diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index d77f8ff97..198bb3a7c 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -24,6 +24,7 @@ package processing.app;
 
 import java.awt.*;
 import java.awt.event.*;
+import java.awt.image.BufferedImage;
 import java.util.ArrayList;
 
 import javax.swing.*;
@@ -96,17 +97,6 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
 //    this.menu = menu;
 
     buttons = new ArrayList<Button>();
-//    buttonCount = 0;
-//    which = new int[BUTTON_COUNT];
-
-//    which[buttonCount++] = RUN;
-//    which[buttonCount++] = STOP;
-//    which[buttonCount++] = NEW;
-//    which[buttonCount++] = OPEN;
-//    which[buttonCount++] = SAVE;
-//    which[buttonCount++] = EXPORT;
-
-//    currentRollover = -1;
     rollover = null;
 
     mode = editor.getMode();
@@ -131,23 +121,37 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
    * otherwise createImage() might fail.
    */
   public Image[][] loadImages() {
-//    Image allButtons = Base.getThemeImage("buttons.gif", this);
-//    Image allButtons = Base.loadImage(file);
-    Image allButtons = mode.loadImage("theme/buttons.gif");
-    int count = allButtons.getWidth(this) / BUTTON_WIDTH;
-//    System.out.println("width is " + allButtons.getWidth(this));
+    int res = Toolkit.isRetina() ? 2 : 1;
+    
+    Image allButtons = null;
+    // Some modes may not have a 2x version. If a mode doesn't have a 1x 
+    // version, this will cause an error... they should always have 1x.
+    if (res == 2) {
+      allButtons = mode.loadImage("theme/buttons-2x.png");
+      if (allButtons == null) {
+        res = 1;  // take him down a notch
+      }
+    }
+    if (res == 1) {
+      allButtons = mode.loadImage("theme/buttons.png");
+      if (allButtons == null) {
+        // use the old (pre-2.0b9) file name
+        allButtons = mode.loadImage("theme/buttons.gif");
+      }
+    }
+
+    int count = allButtons.getWidth(this) / BUTTON_WIDTH*res;
     Image[][] buttonImages = new Image[count][3];
     
     for (int i = 0; i < count; i++) {
       for (int state = 0; state < 3; state++) {
-//        Toolkit tk = Toolkit.getDefaultToolkit();
-//        Image image = tk.createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
-//        System.out.println("image is " + image + " " + BUTTON_WIDTH + " " + BUTTON_HEIGHT);
-        Image image = createImage(BUTTON_WIDTH, BUTTON_HEIGHT);
+//        Image image = createImage(BUTTON_WIDTH*res, BUTTON_HEIGHT*res);
+        Image image = new BufferedImage(BUTTON_WIDTH*res, BUTTON_HEIGHT*res, BufferedImage.TYPE_INT_ARGB);
         Graphics g = image.getGraphics();
         g.drawImage(allButtons, 
-                    -(i*BUTTON_IMAGE_SIZE) - 3, 
-                    (-2 + state)*BUTTON_IMAGE_SIZE, null);
+                    -(i*BUTTON_IMAGE_SIZE*res) - 3, 
+                    (state-2)*BUTTON_IMAGE_SIZE*res, null);
+        g.dispose();
         buttonImages[i][state] = image;
       }
     }
diff --git a/app/src/processing/app/Mode.java b/app/src/processing/app/Mode.java
index 2a9769585..f4b7077f8 100644
--- a/app/src/processing/app/Mode.java
+++ b/app/src/processing/app/Mode.java
@@ -803,6 +803,9 @@ public abstract class Mode {
    */
   public Image loadImage(String filename) {
     File file = new File(folder, filename);
+    if (!file.exists()) {
+      return null;
+    }
     return new ImageIcon(file.getAbsolutePath()).getImage();
   }
 
diff --git a/app/src/processing/app/Toolkit.java b/app/src/processing/app/Toolkit.java
index 97084e2f7..071a99a56 100644
--- a/app/src/processing/app/Toolkit.java
+++ b/app/src/processing/app/Toolkit.java
@@ -216,6 +216,7 @@ public class Toolkit {
 
   static Boolean retinaProp;
 
+  /** Yes, retina is a marketing term. But no, nobody else has implemented hi-dpi. */
   static public boolean isRetina() {
     if (Base.isMacOS()) {
       // This should probably be reset each time there's a display change.
diff --git a/java/theme/buttons.gif b/java/theme/buttons.gif
deleted file mode 100644
index 3d8facd00..000000000
Binary files a/java/theme/buttons.gif and /dev/null differ