diff --git a/Android.bp b/Android.bp
index c07ea5444b38da85ce3edffa390663896df2cdb7..b8d0cb544f72e42a75202425a2919eb6b8a760d1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -34,6 +34,7 @@ android_app {
         "androidx.palette_palette",
         "androidx.preference_preference",
         "androidx.recyclerview_recyclerview",
+        "elib",
     ],
 
     overrides: ["Music"],
diff --git a/res/drawable/ic_launcher_background.xml b/res/drawable/ic_launcher_background.xml
index 3275d87d71f594c26c76d5ee48f517466618dca8..5ec6d62982ea4e84e37531e8eacabbb9e1b05d22 100644
--- a/res/drawable/ic_launcher_background.xml
+++ b/res/drawable/ic_launcher_background.xml
@@ -1,22 +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="#ffffff"/>
-  <path
-      android:pathData="M45,44V55.515C43.57,54.558 41.85,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72C44.971,72 49,67.971 49,63V48C49,45.791 50.791,44 53,44H67C69.209,44 71,45.791 71,48V55.515C69.57,54.558 67.85,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72C70.971,72 75,67.971 75,63V44C75,39.582 71.418,36 67,36H53C48.582,36 45,39.582 45,44ZM71,63C71,60.239 68.761,58 66,58C63.239,58 61,60.239 61,63C61,65.761 63.239,68 66,68C68.761,68 71,65.761 71,63ZM40,68C42.761,68 45,65.761 45,63C45,60.239 42.761,58 40,58C37.239,58 35,60.239 35,63C35,65.761 37.239,68 40,68Z"
-      android:fillColor="#A92D63"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M40,68C42.761,68 45,65.761 45,63C45,60.239 42.761,58 40,58C37.239,58 35,60.239 35,63C35,65.761 37.239,68 40,68ZM66,68C68.761,68 71,65.761 71,63C71,60.239 68.761,58 66,58C63.239,58 61,60.239 61,63C61,65.761 63.239,68 66,68Z"
-      android:fillColor="#521E35"
-      android:fillType="evenOdd"/>
+      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 ce461bc034a4a275ecce6df8cc5c9c3148f50ec7..2924aa5e224e6afe052c2a74aa846c85ec81a58c 100644
--- a/res/drawable/ic_launcher_foreground.xml
+++ b/res/drawable/ic_launcher_foreground.xml
@@ -1,34 +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">
-  <group>
-    <clip-path
-        android:pathData="M0,0h108v108h-108z"/>
-    <path
-        android:pathData="M40,72C44.971,72 49,67.971 49,63C49,58.029 44.971,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72ZM66,72C70.971,72 75,67.971 75,63C75,58.029 70.971,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72Z"
-        android:fillColor="#F73487"
-        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="M74,36.64C74,33.39 72.58,32.39 69.4,33.35C64.28,34.89 54.29,38.06 49.17,39.62C46.41,40.46 45.02,42.25 45.02,45.09C45.02,49.86 45.05,62.09 45.07,66.86V68.7C44.99,68.7 44.92,68.69 44.84,68.68C43.64,68.15 42.31,67.96 41.01,68.11C37.14,68.52 34,71.5 34,74.77C34,78.04 37.14,80.36 41.01,79.95C44.88,79.55 48.01,76.56 48.01,73.29C48.01,73.16 48.01,73.03 47.99,72.9C48.01,72.82 48.02,72.73 48.01,72.65C48.01,68.99 48.01,57.88 48.01,54.22C48.01,49.42 48.01,49.43 52.75,47.99C56.36,46.87 64.82,44.12 68.46,43.08C69.5,42.78 71.03,42.1 71.06,44.19C71.11,47.85 71.06,58.95 71.06,62.84C71.04,62.84 71.03,62.84 71.01,62.85C71,62.85 70.99,62.86 70.98,62.87C69.7,62.23 68.26,61.98 66.83,62.15C62.96,62.56 59.83,65.54 59.83,68.81C59.83,72.08 62.96,74.4 66.83,73.99C70.7,73.59 73.84,70.6 73.84,67.33C73.84,67.3 73.84,67.26 73.84,67.23C73.87,67.08 73.89,66.94 73.88,66.79C73.92,59.22 73.98,44.2 74,36.64Z">
+    <aapt:attr name="android:fillColor">
+      <gradient 
+          android:startX="54"
+          android:startY="76.3"
+          android:endX="54"
+          android:endY="41.65"
+          android:type="linear">
+        <item android:offset="0" android:color="#FFE6224F"/>
+        <item android:offset="1" android:color="#FFFF363F"/>
+      </gradient>
+    </aapt:attr>
+  </path>
 </vector>
diff --git a/res/drawable/ic_launcher_monochrome.xml b/res/drawable/ic_launcher_monochrome.xml
deleted file mode 100644
index 37fc89bc66d0e682ceb8254f9e53168c31764b8a..0000000000000000000000000000000000000000
--- a/res/drawable/ic_launcher_monochrome.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     SPDX-FileCopyrightText: 2022 The LineageOS Project
-     SPDX-License-Identifier: Apache-2.0
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportWidth="108"
-    android:viewportHeight="108">
-  <path
-      android:pathData="M45,44V55.515C43.57,54.558 41.85,54 40,54C35.029,54 31,58.029 31,63C31,67.971 35.029,72 40,72C44.971,72 49,67.971 49,63V48C49,45.791 50.791,44 53,44H67C69.209,44 71,45.791 71,48V55.515C69.57,54.558 67.85,54 66,54C61.029,54 57,58.029 57,63C57,67.971 61.029,72 66,72C70.971,72 75,67.971 75,63V44C75,39.582 71.418,36 67,36H53C48.582,36 45,39.582 45,44Z"
-      android:fillColor="#ffffffff"
-      android:fillType="evenOdd"/>
-</vector>
diff --git a/res/drawable/playlist_icon.xml b/res/drawable/playlist_icon.xml
index 7e87ba764721c108055ca64bc23ccaf9284d4426..c2306cf9c29b9ce9849e78aec1ead0b4d93a878e 100644
--- a/res/drawable/playlist_icon.xml
+++ b/res/drawable/playlist_icon.xml
@@ -8,6 +8,6 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/e_icon_color"
         android:pathData="M22,6h-5v8.18c-0.31,-0.11 -0.65,-0.18 -1,-0.18c-1.66,0 -3,1.34 -3,3s1.34,3 3,3s3,-1.34 3,-3v-9h3L22,6L22,6zM15,6h-12v2h12L15,6L15,6zM15,10h-12v2h12L15,10L15,10zM11,14h-8v2h8L11,14L11,14zM15,17c0,-0.55 0.45,-1 1,-1c0.55,0 1,0.45 1,1s-0.45,1 -1,1C15.45,18 15,17.55 15,17z" />
 </vector>
diff --git a/res/drawable/recent_icon.xml b/res/drawable/recent_icon.xml
index 39581a6018f64a8c797aaf136507d57d4d688e0b..9c6b8d6bfb034070200f72376b014879d6d4be8b 100644
--- a/res/drawable/recent_icon.xml
+++ b/res/drawable/recent_icon.xml
@@ -6,7 +6,7 @@
     android:viewportHeight="24">
 
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/e_icon_color"
         android:fillAlpha=".9"
         android:strokeAlpha=".9"
         android:pathData="M13 3c-4.97 0-9 4.03-9 9H1l3.89 3.89 .07 .14L9 12H6c0-3.87 3.13-7 7-7s7 3.13 7
diff --git a/res/drawable/recently_added.xml b/res/drawable/recently_added.xml
index 9af549a9d66bf7c684e1221bd92189a1151ad25e..88c84d5e0e579d1d9e8a5d6288a9be3f9475d6d7 100644
--- a/res/drawable/recently_added.xml
+++ b/res/drawable/recently_added.xml
@@ -8,6 +8,6 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/e_icon_color"
         android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM18.49,14.11l0.26,2.79 -2.74,0.62 -1.43,2.41L12,18.82l-2.58,1.11 -1.43,-2.41 -2.74,-0.62 0.26,-2.8L3.66,12l1.85,-2.12 -0.26,-2.78 2.74,-0.61 1.43,-2.41L12,5.18l2.58,-1.11 1.43,2.41 2.74,0.62 -0.26,2.79L20.34,12l-1.85,2.11zM11,15h2v2h-2zM11,7h2v6h-2z" />
 </vector>
diff --git a/res/drawable/stopwatch_icon_white.xml b/res/drawable/stopwatch_icon_white.xml
index 6d77f334da5ffdf418cbebc0acb410faffe8c873..0e83ff3841df00cedb362c7a20a11ed1b7bf6b7c 100644
--- a/res/drawable/stopwatch_icon_white.xml
+++ b/res/drawable/stopwatch_icon_white.xml
@@ -8,7 +8,7 @@
     <path
         android:pathData="M0 0h24v24H0z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/e_icon_color"
         android:pathData="M11 17c0 .55 .45 1 1 1s1-.45 1-1-.45-1-1-1-1 .45-1 1zm0-14v4h2V5.08c3.39 .49 6
 3.39 6 6.92 0 3.87-3.13 7-7 7s-7-3.13-7-7c0-1.68 .59 -3.22 1.58-4.42L12
 13l1.41-1.41-6.8-6.8v.02C4.42 6.45 3 9.05 3 12c0 4.97 4.02 9 9 9 4.97 0 9-4.03
diff --git a/res/drawable/top_tracks_icon.xml b/res/drawable/top_tracks_icon.xml
index dcedc168e32e56875de61920a87361b128dfa7b9..2735976f42f88e31fd462d0706279263e3346568 100644
--- a/res/drawable/top_tracks_icon.xml
+++ b/res/drawable/top_tracks_icon.xml
@@ -8,6 +8,6 @@
     <path
         android:pathData="M0 0h24v24h-24z" />
     <path
-        android:fillColor="@color/accent"
+        android:fillColor="@color/e_icon_color"
         android:pathData="M16.5,3c-1.74,0 -3.41,0.81 -4.5,2.09C10.91,3.81 9.24,3 7.5,3 4.42,3 2,5.42 2,8.5c0,3.78 3.4,6.86 8.55,11.54L12,21.35l1.45,-1.32C18.6,15.36 22,12.28 22,8.5 22,5.42 19.58,3 16.5,3zM12.1,18.55l-0.1,0.1 -0.1,-0.1C7.14,14.24 4,11.39 4,8.5 4,6.5 5.5,5 7.5,5c1.54,0 3.04,0.99 3.57,2.36h1.87C13.46,5.99 14.96,5 16.5,5c2,0 3.5,1.5 3.5,3.5 0,2.89 -3.14,5.74 -7.9,10.05z" />
 </vector>
diff --git a/res/layout/activity_album_detail.xml b/res/layout/activity_album_detail.xml
index 24884b95e6af433c55dfac5b2949bbc90d4329da..8929967b151115bfe00aad1aeaccd641ba11d59b 100644
--- a/res/layout/activity_album_detail.xml
+++ b/res/layout/activity_album_detail.xml
@@ -68,6 +68,7 @@
                 android:layout_alignBottom="@+id/duration"
                 android:layout_marginEnd="4dp"
                 android:gravity="center"
+                android:tint="@color/accent"
                 android:src="@drawable/stopwatch_icon_small_grey" />
 
             <TextView
diff --git a/res/layout/activity_audio_preview.xml b/res/layout/activity_audio_preview.xml
index d5041160eb02f675bdb7e35dc6881e6315bab12f..0b896cd058d46875183fb13dbdf726281371101f 100644
--- a/res/layout/activity_audio_preview.xml
+++ b/res/layout/activity_audio_preview.xml
@@ -47,7 +47,9 @@
                 android:maxHeight="@dimen/preview_layout_seekbar_height"
                 android:minHeight="@dimen/preview_layout_seekbar_height"
                 android:layout_width="match_parent"
-                android:layout_height="@dimen/preview_layout_seekbar_height"/>
+                android:layout_height="@dimen/preview_layout_seekbar_height"
+                android:thumbTint="@color/e_accent"
+                android:progressTint="@color/e_accent" />
 
             <ProgressBar
                 style="@android:style/Widget.DeviceDefault.ProgressBar.Horizontal"
diff --git a/res/layout/album_detail_song.xml b/res/layout/album_detail_song.xml
index 043808ef76ce6435a77efbac0a3359996b787f75..05dde152b6d41ff69a1d46c985c8571fc66979f6 100644
--- a/res/layout/album_detail_song.xml
+++ b/res/layout/album_detail_song.xml
@@ -23,6 +23,7 @@
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
             android:gravity="center"
+            android:tint="@color/e_icon_color"
             android:src="@drawable/menu_button" />
     </LinearLayout>
 
diff --git a/res/layout/artist_detail_song.xml b/res/layout/artist_detail_song.xml
index 66611a433a85d1eccdd438d35d01e6acb3e5e08b..258dde52c33b39e4bf94db84d77c3d71118826bb 100644
--- a/res/layout/artist_detail_song.xml
+++ b/res/layout/artist_detail_song.xml
@@ -33,6 +33,7 @@
             android:id="@+id/overflow"
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
+            android:tint="@color/e_icon_color"
             android:src="@drawable/menu_button" />
     </LinearLayout>
 
@@ -62,4 +63,4 @@
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
         android:src="@drawable/inset_list_divider" />
-</RelativeLayout>
\ No newline at end of file
+</RelativeLayout>
diff --git a/res/layout/list_item_common.xml b/res/layout/list_item_common.xml
index 41356c483177489ec85e64c58cfe0fe3c3e70e94..5b36baadd0368957773321333a2a7a7da2032932 100644
--- a/res/layout/list_item_common.xml
+++ b/res/layout/list_item_common.xml
@@ -76,6 +76,7 @@
             android:layout_width="@dimen/overflow_width"
             android:layout_height="@dimen/overflow_height"
             android:background="?android:selectableItemBackgroundBorderless"
+            android:tint="@color/e_icon_color"
             android:src="@drawable/menu_button" />
     </LinearLayout>
 </merge>
diff --git a/res/mipmap-anydpi/ic_launcher.xml b/res/mipmap-anydpi/ic_launcher.xml
index b58c81ff94fc2cd9353409539d491f43b91966a5..5afc3d8891a41008985f87d89cabdf806f031df4 100644
--- a/res/mipmap-anydpi/ic_launcher.xml
+++ b/res/mipmap-anydpi/ic_launcher.xml
@@ -1,10 +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"/>
-    <monochrome android:drawable="@drawable/ic_launcher_monochrome"/>
+    <foreground>
+        <inset android:drawable="@drawable/ic_launcher_foreground" android:inset="5%"/>
+    </foreground>
 </adaptive-icon>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index c92a61dbd0545f22d03a815ad8b8c693391ca7bb..3193709cdd07da573e5afa2be7e1a87be561fee5 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -15,8 +15,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Musique</string>
     <string name="page_artists">Artistes</string>
     <string name="page_albums">Albums</string>
@@ -136,4 +135,6 @@
     <string name="header_5_plus_albums">Plus de 5 albums</string>
     <string name="header_other">"Autres"</string>
     <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
-</resources>
+    <string name="visualizer_perm_denied">La permission d\'enregistrer des contenus audio a été refusée, activez-la depuis les Paramètres du téléphone pour afficher les animations musicales.</string>
+    <string name="channel_music">Lecture de la musique</string>
+</resources>
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 01aa44d4d7da6f042867a7e59b005028f80e941e..b818ee989ec495dde6897d5ebc3198194fa1e198 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -15,40 +15,12 @@
      limitations under the License.
 -->
 <resources>
-    <!-- Material -->
-    <color name="primary">#212121</color>
-    <color name="primary_dark">#121212</color>
-    <color name="accent">#1ddbc5</color>
-
-    <!-- Standard Text Color -->
-    <color name="default_text_color">@color/white</color>
-    <color name="default_text_color_light">@color/white</color>
-
     <!-- Cards -->
     <color name="cards_bg_color">#333333</color>
 
-    <!-- Transparent colors -->
-    <color name="background_color">#121212</color>
-
     <!-- Color for the Position Number -->
     <color name="position_number_color">@color/black</color>
 
-    <!-- Color for the action bar -->
-    <color name="header_action_bar_text_color">@color/white</color>
-    <color name="bottom_action_bar_text_color">@color/default_text_color_light</color>
-
-    <!-- Background color used on some page headers -->
-    <color name="page_header_background">@color/black</color>
-
     <!-- Color for background for shadow on playlist page -->
     <color name="header_shadow_color">#ea212121</color>
-
-    <!-- Color for the pop up menu -->
-    <color name="menu_text_color">@color/white</color>
-
-    <!-- List view related colors -->
-    <color name="list_item_header_text_color">@color/white</color>
-
-    <!-- Separated and exposed values for themes -->
-    <color name="widget_background_color">@color/black</color>
 </resources>
diff --git a/res/values-night/styles.xml b/res/values-night/styles.xml
index 60c7e441ae9ecad6667ed8f5cd10156350b12461..174714189f3a3d76ea91225538b74b0a27a7ef51 100644
--- a/res/values-night/styles.xml
+++ b/res/values-night/styles.xml
@@ -26,12 +26,13 @@
         <item name="actionBarStyle">@style/ActionBar</item>
         <item name="actionBarWidgetTheme">@style/ActionBarWidgetTheme</item>
         <item name="colorPrimary">@color/primary</item>
-        <item name="android:colorBackground">@color/primary</item>
+        <item name="android:colorBackground">@color/e_background</item>
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorAccent">@color/accent</item>
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
+        <item name="android:navigationBarColor">@color/primary</item>
     </style>
 
     <style name="ToolBarPopupTheme" parent="@style/Theme.AppCompat" />
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index 7263f55e537dfcfbf9bec2e200ac8d56b52b38fd..168ffd8e6a5308767963718b44c74fd0035ee345 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -15,8 +15,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Muziek</string>
     <string name="page_artists">Artiesten</string>
     <string name="page_albums">Albums</string>
@@ -138,4 +137,4 @@
     <string name="header_other">"Overig"</string>
     <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
     <string name="channel_music">Muziek afspelen</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 015b47b2a4ab4dfd84fe4d0d2e70847c91154bb5..5cec19af42cfbdcd27e4bc6959936b40c51b651f 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -15,8 +15,7 @@
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
      See the License for the specific language governing permissions and
      limitations under the License.
--->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+--><resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="app_name">Музыка</string>
     <string name="page_artists">Исполнители</string>
     <string name="page_albums">Альбомы</string>
@@ -138,4 +137,4 @@
     <string name="header_other">"Другие"</string>
     <string name="duration_format"><xliff:g id="hours">%1$s</xliff:g> <xliff:g id="minutes">%2$s</xliff:g></string>
     <string name="channel_music">Воспроизведение музыки</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 5288d6af15291d483bef8fcc6b14767acbde736e..fd261f82084503ea7a5eeec9df51f719c1781402 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -17,9 +17,9 @@
 -->
 <resources>
     <!-- Material -->
-    <color name="primary">#ffffff</color>
-    <color name="primary_dark">#ffffff</color>
-    <color name="accent">#167C80</color>
+    <color name="primary">@color/e_action_bar</color>
+    <color name="primary_dark">@color/e_action_bar</color>
+    <color name="accent">@color/e_accent</color>
 
     <!-- Main colors -->
     <color name="black">#000000</color>
@@ -44,8 +44,8 @@
     <color name="blue_dark">#303F9F</color>
 
     <!-- Standard Text Color -->
-    <color name="default_text_color">@color/black</color>
-    <color name="default_text_color_light">@color/black</color>
+    <color name="default_text_color">@color/e_primary_text_color</color>
+    <color name="default_text_color_light">@color/e_primary_text_color</color>
 
     <!-- Cards -->
     <color name="cards_bg_color">#ffffff</color>
@@ -53,28 +53,28 @@
     <!-- Transparent colors -->
     <color name="transparent">#00000000</color>
 
-    <color name="background_color">@color/white</color>
+    <color name="background_color">@color/e_background</color>
 
     <!-- Color for the action bar -->
     <color name="header_action_bar_color">@color/primary</color>
-    <color name="header_action_bar_text_color">@color/black</color>
+    <color name="header_action_bar_text_color">@color/default_text_color</color>
     <color name="header_action_bar_text_color_active">@color/accent</color>
     <color name="bottom_action_bar_text_color">@color/white</color>
 
     <!-- Background color used on some page headers -->
-    <color name="page_header_background">@color/white</color>
+    <color name="page_header_background">@color/primary</color>
 
     <!-- Color for background for shadow on playlist page -->
     <color name="header_shadow_color">#eaffffff</color>
 
     <!-- Color for the pop up menu -->
-    <color name="menu_text_color">@color/black</color>
+    <color name="menu_text_color">@color/default_text_color</color>
 
     <!-- List view related colors -->
-    <color name="list_item_header_text_color">@color/black</color>
+    <color name="list_item_header_text_color">@color/default_text_color</color>
     <color name="list_item_text_color">@color/default_text_color</color>
     <color name="list_item_text_color_light">@color/default_text_color_light</color>
-    <color name="list_item_divider_color">#4c212121</color>
+    <color name="list_item_divider_color">@color/e_divider_color</color>
     <color name="list_item_divider_color_light">#34fafafa</color>
     <color name="grid_list_item_text_color">#b3212121</color>
 
@@ -131,7 +131,7 @@
     <color name="visualizer_fill_color">#bffafafa</color>
 
     <!-- Separated and exposed values for themes -->
-    <color name="widget_background_color">@color/white</color>
+    <color name="widget_background_color">@color/e_background</color>
     <color name="activity_album_detail_background_color">@color/background_color</color>
     <color name="activity_artist_detail_background_color">@color/background_color</color>
     <color name="activity_base_background_color">@color/background_color</color>
@@ -145,8 +145,8 @@
     <color name="audio_player_lyrics_text_color">@color/white</color>
     <color name="audio_player_current_time_color">@color/white</color>
     <color name="audio_player_total_time_color">@color/white</color>
-    <color name="number_of_songs_text_color">@color/accent</color>
-    <color name="duration_text_color">@color/accent</color>
+    <color name="number_of_songs_text_color">@color/default_text_color</color>
+    <color name="duration_text_color">@color/default_text_color</color>
 
     <!-- audio player main controls -->
     <color name="audio_player_seeker_progress_color">@color/white</color>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index eb635238b77d21fce98790bc753161e5b63fd51a..56d5cd1edea36f9d01af29e43f980a7fa4e81221 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -33,9 +33,10 @@
         <item name="android:windowContentTransitions">true</item>
         <item name="android:windowAllowEnterTransitionOverlap">false</item>
         <item name="android:windowAllowReturnTransitionOverlap">false</item>
-        <item name="android:navigationBarColor">@color/white</item>
+        <item name="android:navigationBarColor">@color/primary</item>
         <item name="android:windowLightStatusBar">true</item>
         <item name="android:windowLightNavigationBar">true</item>
+        <item name="android:homeAsUpIndicator">@drawable/e_ic_back</item>
     </style>
 
     <style name="ActionBarWidgetTheme" parent="@style/Theme.AppCompat.DayNight">
@@ -86,6 +87,10 @@
         <item name="android:background">@color/header_action_bar_color</item>
     </style>
 
+    <style name="actionOverflowButtonStyle" parent="@style/Widget.AppCompat.ActionButton.Overflow">
+        <item name="android:tint">@color/e_icon_color</item>
+    </style>
+
     <!-- The list item main text style/color -->
     <style name="ListItemMainText">
         <item name="android:textColor">@color/list_item_text_color</item>
@@ -173,7 +178,10 @@
         <item name="android:textSize">@dimen/tab_text_size</item>
     </style>
 
-    <style name="ToolBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar"/>
+    <style name="ToolBarTheme" parent="@style/ThemeOverlay.AppCompat.ActionBar">
+        <item name="colorControlNormal">@color/e_icon_color</item>
+    </style>
+
     <style name="ToolBarThemeMP" parent="@style/ThemeOverlay.AppCompat.ActionBar">
         <item name="colorControlNormal">@color/white</item>
     </style>