diff --git a/app/src/processing/app/EditorHeader.java b/app/src/processing/app/EditorHeader.java
index b4427b68f..e59dc92c6 100644
--- a/app/src/processing/app/EditorHeader.java
+++ b/app/src/processing/app/EditorHeader.java
@@ -58,15 +58,19 @@ public class EditorHeader extends JComponent {
   static final int UNSELECTED = 0;
   static final int SELECTED = 1;
 
-  static final String WHERE[] = { "left", "mid", "right", "menu" };
+  static final String WHERE[] = { "left", "mid", "right" }; //, "menu" };
   static final int LEFT = 0;
   static final int MIDDLE = 1;
   static final int RIGHT = 2;
-  static final int MENU = 3;
+//  static final int MENU = 3;
 
   static final int PIECE_WIDTH = 4;
-
+  static final int PIECE_HEIGHT = 33;
   Image[][] pieces;
+  
+  static final int ARROW_WIDTH = 6;
+  static final int ARROW_HEIGHT = 6;
+  Image tabArrow;
 
   //
 
@@ -131,15 +135,39 @@ public class EditorHeader extends JComponent {
   }
 
 
+  protected String tabFile(int status, int where) {
+    return "theme/tab-" + STATUS[status] + "-" + WHERE[where];
+  }
+  
+  
   public void updateMode() {
     Mode mode = editor.getMode();
-    pieces = new Image[STATUS.length][WHERE.length];
-    for (int i = 0; i < STATUS.length; i++) {
-      for (int j = 0; j < WHERE.length; j++) {
-        String filename = "theme/tab-" + STATUS[i] + "-" + WHERE[j] + ".gif";
-        pieces[i][j] = mode.loadImage(filename);
+    int res = Toolkit.isRetina() ? 2 : 1;
+    
+    String suffix = "-2x.png";  // wishful thinking
+    // 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) {
+      if (!mode.getContentFile(tabFile(0, 0) + suffix).exists()) {
+        res = 1;
       }
     }
+    if (res == 1) {
+      suffix = ".png";
+      if (!mode.getContentFile(tabFile(0, 0) + suffix).exists()) {
+        suffix = ".gif";
+      }
+    }
+    
+    pieces = new Image[STATUS.length][WHERE.length];
+    for (int status = 0; status < STATUS.length; status++) {
+      for (int where = 0; where < WHERE.length; where++) {
+        //String filename = "theme/tab-" + STATUS[i] + "-" + WHERE[j] + ".gif";
+        pieces[status][where] = mode.loadImage(tabFile(status, where) + suffix);
+      }
+    }
+    
+    tabArrow = mode.loadImage("theme/tab-arrow");
 
     backgroundColor = mode.getColor("header.bgcolor");
     textColor[SELECTED] = mode.getColor("header.text.selected.color");
@@ -214,10 +242,9 @@ public class EditorHeader extends JComponent {
       visitOrder = new Tab[sketch.getCodeCount() - 1];
     }
 
-//    int x = 6; // offset from left edge of the component
     menuRight = sizeW - 16;
-    menuLeft = menuRight - pieces[0][MENU].getWidth(this);
-//    int tabMax = menuLeft - x;
+//    menuLeft = menuRight - pieces[0][MENU].getWidth(this);
+    menuLeft = menuRight - 50;  // FIXME!!
     int tabLeft = 6;
     int tabMax = menuLeft - tabLeft;
 
@@ -264,40 +291,9 @@ public class EditorHeader extends JComponent {
     // now actually draw the tabs
     placeTabs(tabLeft, tabMax, g);
 
-//    for (int i = 0; i < sketch.getCodeCount(); i++) {
-//      SketchCode code = sketch.getCode(i);
-//      Tab tab = tabs[i];
-//
-//      int pieceCount = 2 + (tab.textWidth / PIECE_WIDTH);
-//      int pieceWidth = pieceCount * PIECE_WIDTH;
-//
-//      int state = (code == sketch.getCurrentCode()) ? SELECTED : UNSELECTED;
-//      g.drawImage(pieces[state][LEFT], x, 0, null);
-//      x += PIECE_WIDTH;
-//
-//      int contentLeft = x;
-//      tab.left = x;
-//      for (int j = 0; j < pieceCount; j++) {
-//        g.drawImage(pieces[state][MIDDLE], x, 0, null);
-//        x += PIECE_WIDTH;
-//      }
-//      tab.right = x;
-//      int textLeft = contentLeft + (pieceWidth - tab.textWidth) / 2;
-//
-//      g.setColor(textColor[state]);
-//      int baseline = (sizeH + fontAscent) / 2;
-//      //g.drawString(sketch.code[i].name, textLeft, baseline);
-//      g.drawString(tab.text, textLeft, baseline);
-//
-//      g.drawImage(pieces[state][RIGHT], x, 0, null);
-//      x += PIECE_WIDTH - 1;  // overlap by 1 pixel
-//    }
-
-//    menuLeft = sizeW - (16 + pieces[0][MENU].getWidth(this));
-//    menuRight = sizeW - 16;
     // draw the dropdown menu target
-    g.drawImage(pieces[popup.isVisible() ? SELECTED : UNSELECTED][MENU],
-                menuLeft, 0, null);
+//    g.drawImage(pieces[popup.isVisible() ? SELECTED : UNSELECTED][MENU],
+//                menuLeft, 0, null);
 
     screen.drawImage(offscreen, 0, 0, imageW, imageH, null);
   }
@@ -319,7 +315,7 @@ public class EditorHeader extends JComponent {
 
       int state = (code == sketch.getCurrentCode()) ? SELECTED : UNSELECTED;
       if (g != null) {
-        g.drawImage(pieces[state][LEFT], x, 0, null);
+        g.drawImage(pieces[state][LEFT], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
       }
       x += PIECE_WIDTH;
 
@@ -327,7 +323,7 @@ public class EditorHeader extends JComponent {
       tab.left = x;
       for (int j = 0; j < pieceCount; j++) {
         if (g != null) {
-          g.drawImage(pieces[state][MIDDLE], x, 0, null);
+          g.drawImage(pieces[state][MIDDLE], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
         }
         x += PIECE_WIDTH;
       }
@@ -344,7 +340,7 @@ public class EditorHeader extends JComponent {
       }
 
       if (g != null) {
-        g.drawImage(pieces[state][RIGHT], x, 0, null);
+        g.drawImage(pieces[state][RIGHT], x, 0, PIECE_WIDTH, PIECE_HEIGHT, null);
       }
       x += PIECE_WIDTH - 1;  // overlap by 1 pixel
     }
diff --git a/app/src/processing/app/EditorToolbar.java b/app/src/processing/app/EditorToolbar.java
index 198bb3a7c..715843841 100644
--- a/app/src/processing/app/EditorToolbar.java
+++ b/app/src/processing/app/EditorToolbar.java
@@ -3,7 +3,7 @@
 /*
   Part of the Processing project - http://processing.org
 
-  Copyright (c) 2004-10 Ben Fry and Casey Reas
+  Copyright (c) 2004-13 Ben Fry and Casey Reas
   Copyright (c) 2001-04 Massachusetts Institute of Technology
 
   This program is free software; you can redistribute it and/or modify
@@ -89,6 +89,12 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
   JMenu modeMenu;
   
   protected ArrayList<Button> buttons;
+  
+  static final int ARROW_WIDTH = 6;
+  static final int ARROW_HEIGHT = 6;
+  Image modeArrow;
+  
+  protected Image backgroundImage;
 
 
   public EditorToolbar(Editor editor, Base base) {  //, JMenu menu) {
@@ -103,7 +109,8 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
     bgcolor = mode.getColor("buttons.bgcolor");
     statusFont = mode.getFont("buttons.status.font");
     statusColor = mode.getColor("buttons.status.color");
-    modeTitle = mode.getTitle().toUpperCase();
+//    modeTitle = mode.getTitle().toUpperCase();
+    modeTitle = mode.getTitle();
     modeTextFont = mode.getFont("mode.button.font");
     modeButtonColor = mode.getColor("mode.button.color");
 
@@ -123,20 +130,24 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
   public Image[][] loadImages() {
     int res = Toolkit.isRetina() ? 2 : 1;
     
+    String suffix = null; 
     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");
+      suffix = "-2x.png";
+      allButtons = mode.loadImage("theme/buttons" + suffix);
       if (allButtons == null) {
         res = 1;  // take him down a notch
       }
     }
     if (res == 1) {
-      allButtons = mode.loadImage("theme/buttons.png");
+      suffix = ".png";
+      allButtons = mode.loadImage("theme/buttons" + suffix);
       if (allButtons == null) {
         // use the old (pre-2.0b9) file name
-        allButtons = mode.loadImage("theme/buttons.gif");
+        suffix = ".gif";
+        allButtons = mode.loadImage("theme/buttons" + suffix);
       }
     }
 
@@ -145,7 +156,6 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
     
     for (int i = 0; i < count; i++) {
       for (int state = 0; state < 3; state++) {
-//        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, 
@@ -155,6 +165,10 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
         buttonImages[i][state] = image;
       }
     }
+    
+    // Load the dropdown arrow, based on all the work done above
+    modeArrow = mode.loadImage("theme/mode-arrow" + suffix);
+    
     return buttonImages;
   }
   
@@ -168,24 +182,6 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
       init();
     }
 
-    // this data is shared by all EditorToolbar instances
-//    if (buttonImages == null) {
-//      loadButtons();
-//    }
-
-    // this happens once per instance of EditorToolbar
-//    if (stateImage == null) {
-//      state = new int[buttonCount];
-//      stateImage = new Image[buttonCount];
-//      for (int i = 0; i < buttonCount; i++) {
-//        setState(i, INACTIVE, false);
-//      }
-//      y1 = 0;
-//      y2 = BUTTON_HEIGHT;
-//      x1 = new int[buttonCount];
-//      x2 = new int[buttonCount];
-//    }
-
     Dimension size = getSize();
     if ((offscreen == null) ||
         (size.width != width) || (size.height != height)) {
@@ -254,34 +250,33 @@ public abstract class EditorToolbar extends JComponent implements MouseInputList
       g.drawString(status, buttons.size() * BUTTON_WIDTH + 3 * BUTTON_GAP, statusY);
     }
 
-//    Color modeButtonColor;
-//    Font modeTextFont;
-//    Color modeTextColor;
     g.setFont(modeTextFont);
     FontMetrics metrics = g.getFontMetrics();
-    int modeH = metrics.getAscent();
-    int modeW = metrics.stringWidth(modeTitle);
-    final int modeGapH = 6;
-    final int modeGapV = 3;
+    int modeTextHeight = metrics.getAscent();
+    int modeTextWidth = metrics.stringWidth(modeTitle);
+    final int modeGapWidth = 6;
+    final int modeBoxHeight = 20;
     modeX2 = getWidth() - 16;
-    modeX1 = modeX2 - (modeGapH + modeW + modeGapH);
-    modeY1 = (getHeight() - modeH)/2 - modeGapV;
-    modeY2 = modeY1 + modeH + modeGapV*2;
-//    g.setColor(modeButtonColor);
-//    g.fillRect(modeX1, modeY1, modeX2 - modeX1, modeY2 - modeY1);
-//    g.setColor(modeTextColor);
-//    g.drawString(modeTitle, modeX1 + modeGapH, modeY2 - modeGapV);
+    modeX1 = modeX2 - (modeGapWidth + modeTextWidth + modeGapWidth + ARROW_WIDTH + modeGapWidth);
+    modeY1 = (getHeight() - modeBoxHeight) / 2;
+    modeY2 = modeY1 + modeBoxHeight; //modeY1 + modeH + modeGapV*2;
     g.setColor(modeButtonColor);
     g.drawRect(modeX1, modeY1, modeX2 - modeX1, modeY2 - modeY1);
-    g.drawString(modeTitle, modeX1 + modeGapH, modeY2 - modeGapV);
+    g.drawString(modeTitle, 
+                 modeX1 + modeGapWidth, 
+                 modeY1 + modeTextHeight + (modeBoxHeight - modeTextHeight) / 2);
+    g.drawImage(modeArrow, 
+                modeX2 - ARROW_WIDTH - modeGapWidth, 
+                modeY1 + (modeBoxHeight - ARROW_HEIGHT) / 2, 
+                ARROW_WIDTH, ARROW_HEIGHT, this);
 
     screen.drawImage(offscreen, 0, 0, size.width, size.height, null);
 
     // dim things out when not enabled (not currently in use) 
-    if (!isEnabled()) {
-      screen.setColor(new Color(0, 0, 0, 100));
-      screen.fillRect(0, 0, getWidth(), getHeight());
-    }
+//    if (!isEnabled()) {
+//      screen.setColor(new Color(0, 0, 0, 100));
+//      screen.fillRect(0, 0, getWidth(), getHeight());
+//    }
   }
 
   
diff --git a/java/theme/tab-sel-left.gif b/java/theme/tab-sel-left.gif
deleted file mode 100644
index bdee43c25..000000000
Binary files a/java/theme/tab-sel-left.gif and /dev/null differ
diff --git a/java/theme/tab-sel-mid.gif b/java/theme/tab-sel-mid.gif
deleted file mode 100644
index fa8ed45fc..000000000
Binary files a/java/theme/tab-sel-mid.gif and /dev/null differ
diff --git a/java/theme/tab-sel-right.gif b/java/theme/tab-sel-right.gif
deleted file mode 100644
index d901fdba4..000000000
Binary files a/java/theme/tab-sel-right.gif and /dev/null differ
diff --git a/java/theme/tab-unsel-left.gif b/java/theme/tab-unsel-left.gif
deleted file mode 100644
index eea22d8d8..000000000
Binary files a/java/theme/tab-unsel-left.gif and /dev/null differ
diff --git a/java/theme/tab-unsel-mid.gif b/java/theme/tab-unsel-mid.gif
deleted file mode 100644
index a2c5497b8..000000000
Binary files a/java/theme/tab-unsel-mid.gif and /dev/null differ
diff --git a/java/theme/tab-unsel-right.gif b/java/theme/tab-unsel-right.gif
deleted file mode 100644
index 91c03f5a9..000000000
Binary files a/java/theme/tab-unsel-right.gif and /dev/null differ
diff --git a/java/theme/theme.txt b/java/theme/theme.txt
index 10f6e220c..05c0943af 100644
--- a/java/theme/theme.txt
+++ b/java/theme/theme.txt
@@ -24,17 +24,21 @@ console.output.color = #cccccc
 console.error.color = #ff3000
 
 # GUI - BUTTONS
-buttons.bgcolor = #4a545e
+#buttons.bgcolor = #4a545e
+buttons.bgcolor = #000000
 buttons.status.font = SansSerif,plain,12
 #buttons.status.font.macosx = Helvetica,plain,12
 buttons.status.color = #ffffff
 
 # GUI - MODE
 #mode.button.bgcolor = #9ca6b0
-mode.button.font = SansSerif,plain,9
+#mode.button.font = SansSerif,plain,9
 #mode.button.font.macosx = Helvetica,plain,9
+mode.button.font = Monospaced,plain,10
+mode.button.font.macosx = Monaco,plain,10
 #mode.button.color = #4a545e
-mode.button.color = #9ca6b0
+#mode.button.color = #9ca6b0
+mode.button.color = #ffffff
 
 # GUI - LINESTATUS
 linestatus.color = #ffffff