diff --git a/core/resources/pix/icons/delete.png b/core/resources/pix/icons/delete.png
deleted file mode 100644
index 869be8b4c..000000000
Binary files a/core/resources/pix/icons/delete.png and /dev/null differ
diff --git a/core/resources/pix/icons/down.png b/core/resources/pix/icons/down.png
index f3bc4cd09..29cc3aa67 100644
Binary files a/core/resources/pix/icons/down.png and b/core/resources/pix/icons/down.png differ
diff --git a/core/resources/pix/icons/edit-delete.png b/core/resources/pix/icons/edit-delete.png
index d33c34454..34b7d76a5 100644
Binary files a/core/resources/pix/icons/edit-delete.png and b/core/resources/pix/icons/edit-delete.png differ
diff --git a/core/resources/pix/icons/edit-rename.png b/core/resources/pix/icons/edit-rename.png
new file mode 100644
index 000000000..d88fa4147
Binary files /dev/null and b/core/resources/pix/icons/edit-rename.png differ
diff --git a/core/resources/pix/icons/pencil.png b/core/resources/pix/icons/pencil.png
deleted file mode 100644
index 5b8cc893d..000000000
Binary files a/core/resources/pix/icons/pencil.png and /dev/null differ
diff --git a/core/resources/pix/icons/sim-plot.png b/core/resources/pix/icons/sim-plot.png
index 32f27ca7b..268f75a7b 100644
Binary files a/core/resources/pix/icons/sim-plot.png and b/core/resources/pix/icons/sim-plot.png differ
diff --git a/core/resources/pix/icons/sim-run.png b/core/resources/pix/icons/sim-run.png
index 495d6d432..5dab7afe8 100644
Binary files a/core/resources/pix/icons/sim-run.png and b/core/resources/pix/icons/sim-run.png differ
diff --git a/core/resources/pix/icons/up.png b/core/resources/pix/icons/up.png
index 184c118b6..b5b342aba 100644
Binary files a/core/resources/pix/icons/up.png and b/core/resources/pix/icons/up.png differ
diff --git a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
index bea02944f..cdf63e201 100644
--- a/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
+++ b/core/src/net/sf/openrocket/rocketcomponent/FlightConfigurationId.java
@@ -83,12 +83,11 @@ public final class FlightConfigurationId implements Comparable<FlightConfigurati
 		
 	}
 
-	//extracted this method because maybe, just maybe, this info could be used somewhere else
 	/**
 	 * gets if the id is the default
 	 * @return	if the id is default
 	 */
-	private boolean isDefaultId() {
+	public boolean isDefaultId() {
 		return this.key == FlightConfigurationId.DEFAULT_VALUE_UUID;
 	}
 	
diff --git a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java
index cf219dbda..272044bc4 100644
--- a/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java
+++ b/swing/src/net/sf/openrocket/gui/customexpression/CustomExpressionPanel.java
@@ -197,7 +197,7 @@ public class CustomExpressionPanel extends JPanel {
 			//unitSelector = setLabelStyle(unitSelector);
 			//unitSelector.setBackground(Color.WHITE);
 			
-			JButton editButton = new SelectColorButton(Icons.EDIT);
+			JButton editButton = new SelectColorButton(Icons.EDIT_EDIT);
 			editButton.setToolTipText(trans.get("customExpression.Units.but.ttip.Edit"));
 			editButton.setBorderPainted(false);
 			editButton.addActionListener(new ActionListener() {
@@ -234,7 +234,7 @@ public class CustomExpressionPanel extends JPanel {
 			});
 			
 			
-			JButton deleteButton = new SelectColorButton(Icons.DELETE);
+			JButton deleteButton = new SelectColorButton(Icons.EDIT_DELETE);
 			//// Remove this expression
 			deleteButton.setToolTipText(trans.get("customExpression.Units.but.ttip.Delete"));
 			deleteButton.setBorderPainted(false);
diff --git a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
index a0ab3b412..cf2455623 100644
--- a/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
+++ b/swing/src/net/sf/openrocket/gui/main/BasicFrame.java
@@ -62,6 +62,7 @@ import net.sf.openrocket.gui.util.Icons;
 import net.sf.openrocket.gui.util.OpenFileWorker;
 import net.sf.openrocket.gui.util.SaveFileWorker;
 import net.sf.openrocket.gui.util.SwingPreferences;
+import net.sf.openrocket.gui.widgets.IconButton;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.Markers;
 import net.sf.openrocket.rocketcomponent.AxialStage;
diff --git a/swing/src/net/sf/openrocket/gui/main/DesignPanel.java b/swing/src/net/sf/openrocket/gui/main/DesignPanel.java
index 72065c9ed..900ecfcc6 100644
--- a/swing/src/net/sf/openrocket/gui/main/DesignPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/DesignPanel.java
@@ -4,9 +4,8 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.openrocket.document.OpenRocketDocument;
 import net.sf.openrocket.gui.configdialog.ComponentConfigDialog;
 import net.sf.openrocket.gui.main.componenttree.ComponentTree;
-import net.sf.openrocket.gui.scalefigure.RocketPanel;
 import net.sf.openrocket.gui.util.GUIUtil;
-import net.sf.openrocket.gui.widgets.SelectColorButton;
+import net.sf.openrocket.gui.widgets.IconButton;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.rocketcomponent.AxialStage;
 import net.sf.openrocket.rocketcomponent.PodSet;
@@ -23,6 +22,7 @@ import javax.swing.JScrollPane;
 import javax.swing.JSplitPane;
 import javax.swing.KeyStroke;
 import javax.swing.ScrollPaneConstants;
+import javax.swing.SwingConstants;
 import javax.swing.SwingUtilities;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.TreeSelectionEvent;
@@ -183,24 +183,31 @@ public class DesignPanel extends JSplitPane {
 
 
         // Buttons
-        JButton button = new SelectColorButton(parent.getRocketActions().getMoveUpAction());
+        JButton button = new IconButton();
+        button.setHorizontalAlignment(SwingConstants.LEFT);
+        RocketActions.tieActionToButton(button, parent.getRocketActions().getMoveUpAction());
         panel.add(button, "sizegroup buttons, aligny 65%");
 
-        button = new SelectColorButton(parent.getRocketActions().getMoveDownAction());
+        button = new IconButton();
+        button.setHorizontalAlignment(SwingConstants.LEFT);
+        RocketActions.tieActionToButton(button, parent.getRocketActions().getMoveDownAction());
         panel.add(button, "sizegroup buttons, aligny 0%");
 
-        button = new SelectColorButton(parent.getRocketActions().getEditAction());
-        button.setIcon(null);
+        button = new IconButton();
+        button.setHorizontalAlignment(SwingConstants.LEFT);
+        RocketActions.tieActionToButton(button, parent.getRocketActions().getEditAction());
         button.setMnemonic(0);
         panel.add(button, "sizegroup buttons, gaptop 20%");
 
-        button = new SelectColorButton(parent.getRocketActions().getDuplicateAction());
-        button.setIcon(null);
+        button = new IconButton();
+        button.setHorizontalAlignment(SwingConstants.LEFT);
+        RocketActions.tieActionToButton(button, parent.getRocketActions().getDuplicateAction());
         button.setMnemonic(0);
         panel.add(button, "sizegroup buttons");
 
-        button = new SelectColorButton(parent.getRocketActions().getDeleteAction());
-        button.setIcon(null);
+        button = new IconButton();
+        button.setHorizontalAlignment(SwingConstants.LEFT);
+        RocketActions.tieActionToButton(button, parent.getRocketActions().getDeleteAction());
         button.setMnemonic(0);
         panel.add(button, "sizegroup buttons");
 
diff --git a/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java b/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
index e84ff4358..2a417ed11 100644
--- a/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/FlightConfigurationPanel.java
@@ -24,6 +24,8 @@ import net.sf.openrocket.gui.main.flightconfigpanel.FlightConfigurablePanel;
 import net.sf.openrocket.gui.main.flightconfigpanel.MotorConfigurationPanel;
 import net.sf.openrocket.gui.main.flightconfigpanel.RecoveryConfigurationPanel;
 import net.sf.openrocket.gui.main.flightconfigpanel.SeparationConfigurationPanel;
+import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.gui.widgets.IconButton;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
 import net.sf.openrocket.rocketcomponent.FlightConfigurableComponent;
@@ -36,7 +38,6 @@ import net.sf.openrocket.rocketvisitors.ListComponents;
 import net.sf.openrocket.rocketvisitors.ListMotorMounts;
 import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.util.StateChangeListener;
-import net.sf.openrocket.gui.widgets.SelectColorButton;
 
 @SuppressWarnings("serial")
 public class FlightConfigurationPanel extends JPanel implements StateChangeListener {
@@ -98,19 +99,23 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 		tabs.add(trans.get("edtmotorconfdlg.lbl.Stagetab"), separationConfigurationPanel);
 
 		//// New configuration
-		newConfButton = new SelectColorButton(newConfigAction);
+		newConfButton = new IconButton();
+		RocketActions.tieActionToButton(newConfButton, newConfigAction);
 		this.add(newConfButton,"skip 1,gapright para");
 
 		//// Rename configuration
-		renameConfButton = new SelectColorButton(renameConfigAction);
+		renameConfButton = new IconButton();
+		RocketActions.tieActionToButton(renameConfButton, renameConfigAction);
 		this.add(renameConfButton,"gapright para");
 
 		//// Remove configuration
-		removeConfButton = new SelectColorButton(deleteConfigAction);
+		removeConfButton = new IconButton();
+		RocketActions.tieActionToButton(removeConfButton, deleteConfigAction);
 		this.add(removeConfButton,"gapright para");
 
 		//// Duplicate configuration
-		duplicateConfButton = new SelectColorButton(duplicateConfigAction);
+		duplicateConfButton = new IconButton();
+		RocketActions.tieActionToButton(duplicateConfButton, duplicateConfigAction);
 		this.add(duplicateConfButton, "wrap");
 
 		tabs.addChangeListener(new ChangeListener() {
@@ -275,9 +280,10 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	private void updateButtonState() {
 		FlightConfigurationId currentId = rocket.getSelectedConfiguration().getFlightConfigurationID();
 		// Enable the remove/rename/duplicate buttons only when a configuration is selected.
-		removeConfButton.setEnabled(currentId.isValid());
-		renameConfButton.setEnabled(currentId.isValid());
-		duplicateConfButton.setEnabled(currentId.isValid());
+		boolean enabled = currentId.isValid() && !currentId.isDefaultId();
+		removeConfButton.setEnabled(enabled);
+		renameConfButton.setEnabled(enabled);
+		duplicateConfButton.setEnabled(enabled);
 		
 		// Count the number of motor mounts
 		int motorMountCount = rocket.accept(new ListMotorMounts()).size();
@@ -353,6 +359,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	private class NewConfigAction extends AbstractAction {
 		public NewConfigAction() {
 			putValue(NAME, trans.get("edtmotorconfdlg.but.Newconfiguration"));
+			putValue(LARGE_ICON_KEY, Icons.FILE_NEW);
 		}
 
 		@Override
@@ -364,6 +371,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	private class RenameConfigAction extends AbstractAction {
 		public RenameConfigAction() {
 			putValue(NAME, trans.get("edtmotorconfdlg.but.Renameconfiguration"));
+			putValue(SMALL_ICON, Icons.EDIT_RENAME);
 		}
 
 		@Override
@@ -375,6 +383,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	private class DeleteConfigAction extends AbstractAction {
 		public DeleteConfigAction() {
 			putValue(NAME, trans.get("edtmotorconfdlg.but.Deleteconfiguration"));
+			putValue(SMALL_ICON, Icons.EDIT_DELETE);
 		}
 
 		@Override
@@ -386,6 +395,7 @@ public class FlightConfigurationPanel extends JPanel implements StateChangeListe
 	private class DuplicateConfigAction extends AbstractAction {
 		public DuplicateConfigAction() {
 			putValue(NAME, trans.get("edtmotorconfdlg.but.Duplicateconfiguration"));
+			putValue(SMALL_ICON, Icons.EDIT_DUPLICATE);
 		}
 
 		@Override
diff --git a/swing/src/net/sf/openrocket/gui/main/RocketActions.java b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
index 070b18ee7..41b99a93f 100644
--- a/swing/src/net/sf/openrocket/gui/main/RocketActions.java
+++ b/swing/src/net/sf/openrocket/gui/main/RocketActions.java
@@ -25,6 +25,7 @@ import net.sf.openrocket.gui.components.StyledLabel;
 import net.sf.openrocket.gui.configdialog.ComponentConfigDialog;
 import net.sf.openrocket.gui.dialogs.ScaleDialog;
 import net.sf.openrocket.gui.util.Icons;
+import net.sf.openrocket.gui.widgets.IconButton;
 import net.sf.openrocket.l10n.Translator;
 import net.sf.openrocket.logging.Markers;
 import net.sf.openrocket.rocketcomponent.ComponentChangeEvent;
@@ -75,7 +76,6 @@ public class RocketActions {
 	private final RocketAction duplicateAction;
 	private final RocketAction editAction;
 	private final RocketAction scaleAction;
-	private final RocketAction newStageAction;
 	private final RocketAction moveUpAction;
 	private final RocketAction moveDownAction;
 	private static final Translator trans = Application.getTranslator();
@@ -100,7 +100,6 @@ public class RocketActions {
 		this.duplicateAction = new DuplicateAction();
 		this.editAction = new EditAction();
 		this.scaleAction = new ScaleAction();
-		this.newStageAction = new NewStageAction();
 		this.moveUpAction = new MoveUpAction();
 		this.moveDownAction = new MoveDownAction();
 
@@ -134,7 +133,6 @@ public class RocketActions {
 		duplicateAction.clipboardChanged();
 		editAction.clipboardChanged();
 		scaleAction.clipboardChanged();
-		newStageAction.clipboardChanged();
 		moveUpAction.clipboardChanged();
 		moveDownAction.clipboardChanged();
 	}
@@ -178,10 +176,6 @@ public class RocketActions {
 		return scaleAction;
 	}
 	
-	public Action getNewStageAction() {
-		return newStageAction;
-	}
-	
 	public Action getMoveUpAction() {
 		return moveUpAction;
 	}
@@ -219,6 +213,34 @@ public class RocketActions {
 		button.setAction(action);
 		button.setIcon(null);
 	}
+
+	/**
+	 * Tie an action to a JButton, without using the text of the action for the button.
+	 *
+	 * For any smartass that wants to know why you don't just initialize the JButton with the action:
+	 * this causes a bug where the text of the icon becomes much smaller than is intended.
+	 *
+	 * @param button button to tie the action to
+	 * @param action action to tie to the button
+	 * @param text text to display on the button
+	 */
+	public static void tieActionToButton(JButton button, Action action, String text) {
+		button.setAction(action);
+		button.setText(text);
+	}
+
+	/**
+	 * Tie an action to a JButton.
+	 *
+	 * For any smartass that wants to know why you don't just initialize the JButton with the action:
+	 * this causes a bug where the text of the icon becomes much smaller than is intended.
+	 *
+	 * @param button button to tie the action to
+	 * @param action action to tie to the button
+	 */
+	public static void tieActionToButton(JButton button, Action action) {
+		button.setAction(action);
+	}
 	
 	
 	////////  Helper methods for the actions
@@ -1009,46 +1031,6 @@ public class RocketActions {
 		}
 	}
 	
-	
-	
-	
-	
-	/**
-	 * Action to add a new stage to the rocket.
-	 */
-	private class NewStageAction extends RocketAction {
-		private static final long serialVersionUID = 1L;
-
-		public NewStageAction() {
-			//// New stage
-			this.putValue(NAME, trans.get("RocketActions.NewStageAct.Newstage"));
-			//// Add a new stage to the rocket design.
-			this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.NewStageAct.Newstage"));
-			clipboardChanged();
-		}
-
-		@Override
-		public void actionPerformed(ActionEvent e) {
-			
-			ComponentConfigDialog.disposeDialog();
-
-			RocketComponent stage = new AxialStage();
-
-			//// Add stage
-			document.addUndoPosition("Add stage");
-			rocket.addChild(stage);
-			rocket.getSelectedConfiguration().setAllStages();
-			selectionModel.setSelectedComponent(stage);
-			ComponentConfigDialog.showDialog(parentFrame, document, stage);
-			
-		}
-
-		@Override
-		public void clipboardChanged() {
-			this.setEnabled(true);
-		}
-	}
-
 
 
 	
@@ -1061,6 +1043,7 @@ public class RocketActions {
 		public MoveUpAction() {
 			//// Move up
 			this.putValue(NAME, trans.get("RocketActions.MoveUpAct.Moveup"));
+			this.putValue(SMALL_ICON, Icons.UP);
 			//// Move this component upwards.
 			this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.MoveUpAct.ttip.Moveup"));
 			clipboardChanged();
@@ -1136,6 +1119,7 @@ public class RocketActions {
 		public MoveDownAction() {
 			//// Move down
 			this.putValue(NAME, trans.get("RocketActions.MoveDownAct.Movedown"));
+			this.putValue(SMALL_ICON, Icons.DOWN);
 			//// Move this component downwards.
 			this.putValue(SHORT_DESCRIPTION, trans.get("RocketActions.MoveDownAct.ttip.Movedown"));
 			clipboardChanged();
diff --git a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
index d287d26fa..bd6ad592e 100644
--- a/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
+++ b/swing/src/net/sf/openrocket/gui/main/SimulationPanel.java
@@ -10,7 +10,6 @@ import java.awt.datatransfer.StringSelection;
 import java.awt.datatransfer.Transferable;
 import java.awt.datatransfer.UnsupportedFlavorException;
 import java.awt.event.ActionEvent;
-import java.awt.event.ActionListener;
 import java.awt.event.InputEvent;
 import java.awt.event.KeyEvent;
 import java.awt.event.MouseAdapter;
@@ -38,6 +37,7 @@ import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
 import javax.swing.table.DefaultTableCellRenderer;
 
+import net.sf.openrocket.gui.widgets.IconButton;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,7 +71,6 @@ import net.sf.openrocket.startup.Application;
 import net.sf.openrocket.startup.Preferences;
 import net.sf.openrocket.unit.UnitGroup;
 import net.sf.openrocket.util.AlphanumComparator;
-import net.sf.openrocket.gui.widgets.SelectColorButton;
 
 @SuppressWarnings("serial")
 public class SimulationPanel extends JPanel {
@@ -126,32 +125,32 @@ public class SimulationPanel extends JPanel {
 		////////  The simulation action buttons ////////
 
 		//// New simulation button
-		JButton newButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(newButton, newSimulationAction, trans.get("simpanel.but.newsimulation"));
+		JButton newButton = new IconButton();
+		RocketActions.tieActionToButton(newButton, newSimulationAction, trans.get("simpanel.but.newsimulation"));
 		newButton.setToolTipText(trans.get("simpanel.but.ttip.newsimulation"));
 		this.add(newButton, "skip 1, gapright para");
 
 		//// Edit simulation button
-		editButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(editButton, editSimulationAction, trans.get("simpanel.but.editsimulation"));
+		editButton = new IconButton();
+		RocketActions.tieActionToButton(editButton, editSimulationAction, trans.get("simpanel.but.editsimulation"));
 		editButton.setToolTipText(trans.get("simpanel.but.ttip.editsim"));
 		this.add(editButton, "gapright para");
 
 		//// Run simulations
-		runButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(runButton, runSimulationAction, trans.get("simpanel.but.runsimulations"));
+		runButton = new IconButton();
+		RocketActions.tieActionToButton(runButton, runSimulationAction, trans.get("simpanel.but.runsimulations"));
 		runButton.setToolTipText(trans.get("simpanel.but.ttip.runsimu"));
 		this.add(runButton, "gapright para");
 
 		//// Delete simulations button
-		deleteButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(deleteButton, deleteSimulationAction, trans.get("simpanel.but.deletesimulations"));
+		deleteButton = new IconButton();
+		RocketActions.tieActionToButton(deleteButton, deleteSimulationAction, trans.get("simpanel.but.deletesimulations"));
 		deleteButton.setToolTipText(trans.get("simpanel.but.ttip.deletesim"));
 		this.add(deleteButton, "gapright para");
 
 		//// Plot / export button
-		plotButton = new SelectColorButton();
-		RocketActions.tieActionToButtonNoIcon(plotButton, plotSimulationAction, trans.get("simpanel.but.plotexport"));
+		plotButton = new IconButton();
+		RocketActions.tieActionToButton(plotButton, plotSimulationAction, trans.get("simpanel.but.plotexport"));
 		this.add(plotButton, "wrap para");
 
 
diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java
index a84d08f82..00cdb5e35 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationOptionsPanel.java
@@ -375,7 +375,7 @@ class SimulationOptionsPanel extends JPanel {
 				this.add(button, "right");
 			}
 			
-			button = new SelectColorButton(Icons.DELETE);
+			button = new SelectColorButton(Icons.EDIT_DELETE);
 			button.addActionListener(new ActionListener() {
 				@Override
 				public void actionPerformed(ActionEvent arg0) {
diff --git a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
index db64ba5a7..da516379c 100644
--- a/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
+++ b/swing/src/net/sf/openrocket/gui/simulation/SimulationPlotPanel.java
@@ -464,7 +464,7 @@ public class SimulationPlotPanel extends JPanel {
 			this.add(axisSelector);
 			
 			
-			JButton button = new SelectColorButton(Icons.DELETE);
+			JButton button = new SelectColorButton(Icons.EDIT_DELETE);
 			//// Remove this plot
 			button.setToolTipText(trans.get("simplotpanel.but.ttip.Deletethisplot"));
 			button.setBorderPainted(false);
diff --git a/swing/src/net/sf/openrocket/gui/util/Icons.java b/swing/src/net/sf/openrocket/gui/util/Icons.java
index 5478bff00..cf91c65b0 100644
--- a/swing/src/net/sf/openrocket/gui/util/Icons.java
+++ b/swing/src/net/sf/openrocket/gui/util/Icons.java
@@ -7,6 +7,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import javax.swing.*;
+import java.awt.Component;
+import java.awt.Graphics;
+import java.awt.Image;
 import java.net.URL;
 import java.util.Collections;
 import java.util.HashMap;
@@ -59,6 +62,7 @@ public class Icons {
 	public static final Icon EDIT_UNDO = loadImageIcon("pix/icons/edit-undo.png", trans.get("Icons.Undo"));
 	public static final Icon EDIT_REDO = loadImageIcon("pix/icons/edit-redo.png", trans.get("Icons.Redo"));
 	public static final Icon EDIT_EDIT = loadImageIcon("pix/icons/edit-edit.png", "Edit");
+	public static final Icon EDIT_RENAME = loadImageIcon("pix/icons/edit-rename.png", "Rename");
 	public static final Icon EDIT_CUT = loadImageIcon("pix/icons/edit-cut.png", "Cut");
 	public static final Icon EDIT_COPY = loadImageIcon("pix/icons/edit-copy.png", "Copy");
 	public static final Icon EDIT_PASTE = loadImageIcon("pix/icons/edit-paste.png", "Paste");
@@ -81,8 +85,6 @@ public class Icons {
 	
 	public static final Icon PREFERENCES = loadImageIcon("pix/icons/preferences.png", "Preferences");
 	
-	public static final Icon DELETE = loadImageIcon("pix/icons/delete.png", "Delete");
-	public static final Icon EDIT = loadImageIcon("pix/icons/pencil.png", "Edit");
 	public static final Icon CONFIGURE = loadImageIcon("pix/icons/configure.png", "Configure");
 	public static final Icon HELP = loadImageIcon("pix/icons/help-about.png", "Help");
 	public static final Icon UP = loadImageIcon("pix/icons/up.png", "Up");
@@ -124,4 +126,33 @@ public class Icons {
 		}
 		return new ImageIcon(url, name);
 	}
+
+	/**
+	 * Scales an ImageIcon to the specified scale.
+	 * @param icon icon to scale
+	 * @param scale the scale to scale to (1 = no scale, < 1 = smaller, > 1 = bigger)
+	 * @return scaled down icon. If <icon> is not an ImageIcon, the original icon is returned.
+	 */
+	public static Icon getScaledIcon(Icon icon, final double scale) {
+		if (!(icon instanceof ImageIcon)) {
+			return icon;
+		}
+		final Image image = ((ImageIcon) icon).getImage();
+		return new ImageIcon(image) {
+			@Override
+			public int getIconWidth() {
+				return (int)(image.getWidth(null) * scale);
+			}
+
+			@Override
+			public int getIconHeight() {
+				return (int)(image.getHeight(null) * scale);
+			}
+
+			@Override
+			public void paintIcon(Component c, Graphics g, int x, int y) {
+				g.drawImage(image, x, y, getIconWidth(), getIconHeight(), c);
+			}
+		};
+	}
 }
diff --git a/swing/src/net/sf/openrocket/gui/widgets/IconButton.java b/swing/src/net/sf/openrocket/gui/widgets/IconButton.java
new file mode 100644
index 000000000..a48da582b
--- /dev/null
+++ b/swing/src/net/sf/openrocket/gui/widgets/IconButton.java
@@ -0,0 +1,70 @@
+package net.sf.openrocket.gui.widgets;
+
+import net.sf.openrocket.gui.util.Icons;
+
+import javax.swing.Action;
+import javax.swing.Icon;
+
+/**
+ * Button specifically for displaying an icon.
+ *
+ * @author Sibo Van Gool <sibo.vangool@hotmail.com>
+ */
+public class IconButton extends SelectColorButton {
+    private static final int ICON_GAP = 10;
+    private static final double ICON_SCALE = 0.9;
+
+    public IconButton() {
+        setIconTextGap(ICON_GAP);
+    }
+
+    public IconButton(Icon icon) {
+        super(icon);
+        setIconTextGap(ICON_GAP);
+    }
+
+    public IconButton(String text) {
+        super(text);
+        setIconTextGap(ICON_GAP);
+    }
+
+    public IconButton(Action a) {
+        super(a);
+        setIconTextGap(ICON_GAP);
+    }
+
+    public IconButton(String text, Icon icon) {
+        super(text, icon);
+        setIconTextGap(ICON_GAP);
+    }
+
+    @Override
+    public Icon getIcon() {
+        return Icons.getScaledIcon(super.getIcon(), IconButton.ICON_SCALE);
+    }
+
+    @Override
+    public Icon getSelectedIcon() {
+        return Icons.getScaledIcon(super.getSelectedIcon(), IconButton.ICON_SCALE);
+    }
+
+    @Override
+    public Icon getDisabledIcon() {
+        return Icons.getScaledIcon(super.getDisabledIcon(), IconButton.ICON_SCALE);
+    }
+
+    @Override
+    public Icon getDisabledSelectedIcon() {
+        return Icons.getScaledIcon(super.getDisabledSelectedIcon(), IconButton.ICON_SCALE);
+    }
+
+    @Override
+    public Icon getRolloverIcon() {
+        return Icons.getScaledIcon(super.getRolloverIcon(), IconButton.ICON_SCALE);
+    }
+
+    @Override
+    public Icon getRolloverSelectedIcon() {
+        return Icons.getScaledIcon(super.getRolloverSelectedIcon(), IconButton.ICON_SCALE);
+    }
+}