diff --git a/UI/GamepadEmu.cpp b/UI/GamepadEmu.cpp
index d0a328bb31..abc7e5f78c 100644
--- a/UI/GamepadEmu.cpp
+++ b/UI/GamepadEmu.cpp
@@ -327,7 +327,7 @@ void InitPadLayout() {
 	//space between the bottom keys (space between select, start and un-throttle)
 	const int bottom_key_spacing = 100 * scale;
 	
-	int start_key_X = dp_xres / 2 - (bottom_key_spacing) * scale;
+	int start_key_X = dp_xres / 2 + (bottom_key_spacing) * scale;
 	int start_key_Y = dp_yres - 60 * scale;
 
 	if(g_Config.iStartKeyX == -1 || g_Config.iStartKeyY == -1 ){
@@ -343,7 +343,7 @@ void InitPadLayout() {
 		g_Config.iSelectKeyY = select_key_Y;
 	}
 
-	int unthrottle_key_X = dp_xres / 2 + (bottom_key_spacing);
+	int unthrottle_key_X = dp_xres / 2 - (bottom_key_spacing) * scale;
 	int unthrottle_key_Y = dp_yres - 60 * scale;
 
 	if (g_Config.iUnthrottleKeyX == -1 || g_Config.iUnthrottleKeyY == -1 ){
@@ -409,7 +409,6 @@ UI::ViewGroup *CreatePadLayout(bool *pause) {
 	int start_key_X = g_Config.iStartKeyX;
 	int start_key_Y = g_Config.iStartKeyY;
 
-
 	int select_key_X = g_Config.iSelectKeyX;
 	int select_key_Y = g_Config.iSelectKeyY;
 
diff --git a/UI/TouchControlLayoutScreen.cpp b/UI/TouchControlLayoutScreen.cpp
index e48bbbed8f..aab85a125a 100644
--- a/UI/TouchControlLayoutScreen.cpp
+++ b/UI/TouchControlLayoutScreen.cpp
@@ -263,17 +263,22 @@ void TouchControlLayoutScreen::CreateViews() {
 
 	controls_.push_back(new DragDropButton(g_Config.iSelectKeyX, g_Config.iSelectKeyY, I_RECT, I_SELECT, scale));
 	controls_.push_back(new DragDropButton(g_Config.iStartKeyX, g_Config.iStartKeyY, I_RECT, I_START, scale));
-	controls_.push_back(new DragDropButton(g_Config.iUnthrottleKeyX, g_Config.iUnthrottleKeyY, I_RECT, I_ARROW, scale));
+	DragDropButton *unthrottle = new DragDropButton(g_Config.iUnthrottleKeyX, g_Config.iUnthrottleKeyY, I_RECT, I_ARROW, scale);
+	unthrottle->SetAngle(180.0f);
+	controls_.push_back(unthrottle);
 
 	controls_.push_back(new DragDropButton(g_Config.iLKeyX, g_Config.iLKeyY, I_SHOULDER, I_L, scale));
-	controls_.push_back(new DragDropButton(g_Config.iRKeyX, g_Config.iRKeyY, I_SHOULDER, I_R, scale));
+	DragDropButton *rbutton = new DragDropButton(g_Config.iRKeyX, g_Config.iRKeyY, I_SHOULDER, I_R, scale);
+	rbutton->FlipImageH(true);
+	controls_.push_back(rbutton);
 
 	if (g_Config.bShowAnalogStick) {
 		controls_.push_back(new DragDropButton(g_Config.iAnalogStickX, g_Config.iAnalogStickY, I_STICKBG, I_STICK, scale));
 	};
+	I18NCategory *ms = GetI18NCategory("MainSettings");
 
 	I18NCategory *c = GetI18NCategory("Controls");
-	tabHolder->AddTab(c->T("Controls"), controlsHolder);
+	tabHolder->AddTab(ms->T("Controls"), controlsHolder);
 
 	for (size_t i = 0; i < controls_.size(); i++) {
 		root_->Add(controls_[i]);