diff --git a/app/src/main/res/layout/navigation_bar.xml b/app/src/main/res/layout/navigation_bar.xml
index 8d269b996..a7ca4aa7f 100644
--- a/app/src/main/res/layout/navigation_bar.xml
+++ b/app/src/main/res/layout/navigation_bar.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<merge>
 
-    <RelativeLayout
-        android:layout_width="match_parent"
-        android:layout_height="40dp">
+    <include layout="@layout/navigation_bar_navigation" />
 
-        <include layout="@layout/navigation_bar_navigation" />
+    <include layout="@layout/navigation_bar_fullscreen" />
 
-        <include layout="@layout/navigation_bar_fullscreen" />
-
-        <include layout="@layout/navigation_bar_resize" />
-    </RelativeLayout>
+    <include layout="@layout/navigation_bar_resize" />
 </merge>
diff --git a/app/src/main/res/layout/navigation_bar_fullscreen.xml b/app/src/main/res/layout/navigation_bar_fullscreen.xml
index 1dc2f3f9d..e53bdb6df 100644
--- a/app/src/main/res/layout/navigation_bar_fullscreen.xml
+++ b/app/src/main/res/layout/navigation_bar_fullscreen.xml
@@ -1,37 +1,50 @@
 <?xml version="1.0" encoding="utf-8"?>
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <LinearLayout
+    <FrameLayout
         android:id="@+id/fullScreenModeContainer"
-        style="?attr/navigationBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal"
-        android:padding="0dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:visibility="gone">
 
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/fullScreenExitButton"
-            style="?attr/fullScreenButtonStyle"
-            android:background="@drawable/fullscreen_button_first"
-            android:src="@drawable/ic_icon_back" />
+        <FrameLayout
+            android:layout_width="5dp"
+            android:layout_height="40dp"
+            android:layout_gravity="center"
+            android:background="@drawable/fullscreen_button" />
 
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/fullScreenResizeEnterButton"
-            style="?attr/fullScreenButtonStyle"
-            android:src="@drawable/ic_icon_resize" />
+        <LinearLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:orientation="horizontal">
 
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/projectionButton"
-            style="?attr/fullScreenButtonStyle"
-            android:src="@drawable/ic_icon_vr_projection"
-            android:tooltipText="@string/video_mode_tooltip" />
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/fullScreenExitButton"
+                style="?attr/fullScreenButtonStyle"
+                android:background="@drawable/fullscreen_button_first"
+                android:src="@drawable/ic_icon_back"
+                android:tooltipText="@string/back_tooltip" />
 
-        <org.mozilla.vrbrowser.ui.views.UIButton
-            android:id="@+id/brightnessButton"
-            style="?attr/fullScreenButtonStyle"
-            android:background="@drawable/fullscreen_button_last"
-            android:src="@drawable/ic_icon_brightness" />
-    </LinearLayout>
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/fullScreenResizeEnterButton"
+                style="?attr/fullScreenButtonStyle"
+                android:src="@drawable/ic_icon_resize"
+                android:tooltipText="@string/resize_tooltip" />
+
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/projectionButton"
+                style="?attr/fullScreenButtonStyle"
+                android:src="@drawable/ic_icon_vr_projection"
+                android:tooltipText="@string/video_mode_tooltip" />
+
+            <org.mozilla.vrbrowser.ui.views.UIButton
+                android:id="@+id/brightnessButton"
+                style="?attr/fullScreenButtonStyle"
+                android:background="@drawable/fullscreen_button_last"
+                android:src="@drawable/ic_icon_brightness"
+                android:tooltipText="@string/brightness_mode_tooltip" />
+        </LinearLayout>
+    </FrameLayout>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layout/navigation_bar_resize.xml b/app/src/main/res/layout/navigation_bar_resize.xml
index 06be11ced..57d4da1c5 100644
--- a/app/src/main/res/layout/navigation_bar_resize.xml
+++ b/app/src/main/res/layout/navigation_bar_resize.xml
@@ -3,12 +3,10 @@
 
     <LinearLayout
         android:id="@+id/resizeModeContainer"
-        style="?attr/navigationBarStyle"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:gravity="center_horizontal"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
         android:orientation="horizontal"
-        android:padding="0dp"
         android:visibility="gone">
 
         <org.mozilla.vrbrowser.ui.views.UITextButton