diff --git a/res/drawable/albums.xml b/res/drawable/albums.xml
index 079adc75942231df78e45c69c5b4c116b233504d..1cbef0f4695b509bcba3d570e29cbbbd42fcbab3 100644
--- a/res/drawable/albums.xml
+++ b/res/drawable/albums.xml
@@ -34,6 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M17.999,2h-12c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C19.999,2.9 19.099,2 17.999,2zM5.999,4h5v8l-2.5,-1.5l-2.5,1.5V4zM5.999,19l3,-3.859l2.141,2.58l3,-3.861L17.999,19H5.999z" />
 </vector>
diff --git a/res/drawable/cancel2.xml b/res/drawable/cancel2.xml
index 76dcf076d06bc97a0a66ae410281e228ef25dda3..4303539fad49afe04e46afff77f040abc2c3ce95 100644
--- a/res/drawable/cancel2.xml
+++ b/res/drawable/cancel2.xml
@@ -34,6 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M19.205,6.41L17.795,5l-5.59,5.59L6.615,5l-1.41,1.41l5.59,5.59l-5.59,5.59L6.615,19l5.59,-5.59l5.59,5.59l1.41,-1.41L13.615,12L19.205,6.41z" />
 </vector>
diff --git a/res/drawable/done2.xml b/res/drawable/done2.xml
index 80405d55530b2eac63c8b16b78b1e88bee0587e0..0c95d7504a48db97e7e74e866c26c7b65a9f2c44 100644
--- a/res/drawable/done2.xml
+++ b/res/drawable/done2.xml
@@ -34,6 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M8.795,15.875l-4.17,-4.17l-1.42,1.41l5.59,5.59l12,-12l-1.41,-1.41L8.795,15.875z" />
 </vector>
diff --git a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
index 9cb078aced12961d67433b63c5c1180ab8cf6a4b..0c003f5a5802c472e3be431f4c47f59883dcc682 100644
--- a/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
+++ b/res/drawable/dropdown_ic_arrow_normal_holo_dark.xml
@@ -34,7 +34,6 @@
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
-        android:fillAlpha="0.54"
         android:fillColor="@color/accent"
         android:pathData="M0,5h24l-12,14L0,5z" />
 </vector>
\ No newline at end of file
diff --git a/res/drawable/multiselect_delete.xml b/res/drawable/multiselect_delete.xml
index a09691cd7c964acf105aab75eca7e946e4509d8b..bd20fe6fc7206c9eca36a9f0a093095e81ed0a6b 100644
--- a/res/drawable/multiselect_delete.xml
+++ b/res/drawable/multiselect_delete.xml
@@ -34,6 +34,5 @@
     android:viewportHeight="72.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M59,10L46.92,10l-2.16,-4L27,6l-2.16,4L13,10a1,1 0,0 0,-1 1v4a1,1 0,0 0,1 1h46a1,1 0,0 0,1 -1L60,11A1,1 0,0 0,59 10ZM16,60a6,6 0,0 0,6 6h28a6,6 0,0 0,6 -6L56,20L16,20v40Z" />
 </vector>
diff --git a/res/drawable/multiselect_more.xml b/res/drawable/multiselect_more.xml
index e19f7d49c40d9a7a5a8d3f52a6a99582ae26c32b..50392cf1f70ae155fc8ef54a7f7e03098163700e 100644
--- a/res/drawable/multiselect_more.xml
+++ b/res/drawable/multiselect_more.xml
@@ -34,6 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M12,8c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2c-1.1,0 -2,0.9 -2,2S10.9,8 12,8zM12,10c-1.1,0 -2,0.9 -2,2c0,1.1 0.9,2 2,2c1.1,0 2,-0.9 2,-2C14,10.9 13.1,10 12,10zM12,16c-1.1,0 -2,0.9 -2,2s0.9,2 2,2c1.1,0 2,-0.9 2,-2S13.1,16 12,16z" />
 </vector>
diff --git a/res/drawable/multiselect_share.xml b/res/drawable/multiselect_share.xml
index 4ee9258a9e296c6dd35d3252fe29e27556afe78c..d5c9d4be06733bb37467c851527b3a22074a3025 100644
--- a/res/drawable/multiselect_share.xml
+++ b/res/drawable/multiselect_share.xml
@@ -34,6 +34,5 @@
     android:viewportHeight="72.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M54,48c-2.4,0 -4.5,0.9 -6.1,2.4L26.7,38.3c0.2,-0.8 0.3,-1.5 0.3,-2.4c0,-0.8 -0.1,-1.6 -0.3,-2.4l21.2,-12.1c1.6,1.7 3.7,2.6 6.1,2.6c5,0 9,-4 9,-9s-4,-9 -9,-9s-9,4 -9,9c0,0.8 0.1,1.6 0.3,2.3L24.1,29.4C22.5,27.9 20.4,27 18,27c-5,0 -9,4 -9,9s4,9 9,9c2.4,0 4.5,-0.9 6.1,-2.4l21.2,12.1C45.1,55.4 45,56.2 45,57c0,5 4,9 9,9s9,-4 9,-9S59,48 54,48z" />
 </vector>
diff --git a/res/drawable/multiselected_back.xml b/res/drawable/multiselected_back.xml
index df6c287721194299fd093b484a5c4631cd2eb8b0..dc69a1884103aa51387539b2961b7c26b8d9e663 100644
--- a/res/drawable/multiselected_back.xml
+++ b/res/drawable/multiselected_back.xml
@@ -34,6 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8l8,8l1.41,-1.41L7.83,13H20V11z" />
 </vector>
diff --git a/res/drawable/timeline.xml b/res/drawable/timeline.xml
index 21178b0c68679e16e30ae7c0a813858756e321e4..29b87efc448480c2cfb064c422aacc9f24f745e6 100644
--- a/res/drawable/timeline.xml
+++ b/res/drawable/timeline.xml
@@ -34,10 +34,8 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M19.057,4.034h-1.01V2.059h-2.016v1.976H7.969V2.059H5.951v1.976H4.902c-1.115,0 -1.967,0.943 -1.967,2.058l-0.01,13.832c0,1.114 0.902,2.017 2.016,2.017h14.115c1.113,0 2.016,-0.902 2.016,-2.017V6.092C21.072,4.978 20.17,4.034 19.057,4.034zM19.098,19.965H4.941V9.015h14.156V19.965z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M19.057,4.034h-1.01V2.059h-2.016v1.976H7.969V2.059H5.951v1.976H4.902c-1.115,0 -1.967,0.943 -1.967,2.058l-0.01,13.832c0,1.114 0.902,2.017 2.016,2.017h14.115c1.113,0 2.016,-0.902 2.016,-2.017V6.092C21.072,4.978 20.17,4.034 19.057,4.034zM19.098,19.965H4.941V9.015h14.156V19.965z" />
     <path
         android:fillColor="@color/accent"
-        android:pathData="M6.184,16.241l3.738,-4.984l2.908,3.742l2.076,-2.496l2.907,3.738H6.184z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M6.184,16.241l3.738,-4.984l2.908,3.742l2.076,-2.496l2.907,3.738H6.184z" />
 </vector>
diff --git a/res/drawable/videos.xml b/res/drawable/videos.xml
index 1c00962a4accb8ba520aa5596255b7456c10ffec..1654415f2b61669e4c8090764978bb62f47038f2 100644
--- a/res/drawable/videos.xml
+++ b/res/drawable/videos.xml
@@ -34,6 +34,5 @@
         android:viewportHeight="24.0">
     <path
         android:fillColor="@color/accent"
-        android:pathData="M3.999,6h-2v14c0,1.1 0.9,2 2,2h14v-2h-14V6zM19.999,2h-12c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C21.999,2.9 21.099,2 19.999,2zM11.999,14.5v-9l6,4.5L11.999,14.5z"
-        android:fillAlpha="0.54"/>
+        android:pathData="M3.999,6h-2v14c0,1.1 0.9,2 2,2h14v-2h-14V6zM19.999,2h-12c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4C21.999,2.9 21.099,2 19.999,2zM11.999,14.5v-9l6,4.5L11.999,14.5z" />
 </vector>
diff --git a/res/layout/toolbar.xml b/res/layout/toolbar.xml
index 00270e3a1f9eb46989bb168c2b3b38d0c752b945..b2ccac5ac09b103b886ead80e4da3a78a6ec3733 100755
--- a/res/layout/toolbar.xml
+++ b/res/layout/toolbar.xml
@@ -39,6 +39,7 @@
         android:layout_height="?android:attr/actionBarSize"
         android:background="@color/primary"
         android:elevation="8dp"
+        android:theme="@style/ToolbarTheme"
         android:titleTextAppearance="@style/ToolbarTitleStyle"
         android:popupTheme="@style/ToolbarPopUpTheme" />
 
diff --git a/res/menu/operation.xml b/res/menu/operation.xml
index 0647cad0afe93fdb2e8fd942afaac3668083840d..8932fe1c67af8253a8028ef6577702363e41a367 100644
--- a/res/menu/operation.xml
+++ b/res/menu/operation.xml
@@ -13,10 +13,13 @@
      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_import"
             android:title="@string/Import"
             android:icon="@drawable/ic_menu_ptp_holo_light"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="always|withText"
             android:visible="false" />
     <!-- Ideally, showAsAction for share_panorama and share should be reversed.
@@ -24,52 +27,74 @@
          to the action bar and stays on the overflow menu. -->
     <item android:id="@+id/action_share_panorama"
             android:icon="@drawable/ic_menu_share_holo_light"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:title="@string/share_panorama"
             android:visible="false"
             android:showAsAction="ifRoom">
     </item>
     <item android:id="@+id/action_share"
             android:icon="@drawable/multiselect_share"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:title="@string/share"
             android:visible="false"
             android:showAsAction="ifRoom">
     </item>
     <item android:id="@+id/action_delete"
             android:icon="@drawable/multiselect_delete"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:title="@string/delete"
             android:visible="false"
             android:showAsAction="ifRoom" />
     <item android:id="@+id/action_edit"
             android:title="@string/edit"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="never"
             android:visible="false" />
     <item android:id="@+id/action_rotate_ccw"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="never"
             android:visible="false"
             android:title="@string/rotate_left" />
     <item android:id="@+id/action_rotate_cw"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="never"
             android:visible="false"
             android:title="@string/rotate_right" />
     <item android:id="@+id/action_crop"
             android:title="@string/crop_action"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="never"
             android:visible="false" />
     <item android:id="@+id/action_setas"
             android:title="@string/set_image"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="never"
             android:visible="false" />
     <item android:id="@+id/action_details"
             android:icon="@drawable/ic_menu_info_details"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:title="@string/details"
             android:visible="false"
             android:showAsAction="never" />
     <item android:id="@+id/action_show_on_map"
             android:title="@string/show_on_map"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:showAsAction="never"
             android:visible="false" />
     <item android:id="@+id/action_drm_info"
             android:title="@string/drm_license_info"
+            android:iconTint="@color/accent"
+            android:iconTintMode="src_atop"
             android:enabled="true"
             android:visible="false"
             android:showAsAction="never" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 25845a3ea6c81386ee9e04e436a21ec49b0ba9e6..d3cbd760c3fadd91345533e61b00bff567870b62 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -442,15 +442,13 @@
         <item name="android:statusBarColor">@color/primaryDark</item>
     </style>
 
-    <style name="ToolbarTheme" parent="android:Theme.Material.Light" >
+    <style name="ToolbarTheme" parent="@android:style/ThemeOverlay.Material.Dark.ActionBar" >
         <item name="android:actionOverflowButtonStyle">@style/WhiteOverflow</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorPrimaryDark">@color/primaryDark</item>
         <item name="android:colorControlNormal">@color/accent</item>
-    </style>
-
-    <style name="MytoolbarStyle" parent="android:Theme.Material.Light" >
-        <item name="android:colorControlNormal">#FFFFFF</item>
+        <item name="colorControlNormal">@color/accent</item>
+        <item name="android:textColorSecondary">@color/accent</item>
     </style>
 
     <style name="ToolbarTitleStyle" parent="android:TextAppearance.Material.Widget.Toolbar.Title">
@@ -458,7 +456,16 @@
         <item name="android:textColor">@color/color_default_primary_text</item>
     </style>
 
-    <style name="ToolbarPopUpTheme" parent="android:Theme.Material.Light" />
+    <style name="ToolbarPopUpTheme" parent="@style/Theme.AppCompat.DayNight.DarkActionBar">
+        <item name="android:colorBackground">@color/color_default_background</item>
+        <item name="android:colorPrimary">@color/primary</item>
+        <item name="android:colorPrimaryDark">@color/primaryDark</item>
+        <item name="android:colorAccent">@color/accent</item>
+        <item name="android:textColorPrimary">@color/color_default_primary_text</item>
+        <item name="android:textColorSecondary">@color/accent</item>
+        <item name="colorControlNormal">@color/accent</item>
+        <item name="android:colorControlNormal">@color/accent</item>
+    </style>
 
 
     <!-- Styles -->