diff --git a/res/layout/settings.xml b/res/layout/settings.xml
index 4101891f0..a1203aa9d 100644
--- a/res/layout/settings.xml
+++ b/res/layout/settings.xml
@@ -8,6 +8,7 @@
     android:paddingLeft="@dimen/activity_horizontal_margin"
     android:paddingRight="@dimen/activity_horizontal_margin"
     android:paddingTop="@dimen/activity_vertical_margin"
+    android:scrollbarStyle="outsideOverlay"
     tools:ignore="HardcodedText,TooManyViews,Overdraw" >
 
     <LinearLayout
@@ -28,141 +29,133 @@
             android:layout_marginBottom="6dp"
             android:background="#888888" />
 
-        <CheckBox
-            android:id="@+id/cbNotify"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_notify" />
-
-        <CheckBox
-            android:id="@+id/cbOnDemand"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_ondemand" />
-
-        <CheckBox
-            android:id="@+id/cbBlacklist"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_blacklist" />
-
-        <CheckBox
-            android:id="@+id/cbUsage"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_usagedata" />
-
-        <CheckBox
-            android:id="@+id/cbParameters"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_parameters" />
-
-        <CheckBox
-            android:id="@+id/cbLog"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_log" />
-
-        <CheckBox
-            android:id="@+id/cbExpert"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/settings_expert" />
-
-        <CheckBox
-            android:id="@+id/cbSystem"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:background="?attr/color_dangerous"
-            android:text="@string/settings_syscomponents" />
+            android:divider="?android:attr/listDivider"
+            android:orientation="vertical"
+            android:showDividers="middle" >
+
+            <CheckBox
+                android:id="@+id/cbNotify"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_notify" />
+
+            <CheckBox
+                android:id="@+id/cbOnDemand"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_ondemand" />
+
+            <CheckBox
+                android:id="@+id/cbBlacklist"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_blacklist" />
+
+            <CheckBox
+                android:id="@+id/cbUsage"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_usagedata" />
+
+            <CheckBox
+                android:id="@+id/cbParameters"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_parameters" />
+
+            <CheckBox
+                android:id="@+id/cbLog"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_log" />
+
+            <CheckBox
+                android:id="@+id/cbExpert"
+                style="@style/PreferenceLine"
+                android:text="@string/settings_expert" />
+
+            <CheckBox
+                android:id="@+id/cbSystem"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:background="?attr/color_dangerous"
+                android:text="@string/settings_syscomponents" />
+
+            <CheckBox
+                android:id="@+id/cbExperimental"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:text="@string/settings_experimental"
+                android:visibility="gone" />
+
+            <CheckBox
+                android:id="@+id/cbHttps"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:text="@string/settings_https" />
+
+            <CheckBox
+                android:id="@+id/cbAOSP"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:text="@string/settings_aosp"
+                android:visibility="gone" />
+
+            <LinearLayout
+                android:id="@+id/llConfidence"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:orientation="horizontal" >
 
-        <CheckBox
-            android:id="@+id/cbExperimental"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/settings_experimental"
-            android:visibility="gone" />
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:text="@string/settings_confidence"
+                    android:textIsSelectable="false" />
 
-        <CheckBox
-            android:id="@+id/cbHttps"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/settings_https" />
+                <EditText
+                    android:id="@+id/etConfidence"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:hint="35"
+                    android:inputType="numberDecimal"
+                    android:maxLength="2"
+                    tools:ignore="HardcodedText" />
+            </LinearLayout>
 
-        <CheckBox
-            android:id="@+id/cbAOSP"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/settings_aosp"
-            android:visibility="gone" />
+            <LinearLayout
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:orientation="horizontal" >
 
-        <LinearLayout
-            android:id="@+id/llConfidence"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:gravity="center_vertical"
-            android:orientation="horizontal" >
-
-            <TextView
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:text="@string/settings_confidence"
-                android:textIsSelectable="false" />
-
-            <EditText
-                android:id="@+id/etConfidence"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:hint="35"
-                android:inputType="numberDecimal"
-                android:maxLength="2"
-                tools:ignore="HardcodedText" />
-        </LinearLayout>
+                <TextView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="@string/settings_quirks"
+                    android:textIsSelectable="false" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:orientation="horizontal" >
-
-            <TextView
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="end"
-                android:singleLine="true"
-                android:text="@string/settings_quirks"
-                android:textIsSelectable="false" />
-
-            <EditText
-                android:id="@+id/etQuirks"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:hint="freeze,resolve,test"
-                android:inputType="text"
-                tools:ignore="HardcodedText" />
+                <EditText
+                    android:id="@+id/etQuirks"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:hint="freeze,resolve,test"
+                    android:inputType="text"
+                    tools:ignore="HardcodedText" />
+            </LinearLayout>
+
+            <Button
+                android:id="@+id/btnFlush"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:gravity="center"
+                android:text="@string/menu_flush" />
+
+            <Button
+                android:id="@+id/btnClearDb"
+                style="@style/PreferenceLine"
+                android:layout_marginLeft="30dip"
+                android:gravity="center"
+                android:text="@string/menu_clear_db" />
         </LinearLayout>
 
-        <Button
-            android:id="@+id/btnFlush"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/menu_flush" />
-
-        <Button
-            android:id="@+id/btnClearDb"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="30dip"
-            android:text="@string/menu_clear_db" />
-
         <TextView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
@@ -177,31 +170,45 @@
             android:layout_marginBottom="6dp"
             android:background="#888888" />
 
-        <CheckBox
-            android:id="@+id/cbRandom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/msg_random_boot" />
-
-        <Button
-            android:id="@+id/btnRandom"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/msg_random_now" />
-
-        <Button
-            android:id="@+id/btnClear"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:text="@string/menu_clear" />
-
         <TableLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:divider="?android:attr/listDivider"
+            android:showDividers="middle"
             android:shrinkColumns="2"
             android:stretchColumns="2" >
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
+
+                <CheckBox
+                    android:id="@+id/cbRandom"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_span="3"
+                    android:text="@string/msg_random_boot" />
+            </TableRow>
+
+            <TableRow style="@style/PreferenceLine" >
+
+                <Button
+                    android:id="@+id/btnClear"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_span="3"
+                    android:text="@string/menu_clear" />
+            </TableRow>
+
+            <TableRow style="@style/PreferenceLine" >
+
+                <Button
+                    android:id="@+id/btnRandom"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_span="3"
+                    android:text="@string/msg_random_now" />
+            </TableRow>
+
+            <TableRow style="@style/PreferenceLine" >
 
                 <ImageView
                     android:layout_width="wrap_content"
@@ -217,7 +224,7 @@
                     android:textIsSelectable="false" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbSerial" />
 
@@ -233,7 +240,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbLat" />
 
@@ -249,7 +256,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbLon" />
 
@@ -265,7 +272,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbAlt" />
 
@@ -281,7 +288,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -300,7 +307,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbMac" />
 
@@ -318,7 +325,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -335,7 +342,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbImei" />
 
@@ -353,7 +360,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbPhone" />
 
@@ -369,7 +376,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbId" />
 
@@ -386,7 +393,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbGsfId" />
 
@@ -403,7 +410,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbAdId" />
 
@@ -420,7 +427,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -437,7 +444,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -454,7 +461,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbCountry" />
 
@@ -472,7 +479,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -488,7 +495,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -504,7 +511,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -520,7 +527,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
@@ -536,7 +543,7 @@
                     tools:ignore="HardcodedText" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbSubscriber" />
 
@@ -551,7 +558,7 @@
                     android:singleLine="true" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <CheckBox android:id="@+id/cbSSID" />
 
@@ -565,7 +572,7 @@
                     android:singleLine="true" />
             </TableRow>
 
-            <TableRow>
+            <TableRow style="@style/PreferenceLine" >
 
                 <View />
 
diff --git a/res/values-v14/styles.xml b/res/values-v14/styles.xml
index c442fe07d..9c57b5b54 100644
--- a/res/values-v14/styles.xml
+++ b/res/values-v14/styles.xml
@@ -1,4 +1,4 @@
-<resources>
+<resources xmlns:android="http://schemas.android.com/apk/res/android">
 
     <style name="CustomTheme" parent="android:Theme.Holo">
         <item name="icon_granted">@drawable/granted_holo_dark</item>
@@ -66,4 +66,11 @@
         <item name="android:windowActionBar">true</item>
     </style>
 
+    <style name="PreferenceLine">
+        <item name="android:layout_width">match_parent</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:gravity">center_vertical</item>
+        <item name="android:minHeight">48dp</item>
+    </style>
+
 </resources>
\ No newline at end of file