icon and controller tweaks