Some more tuning of icons, color and scaling.