don't scale quicklaunch icons
fix merge error; update quicklaunch icons (not much gain...)