diff --git a/res/layout/geolocation_permissions_prompt.xml b/res/layout/geolocation_permissions_prompt.xml
index 1920c05..d63ef84 100755
--- a/res/layout/geolocation_permissions_prompt.xml
+++ b/res/layout/geolocation_permissions_prompt.xml
@@ -68,14 +68,21 @@
                 android:id="@+id/dont_share_button"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_weight="1"
-                android:layout_width="0dip"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/geolocation_permissions_prompt_dont_share" />
             <Button
+                android:id="@+id/share_for_limited_time_button"
+                style="?android:attr/buttonBarButtonStyle"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:text="@string/geolocation_permissions_prompt_share_for_limited_time"/>
+            <Button
                 android:id="@+id/share_button"
                 style="?android:attr/buttonBarButtonStyle"
                 android:layout_weight="1"
-                android:layout_width="0dip"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/geolocation_permissions_prompt_share" />
         </LinearLayout>
diff --git a/res/layout/title_bar_nav.xml b/res/layout/title_bar_nav.xml
index 2f1e0a2..3ee99fd 100644
--- a/res/layout/title_bar_nav.xml
+++ b/res/layout/title_bar_nav.xml
@@ -42,6 +42,12 @@
             android:paddingLeft="4dip"
             android:visibility="gone"
             android:src="@drawable/ic_incognito_holo_dark" />
+        <com.android.browser.LocationButton
+            android:id="@+id/location_button"
+            android:layout_width="32dip"
+            android:layout_height="32dip"
+            android:visibility="gone"
+            style="@style/HoloButton"/>
         <FrameLayout
             android:id="@+id/iconcombo"
             android:layout_width="44dip"
@@ -116,7 +122,7 @@
         android:src="@drawable/ic_windows_holo_dark"
         style="@style/HoloButton" />
     <ImageButton
-        android:id="@+id/more"
+        android:id="@+id/more_browser_settings"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         style="@style/HoloButton"