Fixed icons
Less cleanup