diff --git a/android/robot/google-services.json b/android/robot/google-services.json
index 76b081e00..3619ddc11 100644
--- a/android/robot/google-services.json
+++ b/android/robot/google-services.json
@@ -22,6 +22,14 @@
             "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
           }
         },
+        {
+          "client_id": "955078484078-kiqt23b9043p6lpevmdd2c42bid22rct.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.openbot",
+            "certificate_hash": "d6550cd35e6f79362f3d379f65f5bf7b607830f5"
+          }
+        },
         {
           "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
           "client_type": 3
diff --git a/android/robot/src/main/assets/google-services.json b/android/robot/src/main/assets/google-services.json
index 76b081e00..3619ddc11 100644
--- a/android/robot/src/main/assets/google-services.json
+++ b/android/robot/src/main/assets/google-services.json
@@ -22,6 +22,14 @@
             "certificate_hash": "224d8f13596161c1d53e2008aee1650856446ce7"
           }
         },
+        {
+          "client_id": "955078484078-kiqt23b9043p6lpevmdd2c42bid22rct.apps.googleusercontent.com",
+          "client_type": 1,
+          "android_info": {
+            "package_name": "org.openbot",
+            "certificate_hash": "d6550cd35e6f79362f3d379f65f5bf7b607830f5"
+          }
+        },
         {
           "client_id": "955078484078-kbadvp54dljcpk0g0j5bnf5c17q63ir2.apps.googleusercontent.com",
           "client_type": 3
diff --git a/android/robot/src/main/res/layout-land/fragment_object_nav.xml b/android/robot/src/main/res/layout-land/fragment_object_nav.xml
index ef260e2ba..ce7e23f7c 100644
--- a/android/robot/src/main/res/layout-land/fragment_object_nav.xml
+++ b/android/robot/src/main/res/layout-land/fragment_object_nav.xml
@@ -59,7 +59,7 @@
                 android:id="@+id/auto_switch"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginStart="16dp"
+                android:layout_marginStart="12dp"
                 android:layout_marginTop="4dp"
                 android:text="@string/auto_mode" />
 
@@ -77,7 +77,7 @@
             android:id="@+id/usbToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:button="@drawable/usb_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -87,7 +87,7 @@
             android:id="@+id/bleToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="16dp"
+            android:layout_marginRight="16dp"
             android:button="@drawable/ble_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -97,7 +97,7 @@
             android:id="@+id/camera_toggle"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginRight="16dp"
+            android:layout_marginEnd="48dp"
             android:background="@android:color/transparent"
             android:scaleType="center"
             android:src="@drawable/ic_cameraswitch"
@@ -106,6 +106,16 @@
             app:layout_constraintEnd_toEndOf="parent"
             app:tint="@color/openBotBlue" />
 
+        <CheckBox
+            android:id="@+id/mirrorControl"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginEnd="8dp"
+            android:button="@drawable/mirror_control"
+            android:layout_marginTop="8dp"
+            app:layout_constraintTop_toTopOf="@+id/autoLinearLayout"
+            app:layout_constraintEnd_toEndOf="parent" />
+
 
         <LinearLayout
             android:id="@+id/linearLayout"
diff --git a/android/robot/src/main/res/layout/fragment_object_nav.xml b/android/robot/src/main/res/layout/fragment_object_nav.xml
index af59f0750..6ed19a17f 100644
--- a/android/robot/src/main/res/layout/fragment_object_nav.xml
+++ b/android/robot/src/main/res/layout/fragment_object_nav.xml
@@ -65,7 +65,7 @@
             android:id="@+id/usbToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="4dp"
             android:button="@drawable/usb_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -75,7 +75,7 @@
             android:id="@+id/bleToggle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="4dp"
             android:button="@drawable/ble_toggle"
             app:layout_constraintBottom_toBottomOf="@+id/camera_toggle"
             app:layout_constraintEnd_toStartOf="@+id/camera_toggle"
@@ -85,7 +85,7 @@
             android:id="@+id/camera_toggle"
             android:layout_width="40dp"
             android:layout_height="40dp"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="2dp"
             android:background="@android:color/transparent"
             android:scaleType="center"
             android:src="@drawable/ic_cameraswitch"