diff --git a/src/keybindings.cpp b/src/keybindings.cpp
index 1aa8826..7f99356 100644
--- a/src/keybindings.cpp
+++ b/src/keybindings.cpp
@@ -76,19 +76,16 @@ static const KbBindingData defaultKbBindings[] =
 	{ SDL_SCANCODE_ESCAPE, Input::B     },
 	{ SDL_SCANCODE_KP_0,   Input::B     },
 	{ SDL_SCANCODE_LSHIFT, Input::A     },
-	{ SDL_SCANCODE_X,      Input::B     },
-	{ SDL_SCANCODE_D,      Input::Z     },
-	{ SDL_SCANCODE_Q,      Input::L     },
-	{ SDL_SCANCODE_W,      Input::R     },
-	{ SDL_SCANCODE_A,      Input::X     },
-	{ SDL_SCANCODE_S,      Input::Y     }
+
+	{ SDL_SCANCODE_W,      Input::Up    },
+	{ SDL_SCANCODE_A,      Input::Left  },
+	{ SDL_SCANCODE_S,      Input::Down  },
+	{ SDL_SCANCODE_D,      Input::Right },
 };
 
 /* RGSS1 */
 static const KbBindingData defaultKbBindings1[] =
 {
-	{ SDL_SCANCODE_Z,      Input::A     },
-	{ SDL_SCANCODE_C,      Input::C     },
 };
 
 /* RGSS2 and higher */
@@ -106,11 +103,6 @@ static const JsBindingData defaultJsBindings[] =
 	{ 0, Input::A },
 	{ 1, Input::B },
 	{ 2, Input::C },
-	{ 3, Input::X },
-	{ 4, Input::Y },
-	{ 5, Input::Z },
-	{ 6, Input::L },
-	{ 7, Input::R }
 };
 
 static elementsN(defaultJsBindings);
diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp
index f3c1451..694240c 100644
--- a/src/settingsmenu.cpp
+++ b/src/settingsmenu.cpp
@@ -37,7 +37,7 @@
 #include <algorithm>
 #include <assert.h>
 
-const Vec2i winSize(540, 356);
+const Vec2i winSize(580, 356);
 
 const uint8_t cBgNorm = 50;
 const uint8_t cBgDark = 20;
@@ -63,16 +63,16 @@ struct VButton
 {
 	BTN_STRING(Up),
 	BTN_STRING(Down),
-	BTN_STRING(L),
+	{ Input::L, "-" },
 	BTN_STRING(Left),
 	BTN_STRING(Right),
-	BTN_STRING(R),
-	BTN_STRING(A),
-	BTN_STRING(B),
-	BTN_STRING(C),
-	BTN_STRING(X),
-	BTN_STRING(Y),
-	BTN_STRING(Z)
+	{ Input::R, "-" },
+	{ Input::A, "Sprint" },
+	{ Input::B, "Cancel" },
+	{ Input::C, "Action" },
+	{ Input::X, "-" },
+	{ Input::Y, "-" },
+	{ Input::Z, "-" },
 };
 
 static elementsN(vButtons);
@@ -764,7 +764,7 @@ void Widget::click(int x, int y, uint8_t button)
 }
 
 /* Ratio of cell area to total widget width */
-#define BW_CELL_R 0.75f
+#define BW_CELL_R 0.69f
 
 void BindingWidget::drawHandler(SDL_Surface *surf)
 {