diff --git a/app/src/processing/app/Editor.java b/app/src/processing/app/Editor.java
index 1d2632769..9bba60884 100644
--- a/app/src/processing/app/Editor.java
+++ b/app/src/processing/app/Editor.java
@@ -38,11 +38,8 @@ import java.util.List;
 import java.util.Timer;
 
 import javax.swing.*;
-import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
 import javax.swing.event.*;
-import javax.swing.plaf.basic.BasicSplitPaneDivider;
-import javax.swing.plaf.basic.BasicSplitPaneUI;
+import javax.swing.plaf.basic.*;
 import javax.swing.text.*;
 import javax.swing.undo.*;
 
@@ -54,6 +51,8 @@ public abstract class Editor extends JFrame implements RunnerListener {
   protected EditorState state;
   protected Mode mode;
 
+  static final int GUTTER = 60;
+  
   // Otherwise, if the window is resized with the message label
   // set to blank, its preferredSize() will be fuckered
   static protected final String EMPTY =
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index d162ac9d5..19afaf49f 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -24,7 +24,7 @@
 package processing.app;
 
 import java.awt.*;
-import java.awt.event.ActionEvent;
+import java.awt.event.*;
 
 import javax.swing.Box;
 import javax.swing.JLabel;
@@ -73,7 +73,7 @@ abstract public class EditorToolbar extends JPanel {
       
       @Override
       public void actionPerformed(ActionEvent e) {
-        handleRun();
+        handleRun(e.getModifiers());
       }
     };
     
@@ -88,6 +88,7 @@ abstract public class EditorToolbar extends JPanel {
     };
     
     box = Box.createHorizontalBox();
+    box.add(Box.createHorizontalStrut(Editor.GUTTER));
     box.add(runButton);
     
     label = new JLabel();
@@ -159,7 +160,7 @@ abstract public class EditorToolbar extends JPanel {
   }
   
   
-  abstract public void handleRun();
+  abstract public void handleRun(int modifiers);
   
   
   abstract public void handleStop();
diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
index af5dfdc10..266f582f6 100644
--- a/app/src/processing/app/Toolkit.java
+++ b/app/src/processing/app/Toolkit.java
@@ -414,7 +414,7 @@ public class Toolkit {
   static public ImageIcon getLibIcon(String filename) {
     File file = Base.getContentFile("lib/" + filename);
     if (!file.exists()) {
-      System.err.println("does not exist: " + file);
+//      System.err.println("does not exist: " + file);
       return null;
     }
     return new ImageIcon(file.getAbsolutePath());
diff --git a/java/src/processing/mode/java/JavaToolbar.java b/java/src/processing/mode/java/JavaToolbar.java
index 0cd56b695..7ed4593d6 100644
--- a/java/src/processing/mode/java/JavaToolbar.java
+++ b/java/src/processing/mode/java/JavaToolbar.java
@@ -19,37 +19,36 @@
 
 package processing.mode.java;
 
-import java.awt.Image;
-import java.awt.event.MouseEvent;
+import java.awt.event.InputEvent;
 
-//import javax.swing.JPopupMenu;
-
-
-import javax.swing.JPanel;
-
-import processing.app.Base;
 import processing.app.Editor;
 import processing.app.EditorToolbar;
-import processing.app.Language;
 
 
 public class JavaToolbar extends EditorToolbar {
+  JavaEditor jeditor;
+  
   
   public JavaToolbar(Editor editor) {
     super(editor);
+    jeditor = (JavaEditor) editor;
   }
 
   
   @Override
-  public void handleRun() {
-    // TODO Auto-generated method stub
-    
+  public void handleRun(int modifiers) {
+    boolean shift = (modifiers & InputEvent.SHIFT_MASK) != 0;
+    if (shift) {
+      jeditor.handlePresent();
+    } else {
+      jeditor.handleRun();
+    }
   }
 
+  
   @Override
   public void handleStop() {
-    // TODO Auto-generated method stub
-    
+    jeditor.handleStop();
   }
 }