Improved shutdown
Tweak icon