diff --git a/pdex/src/processing/mode/experimental/DebugEditor.java b/pdex/src/processing/mode/experimental/DebugEditor.java
index 3649a6dc3..b4d8f6abc 100755
--- a/pdex/src/processing/mode/experimental/DebugEditor.java
+++ b/pdex/src/processing/mode/experimental/DebugEditor.java
@@ -476,6 +476,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
               errorCheckerService.resumeThread();
               System.out.println(thisEditor.getSketch().getName()
                   + " - Error Checker resumed.");
+              errorCheckerService.runManualErrorCheck();
             }
           }
         });
@@ -507,6 +508,7 @@ public class DebugEditor extends JavaEditor implements ActionListener {
           public void actionPerformed(ActionEvent e) {
             errorCheckerService.warningsEnabled = ((JCheckBoxMenuItem) e
                 .getSource()).isSelected();
+            errorCheckerService.runManualErrorCheck();
           }
         });
         debugMenu.add(showWarnings);
diff --git a/pdex/src/processing/mode/experimental/SketchOutline.java b/pdex/src/processing/mode/experimental/SketchOutline.java
index 527c85c88..460dadbb0 100644
--- a/pdex/src/processing/mode/experimental/SketchOutline.java
+++ b/pdex/src/processing/mode/experimental/SketchOutline.java
@@ -337,7 +337,7 @@ public class SketchOutline {
       if (editor != null) {
         iconPath = (Base.getSketchbookFolder().getAbsolutePath())
 
-        + File.separator + "modes" + File.separator + "ExperimentalMode"
+        + File.separator + "modes" + File.separator + editor.getMode().getClass().getSimpleName()
             + File.separator + "data" + File.separator + "icons";
         ;
       }