diff --git a/files/styles/style-dark.css b/files/styles/style-dark.css
index 6a4b1c4..6033ba5 100644
--- a/files/styles/style-dark.css
+++ b/files/styles/style-dark.css
@@ -9,10 +9,11 @@
     color: #777;
 }
 
-JoystickWidget QLabel {
+JoystickButton QLabel {
     border: 1px solid #AAA;
     border-radius: 4px;
     height: 16px;
+    padding: 0 3px;
 }
 
 QCheckBox {
@@ -177,7 +178,8 @@ QLabel {
 }
 
 QLabel:disabled {
-    color: #353535;
+    color: #444;
+    border-color: #444;
 }
 
 QLabel#noUas {
diff --git a/files/styles/style-light.css b/files/styles/style-light.css
index 4f49964..e4b69e8 100644
--- a/files/styles/style-light.css
+++ b/files/styles/style-light.css
@@ -9,10 +9,11 @@
     color: #AAA;
 }
 
-JoystickWidget QLabel {
+JoystickButton QLabel {
     border: 1px solid #777;
     border-radius: 4px;
     height: 16px;
+    padding: 0 3px;
 }
 
 QCheckBox {
@@ -176,7 +177,8 @@ QLabel {
 }
 
 QLabel:disabled {
-    color: #AAA;
+    color: #999;
+    border-color: #999;
 }
 
 QLabel#noUas {
diff --git a/src/ui/JoystickAxis.ui b/src/ui/JoystickAxis.ui
index ac09895..0d1fe95 100644
--- a/src/ui/JoystickAxis.ui
+++ b/src/ui/JoystickAxis.ui
@@ -46,6 +46,9 @@
      <property name="text">
       <string/>
      </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
     </widget>
    </item>
    <item>
diff --git a/src/ui/JoystickButton.ui b/src/ui/JoystickButton.ui
index 8e5191a..71bbe98 100644
--- a/src/ui/JoystickButton.ui
+++ b/src/ui/JoystickButton.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>125</width>
-    <height>27</height>
+    <height>29</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -42,25 +42,46 @@
     <number>1</number>
    </property>
    <item>
-    <widget class="QComboBox" name="joystickAction">
-     <item>
-      <property name="text">
-       <string>--</string>
-      </property>
-     </item>
-    </widget>
-   </item>
-   <item>
     <widget class="QLabel" name="joystickButtonLabel">
      <property name="sizePolicy">
-      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+      <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="minimumSize">
+      <size>
+       <width>20</width>
+       <height>0</height>
+      </size>
+     </property>
      <property name="text">
       <string/>
      </property>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QComboBox" name="joystickAction">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>30</width>
+       <height>0</height>
+      </size>
+     </property>
+     <item>
+      <property name="text">
+       <string>--</string>
+      </property>
+     </item>
     </widget>
    </item>
   </layout>