diff --git a/source/net/filebot/ui/rename/RenameList.java b/source/net/filebot/ui/rename/RenameList.java
index 6f90bfbc..54fe8299 100644
--- a/source/net/filebot/ui/rename/RenameList.java
+++ b/source/net/filebot/ui/rename/RenameList.java
@@ -42,9 +42,9 @@ class RenameList<E> extends FileBotList<E> {
 		getRemoveAction().setEnabled(true);
 
 		buttonPanel = new JPanel(new MigLayout("insets 1.2mm, nogrid, novisualpadding, fill", "align center"));
-		buttonPanel.add(createImageButton(downAction), "gap 10px");
-		buttonPanel.add(createImageButton(upAction), "gap 0");
-		buttonPanel.add(createLoadButton(), "gap 10px");
+		buttonPanel.add(createImageButton(downAction), "gap 10px, sgy button");
+		buttonPanel.add(createImageButton(upAction), "gap 0, sgy button");
+		buttonPanel.add(createLoadButton(), "gap 10px, sgy button");
 
 		add(buttonPanel, BorderLayout.SOUTH);
 
diff --git a/source/net/filebot/ui/rename/RenamePanel.java b/source/net/filebot/ui/rename/RenamePanel.java
index 2b6882f8..1a8926bd 100644
--- a/source/net/filebot/ui/rename/RenamePanel.java
+++ b/source/net/filebot/ui/rename/RenamePanel.java
@@ -229,7 +229,7 @@ public class RenamePanel extends JComponent {
 		namesList.getListComponent().setComponentPopupMenu(fetchPopup);
 		fetchButton.setComponentPopupMenu(fetchPopup);
 		matchButton.setComponentPopupMenu(fetchPopup);
-		namesList.getButtonPanel().add(fetchButton, "gap 0");
+		namesList.getButtonPanel().add(fetchButton, "gap 0, sgy button");
 
 		namesList.getListComponent().setComponentPopupMenu(fetchPopup);
 		fetchButton.setComponentPopupMenu(fetchPopup);
@@ -240,16 +240,16 @@ public class RenamePanel extends JComponent {
 		JButton settingsButton = createImageButton(settingsPopupAction);
 		settingsButton.setComponentPopupMenu(settingsPopup);
 		renameButton.setComponentPopupMenu(settingsPopup);
-		namesList.getButtonPanel().add(settingsButton, "gap indent");
+		namesList.getButtonPanel().add(settingsButton, "gap indent, sgy button");
 
 		// open rename log button
-		filesList.getButtonPanel().add(createImageButton(removeAction), "gap 0", 2);
-		filesList.getButtonPanel().add(createImageButton(clearFilesAction), "gap 0");
-		filesList.getButtonPanel().add(createImageButton(openHistoryAction), "gap indent");
+		filesList.getButtonPanel().add(createImageButton(removeAction), "gap 0, sgy button", 2);
+		filesList.getButtonPanel().add(createImageButton(clearFilesAction), "gap 0, sgy button");
+		filesList.getButtonPanel().add(createImageButton(openHistoryAction), "gap indent, sgy button");
 
 		// create macros popup
 		JButton presetsButton = createImageButton(new ShowPresetsPopupAction());
-		filesList.getButtonPanel().add(presetsButton, "gap 0");
+		filesList.getButtonPanel().add(presetsButton, "gap 0, sgy button");
 
 		// show popup on actionPerformed only when names list is empty
 		matchButton.addActionListener(evt -> {