diff --git a/ComputerSystems/Commodore64/FormC64Screen.Designer.cs b/ComputerSystems/Commodore64/FormC64Screen.Designer.cs
index ef6a04c..e0b9413 100644
--- a/ComputerSystems/Commodore64/FormC64Screen.Designer.cs
+++ b/ComputerSystems/Commodore64/FormC64Screen.Designer.cs
@@ -32,6 +32,7 @@ private void InitializeComponent() {
             this.lblKeyboardDisabled = new System.Windows.Forms.ToolStripStatusLabel();
             this.toolMain = new System.Windows.Forms.ToolStrip();
             this.btnRestart = new System.Windows.Forms.ToolStripButton();
+            this.btnReset = new System.Windows.Forms.ToolStripButton();
             this.btnPause = new System.Windows.Forms.ToolStripButton();
             this.separator1 = new System.Windows.Forms.ToolStripSeparator();
             this.btnOpen = new System.Windows.Forms.ToolStripButton();
@@ -41,10 +42,10 @@ private void InitializeComponent() {
             this.separator3 = new System.Windows.Forms.ToolStripSeparator();
             this.btnCopyOutput = new System.Windows.Forms.ToolStripSplitButton();
             this.btnCopyRawOutput = new System.Windows.Forms.ToolStripMenuItem();
-            this.btnMemoryWatch = new System.Windows.Forms.ToolStripButton();
+            this.btnDebugger = new System.Windows.Forms.ToolStripButton();
             this.ofd = new System.Windows.Forms.OpenFileDialog();
             this.sfd = new System.Windows.Forms.SaveFileDialog();
-            this.btnReset = new System.Windows.Forms.ToolStripButton();
+            this.separator4 = new System.Windows.Forms.ToolStripSeparator();
             ((System.ComponentModel.ISupportInitialize)(this.pScreen)).BeginInit();
             this.statusMain.SuspendLayout();
             this.toolMain.SuspendLayout();
@@ -120,7 +121,8 @@ private void InitializeComponent() {
             this.btnUseCrtFilter,
             this.separator3,
             this.btnCopyOutput,
-            this.btnMemoryWatch});
+            this.separator4,
+            this.btnDebugger});
             this.toolMain.Location = new System.Drawing.Point(0, 0);
             this.toolMain.Name = "toolMain";
             this.toolMain.Size = new System.Drawing.Size(640, 25);
@@ -137,6 +139,16 @@ private void InitializeComponent() {
             this.btnRestart.Text = "Restart";
             this.btnRestart.Click += new System.EventHandler(this.BtnRestart_Click);
             // 
+            // btnReset
+            // 
+            this.btnReset.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnReset.Image = ((System.Drawing.Image)(resources.GetObject("btnReset.Image")));
+            this.btnReset.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnReset.Name = "btnReset";
+            this.btnReset.Size = new System.Drawing.Size(23, 22);
+            this.btnReset.Text = "Reset";
+            this.btnReset.Click += new System.EventHandler(this.BtnReset_Click);
+            // 
             // btnPause
             // 
             this.btnPause.CheckOnClick = true;
@@ -216,15 +228,15 @@ private void InitializeComponent() {
             this.btnCopyRawOutput.ToolTipText = "Copy raw screen";
             this.btnCopyRawOutput.Click += new System.EventHandler(this.BtnCopyRawOutput_Click);
             // 
-            // btnMemoryWatch
+            // btnDebugger
             // 
-            this.btnMemoryWatch.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.btnMemoryWatch.Image = ((System.Drawing.Image)(resources.GetObject("btnMemoryWatch.Image")));
-            this.btnMemoryWatch.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnMemoryWatch.Name = "btnMemoryWatch";
-            this.btnMemoryWatch.Size = new System.Drawing.Size(23, 22);
-            this.btnMemoryWatch.Text = "toolStripButton1";
-            this.btnMemoryWatch.Click += new System.EventHandler(this.BtnMemoryWatch_Click);
+            this.btnDebugger.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
+            this.btnDebugger.Image = ((System.Drawing.Image)(resources.GetObject("btnDebugger.Image")));
+            this.btnDebugger.ImageTransparentColor = System.Drawing.Color.Magenta;
+            this.btnDebugger.Name = "btnDebugger";
+            this.btnDebugger.Size = new System.Drawing.Size(23, 22);
+            this.btnDebugger.Text = "Debugger";
+            this.btnDebugger.Click += new System.EventHandler(this.BtnMemoryWatch_Click);
             // 
             // ofd
             // 
@@ -234,15 +246,10 @@ private void InitializeComponent() {
             // 
             this.sfd.Filter = "PRG-files|*.prg";
             // 
-            // btnReset
+            // separator4
             // 
-            this.btnReset.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image;
-            this.btnReset.Image = ((System.Drawing.Image)(resources.GetObject("btnReset.Image")));
-            this.btnReset.ImageTransparentColor = System.Drawing.Color.Magenta;
-            this.btnReset.Name = "btnReset";
-            this.btnReset.Size = new System.Drawing.Size(23, 22);
-            this.btnReset.Text = "Reset";
-            this.btnReset.Click += new System.EventHandler(this.BtnReset_Click);
+            this.separator4.Name = "separator4";
+            this.separator4.Size = new System.Drawing.Size(6, 25);
             // 
             // FormC64Screen
             // 
@@ -287,9 +294,10 @@ private void InitializeComponent() {
         private System.Windows.Forms.ToolStripSeparator separator3;
         private System.Windows.Forms.ToolStripStatusLabel lblCycles;
         private System.Windows.Forms.ToolStripStatusLabel lblInstructions;
-        private System.Windows.Forms.ToolStripButton btnMemoryWatch;
+        private System.Windows.Forms.ToolStripButton btnDebugger;
         private System.Windows.Forms.ToolStripButton btnPause;
         private System.Windows.Forms.ToolStripStatusLabel lblKeyboardDisabled;
         private System.Windows.Forms.ToolStripButton btnReset;
+        private System.Windows.Forms.ToolStripSeparator separator4;
     }
 }
\ No newline at end of file
diff --git a/ComputerSystems/Commodore64/FormC64Screen.resx b/ComputerSystems/Commodore64/FormC64Screen.resx
index 973ff5e..06694f0 100644
--- a/ComputerSystems/Commodore64/FormC64Screen.resx
+++ b/ComputerSystems/Commodore64/FormC64Screen.resx
@@ -138,14 +138,14 @@
   <data name="btnReset.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGdSURBVDhPvVLLTgJBENwP8ApLWCC8w7K7IbxhCbBXTfwF
-        736BB4MxXjz4HUYT/RIf8eaNgxpNPIge1BhlM1YNg4ryuFnJJLs13dXV3aP9K6LR6Kb6nA3DMNaSyeSR
-        +p1Aq9UStm3f6LpuKeob8Xi8V61Wnz3PE/l8/kTRE2g0Gn6z2RSVSuX9SyQQCCyBeGXi+CQSiR15+QtI
-        sguFwgOEhGVZV4qWtj3Xdf2xQCgUMtXVH1AEBYe1Wk1gJtuShP0NCkD9Dn36kpyDVCp1QIFsNnuuBYNB
-        vdPpiG63K3gJ1XUZNQdwuEwBDPRRzqDdbksBiqmYuWAcBi5KpdLILXp6oYtwOLwqiQWgAwpgkANJwMol
-        XWQymWNJLAC2tI+ijD+VBB7OHgWwYz8SiTiSnAHuv1gsfpTLZYHYnqI1zXGcW740XA64KkVPgMnAPZNz
-        uVxf0SMwCX0NsU6BCfvpdPoQva5wYOyZtiE+pHWs+23qW2EFOLnmS+Op1+sUk4dDY2XTNPtTk38iFovt
-        wuIFxJ5Q0ee+8WjO0POWClHQtE/bSopZQvIesgAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAGgSURBVDhPvVLJTgJBFOQDvMIQtrDDMDPsOwHmqom/4N0v
+        8GAwxosHv8Nool/iEm/eOKjRxIPoQY1RJm1V06goy81KOpmp7lev3uL6VwSDwU31ORt+v38tGo0eqd8J
+        tFotYRjGjaZphqK+EQ6He5VK5dm2baHr+omiJ1Cv151GoyHK5fL7l4jb7V4qlUqvDByfSCSyIy9/AUFm
+        Lpd7gBCdXCla2rabzaYzFvB6vbq6+gOKIOGwWq0K9GRbkrC/QYFsNnuHOh1JzkEsFjugQDKZPHd5PB6t
+        0+mIbrcreAnVdflqDuBwmQIo41H2oN1uSwGKqTdzwXdouCgWiyO36OoLXfh8vlVJLAAdUCCTyQwkYZrm
+        JV0kEoljSSwAeraPpCIej59KAouzRwHM2AkEApYkZ4Dzz+fzH5iEwNueoqWLW25aoVAYcFSKngCDYfue
+        wel0uq/oERgEW0OMU6DDDuwdotYVNow10zYyD2kdy/Q2dVeYwbKsa24aT61Wo5g8bBozY837U4N/IhQK
+        7aZSqQuU9YSMDueNBp+h5i31RMHl+gSNGoogXVS8sgAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnPause.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -199,19 +199,15 @@
         yyFvPyR42P5TOM4D5wxlZrsQ1ywAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="btnMemoryWatch.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnDebugger.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
-        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAIDSURBVDhPpZLrS5NhGMb3j4SWh0oRQVExD4gonkDpg4hG
-        YKxG6WBogkMZKgPNCEVJFBGdGETEvgwyO9DJE5syZw3PIlPEE9pgBCLZ5XvdMB8Ew8gXbl54nuf63dd9
-        0OGSnwCahxbPRNPAPMw9Xpg6ZmF46kZZ0xSKzJPIrhpDWsVnpBhGkKx3nAX8Pv7z1zg8OoY/cITdn4fw
-        bf/C0kYAN3Ma/w3gWfZL5kzTKBxjWyK2DftwI9tyMYCZKXbNHaD91bLYJrDXsYbrWfUKwJrPE9M2M1Oc
-        VzOOpHI7Jr376Hi9ogHqFIANO0/MmmmbmSmm9a8ze+I4MrNWAdjtoJgWcx+PSzg166yZZ8xM8XvXDix9
-        c4jIqFYAjoriBV9AhEPv1mH/sonogha0afbZMMZz+yreTGyhpusHwtNNCsA5U1zS4BLxzJIfg299qO32
-        Ir7UJtZfftyATqeT+8o2D8JSjQrAJblrncYL7ZJ2+bfaFnC/1S1NjL3diRat7qrO7wLRP3HjWsojBeCo
-        mDEo5mNjuweFGvjWg2EBhCbpkW78htSHHwRyNdmgAFzPEee2iFkzayy2OLXzT4gr6UdUnlXrullsxxQ+
-        kx0g8BTA3aZlButjSTyjODq/WcQcW/B/Je4OQhLvKQDnzN1mp0nnkvAhR8VuMzNrpm1mpjgkoVwB/v8D
-        TgDQASA1MVpwzwAAAABJRU5ErkJggg==
+        YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAEBSURBVDhPzZIxTsNAEEVtmZKCgiIFBUUOkJICJJcpU8Ad
+        KLgFB+AIHCAH4BDQIdGkyAEoKBIpQom0vBd2rXVsp6LgS08z8s7Mfo+2+EtNYfSbHtU5WNvSGXzBBp6g
+        b9AJ3EOqG0MjG55hCwHSIG9TV/AKnskLXEJHTk2DdmVZBiFPLGEGg9LJHXxA3hiqqjLeQK+0qmWtb+u6
+        DlQHY55zJgt4hPR7e3nzCrT+Can4kO8YrWsNUP7bOL/RmOfRxTU82NAnnezAwiFuoaNmB1QMOhBqZB57
+        GuU7eAOL1jHmuY3pIU2gpf0O4BTeDx34LZ5dwNG3oLTng9KVmHe2/h9UFD8b1HxoCWtGSAAAAABJRU5E
+        rkJggg==
 </value>
   </data>
   <metadata name="ofd.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/Icons/debug_16.png b/Icons/debug_16.png
new file mode 100644
index 0000000..5b33e20
Binary files /dev/null and b/Icons/debug_16.png differ