diff --git a/a20/overlay/frameworks/base/core/res/res/values/config.xml b/a20/overlay/frameworks/base/core/res/res/values/config.xml
index ae4cbd9..b2467ab 100644
--- a/a20/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a20/overlay/frameworks/base/core/res/res/values/config.xml
@@ -36,7 +36,7 @@
                 <string ...>M -5,0 L -5,10 L 5,10 L 5,0 Z @dp</string>
          @see https://www.w3.org/TR/SVG/paths.html#PathData
          -->
-    <string name="config_mainBuiltInDisplayCutout">M62,0l-3.8,0l-3.9,0.2l-3.9,0.4l-4,0.8l-3.9,1.2l-3.8,1.6l-3.7,2l-3.4,2.4l-3.1,2.8l-2.9,3l-2.7,3.1l-2.6,3.1 l-2.7,2.8C12.5,28,6.2,30.3,0,30.3c-6.3,0-12.5-2.3-17.5-6.8l-2.7-2.8l-2.6-3.1l-2.7-3.1l-2.9-3l-3.2-2.8 L-35,6.2l-3.7-2l-3.8-1.6l-3.9-1.2l-4-0.8L-54.3,0.2L-58.2,0L-62,0Z @dp</string>
+    <string name="config_mainBuiltInDisplayCutout">M 0,0 H -22.42857142857143 V 30.85714285714286 H 22.42857142857143 V 0 H 0 Z @dp</string>
     <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
     <!-- If supported, are dreams enabled? (by default) -->
     <bool name="config_dreamsEnabledByDefault">false</bool>
diff --git a/a20/overlay/frameworks/base/core/res/res/values/dimens.xml b/a20/overlay/frameworks/base/core/res/res/values/dimens.xml
index a7eb53e..5aa1cfe 100644
--- a/a20/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/a20/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <!-- Height of the status bar in landscape. The height should be
-         Max((status bar content height + waterfall top size), top cutout size) -->
-    <dimen name="status_bar_height_landscape">24.0dip</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">31.0dip</dimen>
     <dimen name="status_bar_height_portrait">31.0dip</dimen>
-
-    <!-- Default radius of the software rounded corners. -->
-    <dimen name="rounded_corner_radius">40px</dimen>
+    <dimen name="status_bar_height_landscape">31.0dip</dimen>
+    <dimen name="quick_qs_offset_height">48.0dip</dimen>
+    <dimen name="rounded_corner_radius">0.0dip</dimen>
+    <dimen name="rounded_corner_radius_adjustment">0.0px</dimen>
+    <dimen name="rounded_corner_radius_bottom">0.0dip</dimen>
+    <dimen name="rounded_corner_radius_bottom_adjustment">0.0px</dimen>
+    <dimen name="rounded_corner_radius_top">29.0dip</dimen>
+    <dimen name="rounded_corner_radius_top_adjustment">29.0px</dimen>
 </resources>
diff --git a/a20e/overlay/frameworks/base/core/res/res/values/config.xml b/a20e/overlay/frameworks/base/core/res/res/values/config.xml
index 593636c..c1984cd 100644
--- a/a20e/overlay/frameworks/base/core/res/res/values/config.xml
+++ b/a20e/overlay/frameworks/base/core/res/res/values/config.xml
@@ -3,7 +3,8 @@
     <bool name="config_dozeAlwaysOnDisplayAvailable">false</bool>
     <bool name="config_displayBlanksAfterDoze">true</bool>
     <bool name="config_dozePulsePickup">false</bool>
-    <string name="config_mainBuiltInDisplayCutout">M62,0l-3.8,0l-3.9,0.2l-3.9,0.4l-4,0.8l-3.9,1.2l-3.8,1.6l-3.7,2l-3.4,2.4l-3.1,2.8l-2.9,3l-2.7,3.1l-2.6,3.1 l-2.7,2.8C12.5,28,6.2,30.3,0,30.3c-6.3,0-12.5-2.3-17.5-6.8l-2.7-2.8l-2.6-3.1l-2.7-3.1l-2.9-3l-3.2-2.8 L-35,6.2l-3.7-2l-3.8-1.6l-3.9-1.2l-4-0.8L-54.3,0.2L-58.2,0L-62,0Z @dp</string>
+    <string name="config_mainBuiltInDisplayCutout">M 0,0 H -22.42857142857143 V 30.85714285714286 H 22.42857142857143 V 0 H 0 Z @dp</string>
+    <string translatable="false" name="config_mainBuiltInDisplayCutoutRectApproximation">@*android:string/config_mainBuiltInDisplayCutout</string>
     <bool name="config_supportDoubleTapWake">false</bool>
     <bool name="config_enableBurnInProtection">false</bool>
     <bool name="config_allowAutoBrightnessWhileDozing">true</bool>
diff --git a/a20e/overlay/frameworks/base/core/res/res/values/dimens.xml b/a20e/overlay/frameworks/base/core/res/res/values/dimens.xml
index faac598..5aa1cfe 100644
--- a/a20e/overlay/frameworks/base/core/res/res/values/dimens.xml
+++ b/a20e/overlay/frameworks/base/core/res/res/values/dimens.xml
@@ -1,6 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <dimen name="status_bar_height_landscape">24.0dip</dimen>
+    <dimen name="status_bar_height">31.0dip</dimen>
     <dimen name="status_bar_height_portrait">31.0dip</dimen>
-    <dimen name="rounded_corner_radius">40px</dimen>
+    <dimen name="status_bar_height_landscape">31.0dip</dimen>
+    <dimen name="quick_qs_offset_height">48.0dip</dimen>
+    <dimen name="rounded_corner_radius">0.0dip</dimen>
+    <dimen name="rounded_corner_radius_adjustment">0.0px</dimen>
+    <dimen name="rounded_corner_radius_bottom">0.0dip</dimen>
+    <dimen name="rounded_corner_radius_bottom_adjustment">0.0px</dimen>
+    <dimen name="rounded_corner_radius_top">29.0dip</dimen>
+    <dimen name="rounded_corner_radius_top_adjustment">29.0px</dimen>
 </resources>
diff --git a/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml b/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
index caf53a0..aa20288 100644
--- a/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
+++ b/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/dimens.xml
@@ -16,5 +16,10 @@
 */
 -->
 <resources>
-    <dimen name="rounded_corner_content_padding">48px</dimen>
+    <dimen name="status_bar_padding_start">6.0dip</dimen>
+    <dimen name="status_bar_padding_end">4.0dip</dimen>
+    <dimen name="status_bar_padding_top">1.0dip</dimen>
+    <dimen name="rounded_corner_content_padding">23.0dip</dimen>
+    <dimen name="rounded_corner_radius_top">29.0dip</dimen>
+    <dimen name="rounded_corner_radius_top_adjustment">29.0px</dimen>
 </resources>
diff --git a/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml b/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml
deleted file mode 100644
index 431ba51..0000000
--- a/universal7885-common/overlay/frameworks/base/packages/SystemUI/res/values/flags.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-    Copyright (C) 2021 The Android Open Source Project
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
-<resources>
-    <bool name="flag_combined_status_bar_signal_icons">true</bool>
-</resources>