diff --git a/app/src/processing/app/EditorButton.java b/app/src/processing/app/EditorButton.java
index 71a205545..a2c43f0e2 100644
--- a/app/src/processing/app/EditorButton.java
+++ b/app/src/processing/app/EditorButton.java
@@ -62,12 +62,11 @@ implements MouseListener, MouseMotionListener, ActionListener {
     this.titleShift = titleShift;
    
     final int res = Toolkit.highResDisplay() ? 2 : 1;
-    
-    disabledImage = mode.loadImage(name + "-enabled-" + res + "x.png");
+    disabledImage = mode.loadImage(name + "-disabled-" + res + "x.png");
     enabledImage = mode.loadImage(name + "-enabled-" + res + "x.png");
-    selectedImage = mode.loadImage(name + "-enabled-" + res + "x.png");
-    pressedImage = mode.loadImage(name + "-enabled-" + res + "x.png");
-    rolloverImage = mode.loadImage(name + "-enabled-" + res + "x.png");
+    selectedImage = mode.loadImage(name + "-selected-" + res + "x.png");
+    pressedImage = mode.loadImage(name + "-pressed-" + res + "x.png");
+    rolloverImage = mode.loadImage(name + "-rollover-" + res + "x.png");
     
     if (disabledImage == null) { 
       disabledImage = enabledImage;
@@ -81,6 +80,8 @@ implements MouseListener, MouseMotionListener, ActionListener {
     if (rolloverImage == null) {
       rolloverImage = enabledImage;  // could be pressed image
     }
+    addMouseListener(this);
+    addMouseMotionListener(this);
   }
   
   
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
index 46b3e4492..e4b0f3352 100644
--- a/app/src/processing/app/Mode.java
+++ b/app/src/processing/app/Mode.java
@@ -1184,8 +1184,10 @@ public abstract class Mode {
   public ImageIcon loadIcon(String filename) {
     File file = new File(folder, filename);
     if (!file.exists()) {
+//      EditorConsole.systemErr.println("file does not exist: " + file.getAbsolutePath());
       return null;
     }
+//    EditorConsole.systemErr.println("found: " + file.getAbsolutePath());
     return new ImageIcon(file.getAbsolutePath());
   }
   
diff --git a/java/src/processing/mode/java/DebugTray.java b/java/src/processing/mode/java/DebugTray.java
index 03c802d78..ac16c5e58 100644
--- a/java/src/processing/mode/java/DebugTray.java
+++ b/java/src/processing/mode/java/DebugTray.java
@@ -33,6 +33,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import javax.swing.*;
+import javax.swing.border.EmptyBorder;
 import javax.swing.event.TreeExpansionEvent;
 import javax.swing.event.TreeExpansionListener;
 import javax.swing.table.TableColumn;
@@ -124,7 +125,7 @@ public class DebugTray extends JFrame {
     Box box = Box.createHorizontalBox();
 
     continueButton = 
-      new EditorButton(mode, "debug-continue", 
+      new EditorButton(mode, "theme/debug/continue", 
                        Language.text("toolbar.debug.continue")) {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -136,7 +137,7 @@ public class DebugTray extends JFrame {
     box.add(Box.createHorizontalStrut(GAP));
     
     stepButton = 
-      new EditorButton(mode, "debug-step",
+      new EditorButton(mode, "theme/debug/step",
                        Language.text("toolbar.debug.step"),
                        Language.text("toolbar.debug.step_into")) {
       @Override
@@ -154,7 +155,7 @@ public class DebugTray extends JFrame {
     box.add(Box.createHorizontalStrut(GAP));
 
     breakpointButton = 
-      new EditorButton(mode, "debug-breakpoint",
+      new EditorButton(mode, "theme/debug/breakpoint",
                        Language.text("toolbar.debug.toggle_breakpoints")) {
       @Override
       public void actionPerformed(ActionEvent e) {
@@ -162,15 +163,19 @@ public class DebugTray extends JFrame {
         editor.debugger.toggleBreakpoint();
       }
     };
-    add(breakpointButton);
+    box.add(breakpointButton);
     box.add(Box.createHorizontalStrut(GAP));
 
-    JLabel label = new JLabel();
+    JLabel label = new JLabel("testing");
     box.add(label);
     continueButton.setRolloverLabel(label);
     stepButton.setRolloverLabel(label);
     breakpointButton.setRolloverLabel(label);
     
+    // the rest is all gaps
+    box.add(Box.createHorizontalGlue());
+    box.setBorder(new EmptyBorder(GAP, GAP, GAP, GAP));
+
     return box;
   }