diff --git a/app/src/main/java/com/ziadoua/zcard/AboutActivity.java b/app/src/main/java/com/ziadoua/zcard/AboutActivity.java
index 42f32ba45d..b92e2ae7da 100644
--- a/app/src/main/java/com/ziadoua/zcard/AboutActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/AboutActivity.java
@@ -35,19 +35,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(binding.toolbar);
         enableToolbarBackButton();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
-
         TextView copyright = binding.creditsSub;
         copyright.setText(content.getCopyrightShort());
         TextView versionHistory = binding.versionHistorySub;
diff --git a/app/src/main/java/com/ziadoua/zcard/ImportExportActivity.java b/app/src/main/java/com/ziadoua/zcard/ImportExportActivity.java
index 8672f7b813..1b6af44829 100644
--- a/app/src/main/java/com/ziadoua/zcard/ImportExportActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/ImportExportActivity.java
@@ -69,18 +69,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         enableToolbarBackButton();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
         Intent fileIntent = getIntent();
         if (fileIntent != null && fileIntent.getType() != null) {
             chooseImportType(false, fileIntent.getData());
diff --git a/app/src/main/java/com/ziadoua/zcard/LoyaltyCardEditActivity.java b/app/src/main/java/com/ziadoua/zcard/LoyaltyCardEditActivity.java
index db41e97de3..9ede174e94 100644
--- a/app/src/main/java/com/ziadoua/zcard/LoyaltyCardEditActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/LoyaltyCardEditActivity.java
@@ -328,18 +328,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         enableToolbarBackButton();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
         mDatabase = new DBHelper(this).getWritableDatabase();
 
         extractIntentFields(getIntent());
diff --git a/app/src/main/java/com/ziadoua/zcard/MainActivity.java b/app/src/main/java/com/ziadoua/zcard/MainActivity.java
index 0219bb1713..18a5e73f7f 100644
--- a/app/src/main/java/com/ziadoua/zcard/MainActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/MainActivity.java
@@ -239,18 +239,6 @@ protected void onCreate(Bundle inputSavedInstanceState) {
         groupsTabLayout = binding.groups;
         contentMainBinding = ContentMainBinding.bind(binding.include.getRoot());
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
         mDatabase = new DBHelper(this).getWritableDatabase();
 
         mUpdateLoyaltyCardListRunnable = () -> {
diff --git a/app/src/main/java/com/ziadoua/zcard/ManageGroupActivity.java b/app/src/main/java/com/ziadoua/zcard/ManageGroupActivity.java
index 22d0c07cce..8e064fd387 100644
--- a/app/src/main/java/com/ziadoua/zcard/ManageGroupActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/ManageGroupActivity.java
@@ -55,18 +55,6 @@ protected void onCreate(Bundle inputSavedInstanceState) {
         Toolbar toolbar = binding.toolbar;
         setSupportActionBar(toolbar);
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
         mDatabase = new DBHelper(this).getWritableDatabase();
 
         noGroupCardsText = binding.include.noGroupCardsText;
diff --git a/app/src/main/java/com/ziadoua/zcard/ManageGroupsActivity.java b/app/src/main/java/com/ziadoua/zcard/ManageGroupsActivity.java
index bc29bed5c8..2002bcaf71 100644
--- a/app/src/main/java/com/ziadoua/zcard/ManageGroupsActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/ManageGroupsActivity.java
@@ -50,18 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         enableToolbarBackButton();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
         mDatabase = new DBHelper(this).getWritableDatabase();
     }
 
diff --git a/app/src/main/java/com/ziadoua/zcard/preferences/SettingsActivity.java b/app/src/main/java/com/ziadoua/zcard/preferences/SettingsActivity.java
index 364e570627..ef12519e53 100644
--- a/app/src/main/java/com/ziadoua/zcard/preferences/SettingsActivity.java
+++ b/app/src/main/java/com/ziadoua/zcard/preferences/SettingsActivity.java
@@ -50,18 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
         setSupportActionBar(toolbar);
         enableToolbarBackButton();
 
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.R) {
-            if (getWindow().getInsetsController() != null) {
-                if (!Utils.isDarkModeEnabled(this)) {
-                    getWindow().getInsetsController().setSystemBarsAppearance(WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS, WindowInsetsController.APPEARANCE_LIGHT_NAVIGATION_BARS);
-                }
-
-            }
-        }
-
-        int colorBackground = MaterialColors.getColor(this, com.google.android.material.R.attr.colorSurface, ContextCompat.getColor(this, R.color.md_theme_light_surface));
-        getWindow().setNavigationBarColor(colorBackground);
-
         // Display the fragment as the main content.
         fragment = new SettingsFragment();
         getSupportFragmentManager().beginTransaction()
diff --git a/app/src/main/res/values-night/themes.xml b/app/src/main/res/values-night/themes.xml
index fd69224bda..8ed27a04d7 100644
--- a/app/src/main/res/values-night/themes.xml
+++ b/app/src/main/res/values-night/themes.xml
@@ -30,8 +30,6 @@
 
         <item name="windowActionModeOverlay">true</item>
         <item name="popupMenuBackground">@drawable/rounded</item>
-
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 3e1b13fac2..e6eaa00db7 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -30,8 +30,6 @@
 
         <item name="windowActionModeOverlay">true</item>
         <item name="popupMenuBackground">@drawable/rounded</item>
-
-        <item name="android:navigationBarColor">@android:color/transparent</item>
     </style>
 
     <style name="ThemeOverlay.App.MaterialAlertDialog.Monet" parent="ThemeOverlay.Material3.MaterialAlertDialog">