diff --git a/config/common.mk b/config/common.mk
index b2539becf07cf2201e4a32abeaf605e6f467f73b..7b9b79aea83998b16ca23c8a94ec7fb803de2267 100644
--- a/config/common.mk
+++ b/config/common.mk
@@ -202,7 +202,7 @@ PRODUCT_PACKAGE_OVERLAYS += \
 
 PRODUCT_PACKAGES += \
     NetworkStackOverlay \
-    TrebuchetOverlay
+    BlissLauncherOverlay
 
 # Translations
 PRODUCT_ENFORCE_RRO_EXCLUDED_OVERLAYS += vendor/crowdin/overlay
diff --git a/config/common_mobile.mk b/config/common_mobile.mk
index 74c8a5f02a899ff6109da4f37bca661a944f5e09..ed6940f4b547a383fc8c03c52287966480bbb069 100644
--- a/config/common_mobile.mk
+++ b/config/common_mobile.mk
@@ -47,6 +47,7 @@ endif
 
 # Customizations
 PRODUCT_PACKAGES += \
+    IconShapeCircleOverlay \
     IconShapePebbleOverlay \
     IconShapeRoundedRectOverlay \
     IconShapeSquareOverlay \
diff --git a/overlay/common/frameworks/base/core/res/res/values/config.xml b/overlay/common/frameworks/base/core/res/res/values/config.xml
index 9a8ba05a6d2244cca5c8ebeb1c431673bc24d454..156c492100070d4cf5d785cb11c31a62f7556eec 100644
--- a/overlay/common/frameworks/base/core/res/res/values/config.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/config.xml
@@ -81,8 +81,8 @@
     <!-- Flag indicating which package name can access the persistent data partition -->
     <string name="config_persistentDataPackageName" translatable="false">com.google.android.gms</string>
 
-   <!-- Set icon mask to circle -->
-   <string name="config_icon_mask" translatable="false">"M50 0A50 50,0,1,1,50 100A50 50,0,1,1,50 0"</string>
+    <!-- Set icon mask to circle -->
+    <string name="config_icon_mask">M 78.9068 100.0425 H 21.0206 c -11.6647 0 -21.1077 -9.4484 -21.1077 -21.12 V 21.12 C 0.03 9.4484 9.473 0 21.1377 0 h 57.7688 c 11.6647 0 21.1077 9.4484 21.1077 21.12 v 57.8023 C 100.0146 90.5941 90.5719 100.0425 78.9068 100.0425 z</string>
 
     <!-- Whether action menu items should be displayed in ALLCAPS or not.
          Defaults to true. If this is not appropriate for specific locales
@@ -90,7 +90,7 @@
     <bool name="config_buttonTextAllCaps">false</bool>
 
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
-    <bool name="config_useRoundIcon">true</bool>
+    <bool name="config_useRoundIcon">false</bool>
 
     <!-- Whether or not we should show the option to show battery percentage -->
     <bool name="config_battery_percentage_setting_available">false</bool>
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
index 37c5f13e501d9ca536051e850a20bceb5a7ea3d8..56398aa873878f7353714f0812568d0055f0081a 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_device.xml
@@ -34,5 +34,6 @@
         <item>com.android.messaging</item> <!-- AOSP messaging -->
         <item>com.google.android.setupwizard</item> <!-- Google SetupWizard -->
         <item>org.lineageos.setupwizard</item> <!-- LineageOS SetupWizard -->
+        <item>foundation.e.blisslauncher</item> <!--­ Bliss Launcher -->
     </string-array>
 </resources>
diff --git a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
index 0099c83bb5a9375ac8debb23af8e09ae39720fc9..978a7f4e71688c3f5c7dca7b0baf97340f437494 100644
--- a/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
+++ b/overlay/common/frameworks/base/core/res/res/values/vendor_required_apps_managed_user.xml
@@ -32,5 +32,6 @@
         <item>com.android.dialer</item> <!-- AOSP dialer -->
         <item>com.google.android.apps.messaging</item> <!-- Google messaging to enable text messaging -->
         <item>com.android.messaging</item> <!-- AOSP messaging -->
+        <item>foundation.e.blisslauncher</item> <!-- Bliss Launcher -->
     </string-array>
 </resources>
diff --git a/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
new file mode 100644
index 0000000000000000000000000000000000000000..16298140a7622344072345b9ff29c83bf76e53b5
--- /dev/null
+++ b/overlay/common/frameworks/libs/systemui/iconloaderlib/res/values/config.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+**
+** Copyright 2018, 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>
+
+    <string name="calendar_component_name" translatable="false">foundation.e.calendar/com.android.calendar.AllInOneActivity</string>
+    <string name="clock_component_name" translatable="false">com.android.deskclock/com.android.deskclock.DeskClockApplication</string>
+
+</resources>
diff --git a/overlay/rro_packages/TrebuchetOverlay/Android.bp b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
similarity index 81%
rename from overlay/rro_packages/TrebuchetOverlay/Android.bp
rename to overlay/rro_packages/BlissLauncherOverlay/Android.bp
index 833e0d8f2c2352a6502e28eb8b3bb95cf56c58a4..12cb08515c879f78546324e9e3c62fa9a7c27ead 100644
--- a/overlay/rro_packages/TrebuchetOverlay/Android.bp
+++ b/overlay/rro_packages/BlissLauncherOverlay/Android.bp
@@ -4,6 +4,6 @@
 //
 
 runtime_resource_overlay {
-    name: "TrebuchetOverlay",
+    name: "BlissLauncherOverlay",
     product_specific: true,
 }
diff --git a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
similarity index 72%
rename from overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
rename to overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
index b87512af0772a2d5013cba64bda11985ea6cc0a1..1f2b84651890caa61f8efd230a994cefc29b2c06 100644
--- a/overlay/rro_packages/TrebuchetOverlay/AndroidManifest.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/AndroidManifest.xml
@@ -4,10 +4,10 @@
      SPDX-License-Identifier: Apache-2.0
 -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.android.launcher3.overlay">
+    package="foundation.e.blisslauncher.overlay">
 
     <overlay
         android:isStatic="true"
         android:priority="100"
-        android:targetPackage="com.android.launcher3" />
+        android:targetPackage="foundation.e.blisslauncher" />
 </manifest>
diff --git a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
similarity index 77%
rename from overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
rename to overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
index 984c43b020026f632d83dcf32f4bdcd74efb518f..7310f6aa9f3c3c995599f2775c78e2c6c2adc2c5 100644
--- a/overlay/rro_packages/TrebuchetOverlay/res/values/config.xml
+++ b/overlay/rro_packages/BlissLauncherOverlay/res/values/config.xml
@@ -22,4 +22,7 @@
     <!-- Enable All Apps header scrim (works fine with our fixed search UI) -->
     <bool name="config_header_protection_supported">true</bool>
 
+    <string name="calendar_component_name" translatable="false">foundation.e.calendar/com.android.calendar.AllInOneActivity</string>
+    <string name="clock_component_name" translatable="false">com.android.deskclock/com.android.deskclock.DeskClockApplication</string>
+
 </resources>