diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f5df9d4e..e5ce0dfa 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -15,9 +15,6 @@
         <meta-data
             android:name="com.samsung.android.icon_container.has_icon_container"
             android:value="true" />
-        <meta-data
-            android:name="com.samsung.android.icon_container.feature_appicon"
-            android:value="ADAPTIVEICON_SHADOW" />
 
         <activity android:name=".SwitchBarActivity" />
         <activity
@@ -30,6 +27,9 @@
             android:name=".SplashActivity"
             android:theme="@style/OneUISplashTheme"
             android:exported="true">
+            <meta-data
+                android:name="com.sec.android.app.launcher.icon_theme" android:value="themeColor"/>
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
diff --git a/app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java b/app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java
index d4696e03..65b4503e 100644
--- a/app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java
+++ b/app/src/main/java/de/dlyt/yanndroid/oneuiexample/base/BaseThemeActivity.java
@@ -23,11 +23,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         int normalTheme = mUseOUI4Theme ? R.style.OneUI4Theme : R.style.OneUI3Theme;
         int altTheme = mUseOUI4Theme ? R.style.OneUI4AboutTheme : R.style.OneUI3AboutTheme;
-
         setTheme(mUseAltTheme ? altTheme : normalTheme);
         new ThemeUtil(this);
 
         super.onCreate(savedInstanceState);
+
+        int normalThemeNavBar = mUseOUI4Theme ? R.color.sesl4_round_and_bgcolor : R.color.sesl_round_and_bgcolor;
+        int altThemeNavBar = R.color.splash_background;
+        getWindow().setNavigationBarColor(getResources().getColor(mUseAltTheme ? altThemeNavBar : normalThemeNavBar));
     }
 
     protected void switchOUITheme() {
diff --git a/yanndroid/oneui/src/main/res/values/themes.xml b/yanndroid/oneui/src/main/res/values/themes.xml
index d082faba..5349edeb 100644
--- a/yanndroid/oneui/src/main/res/values/themes.xml
+++ b/yanndroid/oneui/src/main/res/values/themes.xml
@@ -12,6 +12,8 @@
         <item name="android:windowLightStatusBar" tools:targetApi="m">true</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="27">true</item>
 
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@color/sesl_round_and_bgcolor</item>
+
         <item name="android:listSeparatorTextViewStyle">@style/ListSeparatorStyle</item>
 
         <item name="colorPrimary">@color/primary_color</item>
@@ -60,6 +62,8 @@
         <item name="android:statusBarColor">@color/sesl4_round_and_bgcolor</item>
         <item name="android:navigationBarColor">@color/sesl4_round_and_bgcolor</item>
 
+        <item name="android:windowSplashScreenAnimatedIcon" tools:targetApi="s">@color/sesl4_round_and_bgcolor</item>
+
         <item name="roundedCornerColor">@color/sesl4_round_and_bgcolor</item>
 
         <item name="android:textColorPrimary">@color/sesl4_primary_text</item>