Tray as buttons

Tray icons are now buttons