Various icon tweaks and fixes