diff --git a/resource-overlay/dubai/Frameworks/res/values/config.xml b/resource-overlay/dubai/Frameworks/res/values/config.xml
index 8e6ff12..0a0b2b8 100644
--- a/resource-overlay/dubai/Frameworks/res/values/config.xml
+++ b/resource-overlay/dubai/Frameworks/res/values/config.xml
@@ -134,13 +134,32 @@
 
          @see https://www.w3.org/TR/SVG/paths.html#PathData
          -->
-    <string translatable="false" name="config_mainBuiltInDisplayCutout">
-        M -35,0
-        L 35,0
-		L 35,105
-		L -35,105
-		Z
-	</string>
+    <string name="config_mainBuiltInDisplayCutout" translatable="false">
+        M 503.5,65
+        a 36.5,36.5 0 1 0 73,0
+        a 36.5,36.5 0 1 0 -73,0
+        Z
+        @left
+    </string>
+
+    <!-- Like config_mainBuiltInDisplayCutout, but this path is used to report the
+         one single bounding rect per device edge to the app via
+         {@link DisplayCutout#getBoundingRect}. Note that this path should try to match the visual
+         appearance of the cutout as much as possible, and may be smaller than
+         config_mainBuiltInDisplayCutout
+         -->
+    <string name="config_mainBuiltInDisplayCutoutRectApproximation" translatable="false">
+        M -36.5 0
+        L -36.5 130
+        L 36.5 130
+        L 36.5 0
+        Z
+    </string>
+
+    <!-- Whether the display cutout region of the main built-in display should be forced to
+         black in software (to avoid aliasing or emulate a cutout that is not physically existent).
+         -->
+    <bool name="config_fillMainBuiltInDisplayCutout">true</bool>
 
 	<!-- Indicate whether to allow the device to suspend when the screen is off
          due to the proximity sensor.  This resource should only be set to true
diff --git a/resource-overlay/dubai/Frameworks/res/values/dimens.xml b/resource-overlay/dubai/Frameworks/res/values/dimens.xml
index d42b87d..abc96bf 100644
--- a/resource-overlay/dubai/Frameworks/res/values/dimens.xml
+++ b/resource-overlay/dubai/Frameworks/res/values/dimens.xml
@@ -8,20 +8,20 @@
     <dimen name="rounded_corner_radius">95.0px</dimen>
 
     <!-- Default paddings for content around the corners. -->
-    <dimen name="rounded_corner_content_padding">4px</dimen>
+    <dimen name="rounded_corner_content_padding">14dp</dimen>
 
     <!-- The default height of the status bar used in {@link SystemBarUtils#getStatusBarHeight} to
          calculate the status bar height. -->
-    <dimen name="status_bar_height_default">105px</dimen>
+    <dimen name="status_bar_height_default">28dp</dimen>
 
     <!-- Height of the status bar in portrait. The height should be
          Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_portrait">@dimen/status_bar_height_default</dimen>
+    <dimen name="status_bar_height_portrait">130px</dimen>
 
     <!-- Height of the status bar in landscape.
          Do not read this dimen directly. Use {@link SystemBarUtils#getStatusBarHeight} instead.
          -->
-    <dimen name="status_bar_height_landscape">14dip</dimen>
+    <dimen name="status_bar_height_landscape">28dp</dimen>
 
     <!-- Height of area above QQS where battery/time go.
          Do not read this dimen directly. Use {@link SystemBarUtils#getQuickQsOffsetHeight} instead.
diff --git a/resource-overlay/dubai/SystemUI/res/values/config.xml b/resource-overlay/dubai/SystemUI/res/values/config.xml
new file mode 100644
index 0000000..8c34dad
--- /dev/null
+++ b/resource-overlay/dubai/SystemUI/res/values/config.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (C) 2022 The LineageOS Project
+     SPDX-License-Identifier: Apache-2.0
+-->
+
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- A path similar to frameworks/base/core/res/res/values/config.xml
+      config_mainBuiltInDisplayCutout that describes a path larger than the exact path of a display
+      cutout. If present as well as config_enableDisplayCutoutProtection is set to true, then
+      SystemUI will draw this "protection path" instead of the display cutout path that is normally
+      used for anti-aliasing.
+
+      This path will only be drawn when the front-facing camera turns on, otherwise the main
+      DisplayCutout path will be rendered
+       -->
+    <string translatable="false" name="config_frontBuiltInDisplayCutoutProtection">
+        M 498.5,65
+        a 41.5,41.5 0 1 0 83,0
+        a 41.5,41.5 0 1 0 -83,0
+        Z
+    </string>
+
+    <!--  ID for the camera that needs extra protection -->
+    <string translatable="false" name="config_protectedCameraId">1</string>
+
+    <!--  Flag to turn on the rendering of the above path or not  -->
+    <bool name="config_enableDisplayCutoutProtection">true</bool>
+
+</resources>
diff --git a/resource-overlay/dubai/SystemUI/res/values/dimens.xml b/resource-overlay/dubai/SystemUI/res/values/dimens.xml
index 55b4824..48b8d48 100644
--- a/resource-overlay/dubai/SystemUI/res/values/dimens.xml
+++ b/resource-overlay/dubai/SystemUI/res/values/dimens.xml
@@ -17,7 +17,7 @@
     <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">16.0dip</dimen>
+    <dimen name="keyguard_carrier_text_margin">4dp</dimen>
 
     <!-- Margin on the right side of the system icon group on Keyguard. -->
     <dimen name="system_icons_keyguard_padding_end">10.0px</dimen>
@@ -31,4 +31,7 @@
     <!-- Location on the screen of the center of the physical volume up/down buttons. -->
     <dimen name="physical_volume_up_button_center_screen_location_y">600.0px</dimen>
     <dimen name="physical_volume_down_button_center_screen_location_y">760.0px</dimen>
+
+    <!--  Total minimum padding to enforce to ensure that the dot can always show  -->
+    <dimen name="ongoing_appops_dot_min_padding">14dp</dimen>
 </resources>