diff --git a/source/net/filebot/ResourceManager.java b/source/net/filebot/ResourceManager.java
index 23750d11..c6a68788 100644
--- a/source/net/filebot/ResourceManager.java
+++ b/source/net/filebot/ResourceManager.java
@@ -27,6 +27,10 @@ public final class ResourceManager {
 	}
 
 	private static Icon getIcon(List<String> icons) {
+		if (icons.isEmpty()) {
+			return null;
+		}
+
 		return cache.computeIfAbsent(icons.get(0), i -> {
 			// load image
 			URL[] resource = getMultiResolutionImageResource(i);
@@ -35,11 +39,7 @@ public final class ResourceManager {
 			}
 
 			// try next image
-			if (icons.size() > 0) {
-				return getIcon(icons.subList(1, icons.size()));
-			}
-
-			return null;
+			return getIcon(icons.subList(1, icons.size()));
 		});
 	}
 
diff --git a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
index a5bf2a6f..cb7318d0 100644
--- a/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
+++ b/source/net/filebot/ui/subtitle/SubtitleAutoMatchDialog.java
@@ -37,7 +37,6 @@ import java.util.logging.Level;
 
 import javax.swing.AbstractAction;
 import javax.swing.Action;
-import javax.swing.BorderFactory;
 import javax.swing.DefaultCellEditor;
 import javax.swing.DefaultComboBoxModel;
 import javax.swing.DefaultListCellRenderer;
@@ -169,8 +168,8 @@ class SubtitleAutoMatchDialog extends JDialog {
 	}
 
 	protected void addSubtitleService(final SubtitleServiceBean service, final JPanel servicePanel) {
-		final LinkButton component = new LinkButton(service.getDescription(), null, ResourceManager.getIcon("database"), service.getLink());
-		component.setBorder(BorderFactory.createEmptyBorder());
+		LinkButton component = new LinkButton(service.getDescription(), null, ResourceManager.getIcon("database.go"), service.getLink());
+		component.setBorder(createEmptyBorder());
 		component.setVisible(false);
 
 		service.addPropertyChangeListener(evt -> {