diff --git a/apps/Tag/AndroidManifest.xml b/apps/Tag/AndroidManifest.xml
index dc362a126..4414d7360 100644
--- a/apps/Tag/AndroidManifest.xml
+++ b/apps/Tag/AndroidManifest.xml
@@ -22,7 +22,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.apps.tag">
     <application android:label="Tags">
-        <activity android:name="TagBrowserActivity" android:icon="@drawable/ic_launcher_nfc">
+      <activity android:name="TagBrowserActivity"
+              android:icon="@drawable/ic_launcher_nfc"
+              android:theme="@style/Tags.TagBrowserTheme" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
diff --git a/apps/Tag/res/drawable/desk_clock.xml b/apps/Tag/res/drawable/desk_clock.xml
deleted file mode 100644
index 56bc43343..000000000
--- a/apps/Tag/res/drawable/desk_clock.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:drawable="@drawable/ic_menu_desk_clock"
-          android:state_selected="true" />
-    <item android:drawable="@drawable/ic_menu_desk_clock48" />
-</selector>
diff --git a/apps/Tag/res/drawable/ic_menu_desk_clock.png b/apps/Tag/res/drawable/ic_menu_desk_clock.png
index 74a1a3cce..0a82ad669 100644
Binary files a/apps/Tag/res/drawable/ic_menu_desk_clock.png and b/apps/Tag/res/drawable/ic_menu_desk_clock.png differ
diff --git a/apps/Tag/res/drawable/ic_menu_desk_clock48.png b/apps/Tag/res/drawable/ic_menu_desk_clock48.png
deleted file mode 100644
index 2d3281e5b..000000000
Binary files a/apps/Tag/res/drawable/ic_menu_desk_clock48.png and /dev/null differ
diff --git a/apps/Tag/res/drawable/ic_menu_tag.png b/apps/Tag/res/drawable/ic_menu_tag.png
new file mode 100644
index 000000000..c4d820eff
Binary files /dev/null and b/apps/Tag/res/drawable/ic_menu_tag.png differ
diff --git a/apps/Tag/res/layout/main.xml b/apps/Tag/res/layout/main.xml
index dd8a07cbe..50b2324de 100644
--- a/apps/Tag/res/layout/main.xml
+++ b/apps/Tag/res/layout/main.xml
@@ -1,21 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 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.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
 <TabHost xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@android:id/tabhost"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
     <LinearLayout
         android:orientation="vertical"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:padding="5dp">
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
         <TabWidget
             android:id="@android:id/tabs"
-            android:layout_width="fill_parent"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content" />
+
         <FrameLayout
             android:id="@android:id/tabcontent"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:padding="5dp" />
     </LinearLayout>
 </TabHost>
diff --git a/apps/Tag/res/layout/hello_activity.xml b/apps/Tag/res/values/styles.xml
similarity index 62%
rename from apps/Tag/res/layout/hello_activity.xml
rename to apps/Tag/res/values/styles.xml
index d4f5fe669..40e29fb1d 100644
--- a/apps/Tag/res/layout/hello_activity.xml
+++ b/apps/Tag/res/values/styles.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2010 The Android Open Source Project
+<!--
+     Copyright (C) 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.
@@ -13,13 +14,10 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
+<resources>
+
+  <style name="Tags.TagBrowserTheme" parent="@android:style/Theme.NoTitleBar">
+  </style>
 
 
-<EditText xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/text"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:textSize="18sp"
-    android:autoText="true"
-    android:capitalize="sentences"
-    android:text="@string/hello_activity_text_text" />
-
+</resources>
diff --git a/apps/Tag/src/com/android/apps/tag/TagBrowserActivity.java b/apps/Tag/src/com/android/apps/tag/TagBrowserActivity.java
index 68233b06e..a4cbb86a6 100644
--- a/apps/Tag/src/com/android/apps/tag/TagBrowserActivity.java
+++ b/apps/Tag/src/com/android/apps/tag/TagBrowserActivity.java
@@ -43,14 +43,13 @@ public class TagBrowserActivity extends TabActivity {
                 .putExtra(TagList.SHOW_SAVED_ONLY, true);
         Intent iRecentList = new Intent().setClass(this, TagList.class);
 
-
         TabHost.TabSpec spec1 = tabHost.newTabSpec("1")
-                .setIndicator("Saved", res.getDrawable(R.drawable.ic_launcher_nfc))
+                .setIndicator("Saved", res.getDrawable(R.drawable.ic_menu_tag))
                 .setContent(iSavedList);
         tabHost.addTab(spec1);
 
         TabHost.TabSpec spec2 = tabHost.newTabSpec("2")
-                .setIndicator("Recent", res.getDrawable(R.drawable.desk_clock))
+                .setIndicator("Recent", res.getDrawable(R.drawable.ic_menu_desk_clock))
                 .setContent(iRecentList);
         tabHost.addTab(spec2);
     }