diff --git a/src/app/commands/cmd_palette_editor.cpp b/src/app/commands/cmd_palette_editor.cpp
index 36b17703c..6a009edae 100644
--- a/src/app/commands/cmd_palette_editor.cpp
+++ b/src/app/commands/cmd_palette_editor.cpp
@@ -56,6 +56,9 @@ namespace app {
 using namespace gfx;
 using namespace ui;
 
+enum { RGB_MODE, HSV_MODE };
+enum { ABS_MODE, REL_MODE };
+
 class PaletteEntryEditor : public Window {
 public:
   PaletteEntryEditor();
@@ -70,9 +73,8 @@ protected:
   void onFgBgColorChange(const app::Color& _color);
   void onColorSlidersChange(ColorSlidersChangeEvent& ev);
   void onColorHexEntryChange(const app::Color& color);
-  void onColorTypeButtonClick(Event& ev);
-  void onAbsoluteButtonClick(Event& ev);
-  void onRelativeButtonClick(Event& ev);
+  void onColorTypeClick();
+  void onChangeModeClick();
 
 private:
   void selectColorType(app::Color::Type type);
@@ -90,12 +92,10 @@ private:
   Box m_vbox;
   Box m_topBox;
   Box m_bottomBox;
-  RadioButton m_rgbButton;
-  RadioButton m_hsvButton;
+  ButtonSet m_colorType;
+  ButtonSet m_changeMode;
   HexColorEntry m_hexColorEntry;
   Label m_entryLabel;
-  RadioButton m_absButton;
-  RadioButton m_relButton;
   RgbSliders m_rgbSliders;
   HsvSliders m_hsvSliders;
 
@@ -242,11 +242,9 @@ PaletteEntryEditor::PaletteEntryEditor()
   , m_vbox(JI_VERTICAL)
   , m_topBox(JI_HORIZONTAL)
   , m_bottomBox(JI_HORIZONTAL)
-  , m_rgbButton("RGB", 1, kButtonWidget)
-  , m_hsvButton("HSB", 1, kButtonWidget)
+  , m_colorType(2)
   , m_entryLabel("")
-  , m_absButton("Abs", 2, kButtonWidget)
-  , m_relButton("Rel", 2, kButtonWidget)
+  , m_changeMode(2)
   , m_disableHexUpdate(false)
   , m_redrawTimer(250, this)
   , m_redrawAll(false)
@@ -254,23 +252,23 @@ PaletteEntryEditor::PaletteEntryEditor()
   , m_selfPalChange(false)
   , m_fromPalette(0, Palette::MaxColors)
 {
+  m_colorType.addItem("RGB");
+  m_colorType.addItem("HSB");
+  m_changeMode.addItem("Abs");
+  m_changeMode.addItem("Rel");
+
   m_topBox.setBorder(gfx::Border(0));
   m_topBox.child_spacing = 0;
   m_bottomBox.setBorder(gfx::Border(0));
 
-  setup_mini_look(&m_rgbButton);
-  setup_mini_look(&m_hsvButton);
-  setup_mini_look(&m_absButton);
-  setup_mini_look(&m_relButton);
-
   // Top box
-  m_topBox.addChild(&m_rgbButton);
-  m_topBox.addChild(&m_hsvButton);
+  m_topBox.addChild(&m_colorType);
+  m_topBox.addChild(new Separator("", JI_VERTICAL));
+  m_topBox.addChild(&m_changeMode);
+  m_topBox.addChild(new Separator("", JI_VERTICAL));
   m_topBox.addChild(&m_hexColorEntry);
   m_topBox.addChild(&m_entryLabel);
   m_topBox.addChild(new BoxFiller);
-  m_topBox.addChild(&m_absButton);
-  m_topBox.addChild(&m_relButton);
 
   // Main vertical box
   m_vbox.addChild(&m_topBox);
@@ -279,16 +277,14 @@ PaletteEntryEditor::PaletteEntryEditor()
   m_vbox.addChild(&m_bottomBox);
   addChild(&m_vbox);
 
-  m_rgbButton.Click.connect(&PaletteEntryEditor::onColorTypeButtonClick, this);
-  m_hsvButton.Click.connect(&PaletteEntryEditor::onColorTypeButtonClick, this);
-  m_absButton.Click.connect(&PaletteEntryEditor::onAbsoluteButtonClick, this);
-  m_relButton.Click.connect(&PaletteEntryEditor::onRelativeButtonClick, this);
+  m_colorType.ItemChange.connect(&PaletteEntryEditor::onColorTypeClick, this);
+  m_changeMode.ItemChange.connect(&PaletteEntryEditor::onChangeModeClick, this);
 
   m_rgbSliders.ColorChange.connect(&PaletteEntryEditor::onColorSlidersChange, this);
   m_hsvSliders.ColorChange.connect(&PaletteEntryEditor::onColorSlidersChange, this);
   m_hexColorEntry.ColorChange.connect(&PaletteEntryEditor::onColorHexEntryChange, this);
 
-  m_absButton.setSelected(true);
+  m_changeMode.setSelectedItem(ABS_MODE);
   selectColorType(app::Color::RgbType);
 
   // We hook fg/bg color changes (by eyedropper mainly) to update the selected entry color
@@ -451,25 +447,31 @@ void PaletteEntryEditor::onColorHexEntryChange(const app::Color& color)
   m_disableHexUpdate = false;
 }
 
-void PaletteEntryEditor::onColorTypeButtonClick(Event& ev)
+void PaletteEntryEditor::onColorTypeClick()
 {
-  RadioButton* source = static_cast<RadioButton*>(ev.getSource());
-
-  if (source == &m_rgbButton) selectColorType(app::Color::RgbType);
-  else if (source == &m_hsvButton) selectColorType(app::Color::HsvType);
+  switch (m_colorType.selectedItem()) {
+    case RGB_MODE:
+      selectColorType(app::Color::RgbType);
+      break;
+    case HSV_MODE:
+      selectColorType(app::Color::HsvType);
+      break;
+  }
 }
 
-void PaletteEntryEditor::onAbsoluteButtonClick(Event& ev)
+void PaletteEntryEditor::onChangeModeClick()
 {
-  m_rgbSliders.setMode(ColorSliders::Absolute);
-  m_hsvSliders.setMode(ColorSliders::Absolute);
-}
-
-void PaletteEntryEditor::onRelativeButtonClick(Event& ev)
-{
-  m_rgbSliders.setMode(ColorSliders::Relative);
-  m_hsvSliders.setMode(ColorSliders::Relative);
-  resetRelativeInfo();
+  switch (m_changeMode.selectedItem()) {
+    case ABS_MODE:
+      m_rgbSliders.setMode(ColorSliders::Absolute);
+      m_hsvSliders.setMode(ColorSliders::Absolute);
+      break;
+    case REL_MODE:
+      m_rgbSliders.setMode(ColorSliders::Relative);
+      m_hsvSliders.setMode(ColorSliders::Relative);
+      resetRelativeInfo();
+      break;
+  }
 }
 
 void PaletteEntryEditor::setPaletteEntry(const app::Color& color)
@@ -643,8 +645,8 @@ void PaletteEntryEditor::selectColorType(app::Color::Type type)
   resetRelativeInfo();
 
   switch (type) {
-    case app::Color::RgbType: m_rgbButton.setSelected(true); break;
-    case app::Color::HsvType: m_hsvButton.setSelected(true); break;
+    case app::Color::RgbType: m_colorType.setSelectedItem(RGB_MODE); break;
+    case app::Color::HsvType: m_colorType.setSelectedItem(HSV_MODE); break;
   }
 
   m_vbox.layout();
diff --git a/src/app/ui/button_set.cpp b/src/app/ui/button_set.cpp
index 5f38b94a9..44cc3442d 100644
--- a/src/app/ui/button_set.cpp
+++ b/src/app/ui/button_set.cpp
@@ -45,6 +45,7 @@ ButtonSet::Item::Item()
   : Widget(buttonset_item_type())
   , m_icon(NULL)
 {
+  setup_mini_font(this);
 }
 
 void ButtonSet::Item::setIcon(she::Surface* icon)
@@ -63,7 +64,7 @@ void ButtonSet::Item::onPaint(ui::PaintEvent& ev)
   SkinTheme* theme = static_cast<SkinTheme*>(getTheme());
   Graphics* g = ev.getGraphics();
   gfx::Rect rc = getClientBounds();
-  gfx::Color face;
+  gfx::Color fg, bg;
   int nw;
 
   if (!gfx::is_transparent(getBgColor()))
@@ -72,23 +73,26 @@ void ButtonSet::Item::onPaint(ui::PaintEvent& ev)
   if (isSelected() || hasMouseOver()) {
     if (hasCapture()) {
       nw = PART_TOOLBUTTON_PUSHED_NW;
-      face = theme->colors.buttonSelectedFace();
+      fg = theme->colors.buttonSelectedText();
+      bg = theme->colors.buttonSelectedFace();
     }
     else {
       nw = PART_TOOLBUTTON_HOT_NW;
-      face = theme->colors.buttonHotFace();
+      fg = theme->colors.buttonHotText();
+      bg = theme->colors.buttonHotFace();
     }
   }
   else {
     nw = PART_TOOLBUTTON_LAST_NW;
-    face = theme->colors.buttonNormalFace();
+    fg = theme->colors.buttonNormalText();
+    bg = theme->colors.buttonNormalFace();
   }
 
   Grid::Info info = buttonSet()->getChildInfo(this);
   if (info.col < info.grid_cols-1) rc.w+=1*guiscale();
   if (info.row < info.grid_rows-1) rc.h+=3*guiscale();
 
-  theme->draw_bounds_nw(g, rc, nw, face);
+  theme->draw_bounds_nw(g, rc, nw, bg);
 
   if (m_icon) {
     int u = rc.x + rc.w/2 - m_icon->width()/2;
@@ -99,6 +103,15 @@ void ButtonSet::Item::onPaint(ui::PaintEvent& ev)
     else
       g->drawRgbaSurface(m_icon, u, v);
   }
+
+  if (!getText().empty()) {
+    gfx::Size sz(getTextSize());
+    gfx::Point pt(rc.x + rc.w/2 - sz.w/2,
+                  rc.y + rc.h/2 - sz.h/2 - 1*guiscale());
+
+    g->setFont(getFont());
+    g->drawString(getText(), fg, gfx::ColorNone, pt);
+  }
 }
 
 bool ButtonSet::Item::onProcessMessage(ui::Message* msg)
@@ -148,7 +161,14 @@ bool ButtonSet::Item::onProcessMessage(ui::Message* msg)
 
 void ButtonSet::Item::onPreferredSize(ui::PreferredSizeEvent& ev)
 {
-  gfx::Size sz(16, 16); // TODO Calculate from icon
+  gfx::Size sz;
+
+  if (m_icon) {
+    sz.w = 16*guiscale();
+    sz.h = 16*guiscale();
+  }
+  else if (!getText().empty())
+    sz += getTextSize() + 8*guiscale();;
 
   Grid::Info info = buttonSet()->getChildInfo(this);
   if (info.row == info.grid_rows-1)
@@ -165,6 +185,13 @@ ButtonSet::ButtonSet(int columns)
   noBorderNoChildSpacing();
 }
 
+void ButtonSet::addItem(const std::string& text, int hspan, int vspan)
+{
+  Item* item = new Item();
+  item->setText(text);
+  addItem(item, hspan, vspan);
+}
+
 void ButtonSet::addItem(she::Surface* icon, int hspan, int vspan)
 {
   Item* item = new Item();
diff --git a/src/app/ui/button_set.h b/src/app/ui/button_set.h
index 41c2eaa93..850582943 100644
--- a/src/app/ui/button_set.h
+++ b/src/app/ui/button_set.h
@@ -34,6 +34,7 @@ namespace app {
 
     ButtonSet(int columns);
 
+    void addItem(const std::string& text, int hspan = 1, int vspan = 1);
     void addItem(she::Surface* icon, int hspan = 1, int vspan = 1);
     void addItem(Item* item, int hspan = 1, int vspan = 1);
     Item* getItem(int index);
diff --git a/src/app/ui/skin/skin_theme.cpp b/src/app/ui/skin/skin_theme.cpp
index 787c2249c..4e8715b2c 100644
--- a/src/app/ui/skin/skin_theme.cpp
+++ b/src/app/ui/skin/skin_theme.cpp
@@ -780,18 +780,18 @@ void SkinTheme::initWidget(Widget* widget)
       break;
 
     case kSeparatorWidget:
-      /* frame */
+      // Frame
       if ((widget->getAlign() & JI_HORIZONTAL) &&
           (widget->getAlign() & JI_VERTICAL)) {
         BORDER(4 * scale);
       }
-      /* horizontal bar */
+      // Horizontal bar
       else if (widget->getAlign() & JI_HORIZONTAL) {
         BORDER4(2 * scale, 4 * scale, 2 * scale, 0);
       }
-      /* vertical bar */
+      // Vertical bar
       else {
-        BORDER4(4 * scale, 2 * scale, 0, 2 * scale);
+        BORDER4(4 * scale, 2 * scale, 1 * scale, 2 * scale);
       }
 
       if (widget->hasText()) {