diff --git a/UI/GameSettingsScreen.cpp b/UI/GameSettingsScreen.cpp
index 256ea933e5..7a0ac796de 100644
--- a/UI/GameSettingsScreen.cpp
+++ b/UI/GameSettingsScreen.cpp
@@ -244,10 +244,11 @@ void GameSettingsScreen::CreateViews() {
 	layoutEditorChoice_->SetEnabledPtr(&g_Config.bShowTouchControls);
 	CheckBox *disableDiags = controlsSettings->Add(new CheckBox(&g_Config.bDisableDpadDiagonals, c->T("Disable D-Pad diagonals (4-way touch)")));
 	disableDiags->SetEnabledPtr(&g_Config.bShowTouchControls);
-	controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager()));
+	View *opacity = controlsSettings->Add(new PopupSliderChoice(&g_Config.iTouchButtonOpacity, 0, 100, c->T("Button Opacity"), screenManager()));
+	opacity->SetEnabledPtr(&g_Config.bShowTouchControls);
 	static const char *touchControlStyles[] = {"Classic", "Thin borders"};
 	View *style = controlsSettings->Add(new PopupMultiChoice(&g_Config.iTouchButtonStyle, c->T("Button style"), touchControlStyles, 0, ARRAY_SIZE(touchControlStyles), c, screenManager()));
-	disableDiags->SetEnabledPtr(&g_Config.bShowTouchControls);
+	style->SetEnabledPtr(&g_Config.bShowTouchControls);
 
 	// System
 	ViewGroup *systemSettingsScroll = new ScrollView(ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, FILL_PARENT));
diff --git a/UI/MainScreen.cpp b/UI/MainScreen.cpp
index 4fbf8e62e2..aebba46e9e 100644
--- a/UI/MainScreen.cpp
+++ b/UI/MainScreen.cpp
@@ -445,10 +445,11 @@ void GameBrowser::Refresh() {
 			path_.GetListing(fileInfo, "zip:rar:r01:");
 			if (!fileInfo.empty()) {
 				UI::LinearLayout *zl = new UI::LinearLayout(UI::ORIENT_VERTICAL, new LinearLayoutParams(FILL_PARENT, WRAP_CONTENT));
+				zl->SetSpacing(4.0f);
 				Add(zl);
 				for (size_t i = 0; i < fileInfo.size(); i++) {
 					if (!fileInfo[i].isDirectory) {
-						zl->Add(new GameButton(fileInfo[i].fullName, false, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::WRAP_CONTENT)));
+						zl->Add(new GameButton(fileInfo[i].fullName, false, new UI::LinearLayoutParams(UI::FILL_PARENT, UI::WRAP_CONTENT)))->OnClick.Handle(this, &GameBrowser::GameButtonClick);
 					}
 				}
 			}
diff --git a/native b/native
index d20700d5bb..b0ab77d4c2 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit d20700d5bb1dfa30c735f16cc2c04d7be6a5ab4b
+Subproject commit b0ab77d4c24b887b3b40ea0512f2e590f4fe36f0