diff --git a/gvr-interface/CMakeLists.txt b/gvr-interface/CMakeLists.txt
index bd0eb07e87..91838edc63 100644
--- a/gvr-interface/CMakeLists.txt
+++ b/gvr-interface/CMakeLists.txt
@@ -28,19 +28,21 @@ include_glm()
 link_hifi_libraries(shared networking audio-client avatars)
 include_dependency_includes()
 
-find_package(LibOVR)
-if (LIBOVR_FOUND)
-  add_definitions(-DHAVE_LIBOVR)
-  target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES})
-  include_directories(SYSTEM ${LIBOVR_INCLUDE_DIRS})
+if (ANDROID)
+  find_package(LibOVR)
+  
+  if (LIBOVR_FOUND)
+    add_definitions(-DHAVE_LIBOVR)
+    target_link_libraries(${TARGET_NAME} ${LIBOVR_LIBRARIES} ${LIBOVR_ANDROID_LIBRARIES})
+    include_directories(SYSTEM ${LIBOVR_INCLUDE_DIRS})
   
-  if (ANDROID)
     # we need VRLib, so add a project.properties to our apk build folder that says that
     file(RELATIVE_PATH RELATIVE_VRLIB_PATH ${ANDROID_APK_OUTPUT_DIR} "${LIBOVR_VRLIB_DIR}")
     file(WRITE "${ANDROID_APK_BUILD_DIR}/project.properties" "android.library.reference.1=${RELATIVE_VRLIB_PATH}")
-  
+
     list(APPEND IGNORE_COPY_LIBS ${LIBOVR_ANDROID_LIBRARIES})
-  endif (ANDROID)
+  endif ()
+
 endif ()
 
 # the presence of a HOCKEY_APP_ID means we are making a beta build
diff --git a/gvr-interface/res/drawable/icon.png b/gvr-interface/res/drawable/icon.png
index 4fe5404c7d..70aaf9b4ed 100644
Binary files a/gvr-interface/res/drawable/icon.png and b/gvr-interface/res/drawable/icon.png differ
diff --git a/gvr-interface/src/GVRMainWindow.cpp b/gvr-interface/src/GVRMainWindow.cpp
index 3176457677..c2ae8bf818 100644
--- a/gvr-interface/src/GVRMainWindow.cpp
+++ b/gvr-interface/src/GVRMainWindow.cpp
@@ -62,7 +62,7 @@ GVRMainWindow::GVRMainWindow(QWidget* parent) :
     setCentralWidget(baseWidget);
     
     // add the interface view
-    InterfaceView* interfaceView = new InterfaceView(baseWidget);
+    new InterfaceView(baseWidget);
 }
 
 void GVRMainWindow::showAddressBar() {
diff --git a/gvr-interface/src/main.cpp b/gvr-interface/src/main.cpp
index 5fa5390df0..fd08c4c3ad 100644
--- a/gvr-interface/src/main.cpp
+++ b/gvr-interface/src/main.cpp
@@ -16,7 +16,11 @@ int main(int argc, char* argv[]) {
     GVRInterface app(argc, argv);
     
     GVRMainWindow mainWindow;
+#ifdef ANDROID
+    mainWindow.showFullScreen();
+#else
     mainWindow.showMaximized();
+#endif
     
     return app.exec();
 }
\ No newline at end of file
diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp
index 4f5bd05537..1a18093b02 100644
--- a/libraries/networking/src/AddressManager.cpp
+++ b/libraries/networking/src/AddressManager.cpp
@@ -57,7 +57,11 @@ const QUrl AddressManager::currentAddress() const {
 
 void AddressManager::loadSettings(const QString& lookupString) {
     if (lookupString.isEmpty()) {
-        handleLookupString(SettingHandles::currentAddress.get().toString());
+        const QString& lastAddress = SettingHandles::currentAddress.get().toString();
+        
+        if (lastAddress.isEmpty()) {
+            handleLookupString(lastAddress);
+        }
     } else {
         handleLookupString(lookupString);
     }