diff --git a/app/build.gradle b/app/build.gradle
index 022e3e0ce..2032121ea 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
         vectorDrawables.useSupportLibrary = true
 
         applicationId "code.name.monkey.retromusic"
-        versionCode 395
-        versionName '3.4.810'
+        versionCode 396
+        versionName '3.4.850'
 
         multiDexEnabled true
 
diff --git a/app/src/main/assets/retro-changelog.html b/app/src/main/assets/retro-changelog.html
index dc00d3156..770a4961c 100644
--- a/app/src/main/assets/retro-changelog.html
+++ b/app/src/main/assets/retro-changelog.html
@@ -1 +1 @@
-<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: {link-color};        }        a:active {        color: {link-color-active};        }        ol {        list-style-position: inside;        padding-left: 0;        padding-right: 0;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v3.4.850</h4><ul>    <li>Added current playing tab options for Bottom Navigation View</li>    <li>Added search in genre</li>    <li>Fix bugs & crashes</li></ul><h4>v3.4.800</h4><ul>    <li>Improved dark theme colors and Follow system theme</li>    <li>Rounded rectangle ripple for BottomNavigationView</li>    <li>Follow sleep timer dialog checkbox color as accent</li>    <li>Added song list selection for Album and Artist details</li>    <li>Fixed Toolbar popup text color when selecting songs</li></ul><h4>v3.4.700</h4><ul>    <li>Added splash screen(for app loading time)</li>    <li>Updated dark theme colors</li>    <li>Added circular progress view</li>    <li>Hiding year if not showing</li></ul><h4>v3.4.600</h4><ul>    <li>Fix notification layout height</li>    <li>Fix folder list last item not showing</li>    <li>Added auto hide/ show controls according to first and last item</li></ul><h4>v3.4.500</h4><ul>    <li>Added peak theme</li>    <li>Added app rating dialog</li>    <li>Fix song name scrolling in now playing themes if it's long</li>    <li>Fix playing queue last item hiding FAB</li>    <li>Added desaturated color option for dark mode</li>    <li>Fix slow search loading</li>    <li>Fix last added slow loading</li>    <li>Fix home banner toolbar corner</li>    <li>Fix home crashing when switching between two tabs</li>    <li>Fix remaining time in playing queue</li>    <li>Fix font not applied for some components</li>    <li>Fix crashing on album details sorting</li>    <li>Fixed lot of internal bugs</li>    <li>Fix dialog expand</li>    <li>Fix list card color</li>    <li>Removed SlidingUpPanel to replace with BottomSheet</li>    <li>Removed color theme as per material design guidelines</li>    <li>Removed classic theme(We're bringing back)</li>    <li>Replace line switch to Material Switch in settings</li>    <li>Performance improved</li>    <li>Updated internal libraries</li>    <li>Updated translation</li>    <li>Limiting the use of Theme engine for making use of system colors</li>    <li>Change home icon from the user icon</li>    <li>Corrected all toolbar with elevation when scrolling</li></ul><h4>v3.3.200</h4><ul>    <li>Fix fullscreen bottom tabs icons squash</li>    <li>Improved tiny theme colors</li>    <li>Android auto support</li>    <li>New notification icon</li>    <li>Favorite icon in mini player</li></ul><h4>v.3.3.100</h4><ul>    <li>Improved Now playing controls alignment</li>    <li>Lot internal changes to improve performance</li>    <li>Fix playlist adding crash</li>    <li>Fix color corrections</li>    <li>Fix file editing crash</li></ul><h4>v3.3.000</h4><ul>    <li>SD card support for deleting and editing</li></ul><h4>v3.2.240</h4><ul>    <li>Improved options dialog with selected color and title icon</li>    <li>Fix dialog color on dark theme</li></ul><h4>v3.2.220</h4><ul>    <li>Fix Notification SeekBar position (Need Android Q test)</li>    <li>Rolled back settings tint icons</li>    <li>Changed preference category title style according Android Q</li>    <li>Fix tabs options not working</li></ul><h4>v3.2.203</h4><ul>    <li>Carousel effect improved</li>    <li>Settings icons are now tint accent color</li>    <li>Settings title, back arrow and icons are now tint accent color</li>    <li>Equalizer is removed</li>    <li>Fix keyboard not popping on Search</li>    <li>Curated the main options</li>    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>    <li>Edit text input handles are colored</li></ul><h4>v3.2.135</h4><ul>    <li>Fix crashing on sharing song</li></ul><h4>v3.2.125</h4><ul>    <li>Fix crashing on selecting profile picture</li>    <li>Semi transparent color fix(s) on now playing themes</li></ul><h4>v3.2.120</h4><ul>    <li>Fix crashing on choosing a theme</li>    <li>Fix color theme selection without pro enabled</li>    <li>Fix icon tint some places</li></ul><h4>v3.2.105</h4><ul>    <li>Fix color notifications</li></ul><h4>v3.2.100</h4><ul>    <li>Fix crashing on Sleep timer</li>    <li>Toolbar elevation removed added stroke instead</li>    <li>Show empty indication for home</li></ul><h4>v3.2.000</h4><ul>    <li>Implemented Artist image loading all thanks to <a            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>    <li>Fixed buttons in Genre details</li>    <li>Fixed color buttons in Album and Artist details screen</li></ul><h4>v3.1.900</h4><ul>    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist        Details etc.    </li>    <li>Home toolbar is semi transparent in Banner mode</li>    <li>Added new Buy Retro Music pro in settings</li>    <li>Improved dark color in Dark theme</li></ul><h4>v3.1.850</h4><ul>    <li>Toolbar will be clickable for Search</li></ul><h4>v3.1.800</h4><ul>    <li>Search bar CardView background</li>    <li>Improve volume zero</li>    <li>Now playing and Album theme picker rollback to dialog</li>    <li>Fix sharing app link</li>    <li>Fix scanning dialog</li>    <li>Added settings icons for options</li></ul><h4>v3.1.700</h4><ul>    <li>Cleaned internal code</li>    <li>Removed full screen option</li>    <li>Added Toolbar elevation</li>    <li>To access menu either tap on Toolbar or Hamburger icon</li>    <li>Fix back button not working on playing queue</li>    <li>Fix crashing on What's New screen</li>    <li>Fix lyrics dialog</li>    <li>Changed toggles to line icons</li>    <li>Fix crashing on artist list for number format error</li>    <li>Fix blacklist dialog crashing</li>    <li>Rearranged icons and main menu access</li>    <li>Fix some crashes when device is locked or background</li>    <li>Folder screen have main options access</li>    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li></ul><h4>v3.1.400</h4><ul>    <li>Removed sync lyrics for Android 5</li>    <li>Fix Seek-bar color in settings</li>    <li>Added keyboard to popup on search</li>    <li>Added keyboard to popup on search</li>    <li>Improved lock-screen behavior and UI</li>    <li>Improved text appearance</li>    <li>Fix bio text not showing in settings</li>    <li>Fix not showing slider(blur, filter song) amount in settings</li>    <li>Fix setting ringtone</li>    <li>Fix file sharing crash</li>    <li>Fix some crashes</li>    <li>Fix playlist icon on small devices</li>    <li>Fix empty lyrics text color</li>    <li>Fix album cover background purple color in color theme</li></ul><h4>v3.1.300</h4><ul>    <li>Fix rename playlist text color</li>    <li>Fix same album showing in details page</li>    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>    <li>Improved home sections loading</li>    <li>Removed library options which are duplicated (it's available from profile menu)</li>    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>    <li>Replaced home with for you</li>    <li>Fixed profile image not loading in about</li>    <li>Improved selecting user profile image</li>    <li>Added bio to enter custom message</li>    <li>Improved some UI screens</li></ul><p>If you see entire app white or dark or black select same theme in settings to fix </p><p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p><p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its    not working try to    uninstall and install again. </p></body>
\ No newline at end of file
+<html><head>    <style type="text/css">        * {        word-wrap: break-word;        }        {style-placeholder}        a {        color: {link-color};        }        a:active {        color: {link-color-active};        }        ol {        list-style-position: inside;        padding-left: 0;        padding-right: 0;        }        li {        padding-top: 8px;        }    </style></head><body><h4>v3.4.850</h4><ul>    <li>Added current playing tab options for Bottom Navigation View</li>    <li>Added search in genre</li>    <li>Fix bugs & crashes</li>    <li>Fix crashing on lyrics</li>    <li>Fix genere last songs are under mini player</li></ul><h4>v3.4.800</h4><ul>    <li>Improved dark theme colors and Follow system theme</li>    <li>Rounded rectangle ripple for BottomNavigationView</li>    <li>Follow sleep timer dialog checkbox color as accent</li>    <li>Added song list selection for Album and Artist details</li>    <li>Fixed Toolbar popup text color when selecting songs</li></ul><h4>v3.4.700</h4><ul>    <li>Added splash screen(for app loading time)</li>    <li>Updated dark theme colors</li>    <li>Added circular progress view</li>    <li>Hiding year if not showing</li></ul><h4>v3.4.600</h4><ul>    <li>Fix notification layout height</li>    <li>Fix folder list last item not showing</li>    <li>Added auto hide/ show controls according to first and last item</li></ul><h4>v3.4.500</h4><ul>    <li>Added peak theme</li>    <li>Added app rating dialog</li>    <li>Fix song name scrolling in now playing themes if it's long</li>    <li>Fix playing queue last item hiding FAB</li>    <li>Added desaturated color option for dark mode</li>    <li>Fix slow search loading</li>    <li>Fix last added slow loading</li>    <li>Fix home banner toolbar corner</li>    <li>Fix home crashing when switching between two tabs</li>    <li>Fix remaining time in playing queue</li>    <li>Fix font not applied for some components</li>    <li>Fix crashing on album details sorting</li>    <li>Fixed lot of internal bugs</li>    <li>Fix dialog expand</li>    <li>Fix list card color</li>    <li>Removed SlidingUpPanel to replace with BottomSheet</li>    <li>Removed color theme as per material design guidelines</li>    <li>Removed classic theme(We're bringing back)</li>    <li>Replace line switch to Material Switch in settings</li>    <li>Performance improved</li>    <li>Updated internal libraries</li>    <li>Updated translation</li>    <li>Limiting the use of Theme engine for making use of system colors</li>    <li>Change home icon from the user icon</li>    <li>Corrected all toolbar with elevation when scrolling</li></ul><h4>v3.3.200</h4><ul>    <li>Fix fullscreen bottom tabs icons squash</li>    <li>Improved tiny theme colors</li>    <li>Android auto support</li>    <li>New notification icon</li>    <li>Favorite icon in mini player</li></ul><h4>v.3.3.100</h4><ul>    <li>Improved Now playing controls alignment</li>    <li>Lot internal changes to improve performance</li>    <li>Fix playlist adding crash</li>    <li>Fix color corrections</li>    <li>Fix file editing crash</li></ul><h4>v3.3.000</h4><ul>    <li>SD card support for deleting and editing</li></ul><h4>v3.2.240</h4><ul>    <li>Improved options dialog with selected color and title icon</li>    <li>Fix dialog color on dark theme</li></ul><h4>v3.2.220</h4><ul>    <li>Fix Notification SeekBar position (Need Android Q test)</li>    <li>Rolled back settings tint icons</li>    <li>Changed preference category title style according Android Q</li>    <li>Fix tabs options not working</li></ul><h4>v3.2.203</h4><ul>    <li>Carousel effect improved</li>    <li>Settings icons are now tint accent color</li>    <li>Settings title, back arrow and icons are now tint accent color</li>    <li>Equalizer is removed</li>    <li>Fix keyboard not popping on Search</li>    <li>Curated the main options</li>    <li>Folder toolbar outlined, folder icon background fix and separate line removed</li>    <li>Edit text input handles are colored</li></ul><h4>v3.2.135</h4><ul>    <li>Fix crashing on sharing song</li></ul><h4>v3.2.125</h4><ul>    <li>Fix crashing on selecting profile picture</li>    <li>Semi transparent color fix(s) on now playing themes</li></ul><h4>v3.2.120</h4><ul>    <li>Fix crashing on choosing a theme</li>    <li>Fix color theme selection without pro enabled</li>    <li>Fix icon tint some places</li></ul><h4>v3.2.105</h4><ul>    <li>Fix color notifications</li></ul><h4>v3.2.100</h4><ul>    <li>Fix crashing on Sleep timer</li>    <li>Toolbar elevation removed added stroke instead</li>    <li>Show empty indication for home</li></ul><h4>v3.2.000</h4><ul>    <li>Implemented Artist image loading all thanks to <a            href="https://github.com/AdrienPoupa/VinylMusicPlayer"> VinylMusicPlayer</a></li>    <li>Fixed buttons in Genre details</li>    <li>Fixed color buttons in Album and Artist details screen</li></ul><h4>v3.1.900</h4><ul>    <li>Added Play and Shuffle buttons on Songs list, Album Details, Artist Details, Playlist        Details etc.    </li>    <li>Home toolbar is semi transparent in Banner mode</li>    <li>Added new Buy Retro Music pro in settings</li>    <li>Improved dark color in Dark theme</li></ul><h4>v3.1.850</h4><ul>    <li>Toolbar will be clickable for Search</li></ul><h4>v3.1.800</h4><ul>    <li>Search bar CardView background</li>    <li>Improve volume zero</li>    <li>Now playing and Album theme picker rollback to dialog</li>    <li>Fix sharing app link</li>    <li>Fix scanning dialog</li>    <li>Added settings icons for options</li></ul><h4>v3.1.700</h4><ul>    <li>Cleaned internal code</li>    <li>Removed full screen option</li>    <li>Added Toolbar elevation</li>    <li>To access menu either tap on Toolbar or Hamburger icon</li>    <li>Fix back button not working on playing queue</li>    <li>Fix crashing on What's New screen</li>    <li>Fix lyrics dialog</li>    <li>Changed toggles to line icons</li>    <li>Fix crashing on artist list for number format error</li>    <li>Fix blacklist dialog crashing</li>    <li>Rearranged icons and main menu access</li>    <li>Fix some crashes when device is locked or background</li>    <li>Folder screen have main options access</li>    <li>Dialogs are now using Material Dialogs v3(BottomSheet)</li>    <li>Fix Shuffle icon for Artist, Album, Genre and Playlist details</li></ul><h4>v3.1.400</h4><ul>    <li>Removed sync lyrics for Android 5</li>    <li>Fix Seek-bar color in settings</li>    <li>Added keyboard to popup on search</li>    <li>Added keyboard to popup on search</li>    <li>Improved lock-screen behavior and UI</li>    <li>Improved text appearance</li>    <li>Fix bio text not showing in settings</li>    <li>Fix not showing slider(blur, filter song) amount in settings</li>    <li>Fix setting ringtone</li>    <li>Fix file sharing crash</li>    <li>Fix some crashes</li>    <li>Fix playlist icon on small devices</li>    <li>Fix empty lyrics text color</li>    <li>Fix album cover background purple color in color theme</li></ul><h4>v3.1.300</h4><ul>    <li>Fix rename playlist text color</li>    <li>Fix same album showing in details page</li>    <li>Fix lyrics text alignment on sync and lyrics reading improved</li>    <li>Improved home sections loading</li>    <li>Removed library options which are duplicated (it's available from profile menu)</li>    <li>Replaced collapsing Fab with Android Floating Extended Fab</li>    <li>Replaced home with for you</li>    <li>Fixed profile image not loading in about</li>    <li>Improved selecting user profile image</li>    <li>Added bio to enter custom message</li>    <li>Improved some UI screens</li></ul><p>If you see entire app white or dark or black select same theme in settings to fix </p><p style="line-height:150%"><a href="https://github.com/h4h13/RetroMusicPlayer/wiki/FAQ">FAQ's</a></p><p style="line-height:150%">*If you face any UI related issues you clear app data and cache, if its    not working try to    uninstall and install again. </p></body>
\ No newline at end of file
diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml
index 9b51c1852..c450afa49 100644
--- a/app/src/main/res/layout-land/activity_album.xml
+++ b/app/src/main/res/layout-land/activity_album.xml
@@ -110,14 +110,10 @@
                             android:id="@+id/albumText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
-                            android:layout_gravity="center"
-                            android:ellipsize="marquee"
-                            android:focusable="true"
-                            android:focusableInTouchMode="true"
-                            android:freezesText="true"
-                            android:marqueeRepeatLimit="marquee_forever"
+                            android:ellipsize="end"
+                            android:fontFamily="sans-serif"
+                            android:fontFeatureSettings="onum"
                             android:paddingTop="4dp"
-                            android:scrollHorizontally="true"
                             android:singleLine="true"
                             android:textAppearance="@style/TextViewSubtitle2"
                             android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout-land/activity_artist_details.xml b/app/src/main/res/layout-land/activity_artist_details.xml
index 1bb443f9d..1b7bf2eb1 100644
--- a/app/src/main/res/layout-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@@ -40,6 +40,7 @@
                     android:layout_width="match_parent"
                     android:layout_height="48dp" />
             </FrameLayout>
+
             <com.google.android.material.card.MaterialCardView
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
@@ -95,6 +96,8 @@
                             android:id="@+id/text"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:fontFamily="sans-serif"
+                            android:fontFeatureSettings="onum"
                             android:paddingTop="4dp"
                             android:textAppearance="@style/TextViewSubtitle2"
                             android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout-xlarge-land/activity_album.xml b/app/src/main/res/layout-xlarge-land/activity_album.xml
index d31547b4c..b8764e5a6 100644
--- a/app/src/main/res/layout-xlarge-land/activity_album.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_album.xml
@@ -126,6 +126,8 @@
                             android:id="@+id/albumText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:fontFamily="sans-serif"
+                            android:fontFeatureSettings="onum"
                             android:paddingTop="4dp"
                             android:textAppearance="@style/TextViewHeadline6"
                             android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
index 8607d1ca8..8808c29d3 100644
--- a/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_artist_details.xml
@@ -97,13 +97,10 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:layout_gravity="center"
-                        android:ellipsize="marquee"
-                        android:focusable="true"
-                        android:focusableInTouchMode="true"
-                        android:freezesText="true"
-                        android:marqueeRepeatLimit="marquee_forever"
+                        android:ellipsize="end"
+                        android:fontFamily="sans-serif"
+                        android:fontFeatureSettings="onum"
                         android:paddingTop="4dp"
-                        android:scrollHorizontally="true"
                         android:singleLine="true"
                         android:textAppearance="@style/TextViewHeadline6"
                         android:textColor="?android:attr/textColorSecondary"
@@ -112,8 +109,8 @@
 
                 </LinearLayout>
 
-
                 <include layout="@layout/activity_artist_content" />
+
             </LinearLayout>
         </com.google.android.material.card.MaterialCardView>
     </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
index be83c8147..946452649 100755
--- a/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout-xlarge-land/fragment_player_playback_controls.xml
@@ -130,7 +130,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
@@ -144,7 +145,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml
index 23ecc5eac..5df4d4c43 100644
--- a/app/src/main/res/layout-xlarge/activity_album.xml
+++ b/app/src/main/res/layout-xlarge/activity_album.xml
@@ -132,6 +132,8 @@
                             android:layout_gravity="center"
                             android:ellipsize="marquee"
                             android:focusable="true"
+                            android:fontFamily="sans-serif"
+                            android:fontFeatureSettings="onum"
                             android:focusableInTouchMode="true"
                             android:freezesText="true"
                             android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout-xlarge/activity_artist_details.xml b/app/src/main/res/layout-xlarge/activity_artist_details.xml
index 07ddf7df1..b6bfa9236 100644
--- a/app/src/main/res/layout-xlarge/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@@ -100,6 +100,8 @@
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
                         android:paddingTop="4dp"
+                        android:fontFamily="sans-serif"
+                        android:fontFeatureSettings="onum"
                         android:textAppearance="@style/TextViewHeadline6"
                         android:textColor="?android:attr/textColorSecondary"
                         tools:ignore="MissingPrefix"
@@ -107,7 +109,6 @@
 
                 </LinearLayout>
 
-
                 <include layout="@layout/activity_artist_content" />
 
             </LinearLayout>
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index e30dd78ea..edf00d2e6 100755
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -112,6 +112,8 @@
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="4dp"
                     android:layout_marginEnd="16dp"
+                    android:fontFamily="sans-serif"
+                    android:fontFeatureSettings="onum"
                     android:singleLine="true"
                     android:textAppearance="@style/TextViewSubtitle2"
                     android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml
index d25f0b8fa..e16770556 100755
--- a/app/src/main/res/layout/activity_artist_details.xml
+++ b/app/src/main/res/layout/activity_artist_details.xml
@@ -96,6 +96,8 @@
                     android:layout_height="wrap_content"
                     android:layout_marginStart="16dp"
                     android:layout_marginTop="4dp"
+                    android:fontFamily="sans-serif"
+                    android:fontFeatureSettings="onum"
                     android:layout_marginEnd="16dp"
                     android:textAppearance="@style/TextViewSubtitle2"
                     android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
index 56a066fb4..cda1e808e 100644
--- a/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_adaptive_player_playback_controls.xml
@@ -24,6 +24,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -37,7 +39,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
index 27e207043..d1a03bed7 100644
--- a/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_blur_player_playback_controls.xml
@@ -51,7 +51,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
@@ -65,7 +66,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
index 8fce1b37c..1e8d2c813 100644
--- a/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_blur_player_playback_controls.xml
@@ -24,8 +24,7 @@
 
         <include layout="@layout/media_button" />
 
-        <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-            xmlns:tools="http://schemas.android.com/tools"
+        <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
@@ -39,6 +38,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
+                android:fontFamily="sans-serif"
+                android:fontFeatureSettings="onum"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
                 android:textAppearance="@style/TextViewOverline"
@@ -51,6 +52,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="0"
+                android:fontFamily="sans-serif"
+                android:fontFeatureSettings="onum"
                 android:paddingStart="8dp"
                 android:paddingEnd="8dp"
                 android:textAppearance="@style/TextViewOverline"
diff --git a/app/src/main/res/layout/fragment_card_player_playback_controls.xml b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
index fb54bcb74..135d0b0a0 100644
--- a/app/src/main/res/layout/fragment_card_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_card_player_playback_controls.xml
@@ -20,6 +20,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -32,6 +34,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_color_player_playback_controls.xml b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
index 67018ae0c..2ec368fa0 100644
--- a/app/src/main/res/layout/fragment_color_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_color_player_playback_controls.xml
@@ -23,7 +23,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -36,7 +37,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_fit_playback_controls.xml b/app/src/main/res/layout/fragment_fit_playback_controls.xml
index f43eb8f61..9ad41af7d 100644
--- a/app/src/main/res/layout/fragment_fit_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_fit_playback_controls.xml
@@ -18,6 +18,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -31,6 +33,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
index db4ad45aa..795f91682 100644
--- a/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_flat_player_playback_controls.xml
@@ -23,25 +23,30 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry" />
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="@tools:sample/date/hhmm" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/songTotalTime"
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
             android:textColor="?android:attr/textColorSecondary"
             android:textSize="12sp"
-            tools:ignore="RtlHardcoded,RtlSymmetry" />
+            tools:ignore="RtlHardcoded,RtlSymmetry"
+            tools:text="@tools:sample/date/hhmm" />
 
         <androidx.appcompat.widget.AppCompatSeekBar
             android:id="@+id/progressSlider"
diff --git a/app/src/main/res/layout/fragment_full_player_controls.xml b/app/src/main/res/layout/fragment_full_player_controls.xml
index 090b4c88b..bd8d70192 100644
--- a/app/src/main/res/layout/fragment_full_player_controls.xml
+++ b/app/src/main/res/layout/fragment_full_player_controls.xml
@@ -57,7 +57,7 @@
             app:layout_constraintEnd_toStartOf="@+id/songFavourite"
             app:layout_constraintStart_toEndOf="@+id/playerMenu"
             app:layout_constraintTop_toBottomOf="@+id/title"
-            tools:text="@string/for_you" />
+            tools:text="@tools:sample/lorem" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:id="@+id/songFavourite"
diff --git a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
index 75aed24ee..fdb37b2da 100644
--- a/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_lock_screen_playback_controls.xml
@@ -24,7 +24,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -38,7 +39,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_material_playback_controls.xml b/app/src/main/res/layout/fragment_material_playback_controls.xml
index ae2e426f3..c3ff87368 100644
--- a/app/src/main/res/layout/fragment_material_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_material_playback_controls.xml
@@ -24,7 +24,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -38,7 +39,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_peak_control_player.xml b/app/src/main/res/layout/fragment_peak_control_player.xml
index 7680a6e4f..a70318231 100644
--- a/app/src/main/res/layout/fragment_peak_control_player.xml
+++ b/app/src/main/res/layout/fragment_peak_control_player.xml
@@ -35,7 +35,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -49,7 +50,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_plain_controls_fragment.xml b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
index e0e89871a..8ee3b903b 100644
--- a/app/src/main/res/layout/fragment_plain_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_plain_controls_fragment.xml
@@ -22,7 +22,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
@@ -36,7 +37,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml
index 0580891e3..f31095bac 100755
--- a/app/src/main/res/layout/fragment_player_playback_controls.xml
+++ b/app/src/main/res/layout/fragment_player_playback_controls.xml
@@ -38,7 +38,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentRight="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|right|end"
             android:paddingRight="8dp"
             android:singleLine="true"
@@ -52,7 +53,8 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:layout_alignParentLeft="true"
-            android:fontFamily="sans-serif-medium"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:gravity="center_vertical|left|end"
             android:paddingLeft="8dp"
             android:singleLine="true"
diff --git a/app/src/main/res/layout/fragment_simple_controls_fragment.xml b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
index 9ed6694a6..04f38a237 100644
--- a/app/src/main/res/layout/fragment_simple_controls_fragment.xml
+++ b/app/src/main/res/layout/fragment_simple_controls_fragment.xml
@@ -58,6 +58,8 @@
         android:layout_height="wrap_content"
         android:gravity="center"
         android:paddingStart="16dp"
+        android:fontFamily="sans-serif"
+        android:fontFeatureSettings="onum"
         android:paddingEnd="16dp"
         android:textAppearance="@style/TextViewSubtitle2"
         app:layout_constraintBottom_toTopOf="@+id/playerMediaControllerContainer"
diff --git a/app/src/main/res/layout/fragment_tiny_player.xml b/app/src/main/res/layout/fragment_tiny_player.xml
index c3faccc26..f1d1357ad 100644
--- a/app/src/main/res/layout/fragment_tiny_player.xml
+++ b/app/src/main/res/layout/fragment_tiny_player.xml
@@ -51,12 +51,15 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="end"
+        android:fontFamily="sans-serif"
+        android:fontFeatureSettings="onum"
         android:padding="16dp"
         android:textAppearance="@style/TextViewHeadline3"
         android:textStyle="bold"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toBottomOf="@id/status_bar"
-        tools:ignore="MissingPrefix" />
+        tools:ignore="MissingPrefix"
+        tools:text="@tools:sample/date/hhmm" />
 
     <FrameLayout
         android:id="@+id/toolbarContainer"
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index d1f2226a1..f94ef6c1c 100755
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -92,6 +92,8 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:ellipsize="end"
+            android:fontFamily="sans-serif"
+            android:fontFeatureSettings="onum"
             android:maxLines="1"
             android:textColor="?android:attr/textColorSecondary"
             tools:text="Song artist name " />
diff --git a/app/src/main/res/layout/item_list_no_image.xml b/app/src/main/res/layout/item_list_no_image.xml
index 456015d06..b7f4fdf4b 100644
--- a/app/src/main/res/layout/item_list_no_image.xml
+++ b/app/src/main/res/layout/item_list_no_image.xml
@@ -38,6 +38,7 @@
         android:id="@+id/text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
         android:fontFeatureSettings="onum"
         android:singleLine="true"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/item_queue.xml b/app/src/main/res/layout/item_queue.xml
index 46a621eb7..6f52b7286 100644
--- a/app/src/main/res/layout/item_queue.xml
+++ b/app/src/main/res/layout/item_queue.xml
@@ -78,6 +78,8 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:ellipsize="end"
+                    android:fontFamily="sans-serif"
+                    android:fontFeatureSettings="onum"
                     android:maxLines="1"
                     tools:text="Song details" />
             </LinearLayout>
diff --git a/app/src/main/res/layout/item_song.xml b/app/src/main/res/layout/item_song.xml
index 00ba56eff..7db826edc 100755
--- a/app/src/main/res/layout/item_song.xml
+++ b/app/src/main/res/layout/item_song.xml
@@ -24,6 +24,7 @@
             android:id="@+id/imageText"
             android:layout_width="40dp"
             android:layout_height="match_parent"
+            android:fontFamily="sans-serif"
             android:fontFeatureSettings="onum"
             android:gravity="center"
             android:maxLines="1"
@@ -53,6 +54,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="0"
+        android:fontFamily="sans-serif"
         android:fontFeatureSettings="onum"
         android:padding="8dp"
         android:textColor="?android:attr/textColorSecondary"
diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml
index 351301387..25864d96a 100644
--- a/app/src/main/res/layout/list_item_view_seekbar.xml
+++ b/app/src/main/res/layout/list_item_view_seekbar.xml
@@ -88,6 +88,8 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
         android:layout_marginEnd="16dp"
+        android:fontFamily="sans-serif"
+        android:fontFeatureSettings="onum"
         android:textAppearance="@style/TextViewSubtitle1"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/list_setting_item_view.xml b/app/src/main/res/layout/list_setting_item_view.xml
index 142e5c887..6f37b337e 100644
--- a/app/src/main/res/layout/list_setting_item_view.xml
+++ b/app/src/main/res/layout/list_setting_item_view.xml
@@ -14,12 +14,13 @@
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="?rectSelector"
-    android:gravity="center_vertical"
     android:layout_marginStart="4dp"
     android:layout_marginEnd="4dp"
+    android:background="?rectSelector"
+    android:gravity="center_vertical"
     android:orientation="horizontal">
 
     <code.name.monkey.retromusic.views.ColorIconsImageView
@@ -34,8 +35,8 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:padding="16dp"
-        android:orientation="vertical">
+        android:orientation="vertical"
+        android:padding="16dp">
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/title"
@@ -44,9 +45,9 @@
             android:ellipsize="marquee"
             android:fadingEdge="horizontal"
             android:singleLine="true"
-            android:text="@string/general_settings_title"
             android:textAppearance="@style/TextViewSubtitle1"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            tools:text="@tools:sample/lorem/random" />
 
         <com.google.android.material.textview.MaterialTextView
             android:id="@+id/text"
@@ -54,7 +55,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="2dp"
             android:maxLines="4"
-            android:text="@string/general_settings_summary"
-            android:textColor="?android:attr/textColorSecondary" />
+            android:textColor="?android:attr/textColorSecondary"
+            tools:text="@tools:sample/lorem/random" />
     </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/preference_now_playing_screen_item.xml b/app/src/main/res/layout/preference_now_playing_screen_item.xml
index 7ce569568..6ecbcd2bc 100644
--- a/app/src/main/res/layout/preference_now_playing_screen_item.xml
+++ b/app/src/main/res/layout/preference_now_playing_screen_item.xml
@@ -22,6 +22,6 @@
         android:layout_width="match_parent"
         android:layout_height="0dp"
         android:layout_weight="1"
-        tools:src="@tools:sample/avatars" />
+        tools:src="@tools:sample/backgrounds/scenic" />
 
 </LinearLayout>
\ No newline at end of file
