Issue #8: A whole lot more icons