diff --git a/res/color/bottom_nav_color.xml b/res/color/bottom_nav_color.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f6aec0b9a1d4d3a0292967e941bde2cb62df2313
--- /dev/null
+++ b/res/color/bottom_nav_color.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:state_checked="true" android:color="@color/navigation_accent_enabled" />
+    <item android:state_checked="false" android:color="@color/navigation_accent_disabled"/>
+</selector>
\ No newline at end of file
diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
index b668381d3630c40f706e830b9bb195b250aafdef..fb882e1e111ed7c85c30456e3363d25cc3ce0e84 100644
--- a/res/layout/gallery_main.xml
+++ b/res/layout/gallery_main.xml
@@ -64,8 +64,8 @@
             android:layout_alignParentBottom="true"
             app:menu="@menu/navigation_items"
             app:itemBackground="@color/primary"
-            app:itemIconTint="@drawable/item_bg"
-            app:itemTextColor="@drawable/item_bg" />
+            app:itemIconTint="@color/bottom_nav_color"
+            app:itemTextColor="@color/bottom_nav_color" />
 
     </RelativeLayout>
 
diff --git a/res/menu/album.xml b/res/menu/album.xml
index 4b76b6981aa3ef4e76b41ddde381b23e09687a63..c68ed20c072f311485660cf3f32b6311a538ca9a 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -15,15 +15,15 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/action_camera"
-        android:icon="@drawable/camera"
+        android:icon="@lineageos.platform:drawable/ic_camera_photo"
         android:title="@string/switch_to_camera"
         android:showAsAction="ifRoom" />
     <item android:id="@+id/action_slideshow"
-        android:icon="@drawable/slideshow"
+        android:icon="@lineageos.platform:drawable/ic_video_play"
         android:title="@string/slideshow"
         android:showAsAction="ifRoom" />
     <item android:id="@+id/action_select"
-        android:icon="@drawable/ic_selection"
+        android:icon="@lineageos.platform:drawable/ic_squared_tick"
         android:title="@string/select_item"
         android:showAsAction="ifRoom" />
 <!--     <item android:id="@+id/action_group_by" -->
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index b21bf3d3836c0a49069e0018cb0f6b87acab23f2..0b91e27a4d35133750eabfcc79a39a966663582f 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -18,11 +18,11 @@
 -->
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/action_camera"
-        android:icon="@drawable/camera"
+        android:icon="@lineageos.platform:drawable/ic_camera_photo"
         android:title="@string/switch_to_camera"
         android:showAsAction="ifRoom" />
     <item android:id="@+id/action_select"
-        android:icon="@drawable/ic_selection"
+        android:icon="@lineageos.platform:drawable/ic_squared_tick"
         android:title="@string/select_album"
         android:showAsAction="ifRoom" />
     <item android:id="@+id/action_manage_offline"
diff --git a/res/menu/navigation_items.xml b/res/menu/navigation_items.xml
index b4f39dc1c97596c2a773ee2fb11aa25583e4431c..c606602df19c03d860a772eb16814268858dba75 100644
--- a/res/menu/navigation_items.xml
+++ b/res/menu/navigation_items.xml
@@ -1,11 +1,11 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
      <item android:id="@+id/action_timeline"
           android:title="@string/timeline_title"
-          android:icon="@drawable/ic_timeline" />
+          android:icon="@lineageos.platform:drawable/ic_timeline" />
      <item android:id="@+id/action_album"
           android:title="@string/albums_title"
-          android:icon="@drawable/ic_album" />
+          android:icon="@lineageos.platform:drawable/ic_album" />
      <item android:id="@+id/action_videos"
           android:title="@string/videos_title"
-          android:icon="@drawable/ic_video" />
+          android:icon="@lineageos.platform:drawable/ic_videos" />
 </menu>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b00001acec96e68133bca0730f6cc4ee5dd7af2c..347ccb7d6881eb16c3b33d4a9e6b6a036d7dc45d 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -89,6 +89,6 @@
     <color name="timeline_title_number_text_color">@color/white</color>
     <color name="timeline_title_background_color">@color/default_background</color>
 
-    <color name="navigation_accent_disabled">@lineageos.platform:color/color_default_gray2</color>
-    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_primary</color>
+    <color name="navigation_accent_disabled">@lineageos.platform:color/color_default_primary</color>
+    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_blue1</color>
 </resources>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 57a663c4834bf190836fb9dc89edaf42cf010ad1..8c3758450eebf0e62e219af9c7ced1b9212d8350 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -21,7 +21,9 @@ import android.content.Context;
 import android.content.Intent;
 //import android.drm.DrmHelper;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -632,6 +634,7 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         } else {
             inflator.inflate(R.menu.album, menu);
             mActionBar.setTitle(mMediaSet.getName());
+            changeMenuItemColor(menu);
 
             FilterUtils.setupMenuItems(mActionBar, mMediaSetPath, true);
 
@@ -651,6 +654,17 @@ public class AlbumPage extends ActivityState implements GalleryActionBar.Cluster
         return true;
     }
 
+    private void changeMenuItemColor(Menu menu){
+        for(int i = 0; i < menu.size(); i++){
+            Drawable drawable = menu.getItem(i).getIcon();
+            if(drawable != null) {
+                drawable.mutate();
+                drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+            }
+        }
+
+    }
+
     private boolean allVideoFiles() {
         if (mMediaSet == null)
             return false;
diff --git a/src/com/android/gallery3d/app/AlbumSetPage.java b/src/com/android/gallery3d/app/AlbumSetPage.java
index ffa5d95d042f1cb57a8e562cdb9b9afff7e37098..e61c94184253fbdae0ced99182bf1cac463b1f36 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -23,7 +23,9 @@ import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
@@ -624,10 +626,23 @@ public class AlbumSetPage extends ActivityState implements
             moreItem.setVisible(mActivity.getResources().getBoolean(
                     R.bool.config_show_more_images));
             mActionBar.setTitle(R.string.albums_title);
+            changeMenuItemColor(menu);
         }
         return true;
     }
 
+
+    private void changeMenuItemColor(Menu menu){
+        for(int i = 0; i < menu.size(); i++){
+            Drawable drawable = menu.getItem(i).getIcon();
+            if(drawable != null) {
+                drawable.mutate();
+                drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+            }
+        }
+
+    }
+
     @Override
     protected boolean onItemSelected(MenuItem item) {
         Activity activity = mActivity;
diff --git a/src/com/android/gallery3d/app/TimeLinePage.java b/src/com/android/gallery3d/app/TimeLinePage.java
index 2c71b8b1e69260f09ff0b2cb071de26a562294d2..d9a4eb9c64870afd83d9a6f025adea59ee2fb3b3 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -26,7 +26,9 @@ import android.content.Intent;
 import android.content.IntentFilter;
 import android.content.res.Configuration;
 import android.graphics.Color;
+import android.graphics.PorterDuff;
 import android.graphics.Rect;
+import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Bundle;
@@ -592,6 +594,7 @@ public class TimeLinePage extends ActivityState implements
         } else {
             inflator.inflate(R.menu.album, menu);
             actionBar.setTitle(R.string.timeline_title);
+            changeMenuItemColor(menu);
 
             FilterUtils.setupMenuItems(actionBar, mMediaSetPath, true);
             //menu.findItem(R.id.action_group_by).setVisible(mShowClusterMenu);
@@ -602,6 +605,18 @@ public class TimeLinePage extends ActivityState implements
         return true;
     }
 
+    private void changeMenuItemColor(Menu menu){
+        for(int i = 0; i < menu.size(); i++){
+            Drawable drawable = menu.getItem(i).getIcon();
+            if(drawable != null) {
+                drawable.mutate();
+                drawable.setColorFilter(mActivity.getResources().getColor(R.color.white), PorterDuff.Mode.SRC_ATOP);
+            }
+        }
+
+    }
+
+
     private void prepareAnimationBackToFilmstrip(int slotIndex) {
         if (mAlbumDataAdapter == null || !mAlbumDataAdapter.isActive(slotIndex)) return;
         MediaItem item = mAlbumDataAdapter.get(slotIndex);