diff --git a/app/build.gradle b/app/build.gradle
index 2aec8e797..8ffffa021 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -51,6 +51,11 @@ android {
             versionName defaultConfig.versionName + "_" + getDate()
             dimension "default"
         }
+        font {
+            versionCode defaultConfig.versionCode + 10000
+            versionName defaultConfig.versionName + "_" + getDate()
+            dimension "default"
+        }
     }
 
     packagingOptions {
@@ -136,7 +141,7 @@ dependencies {
     implementation('com.h6ah4i.android.widget.advrecyclerview:advrecyclerview:0.11.0@aar') {
         transitive = true
     }
-    
+
     /*UI Library*/
     implementation 'me.zhanghai.android.materialprogressbar:library:1.6.1'
 
diff --git a/app/src/main/res/layout-land/activity_album.xml b/app/src/main/res/layout-land/activity_album.xml
index 1ad0755ee..ae4c50177 100644
--- a/app/src/main/res/layout-land/activity_album.xml
+++ b/app/src/main/res/layout-land/activity_album.xml
@@ -78,6 +78,7 @@
                                 android:layout_height="wrap_content"
                                 android:maxLines="2"
                                 android:textAppearance="@style/TextViewHeadline6"
+                                android:textStyle="bold"
                                 tools:ignore="MissingPrefix"
                                 tools:text="Album name" />
 
@@ -91,6 +92,7 @@
                                 android:focusableInTouchMode="true"
                                 android:freezesText="true"
                                 android:marqueeRepeatLimit="marquee_forever"
+                                android:paddingTop="4dp"
                                 android:scrollHorizontally="true"
                                 android:singleLine="true"
                                 android:textAppearance="@style/TextViewHeadline6"
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 e2710952e..fb2576879 100644
--- a/app/src/main/res/layout-land/activity_artist_details.xml
+++ b/app/src/main/res/layout-land/activity_artist_details.xml
@@ -67,11 +67,13 @@
                                 android:layout_height="wrap_content"
                                 android:maxLines="2"
                                 android:textAppearance="@style/TextViewHeadline6"
+                                android:textStyle="bold"
                                 tools:ignore="MissingPrefix"
                                 tools:text="Title" />
 
                             <com.google.android.material.textview.MaterialTextView
                                 android:id="@+id/text"
+                                android:paddingTop="4dp"
                                 android:layout_width="match_parent"
                                 android:layout_height="wrap_content"
                                 android:textAppearance="@style/TextViewSubtitle2"
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 d3ccb4dc6..6ef651795 100644
--- a/app/src/main/res/layout-xlarge-land/activity_album.xml
+++ b/app/src/main/res/layout-xlarge-land/activity_album.xml
@@ -104,6 +104,7 @@
                             android:layout_height="wrap_content"
                             android:maxLines="2"
                             android:textAppearance="@style/TextViewHeadline3"
+                            android:textStyle="bold"
                             tools:ignore="MissingPrefix"
                             tools:text="Album name" />
 
@@ -111,6 +112,7 @@
                             android:id="@+id/albumText"
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
+                            android:paddingTop="4dp"
                             android:textAppearance="@style/TextViewHeadline6"
                             tools:ignore="MissingPrefix"
                             tools:text="Album details" />
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 a013e1ac5..b853d3628 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
@@ -74,6 +74,7 @@
                         android:layout_height="wrap_content"
                         android:maxLines="2"
                         android:textAppearance="@style/TextViewHeadline4"
+                        android:textStyle="bold"
                         tools:ignore="MissingPrefix"
                         tools:text="Title" />
 
@@ -87,6 +88,7 @@
                         android:focusableInTouchMode="true"
                         android:freezesText="true"
                         android:marqueeRepeatLimit="marquee_forever"
+                        android:paddingTop="4dp"
                         android:scrollHorizontally="true"
                         android:singleLine="true"
                         android:textAppearance="@style/TextViewHeadline6"
diff --git a/app/src/main/res/layout-xlarge/activity_album.xml b/app/src/main/res/layout-xlarge/activity_album.xml
index a350f3361..f06b84969 100644
--- a/app/src/main/res/layout-xlarge/activity_album.xml
+++ b/app/src/main/res/layout-xlarge/activity_album.xml
@@ -106,6 +106,7 @@
                             android:layout_height="wrap_content"
                             android:maxLines="2"
                             android:textAppearance="@style/TextViewHeadline4"
+                            android:textStyle="bold"
                             tools:ignore="MissingPrefix"
                             tools:text="Album name" />
 
@@ -120,6 +121,7 @@
                             android:focusableInTouchMode="true"
                             android:freezesText="true"
                             android:marqueeRepeatLimit="marquee_forever"
+                            android:paddingTop="4dp"
                             android:scrollHorizontally="true"
                             android:singleLine="true"
                             tools:ignore="MissingPrefix"
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 21994b6a9..1e4d7032c 100644
--- a/app/src/main/res/layout-xlarge/activity_artist_details.xml
+++ b/app/src/main/res/layout-xlarge/activity_artist_details.xml
@@ -76,12 +76,14 @@
                         android:layout_height="wrap_content"
                         android:maxLines="2"
                         android:textAppearance="@style/TextViewHeadline4"
+                        android:textStyle="bold"
                         tools:ignore="MissingPrefix"
                         tools:text="Title" />
 
                     <com.google.android.material.textview.MaterialTextView
                         android:id="@+id/text"
                         android:layout_width="match_parent"
+                        android:paddingTop="4dp"
                         android:layout_height="wrap_content"
                         android:textAppearance="@style/TextViewHeadline6"
                         tools:ignore="MissingPrefix"
diff --git a/app/src/main/res/layout/activity_album.xml b/app/src/main/res/layout/activity_album.xml
index 6538c6ed4..82bf29cd8 100755
--- a/app/src/main/res/layout/activity_album.xml
+++ b/app/src/main/res/layout/activity_album.xml
@@ -77,7 +77,8 @@
                         android:layout_height="52dp"
                         android:layout_weight="0"
                         app:civ_border="false"
-                        app:civ_shadow="false" />
+                        app:civ_shadow="false"
+                        tools:srcCompat="@tools:sample/backgrounds/scenic[11]" />
 
                     <LinearLayout
                         android:layout_width="match_parent"
@@ -93,6 +94,7 @@
                             android:layout_height="wrap_content"
                             android:maxLines="2"
                             android:textAppearance="@style/TextViewHeadline6"
+                            android:textStyle="bold"
                             tools:ignore="MissingPrefix"
                             tools:text="Album name" />
 
@@ -101,6 +103,7 @@
                             android:layout_width="match_parent"
                             android:layout_height="wrap_content"
                             android:singleLine="true"
+                            android:paddingTop="4dp"
                             android:textAppearance="@style/TextViewSubtitle2"
                             tools:ignore="MissingPrefix"
                             tools:text="Album details" />
diff --git a/app/src/main/res/layout/activity_artist_details.xml b/app/src/main/res/layout/activity_artist_details.xml
index 7a6008ca7..bc2902933 100755
--- a/app/src/main/res/layout/activity_artist_details.xml
+++ b/app/src/main/res/layout/activity_artist_details.xml
@@ -78,6 +78,7 @@
                         android:layout_height="wrap_content"
                         android:maxLines="2"
                         android:textAppearance="@style/TextViewHeadline6"
+                        android:textStyle="bold"
                         tools:ignore="MissingPrefix"
                         tools:text="Title" />
 
@@ -85,6 +86,7 @@
                         android:id="@+id/text"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
+                        android:paddingTop="4dp"
                         android:textAppearance="@style/TextViewSubtitle2"
                         tools:ignore="MissingPrefix"
                         tools:text="Title" />