diff --git a/res/layout/url_bar.xml b/res/layout/url_bar.xml
index 29a6462..b803881 100644
--- a/res/layout/url_bar.xml
+++ b/res/layout/url_bar.xml
@@ -54,10 +54,11 @@
             android:background="@drawable/browserbarbutton"
             android:src="@drawable/ic_bookmarks_history_normal" />
         <LinearLayout
-            android:id="@+id/urlbar"
+            android:id="@+id/urlbar_unfocused"
             android:layout_width="0dip"
             android:layout_height="match_parent"
             android:layout_weight="1.0"
+            android:background="@null"
             android:orientation="horizontal" >
             <ImageButton
                 android:id="@+id/star"
@@ -72,15 +73,14 @@
                 android:layout_height="wrap_content"
                 style="@style/HoloIcon"
                 android:visibility="gone" />
-            <com.android.browser.UrlInputView
-                android:id="@+id/editurl"
+            <EditText
+                android:id="@+id/url_unfocused"
                 android:layout_width="0dip"
                 android:layout_weight="1.0"
                 android:layout_height="match_parent"
                 android:background="@null"
-                android:paddingLeft="16dip"
-                android:paddingRight="16dip"
                 android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="#ffc0c0c0"
                 android:hint="@string/search_hint"
                 android:gravity="center_vertical"
                 android:singleLine="true"
@@ -98,6 +98,46 @@
                 style="@style/HoloButton"
                 android:background="@drawable/browserbarbutton" />
         </LinearLayout>
+        <LinearLayout
+            android:id="@+id/urlbar_focused"
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1.0"
+            android:orientation="horizontal"
+            android:background="@drawable/text_field_results"
+            android:visibility="gone"
+             >
+            <ImageView
+                android:id="@+id/searchicon"
+                android:src="@drawable/ic_search_category_suggest"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                style="@style/HoloButton" />
+            <com.android.browser.UrlInputView
+                android:id="@+id/url_focused"
+                android:layout_width="0dip"
+                android:layout_weight="1.0"
+                android:layout_height="match_parent"
+                android:background="@null"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:textColor="@color/black"
+                android:hint="@string/search_hint"
+                android:gravity="center_vertical"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:lines="1"
+                android:scrollHorizontally="true"
+                android:inputType="textUri"
+                android:imeOptions="actionGo" />
+            <ImageButton
+                android:id="@+id/go"
+                android:src="@drawable/ic_go_dark"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:gravity="center_vertical"
+                style="@style/HoloButton"
+                android:background="@drawable/browserbarbutton" />
+        </LinearLayout>
     </LinearLayout>
     <com.android.browser.PageProgressView
         android:id="@+id/progress"
diff --git a/res/layout/simple_dropdown_item_2line.xml b/res/layout/url_dropdown_item.xml
similarity index 79%
rename from res/layout/simple_dropdown_item_2line.xml
rename to res/layout/url_dropdown_item.xml
index 8b955ec..5e8f84c 100644
--- a/res/layout/simple_dropdown_item_2line.xml
+++ b/res/layout/url_dropdown_item.xml
@@ -2,7 +2,7 @@
 <!--
 /* //device/apps/common/assets/res/any/layout/simple_spinner_item.xml
 **
-** Copyright 2008, The Android Open Source Project
+** Copyright 2010, The Android Open Source Project
 **
 ** Licensed under the Apache License, Version 2.0 (the "License");
 ** you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="?android:attr/listPreferredItemHeight"
+    android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:gravity="center_vertical"
     android:baselineAligned="false">
@@ -30,11 +30,10 @@
         android:layout_height="wrap_content"
         android:id="@+id/icon1"
         android:scaleType="center"
-        android:paddingLeft="2dip"
-        android:paddingRight="2dip" />
+        style="@style/HoloButton" />
     <TwoLineListItem
-        android:paddingTop="2dip"
-        android:paddingBottom="2dip"
+        android:paddingTop="16dip"
+        android:paddingBottom="16dip"
         android:layout_width="0dip"
         android:layout_weight="1"
         android:layout_height="wrap_content"
@@ -57,4 +56,13 @@
             android:layout_below="@android:id/text1"
             android:layout_alignLeft="@android:id/text1" />
     </TwoLineListItem>
+    <ImageButton
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/icon2"
+        android:scaleType="center"
+        style="@style/HoloButton"
+        android:src="@drawable/ic_add_string"
+        android:background="@drawable/browserbarbutton"
+         />
 </LinearLayout>