Remove some icons
Tweaked palette scroll box
Refactor