diff --git a/ArteKaffee.ahk b/ArteKaffee.ahk
index f076b46..c8f208b 100644
--- a/ArteKaffee.ahk
+++ b/ArteKaffee.ahk
@@ -2,6 +2,8 @@
 #SingleInstance Force
 Persistent
 
+FileInstall("akfe-on.ico", A_Temp "\akfe-on.ico")
+FileInstall("akfe-off.ico", A_Temp "\akfe-off.ico")
 
 global IdleTime := 240 ; seconds
 global Enabled := true
@@ -34,11 +36,11 @@ A_TrayMenu.Add("Noodle", CopyMenu)
 
 A_TrayMenu.Add()
 A_TrayMenu.Add("Exit", (*) => ExitApp())
-
+TraySetIcon(A_Temp "\akfe-on.ico")
 UpdateTray()
 
 SetTimer(CheckMouse, 20000)
-
+OnMessage(0x404, TrayIconHandler)
 
 ;=========================================================
 ; Mouse mover
@@ -67,6 +69,14 @@ CheckMouse() {
     }
 }
 
+TrayIconHandler(wParam, lParam, msg, hwnd)
+{
+    ; Double left click on tray icon
+    if (lParam = 0x203) {
+        ToggleEnabled()
+    }
+}
+
 ;=========================================================
 ; Tray functions
 ;=========================================================
@@ -92,11 +102,13 @@ UpdateTray() {
     global Enabled
 
     if Enabled {
+        TraySetIcon(A_Temp "\akfe-on.ico")
         A_TrayMenu.Check("Enabled")
-        A_IconTip := "Mouse Mover - Active"
+        A_IconTip := "ArteKaffee - Active"
     } else {
+        TraySetIcon(A_Temp "\akfe-off.ico")
         A_TrayMenu.Uncheck("Enabled")
-        A_IconTip := "Mouse Mover - Disabled"
+        A_IconTip := "ArteKaffee - Disabled"
     }
 }