diff --git a/smali/AndroidManifest.xml b/smali/AndroidManifest.xml
index 99b2ddfa3..8b4b838fc 100644
--- a/smali/AndroidManifest.xml
+++ b/smali/AndroidManifest.xml
@@ -157,6 +157,9 @@
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyBlTHhNGPj7ktPWrUo_d4YJs_Sn_zsISZg" />
+        <meta-data
+            android:name="com.samsung.android.icon_container.has_icon_container"
+            android:value="@bool/com_samsung_android_icon_container_has_icon_container"/>
         <meta-data
             android:name="com.google.android.geo.API_SECRET"
             android:value="yu6ZAA0OWO3kmr4es7fGtSmiyfk=" />
@@ -1620,9 +1623,6 @@
         <meta-data
             android:name="optimization_key"
             android:value="lONMnJymOutPww6aDtTpqGS77DtnW6hlwIrhgDPTGGyu+UvR7aR+nf8V4tSiVPyOZXgsTxne0umX209UUetCDGLXYcoMZLz/mNX4osYj/ACdI+6N7zFlO9+4L4vWJhlL59TKmQ3LDPyrd+InYdPl/WYwPBCBeeSMOPXVpUWEQsMH301NstEjSBZv+O0QzeuQS9/Jy94iop4kyFEtDkslfk6DyFEqeBLMA+D34UUhhsjwrwLC9FDtKJFTgSvfWbL0yT8GyNrUlsBlyRFsMUs6VvrMVJ9pft1rFEnn78jsaD8HrAWaIeq+DBjZ1KRokb2OI7U/XP14lbYMpLo4LgvfeQ==" />
-        <meta-data
-            android:name="com.samsung.android.icon_container.has_icon_container"
-            android:value="true" />
         <meta-data
             android:name="asset_statements"
             android:resource="@string/asset_statements" />
diff --git a/smali/res/values-v31/bools.xml b/smali/res/values-v31/bools.xml
new file mode 100644
index 000000000..9450674b1
--- /dev/null
+++ b/smali/res/values-v31/bools.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="com_samsung_android_icon_container_has_icon_container">false</bool>
+</resources>
diff --git a/smali/res/values/bools.xml b/smali/res/values/bools.xml
index f66e205f7..fa5912a36 100644
--- a/smali/res/values/bools.xml
+++ b/smali/res/values/bools.xml
@@ -16,4 +16,5 @@
     <bool name="spb_default_progressiveStart_activated">false</bool>
     <bool name="spb_default_reversed">false</bool>
     <bool name="vk_is_tablet">false</bool>
+    <bool name="com_samsung_android_icon_container_has_icon_container">true</bool>
 </resources>