Clean up
Better image handling for icon
.