diff --git a/intl/msg_hash_ja.h b/intl/msg_hash_ja.h
index a8e823afb7..d4c8627c33 100644
--- a/intl/msg_hash_ja.h
+++ b/intl/msg_hash_ja.h
@@ -3756,7 +3756,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT_CONTRIBUTORS,
       "作成者")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_CURRENT_SHADER,
       "現在のシェーダー")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_DOWN,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MOVE_DOWN,
       "下へ移動")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_UP,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MOVE_UP,
       "上へ移動")
diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h
index 729bc127de..c1a98f01ac 100644
--- a/intl/msg_hash_us.h
+++ b/intl/msg_hash_us.h
@@ -4258,7 +4258,7 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MENU_HELP_ABOUT_CONTRIBUTORS,
       "Contributors")
 MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_CURRENT_SHADER,
       "Current shader")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_DOWN,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MOVE_DOWN,
       "Move Down")
-MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_UP,
+MSG_HASH(MENU_ENUM_LABEL_VALUE_QT_MOVE_UP,
       "Move Up")
diff --git a/msg_hash.h b/msg_hash.h
index de082a40af..1c7837abf9 100644
--- a/msg_hash.h
+++ b/msg_hash.h
@@ -1980,8 +1980,8 @@ enum msg_hash_enums
    MENU_ENUM_LABEL_VALUE_QT_UPDATE_RETROARCH_FINISHED,
    MENU_ENUM_LABEL_VALUE_QT_UPDATE_RETROARCH_FAILED,
    MENU_ENUM_LABEL_VALUE_QT_CURRENT_SHADER,
-   MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_DOWN,
-   MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_UP,
+   MENU_ENUM_LABEL_VALUE_QT_MOVE_DOWN,
+   MENU_ENUM_LABEL_VALUE_QT_MOVE_UP,
 
    MENU_LABEL(MIDI_INPUT),
    MENU_LABEL(MIDI_OUTPUT),
diff --git a/ui/drivers/qt/shaderparamsdialog.cpp b/ui/drivers/qt/shaderparamsdialog.cpp
index fbd48501b7..23f2fc8c95 100644
--- a/ui/drivers/qt/shaderparamsdialog.cpp
+++ b/ui/drivers/qt/shaderparamsdialog.cpp
@@ -10,6 +10,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QPushButton>
+#include <QToolButton>
 
 #include "shaderparamsdialog.h"
 #include "../ui_qt.h"
@@ -418,28 +419,32 @@ void ShaderParamsDialog::reload()
       QHBoxLayout *filterScaleHBoxLayout = NULL;
       QComboBox *filterComboBox = new QComboBox();
       QComboBox *scaleComboBox = new QComboBox();
-      QPushButton *moveDownButton = NULL;
-      QPushButton *moveUpButton = NULL;
+      QToolButton *moveDownButton = NULL;
+      QToolButton *moveUpButton = NULL;
       unsigned j = 0;
 
       filterComboBox->setProperty("pass", i);
       scaleComboBox->setProperty("pass", i);
 
+      moveDownButton = new QToolButton();
+      moveDownButton->setText("↓");
+      moveDownButton->setProperty("pass", i);
+
+      moveUpButton = new QToolButton();
+      moveUpButton->setText("↑");
+      moveUpButton->setProperty("pass", i);
+
       /* Can't move down if we're already at the bottom. */
       if (i < static_cast<int>(video_shader->passes) - 1)
-      {
-         moveDownButton = new QPushButton(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_DOWN));
-         moveDownButton->setProperty("pass", i);
          connect(moveDownButton, SIGNAL(clicked()), this, SLOT(onShaderPassMoveDownClicked()));
-      }
+      else
+         moveDownButton->setDisabled(true);
 
       /* Can't move up if we're already at the top. */
       if (i > 0)
-      {
-         moveUpButton = new QPushButton(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_QT_SHADER_MOVE_UP));
-         moveUpButton->setProperty("pass", i);
          connect(moveUpButton, SIGNAL(clicked()), this, SLOT(onShaderPassMoveUpClicked()));
-      }
+      else
+         moveUpButton->setDisabled(true);
 
       for (;;)
       {
@@ -482,10 +487,12 @@ void ShaderParamsDialog::reload()
       m_layout->addWidget(groupBox);
 
       filterScaleHBoxLayout = new QHBoxLayout();
+      filterScaleHBoxLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Preferred));
       filterScaleHBoxLayout->addWidget(new QLabel(QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_FILTER)) + ":"));
       filterScaleHBoxLayout->addWidget(filterComboBox);
       filterScaleHBoxLayout->addWidget(new QLabel(QString(msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SCALE)) + ":"));
       filterScaleHBoxLayout->addWidget(scaleComboBox);
+      filterScaleHBoxLayout->addSpacerItem(new QSpacerItem(20, 0, QSizePolicy::Preferred, QSizePolicy::Preferred));
 
       if (moveUpButton)
          filterScaleHBoxLayout->addWidget(moveUpButton);