diff --git a/android/res/layout-land/encode.xml b/android/res/layout-land/encode.xml
index eeced9b18..947f97017 100755
--- a/android/res/layout-land/encode.xml
+++ b/android/res/layout-land/encode.xml
@@ -39,7 +39,6 @@
               android:layout_gravity="center_vertical"
               android:gravity="center"
               android:textColor="@color/contents_text"
-              android:textSize="18sp"
               android:paddingRight="8dip"
               android:paddingTop="8dip"
               android:paddingBottom="8dip"/>
diff --git a/android/res/layout-land/share.xml b/android/res/layout-land/share.xml
index 8730c2ab6..5bbfe1f74 100755
--- a/android/res/layout-land/share.xml
+++ b/android/res/layout-land/share.xml
@@ -25,7 +25,7 @@
   <TextView
       android:layout_width="fill_parent"
       android:layout_height="wrap_content"
-      android:textSize="18sp"
+      android:gravity="center"
       android:text="@string/msg_share_explanation"
       android:paddingBottom="12dip"/>
 
@@ -83,7 +83,6 @@
   <EditText android:id="@+id/share_text_view"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textSize="16sp"
             android:hint="@string/msg_share_text"
             android:singleLine="true"
             android:selectAllOnFocus="true"/>
diff --git a/android/res/layout-ldpi/capture.xml b/android/res/layout-ldpi/capture.xml
index 261bfa0e8..a9b6b0975 100755
--- a/android/res/layout-ldpi/capture.xml
+++ b/android/res/layout-ldpi/capture.xml
@@ -33,7 +33,6 @@
                 android:layout_height="fill_parent"
                 android:background="@color/result_view"
                 android:visibility="gone"
-                android:padding="4dip"
                 android:baselineAligned="false">
 
     <LinearLayout
@@ -42,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="top"
-        android:padding="12dip">
+        android:padding="@dimen/standard_padding">
 
       <LinearLayout
           android:orientation="vertical"
@@ -55,7 +54,7 @@
                    android:layout_height="wrap_content"
                    android:maxWidth="150dip"
                    android:maxHeight="150dip"
-                   android:layout_marginBottom="4dip"
+                   android:layout_marginBottom="@dimen/half_padding"
                    android:adjustViewBounds="true"
                    android:scaleType="centerInside"/>
 
@@ -69,14 +68,12 @@
                     android:text="@string/msg_default_format"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/format_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -90,14 +87,12 @@
                     android:text="@string/msg_default_type"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/type_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -111,14 +106,12 @@
                     android:text="@string/msg_default_time"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/time_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -133,14 +126,12 @@
                     android:text="@string/msg_default_meta"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/meta_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -169,8 +160,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/result_text"
                     android:textColorLink="@color/result_text"
-                    android:textSize="14sp"
-                    android:padding="24dip"
+                    android:paddingLeft="12dip"
                     android:autoLink="web"
                     android:clickable="true"/>
 
@@ -189,34 +179,28 @@
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:id="@+id/shopper_button"
               android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:drawableLeft="@drawable/shopper_icon"
-              android:drawablePadding="4dip"
               android:text="@string/button_google_shopper"
               android:visibility="gone"/>
 
@@ -230,7 +214,6 @@
             android:layout_gravity="bottom|center_horizontal"
             android:background="@color/transparent"
             android:text="@string/msg_default_status"
-            android:textColor="@color/status_text"
-            android:textSize="14sp"/>
+            android:textColor="@color/status_text"/>
 
 </FrameLayout>
diff --git a/android/res/layout/bookmark_picker_list_item.xml b/android/res/layout/bookmark_picker_list_item.xml
index 6ff455d93..05c99ac2d 100644
--- a/android/res/layout/bookmark_picker_list_item.xml
+++ b/android/res/layout/bookmark_picker_list_item.xml
@@ -19,19 +19,16 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:padding="4dip">
-
+    android:padding="@dimen/half_padding">
 
   <TextView android:id="@+id/bookmark_title"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceLarge"
             android:singleLine="true"/>
 
   <TextView android:id="@+id/bookmark_url"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceSmall"
             android:singleLine="false"/>
 
 </LinearLayout>
diff --git a/android/res/layout/capture.xml b/android/res/layout/capture.xml
index c7e7881bb..6958ce65a 100755
--- a/android/res/layout/capture.xml
+++ b/android/res/layout/capture.xml
@@ -33,7 +33,6 @@
                 android:layout_height="fill_parent"
                 android:background="@color/result_view"
                 android:visibility="gone"
-                android:padding="4dip"
                 android:baselineAligned="false">
 
     <LinearLayout
@@ -42,7 +41,7 @@
         android:layout_height="wrap_content"
         android:layout_weight="1"
         android:gravity="center"
-        android:padding="12dip">
+        android:padding="@dimen/standard_padding">
 
       <LinearLayout
           android:orientation="vertical"
@@ -55,7 +54,7 @@
                    android:layout_height="wrap_content"
                    android:maxWidth="160dip"
                    android:maxHeight="160dip"
-                   android:layout_marginBottom="4dip"
+                   android:layout_marginBottom="@dimen/half_padding"
                    android:adjustViewBounds="true"
                    android:scaleType="centerInside"/>
 
@@ -69,14 +68,12 @@
                     android:text="@string/msg_default_format"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/format_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -90,14 +87,12 @@
                     android:text="@string/msg_default_type"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/type_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -111,14 +106,12 @@
                     android:text="@string/msg_default_time"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/time_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -133,14 +126,12 @@
                     android:text="@string/msg_default_meta"
                     android:textColor="@color/result_minor_text"
                     android:textStyle="bold"
-                    android:textSize="14sp"
-                    android:paddingRight="4dip"/>
+                    android:paddingRight="@dimen/half_padding"/>
 
           <TextView android:id="@+id/meta_text_view"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="@color/result_minor_text"
-                    android:textSize="14sp"/>
+                    android:textColor="@color/result_minor_text"/>
 
         </LinearLayout>
 
@@ -169,8 +160,7 @@
                     android:layout_height="wrap_content"
                     android:textColor="@color/result_text"
                     android:textColorLink="@color/result_text"
-                    android:textSize="14sp"
-                    android:padding="24dip"
+                    android:paddingLeft="12dip"
                     android:autoLink="web"/>
 
         </LinearLayout>
@@ -188,34 +178,28 @@
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:visibility="gone"/>
 
       <Button android:id="@+id/shopper_button"
               android:layout_width="0dip"
               android:layout_height="wrap_content"
               android:layout_weight="1"
-              android:textSize="14sp"
               android:drawableLeft="@drawable/shopper_icon"
-              android:drawablePadding="4dip"
               android:text="@string/button_google_shopper"
               android:visibility="gone"/>
 
@@ -229,7 +213,6 @@
             android:layout_gravity="bottom|center_horizontal"
             android:background="@color/transparent"
             android:text="@string/msg_default_status"
-            android:textColor="@color/status_text"
-            android:textSize="14sp"/>
+            android:textColor="@color/status_text"/>
 
 </FrameLayout>
diff --git a/android/res/layout/encode.xml b/android/res/layout/encode.xml
index 21c0b8094..0dfcbc535 100755
--- a/android/res/layout/encode.xml
+++ b/android/res/layout/encode.xml
@@ -40,10 +40,9 @@
               android:layout_gravity="center_horizontal"
               android:gravity="center"
               android:textColor="@color/contents_text"
-              android:textSize="18sp"
-              android:paddingBottom="8dip"
-              android:paddingLeft="8dip"
-              android:paddingRight="8dip"/>
+              android:paddingBottom="@dimen/standard_padding"
+              android:paddingLeft="@dimen/standard_padding"
+              android:paddingRight="@dimen/standard_padding"/>
 
   </ScrollView>
 
diff --git a/android/res/layout/help.xml b/android/res/layout/help.xml
index 7962460fe..f3cd333dc 100644
--- a/android/res/layout/help.xml
+++ b/android/res/layout/help.xml
@@ -22,9 +22,7 @@
   <WebView android:id="@+id/help_contents"
            android:layout_width="fill_parent"
            android:layout_height="wrap_content"
-           android:layout_weight="1"
-           android:fadingEdge="vertical"
-           android:fadingEdgeLength="12dip"/>
+           android:layout_weight="1"/>
 
   <LinearLayout
       android:layout_width="fill_parent"
@@ -32,7 +30,7 @@
       android:layout_weight="0"
       android:orientation="horizontal"
       android:gravity="center"
-      android:padding="4dip"
+      android:paddingTop="@dimen/half_padding"
       android:weightSum="1">
 
     <Button android:id="@+id/back_button"
diff --git a/android/res/layout/history_list_item.xml b/android/res/layout/history_list_item.xml
index c970e0a05..1e20d8cf4 100644
--- a/android/res/layout/history_list_item.xml
+++ b/android/res/layout/history_list_item.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:padding="8dip">
+    android:padding="@dimen/standard_padding">
 
   <TextView android:id="@+id/history_title"
             android:layout_width="fill_parent"
diff --git a/android/res/layout/search_book_contents_header.xml b/android/res/layout/search_book_contents_header.xml
index 36be6c335..0548eea84 100644
--- a/android/res/layout/search_book_contents_header.xml
+++ b/android/res/layout/search_book_contents_header.xml
@@ -17,8 +17,7 @@
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
           android:layout_width="fill_parent"
           android:layout_height="wrap_content"
-          android:paddingLeft="8dip"
-          android:paddingBottom="4dip"
+          android:paddingLeft="@dimen/standard_padding"
+          android:paddingBottom="@dimen/half_padding"
           android:enabled="false"
-          android:singleLine="true"
-          android:textSize="14sp"/>
+          android:singleLine="true"/>
diff --git a/android/res/layout/search_book_contents_list_item.xml b/android/res/layout/search_book_contents_list_item.xml
index 9f1957c54..229e24e22 100644
--- a/android/res/layout/search_book_contents_list_item.xml
+++ b/android/res/layout/search_book_contents_list_item.xml
@@ -19,22 +19,20 @@
     android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
-    android:padding="6dip">
+    android:padding="@dimen/standard_padding">
 
   <TextView android:id="@+id/page_number_view"
             android:layout_width="75dip"
             android:layout_height="wrap_content"
             android:layout_gravity="left|top"
-            android:layout_marginRight="8dip"
+            android:layout_marginRight="@dimen/standard_padding"
             android:singleLine="false"
-            android:textSize="14sp"
             android:textStyle="bold"/>
 
   <TextView android:id="@+id/snippet_view"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="left|top"
-            android:singleLine="false"
-            android:textSize="14sp"/>
+            android:singleLine="false"/>
 
 </com.google.zxing.client.android.book.SearchBookContentsListItem>
diff --git a/android/res/layout/share.xml b/android/res/layout/share.xml
index 6a57d2f87..933002b29 100755
--- a/android/res/layout/share.xml
+++ b/android/res/layout/share.xml
@@ -28,27 +28,27 @@
       android:layout_height="wrap_content"
       android:gravity="center"
       android:orientation="vertical"
-      android:padding="8dip">
+      android:padding="@dimen/standard_padding">
 
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="18sp"
+        android:gravity="center"
         android:text="@string/msg_share_explanation"
-        android:paddingBottom="8dip"/>
+        android:paddingBottom="@dimen/standard_padding"/>
 
     <ImageView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:scaleType="center"
         android:src="@drawable/share_via_barcode"
-        android:paddingBottom="8dip"/>
+        android:paddingBottom="@dimen/standard_padding"/>
 
     <LinearLayout
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingBottom="8dip">
+        android:paddingBottom="@dimen/standard_padding">
 
       <Button android:id="@+id/share_app_button"
               android:layout_width="fill_parent"
@@ -68,7 +68,7 @@
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:orientation="horizontal"
-        android:paddingBottom="8dip">
+        android:paddingBottom="@dimen/standard_padding">
 
       <Button android:id="@+id/share_contact_button"
               android:layout_width="fill_parent"
@@ -87,7 +87,6 @@
     <EditText android:id="@+id/share_text_view"
               android:layout_width="fill_parent"
               android:layout_height="wrap_content"
-              android:textSize="16sp"
               android:hint="@string/msg_share_text"
               android:singleLine="true"
               android:selectAllOnFocus="true"/>
diff --git a/android/res/values-ar/strings.xml b/android/res/values-ar/strings.xml
index d3744b3f6..190751b28 100644
--- a/android/res/values-ar/strings.xml
+++ b/android/res/values-ar/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">السابق</string>
   <string name="button_book_search">بحث في الكتب</string>
   <string name="button_cancel">إلغاء</string>
-  <string name="button_clipboard_empty">الحافظة فارغة</string>
   <string name="button_custom_product_search">بحث مخصص</string>
   <string name="button_dial">طلب رقم</string>
   <string name="button_done">تم</string>
   <string name="button_email">إرسال بريد</string>
   <string name="button_get_directions">معرفة الاتجاهات</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">إرسال MMS</string>
   <string name="button_ok">موافق</string>
   <string name="button_open_browser">فتح المتصفح</string>
diff --git a/android/res/values-bg/strings.xml b/android/res/values-bg/strings.xml
index 3ec787bd8..ecde25234 100644
--- a/android/res/values-bg/strings.xml
+++ b/android/res/values-bg/strings.xml
@@ -23,7 +23,6 @@
   <string name="button_back">Обратно</string>
   <string name="button_book_search">Търси Книга</string>
   <string name="button_cancel">Отказ</string>
-  <string name="button_clipboard_empty">Клипборд</string>
   <string name="button_custom_product_search">Потребителско търсене</string>
   <string name="button_dial">Набери телефон</string>
   <string name="button_done">Готово</string>
diff --git a/android/res/values-ca/strings.xml b/android/res/values-ca/strings.xml
index ef6f925ac..b8b29171f 100644
--- a/android/res/values-ca/strings.xml
+++ b/android/res/values-ca/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Enrere</string>
   <string name="button_book_search">Cerca el llibre</string>
   <string name="button_cancel">Cancel·la</string>
-  <string name="button_clipboard_empty">el porta-retalls és buit</string>
   <string name="button_custom_product_search">Cerca personalitzada</string>
   <string name="button_dial">Marca el número</string>
   <string name="button_done">Fet</string>
   <string name="button_email">Envia un correu electrònic</string>
   <string name="button_get_directions">Obté direccions</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Envia MMS</string>
   <string name="button_ok">D\'acord</string>
   <string name="button_open_browser">Obre el navegador</string>
diff --git a/android/res/values-cs/strings.xml b/android/res/values-cs/strings.xml
index 7506842cf..144d6823a 100644
--- a/android/res/values-cs/strings.xml
+++ b/android/res/values-cs/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Zpět</string>
   <string name="button_book_search">Hledat knihu</string>
   <string name="button_cancel">Zrušit</string>
-  <string name="button_clipboard_empty">Schránka je prázdná</string>
   <string name="button_custom_product_search">Vlastní vyhledávání</string>
   <string name="button_dial">Číselník</string>
   <string name="button_done">Hotovo</string>
   <string name="button_email">Poslat emailem</string>
   <string name="button_get_directions">Získat nastavení</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Poslat přes MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Otevřít prohlížeč</string>
diff --git a/android/res/values-da/strings.xml b/android/res/values-da/strings.xml
index 2579d97a0..608da56fb 100644
--- a/android/res/values-da/strings.xml
+++ b/android/res/values-da/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Tilbage</string>
   <string name="button_book_search">Bogsøgning</string>
   <string name="button_cancel">Annullér</string>
-  <string name="button_clipboard_empty">Udklipsholder er tom</string>
   <string name="button_custom_product_search">Brugerdefineret søgning</string>
   <string name="button_dial">Ring til nummeret</string>
   <string name="button_done">Færdig</string>
   <string name="button_email">Send e-mail</string>
   <string name="button_get_directions">Få kørselsanvisninger</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Send MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Åben browser</string>
diff --git a/android/res/values-de/strings.xml b/android/res/values-de/strings.xml
index c1dd8fe92..98f458284 100644
--- a/android/res/values-de/strings.xml
+++ b/android/res/values-de/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Zurück</string>
   <string name="button_book_search">Büchersuche</string>
   <string name="button_cancel">Abbruch</string>
-  <string name="button_clipboard_empty">Zwischenablage löschen</string>
   <string name="button_custom_product_search">Benutzersuche</string>
   <string name="button_dial">Nummer wählen</string>
   <string name="button_done">Fertig</string>
   <string name="button_email">E-Mail senden</string>
   <string name="button_get_directions">Route berechnen</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">MMS senden</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Browser öffnen</string>
diff --git a/android/res/values-el/strings.xml b/android/res/values-el/strings.xml
index 1fe77ae18..03fe701ba 100644
--- a/android/res/values-el/strings.xml
+++ b/android/res/values-el/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Πίσω</string>
   <string name="button_book_search">Αναζήτηση βιβλίων</string>
   <string name="button_cancel">Ακύρωση</string>
-  <string name="button_clipboard_empty">Πρόχειρο άδειο</string>
   <string name="button_custom_product_search">Σύνθετη αναζήτηση</string>
   <string name="button_dial">Κλήση αριθμού</string>
   <string name="button_done">Έγινε</string>
   <string name="button_email">Αποστολή email</string>
   <string name="button_get_directions">Λάβετε κατευθύνσεις</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Αποστολή MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Άνοιγμα browser</string>
diff --git a/android/res/values-es/strings.xml b/android/res/values-es/strings.xml
index 90739a17d..f6408294a 100644
--- a/android/res/values-es/strings.xml
+++ b/android/res/values-es/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Regresar</string>
   <string name="button_book_search">Búsqueda de libros</string>
   <string name="button_cancel">Cancelar</string>
-  <string name="button_clipboard_empty">Vaciar portapapeles</string>
   <string name="button_custom_product_search">Búsqueda personalizada</string>
   <string name="button_dial">Marcar número</string>
   <string name="button_done">Terminar</string>
   <string name="button_email">Enviar correo electrónico</string>
   <string name="button_get_directions">Obtener direcciones</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Enviar MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Abrir navegador</string>
diff --git a/android/res/values-eu/strings.xml b/android/res/values-eu/strings.xml
index 940ef9060..5aec92f50 100644
--- a/android/res/values-eu/strings.xml
+++ b/android/res/values-eu/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Atzera</string>
   <string name="button_book_search">Bilatu liburua</string>
   <string name="button_cancel">Utzi</string>
-  <string name="button_clipboard_empty">Arbela hutsik dago</string>
   <string name="button_custom_product_search">Bilaketa pertsonalizatua</string>
   <string name="button_dial">Markatu zenbakia</string>
   <string name="button_done">Eginda</string>
   <string name="button_email">Bidali e-posta</string>
   <string name="button_get_directions">Lortu jarraibideak</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Bidali MMS-a</string>
   <string name="button_ok">Ados</string>
   <string name="button_open_browser">Ireki arakatzailea</string>
diff --git a/android/res/values-fi/strings.xml b/android/res/values-fi/strings.xml
index 2f1d7b044..ef4a79242 100644
--- a/android/res/values-fi/strings.xml
+++ b/android/res/values-fi/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Takaisin</string>
   <string name="button_book_search">Kirjahaku</string>
   <string name="button_cancel">Peruuta</string>
-  <string name="button_clipboard_empty">Leikepöytä on tyhjä</string>
   <string name="button_custom_product_search">Mukautettu haku</string>
   <string name="button_dial">Soita numeroon</string>
   <string name="button_done">Valmis</string>
   <string name="button_email">Lähetä sähköpostia</string>
   <string name="button_get_directions">Hae ajo-ohjeet</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Lähetä multimediaviesti</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Avaa selain</string>
diff --git a/android/res/values-fr/strings.xml b/android/res/values-fr/strings.xml
index 5faf6c830..22cce0d13 100644
--- a/android/res/values-fr/strings.xml
+++ b/android/res/values-fr/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Retour</string>
   <string name="button_book_search">Recherche de livres</string>
   <string name="button_cancel">Annuler</string>
-  <string name="button_clipboard_empty">Vider le presse papier</string>
   <string name="button_custom_product_search">Recherche personalisée</string>
   <string name="button_dial">Composer numéro</string>
   <string name="button_done">Terminé</string>
   <string name="button_email">Envoyer email</string>
   <string name="button_get_directions">Obtenir adresses</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Envoyer MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Ouvrir le navigateur</string>
diff --git a/android/res/values-he/strings.xml b/android/res/values-he/strings.xml
index fdc95acf3..eafb05160 100755
--- a/android/res/values-he/strings.xml
+++ b/android/res/values-he/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">חזרה</string>
   <string name="button_book_search">חיפוש ספר</string>
   <string name="button_cancel">ביטול</string>
-  <string name="button_clipboard_empty">לוח העריכה ריק</string>
   <string name="button_custom_product_search">חיפוש מותאם אישית</string>
   <string name="button_dial">חייג מספר</string>
   <string name="button_done">סיים</string>
   <string name="button_email">שלח דואר אלקטרוני</string>
   <string name="button_get_directions">קבל הוראות הגעה</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">שלח הודעת מולטימדיה</string>
   <string name="button_ok">אישור</string>
   <string name="button_open_browser">פתח את הדפדפן</string>
diff --git a/android/res/values-hi/strings.xml b/android/res/values-hi/strings.xml
index 2e173beb4..8e8c938ae 100644
--- a/android/res/values-hi/strings.xml
+++ b/android/res/values-hi/strings.xml
@@ -23,7 +23,6 @@
   <string name="button_back">वापस</string>
   <string name="button_book_search">पुस्तक खोज</string>
   <string name="button_cancel">रद्द करना</string>
-  <string name="button_clipboard_empty">खाली क्लिपबोर्ड</string>
   <string name="button_custom_product_search">कस्टम खोज</string>
   <string name="button_dial">डायल नंबर</string>
   <string name="button_done">ठीक है</string>
diff --git a/android/res/values-hu/strings.xml b/android/res/values-hu/strings.xml
index 158cd70ab..4e8e43902 100644
--- a/android/res/values-hu/strings.xml
+++ b/android/res/values-hu/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Vissza</string>
   <string name="button_book_search">Könyv keresése</string>
   <string name="button_cancel">Mégse</string>
-  <string name="button_clipboard_empty">Üres a vágólap</string>
   <string name="button_custom_product_search">Egyedi keresés</string>
   <string name="button_dial">Telefonszám tárcsázása</string>
   <string name="button_done">Kész</string>
   <string name="button_email">E-mail küldése</string>
   <string name="button_get_directions">Útvonaltervezés</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">MMS küldése</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Böngésző megnyitása</string>
diff --git a/android/res/values-id/strings.xml b/android/res/values-id/strings.xml
index 3f1c3024a..034cc24df 100644
--- a/android/res/values-id/strings.xml
+++ b/android/res/values-id/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Kembali</string>
   <string name="button_book_search">Cari Buku</string>
   <string name="button_cancel">Batal</string>
-  <string name="button_clipboard_empty">Clipboard kosong</string>
   <string name="button_custom_product_search">Pencarian kustom</string>
   <string name="button_dial">Panggil nomor</string>
   <string name="button_done">Selesai</string>
   <string name="button_email">Kirim surel</string>
   <string name="button_get_directions">Dapatkan petunjuk arah</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Kirim MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Buka browser</string>
diff --git a/android/res/values-it/strings.xml b/android/res/values-it/strings.xml
index edc88e3b1..675dc292e 100644
--- a/android/res/values-it/strings.xml
+++ b/android/res/values-it/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Indietro</string>
   <string name="button_book_search">Cerca libro</string>
   <string name="button_cancel">Annulla</string>
-  <string name="button_clipboard_empty">Appunti vuoti</string>
   <string name="button_custom_product_search">Ricerca personalizzata</string>
   <string name="button_dial">Componi numero</string>
   <string name="button_done">Fatto</string>
   <string name="button_email">Invia email</string>
   <string name="button_get_directions">Ottieni indirizzi</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Invia MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Apri browser</string>
diff --git a/android/res/values-iw/strings.xml b/android/res/values-iw/strings.xml
index fdc95acf3..eafb05160 100644
--- a/android/res/values-iw/strings.xml
+++ b/android/res/values-iw/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">חזרה</string>
   <string name="button_book_search">חיפוש ספר</string>
   <string name="button_cancel">ביטול</string>
-  <string name="button_clipboard_empty">לוח העריכה ריק</string>
   <string name="button_custom_product_search">חיפוש מותאם אישית</string>
   <string name="button_dial">חייג מספר</string>
   <string name="button_done">סיים</string>
   <string name="button_email">שלח דואר אלקטרוני</string>
   <string name="button_get_directions">קבל הוראות הגעה</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">שלח הודעת מולטימדיה</string>
   <string name="button_ok">אישור</string>
   <string name="button_open_browser">פתח את הדפדפן</string>
diff --git a/android/res/values-ja/strings.xml b/android/res/values-ja/strings.xml
index 7377430eb..336ad6dfa 100644
--- a/android/res/values-ja/strings.xml
+++ b/android/res/values-ja/strings.xml
@@ -23,7 +23,6 @@
   <string name="button_back">戻る</string>
   <string name="button_book_search">書籍を検索</string>
   <string name="button_cancel">キャンセル</string>
-  <string name="button_clipboard_empty">クリップボードは空です</string>
   <string name="button_custom_product_search">カスタム サーチ</string>
   <string name="button_dial">発信</string>
   <string name="button_done">完了</string>
diff --git a/android/res/values-ko/strings.xml b/android/res/values-ko/strings.xml
index b6466be6e..7df7376f9 100644
--- a/android/res/values-ko/strings.xml
+++ b/android/res/values-ko/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">뒤로</string>
   <string name="button_book_search">책 검색</string>
   <string name="button_cancel">취소</string>
-  <string name="button_clipboard_empty">복사된 항목 없음</string>
   <string name="button_custom_product_search">사용자 지정 검색</string>
   <string name="button_dial">전화 걸기</string>
   <string name="button_done">완료</string>
   <string name="button_email">이메일 보내기</string>
   <string name="button_get_directions">방향을 찾기</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">MMS 보내기</string>
   <string name="button_ok">확인</string>
   <string name="button_open_browser">웹브라우저로 열기</string>
diff --git a/android/res/values-nl/strings.xml b/android/res/values-nl/strings.xml
index a88838021..0cf6a08cf 100644
--- a/android/res/values-nl/strings.xml
+++ b/android/res/values-nl/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Terug</string>
   <string name="button_book_search">Boeken zoeken</string>
   <string name="button_cancel">Annuleren</string>
-  <string name="button_clipboard_empty">Klembord legen</string>
   <string name="button_custom_product_search">Aangepast zoeken</string>
   <string name="button_dial">Nummer bellen</string>
   <string name="button_done">Gereed</string>
   <string name="button_email">E-mail versturen</string>
   <string name="button_get_directions">Routebeschrijving opvragen</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">MMS versturen</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Browser openen</string>
diff --git a/android/res/values-pl/strings.xml b/android/res/values-pl/strings.xml
index e0bed1068..59a8f7161 100644
--- a/android/res/values-pl/strings.xml
+++ b/android/res/values-pl/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Wstecz</string>
   <string name="button_book_search">Szukaj książek</string>
   <string name="button_cancel">Anuluj</string>
-  <string name="button_clipboard_empty">Schowek pusty</string>
   <string name="button_custom_product_search">Wyszukiwanie indywidualne</string>
   <string name="button_dial">Wykręć numer</string>
   <string name="button_done">Gotowe</string>
   <string name="button_email">Wyślij email</string>
   <string name="button_get_directions">Otrzymaj wskazówki</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Wyślij MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Otwórz przeglądarkę</string>
diff --git a/android/res/values-pt/strings.xml b/android/res/values-pt/strings.xml
index 7d8e8db16..e90599a42 100644
--- a/android/res/values-pt/strings.xml
+++ b/android/res/values-pt/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Voltar</string>
   <string name="button_book_search">Procurar livro</string>
   <string name="button_cancel">Cancelar</string>
-  <string name="button_clipboard_empty">Área de transferência vazia</string>
   <string name="button_custom_product_search">Pesquisa Personalizada</string>
   <string name="button_dial">Marcar número</string>
   <string name="button_done">Feito</string>
   <string name="button_email">Enviar e-mail</string>
   <string name="button_get_directions">Obter direcções</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Enviar MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Abrir navegador</string>
diff --git a/android/res/values-ru/strings.xml b/android/res/values-ru/strings.xml
index 824258cdf..8390cccad 100644
--- a/android/res/values-ru/strings.xml
+++ b/android/res/values-ru/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Назад</string>
   <string name="button_book_search">Поиск книги</string>
   <string name="button_cancel">Отмена</string>
-  <string name="button_clipboard_empty">Очистить буфер обмена</string>
   <string name="button_custom_product_search">Пользовательский поиск</string>
   <string name="button_dial">Набрать номер</string>
   <string name="button_done">Готово</string>
   <string name="button_email">Отправить e-mail</string>
   <string name="button_get_directions">Проложить маршрут</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Послать MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Открыть браузер</string>
diff --git a/android/res/values-sk/strings.xml b/android/res/values-sk/strings.xml
index 090236915..47d299dab 100644
--- a/android/res/values-sk/strings.xml
+++ b/android/res/values-sk/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Späť</string>
   <string name="button_book_search">Hľadať knihu</string>
   <string name="button_cancel">Zrušiť</string>
-  <string name="button_clipboard_empty">Schránka prázdna</string>
   <string name="button_custom_product_search">Prispôsobené vyhľadávanie</string>
   <string name="button_dial">Vytočiť číslo</string>
   <string name="button_done">Hotovo</string>
   <string name="button_email">Poslať e-mail</string>
   <string name="button_get_directions">Získať pokyny</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Poslať MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Otvoriť prehliadač</string>
diff --git a/android/res/values-sl/strings.xml b/android/res/values-sl/strings.xml
index 72dc34e75..d1c2bb471 100644
--- a/android/res/values-sl/strings.xml
+++ b/android/res/values-sl/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Nazaj</string>
   <string name="button_book_search">Išči knjigo</string>
   <string name="button_cancel">Prekliči</string>
-  <string name="button_clipboard_empty">Odložišče prazno</string>
   <string name="button_custom_product_search">Iskanje po meri</string>
   <string name="button_dial">Pokliči številko</string>
   <string name="button_done">Končano</string>
   <string name="button_email">Pošlji e-mail</string>
   <string name="button_get_directions">Dobi smer</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Pošlji MMS</string>
   <string name="button_ok">V redu</string>
   <string name="button_open_browser">Odpri brskalnik</string>
diff --git a/android/res/values-sv/strings.xml b/android/res/values-sv/strings.xml
index 156118bee..d45f27a36 100644
--- a/android/res/values-sv/strings.xml
+++ b/android/res/values-sv/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Tillbaka</string>
   <string name="button_book_search">Boksökning</string>
   <string name="button_cancel">Avbryt</string>
-  <string name="button_clipboard_empty">Klippbordet är tomt</string>
   <string name="button_custom_product_search">Anpassad sökning</string>
   <string name="button_dial">Ring nummer</string>
   <string name="button_done">Klar</string>
   <string name="button_email">Skicka email</string>
   <string name="button_get_directions">Hämta instruktioner</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Skicka MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Öppna webbläsare</string>
diff --git a/android/res/values-tr/strings.xml b/android/res/values-tr/strings.xml
index c49a137cd..eeb08f27a 100644
--- a/android/res/values-tr/strings.xml
+++ b/android/res/values-tr/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Geri</string>
   <string name="button_book_search">Kitap Arama</string>
   <string name="button_cancel">İptal</string>
-  <string name="button_clipboard_empty">Pano boş</string>
   <string name="button_custom_product_search">Özel arama</string>
   <string name="button_dial">Numaraya çağrı</string>
   <string name="button_done">Tamam</string>
   <string name="button_email">Email gönder</string>
   <string name="button_get_directions">Yön bilgisi al</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">MMS gönder</string>
   <string name="button_ok">Tamam</string>
   <string name="button_open_browser">Tarayıcıyı aç</string>
diff --git a/android/res/values-zh-rCN/strings.xml b/android/res/values-zh-rCN/strings.xml
index e4849d68e..3163ffd6f 100644
--- a/android/res/values-zh-rCN/strings.xml
+++ b/android/res/values-zh-rCN/strings.xml
@@ -23,7 +23,6 @@
   <string name="button_back">返回</string>
   <string name="button_book_search">打开图书搜索</string>
   <string name="button_cancel">取消</string>
-  <string name="button_clipboard_empty">清空剪切板</string>
   <string name="button_custom_product_search">自定义搜索</string>
   <string name="button_dial">拨号</string>
   <string name="button_done">完成</string>
diff --git a/android/res/values-zh-rTW/strings.xml b/android/res/values-zh-rTW/strings.xml
index b7e305679..f614e2745 100644
--- a/android/res/values-zh-rTW/strings.xml
+++ b/android/res/values-zh-rTW/strings.xml
@@ -23,7 +23,6 @@
   <string name="button_back">返回</string>
   <string name="button_book_search">打開圖書搜索</string>
   <string name="button_cancel">取消</string>
-  <string name="button_clipboard_empty">剪貼簿清空</string>
   <string name="button_custom_product_search">自定義搜索</string>
   <string name="button_dial">撥號</string>
   <string name="button_done">完成</string>
diff --git a/android/res/values/colors.xml b/android/res/values/colors.xml
index 8ed7b018a..07b0f96da 100755
--- a/android/res/values/colors.xml
+++ b/android/res/values/colors.xml
@@ -17,13 +17,13 @@
 <resources>
   <color name="contents_text">#ff000000</color>
   <color name="encode_view">#ffffffff</color>
-  <color name="possible_result_points">#c0ffff00</color>
+  <color name="possible_result_points">#c0ffbd21</color> <!-- Android standard ICS color -->
   <color name="result_minor_text">#ffc0c0c0</color>
-  <color name="result_points">#c000ff00</color>
+  <color name="result_points">#c099cc00</color> <!-- Android standard ICS color -->
   <color name="result_text">#ffffffff</color>
   <color name="result_view">#b0000000</color>
   <color name="status_text">#ffffffff</color>
   <color name="transparent">#00000000</color>
-  <color name="viewfinder_laser">#ffff0000</color>
+  <color name="viewfinder_laser">#ffcc0000</color> <!-- Android standard ICS color -->
   <color name="viewfinder_mask">#60000000</color>
 </resources>
diff --git a/android/res/values/dimens.xml b/android/res/values/dimens.xml
new file mode 100644
index 000000000..e03100921
--- /dev/null
+++ b/android/res/values/dimens.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources>
+  <dimen name="standard_padding">8dip</dimen>
+  <dimen name="half_padding">4dip</dimen>
+</resources>
\ No newline at end of file
diff --git a/android/res/values/strings.xml b/android/res/values/strings.xml
index 3b1ef3a1e..087e156c0 100755
--- a/android/res/values/strings.xml
+++ b/android/res/values/strings.xml
@@ -23,13 +23,12 @@
   <string name="button_back">Back</string>
   <string name="button_book_search">Book Search</string>
   <string name="button_cancel">Cancel</string>
-  <string name="button_clipboard_empty">Clipboard empty</string>
   <string name="button_custom_product_search">Custom search</string>
   <string name="button_dial">Dial number</string>
   <string name="button_done">Done</string>
   <string name="button_email">Send email</string>
   <string name="button_get_directions">Get directions</string>
-  <string name="button_google_shopper">Google Shopper</string>
+  <string name="button_google_shopper">Shopper</string>
   <string name="button_mms">Send MMS</string>
   <string name="button_ok">OK</string>
   <string name="button_open_browser">Open browser</string>
diff --git a/android/src/com/google/zxing/client/android/share/ShareActivity.java b/android/src/com/google/zxing/client/android/share/ShareActivity.java
index 1aa446212..67f10a179 100755
--- a/android/src/com/google/zxing/client/android/share/ShareActivity.java
+++ b/android/src/com/google/zxing/client/android/share/ShareActivity.java
@@ -132,15 +132,8 @@ public final class ShareActivity extends Activity {
   @Override
   protected void onResume() {
     super.onResume();
-
     ClipboardManager clipboard = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
-    if (clipboard.hasText()) {
-      clipboardButton.setEnabled(true);
-      clipboardButton.setText(R.string.button_share_clipboard);
-    } else {
-      clipboardButton.setEnabled(false);
-      clipboardButton.setText(R.string.button_clipboard_empty);
-    }
+    clipboardButton.setEnabled(clipboard.hasText());
   }
 
   @Override