diff --git a/app/src/main/res/layout/options_footer.xml b/app/src/main/res/layout/options_footer.xml
index 648796817..535acf142 100644
--- a/app/src/main/res/layout/options_footer.xml
+++ b/app/src/main/res/layout/options_footer.xml
@@ -9,7 +9,7 @@
 
     <RelativeLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:gravity="center">
 
         <View
diff --git a/app/src/main/res/layout/options_header.xml b/app/src/main/res/layout/options_header.xml
index 913906698..7bdbbfcfe 100644
--- a/app/src/main/res/layout/options_header.xml
+++ b/app/src/main/res/layout/options_header.xml
@@ -27,7 +27,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
         android:orientation="vertical">
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/setting_button.xml b/app/src/main/res/layout/setting_button.xml
index 50efbb05d..10755e3c7 100644
--- a/app/src/main/res/layout/setting_button.xml
+++ b/app/src/main/res/layout/setting_button.xml
@@ -3,7 +3,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/developer_options_row_width"
+        android:layout_height="match_parent"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:orientation="vertical">
 
         <RelativeLayout
@@ -19,7 +21,7 @@
                 android:layout_marginEnd="10dp"
                 android:layout_toStartOf="@+id/button"
                 android:gravity="center_vertical"
-                tools:text="Edit Setting Description" />
+                tools:text="@string/privacy_options_popups_reset" />
 
             <TextView
                 android:id="@+id/button"
diff --git a/app/src/main/res/layout/setting_edit.xml b/app/src/main/res/layout/setting_edit.xml
index 10ed01d6d..06936d9dd 100644
--- a/app/src/main/res/layout/setting_edit.xml
+++ b/app/src/main/res/layout/setting_edit.xml
@@ -3,7 +3,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/developer_options_row_width"
+        android:layout_height="match_parent"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:orientation="vertical">
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/setting_radio_group.xml b/app/src/main/res/layout/setting_radio_group.xml
index 545a1453a..fa05531b3 100644
--- a/app/src/main/res/layout/setting_radio_group.xml
+++ b/app/src/main/res/layout/setting_radio_group.xml
@@ -3,7 +3,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="@dimen/developer_options_row_width"
+        android:layout_height="match_parent"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:orientation="vertical">
 
         <RelativeLayout
diff --git a/app/src/main/res/layout/setting_radio_group_v.xml b/app/src/main/res/layout/setting_radio_group_v.xml
index 512e11274..df7a08189 100644
--- a/app/src/main/res/layout/setting_radio_group_v.xml
+++ b/app/src/main/res/layout/setting_radio_group_v.xml
@@ -3,7 +3,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        android:layout_height="match_parent"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:orientation="vertical">
 
         <RelativeLayout
@@ -17,7 +19,7 @@
                 android:layout_alignParentStart="true"
                 android:layout_alignParentTop="true"
                 android:layout_centerVertical="true"
-                android:layout_marginBottom="20dp"
+                android:layout_marginBottom="10dp"
                 tools:text="Radio Setting Description" />
 
             <RadioGroup
diff --git a/app/src/main/res/layout/setting_switch.xml b/app/src/main/res/layout/setting_switch.xml
index 226b291eb..6ed31a5d4 100644
--- a/app/src/main/res/layout/setting_switch.xml
+++ b/app/src/main/res/layout/setting_switch.xml
@@ -5,7 +5,9 @@
     <LinearLayout
         android:id="@+id/layout"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/developer_options_row_width"
+        android:layout_height="match_parent"
+        android:paddingTop="5dp"
+        android:paddingBottom="5dp"
         android:orientation="vertical">
 
         <RelativeLayout
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index c987b08ab..3cb638626 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -134,7 +134,7 @@
     <dimen name="options_height">385dp</dimen>
 
     <!-- Developer Panel -->
-    <dimen name="options_button_width">120dp</dimen>
+    <dimen name="options_button_width">140dp</dimen>
     <dimen name="options_button_height">30dp</dimen>
     <dimen name="options_text_height">30dp</dimen>
     <dimen name="developer_options_row_width">40dp</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 2151b712d..1764a5a30 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -363,7 +363,7 @@
 
     <style name="settingsButtonDescriptionText">
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_height">@dimen/options_text_height</item>
+        <item name="android:layout_height">wrap_content</item>
         <item name="android:gravity">center</item>
         <item name="android:textColor">@color/fog</item>
         <item name="android:textSize">@dimen/text_medium_size</item>