diff --git a/Core/Config.cpp b/Core/Config.cpp
index e734cb0f98..8d0dcb01db 100644
--- a/Core/Config.cpp
+++ b/Core/Config.cpp
@@ -153,7 +153,12 @@ void Config::Load(const char *iniFileName, const char *controllerIniFilename)
 #ifdef BLACKBERRY
 	control->Get("ShowTouchControls", &bShowTouchControls, pixel_xres != pixel_yres);
 #elif defined(USING_GLES2)
-	control->Get("ShowTouchControls", &bShowTouchControls, true);
+	std::string name = System_GetName();
+	if (name == "NVIDIA:SHIELD" || name == "Sony Ericsson:R800i" || name == "Sony Ericsson:zeus") {
+		control->Get("ShowTouchControls", &bShowTouchControls, false);
+	} else {
+		control->Get("ShowTouchControls", &bShowTouchControls, true);
+	}
 #else
 	control->Get("ShowTouchControls", &bShowTouchControls, false);
 #endif
diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index 7b57be6607..badaff66fb 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -86,7 +86,7 @@ void ControlMapper::Refresh() {
 	
 	root->Add(new Choice(keyName_, new LinearLayoutParams(200, WRAP_CONTENT)))->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
 	LinearLayout *rightColumn = root->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
-
+	rightColumn->SetSpacing(2.0f);
 	std::vector<KeyDef> mappings;
 	KeyMap::KeyFromPspButton(pspKey_, &mappings);
 
diff --git a/native b/native
index 3ea9d45299..ae0847cecb 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 3ea9d45299a8066f451878e3ace127c947cc7a2f
+Subproject commit ae0847cecbac76c7c7901ab76824a91c29b7329e