diff --git a/UI/ControlMappingScreen.cpp b/UI/ControlMappingScreen.cpp
index cb245306ce..d25f3dccf6 100644
--- a/UI/ControlMappingScreen.cpp
+++ b/UI/ControlMappingScreen.cpp
@@ -100,7 +100,9 @@ void ControlMapper::Refresh() {
 		root->Add(new Choice(iter->second, new LinearLayoutParams(200, WRAP_CONTENT)))->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
 	} else {
 		// No image? Let's translate.
-		root->Add(new Choice(c->T(keyName_.c_str()), new LinearLayoutParams(200, WRAP_CONTENT)))->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
+		Choice *choice = new Choice(c->T(keyName_.c_str()), new LinearLayoutParams(200, WRAP_CONTENT));
+		choice->SetCentered(true);
+		root->Add(choice)->OnClick.Handle(this, &ControlMapper::OnReplaceAll);
 	}
 
 	LinearLayout *rightColumn = root->Add(new LinearLayout(ORIENT_VERTICAL, new LinearLayoutParams(1.0f)));
diff --git a/native b/native
index 685a1f7e6f..9282fa59ca 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 685a1f7e6f13a4809b3dc1fb845c16a7402c1bff
+Subproject commit 9282fa59cadc1faad6c247d413fb96231293acd2