diff --git a/source/net/filebot/ui/rename/BindingDialog.java b/source/net/filebot/ui/rename/BindingDialog.java
index ba46c653..acdf819e 100644
--- a/source/net/filebot/ui/rename/BindingDialog.java
+++ b/source/net/filebot/ui/rename/BindingDialog.java
@@ -270,7 +270,7 @@ class BindingDialog extends JDialog {
 		}
 	};
 
-	protected final Action mediaInfoAction = new AbstractAction("Info", ResourceManager.getIcon("action.properties")) {
+	protected final Action mediaInfoAction = new AbstractAction("Open MediaInfo", ResourceManager.getIcon("action.properties")) {
 
 		private Map<StreamKind, List<Map<String, String>>> getMediaInfo(File file) {
 			try {
diff --git a/source/net/filebot/ui/rename/MatchAction.java b/source/net/filebot/ui/rename/MatchAction.java
index f94856b8..8fe04a90 100644
--- a/source/net/filebot/ui/rename/MatchAction.java
+++ b/source/net/filebot/ui/rename/MatchAction.java
@@ -39,7 +39,6 @@ class MatchAction extends AbstractAction {
 
 	public void setMatchMode(boolean strict) {
 		putValue(NAME, "Match");
-		putValue(SHORT_DESCRIPTION, "Match files and names");
 		putValue(SMALL_ICON, ResourceManager.getIcon(strict ? "action.match.strict" : "action.match"));
 	}
 
diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java
index a28f488c..b05c337c 100644
--- a/source/net/filebot/ui/rename/RenamePanel.java
+++ b/source/net/filebot/ui/rename/RenamePanel.java
@@ -160,7 +160,7 @@ public class RenamePanel extends JComponent {
 		new ScrollPaneSynchronizer(namesList, filesList);
 
 		// delete items from both lists
-		Action removeAction = new AbstractAction("Remove", ResourceManager.getIcon("dialog.cancel")) {
+		Action removeAction = new AbstractAction("Exclude Selected Items", ResourceManager.getIcon("dialog.cancel")) {
 
 			@Override
 			public void actionPerformed(ActionEvent e) {
@@ -546,7 +546,7 @@ public class RenamePanel extends JComponent {
 		}
 	}
 
-	protected final Action clearFilesAction = new AbstractAction("Clear", ResourceManager.getIcon("action.clear")) {
+	protected final Action clearFilesAction = new AbstractAction("Clear All", ResourceManager.getIcon("action.clear")) {
 
 		@Override
 		public void actionPerformed(ActionEvent evt) {
diff --git a/source/net/filebot/ui/subtitle/SubtitlePanel.java b/source/net/filebot/ui/subtitle/SubtitlePanel.java
index 9604b7d6..6d58e046 100644
--- a/source/net/filebot/ui/subtitle/SubtitlePanel.java
+++ b/source/net/filebot/ui/subtitle/SubtitlePanel.java
@@ -246,7 +246,7 @@ public class SubtitlePanel extends AbstractSearchPanel<SubtitleProvider, Subtitl
 
 	}
 
-	protected final Action setUserAction = new AbstractAction("Set User", ResourceManager.getIcon("action.user")) {
+	protected final Action setUserAction = new AbstractAction("Login", ResourceManager.getIcon("action.user")) {
 
 		@Override
 		public void actionPerformed(ActionEvent evt) {
diff --git a/source/net/filebot/util/ui/SwingUI.java b/source/net/filebot/util/ui/SwingUI.java
index 49874fd3..1b198750 100644
--- a/source/net/filebot/util/ui/SwingUI.java
+++ b/source/net/filebot/util/ui/SwingUI.java
@@ -87,6 +87,7 @@ public final class SwingUI {
 	public static JButton createImageButton(Action action) {
 		JButton button = new JButton(action);
 		button.setHideActionText(true);
+		button.setToolTipText(String.valueOf(action.getValue(Action.NAME)));
 		button.setOpaque(false);
 
 		return button;