diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6956fd22c3..4d616e1f3a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -80,6 +80,7 @@ endif()
 if (ANDROID)
   set(GLES_OPTION ON)
   set(PLATFORM_QT_COMPONENTS AndroidExtras WebView)
+  add_definitions(-DHIFI_ANDROID_APP=\"${HIFI_ANDROID_APP}\")
 else ()
   set(PLATFORM_QT_COMPONENTS WebEngine)
 endif ()
diff --git a/interface/resources/icons/+android/backward.svg b/interface/resources/icons/+android_interface/backward.svg
old mode 100755
new mode 100644
similarity index 100%
rename from interface/resources/icons/+android/backward.svg
rename to interface/resources/icons/+android_interface/backward.svg
diff --git a/interface/resources/icons/+android/bubble-a.svg b/interface/resources/icons/+android_interface/bubble-a.svg
similarity index 100%
rename from interface/resources/icons/+android/bubble-a.svg
rename to interface/resources/icons/+android_interface/bubble-a.svg
diff --git a/interface/resources/icons/+android/bubble-i.svg b/interface/resources/icons/+android_interface/bubble-i.svg
similarity index 100%
rename from interface/resources/icons/+android/bubble-i.svg
rename to interface/resources/icons/+android_interface/bubble-i.svg
diff --git a/interface/resources/icons/+android/button-a.svg b/interface/resources/icons/+android_interface/button-a.svg
similarity index 100%
rename from interface/resources/icons/+android/button-a.svg
rename to interface/resources/icons/+android_interface/button-a.svg
diff --git a/interface/resources/icons/+android/button.svg b/interface/resources/icons/+android_interface/button.svg
similarity index 100%
rename from interface/resources/icons/+android/button.svg
rename to interface/resources/icons/+android_interface/button.svg
diff --git a/interface/resources/icons/+android/forward.svg b/interface/resources/icons/+android_interface/forward.svg
similarity index 100%
rename from interface/resources/icons/+android/forward.svg
rename to interface/resources/icons/+android_interface/forward.svg
diff --git a/interface/resources/icons/+android/go-a.svg b/interface/resources/icons/+android_interface/go-a.svg
old mode 100755
new mode 100644
similarity index 100%
rename from interface/resources/icons/+android/go-a.svg
rename to interface/resources/icons/+android_interface/go-a.svg
diff --git a/interface/resources/icons/+android/go-i.svg b/interface/resources/icons/+android_interface/go-i.svg
similarity index 100%
rename from interface/resources/icons/+android/go-i.svg
rename to interface/resources/icons/+android_interface/go-i.svg
diff --git a/interface/resources/icons/+android/hand.svg b/interface/resources/icons/+android_interface/hand.svg
similarity index 100%
rename from interface/resources/icons/+android/hand.svg
rename to interface/resources/icons/+android_interface/hand.svg
diff --git a/interface/resources/icons/+android/hide.svg b/interface/resources/icons/+android_interface/hide.svg
similarity index 100%
rename from interface/resources/icons/+android/hide.svg
rename to interface/resources/icons/+android_interface/hide.svg
diff --git a/interface/resources/icons/+android/mic-mute-a.svg b/interface/resources/icons/+android_interface/mic-mute-a.svg
similarity index 100%
rename from interface/resources/icons/+android/mic-mute-a.svg
rename to interface/resources/icons/+android_interface/mic-mute-a.svg
diff --git a/interface/resources/icons/+android/mic-mute-i.svg b/interface/resources/icons/+android_interface/mic-mute-i.svg
similarity index 100%
rename from interface/resources/icons/+android/mic-mute-i.svg
rename to interface/resources/icons/+android_interface/mic-mute-i.svg
diff --git a/interface/resources/icons/+android/mic-unmute-a.svg b/interface/resources/icons/+android_interface/mic-unmute-a.svg
old mode 100755
new mode 100644
similarity index 100%
rename from interface/resources/icons/+android/mic-unmute-a.svg
rename to interface/resources/icons/+android_interface/mic-unmute-a.svg
diff --git a/interface/resources/icons/+android/mic-unmute-i.svg b/interface/resources/icons/+android_interface/mic-unmute-i.svg
similarity index 100%
rename from interface/resources/icons/+android/mic-unmute-i.svg
rename to interface/resources/icons/+android_interface/mic-unmute-i.svg
diff --git a/interface/resources/icons/+android/myview-a.svg b/interface/resources/icons/+android_interface/myview-a.svg
old mode 100755
new mode 100644
similarity index 100%
rename from interface/resources/icons/+android/myview-a.svg
rename to interface/resources/icons/+android_interface/myview-a.svg
diff --git a/interface/resources/icons/+android/myview-hover.svg b/interface/resources/icons/+android_interface/myview-hover.svg
old mode 100755
new mode 100644
similarity index 100%
rename from interface/resources/icons/+android/myview-hover.svg
rename to interface/resources/icons/+android_interface/myview-hover.svg
diff --git a/interface/resources/icons/+android/myview-i.svg b/interface/resources/icons/+android_interface/myview-i.svg
old mode 100755
new mode 100644
similarity index 100%
rename from interface/resources/icons/+android/myview-i.svg
rename to interface/resources/icons/+android_interface/myview-i.svg
diff --git a/interface/resources/icons/+android/show-up.svg b/interface/resources/icons/+android_interface/show-up.svg
similarity index 100%
rename from interface/resources/icons/+android/show-up.svg
rename to interface/resources/icons/+android_interface/show-up.svg
diff --git a/interface/resources/icons/+android/stats.svg b/interface/resources/icons/+android_interface/stats.svg
similarity index 100%
rename from interface/resources/icons/+android/stats.svg
rename to interface/resources/icons/+android_interface/stats.svg
diff --git a/interface/resources/icons/+android/tick.svg b/interface/resources/icons/+android_interface/tick.svg
similarity index 100%
rename from interface/resources/icons/+android/tick.svg
rename to interface/resources/icons/+android_interface/tick.svg
diff --git a/interface/resources/qml/+android/StatText.qml b/interface/resources/qml/+android_interface/StatText.qml
similarity index 100%
rename from interface/resources/qml/+android/StatText.qml
rename to interface/resources/qml/+android_interface/StatText.qml
diff --git a/interface/resources/qml/+android/Stats.qml b/interface/resources/qml/+android_interface/Stats.qml
similarity index 100%
rename from interface/resources/qml/+android/Stats.qml
rename to interface/resources/qml/+android_interface/Stats.qml
diff --git a/interface/resources/qml/+android/Web3DSurface.qml b/interface/resources/qml/+android_interface/Web3DSurface.qml
similarity index 100%
rename from interface/resources/qml/+android/Web3DSurface.qml
rename to interface/resources/qml/+android_interface/Web3DSurface.qml
diff --git a/interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml b/interface/resources/qml/LoginDialog/+android_interface/LinkAccountBody.qml
similarity index 100%
rename from interface/resources/qml/LoginDialog/+android/LinkAccountBody.qml
rename to interface/resources/qml/LoginDialog/+android_interface/LinkAccountBody.qml
diff --git a/interface/resources/qml/LoginDialog/+android/SignUpBody.qml b/interface/resources/qml/LoginDialog/+android_interface/SignUpBody.qml
similarity index 100%
rename from interface/resources/qml/LoginDialog/+android/SignUpBody.qml
rename to interface/resources/qml/LoginDialog/+android_interface/SignUpBody.qml
diff --git a/interface/resources/qml/controlsUit/+android/ImageButton.qml b/interface/resources/qml/controlsUit/+android_interface/ImageButton.qml
similarity index 100%
rename from interface/resources/qml/controlsUit/+android/ImageButton.qml
rename to interface/resources/qml/controlsUit/+android_interface/ImageButton.qml
diff --git a/interface/resources/qml/desktop/+android/FocusHack.qml b/interface/resources/qml/desktop/+android_interface/FocusHack.qml
similarity index 100%
rename from interface/resources/qml/desktop/+android/FocusHack.qml
rename to interface/resources/qml/desktop/+android_interface/FocusHack.qml
diff --git a/interface/resources/qml/hifi/+android/ActionBar.qml b/interface/resources/qml/hifi/+android_interface/ActionBar.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/ActionBar.qml
rename to interface/resources/qml/hifi/+android_interface/ActionBar.qml
diff --git a/interface/resources/qml/hifi/+android/AudioBar.qml b/interface/resources/qml/hifi/+android_interface/AudioBar.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/AudioBar.qml
rename to interface/resources/qml/hifi/+android_interface/AudioBar.qml
diff --git a/interface/resources/qml/hifi/+android/AvatarOption.qml b/interface/resources/qml/hifi/+android_interface/AvatarOption.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/AvatarOption.qml
rename to interface/resources/qml/hifi/+android_interface/AvatarOption.qml
diff --git a/interface/resources/qml/hifi/+android/Desktop.qml b/interface/resources/qml/hifi/+android_interface/Desktop.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/Desktop.qml
rename to interface/resources/qml/hifi/+android_interface/Desktop.qml
diff --git a/interface/resources/qml/hifi/+android/HifiConstants.qml b/interface/resources/qml/hifi/+android_interface/HifiConstants.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/HifiConstants.qml
rename to interface/resources/qml/hifi/+android_interface/HifiConstants.qml
diff --git a/interface/resources/qml/hifi/+android/StatsBar.qml b/interface/resources/qml/hifi/+android_interface/StatsBar.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/StatsBar.qml
rename to interface/resources/qml/hifi/+android_interface/StatsBar.qml
diff --git a/interface/resources/qml/hifi/+android/WindowHeader.qml b/interface/resources/qml/hifi/+android_interface/WindowHeader.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/WindowHeader.qml
rename to interface/resources/qml/hifi/+android_interface/WindowHeader.qml
diff --git a/interface/resources/qml/hifi/+android/bottomHudOptions.qml b/interface/resources/qml/hifi/+android_interface/bottomHudOptions.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/bottomHudOptions.qml
rename to interface/resources/qml/hifi/+android_interface/bottomHudOptions.qml
diff --git a/interface/resources/qml/hifi/+android/button.qml b/interface/resources/qml/hifi/+android_interface/button.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/button.qml
rename to interface/resources/qml/hifi/+android_interface/button.qml
diff --git a/interface/resources/qml/hifi/+android/modesbar.qml b/interface/resources/qml/hifi/+android_interface/modesbar.qml
similarity index 100%
rename from interface/resources/qml/hifi/+android/modesbar.qml
rename to interface/resources/qml/hifi/+android_interface/modesbar.qml
diff --git a/interface/resources/qml/hifi/avatarapp/+android/TransparencyMask.qml b/interface/resources/qml/hifi/avatarapp/+android_interface/TransparencyMask.qml
similarity index 100%
rename from interface/resources/qml/hifi/avatarapp/+android/TransparencyMask.qml
rename to interface/resources/qml/hifi/avatarapp/+android_interface/TransparencyMask.qml
diff --git a/interface/resources/qml/stylesUit/+android/HifiConstants.qml b/interface/resources/qml/stylesUit/+android_interface/HifiConstants.qml
similarity index 100%
rename from interface/resources/qml/stylesUit/+android/HifiConstants.qml
rename to interface/resources/qml/stylesUit/+android_interface/HifiConstants.qml
diff --git a/libraries/shared/src/shared/FileUtils.cpp b/libraries/shared/src/shared/FileUtils.cpp
index 9a58fc3e78..f2a4925351 100644
--- a/libraries/shared/src/shared/FileUtils.cpp
+++ b/libraries/shared/src/shared/FileUtils.cpp
@@ -32,7 +32,7 @@ const QStringList& FileUtils::getFileSelectors() {
     std::call_once(once, [] {
 
 #if defined(Q_OS_ANDROID)
-        //extraSelectors << "android_" HIFI_ANDROID_APP;
+        extraSelectors << "android_" HIFI_ANDROID_APP;
 #endif
 
 #if defined(USE_GLES)
diff --git a/scripts/+android/defaultScripts.js b/scripts/+android_interface/defaultScripts.js
similarity index 100%
rename from scripts/+android/defaultScripts.js
rename to scripts/+android_interface/defaultScripts.js
diff --git a/scripts/+android_questInterface/defaultScripts.js b/scripts/+android_questInterface/defaultScripts.js
index da50e4a182..d22716302c 100644
--- a/scripts/+android_questInterface/defaultScripts.js
+++ b/scripts/+android_questInterface/defaultScripts.js
@@ -25,6 +25,7 @@ var DEFAULT_SCRIPTS_COMBINED = [
     "system/notifications.js",
     "system/commerce/wallet.js",
     "system/dialTone.js",
+    "system/quickGoto.js",
     "system/firstPersonHMD.js",
     "system/tablet-ui/tabletUI.js",
     "system/miniTablet.js"
diff --git a/scripts/system/+android/actionbar.js b/scripts/system/+android_interface/actionbar.js
similarity index 100%
rename from scripts/system/+android/actionbar.js
rename to scripts/system/+android_interface/actionbar.js
diff --git a/scripts/system/+android/audio.js b/scripts/system/+android_interface/audio.js
similarity index 100%
rename from scripts/system/+android/audio.js
rename to scripts/system/+android_interface/audio.js
diff --git a/scripts/system/+android/clickWeb.js b/scripts/system/+android_interface/clickWeb.js
similarity index 100%
rename from scripts/system/+android/clickWeb.js
rename to scripts/system/+android_interface/clickWeb.js
diff --git a/scripts/system/+android/displayNames.js b/scripts/system/+android_interface/displayNames.js
similarity index 100%
rename from scripts/system/+android/displayNames.js
rename to scripts/system/+android_interface/displayNames.js
diff --git a/scripts/system/+android/modes.js b/scripts/system/+android_interface/modes.js
similarity index 100%
rename from scripts/system/+android/modes.js
rename to scripts/system/+android_interface/modes.js
diff --git a/scripts/system/+android/radar.js b/scripts/system/+android_interface/radar.js
similarity index 100%
rename from scripts/system/+android/radar.js
rename to scripts/system/+android_interface/radar.js
diff --git a/scripts/system/+android/stats.js b/scripts/system/+android_interface/stats.js
similarity index 100%
rename from scripts/system/+android/stats.js
rename to scripts/system/+android_interface/stats.js
diff --git a/scripts/system/+android/touchscreenvirtualpad.js b/scripts/system/+android_interface/touchscreenvirtualpad.js
similarity index 100%
rename from scripts/system/+android/touchscreenvirtualpad.js
rename to scripts/system/+android_interface/touchscreenvirtualpad.js
diff --git a/scripts/system/+android/uniqueColor.js b/scripts/system/+android_interface/uniqueColor.js
similarity index 100%
rename from scripts/system/+android/uniqueColor.js
rename to scripts/system/+android_interface/uniqueColor.js
diff --git a/scripts/system/quickGoto.js b/scripts/system/quickGoto.js
new file mode 100644
index 0000000000..c5560cce83
--- /dev/null
+++ b/scripts/system/quickGoto.js
@@ -0,0 +1,36 @@
+"use strict";
+
+//
+//  quickGoto.js
+//  scripts/system/
+//
+//  Created by Dante Ruiz
+//  Copyright 2016 High Fidelity, Inc.
+//
+//  Distributed under the Apache License, Version 2.0.
+//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
+//
+/* globals Tablet, Toolbars, Script, HMD, DialogsManager */
+
+(function() { // BEGIN LOCAL_SCOPE
+
+    function addGotoButton(destination) {
+        tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
+        button = tablet.addButton({
+            icon: "icons/tablet-icons/goto-i.svg",
+            activeIcon: "icons/tablet-icons/goto-a.svg",
+            text: destination
+        });
+        var buttonDestination = destination;
+        button.clicked.connect(function() {
+            Window.location = "hifi://" + buttonDestination;
+        });
+        Script.scriptEnding.connect(function () {
+            tablet.removeButton(button);
+        });
+    }
+
+    addGotoButton("dev-mobile");
+    addGotoButton("quest-dev");
+
+}()); // END LOCAL_SCOPE