diff --git a/Android.bp b/Android.bp
index 88ebebadd4fc97b7fa6e3034832800098cc645d6..7e088ec60801db13cb2bc943862bebb85856eb46 100644
--- a/Android.bp
+++ b/Android.bp
@@ -54,6 +54,7 @@ java_defaults {
         "apache-commons-compress",
         "com.google.android.material_material",
         "guava",
+        "elib",
     ],
 
     libs: [
diff --git a/res/color/search_chip_background_color.xml b/res/color/search_chip_background_color.xml
index c94d155a5f39464adc9cb70ccb2cd512f5125f2b..ed5f3222fbe90bc4852dafb65766b08a4ea09fca 100644
--- a/res/color/search_chip_background_color.xml
+++ b/res/color/search_chip_background_color.xml
@@ -16,7 +16,7 @@
   -->
 
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_selected="true" android:color="?android:attr/colorSecondary"/>
-    <item android:state_enabled="true" android:color="?android:attr/colorBackground"/>
+    <item android:state_selected="true" android:color="@color/e_alpha_accent"/>
+    <item android:state_enabled="true" android:color="@color/e_action_bar"/>
     <item android:state_enabled="false" android:color="@color/chip_background_disable_color"/>
 </selector>
\ No newline at end of file
diff --git a/res/drawable/bottom_sheet_dialog_background.xml b/res/drawable/bottom_sheet_dialog_background.xml
index 703667a52423ac8aef3b3576999f5155fb99f419..f3f7bb930fedc9e62cd8fe0aaf77fcdcbdf7e9ed 100644
--- a/res/drawable/bottom_sheet_dialog_background.xml
+++ b/res/drawable/bottom_sheet_dialog_background.xml
@@ -15,7 +15,7 @@
 -->
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
 
-    <solid android:color="?android:attr/colorBackground" />
+    <solid android:color="?android:attr/colorBackgroundFloating" />
 
     <corners android:topLeftRadius="@dimen/grid_item_radius"
              android:topRightRadius="@dimen/grid_item_radius"
diff --git a/res/drawable/ic_arrow_back.xml b/res/drawable/ic_arrow_back.xml
index 1a9993033240dffb18681a538d51f4ac8d01fb9f..08f4e1ae9bf2bca8a3721a74287a5314b50a1840 100644
--- a/res/drawable/ic_arrow_back.xml
+++ b/res/drawable/ic_arrow_back.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24.0"
         android:viewportHeight="24.0">
     <path
-        android:fillColor="?android:colorControlNormal"
+        android:fillColor="@color/e_primary_text_color"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_hamburger.xml b/res/drawable/ic_hamburger.xml
index bc273524ba973bce677a3975297e79d28abe813c..4e4ef7f7bfce11069e6b0781910b8b9d2c0e1c5e 100644
--- a/res/drawable/ic_hamburger.xml
+++ b/res/drawable/ic_hamburger.xml
@@ -20,6 +20,6 @@
         android:viewportWidth="24"
         android:viewportHeight="24">
     <path
-        android:fillColor="?android:attr/colorControlNormal"
+        android:fillColor="@color/e_primary_text_color"
         android:pathData="M3,18h18v-2H3V18zM3,13h18v-2H3V13zM3,6v2h18V6H3z"/>
 </vector>
\ No newline at end of file
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index 452f45a3ad5508dc3bee9dd4486ea9faeb12977d..5ec6d62982ea4e84e37531e8eacabbb9e1b05d22 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,17 +1,37 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
   <path
-      android:pathData="M0,0h108v108h-108z"
-      android:fillColor="#0092E4"/>
-  <path
-      android:pathData="M60,70m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0"
-      android:fillColor="#CBDEFB"/>
+      android:pathData="M0,0h108v108h-108z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="1.52"
+          android:endX="54"
+          android:endY="108.02"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFFFFFFF"/>
+        <item android:offset="1" android:color="#FFE6E8E9"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/drawable/ic_launcher_foreground.xml b/res/drawable/ic_launcher_foreground.xml
index 7ce0be9048f8ab8f0bd44d93f22abf6439a0d62c..6fe8e07e1af917d812b6e5e5f8583d15200fa19f 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,34 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
     android:width="108dp"
     android:height="108dp"
     android:viewportWidth="108"
     android:viewportHeight="108">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M108,0H0V108H108V0ZM34,38C31.791,38 30,39.791 30,42V68C30,70.209 31.791,72 34,72H74C76.209,72 78,70.209 78,68V42C78,39.791 76.209,38 74,38H58L54.586,34.586C54.211,34.211 53.702,34 53.172,34H38.828C38.298,34 37.789,34.211 37.414,34.586L34,38Z"
-        android:fillColor="#ffffff"
-        android:fillType="evenOdd"/>
-    <path
-        android:pathData="M28.54,28.54m-72,0a72,72 0,1 1,144 0a72,72 0,1 1,-144 0"
-        android:fillAlpha="0.6">
-      <aapt:attr name="android:fillColor">
-        <gradient
-            android:gradientRadius="72"
-            android:centerX="28.54"
-            android:centerY="28.54"
-            android:type="radial">
-          <item android:offset="0" android:color="#19FFFFFF"/>
-          <item android:offset="1" android:color="#00FFFFFF"/>
-        </gradient>
-      </aapt:attr>
-    </path>
-  </group>
+  <path
+      android:pathData="M75.47,33H32.52C30.02,33 28,35.02 28,37.52V63.92C28,66.42 30.02,68.45 32.52,68.45H75.47C77.97,68.45 80,66.42 80,63.92V37.52C80,35.02 77.97,33 75.47,33Z"
+      android:fillColor="#00A9ED"/>
+  <path
+      android:pathData="M74.52,35.46H33.48C30.98,35.46 28.96,37.48 28.96,39.98V66.38C28.96,68.88 30.98,70.9 33.48,70.9H74.52C77.02,70.9 79.04,68.88 79.04,66.38V39.98C79.04,37.48 77.02,35.46 74.52,35.46Z"
+      android:fillColor="#FAF17A"/>
+  <path
+      android:pathData="M46.17,42.32L46.2,42.39C45.51,41.12 44.12,40.22 43,40.22H31.51C31.05,40.22 30.59,40.31 30.17,40.49C29.74,40.67 29.35,40.92 29.03,41.25C28.7,41.58 28.45,41.96 28.27,42.39C28.09,42.81 28,43.27 28,43.73V45.3H28.01V45.31H28V70.29C28,71.49 28.48,72.64 29.32,73.48C30.17,74.33 31.32,74.81 32.52,74.81H75.48C76.68,74.81 77.83,74.33 78.68,73.48C79.52,72.64 80,71.49 80,70.29V49.83C80,48.63 79.52,47.48 78.68,46.63C77.83,45.78 76.68,45.31 75.48,45.31L50.48,45.3C48.83,45.3 46.98,43.81 46.17,42.32Z"
+      android:fillColor="#00A9ED"/>
 </vector>
diff --git a/res/drawable/list_divider.xml b/res/drawable/list_divider.xml
index 5067af08e842dd9fc197a8f8d3f618c343c1b768..de96b1f12df9b083d9180caf9fc1dde49d4a0296 100644
--- a/res/drawable/list_divider.xml
+++ b/res/drawable/list_divider.xml
@@ -15,7 +15,7 @@
 -->
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:tint="?android:attr/colorForeground">
+       android:tint="@android:color/transparent">
     <solid android:color="@color/list_divider_color" />
     <size
         android:height="1dp"
diff --git a/res/layout/drawer_layout.xml b/res/layout/drawer_layout.xml
index d08c17d9fae3a80794c0aa73aaabf7a7306f8b17..25a982eb86217343fb9d119d42f7eaa27bc85b05 100644
--- a/res/layout/drawer_layout.xml
+++ b/res/layout/drawer_layout.xml
@@ -79,13 +79,13 @@
             android:layout_gravity="start"
             android:orientation="vertical"
             android:elevation="0dp"
-            android:background="?android:attr/colorBackground">
+            android:background="@color/e_drawer_background">
 
             <androidx.appcompat.widget.Toolbar
                 android:id="@+id/roots_toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@color/e_drawer_background"
                 android:elevation="0dp"
                 app:titleTextAppearance="@style/DrawerMenuTitle"
                 app:titleTextColor="?android:colorAccent"/>
diff --git a/res/layout/inspector_activity.xml b/res/layout/inspector_activity.xml
index 8763351c9f33b27ca4cb3217b777a13deb006cc8..9d6908a04eede579bdb1dc8fb8759d84bd3428ac 100644
--- a/res/layout/inspector_activity.xml
+++ b/res/layout/inspector_activity.xml
@@ -55,7 +55,7 @@
                 android:id="@+id/toolbar"
                 android:layout_width="match_parent"
                 android:layout_height="?android:attr/actionBarSize"
-                android:background="?android:attr/colorBackground"
+                android:background="@color/e_action_bar"
                 android:theme="?actionBarTheme"
                 app:title="@string/inspector_title"
                 app:titleTextAppearance="@style/ToolbarTitle"
@@ -76,7 +76,7 @@
             android:orientation="vertical"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@drawable/bottom_sheet_dialog_background"
+            android:background="@color/app_background_color"
             android:paddingBottom="5dp">
 
             <com.android.documentsui.inspector.DetailsView
diff --git a/res/layout/inspector_header.xml b/res/layout/inspector_header.xml
index 94a092790a434286dc3d091a32e1cc6318f70afd..d50ccf09602d037ef51ae70a0570642fefe78d27 100644
--- a/res/layout/inspector_header.xml
+++ b/res/layout/inspector_header.xml
@@ -24,6 +24,6 @@
         android:layout_height="match_parent"
         android:scaleType="fitCenter"
         android:alpha="0.0"
-        android:background="?android:colorBackgroundFloating" />
+        android:background="?android:colorBackground" />
 
 </RelativeLayout>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index 3d90bc5c3365d4775bbf1cccb9e699f0f1d06931..25f9cfa96d332c92c0680432e6fe3b10b809c915 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,9 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
+  ~ Copyright ECORP SAS 2022
+  ~ This program is free software: you can redistribute it and/or modify
+  ~ it under the terms of the GNU General Public License as published by
+  ~ the Free Software Foundation, either version 3 of the License, or
+  ~ (at your option) any later version.
+  ~
+  ~ This program is distributed in the hope that it will be useful,
+  ~ but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~ GNU General Public License for more details.
+  ~
+  ~ You should have received a copy of the GNU General Public License
+  ~  along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@drawable/ic_launcher_background"/>
-    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground>
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%" />
+    </foreground>
+</adaptive-icon>
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 169f52f35dfd1a174e055157e848f11c06ed9f95..364bf1e3ba3ea9ee297176e4981825096016d63a 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -14,14 +14,8 @@
      limitations under the License.
 -->
 <resources>
-    <color name="app_background_color">#202124</color>
-    <color name="background_floating">#3C4043</color>
     <color name="nav_bar_translucent">#52000000</color>
 
-    <color name="primary">#8AB4F8</color>
-    <color name="secondary">#3D8AB4F8</color>
-    <color name="hairline">#5F6368</color>
-
     <color name="empty_state_text">@android:color/white</color>
     <color name="error_image_color">@android:color/white</color>
 
@@ -32,5 +26,4 @@
     <color name="doc_list_item_subtitle_disabled">#36ffffff</color>
 
     <color name="list_divider_color">#9aa0a6</color>
-    <color name="list_item_selected_background_color">?android:colorSecondary</color>
 </resources>
diff --git a/res/values-night/themes.xml b/res/values-night/themes.xml
index 8ade73172dd2fdfff1ce649528d6356ad1ad73d3..ddf2dcd0278b53d0f53542362831e510a8a7a175 100644
--- a/res/values-night/themes.xml
+++ b/res/values-night/themes.xml
@@ -18,30 +18,4 @@
     <style name="LauncherTheme" parent="DocumentsTheme">
         <item name="android:windowBackground">@drawable/launcher_screen_night</item>
     </style>
-    <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
-
-        <!-- Toolbar -->
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
-        <item name="android:actionBarSize">@dimen/action_bar_size</item>
-
-        <!-- Color section -->
-        <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@color/app_background_color</item>
-        <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_dark</item>
-        <item name="android:colorControlActivated">@color/primary</item>
-        <item name="android:colorPrimary">@color/primary</item>
-        <item name="android:colorSecondary">@color/secondary</item>
-        <item name="android:strokeColor">@color/hairline</item>
-
-        <!-- System | Widget section -->
-        <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:attr/colorBackground</item>
-        <item name="android:windowBackground">?android:attr/colorBackground</item>
-        <item name="android:windowLightStatusBar">false</item>
-        <item name="android:windowLightNavigationBar">false</item>
-        <item name="android:windowNoTitle">true</item>
-        <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
-
-    </style>
 </resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 98287627e2861bb46455112ecfd5f09407909a61..a80959b71362525cac23407cd9c9505536d7615a 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -19,13 +19,13 @@
          else that needs to manually declare a background matching the "default"
          app background (e.g. the drawer overlay). -->
 
-    <color name="app_background_color">@android:color/white</color>
-    <color name="background_floating">@android:color/white</color>
+    <color name="app_background_color">@color/e_background</color>
+    <color name="background_floating">@color/e_floating_background</color>
     <color name="nav_bar_translucent">#99FFFFFF</color>
 
-    <color name="primary">#1E88E5</color> <!-- Blue 600 -->
-    <color name="secondary">#E3F2FD</color> <!-- Blue 50 -->
-    <color name="hairline">#E0E0E0</color> <!-- Gray 300 -->
+    <color name="primary">@color/e_accent</color> <!-- Blue 600 -->
+    <color name="secondary">@color/e_alpha_accent</color> <!-- Blue 50 -->
+    <color name="hairline">@color/e_stroke_color</color>
 
     <color name="chip_background_disable_color">#fff1f3f4</color>
     <color name="menu_search_background">@android:color/transparent</color>
@@ -52,5 +52,5 @@
 
     <color name="list_divider_color">#1f000000</color>
     <color name="list_item_selected_background_color">?android:colorSecondary</color>
-    <color name="color_surface_header">@color/app_background_color</color>
+    <color name="color_surface_header">@color/e_action_bar</color>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 264f2b4e6bcfda0ae578f148a2ef4be60640273f..c7ed49083c27780fe991bb0764a397b62babcb7b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -17,6 +17,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
     <style name="ActionBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="colorControlNormal">?android:textColorSecondary</item>
+        <item name="android:homeAsUpIndicator">@drawable/ic_arrow_back</item>
     </style>
 
     <style name="ActionModeStyle" parent="Widget.AppCompat.ActionMode">
@@ -27,7 +28,7 @@
     </style>
 
     <style name="CardViewStyle" parent="@style/Widget.MaterialComponents.CardView">
-        <item name="cardBackgroundColor">@color/app_background_color</item>
+        <item name="cardBackgroundColor">@color/e_floating_background</item>
         <item name="cardPreventCornerOverlap">false</item>
         <item name="cardCornerRadius">@dimen/grid_item_radius</item>
         <item name="cardElevation">@dimen/grid_item_elevation</item>
@@ -59,7 +60,7 @@
     </style>
 
     <style name="OverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
-        <item name="android:tint">?android:colorControlNormal</item>
+        <item name="android:src">@drawable/e_ic_more</item>
         <item name="android:minWidth">@dimen/button_touch_size</item>
     </style>
 
@@ -103,6 +104,8 @@
     </style>
 
     <style name="MaterialAlertDialogTheme" parent="@style/ThemeOverlay.MaterialComponents.MaterialAlertDialog.Centered">
+        <item name="colorSurface">@color/background_floating</item>
+        <item name="elevationOverlayEnabled">false</item>
         <item name="android:dialogCornerRadius">@dimen/grid_item_radius</item>
         <item name="alertDialogStyle">@style/MaterialAlertDialogStyle</item>
         <item name="buttonBarPositiveButtonStyle">@style/DialogTextButton</item>
diff --git a/res/values/themes.xml b/res/values/themes.xml
index 4433742822b46e7185983101213cb601478ccf4c..a7bae6433b5114c9d0853fe12d40e6c0fd7824bb 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -22,13 +22,13 @@
     <style name="DocumentsTheme" parent="@android:style/Theme.DeviceDefault.DocumentsUI">
 
         <item name="android:actionBarSize">@dimen/action_bar_size</item>
-        <item name="android:actionModeBackground">?android:attr/colorBackground</item>
+        <item name="android:actionModeBackground">@color/e_action_bar</item>
 
         <!-- Color section -->
         <item name="android:colorAccent">@color/primary</item>
-        <item name="android:colorBackground">@android:color/white</item>
+        <item name="android:colorBackground">@color/app_background_color</item>
         <item name="android:colorBackgroundFloating">@color/background_floating</item>
-        <item name="android:colorControlHighlight">@color/ripple_material_light</item>
+        <item name="android:colorControlHighlight">@color/e_alpha_accent</item>
         <item name="android:colorControlActivated">@color/primary</item>
         <item name="android:colorPrimary">@color/primary</item>
         <item name="android:colorSecondary">@color/secondary</item>
@@ -36,16 +36,17 @@
 
         <!-- System | Widget section -->
         <item name="android:listDivider">@drawable/list_divider</item>
-        <item name="android:statusBarColor">?android:colorBackground</item>
-        <item name="android:navigationBarColor">?android:colorBackground</item>
+        <item name="android:statusBarColor">@color/e_action_bar</item>
+        <item name="android:navigationBarColor">@color/e_action_bar</item>
         <item name="android:windowBackground">?android:colorBackground</item>
-        <item name="android:windowLightStatusBar">true</item>
-        <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:windowLightStatusBar">@bool/isLight</item>
+        <item name="android:windowLightNavigationBar">@bool/isLight</item>
         <item name="android:windowSoftInputMode">stateUnspecified|adjustUnspecified</item>
 
         <!-- OEM should not overlay this attr -->
         <item name="android:windowNoTitle">true</item>
-
+        <item name="android:textColorPrimary">@color/e_primary_text_color</item>
+        <item name="android:textColorSecondary">@color/e_secondary_text_color</item>
     </style>
 
     <style name="DocumentsDefaultTheme" parent="@style/Theme.MaterialComponents.DayNight.NoActionBar">
diff --git a/src/com/android/documentsui/BaseActivity.java b/src/com/android/documentsui/BaseActivity.java
index b4ab5bdf020c79e9e8ec50ef9245f42b11153823..068b1151d67e3b4f39df5ae29e97117973de8830 100644
--- a/src/com/android/documentsui/BaseActivity.java
+++ b/src/com/android/documentsui/BaseActivity.java
@@ -439,12 +439,6 @@ public abstract class BaseActivity
         });
 
         getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
-        if (Build.VERSION.SDK_INT >= 29) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setNavigationBarContrastEnforced(true);
-        } else {
-            getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
     }
 
     @Override
diff --git a/src/com/android/documentsui/inspector/InspectorActivity.java b/src/com/android/documentsui/inspector/InspectorActivity.java
index 948d66fb27c213b052e6600c816538cfaebd28f6..42759526111f7273c040fa769548bda38bca4748 100644
--- a/src/com/android/documentsui/inspector/InspectorActivity.java
+++ b/src/com/android/documentsui/inspector/InspectorActivity.java
@@ -119,11 +119,5 @@ public class InspectorActivity extends AppCompatActivity {
         });
 
         getWindow().setNavigationBarDividerColor(Color.TRANSPARENT);
-        if (Build.VERSION.SDK_INT >= 29) {
-            getWindow().setNavigationBarColor(Color.TRANSPARENT);
-            getWindow().setNavigationBarContrastEnforced(true);
-        } else {
-            getWindow().setNavigationBarColor(getColor(R.color.nav_bar_translucent));
-        }
     }
 }
\ No newline at end of file