diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a70ee0e..841203d 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -26,18 +26,13 @@
     <application android:label="@string/app_name"
                  android:icon="@drawable/ic_launcher_soundrecorder">
         <activity android:name="SoundRecorder"
-                android:configChanges="orientation|keyboardHidden">
+            android:configChanges="orientation|keyboardHidden"
+            android:theme="@style/Theme.SoundRecorder"
+            >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
             <intent-filter>
-                 <action android:name="android.intent.action.GET_CONTENT" />
-                 <category android:name="android.intent.category.DEFAULT" />
-                 <category android:name="android.intent.category.OPENABLE" />
-                 <data android:mimeType="audio/amr" />
-                 <data android:mimeType="audio/3gpp" />
-            </intent-filter>
-            <intent-filter>
                  <action android:name="android.provider.MediaStore.RECORD_SOUND" />
                  <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
diff --git a/res/drawable-hdpi/idle_led.png b/res/drawable-hdpi/idle_led.png
deleted file mode 100644
index 7d74828..0000000
--- a/res/drawable-hdpi/idle_led.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/idle_led.png b/res/drawable-mdpi/idle_led.png
deleted file mode 100644
index 056b556..0000000
--- a/res/drawable-mdpi/idle_led.png
+++ /dev/null
Binary files differ
diff --git a/res/layout-land/main.xml b/res/layout-land/main.xml
index 0d65783..a23c817 100644
--- a/res/layout-land/main.xml
+++ b/res/layout-land/main.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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.
+-->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -141,17 +155,17 @@
 
             <ImageButton android:id="@+id/recordButton"
                 android:layout_height="match_parent" 
-                style="@android:style/MediaButton"
+                style="@style/MediaButton"
                 android:src="@drawable/record" />
     
             <ImageButton android:id="@+id/playButton"
                 android:layout_height="match_parent" 
-                style="@android:style/MediaButton"
+                style="@style/MediaButton"
                 android:src="@drawable/play" />
     
             <ImageButton android:id="@+id/stopButton"
                 android:layout_height="match_parent" 
-                style="@android:style/MediaButton"
+                style="@style/MediaButton"
                 android:src="@drawable/stop" />
 
         </LinearLayout>
diff --git a/res/layout-port/main.xml b/res/layout-port/main.xml
index 816c0cc..8856dba 100644
--- a/res/layout-port/main.xml
+++ b/res/layout-port/main.xml
@@ -1,4 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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.
+-->
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
@@ -138,17 +152,17 @@
 
             <ImageButton android:id="@+id/recordButton"
                 android:layout_height="match_parent" 
-                style="@android:style/MediaButton"
+                style="@style/MediaButton"
                 android:src="@drawable/record" />
     
             <ImageButton android:id="@+id/playButton"
                 android:layout_height="match_parent" 
-                style="@android:style/MediaButton"
+                style="@style/MediaButton"
                 android:src="@drawable/play" />
     
             <ImageButton android:id="@+id/stopButton"
                 android:layout_height="match_parent" 
-                style="@android:style/MediaButton"
+                style="@style/MediaButton"
                 android:src="@drawable/stop" />
 
         </LinearLayout>
diff --git a/res/layout-xlarge/main.xml b/res/layout-xlarge/main.xml
new file mode 100644
index 0000000..89221c1
--- /dev/null
+++ b/res/layout-xlarge/main.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <ImageView
+         android:src="@android:drawable/divider_horizontal_dark"
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content"
+         android:scaleType="fitXY"/>
+
+    <RelativeLayout android:id="@+id/timerViewLayout"
+        android:layout_width="match_parent"
+        android:layout_height="242dip"
+        android:background="@drawable/gradient_bg">
+
+        <TextView android:id="@+id/timerView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:textSize="112dip"
+            android:layout_centerInParent="true"
+            style="@android:style/TextAppearance.Large" />
+
+        <LinearLayout android:id="@+id/stateMessage2Layout"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/timerView"
+            android:layout_centerHorizontal="true"
+            android:baselineAligned="false">
+
+            <ImageView android:id="@+id/stateLED"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_vertical" />
+
+            <TextView android:id="@+id/stateMessage2"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/recording"
+                android:layout_gravity="center_vertical"
+                android:layout_marginLeft="5px"
+                style="@android:style/TextAppearance.Medium"/>
+
+        </LinearLayout>
+
+        <TextView android:id="@+id/stateMessage1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/stateMessage2Layout"
+            android:layout_centerHorizontal="true"
+            style="@android:style/TextAppearance.Small" />
+
+        <ProgressBar android:id="@+id/stateProgressBar"
+            android:orientation="horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_above="@+id/timerView"
+            android:max="100"
+            android:progress="0"
+            android:layout_marginLeft="20dip"
+            android:layout_marginRight="20dip"
+            style="?android:attr/progressBarStyleHorizontal" />
+
+    </RelativeLayout>
+
+    <ImageView
+         android:src="@android:drawable/divider_horizontal_dark"
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content"
+         android:scaleType="fitXY"/>
+
+    <FrameLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+            <LinearLayout android:id="@+id/exitButtons"
+                android:orientation="horizontal"
+                android:gravity="center_vertical"
+                android:layout_gravity="center_vertical"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true" >
+
+                <Button android:id="@+id/acceptButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/accept"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="15dip"
+                    android:layout_marginRight="2dip" />
+
+                <Button android:id="@+id/discardButton"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:text="@string/discard"
+                    android:layout_weight="1"
+                    android:layout_marginLeft="2dip"
+                    android:layout_marginRight="15dip" />
+
+            </LinearLayout>
+
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="match_parent">
+
+            <com.android.soundrecorder.VUMeter android:id="@+id/uvMeter"
+                android:layout_width="200px"
+                android:layout_height="80px"
+                android:layout_centerInParent="true" />
+        </RelativeLayout>
+
+    </FrameLayout>
+
+    <ImageView
+         android:src="@android:drawable/divider_horizontal_dark"
+         android:layout_width="match_parent"
+         android:layout_height="wrap_content"
+         android:scaleType="fitXY"/>
+
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dip"
+        android:background="@android:drawable/title_bar"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
+
+        <LinearLayout
+            android:layout_marginTop="4dip"
+            android:layout_marginBottom="4dip"
+            android:orientation="horizontal"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent" >
+
+            <ImageButton android:id="@+id/recordButton"
+                android:layout_height="match_parent"
+                style="@style/MediaButton"
+                android:src="@drawable/record" />
+
+            <ImageButton android:id="@+id/playButton"
+                android:layout_height="match_parent"
+                style="@style/MediaButton"
+                android:src="@drawable/play" />
+
+            <ImageButton android:id="@+id/stopButton"
+                android:layout_height="match_parent"
+                style="@style/MediaButton"
+                android:src="@drawable/stop" />
+
+        </LinearLayout>
+
+    </LinearLayout>
+
+</LinearLayout>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index f9f5420..137e9e7 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"استخدام هذا التسجيل"</string>
     <string name="discard" msgid="761613433029406319">"إلغاء"</string>
     <string name="button_ok" msgid="3004911343723076226">"موافق"</string>
-    <string name="press_record" msgid="5039711805290780494">"اضغط على تسجيل"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"تسجيلاتك"</string>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 1e7dc9e..899b600 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Използване на този запис"</string>
     <string name="discard" msgid="761613433029406319">"Отхвърляне"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Натиснете за запис"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Вашите записи"</string>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index a8a85aa..7c9fb96 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utilitza aquest enregistrament"</string>
     <string name="discard" msgid="761613433029406319">"Descarta"</string>
     <string name="button_ok" msgid="3004911343723076226">"D\'acord"</string>
-    <string name="press_record" msgid="5039711805290780494">"Premeu \"enregistra\""</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Els vostres enregistraments"</string>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 9f41fb9..b728866 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Použít tento záznam"</string>
     <string name="discard" msgid="761613433029406319">"Zrušit"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Stiskněte tlačítko Záznam"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Vaše záznamy"</string>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 573e0c3..8d1eb3d 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Brug denne optagelse"</string>
     <string name="discard" msgid="761613433029406319">"Kassér"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Tryk på optag"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Dine optagelser"</string>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index fd12413..160d198 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Diese Aufnahme verwenden"</string>
     <string name="discard" msgid="761613433029406319">"Verwerfen"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Aufnahmetaste drücken"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Ihre Aufnahmen"</string>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index cbc6cd3..1029a86 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Χρησιμοποιήστε αυτήν την εγγραφή"</string>
     <string name="discard" msgid="761613433029406319">"Απόρριψη"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Πατήστε το κουμπί εγγραφής"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Οι εγγραφές σας"</string>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index 6128340..15e30b6 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Use this recording"</string>
     <string name="discard" msgid="761613433029406319">"Discard"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Press record"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Your recordings"</string>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index d7be913..9ac7b64 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utiliza esta grabación"</string>
     <string name="discard" msgid="761613433029406319">"Descartar"</string>
     <string name="button_ok" msgid="3004911343723076226">"Aceptar"</string>
-    <string name="press_record" msgid="5039711805290780494">"Presiona grabar"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Tus grabaciones"</string>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index 3a0537d..fc7051f 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utilizar esta grabación"</string>
     <string name="discard" msgid="761613433029406319">"Descartar"</string>
     <string name="button_ok" msgid="3004911343723076226">"Aceptar"</string>
-    <string name="press_record" msgid="5039711805290780494">"Pulsa el botón de grabación."</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Tus grabaciones"</string>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index e1159f0..68742ea 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"استفاده از این مورد ضبط شده"</string>
     <string name="discard" msgid="761613433029406319">"صرفنظر"</string>
     <string name="button_ok" msgid="3004911343723076226">"تأیید"</string>
-    <string name="press_record" msgid="5039711805290780494">"ضبط را فشار دهید"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"موارد ضبط شده شما"</string>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 4ac5b59..3fa111b 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Käytä tätä tallennetta"</string>
     <string name="discard" msgid="761613433029406319">"Hylkää"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Paina Tallenna"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Omat tallenteet"</string>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index fa2234d..6e645bc 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utiliser cet enregistrement audio"</string>
     <string name="discard" msgid="761613433029406319">"Supprimer"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Appuyez sur \"Enregistrer\""</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Vos enregistrements audio"</string>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index a3e5141..d5dee47 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Koristi ovaj snimak"</string>
     <string name="discard" msgid="761613433029406319">"Odbaci"</string>
     <string name="button_ok" msgid="3004911343723076226">"U redu"</string>
-    <string name="press_record" msgid="5039711805290780494">"Pritisnite za snimanje"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Vaši snimci"</string>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 1fd4caf..17758bc 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"A felvétel használata"</string>
     <string name="discard" msgid="761613433029406319">"Elvetés"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Nyomja meg a rögzítés gombot"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Saját felvételek"</string>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index d781b59..d4d35a0 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Gunakan rekaman ini"</string>
     <string name="discard" msgid="761613433029406319">"Buang"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Tekan rekam"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Rekaman Anda:"</string>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index 48e534b..15be8ac 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Usa questa registrazione"</string>
     <string name="discard" msgid="761613433029406319">"Ignora"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Premi Registra"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Registrazioni"</string>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index 1f4a32e..b1db79e 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"השתמש בהקלטה זו"</string>
     <string name="discard" msgid="761613433029406319">"מחק"</string>
     <string name="button_ok" msgid="3004911343723076226">"אישור"</string>
-    <string name="press_record" msgid="5039711805290780494">"לחץ על \'הקלט\'"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"ההקלטות שלך"</string>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 2b56a66..6410c85 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"この録音を使用"</string>
     <string name="discard" msgid="761613433029406319">"破棄"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"録音ボタンを押して録音"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"録音リスト"</string>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index a3961e3..ec9950c 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"이 녹음 메시지 사용"</string>
     <string name="discard" msgid="761613433029406319">"취소"</string>
     <string name="button_ok" msgid="3004911343723076226">"확인"</string>
-    <string name="press_record" msgid="5039711805290780494">"녹음 누르기"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"내 콘텐츠"</string>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index e266fb2..59b6a1d 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Naudoti šį įrašą"</string>
     <string name="discard" msgid="761613433029406319">"Atmesti"</string>
     <string name="button_ok" msgid="3004911343723076226">"Gerai"</string>
-    <string name="press_record" msgid="5039711805290780494">"Paspauskite „Įrašyti“"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Jūsų įrašai"</string>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index e2e48b2..b63009d 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Izmantot šo ierakstu"</string>
     <string name="discard" msgid="761613433029406319">"Atmest"</string>
     <string name="button_ok" msgid="3004911343723076226">"Labi"</string>
-    <string name="press_record" msgid="5039711805290780494">"Nospiediet Ierakstīt"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Jūsu ieraksti"</string>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index c2c37b1..2739548 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Bruk dette opptaket"</string>
     <string name="discard" msgid="761613433029406319">"Forkast"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Trykk «ta opp»"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Dine opptak"</string>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index fa34a42..6d4a84a 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Deze opname gebruiken"</string>
     <string name="discard" msgid="761613433029406319">"Weggooien"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Druk op \'Opnemen\'"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Uw opnamen"</string>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 3fb6deb..4144b6c 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Użyj tego nagrania"</string>
     <string name="discard" msgid="761613433029406319">"Odrzuć"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Naciśnij przycisk nagrywania"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Twoje nagrania"</string>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index 8bbc7e0..35d251e 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utilizar esta gravação"</string>
     <string name="discard" msgid="761613433029406319">"Rejeitar"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Prima gravar"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"As suas gravações"</string>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index 60faa26..0991785 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Usar esta gravação"</string>
     <string name="discard" msgid="761613433029406319">"Descartar"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Pressione gravar"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Suas gravações"</string>
diff --git a/res/values-rm/strings.xml b/res/values-rm/strings.xml
index 7196d5d..a31f143 100644
--- a/res/values-rm/strings.xml
+++ b/res/values-rm/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utilisar questa registraziun"</string>
     <string name="discard" msgid="761613433029406319">"Annullar"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Smatgar sin «Registrar»"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Vossas registraziuns"</string>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index 4a0b5d4..ac02020 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Utilizaţi această înregistrare"</string>
     <string name="discard" msgid="761613433029406319">"Renunţaţi"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Apăsaţi pe Înregistrare"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Înregistrările dvs."</string>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index c606d92..18486c6 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Использовать эту запись"</string>
     <string name="discard" msgid="761613433029406319">"Отменить"</string>
     <string name="button_ok" msgid="3004911343723076226">"ОК"</string>
-    <string name="press_record" msgid="5039711805290780494">"Нажмите \"Записать\""</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Ваши записи"</string>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index bdd4bcf..81d32c4 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Použiť tento záznam"</string>
     <string name="discard" msgid="761613433029406319">"Zahodiť"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Stlačte tlačidlo Záznam"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Vaše záznamy"</string>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index bb3c5a6..31fc669 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Uporabi ta posnetek"</string>
     <string name="discard" msgid="761613433029406319">"Zavrzi"</string>
     <string name="button_ok" msgid="3004911343723076226">"V redu"</string>
-    <string name="press_record" msgid="5039711805290780494">"Pritisnite »Snemaj«"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Vaši posnetki"</string>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index e430ef9..40cbea5 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Користи овај снимак"</string>
     <string name="discard" msgid="761613433029406319">"Одбаци"</string>
     <string name="button_ok" msgid="3004911343723076226">"Потврди"</string>
-    <string name="press_record" msgid="5039711805290780494">"Притисните дугме за снимање"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Ваши снимци"</string>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index 5ecb90b..9b1d143 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Använd den här inspelningen"</string>
     <string name="discard" msgid="761613433029406319">"Släng"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Tryck på spela in"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Dina inspelningar"</string>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 52f6b55..a51f1f4 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"ใช้การบันทึกนี้"</string>
     <string name="discard" msgid="761613433029406319">"ยกเลิก"</string>
     <string name="button_ok" msgid="3004911343723076226">"ตกลง"</string>
-    <string name="press_record" msgid="5039711805290780494">"กดบันทึก"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"การบันทึกของคุณ"</string>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 10fcb48..89d7b0a 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Gamitin ang pag-record na ito"</string>
     <string name="discard" msgid="761613433029406319">"Itapon"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Pindutin ang record"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Iyong mga pag-record"</string>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 01668f2..10493d4 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Bu kaydı kullan"</string>
     <string name="discard" msgid="761613433029406319">"Sil"</string>
     <string name="button_ok" msgid="3004911343723076226">"Tamam"</string>
-    <string name="press_record" msgid="5039711805290780494">"Kaydet düğmesine basın"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Kayıtlarınız"</string>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index f7bb7b9..db7f9b0 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Використ. цей запис"</string>
     <string name="discard" msgid="761613433029406319">"Відхилити"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Натисн. запис."</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Ваші записи"</string>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index d62b63e..78e8207 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"Sử dụng bản ghi này"</string>
     <string name="discard" msgid="761613433029406319">"Huỷ"</string>
     <string name="button_ok" msgid="3004911343723076226">"OK"</string>
-    <string name="press_record" msgid="5039711805290780494">"Nhấn vào ghi"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"Bản ghi của bạn"</string>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 69529c4..2e3dfa4 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"使用此录音"</string>
     <string name="discard" msgid="761613433029406319">"放弃"</string>
     <string name="button_ok" msgid="3004911343723076226">"确定"</string>
-    <string name="press_record" msgid="5039711805290780494">"按录音键"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"您的录音"</string>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index 53edf1b..aa6dc53 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -31,7 +31,6 @@
     <string name="accept" msgid="7770652589312551402">"使用此錄音"</string>
     <string name="discard" msgid="761613433029406319">"捨棄"</string>
     <string name="button_ok" msgid="3004911343723076226">"確定"</string>
-    <string name="press_record" msgid="5039711805290780494">"按下 [錄音]"</string>
     <!-- no translation found for audio_db_title_format (7912182366970749312) -->
     <skip />
     <string name="audio_db_artist_name" msgid="961640229118120080">"您的錄音"</string>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 0ca9a1b..b91e865 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -49,8 +49,6 @@
     <string name="button_ok">OK</string>
     <!-- Do not translate. Format of the timer that shows how much has been recorded so far -->
     <string name="timer_format" translatable="false"><xliff:g id="format">%02d:%02d</xliff:g></string>
-    <!-- label shown before the user has recorded anything -->
-    <string name="press_record">Press record</string>
    
     <!-- the name under which recordings will be visible in the media database is formatted like this --> 
     <string name="audio_db_title_format"><xliff:g id="format">yyyy-MM-dd HH:mm:ss</xliff:g></string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
new file mode 100644
index 0000000..1a541c9
--- /dev/null
+++ b/res/values/styles.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 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.
+-->
+<resources>
+    <style name="Theme.SoundRecorder" parent="@android:style/Theme.Holo.DialogWhenLarge">
+        <item name="android:windowCloseOnTouchOutside">true</item>
+    </style>
+    <style name="MediaButton" parent="@android:style/MediaButton">
+        <item name="android:background">@android:drawable/btn_default</item>
+    </style>
+</resources>
diff --git a/src/com/android/soundrecorder/Recorder.java b/src/com/android/soundrecorder/Recorder.java
index 1531c4e..b9654cd 100644
--- a/src/com/android/soundrecorder/Recorder.java
+++ b/src/com/android/soundrecorder/Recorder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
 package com.android.soundrecorder;
 
 import java.io.File;
diff --git a/src/com/android/soundrecorder/SoundRecorder.java b/src/com/android/soundrecorder/SoundRecorder.java
index a138625..76712b8 100644
--- a/src/com/android/soundrecorder/SoundRecorder.java
+++ b/src/com/android/soundrecorder/SoundRecorder.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
 package com.android.soundrecorder;
 
 import java.io.File;
@@ -709,10 +725,8 @@
                     mRecordButton.requestFocus();
                     
                     mStateMessage1.setVisibility(View.INVISIBLE);
-                    mStateLED.setVisibility(View.VISIBLE);
-                    mStateLED.setImageResource(R.drawable.idle_led);
-                    mStateMessage2.setVisibility(View.VISIBLE);
-                    mStateMessage2.setText(res.getString(R.string.press_record));
+                    mStateLED.setVisibility(View.INVISIBLE);
+                    mStateMessage2.setVisibility(View.INVISIBLE);
                     
                     mExitButtons.setVisibility(View.INVISIBLE);
                     mVUMeter.setVisibility(View.VISIBLE);
@@ -743,8 +757,7 @@
                 if (mSampleInterrupted) {
                     mStateMessage2.setVisibility(View.VISIBLE);
                     mStateMessage2.setText(res.getString(R.string.recording_stopped));
-                    mStateLED.setImageResource(R.drawable.idle_led);
-                    mStateLED.setVisibility(View.VISIBLE);                        
+                    mStateLED.setVisibility(View.INVISIBLE);
                 }
                 
                 if (mErrorUiMessage != null) {
diff --git a/src/com/android/soundrecorder/VUMeter.java b/src/com/android/soundrecorder/VUMeter.java
index 6aee87d..0396284 100644
--- a/src/com/android/soundrecorder/VUMeter.java
+++ b/src/com/android/soundrecorder/VUMeter.java
@@ -1,3 +1,19 @@
+/*
+ * Copyright (C) 2011 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.
+ */
+
 package com.android.soundrecorder;
 
 import java.util.Map;