diff --git a/src/win32/VBA.rc b/src/win32/VBA.rc
index 2299f109..e8648816 100644
--- a/src/win32/VBA.rc
+++ b/src/win32/VBA.rc
@@ -193,41 +193,41 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,168,282,42,12
 END
 
-IDD_CONFIG DIALOGEX 0, 0, 221, 241
+IDD_CONFIG DIALOGEX 0, 0, 354, 119
 STYLE DS_SYSMODAL | DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
 CAPTION "Joypad configuration"
 FONT 8, "MS Sans Serif", 0, 0, 0x0
 BEGIN
-    EDITTEXT        IDC_EDIT_UP,38,5,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_DOWN,38,19,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_LEFT,38,33,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_RIGHT,38,47,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_A,38,61,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_B,38,75,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_L,38,89,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_R,38,103,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_SELECT,38,117,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_START,38,131,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_SPEED,38,145,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_CAPTURE,38,159,176,12,ES_AUTOHSCROLL
-    EDITTEXT        IDC_EDIT_BUTTON_GS,38,173,176,12,ES_AUTOHSCROLL
-    PUSHBUTTON      "OK",ID_OK,61,220,40,14
-    PUSHBUTTON      "Cancel",ID_CANCEL,115,220,40,14
-    LTEXT           "Up:",IDC_STATIC,5,5,35,10
-    LTEXT           "Down:",IDC_STATIC,5,19,35,10
-    LTEXT           "Left:",IDC_STATIC,5,33,35,10
-    LTEXT           "Right:",IDC_STATIC,5,47,35,10
-    LTEXT           "Button A:",IDC_STATIC,5,61,35,10
-    LTEXT           "Button B:",IDC_STATIC,5,75,35,10
-    LTEXT           "Button L:",IDC_STATIC,5,89,35,10
-    LTEXT           "Button R:",IDC_STATIC,5,103,35,10
-    LTEXT           "Select:",IDC_STATIC,5,117,35,10
-    LTEXT           "Start:",IDC_STATIC,5,131,35,10
-    LTEXT           "Speed:",IDC_STATIC,5,145,35,10
-    LTEXT           "Capture:",IDC_STATIC,5,159,35,10
-    LTEXT           "GS:",IDC_STATIC,5,173,35,10
+    RTEXT           "Up",IDC_STATIC,6,6,36,12
+    EDITTEXT        IDC_EDIT_UP,48,6,126,12,ES_AUTOHSCROLL
+    RTEXT           "Down",IDC_STATIC,6,18,36,12
+    EDITTEXT        IDC_EDIT_DOWN,48,18,126,12,ES_AUTOHSCROLL
+    RTEXT           "Left",IDC_STATIC,6,30,36,12
+    EDITTEXT        IDC_EDIT_LEFT,48,30,126,12,ES_AUTOHSCROLL
+    RTEXT           "Right",IDC_STATIC,6,42,36,12
+    EDITTEXT        IDC_EDIT_RIGHT,48,42,126,12,ES_AUTOHSCROLL
+    RTEXT           "A",IDC_STATIC,180,6,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_A,222,6,126,12,ES_AUTOHSCROLL
+    RTEXT           "B",IDC_STATIC,180,18,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_B,222,18,126,12,ES_AUTOHSCROLL
+    RTEXT           "L",IDC_STATIC,180,30,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_L,222,30,126,12,ES_AUTOHSCROLL
+    RTEXT           "R",IDC_STATIC,180,42,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_R,222,42,126,12,ES_AUTOHSCROLL
+    RTEXT           "Select",IDC_STATIC,180,60,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_SELECT,222,60,126,12,ES_AUTOHSCROLL
+    RTEXT           "Start",IDC_STATIC,180,72,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_START,222,72,126,12,ES_AUTOHSCROLL
+    RTEXT           "Speed Up",IDC_STATIC,6,60,36,12
+    EDITTEXT        IDC_EDIT_SPEED,48,60,126,12,ES_AUTOHSCROLL
+    RTEXT           "Screenshot",IDC_STATIC,6,72,36,12
+    EDITTEXT        IDC_EDIT_CAPTURE,48,72,126,12,ES_AUTOHSCROLL
+    RTEXT           "GS",IDC_STATIC,6,84,36,12
+    EDITTEXT        IDC_EDIT_BUTTON_GS,48,84,126,12,ES_AUTOHSCROLL
     CONTROL         "Assign additional keys to functions",IDC_APPENDMODE,
-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,47,197,135,10
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,48,102,126,12
+    DEFPUSHBUTTON   "OK",ID_OK,258,96,42,18
+    PUSHBUTTON      "Cancel",ID_CANCEL,306,96,42,18
 END
 
 IDD_CHEATS DIALOG  0, 0, 276, 253
@@ -1139,9 +1139,9 @@ BEGIN
     IDD_CONFIG, DIALOG
     BEGIN
         LEFTMARGIN, 7
-        RIGHTMARGIN, 214
+        RIGHTMARGIN, 347
         TOPMARGIN, 7
-        BOTTOMMARGIN, 234
+        BOTTOMMARGIN, 112
     END
 
     IDD_CHEATS, DIALOG