diff --git a/res/values/colors.xml b/res/values/colors.xml
index 96260d544ea4301f64ec3f0e7ab322c6db19e394..6715375b2562f2901e44d7c83fe8d53975df0a61 100755
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -25,18 +25,18 @@
     <color name="albumset_label_background">@color/black_transparent_4</color>
     <color name="albumset_label_title">@color/white</color>
     <color name="albumset_label_count">@color/white</color>
-    <color name="albumlist_label_title">@color/white</color>
+    <color name="albumlist_label_title">@color/color_default_primary_text</color>
 
     <color name="darker_transparent">@color/black_transparent_5</color>
 
     <!-- configuration for album page -->
     <color name="album_background">@color/default_background</color>
-    <color name="album_placeholder">@color/default_background</color>
+    <color name="album_placeholder">@color/white</color>
 
     <!-- configuration for photo page -->
     <color name="photo_background">@color/black</color>
     <color name="photo_placeholder">@color/light_black</color>
-    <color name="photo_page_action_bar">#8A000000</color>
+    <color name="photo_page_action_bar">@color/default_background</color>
     <color name="photo_page_bottom_panel">#8A000000</color>
 
     <!-- configuration for manage cache page -->
@@ -93,5 +93,5 @@
     <color name="timeline_title_background_color">@color/default_background</color>
 
     <color name="navigation_accent_disabled">@color/disable_tab_color</color>
-    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_blue1</color>
+    <color name="navigation_accent_enabled">@lineageos.platform:color/color_default_accent</color>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 49aa5d59931dfc288c1ff3ad9a76189f028c3421..07b72f3d971b31c8a605d8d83ad081f4d2bd9890 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -185,7 +185,7 @@
     <dimen name="timeline_grid_vertical_space">3dp</dimen>
     <dimen name="slot_width">174dp</dimen>
     <dimen name="slot_height">174dp</dimen>
-    <dimen name="toolbar_height">80dp</dimen>
+    <dimen name="toolbar_height">56dp</dimen>
     <dimen name="slot_width_album">116dp</dimen>
     <dimen name="slot_height_album">116dp</dimen>
     <dimen name="crop_icon_size">30dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 19de51af2f04462705791c35a2c9396fe470a753..648fee2e73e47b65ade2384bdd1f3a1290424581 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -32,7 +32,7 @@
         <item name="android:windowContentOverlay">@null</item>
         <item name="android:colorBackgroundCacheHint">@null</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:statusBarColor">@color/primary</item>
+        <item name="android:statusBarColor">@android:color/transparent</item>
         <item name="android:windowTranslucentStatus">true</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowActionModeOverlay">true</item>
@@ -319,10 +319,13 @@
     </style>
 
     <style name="AppTheme" parent="Theme.AppCompat.Light">
+        <item name="colorPrimary">@color/primary</item>
+        <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primaryDark</item>
         <item name="android:windowDisablePreview">true</item>
         <item name="android:windowDrawsSystemBarBackgrounds">true</item>
-        <item name="android:windowBackground">@android:color/black</item>
-        <item name="android:statusBarColor">@color/primary</item>
+        <item name="android:windowBackground">@color/primary</item>
         <item name="android:windowTranslucentNavigation">false</item>
         <item name="android:windowActionBar">false</item>
         <item name="android:windowActionModeOverlay">true</item>
@@ -339,10 +342,11 @@
         <item name="android:statusBarColor">#ab5810</item>
     </style>
 
-    <style name="ToolbarTheme" parent="android:Theme.Material" >
+    <style name="ToolbarTheme" parent="android:Theme.Material.Light" >
         <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:colorControlNormal">@color/color_default_primary_text</item>
     </style>
 
     <style name="MytoolbarStyle" parent="android:Theme.Material.Light" >
@@ -362,7 +366,7 @@
         <item name="android:src">@drawable/multiselect_more</item>
     </style>
     <style name="WhiteOverflow" parent="@android:style/Widget.Material.ActionButton.Overflow">
-        <item name="android:src">@drawable/more</item>
+        <item name="android:src">@lineageos.platform:drawable/ic_menu</item>
     </style>
     <style name="FilterShowActionBar" parent="@android:style/Widget.Material.Light.ActionBar">
         <item name="android:background">@color/edit_actionbar_background</item>
diff --git a/src/com/android/gallery3d/app/AlbumPage.java b/src/com/android/gallery3d/app/AlbumPage.java
index 61cefde4510bc152aa5a06e70c902a404b308e45..9c929044486d848063dae76654ca859355a72364 100644
--- a/src/com/android/gallery3d/app/AlbumPage.java
+++ b/src/com/android/gallery3d/app/AlbumPage.java
@@ -634,7 +634,6 @@ 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);
 
@@ -654,17 +653,6 @@ 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.color_default_primary_text), 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 5f707309daf99664ac418b3ce2614eadb6447cdf..8c2368386cb7d9a1e860df64cf03ce5d0f57dc1f 100755
--- a/src/com/android/gallery3d/app/AlbumSetPage.java
+++ b/src/com/android/gallery3d/app/AlbumSetPage.java
@@ -626,23 +626,11 @@ 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.color_default_primary_text), 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 471bf8cb1283997204d2506a45f4184ea035b642..a2f85e8fe182840cf39b52393ef1c85baf102d06 100755
--- a/src/com/android/gallery3d/app/TimeLinePage.java
+++ b/src/com/android/gallery3d/app/TimeLinePage.java
@@ -590,7 +590,6 @@ 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);
@@ -601,17 +600,6 @@ 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.color_default_primary_text), 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/ui/AlbumSetSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
index 264325a910697ff68fc0f26f5f9ef38da6b77903..6fc17ca9281d9fe437948b490e06300da1642f1f 100644
--- a/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AlbumSetSlotRenderer.java
@@ -164,6 +164,11 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
         } else if (mInSelectionMode && mSelectionManager.isItemSelected(entry.setPath)) {
             drawSelectedFrame(canvas, width, height);
         }
+
+        if (entry.album != null) {
+            drawRoundedOverlay(canvas, width, height);
+        }
+        
         return renderRequestFlags;
     }
 
@@ -181,6 +186,7 @@ public class AlbumSetSlotRenderer extends AbstractSlotRenderer {
             entry.content = content;
         }
         drawContent(canvas, content, width, height, entry.rotation);
+
         if ((content instanceof FadeInTexture) &&
                 ((FadeInTexture) content).isAnimating()) {
             renderRequestFlags |= SlotView.RENDER_MORE_FRAME;
diff --git a/src/com/android/gallery3d/ui/AlbumSlotRenderer.java b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java
index a4096dc958ad6f7834b47b2029d35931edd99d6e..6112e7fa646b7da8933d5c97b8fcebc1a69b5262 100644
--- a/src/com/android/gallery3d/ui/AlbumSlotRenderer.java
+++ b/src/com/android/gallery3d/ui/AlbumSlotRenderer.java
@@ -215,6 +215,16 @@ public class AlbumSlotRenderer extends AbstractSlotRenderer {
                 && mSelectionManager.isItemSelected(entry.path)) {
             drawSelectedFrame(canvas, width, height);
         }
+
+        if (entry.path != null) {
+            if (!mIsGridViewShown) {
+                int minSize = Math.min(width, height);
+                drawRoundedOverlay(canvas, minSize, minSize);
+            } else {
+                drawRoundedOverlay(canvas, width, height);
+            }
+        }
+
         return renderRequestFlags;
     }