diff --git a/res/layout/location_settings.xml b/res/layout/location_settings.xml
index 0b344cc..9834d77 100644
--- a/res/layout/location_settings.xml
+++ b/res/layout/location_settings.xml
@@ -51,8 +51,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/location_margin_left"
- android:layout_marginRight="@dimen/content_margin_right"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
@@ -87,8 +87,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/location_margin_left"
- android:layout_marginRight="@dimen/content_margin_right"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
@@ -123,8 +123,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/location_margin_left"
- android:layout_marginRight="@dimen/content_margin_right"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
diff --git a/res/layout/setup_cyanogen_services.xml b/res/layout/setup_cyanogen_services.xml
index 801e198..d788504 100644
--- a/res/layout/setup_cyanogen_services.xml
+++ b/res/layout/setup_cyanogen_services.xml
@@ -56,8 +56,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/location_margin_left"
- android:layout_marginRight="@dimen/content_margin_right"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
@@ -93,8 +93,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/location_margin_left"
- android:layout_marginRight="@dimen/content_margin_right"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
@@ -130,8 +130,8 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/location_margin_left"
- android:layout_marginRight="@dimen/content_margin_right"
+ android:paddingLeft="@dimen/location_margin_left"
+ android:paddingRight="@dimen/content_margin_right"
android:background="?android:attr/selectableItemBackground"
android:clickable="true">
diff --git a/res/layout/setup_datetime_page.xml b/res/layout/setup_datetime_page.xml
index 46373f8..b1bfb3f 100644
--- a/res/layout/setup_datetime_page.xml
+++ b/res/layout/setup_datetime_page.xml
@@ -34,8 +34,6 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingLeft="@dimen/content_margin_left"
- android:paddingRight="@dimen/content_margin_right"
style="@style/PageContent">
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8568015..fb5df89 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -56,6 +56,7 @@