diff --git a/dlls/joy.cpl/joy.rc b/dlls/joy.cpl/joy.rc
index 8086ecec6e1..d1c179d2ef3 100644
--- a/dlls/joy.cpl/joy.rc
+++ b/dlls/joy.cpl/joy.rc
@@ -55,8 +55,8 @@ CAPTION "Test Joystick"
 FONT 8, "Ms Shell Dlg"
 {
     COMBOBOX        IDC_TESTSELECTCOMBO, 5, 5, 200, 60, CBS_DROPDOWNLIST | CBS_HASSTRINGS
-    GROUPBOX        "Buttons", IDC_STATIC, 0, 110, 250, 110
-    GROUPBOX        "", IDC_TESTGROUPXY, 15, 30, 60, 60
+    GROUPBOX        "Buttons", IDC_STATIC, 15, 100, 291, 70
+    GROUPBOX        "", IDC_TESTGROUPXY,   15, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPRXRY, 92, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPZRZ, 169, 30, 60, 60
     GROUPBOX        "", IDC_TESTGROUPPOV, 246, 30, 60, 60
diff --git a/dlls/joy.cpl/main.c b/dlls/joy.cpl/main.c
index cc1ce800445..e48762d18f1 100644
--- a/dlls/joy.cpl/main.c
+++ b/dlls/joy.cpl/main.c
@@ -43,13 +43,13 @@ WINE_DEFAULT_DEBUG_CHANNEL(joycpl);
 #define TEST_MAX_AXES       4
 #define TEST_POLL_TIME      100
 
-#define TEST_BUTTON_COL_MAX 8
-#define TEST_BUTTON_X       8
-#define TEST_BUTTON_Y       122
-#define TEST_NEXT_BUTTON_X  30
-#define TEST_NEXT_BUTTON_Y  25
-#define TEST_BUTTON_SIZE_X  20
-#define TEST_BUTTON_SIZE_Y  18
+#define TEST_BUTTON_COL_MAX 16
+#define TEST_BUTTON_X       24
+#define TEST_BUTTON_Y       112
+#define TEST_NEXT_BUTTON_X  17
+#define TEST_NEXT_BUTTON_Y  15
+#define TEST_BUTTON_SIZE_X  16
+#define TEST_BUTTON_SIZE_Y  14
 
 #define TEST_AXIS_X         43
 #define TEST_AXIS_Y         60