diff --git a/app/build.gradle b/app/build.gradle
index cf224cf59..b5f75ab35 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -61,6 +61,9 @@ android {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
+        debug {
+            pseudoLocalesEnabled true
+        }
     }
 
     externalNativeBuild {
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
index bea09c17d..4d9c61cb1 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/ButtonSetting.java
@@ -46,12 +46,7 @@ private void initialize(Context aContext) {
         mButton.setOnClickListener(mInternalClickListener);
     }
 
-    private View.OnClickListener mInternalClickListener = new View.OnClickListener() {
-        @Override
-        public void onClick(View v) {
-            onClickListener(v);
-        }
-    };
+    private View.OnClickListener mInternalClickListener = v -> onClickListener(v);
 
     protected void onClickListener(View v) {
         if (mAudio != null) {
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SingleEditSetting.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SingleEditSetting.java
index 0369d58da..abe78befb 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SingleEditSetting.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/views/settings/SingleEditSetting.java
@@ -140,7 +140,7 @@ protected boolean updateTouchTextSelection(View v) {
         }
 
         editText.requestFocusFromTouch();
-
+        
         return false;
     }
 
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SettingsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SettingsWidget.java
index 63c3aed81..6f89c5b62 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SettingsWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/dialogs/SettingsWidget.java
@@ -361,16 +361,7 @@ private void onOptionsDialogDismissed() {
     // WindowManagerDelegate.FocusChangeListener
     @Override
     public void onGlobalFocusChanged(View oldFocus, View newFocus) {
-        boolean dismiss = false;
-        UIWidget widget = getChild(mCurrentlyOpenedDialogHandle);
-        if (widget != null && oldFocus == widget && widget.isVisible()) {
-            dismiss = true;
-
-        } else if (oldFocus == this && isVisible()) {
-            dismiss = true;
-        }
-
-        if (dismiss) {
+        if (oldFocus == this && isVisible()) {
             onDismiss();
         }
     }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DeveloperOptionsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DeveloperOptionsWidget.java
index 3d45cb9a5..a2079b2e1 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DeveloperOptionsWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DeveloperOptionsWidget.java
@@ -18,13 +18,16 @@
 import org.mozilla.vrbrowser.ui.views.settings.ButtonSetting;
 import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
 import org.mozilla.vrbrowser.ui.views.settings.SwitchSetting;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.dialogs.RestartDialogWidget;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 
 import static org.mozilla.vrbrowser.utils.ServoUtils.isServoAvailable;
 
-public class DeveloperOptionsWidget extends UIWidget {
+public class DeveloperOptionsWidget extends UIWidget implements
+        WidgetManagerDelegate.WorldClickListener,
+        WidgetManagerDelegate.FocusChangeListener {
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -63,8 +66,11 @@ private void initialize(Context aContext) {
 
         mAudio = AudioEngine.fromContext(aContext);
 
+        mWidgetManager.addFocusChangeListener(this);
+        mWidgetManager.addWorldClickListener(this);
+
         mBackButton = findViewById(R.id.backButton);
-        mBackButton.setOnClickListener((OnClickListener) view -> {
+        mBackButton.setOnClickListener(view -> {
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
@@ -125,6 +131,14 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.restart_dialog_world_z);
     }
 
+    @Override
+    public void releaseWidget() {
+        mWidgetManager.removeFocusChangeListener(this);
+        mWidgetManager.removeWorldClickListener(this);
+
+        super.releaseWidget();
+    }
+
     @Override
     public void show() {
         super.show();
@@ -282,4 +296,22 @@ private void setPointerColor(int checkedId, boolean doApply) {
         }
     }
 
+    // WindowManagerDelegate.FocusChangeListener
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (oldFocus == this && isVisible() && findViewById(newFocus.getId()) == null) {
+            onDismiss();
+        }
+    }
+
+    // WorldClickListener
+
+    @Override
+    public void onWorldClick() {
+        if (isVisible()) {
+            onDismiss();
+        }
+    }
+
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DisplayOptionsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DisplayOptionsWidget.java
index d540140d4..33e8a4cc5 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DisplayOptionsWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/DisplayOptionsWidget.java
@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ScrollView;
 
 import org.mozilla.vrbrowser.R;
@@ -18,11 +19,14 @@
 import org.mozilla.vrbrowser.ui.views.settings.DoubleEditSetting;
 import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
 import org.mozilla.vrbrowser.ui.views.settings.SingleEditSetting;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.dialogs.RestartDialogWidget;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 
-public class DisplayOptionsWidget extends UIWidget {
+public class DisplayOptionsWidget extends UIWidget implements
+        WidgetManagerDelegate.WorldClickListener,
+        WidgetManagerDelegate.FocusChangeListener {
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -60,8 +64,11 @@ private void initialize(Context aContext) {
 
         mAudio = AudioEngine.fromContext(aContext);
 
+        mWidgetManager.addFocusChangeListener(this);
+        mWidgetManager.addWorldClickListener(this);
+
         mBackButton = findViewById(R.id.backButton);
-        mBackButton.setOnClickListener((OnClickListener) view -> {
+        mBackButton.setOnClickListener(view -> {
             if (mAudio != null) {
                 mAudio.playSound(AudioEngine.Sound.CLICK);
             }
@@ -126,6 +133,14 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.restart_dialog_world_z);
     }
 
+    @Override
+    public void releaseWidget() {
+        mWidgetManager.removeFocusChangeListener(this);
+        mWidgetManager.removeWorldClickListener(this);
+
+        super.releaseWidget();
+    }
+
     @Override
     public void show() {
         super.show();
@@ -329,4 +344,22 @@ private void setMaxWindowSize(int newMaxWindowWidth, int newMaxWindowHeight, boo
         String newMaxWindowHeightStr = Integer.toString(newMaxWindowHeight);
         mMaxWindowSizeEdit.setSecondText(newMaxWindowHeightStr);
     }
+
+    // WindowManagerDelegate.FocusChangeListener
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (oldFocus == this && isVisible() && findViewById(newFocus.getId()) == null) {
+            onDismiss();
+        }
+    }
+
+    // WorldClickListener
+
+    @Override
+    public void onWorldClick() {
+        if (isVisible()) {
+            onDismiss();
+        }
+    }
 }
diff --git a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/VoiceSearchLanguageOptionsWidget.java b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/VoiceSearchLanguageOptionsWidget.java
index 1e55495a5..fbe6e71d6 100644
--- a/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/VoiceSearchLanguageOptionsWidget.java
+++ b/app/src/common/shared/org/mozilla/vrbrowser/ui/widgets/options/VoiceSearchLanguageOptionsWidget.java
@@ -7,6 +7,7 @@
 
 import android.content.Context;
 import android.util.AttributeSet;
+import android.view.View;
 import android.widget.ScrollView;
 
 import org.mozilla.vrbrowser.R;
@@ -16,10 +17,13 @@
 import org.mozilla.vrbrowser.ui.views.settings.ButtonSetting;
 import org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting;
 import org.mozilla.vrbrowser.ui.widgets.UIWidget;
+import org.mozilla.vrbrowser.ui.widgets.WidgetManagerDelegate;
 import org.mozilla.vrbrowser.ui.widgets.WidgetPlacement;
 import org.mozilla.vrbrowser.utils.LocaleUtils;
 
-public class VoiceSearchLanguageOptionsWidget extends UIWidget {
+public class VoiceSearchLanguageOptionsWidget extends UIWidget implements
+        WidgetManagerDelegate.WorldClickListener,
+        WidgetManagerDelegate.FocusChangeListener {
 
     private AudioEngine mAudio;
     private UIButton mBackButton;
@@ -50,6 +54,9 @@ private void initialize(Context aContext) {
 
         mAudio = AudioEngine.fromContext(aContext);
 
+        mWidgetManager.addFocusChangeListener(this);
+        mWidgetManager.addWorldClickListener(this);
+
         mBackButton = findViewById(R.id.backButton);
         mBackButton.setOnClickListener(view -> {
             if (mAudio != null) {
@@ -83,6 +90,14 @@ protected void initializeWidgetPlacement(WidgetPlacement aPlacement) {
         aPlacement.translationZ = WidgetPlacement.unitFromMeters(getContext(), R.dimen.restart_dialog_world_z);
     }
 
+    @Override
+    public void releaseWidget() {
+        mWidgetManager.removeFocusChangeListener(this);
+        mWidgetManager.removeWorldClickListener(this);
+
+        super.releaseWidget();
+    }
+
     @Override
     public void show() {
         super.show();
@@ -109,4 +124,22 @@ private void setLanguage(int checkedId, boolean doApply) {
         SettingsStore.getInstance(getContext()).setVoiceSearchLanguage(mLanguage.getValueForId(checkedId).toString());
     }
 
+    // WindowManagerDelegate.FocusChangeListener
+
+    @Override
+    public void onGlobalFocusChanged(View oldFocus, View newFocus) {
+        if (oldFocus == this && isVisible() && findViewById(newFocus.getId()) == null) {
+            onDismiss();
+        }
+    }
+
+    // WorldClickListener
+
+    @Override
+    public void onWorldClick() {
+        if (isVisible()) {
+            onDismiss();
+        }
+    }
+
 }
diff --git a/app/src/main/res/layout/crash_dialog.xml b/app/src/main/res/layout/crash_dialog.xml
index 38f1f52c8..8e435e19d 100644
--- a/app/src/main/res/layout/crash_dialog.xml
+++ b/app/src/main/res/layout/crash_dialog.xml
@@ -72,21 +72,21 @@
 
         <Button
             android:id="@+id/learnMoreButton"
-            style="@style/dialogButtonRegular"
+            style="@style/dialogButtonWide"
             android:layout_marginEnd="@dimen/dialog_button_margin_end"
             android:text="@string/learn_more_button"
             tools:text="@string/learn_more_button" />
 
         <Button
             android:id="@+id/dontSendButton"
-            style="@style/dialogButtonRegular"
+            style="@style/dialogButtonWide"
             android:layout_marginEnd="@dimen/dialog_button_margin_end"
             android:text="@string/do_not_sent_button"
             tools:text="@string/do_not_sent_button" />
 
         <Button
             android:id="@+id/sendDataButton"
-            style="@style/dialogButtonHighlighted"
+            style="@style/dialogButtonWideHighlighted"
             android:text="@string/send_data_button"
             tools:text="@string/send_data_button" />
     </LinearLayout>
diff --git a/app/src/main/res/layout/honeycomb_button.xml b/app/src/main/res/layout/honeycomb_button.xml
index a731f4099..c2affc330 100644
--- a/app/src/main/res/layout/honeycomb_button.xml
+++ b/app/src/main/res/layout/honeycomb_button.xml
@@ -19,22 +19,23 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
+            android:layout_marginStart="15dp"
+            android:layout_marginEnd="15dp"
+            android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:text="@string/settings_privacy"
-            android:textSize="@dimen/text_smaller_size"
-            android:fontFamily="sans-serif-light"/>
+            android:textSize="@dimen/text_smaller_size" />
+
         <TextView
             android:id="@+id/settings_secondary_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:layout_marginLeft="15dp"
-            android:layout_marginRight="15dp"
+            android:layout_marginStart="5dp"
+            android:layout_marginEnd="5dp"
+            android:fontFamily="sans-serif-light"
             android:gravity="center"
             android:text="Secondary text"
-            android:textSize="@dimen/text_smaller_size"
-            android:fontFamily="sans-serif-light"/>
+            android:textSize="@dimen/text_smaller_size" />
     </LinearLayout>
 </merge>
diff --git a/app/src/main/res/layout/honeycomb_switch.xml b/app/src/main/res/layout/honeycomb_switch.xml
index 401519a3b..c9a739fa6 100644
--- a/app/src/main/res/layout/honeycomb_switch.xml
+++ b/app/src/main/res/layout/honeycomb_switch.xml
@@ -1,16 +1,19 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tool="http://schemas.android.com/tools">
+
     <TextView
         android:id="@+id/honeycombSwitchText"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
+        android:layout_marginStart="5dp"
+        android:layout_marginEnd="5dp"
         android:fontFamily="sans-serif-light"
         android:gravity="center"
         android:paddingBottom="5dp"
         android:textColor="@color/white"
         android:textSize="@dimen/text_smaller_size"
-        tool:text="Description"/>
+        tool:text="Description" />
 
     <Switch
         android:id="@+id/honeycombSwitchButton"
diff --git a/app/src/main/res/layout/options_developer.xml b/app/src/main/res/layout/options_developer.xml
index 63fd9950e..286deae54 100644
--- a/app/src/main/res/layout/options_developer.xml
+++ b/app/src/main/res/layout/options_developer.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
         android:id="@+id/optionsLayout"
@@ -9,9 +8,9 @@
         android:layout_height="match_parent"
         android:background="@drawable/dialog_background"
         android:paddingStart="30dp"
-        android:paddingTop="20dp"
+        android:paddingTop="10dp"
         android:paddingEnd="30dp"
-        android:paddingBottom="20dp">
+        android:paddingBottom="10dp">
 
         <org.mozilla.vrbrowser.ui.views.UIButton
             android:id="@+id/backButton"
@@ -25,54 +24,61 @@
             android:src="@drawable/ic_icon_back"
             android:tint="@color/midnight" />
 
+        <View
+            android:id="@+id/separatorTop"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_below="@+id/backButton"
+            android:layout_marginBottom="10dp"
+            android:background="@color/iron" />
+
         <ScrollView
             android:id="@+id/scrollbar"
-            style="@style/scrollbar"
+            android:scrollbars="none"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/resetButton"
-            android:layout_below="@+id/backButton">
+            android:layout_above="@+id/separatorBottom"
+            android:layout_below="@+id/separatorTop">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
                 android:orientation="vertical">
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/remote_debugging_switch"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_remote_debugging" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/show_console_switch"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_show_console" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/env_override_switch"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_env_override" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/multiprocess_switch"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_multiprocess" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SwitchSetting
                     android:id="@+id/servo_switch"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_servo" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting
                     android:id="@+id/environment_radio"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_environments"
                     app:options="@array/developer_options_environments"
                     app:values="@array/developer_options_environments_values" />
@@ -80,17 +86,26 @@
                 <org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting
                     android:id="@+id/pointer_radio"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_pointer_color"
                     app:options="@array/developer_options_pointer_colors"
                     app:values="@array/developer_options_pointer_colors_values" />
             </LinearLayout>
         </ScrollView>
 
+        <View
+            android:id="@+id/separatorBottom"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_above="@+id/resetButton"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/iron" />
+
         <org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
             android:id="@+id/resetButton"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             app:buttonText="@string/developer_options_reset_button"
             app:description="@string/developer_options_reset" />
diff --git a/app/src/main/res/layout/options_display.xml b/app/src/main/res/layout/options_display.xml
index fe06bb403..2fee43a4e 100644
--- a/app/src/main/res/layout/options_display.xml
+++ b/app/src/main/res/layout/options_display.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
 
     <RelativeLayout
         android:id="@+id/optionsLayout"
@@ -9,9 +8,9 @@
         android:layout_height="match_parent"
         android:background="@drawable/dialog_background"
         android:paddingStart="30dp"
-        android:paddingTop="20dp"
+        android:paddingTop="10dp"
         android:paddingEnd="30dp"
-        android:paddingBottom="20dp">
+        android:paddingBottom="10dp">
 
         <org.mozilla.vrbrowser.ui.views.UIButton
             android:id="@+id/backButton"
@@ -25,24 +24,31 @@
             android:src="@drawable/ic_icon_back"
             android:tint="@color/midnight" />
 
+        <View
+            android:id="@+id/separatorTop"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_below="@+id/backButton"
+            android:layout_marginBottom="10dp"
+            android:background="@color/iron" />
+
         <ScrollView
             android:id="@+id/scrollbar"
-            style="@style/scrollbar"
+            android:scrollbars="none"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_above="@+id/resetButton"
-            android:layout_below="@+id/backButton">
+            android:layout_above="@+id/separatorBottom"
+            android:layout_below="@+id/separatorTop">
 
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginEnd="20dp"
                 android:orientation="vertical">
 
                 <org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting
                     android:id="@+id/ua_radio"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_ua_mode"
                     app:options="@array/developer_options_ua_modes"
                     app:values="@array/developer_options_ua_mode_values" />
@@ -50,7 +56,7 @@
                 <org.mozilla.vrbrowser.ui.views.settings.RadioGroupSetting
                     android:id="@+id/msaa_radio"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_msaa"
                     app:options="@array/developer_options_msaa"
                     app:values="@array/developer_options_ua_mode_values" />
@@ -58,35 +64,44 @@
                 <org.mozilla.vrbrowser.ui.views.settings.SingleEditSetting
                     android:id="@+id/density_edit"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_display_density" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.SingleEditSetting
                     android:id="@+id/dpi_edit"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:description="@string/developer_options_display_dpi" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.DoubleEditSetting
                     android:id="@+id/windowSize_edit"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:by="@string/developer_options_by"
                     app:description="@string/developer_options_window_size" />
 
                 <org.mozilla.vrbrowser.ui.views.settings.DoubleEditSetting
                     android:id="@+id/maxWindowSize_edit"
                     android:layout_width="match_parent"
-                    android:layout_height="60dp"
+                    android:layout_height="wrap_content"
                     app:by="@string/developer_options_by"
                     app:description="@string/developer_options_max_window_size" />
             </LinearLayout>
         </ScrollView>
 
+        <View
+            android:id="@+id/separatorBottom"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_above="@+id/resetButton"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/iron" />
+
         <org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
             android:id="@+id/resetButton"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             app:buttonText="@string/developer_options_reset_button"
             app:description="@string/display_options_reset" />
diff --git a/app/src/main/res/layout/options_language.xml b/app/src/main/res/layout/options_language.xml
index 68c0d1765..ee2cf5814 100644
--- a/app/src/main/res/layout/options_language.xml
+++ b/app/src/main/res/layout/options_language.xml
@@ -9,9 +9,9 @@
         android:layout_height="match_parent"
         android:background="@drawable/dialog_background"
         android:paddingStart="30dp"
-        android:paddingTop="20dp"
+        android:paddingTop="10dp"
         android:paddingEnd="30dp"
-        android:paddingBottom="20dp">
+        android:paddingBottom="10dp">
 
         <org.mozilla.vrbrowser.ui.views.UIButton
             android:id="@+id/backButton"
@@ -25,11 +25,19 @@
             android:src="@drawable/ic_icon_back"
             android:tint="@color/midnight" />
 
+        <View
+            android:id="@+id/separatorTop"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_below="@+id/voice_search_language_title"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/iron" />
+
         <TextView
             android:id="@+id/voice_search_language_title"
             style="@style/settingsDescription"
             android:layout_below="@+id/backButton"
-            android:layout_marginBottom="10dp"
             android:gravity="center_vertical"
             android:text="@string/settings_language_choose_language_voice_search"
             tools:text="@string/settings_language_choose_language_voice_search" />
@@ -39,8 +47,8 @@
             style="@style/scrollbar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_above="@+id/resetButton"
-            android:layout_below="@+id/voice_search_language_title">
+            android:layout_above="@+id/separatorBottom"
+            android:layout_below="@+id/separatorTop">
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -59,10 +67,19 @@
             </LinearLayout>
         </ScrollView>
 
+        <View
+            android:id="@+id/separatorBottom"
+            android:layout_width="match_parent"
+            android:layout_height="0.5dp"
+            android:layout_above="@+id/resetButton"
+            android:layout_marginTop="10dp"
+            android:layout_marginBottom="10dp"
+            android:background="@color/iron" />
+
         <org.mozilla.vrbrowser.ui.views.settings.ButtonSetting
             android:id="@+id/resetButton"
             android:layout_width="match_parent"
-            android:layout_height="60dp"
+            android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
             app:buttonText="@string/developer_options_reset_button"
             app:description="@string/language_options_reset" />
diff --git a/app/src/main/res/layout/setting_button.xml b/app/src/main/res/layout/setting_button.xml
index f2d496b95..b0e691449 100644
--- a/app/src/main/res/layout/setting_button.xml
+++ b/app/src/main/res/layout/setting_button.xml
@@ -3,7 +3,7 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="@dimen/developer_options_row_width"
         android:orientation="vertical">
 
         <RelativeLayout
@@ -16,6 +16,8 @@
                 style="@style/settingsDescription"
                 android:layout_alignParentStart="true"
                 android:layout_centerVertical="true"
+                android:layout_marginEnd="10dp"
+                android:layout_toStartOf="@+id/button"
                 android:gravity="center_vertical"
                 tools:text="Edit Setting Description" />
 
diff --git a/app/src/main/res/layout/setting_edit.xml b/app/src/main/res/layout/setting_edit.xml
index 76497d8d1..85a0b4619 100644
--- a/app/src/main/res/layout/setting_edit.xml
+++ b/app/src/main/res/layout/setting_edit.xml
@@ -3,14 +3,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="@dimen/developer_options_row_width"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/iron" />
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -28,6 +23,7 @@
                     android:id="@+id/setting_description"
                     style="@style/settingsDescription"
                     android:text="@string/developer_options_window_size"
+                    android:layout_marginEnd="5dp"
                     tools:text="Setting Description" />
 
                 <TextView
@@ -48,6 +44,7 @@
                 <TextView
                     android:id="@+id/settingBy"
                     style="@style/settingsDescription"
+                    android:layout_marginEnd="5dp"
                     tools:text="x" />
 
                 <TextView
diff --git a/app/src/main/res/layout/setting_radio_group.xml b/app/src/main/res/layout/setting_radio_group.xml
index 9ad9a0ea5..688bc6c66 100644
--- a/app/src/main/res/layout/setting_radio_group.xml
+++ b/app/src/main/res/layout/setting_radio_group.xml
@@ -3,14 +3,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="@dimen/developer_options_row_width"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/iron" />
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
diff --git a/app/src/main/res/layout/setting_switch.xml b/app/src/main/res/layout/setting_switch.xml
index 4dd81c800..a21f7a895 100644
--- a/app/src/main/res/layout/setting_switch.xml
+++ b/app/src/main/res/layout/setting_switch.xml
@@ -4,14 +4,9 @@
 
     <LinearLayout
         android:layout_width="match_parent"
-        android:layout_height="60dp"
+        android:layout_height="@dimen/developer_options_row_width"
         android:orientation="vertical">
 
-        <View
-            android:layout_width="match_parent"
-            android:layout_height="0.5dp"
-            android:background="@color/iron" />
-
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="match_parent"
@@ -32,16 +27,17 @@
                 android:layout_alignParentEnd="true"
                 android:layout_centerVertical="true"
                 android:gravity="center"
-                android:orientation="vertical">
-
-                <Switch
-                    android:id="@+id/settings_switch"
-                    style="@style/settingsSwitch" />
+                android:orientation="horizontal">
 
                 <TextView
                     android:id="@+id/settings_switch_text"
                     style="@style/settingsSwitchText"
+                    android:layout_marginEnd="5dp"
                     tools:text="OFF" />
+
+                <Switch
+                    android:id="@+id/settings_switch"
+                    style="@style/settingsSwitch" />
             </LinearLayout>
         </RelativeLayout>
     </LinearLayout>
diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml
index d277036c0..0657a0069 100644
--- a/app/src/main/res/layout/settings.xml
+++ b/app/src/main/res/layout/settings.xml
@@ -89,7 +89,7 @@
                             android:layout_marginRight="10dp"
                             app:honeycombButtonIcon="@drawable/ic_settings_display"
                             app:honeycombButtonText="@string/settings_display"
-                            app:honeycombButtonTextSize="52dp" />
+                            app:honeycombButtonTextSize="@dimen/settings_button_text_width" />
 
                         <org.mozilla.vrbrowser.ui.views.HoneycombButton
                             android:id="@+id/languageButton"
@@ -97,19 +97,21 @@
                             android:layout_centerHorizontal="true"
                             android:layout_marginRight="10dp"
                             app:honeycombButtonIcon="@drawable/ic_settings_language"
-                            app:honeycombButtonText="@string/settings_language" />
+                            app:honeycombButtonText="@string/settings_language"
+                            app:honeycombButtonTextSize="@dimen/settings_button_text_width"/>
 
                         <org.mozilla.vrbrowser.ui.views.HoneycombSwitch
                             android:id="@+id/crashReportingSwitch"
                             style="?attr/honeycombButtonStyle"
                             android:layout_marginRight="10dp"
                             app:honeycombSwitchText="@string/settings_crash_reporting"
-                            app:honeycombSwitchTextSize="72dp" />
+                            app:honeycombSwitchTextSize="@dimen/settings_button_text_width" />
 
                         <org.mozilla.vrbrowser.ui.views.HoneycombSwitch
                             android:id="@+id/telemetry_switch"
                             style="?attr/honeycombButtonStyle"
-                            app:honeycombSwitchText="@string/settings_telemetry" />
+                            app:honeycombSwitchText="@string/settings_telemetry"
+                            app:honeycombSwitchTextSize="@dimen/settings_button_text_width"/>
 
                     </LinearLayout>
 
@@ -128,7 +130,7 @@
                             android:layout_marginRight="10dp"
                             app:honeycombButtonIcon="@drawable/ic_settings_privacypolicy"
                             app:honeycombButtonText="@string/settings_privacy"
-                            app:honeycombButtonTextSize="52dp" />
+                            app:honeycombSwitchTextSize="@dimen/settings_button_text_width" />
 
                         <org.mozilla.vrbrowser.ui.views.HoneycombButton
                             android:id="@+id/developerOptionsButton"
@@ -136,14 +138,15 @@
                             android:layout_marginRight="10dp"
                             app:honeycombButtonIcon="@drawable/ic_settings_developeroptions"
                             app:honeycombButtonText="@string/settings_developer_options"
-                            app:honeycombButtonTextSize="52dp" />
+                            app:honeycombSwitchTextSize="@dimen/settings_button_text_width" />
 
                         <org.mozilla.vrbrowser.ui.views.HoneycombButton
                             android:id="@+id/reportButton"
                             style="?attr/honeycombButtonStyle"
                             app:honeycombButtonIcon="@drawable/ic_settings_reportissue"
                             app:honeycombButtonText="@string/settings_report_issue"
-                            app:honeycombSecondaryText="@string/bug_report_url" />
+                            app:honeycombSecondaryText="@string/bug_report_url"
+                            app:honeycombSwitchTextSize="@dimen/settings_button_text_width" />
                     </LinearLayout>
                 </RelativeLayout>
             </HorizontalScrollView>
diff --git a/app/src/main/res/layout/voice_search_dialog.xml b/app/src/main/res/layout/voice_search_dialog.xml
index 7b58630cb..fc572aeab 100644
--- a/app/src/main/res/layout/voice_search_dialog.xml
+++ b/app/src/main/res/layout/voice_search_dialog.xml
@@ -41,7 +41,7 @@
         android:id="@+id/voiceSearchText1"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="5dp"
         android:text="@string/voice_search_start"
         android:textAlignment="viewStart"
         android:textColor="@color/white"
diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml
index ae652c003..275d0988b 100644
--- a/app/src/main/res/values/dimen.xml
+++ b/app/src/main/res/values/dimen.xml
@@ -53,6 +53,7 @@
     <dimen name="settings_width">580dp</dimen>
     <dimen name="settings_height">520dp</dimen>
     <dimen name="settings_button_height">320dp</dimen>
+    <dimen name="settings_button_text_width">100dp</dimen>
 
     <!-- Common values for menu style widgets -->
     <dimen name="menu_item_height">88dp</dimen>
@@ -76,7 +77,7 @@
     <!-- Restart Dialog -->
     <item name="restart_dialog_world_y" format="float" type="dimen">1.6</item>
     <item name="restart_dialog_world_z" format="float" type="dimen">-1.8</item>
-    <dimen name="restart_dialog_width">380dp</dimen>
+    <dimen name="restart_dialog_width">420dp</dimen>
     <dimen name="restart_dialog_height">280dp</dimen>
 
     <!-- Top Bar -->
@@ -92,12 +93,14 @@
     <dimen name="tray_height">40dp</dimen>
 
     <!-- Developer Options Panel -->
-    <dimen name="developer_options_width">470dp</dimen>
-    <dimen name="developer_options_height">380dp</dimen>
+    <dimen name="developer_options_width">585dp</dimen>
+    <dimen name="developer_options_height">385dp</dimen>
+    <dimen name="developer_options_button_width">120dp</dimen>
+    <dimen name="developer_options_row_width">40dp</dimen>
 
     <!-- Voice search panel -->
-    <dimen name="voice_search_width">400dp</dimen>
-    <dimen name="voice_search_height">275dp</dimen>
+    <dimen name="voice_search_width">460dp</dimen>
+    <dimen name="voice_search_height">280dp</dimen>
     <dimen name="voice_search_padding_top">20dp</dimen>
     <dimen name="voice_search_padding_bottom">25dp</dimen>
     <dimen name="voice_search_padding_sides">30dp</dimen>
@@ -112,13 +115,14 @@
     <dimen name="choice_prompt_height">380dp</dimen>
 
     <!-- Crash Dialog prompt -->
-    <dimen name="crash_dialog_width">450dp</dimen>
+    <dimen name="crash_dialog_width">640dp</dimen>
     <dimen name="crash_dialog_height">350dp</dimen>
-    <item name="crash_dialog_world_y" format="float" type="dimen">1.5</item>
+    <item name="crash_dialog_world_y" format="float" type="dimen">1.2</item>
     <item name="crash_dialog_world_z" format="float" type="dimen">-1.8</item>
 
     <!-- Dialog buttons -->
-    <dimen name="dialog_button_width">100dp</dimen>
+    <dimen name="dialog_button_width">156dp</dimen>
+    <dimen name="dialog_button_wide_width">175dp</dimen>
     <dimen name="dialog_button_height">35dp</dimen>
     <dimen name="dialog_button_margin_end">20dp</dimen>
     <dimen name="dialog_button_text_size">14dip</dimen>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5fc51be11..af6fef2a9 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -176,7 +176,7 @@
     </style>
 
     <style name="settingsButton">
-        <item name="android:layout_width">50dp</item>
+        <item name="android:layout_width">@dimen/developer_options_button_width</item>
         <item name="android:layout_height">25dp</item>
         <item name="android:layout_gravity">center</item>
         <item name="android:gravity">center</item>
@@ -224,12 +224,11 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="android:textColor">@color/fog</item>
         <item name="android:textSize">@dimen/text_medium_size</item>
-        <item name="android:layout_marginEnd">5dp</item>
     </style>
 
     <style name="dialogButtonRegular">
-        <item name="android:layout_width">100dp</item>
-        <item name="android:layout_height">35dp</item>
+        <item name="android:layout_width">@dimen/dialog_button_width</item>
+        <item name="android:layout_height">36dp</item>
         <item name="android:background">@drawable/dialog_regular_button_background</item>
         <item name="android:fontFamily">sans-serif</item>
         <item name="android:scaleType">fitCenter</item>
@@ -238,10 +237,18 @@
         <item name="android:textColor">@drawable/dialog_button_text_color</item>
     </style>
 
+    <style name="dialogButtonWide" parent="dialogButtonRegular">
+        <item name="android:layout_width">@dimen/dialog_button_wide_width</item>
+    </style>
+
     <style name="dialogButtonHighlighted" parent="dialogButtonRegular">
         <item name="android:background">@drawable/dialog_highlighted_button_background</item>
     </style>
 
+    <style name="dialogButtonWideHighlighted" parent="dialogButtonWide">
+        <item name="android:background">@drawable/dialog_highlighted_button_background</item>
+    </style>
+
     <style name="FxR.Dark" parent="@android:style/Theme.Black.NoTitleBar.Fullscreen">
         <item name="android:windowNoTitle">true</item>
         <item name="android:windowActionBar">false</item>
@@ -270,6 +277,7 @@
         <item name="android:fastScrollStyle">@style/Widget.FastScroll</item>
         <item name="android:fastScrollOverlayPosition">atThumb</item>
         <item name="android:smoothScrollbar">true</item>
+        <item name="android:overScrollMode">ifContentScrolls</item>
     </style>
 
     <style name="Widget.FastScroll" parent="android:Widget.Material.FastScroll"/>