diff --git a/source/net/filebot/resources/action.folder.png b/source/net/filebot/resources/action.folder.png
index 5d2655e4..db20061b 100644
Binary files a/source/net/filebot/resources/action.folder.png and b/source/net/filebot/resources/action.folder.png differ
diff --git a/source/net/filebot/resources/action.folder@2x.png b/source/net/filebot/resources/action.folder@2x.png
new file mode 100644
index 00000000..12939f6b
Binary files /dev/null and b/source/net/filebot/resources/action.folder@2x.png differ
diff --git a/source/net/filebot/resources/action.load@2x.png b/source/net/filebot/resources/action.load@2x.png
index 905eb865..20898107 100644
Binary files a/source/net/filebot/resources/action.load@2x.png and b/source/net/filebot/resources/action.load@2x.png differ
diff --git a/source/net/filebot/resources/action.variable.png b/source/net/filebot/resources/action.variable.png
deleted file mode 100644
index c3cd6955..00000000
Binary files a/source/net/filebot/resources/action.variable.png and /dev/null differ
diff --git a/source/net/filebot/resources/action.variables.png b/source/net/filebot/resources/action.variables.png
new file mode 100644
index 00000000..b5ff5ef3
Binary files /dev/null and b/source/net/filebot/resources/action.variables.png differ
diff --git a/source/net/filebot/resources/action.variables@2x.png b/source/net/filebot/resources/action.variables@2x.png
new file mode 100644
index 00000000..67c336ab
Binary files /dev/null and b/source/net/filebot/resources/action.variables@2x.png differ
diff --git a/source/net/filebot/resources/button.repeat.png b/source/net/filebot/resources/button.repeat.png
index 1c4f57a1..cae00264 100644
Binary files a/source/net/filebot/resources/button.repeat.png and b/source/net/filebot/resources/button.repeat.png differ
diff --git a/source/net/filebot/resources/button.repeat.selected.png b/source/net/filebot/resources/button.repeat.selected.png
index 406ec333..f64d67db 100644
Binary files a/source/net/filebot/resources/button.repeat.selected.png and b/source/net/filebot/resources/button.repeat.selected.png differ
diff --git a/source/net/filebot/resources/button.repeat.selected@2x.png b/source/net/filebot/resources/button.repeat.selected@2x.png
new file mode 100644
index 00000000..e9f54903
Binary files /dev/null and b/source/net/filebot/resources/button.repeat.selected@2x.png differ
diff --git a/source/net/filebot/resources/button.repeat@2x.png b/source/net/filebot/resources/button.repeat@2x.png
new file mode 100644
index 00000000..30db43f5
Binary files /dev/null and b/source/net/filebot/resources/button.repeat@2x.png differ
diff --git a/source/net/filebot/ui/rename/BindingDialog.java b/source/net/filebot/ui/rename/BindingDialog.java
index 5f4711c6..e2f76a8a 100644
--- a/source/net/filebot/ui/rename/BindingDialog.java
+++ b/source/net/filebot/ui/rename/BindingDialog.java
@@ -369,7 +369,7 @@ class BindingDialog extends JDialog {
 
 	};
 
-	protected final Action selectFileAction = new AbstractAction("Select Media File", ResourceManager.getIcon("action.load")) {
+	protected final Action selectFileAction = new AbstractAction("Select Media File", ResourceManager.getIcon("action.folder")) {
 
 		@Override
 		public void actionPerformed(ActionEvent evt) {
diff --git a/source/net/filebot/ui/rename/FormatDialog.java b/source/net/filebot/ui/rename/FormatDialog.java
index 0a171ec6..6f2c53ba 100644
--- a/source/net/filebot/ui/rename/FormatDialog.java
+++ b/source/net/filebot/ui/rename/FormatDialog.java
@@ -212,9 +212,9 @@ public class FormatDialog extends JDialog {
 		editorScrollPane.setOpaque(true);
 
 		content.add(editorScrollPane, "w 120px:min(pref, 420px), h 40px!, growx, wrap 4px, id editor");
-		content.add(createImageButton(changeSampleAction), "sg action, w 25!, h 19!, pos n editor.y2+1 editor.x2 n");
-		content.add(createImageButton(selectFolderAction), "sg action, w 25!, h 19!, pos n editor.y2+1 editor.x2-(27*1) n");
-		content.add(createImageButton(showRecentAction), "sg action, w 25!, h 19!, pos n editor.y2+1 editor.x2-(27*2) n");
+		content.add(createImageButton(changeSampleAction), "sg action, w 25!, h 19!, pos n editor.y2+2 editor.x2 n");
+		content.add(createImageButton(selectFolderAction), "sg action, w 25!, h 19!, pos n editor.y2+2 editor.x2-(27*1) n");
+		content.add(createImageButton(showRecentAction), "sg action, w 25!, h 19!, pos n editor.y2+2 editor.x2-(27*2) n");
 
 		content.add(help, "growx, wrap 25px:push");
 
@@ -644,7 +644,7 @@ public class FormatDialog extends JDialog {
 		return popup;
 	}
 
-	protected final Action changeSampleAction = new AbstractAction("Change Sample", ResourceManager.getIcon("action.variable")) {
+	protected final Action changeSampleAction = new AbstractAction("Change Sample", ResourceManager.getIcon("action.variables")) {
 
 		@Override
 		public void actionPerformed(ActionEvent evt) {