diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
index ef0e044564215..1ffc8265f48a6 100644
--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
@@ -45,11 +45,11 @@ LOCAL_REQUIRED_MODULES := \
 	IconPackRoundedSettingsOverlay \
 	IconPackRoundedSystemUIOverlay \
 	IconPackRoundedThemePickerOverlay \
-        IconShapeFlowerOverlay \
-        IconShapeHexagonOverlay \
 	IconShapeRoundedRectOverlay \
 	IconShapeSquircleOverlay \
+	IconShapeTaperedRectOverlay \
 	IconShapeTeardropOverlay \
+	IconShapeVesselOverlay \
 	NavigationBarMode3ButtonOverlay \
 	NavigationBarModeGesturalOverlay \
 	NavigationBarModeGesturalOverlayNarrowBack \
diff --git a/packages/overlays/IconShapeHexagonOverlay/Android.mk b/packages/overlays/IconShapeTaperedRectOverlay/Android.mk
similarity index 89%
rename from packages/overlays/IconShapeHexagonOverlay/Android.mk
rename to packages/overlays/IconShapeTaperedRectOverlay/Android.mk
index 16ef3995dedde..6f1bf2370a150 100644
--- a/packages/overlays/IconShapeHexagonOverlay/Android.mk
+++ b/packages/overlays/IconShapeTaperedRectOverlay/Android.mk
@@ -17,13 +17,13 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_RRO_THEME := IconShapeHexagon
+LOCAL_RRO_THEME := IconShapeTaperedRect
 
 LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := IconShapeHexagonOverlay
+LOCAL_PACKAGE_NAME := IconShapeTaperedRectOverlay
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml b/packages/overlays/IconShapeTaperedRectOverlay/AndroidManifest.xml
similarity index 86%
rename from packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml
rename to packages/overlays/IconShapeTaperedRectOverlay/AndroidManifest.xml
index 384d5b36e5769..363e33ce450eb 100644
--- a/packages/overlays/IconShapeHexagonOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconShapeTaperedRectOverlay/AndroidManifest.xml
@@ -15,7 +15,7 @@
   -->
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.theme.icon.hexagon"
+          package="com.android.theme.icon.taperedrect"
           android:versionCode="1"
           android:versionName="1.0">
     <overlay
@@ -24,5 +24,5 @@
         android:category="android.theme.customization.adaptive_icon_shape"
         android:priority="1"/>
 
-    <application android:label="@string/icon_shape_hexagon_overlay" android:hasCode="false"/>
+    <application android:label="@string/icon_shape_tapered_rect_overlay" android:hasCode="false"/>
 </manifest>
diff --git a/packages/overlays/IconShapeHexagonOverlay/res/values/config.xml b/packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
similarity index 90%
rename from packages/overlays/IconShapeHexagonOverlay/res/values/config.xml
rename to packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
index f7cb5951b4f15..ace06406c13c2 100644
--- a/packages/overlays/IconShapeHexagonOverlay/res/values/config.xml
+++ b/packages/overlays/IconShapeTaperedRectOverlay/res/values/config.xml
@@ -16,7 +16,7 @@
   -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
-    <string name="config_icon_mask" translatable="false">"M12,0 88,0 100,50 88,100 12,100 0,50 12,0 Z"</string>
+    <string name="config_icon_mask" translatable="false">"M20,0 80,0 100,20 100,80 80,100 20,100 0,80 0,20 20,0 Z"</string>
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
     <bool name="config_useRoundIcon">false</bool>
     <!-- Corner radius of system dialogs -->
diff --git a/packages/overlays/IconShapeHexagonOverlay/res/values/strings.xml b/packages/overlays/IconShapeTaperedRectOverlay/res/values/strings.xml
similarity index 84%
rename from packages/overlays/IconShapeHexagonOverlay/res/values/strings.xml
rename to packages/overlays/IconShapeTaperedRectOverlay/res/values/strings.xml
index e00dc9d938ec7..3f36598a89bc8 100644
--- a/packages/overlays/IconShapeHexagonOverlay/res/values/strings.xml
+++ b/packages/overlays/IconShapeTaperedRectOverlay/res/values/strings.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Hexagon icon overlay -->
-    <string name="icon_shape_hexagon_overlay" translatable="false">Hexagon</string>
+    <!-- Tapered rect icon overlay -->
+    <string name="icon_shape_tapered_rect_overlay" translatable="false">Tapered Rect</string>
 
 </resources>
diff --git a/packages/overlays/IconShapeFlowerOverlay/Android.mk b/packages/overlays/IconShapeVesselOverlay/Android.mk
similarity index 90%
rename from packages/overlays/IconShapeFlowerOverlay/Android.mk
rename to packages/overlays/IconShapeVesselOverlay/Android.mk
index d410bb72b7239..0816e6f7800d9 100644
--- a/packages/overlays/IconShapeFlowerOverlay/Android.mk
+++ b/packages/overlays/IconShapeVesselOverlay/Android.mk
@@ -17,13 +17,13 @@
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_RRO_THEME := IconShapeFlower
+LOCAL_RRO_THEME := IconShapeVessel
 
 LOCAL_PRODUCT_MODULE := true
 
 LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
 
-LOCAL_PACKAGE_NAME := IconShapeFlowerOverlay
+LOCAL_PACKAGE_NAME := IconShapeVesselOverlay
 LOCAL_SDK_VERSION := current
 
 include $(BUILD_RRO_PACKAGE)
diff --git a/packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml b/packages/overlays/IconShapeVesselOverlay/AndroidManifest.xml
similarity index 90%
rename from packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml
rename to packages/overlays/IconShapeVesselOverlay/AndroidManifest.xml
index 22411a234fe6e..24f52dd99bd5b 100644
--- a/packages/overlays/IconShapeFlowerOverlay/AndroidManifest.xml
+++ b/packages/overlays/IconShapeVesselOverlay/AndroidManifest.xml
@@ -14,7 +14,7 @@
   ~ limitations under the License.
   -->
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-          package="com.android.theme.icon.flower"
+          package="com.android.theme.icon.vessel"
           android:versionCode="1"
           android:versionName="1.0">
     <overlay
@@ -23,5 +23,5 @@
         android:category="android.theme.customization.adaptive_icon_shape"
         android:priority="1"/>
 
-    <application android:label="@string/icon_shape_flower_overlay" android:hasCode="false"/>
+    <application android:label="@string/icon_shape_vessel_overlay" android:hasCode="false"/>
 </manifest>
diff --git a/packages/overlays/IconShapeFlowerOverlay/res/values/config.xml b/packages/overlays/IconShapeVesselOverlay/res/values/config.xml
similarity index 67%
rename from packages/overlays/IconShapeFlowerOverlay/res/values/config.xml
rename to packages/overlays/IconShapeVesselOverlay/res/values/config.xml
index 73f4f2175a4b4..86d31f6450bc7 100644
--- a/packages/overlays/IconShapeFlowerOverlay/res/values/config.xml
+++ b/packages/overlays/IconShapeVesselOverlay/res/values/config.xml
@@ -16,7 +16,7 @@
   -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->
-    <string name="config_icon_mask" translatable="false">"M50,0 C60.6,0 69.9,5.3 75.6,13.5 78.5,17.8 82.3,21.5 86.6,24.5 94.7,30.1 100,39.4 100,50 100,60.6 94.7,69.9 86.5,75.6 82.2,78.5 78.5,82.3 75.5,86.6 69.9,94.7 60.6,100 50,100 39.4,100 30.1,94.7 24.4,86.5 21.5,82.2 17.7,78.5 13.4,75.5 5.3,69.9 0,60.6 0,50 0,39.4 5.3,30.1 13.5,24.4 17.8,21.5 21.5,17.7 24.5,13.4 30.1,5.3 39.4,0 50,0 Z"</string>
+    <string name="config_icon_mask" translatable="false">"M12.97,0 C8.41,0 4.14,2.55 2.21,6.68 -1.03,13.61 -0.71,21.78 3.16,28.46 4.89,31.46 4.89,35.2 3.16,38.2 -1.05,45.48 -1.05,54.52 3.16,61.8 4.89,64.8 4.89,68.54 3.16,71.54 -0.71,78.22 -1.03,86.39 2.21,93.32 4.14,97.45 8.41,100 12.97,100 21.38,100 78.62,100 87.03,100 91.59,100 95.85,97.45 97.79,93.32 101.02,86.39 100.71,78.22 96.84,71.54 95.1,68.54 95.1,64.8 96.84,61.8 101.05,54.52 101.05,45.48 96.84,38.2 95.1,35.2 95.1,31.46 96.84,28.46 100.71,21.78 101.02,13.61 97.79,6.68 95.85,2.55 91.59,0 87.03,0 78.62,0 21.38,0 12.97,0 Z"</string>
     <!-- Flag indicating whether round icons should be parsed from the application manifest. -->
     <bool name="config_useRoundIcon">false</bool>
     <!-- Corner radius of system dialogs -->
diff --git a/packages/overlays/IconShapeFlowerOverlay/res/values/strings.xml b/packages/overlays/IconShapeVesselOverlay/res/values/strings.xml
similarity index 86%
rename from packages/overlays/IconShapeFlowerOverlay/res/values/strings.xml
rename to packages/overlays/IconShapeVesselOverlay/res/values/strings.xml
index 47c1479e5a40d..a50e7e9a9ab21 100644
--- a/packages/overlays/IconShapeFlowerOverlay/res/values/strings.xml
+++ b/packages/overlays/IconShapeVesselOverlay/res/values/strings.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <!-- Flower icon overlay -->
-    <string name="icon_shape_flower_overlay" translatable="false">Flower</string>
+    <!-- Vessel icon overlay -->
+    <string name="icon_shape_vessel_overlay" translatable="false">Vessel</string>
 
 </resources>