diff --git a/Limelight/ViewControllers/MainFrameViewController.m b/Limelight/ViewControllers/MainFrameViewController.m
index 113c428..d55952d 100644
--- a/Limelight/ViewControllers/MainFrameViewController.m
+++ b/Limelight/ViewControllers/MainFrameViewController.m
@@ -109,6 +109,18 @@ static NSMutableSet* hostList;
     });
 }
 
+- (void)disableUpButton {
+#if !TARGET_OS_TV
+    [self->_upButton setTitle:nil];
+#endif
+}
+
+- (void)enableUpButton {
+#if !TARGET_OS_TV
+    [self->_upButton setTitle:@"Select New Host"];
+#endif
+}
+
 - (void)alreadyPaired {
     BOOL usingCachedAppList = false;
     
@@ -126,11 +138,7 @@ static NSMutableSet* hostList;
             
             self.title = host.name;
             
-#if !TARGET_OS_TV
-            [self->_upButton setImage:[UIImage imageNamed:@"UpIcon"]];
-#endif
-            [self.navigationController.navigationBar setNeedsLayout];
-            
+            [self enableUpButton];
             [self updateAppsForHost:host];
             [self hideLoadingFrame: nil];
         });
@@ -173,11 +181,7 @@ static NSMutableSet* hostList;
                 }
                 
                 self.title = host.name;
-                
-#if !TARGET_OS_TV
-                [self->_upButton setImage:[UIImage imageNamed:@"UpIcon"]];
-#endif
-                [self.navigationController.navigationBar setNeedsLayout];
+                [self enableUpButton];
                 
                 [self updateAppsForHost:host];
                 [self->_appManager stopRetrieving];
@@ -251,10 +255,7 @@ static NSMutableSet* hostList;
     _selectedHost = nil;
     
     self.title = @"Select Host";
-    
-#if !TARGET_OS_TV
-    [_upButton setImage:nil];
-#endif
+    [self disableUpButton];
     
     [self.collectionView reloadData];
     [self.view addSubview:hostScrollView];
@@ -707,7 +708,7 @@ static NSMutableSet* hostList;
     // Set the host name button action. When it's tapped, it'll show the host selection view.
     [_upButton setTarget:self];
     [_upButton setAction:@selector(showHostSelectionView)];
-    [_upButton setImage:nil];
+    [self disableUpButton];
     
     // Set the gesture
     [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer];
diff --git a/iPad.storyboard b/iPad.storyboard
index b02ab5c..e648a23 100644
--- a/iPad.storyboard
+++ b/iPad.storyboard
@@ -37,12 +37,8 @@
                         </connections>
                     </collectionView>
                     <navigationItem key="navigationItem" id="pSu-bl-gL9">
-                        <barButtonItem key="leftBarButtonItem" image="SettingsButton" id="mSL-ru-nRm">
-                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU">
-                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </barButtonItem>
+                        <barButtonItem key="leftBarButtonItem" title="Settings" id="mSL-ru-nRm"/>
+                        <barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU"/>
                     </navigationItem>
                     <connections>
                         <outlet property="settingsButton" destination="mSL-ru-nRm" id="NRf-lv-vlh"/>
@@ -351,7 +347,4 @@
             <point key="canvasLocation" x="1530.46875" y="834.9609375"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="SettingsButton" width="75" height="75"/>
-    </resources>
 </document>
diff --git a/iPhone.storyboard b/iPhone.storyboard
index f6d40c1..b16895b 100644
--- a/iPhone.storyboard
+++ b/iPhone.storyboard
@@ -38,12 +38,8 @@
                     </collectionView>
                     <toolbarItems/>
                     <navigationItem key="navigationItem" id="pSu-bl-gL9">
-                        <barButtonItem key="leftBarButtonItem" image="SettingsButton" id="mSL-ru-nRm">
-                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </barButtonItem>
-                        <barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU">
-                            <color key="tintColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
-                        </barButtonItem>
+                        <barButtonItem key="leftBarButtonItem" title="Settings" id="mSL-ru-nRm"/>
+                        <barButtonItem key="rightBarButtonItem" id="KDy-JC-2sU"/>
                     </navigationItem>
                     <connections>
                         <outlet property="settingsButton" destination="mSL-ru-nRm" id="NRf-lv-vlh"/>
@@ -352,7 +348,4 @@
             <point key="canvasLocation" x="3031" y="1487"/>
         </scene>
     </scenes>
-    <resources>
-        <image name="SettingsButton" width="75" height="75"/>
-    </resources>
 </document>