diff --git a/resource-overlay/dubai/SystemUI/res/values/dimens.xml b/resource-overlay/dubai/SystemUI/res/values/dimens.xml
index 38117f0..1553daf 100644
--- a/resource-overlay/dubai/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/dubai/SystemUI/res/values/dimens.xml
@@ -5,39 +5,18 @@
 -->
 <resources>
     <!-- the padding on the start of the statusbar -->
-    <dimen name="status_bar_padding_start">24dp</dimen>
-
-    <!-- the padding on the top of the statusbar (usually 0) -->
-    <dimen name="status_bar_padding_top">10px</dimen>
-
-    <dimen name="rounded_corner_content_padding">6px</dimen>
+    <dimen name="status_bar_padding_start">8.0dip</dimen>
 
     <!-- Height of the status bar header bar when on Keyguard -->
     <dimen name="status_bar_header_height_keyguard">@*android:dimen/status_bar_height</dimen>
 
     <!-- Margin on the left side of the carrier text on Keyguard -->
-    <dimen name="keyguard_carrier_text_margin">@dimen/status_bar_padding_start</dimen>
-
-    <dimen name="system_icons_keyguard_padding_end">10.0px</dimen>
+    <dimen name="keyguard_carrier_text_margin">16.0dip</dimen>
 
 	<!-- Location on the screen of the center of the physical power button. -->
-    <dimen name="physical_power_button_center_screen_location_y">810px</dimen>
+    <dimen name="physical_power_button_center_screen_location_y">620.0px</dimen>
 
     <!-- Location on the screen of the center of the physical volume up/down buttons. -->
-    <dimen name="physical_volume_up_button_center_screen_location_y">300px</dimen>
-    <dimen name="physical_volume_down_button_center_screen_location_y">482px</dimen>
-
-    <!-- Configure  protection around the front-facing camera -->
-    <string name="config_frontBuiltInDisplayCutoutProtection">
-        M 661,72
-        a 57,57 0 1 0 114,0
-        a 57,57 0 1 0 -114,0
-        Z
-    </string>
-
-    <!-- Camera 1 is the front camera -->
-    <string name="config_protectedCameraId">1</string>
-
-    <!--  Flag to turn on the rendering of the above path or not  -->
-    <bool name="config_enableDisplayCutoutProtection">true</bool>
+    <dimen name="physical_volume_up_button_center_screen_location_y">950.0px</dimen>
+    <dimen name="physical_volume_down_button_center_screen_location_y">1150.0px</dimen>
 </resources>