diff -r ddb02fd788ec -r 8731a1b81301 GUI/MainForm.cs
--- a/GUI/MainForm.cs	Tue Mar 15 22:00:31 2011 +0000
+++ b/GUI/MainForm.cs	Wed Mar 16 22:10:26 2011 +0000
@@ -388,9 +388,10 @@
       Visible = false;
       SaveConfiguration();
 
-      timer.Enabled = false;
-      systemTray.Dispose();      
+      systemTray.IsMainIconEnabled = false;
+      timer.Enabled = false;            
       computer.Close();
+      systemTray.Dispose();
     }
 
     private void aboutMenuItem_Click(object sender, EventArgs e) {
@@ -593,5 +594,15 @@
         settings.SetValue("mainForm.Height", Bounds.Height);
       }
     }
+
+    private void resetClick(object sender, EventArgs e) {
+      // disable the fallback MainIcon during reset, otherwise icon visibility
+      // might be lost 
+      systemTray.IsMainIconEnabled = false;
+      computer.Close();
+      computer.Open();
+      // restore the MainIcon setting
+      systemTray.IsMainIconEnabled = minimizeToTray.Value;
+    }
   }
 }