More icon improvements and tweaks