diff --git a/source/net/filebot/resources/action.select.png b/source/net/filebot/resources/action.select.png
new file mode 100644
index 00000000..6e1c9174
Binary files /dev/null and b/source/net/filebot/resources/action.select.png differ
diff --git a/source/net/filebot/resources/action.select@2x.png b/source/net/filebot/resources/action.select@2x.png
new file mode 100644
index 00000000..1dec0a2f
Binary files /dev/null and b/source/net/filebot/resources/action.select@2x.png differ
diff --git a/source/net/filebot/resources/arrow.down.png b/source/net/filebot/resources/arrow.down.png
deleted file mode 100644
index 3bc77345..00000000
Binary files a/source/net/filebot/resources/arrow.down.png and /dev/null differ
diff --git a/source/net/filebot/resources/search.shooter@2x.png b/source/net/filebot/resources/search.shooter@2x.png
new file mode 100644
index 00000000..c546c210
Binary files /dev/null and b/source/net/filebot/resources/search.shooter@2x.png differ
diff --git a/source/net/filebot/ui/subtitle/SimpleComboBox.java b/source/net/filebot/ui/subtitle/SimpleComboBox.java
index 2933c204..20e5c1a8 100644
--- a/source/net/filebot/ui/subtitle/SimpleComboBox.java
+++ b/source/net/filebot/ui/subtitle/SimpleComboBox.java
@@ -5,26 +5,31 @@ import static javax.swing.BorderFactory.*;
 import java.awt.Color;
 import java.awt.Rectangle;
 
+import javax.swing.Icon;
 import javax.swing.JButton;
 import javax.swing.JComboBox;
 import javax.swing.plaf.basic.BasicComboBoxUI;
 import javax.swing.plaf.basic.BasicComboPopup;
 import javax.swing.plaf.basic.ComboPopup;
 
-import net.filebot.ResourceManager;
-
 public class SimpleComboBox extends JComboBox {
 
-	public SimpleComboBox() {
-		setUI(new SimpleComboBoxUI());
+	public SimpleComboBox(Icon dropDownArrowIcon) {
+		setUI(new SimpleComboBoxUI(dropDownArrowIcon));
 		setBorder(createEmptyBorder());
 	}
 
 	private static class SimpleComboBoxUI extends BasicComboBoxUI {
 
+		private final Icon dropDownArrowIcon;
+
+		public SimpleComboBoxUI(Icon dropDownArrowIcon) {
+			this.dropDownArrowIcon = dropDownArrowIcon;
+		}
+
 		@Override
 		protected JButton createArrowButton() {
-			JButton button = new JButton(ResourceManager.getIcon("arrow.down"));
+			JButton button = new JButton(dropDownArrowIcon);
 			button.setContentAreaFilled(false);
 			button.setBorderPainted(false);
 			button.setFocusPainted(false);
diff --git a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
index 2039675c..9e1c1019 100644
--- a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
+++ b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
@@ -130,7 +130,7 @@ class SubtitleAutoMatchDialog extends JDialog {
 		table.setAutoCreateRowSorter(true);
 		table.setFillsViewportHeight(true);
 
-		JComboBox editor = new SimpleComboBox();
+		JComboBox editor = new SimpleComboBox(ResourceManager.getIcon("action.select"));
 		editor.setRenderer(new SubtitleOptionRenderer(true));
 
 		// disable selection
@@ -361,7 +361,7 @@ class SubtitleAutoMatchDialog extends JDialog {
 
 	private static class SubtitleMappingOptionRenderer extends DefaultTableCellRenderer {
 
-		private final JComboBox optionComboBox = new SimpleComboBox();
+		private final JComboBox optionComboBox = new SimpleComboBox(ResourceManager.getIcon("action.select"));
 
 		public SubtitleMappingOptionRenderer() {
 			optionComboBox.setBackground(Color.white);