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/drawable/bg_gallery_image.xml b/res/drawable/bg_gallery_image.xml
new file mode 100644
index 0000000000000000000000000000000000000000..5ffa21624b75124c2a9c9dd0fb206a1f1af99b83
--- /dev/null
+++ b/res/drawable/bg_gallery_image.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <corners android:radius="16dp"/>
+
+</shape>
\ No newline at end of file
diff --git a/res/drawable/squared_tick.xml b/res/drawable/squared_tick.xml
new file mode 100644
index 0000000000000000000000000000000000000000..f89d7d0ea0485ec06f9cdbd29bf6f7af1db6df75
--- /dev/null
+++ b/res/drawable/squared_tick.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="8"
+    android:viewportHeight="8">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M7.08042 0.69577H1.44654C1.0144 0.69577 0.678284 1.04789 0.678284 1.46404V7.0979C0.678284 7.53005 1.0144 7.86617 1.44654 7.86617H7.08042C7.49656 7.86617 7.84868 7.53005 7.84868 7.0979V1.46404C7.84868 1.04789 7.49656 0.69577 7.08042 0.69577ZM7.08042 7.0979H1.44654V1.46404H7.08042V7.0979ZM6.50422 3.24064C6.56822 3.16059 6.56822 3.04858 6.50422 2.96855L6.13611 2.60041C6.07211 2.52036 5.94404 2.52036 5.86402 2.60041L3.60727 4.84118L2.64694 3.88084C2.56689 3.80079 2.45487 3.80079 2.37485 3.88084L2.00673 4.23296C1.94272 4.31302 1.94272 4.44103 2.00673 4.50505L3.46322 5.97755C3.54327 6.05761 3.65528 6.05761 3.7353 5.97755L6.50422 3.24064Z" />
+</vector>
\ No newline at end of file
diff --git a/res/drawable/video_play.xml b/res/drawable/video_play.xml
new file mode 100644
index 0000000000000000000000000000000000000000..a058b6004d43ef8cb0ca699e7dab97b5661522cd
--- /dev/null
+++ b/res/drawable/video_play.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="8dp"
+    android:viewportWidth="8"
+    android:viewportHeight="8">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:pathData="M5.57471 4.02066L3.03038 2.47386C2.79908 2.3582 2.5244 2.51723 2.5244 2.77743V5.78438C2.5244 6.05905 2.79908 6.21806 3.03038 6.08795L5.57471 4.62784C5.82047 4.49774 5.82047 4.16523 5.57471 4.02066V4.02066ZM7.49742 4.2809C7.49742 2.30038 5.89276 0.695694 3.91223 0.695694C1.93169 0.695694 0.327026 2.30038 0.327026 4.2809C0.327026 6.26144 1.93169 7.86608 3.91223 7.86608C5.89276 7.86608 7.49742 6.26144 7.49742 4.2809ZM1.02093 4.2809C1.02093 2.6907 2.30756 1.38963 3.91223 1.38963C5.50243 1.38963 6.80351 2.6907 6.80351 4.2809C6.80351 5.88557 5.50243 7.17218 3.91223 7.17218C2.30756 7.17218 1.02093 5.88557 1.02093 4.2809Z" />
+</vector>
\ No newline at end of file
diff --git a/res/layout/gallery_main.xml b/res/layout/gallery_main.xml
index 3a5e54447341faf7f9e61df30677c0fd85e84247..7411fe9ca9d78c688cfa3ee17e0d332834546c99 100755
--- a/res/layout/gallery_main.xml
+++ b/res/layout/gallery_main.xml
@@ -65,8 +65,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/layout/photo_set_item.xml b/res/layout/photo_set_item.xml
index 0f740fad95a71651b4091283cf1ecde8eee635b3..ccf781e577e2ad389a93f7563cc953ad1f2b0d6d 100644
--- a/res/layout/photo_set_item.xml
+++ b/res/layout/photo_set_item.xml
@@ -9,6 +9,7 @@
     <com.android.photos.views.SquareImageView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:background="@drawable/bg_gallery_image"
         android:id="@+id/thumbnail" />
 
 </FrameLayout>
\ No newline at end of file
diff --git a/res/menu/album.xml b/res/menu/album.xml
index 4b76b6981aa3ef4e76b41ddde381b23e09687a63..10ae9085eb4ef45c53718e7404c385a1ea736cf2 100644
--- a/res/menu/album.xml
+++ b/res/menu/album.xml
@@ -13,19 +13,23 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <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" />
+        android:showAsAction="ifRoom"
+        app:iconTint="@color/color_default_primary"/>
     <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" />
+        android:showAsAction="ifRoom"
+        app:iconTint="@color/color_default_primary"/>
     <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" />
+        android:showAsAction="ifRoom"
+        app:iconTint="@color/color_default_primary"/>
 <!--     <item android:id="@+id/action_group_by" -->
 <!--             android:title="@string/group_by" -->
 <!--             android:showAsAction="never"/> -->
diff --git a/res/menu/albumset.xml b/res/menu/albumset.xml
index b21bf3d3836c0a49069e0018cb0f6b87acab23f2..2db11eab5179a3a9def5f63f07b77ab997f390cb 100644
--- a/res/menu/albumset.xml
+++ b/res/menu/albumset.xml
@@ -16,15 +16,19 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
     <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" />
+        android:showAsAction="ifRoom"
+        app:iconTint="@color/color_default_primary"/>
     <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" />
+        android:showAsAction="ifRoom"
+        app:iconTint="@color/color_default_primary"/>
+    
     <item android:id="@+id/action_manage_offline"
             android:title="@string/make_available_offline"
             android:visible="false"
diff --git a/res/menu/navigation_items.xml b/res/menu/navigation_items.xml
index b4f39dc1c97596c2a773ee2fb11aa25583e4431c..8b9b3d14c0c280d7a7034abb2ffb812c92b9987f 100644
--- a/res/menu/navigation_items.xml
+++ b/res/menu/navigation_items.xml
@@ -1,11 +1,14 @@
 <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" />
-     <item android:id="@+id/action_album"
-          android:title="@string/albums_title"
-          android:icon="@drawable/ic_album" />
-     <item android:id="@+id/action_videos"
-          android:title="@string/videos_title"
-          android:icon="@drawable/ic_video" />
+    <item
+        android:id="@+id/action_timeline"
+        android:icon="@lineageos.platform:drawable/ic_timeline"
+        android:title="@string/timeline_title" />
+    <item
+        android:id="@+id/action_album"
+        android:icon="@lineageos.platform:drawable/ic_album"
+        android:title="@string/albums_title" />
+    <item
+        android:id="@+id/action_videos"
+        android:icon="@lineageos.platform:drawable/ic_videos"
+        android:title="@string/videos_title" />
 </menu>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index b00001acec96e68133bca0730f6cc4ee5dd7af2c..d8572524fe302040c0ca31360a13ae17b86b7a99 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -16,6 +16,8 @@
 <resources>
 
     <color name="default_background">@lineageos.platform:color/color_default_primary_text</color>
+    <color name="color_default_blue">@lineageos.platform:color/color_default_blue1</color>
+    <color name="color_default_primary">@lineageos.platform:color/color_default_primary</color>
 
     <!-- configuration for album set page -->
     <color name="albumset_background">@color/default_background</color>
@@ -89,6 +91,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/res/values/styles.xml b/res/values/styles.xml
index 673bdb9f781efa20c9d19e99a65d6b508a3cdb91..e846a7779941b727901b759154cfb106a9bcc447 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -343,12 +343,17 @@
         <item name="colorPrimaryDark">@color/primaryDark</item>
     </style>
 
+    <style name="MytoolbarStyle" parent="android:Theme.Material.Light" >
+        <item name="android:colorControlNormal">#FFFFFF</item>
+    </style>
+
     <style name="ToolbarTitleStyle" parent="android:TextAppearance.Material.Widget.Toolbar.Title">
         <item name="android:textSize">@dimen/toolbar_title_text_size</item>
     </style>
 
     <style name="ToolbarPopUpTheme" parent="android:Theme.Material.Light" />
 
+
     <!-- Styles -->
     <style name="MyOverFlow" parent="@android:style/Widget.Material.ActionButton.Overflow">
         <item name="android:src">@drawable/multiselect_more</item>
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 17224374b1a048c5d61fa56a236472c81b8731a0..3a242d441e69a39f8a8012dc4aec05b3cbfa7112 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -22,9 +22,12 @@ package com.android.gallery3d.app;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
+import android.content.res.ColorStateList;
 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;
@@ -587,6 +590,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);
@@ -597,6 +601,17 @@ 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);
diff --git a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
index baabbadb96df750ba1d8f46d2cf6260d73944f30..13d69590f43c17f27d9af66fc838b3ea039e1872 100644
--- a/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
+++ b/src/com/android/gallery3d/filtershow/imageshow/ImageCrop.java
@@ -22,6 +22,9 @@ import android.graphics.Bitmap;
 import android.graphics.Canvas;
 import android.graphics.Matrix;
 import android.graphics.Paint;
+import android.graphics.PorterDuff;
+import android.graphics.PorterDuffXfermode;
+import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.drawable.Drawable;
 import android.util.AttributeSet;