diff --git a/UI/ControlMappingScreen.h b/UI/ControlMappingScreen.h
index a27976a63c..4b8f709ff0 100644
--- a/UI/ControlMappingScreen.h
+++ b/UI/ControlMappingScreen.h
@@ -21,7 +21,7 @@
 
 #include "UI/MiscScreens.h"
 
-class ControlMappingScreen : public UIScreenWithBackground {
+class ControlMappingScreen : public UIDialogScreenWithBackground {
 public:
 	ControlMappingScreen() {}
 protected:
diff --git a/UI/GameScreen.h b/UI/GameScreen.h
index cd0ae57b7b..0e27495453 100644
--- a/UI/GameScreen.h
+++ b/UI/GameScreen.h
@@ -24,7 +24,7 @@
 // set game specific settings, etc.
 // Uses GameInfoCache heavily to implement the functionality.
 
-class GameScreen : public DialogScreen {
+class GameScreen : public UIDialogScreen {
 public:
 	GameScreen(std::string gamePath) : gamePath_(gamePath) {}
 
diff --git a/UI/MiscScreens.h b/UI/MiscScreens.h
index 6d960aa247..cca70edd7c 100644
--- a/UI/MiscScreens.h
+++ b/UI/MiscScreens.h
@@ -34,9 +34,9 @@ protected:
 	virtual void DrawBackground(UIContext &dc);
 };
 
-class UIDialogScreenWithBackground : public DialogScreen {
+class UIDialogScreenWithBackground : public UIDialogScreen {
 public:
-	UIDialogScreenWithBackground() : DialogScreen() {}
+	UIDialogScreenWithBackground() : UIDialogScreen() {}
 protected:
 	virtual void DrawBackground(UIContext &dc);
 };
diff --git a/native b/native
index 5422dead6a..17996ccd4c 160000
--- a/native
+++ b/native
@@ -1 +1 @@
-Subproject commit 5422dead6ab36cd450bf02c4d2ec9350a5943b8c
+Subproject commit 17996ccd4c133e2f930e9b7141875a6ed5e24558