From 9853804fd884bc3e64da0e2a82e51b421223e6dd Mon Sep 17 00:00:00 2001
From: Anthony Restaino <anthonyrestaino11@gmail.com>
Date: Thu, 29 Jan 2015 13:25:19 -0500
Subject: [PATCH] Complete Material Design for Settings

---
 res/drawable/toolbar_elevate.xml              |  19 +++
 res/layout/about_settings.xml                 |  28 ++--
 res/layout/advanced_settings.xml              |  46 +++----
 ...ark_activity.xml => bookmark_settings.xml} |  26 ++--
 res/layout/display_settings.xml               |  52 +++----
 res/layout/general_settings.xml               |  50 +++----
 res/layout/license_activity.xml               |  41 +++---
 res/layout/privacy_settings.xml               |  76 +++++------
 res/layout/settings.xml                       | 129 +++++++++---------
 res/layout/toolbar.xml                        |   2 +-
 res/layout/toolbar_settings.xml               |   4 +-
 res/values-v21/styles.xml                     |   1 +
 res/values/attr.xml                           |   1 +
 res/values/styles.xml                         |   1 +
 .../browser/lightning/BookmarkActivity.java   |   2 +-
 .../browser/lightning/LicenseActivity.java    |  11 +-
 .../browser/lightning/SettingsActivity.java   |  39 ++----
 17 files changed, 267 insertions(+), 261 deletions(-)
 create mode 100644 res/drawable/toolbar_elevate.xml
 rename res/layout/{bookmark_activity.xml => bookmark_settings.xml} (81%)

diff --git a/res/drawable/toolbar_elevate.xml b/res/drawable/toolbar_elevate.xml
new file mode 100644
index 0000000..e63e4b7
--- /dev/null
+++ b/res/drawable/toolbar_elevate.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item>
+        <shape
+            android:shape="rectangle" >
+
+            <solid android:color="@color/secondary_color_settings" />
+        </shape>
+    </item>
+    <item android:bottom="1dp">
+        <shape
+            android:shape="rectangle" >
+
+            <solid android:color="@color/primary_color" />
+        </shape>
+    </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/res/layout/about_settings.xml b/res/layout/about_settings.xml
index 3f5b726..243beac 100644
--- a/res/layout/about_settings.xml
+++ b/res/layout/about_settings.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/layoutSource"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -36,7 +36,7 @@
                         android:id="@+id/textView1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/action_follow_me"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -44,7 +44,7 @@
                         android:id="@+id/isImportAvailable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/url_twitter"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -54,15 +54,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutLicense"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -78,7 +78,7 @@
                         android:id="@+id/textView12"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/licenses"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
                 </LinearLayout>
@@ -87,15 +87,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutVersion"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -110,7 +110,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/version"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -118,7 +118,7 @@
                         android:id="@+id/versionCode"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="Small Text"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -128,8 +128,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/advanced_settings.xml b/res/layout/advanced_settings.xml
index 7f838c5..1de0dc5 100644
--- a/res/layout/advanced_settings.xml
+++ b/res/layout/advanced_settings.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/rAllowPopups"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -37,7 +37,7 @@
                         android:id="@+id/textView1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/window"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -45,7 +45,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/recommended"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -63,15 +63,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rAllowCookies"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -88,7 +88,7 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/cookies"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -96,7 +96,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/recommended"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -114,15 +114,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rAllowIncognitoCookies"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -138,7 +138,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/incognito_cookies"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -155,15 +155,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rRestoreTabs"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -174,7 +174,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/restore"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -190,15 +190,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <LinearLayout
                 android:id="@+id/layoutRendering"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:orientation="vertical"
                 android:paddingBottom="10dp"
@@ -207,7 +207,7 @@
                 <TextView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/rendering_mode"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -215,7 +215,7 @@
                     android:id="@+id/renderText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="Small Text"
                     android:textAppearance="?android:attr/textAppearanceSmall"
                     android:textColor="@color/light" />
@@ -224,8 +224,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/bookmark_activity.xml b/res/layout/bookmark_settings.xml
similarity index 81%
rename from res/layout/bookmark_activity.xml
rename to res/layout/bookmark_settings.xml
index ee44035..c722801 100644
--- a/res/layout/bookmark_activity.xml
+++ b/res/layout/bookmark_settings.xml
@@ -10,7 +10,7 @@
         android:id="@+id/exportBackup"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:gravity="center_vertical"
         android:orientation="vertical"
         android:paddingBottom="10dp"
@@ -20,7 +20,7 @@
             android:id="@+id/textView1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/export_bookmarks"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
@@ -28,15 +28,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
     <LinearLayout
         android:id="@+id/importBackup"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:gravity="center_vertical"
         android:orientation="vertical"
         android:paddingBottom="10dp"
@@ -46,7 +46,7 @@
             android:id="@+id/textView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/import_backup"
             android:textAppearance="?android:attr/textAppearanceMedium" />
     </LinearLayout>
@@ -54,22 +54,22 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
     <LinearLayout
         android:id="@+id/importFromBrowser"
         android:layout_width="match_parent"
         android:layout_height="60dp"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:gravity="center_vertical"
         android:orientation="vertical" >
 
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/importbookmarks"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -77,7 +77,7 @@
             android:id="@+id/isImportBrowserAvailable"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/recommended"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
@@ -86,8 +86,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/display_settings.xml b/res/layout/display_settings.xml
index eeefd09..68c6659 100644
--- a/res/layout/display_settings.xml
+++ b/res/layout/display_settings.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/rHideStatusBar"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -31,7 +31,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/fullScreenOption"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -47,15 +47,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rFullScreen"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -66,7 +66,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/fullscreen"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -82,15 +82,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rWideViewPort"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -107,7 +107,7 @@
                         android:id="@+id/textView1"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/wideViewPort"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -115,7 +115,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/recommended"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -133,15 +133,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rOverView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -158,7 +158,7 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/overViewMode"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -166,7 +166,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/recommended"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -184,15 +184,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rTextReflow"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -203,7 +203,7 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/reflow"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -219,15 +219,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rTextSize"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -237,7 +237,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/size"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -245,8 +245,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/general_settings.xml b/res/layout/general_settings.xml
index a2c6e09..53ac6c7 100644
--- a/res/layout/general_settings.xml
+++ b/res/layout/general_settings.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/layoutUserAgent"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -36,7 +36,7 @@
                         android:id="@+id/textView4"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/agent"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -44,7 +44,7 @@
                         android:id="@+id/agentText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="Small Text"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -54,15 +54,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutDownload"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -78,7 +78,7 @@
                         android:id="@+id/textView5"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/download"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -86,7 +86,7 @@
                         android:id="@+id/downloadText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="Small Text"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -96,15 +96,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutHomepage"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -120,7 +120,7 @@
                         android:id="@+id/textView6"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/home"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -128,7 +128,7 @@
                         android:id="@+id/homepageText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="Small Text"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -138,15 +138,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutSearch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -161,7 +161,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/search"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -169,7 +169,7 @@
                         android:id="@+id/searchText"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="Small Text"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -179,15 +179,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rGoogleSuggestions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -203,7 +203,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/google_suggestions"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -211,7 +211,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/powered_by_google"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -229,8 +229,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/license_activity.xml b/res/layout/license_activity.xml
index 5d11ced..53a53f5 100644
--- a/res/layout/license_activity.xml
+++ b/res/layout/license_activity.xml
@@ -3,14 +3,13 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical" >
-    
     <include layout="@layout/toolbar_settings" />
 
     <LinearLayout
         android:id="@+id/browserLicense"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:orientation="vertical"
         android:paddingBottom="10dp"
         android:paddingTop="10dp" >
@@ -19,7 +18,7 @@
             android:id="@+id/textView1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/app_name"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -27,7 +26,7 @@
             android:id="@+id/isImportAvailable1"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/mpl_license"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
@@ -36,15 +35,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
     <LinearLayout
         android:id="@+id/licenseAOSP"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:orientation="vertical"
         android:paddingBottom="10dp"
         android:paddingTop="10dp" >
@@ -53,7 +52,7 @@
             android:id="@+id/textView2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/android_open_source_project"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -61,7 +60,7 @@
             android:id="@+id/isImportAvailable2"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/apache"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
@@ -70,15 +69,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
     <LinearLayout
         android:id="@+id/licenseHosts"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:orientation="vertical"
         android:paddingBottom="10dp"
         android:paddingTop="10dp" >
@@ -87,7 +86,7 @@
             android:id="@+id/textView3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/hphosts_ad_server_list"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -95,7 +94,7 @@
             android:id="@+id/isImportAvailable3"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/freeware"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
@@ -104,15 +103,15 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
     <LinearLayout
         android:id="@+id/licenseOrbot"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="?android:attr/listChoiceBackgroundIndicator"
+        android:background="?attr/listChoiceBackgroundIndicator"
         android:orientation="vertical"
         android:paddingBottom="10dp"
         android:paddingTop="10dp" >
@@ -121,7 +120,7 @@
             android:id="@+id/textView4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/library_netcipher"
             android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -129,7 +128,7 @@
             android:id="@+id/isImportAvailable4"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingLeft="10dp"
+            android:paddingLeft="16dp"
             android:text="@string/license_gnu"
             android:textAppearance="?android:attr/textAppearanceSmall"
             android:textColor="@color/light" />
@@ -138,8 +137,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="1dp"
-        android:layout_marginLeft="5dp"
-        android:layout_marginRight="5dp"
+        android:layout_marginLeft="10dp"
+        android:layout_marginRight="10dp"
         android:background="#cdcdcd" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/privacy_settings.xml b/res/layout/privacy_settings.xml
index e5bea2e..0d2a8d5 100644
--- a/res/layout/privacy_settings.xml
+++ b/res/layout/privacy_settings.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/rLocation"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -32,7 +32,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/location"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -48,15 +48,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rSavePasswords"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -73,7 +73,7 @@
                         android:id="@+id/textView2"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/password"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -82,7 +82,7 @@
                         android:id="@+id/textView3"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/recommended"
                         android:textAppearance="?android:attr/textAppearanceSmall"
@@ -100,15 +100,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rClearCacheExit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -120,7 +120,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/cache"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -136,15 +136,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rClearHistoryExit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -155,7 +155,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/clear_history_exit"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -171,15 +171,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rClearCookiesExit"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -190,7 +190,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="30dp"
                     android:text="@string/clear_cookies_exit"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -206,15 +206,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rBrowserHistory"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -230,7 +230,7 @@
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:paddingRight="30dp"
                         android:text="@string/sync_history"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
@@ -239,7 +239,7 @@
                         android:id="@+id/isBrowserAvailable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="text"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -256,15 +256,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rClearCache"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -274,7 +274,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/clear_cache"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -282,15 +282,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rClearHistory"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -300,7 +300,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/history"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -308,15 +308,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/rClearCookies"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -326,7 +326,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/clear_cookies"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -334,8 +334,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index a650fd6..b8de31e 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -20,7 +20,7 @@
                 android:id="@+id/layoutFlash"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -32,32 +32,31 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="60dp"
                     android:text="@string/flash"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <RelativeLayout
-                    android:id="@+id/setR1"
+                <CheckBox
+                    android:id="@+id/cbFlash"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" >
-                </RelativeLayout>
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutAdBlock"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -68,32 +67,31 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="60dp"
                     android:text="@string/block_ads"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <RelativeLayout
-                    android:id="@+id/setR2"
+                <CheckBox
+                    android:id="@+id/cbAdblock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" >
-                </RelativeLayout>
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutImages"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -105,32 +103,31 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="60dp"
                     android:text="@string/block"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <RelativeLayout
-                    android:id="@+id/setR3"
+                <CheckBox
+                    android:id="@+id/cbImageBlock"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" >
-                </RelativeLayout>
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutEnableJS"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -142,32 +139,31 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="60dp"
                     android:text="@string/java"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <RelativeLayout
-                    android:id="@+id/setR4"
+                <CheckBox
+                    android:id="@+id/cbJavascript"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" >
-                </RelativeLayout>
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutUseOrbot"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingRight="10dp"
@@ -178,32 +174,31 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:paddingRight="60dp"
                     android:text="@string/enable_orbot"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
 
-                <RelativeLayout
-                    android:id="@+id/setR5"
+                <CheckBox
+                    android:id="@+id/cbOrbot"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"
-                    android:layout_centerVertical="true" >
-                </RelativeLayout>
+                    android:layout_centerVertical="true" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_height="1dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutGeneral"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -214,7 +209,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/settings_general"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -222,15 +217,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutBookmarks"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -240,7 +235,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/bookmark_settings"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -248,15 +243,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutDisplay"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -267,7 +262,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/settings_display"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -275,15 +270,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutPrivacy"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -294,7 +289,7 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/settings_privacy"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
@@ -302,15 +297,15 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutAdvanced"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -321,23 +316,23 @@
                     android:layout_height="wrap_content"
                     android:layout_alignParentLeft="true"
                     android:layout_centerVertical="true"
-                    android:paddingLeft="10dp"
+                    android:paddingLeft="16dp"
                     android:text="@string/settings_advanced"
                     android:textAppearance="?android:attr/textAppearanceMedium" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="match_parent"
-                android:layout_height="2dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_height="1dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
 
             <RelativeLayout
                 android:id="@+id/layoutAbout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:background="?android:attr/listChoiceBackgroundIndicator"
+                android:background="?attr/listChoiceBackgroundIndicator"
                 android:minHeight="60dp"
                 android:paddingBottom="10dp"
                 android:paddingTop="10dp" >
@@ -353,7 +348,7 @@
                         android:id="@+id/textView11"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/settings_about"
                         android:textAppearance="?android:attr/textAppearanceMedium" />
 
@@ -361,7 +356,7 @@
                         android:id="@+id/isImportAvailable"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                        android:paddingLeft="10dp"
+                        android:paddingLeft="16dp"
                         android:text="@string/settings_about_explain"
                         android:textAppearance="?android:attr/textAppearanceSmall"
                         android:textColor="@color/light" />
@@ -371,8 +366,8 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="1dp"
-                android:layout_marginLeft="5dp"
-                android:layout_marginRight="5dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
                 android:background="#cdcdcd" />
         </LinearLayout>
     </ScrollView>
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
index 1dcc2ac..c99c27c 100644
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -19,8 +19,8 @@
         android:id="@+id/progress_view"
         android:layout_width="match_parent"
         android:layout_height="2dp"
-        custom:bidirectionalAnimate="false"
         custom:backgroundColor="?attr/progressBackgroundColor"
+        custom:bidirectionalAnimate="false"
         custom:progressColor="?attr/colorAccent" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/toolbar_settings.xml b/res/layout/toolbar_settings.xml
index 8960859..bf3cf82 100644
--- a/res/layout/toolbar_settings.xml
+++ b/res/layout/toolbar_settings.xml
@@ -4,8 +4,8 @@
     android:id="@+id/toolbar"
     android:layout_width="match_parent"
     android:layout_height="?attr/actionBarSize"
-    android:background="?colorPrimary"
-    android:minHeight="?attr/actionBarSize"
+    android:background="?toolbarSettingsBackground"
     android:elevation="2dp"
+    android:minHeight="?attr/actionBarSize"
     custom:contentInsetEnd="0dp"
     custom:contentInsetStart="0dp" />
diff --git a/res/values-v21/styles.xml b/res/values-v21/styles.xml
index a44c162..6019678 100644
--- a/res/values-v21/styles.xml
+++ b/res/values-v21/styles.xml
@@ -4,6 +4,7 @@
     <style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light">
 
         <!-- customize the color palette -->
+        <item name="toolbarSettingsBackground">@color/primary_color</item>
         <item name="listBackground">@drawable/list_bg</item>
         <item name="colorPrimary">@color/primary_color</item>
         <item name="colorPrimaryDark">@color/secondary_color_settings</item>
diff --git a/res/values/attr.xml b/res/values/attr.xml
index f76257b..a794e07 100644
--- a/res/values/attr.xml
+++ b/res/values/attr.xml
@@ -9,6 +9,7 @@
     <attr name="listBackground" format="reference|color" />
     <attr name="progressBackgroundColor" format="color" />
     <attr name="searchBackground" format="reference|color" />
+    <attr name="toolbarSettingsBackground" format="reference|color" />
 
     <declare-styleable name="AnimatedProgressBar">
         <attr name="progressColor" format="color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9b16adf..6d31637 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -4,6 +4,7 @@
     <style name="Theme.SettingsTheme" parent="Theme.AppCompat.Light">
 
         <!-- customize the color palette -->
+        <item name="toolbarSettingsBackground">@drawable/toolbar_elevate</item>
         <item name="listBackground">@drawable/list_bg</item>
         <item name="colorPrimary">@color/primary_color</item>
         <item name="colorPrimaryDark">@color/secondary_color_settings</item>
diff --git a/src/acr/browser/lightning/BookmarkActivity.java b/src/acr/browser/lightning/BookmarkActivity.java
index 3f51af2..e4d99f4 100644
--- a/src/acr/browser/lightning/BookmarkActivity.java
+++ b/src/acr/browser/lightning/BookmarkActivity.java
@@ -32,7 +32,7 @@ public class BookmarkActivity extends ActionBarActivity implements OnClickListen
 	@Override
 	public void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
-		setContentView(R.layout.bookmark_activity);
+		setContentView(R.layout.bookmark_settings);
 
 		// set up ActionBar
         Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
diff --git a/src/acr/browser/lightning/LicenseActivity.java b/src/acr/browser/lightning/LicenseActivity.java
index fe38949..15e9642 100644
--- a/src/acr/browser/lightning/LicenseActivity.java
+++ b/src/acr/browser/lightning/LicenseActivity.java
@@ -3,10 +3,11 @@
  */
 package acr.browser.lightning;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
+import android.support.v7.app.ActionBarActivity;
+import android.support.v7.widget.Toolbar;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -15,14 +16,16 @@ import android.view.View;
  *under which this code is licensed. Unless you plan on providing other attribution in the app to 
  *the original source in another visible way, it is advised against the removal of this Activity.
  */
-public class LicenseActivity extends Activity implements View.OnClickListener {
+public class LicenseActivity extends ActionBarActivity implements View.OnClickListener {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {
 		super.onCreate(savedInstanceState);
 		setContentView(R.layout.license_activity);
-		getActionBar().setHomeButtonEnabled(true);
-		getActionBar().setDisplayHomeAsUpEnabled(true);
+		Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+		setSupportActionBar(toolbar);
+
+		getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 		findViewById(R.id.browserLicense).setOnClickListener(this);
 		findViewById(R.id.licenseAOSP).setOnClickListener(this);
 		findViewById(R.id.licenseHosts).setOnClickListener(this);
diff --git a/src/acr/browser/lightning/SettingsActivity.java b/src/acr/browser/lightning/SettingsActivity.java
index fa5c444..1ab853e 100644
--- a/src/acr/browser/lightning/SettingsActivity.java
+++ b/src/acr/browser/lightning/SettingsActivity.java
@@ -26,7 +26,6 @@ import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.EditText;
 import android.widget.RelativeLayout;
-import android.widget.Switch;
 import info.guardianproject.onionkit.ui.OrbotHelper;
 
 public class SettingsActivity extends ActionBarActivity {
@@ -94,24 +93,12 @@ public class SettingsActivity extends ActionBarActivity {
 		boolean imagesBool = mPreferences.getBoolean(PreferenceConstants.BLOCK_IMAGES, false);
 		boolean enableJSBool = mPreferences.getBoolean(PreferenceConstants.JAVASCRIPT, true);
 
-		RelativeLayout r1, r2, r3, r4, r5;
-		r1 = (RelativeLayout) findViewById(R.id.setR1);
-		r2 = (RelativeLayout) findViewById(R.id.setR2);
-		r3 = (RelativeLayout) findViewById(R.id.setR3);
-		r4 = (RelativeLayout) findViewById(R.id.setR4);
-		r5 = (RelativeLayout) findViewById(R.id.setR5);
-
-		Switch flash = new Switch(this);
-		Switch adblock = new Switch(this);
-		Switch images = new Switch(this);
-		Switch enablejs = new Switch(this);
-		Switch orbot = new Switch(this);
-
-		r1.addView(flash);
-		r2.addView(adblock);
-		r3.addView(images);
-		r4.addView(enablejs);
-		r5.addView(orbot);
+		CheckBox flash = (CheckBox) findViewById(R.id.cbFlash);
+		CheckBox adblock = (CheckBox) findViewById(R.id.cbAdblock);
+		CheckBox images = (CheckBox) findViewById(R.id.cbImageBlock);
+		CheckBox enablejs = (CheckBox) findViewById(R.id.cbJavascript);
+		CheckBox orbot = (CheckBox) findViewById(R.id.cbOrbot);
+
 		images.setChecked(imagesBool);
 		enablejs.setChecked(enableJSBool);
 		if (flashNum > 0) {
@@ -122,8 +109,8 @@ public class SettingsActivity extends ActionBarActivity {
 		adblock.setChecked(mPreferences.getBoolean(PreferenceConstants.BLOCK_ADS, false));
 		orbot.setChecked(mPreferences.getBoolean(PreferenceConstants.USE_PROXY, false));
 
-		initSwitch(flash, adblock, images, enablejs, orbot);
-		clickListenerForSwitches(layoutFlash, layoutBlockAds, layoutImages, layoutEnableJS, 
+		initCheckBox(flash, adblock, images, enablejs, orbot);
+		clickListenerForCheckBoxes(layoutFlash, layoutBlockAds, layoutImages, layoutEnableJS, 
 				layoutOrbot, flash, adblock, images, enablejs, orbot);
 
 		RelativeLayout general = (RelativeLayout) findViewById(R.id.layoutGeneral);
@@ -139,10 +126,10 @@ public class SettingsActivity extends ActionBarActivity {
 		about(about);
 	}
 
-	public void clickListenerForSwitches(RelativeLayout layoutFlash, RelativeLayout layoutBlockAds,
+	public void clickListenerForCheckBoxes(RelativeLayout layoutFlash, RelativeLayout layoutBlockAds,
 			RelativeLayout layoutImages, RelativeLayout layoutEnableJS, RelativeLayout layoutOrbot,
-			final Switch flash, final Switch adblock, final Switch images, final Switch enablejs, 
-			final Switch orbot) {
+			final CheckBox flash, final CheckBox adblock, final CheckBox images, final CheckBox enablejs, 
+			final CheckBox orbot) {
 		layoutFlash.setOnClickListener(new OnClickListener() {
 
 			@Override
@@ -195,8 +182,8 @@ public class SettingsActivity extends ActionBarActivity {
 		});
 	}
 
-	public void initSwitch(Switch flash, Switch adblock, Switch images, Switch enablejs,
-			Switch orbot) {
+	public void initCheckBox(CheckBox flash, CheckBox adblock, CheckBox images, CheckBox enablejs,
+			CheckBox orbot) {
 		flash.setEnabled(API < 19);
 		flash.setOnCheckedChangeListener(new OnCheckedChangeListener() {