diff --git a/app/build.gradle b/app/build.gradle
index 614d19af..75e42922 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -10,6 +10,10 @@ android {
 
         versionCode 175
         versionName '1.3.1'
+
+        vectorDrawables {
+            useSupportLibrary = true
+        }
     }
 
     buildTypes {
@@ -36,8 +40,6 @@ android {
 
 dependencies {
     implementation 'androidx.core:core:1.2.0'
-    implementation 'androidx.legacy:legacy-support-core-utils:1.0.0'
-    implementation 'androidx.legacy:legacy-support-core-ui:1.0.0'
     implementation 'androidx.media:media:1.1.0'
     implementation 'androidx.fragment:fragment:1.2.4'
     implementation 'androidx.legacy:legacy-support-v13:1.0.0'
@@ -49,7 +51,6 @@ dependencies {
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.preference:preference:1.1.1'
-    implementation 'androidx.legacy:legacy-preference-v14:1.0.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
 
     implementation 'com.github.kabouzeid:app-theme-helper:1.3.10'
@@ -69,7 +70,6 @@ dependencies {
 
     implementation 'com.squareup.retrofit2:retrofit:2.5.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.5.0'
-    implementation 'com.google.code.gson:gson:2.8.6'
     implementation 'com.google.android.material:material:1.1.0'
 
     implementation 'com.github.bumptech.glide:glide:3.8.0'
diff --git a/app/src/main/res/layout-land/fragment_simple_slide_large_image.xml b/app/src/main/res/layout-land/fragment_simple_slide_large_image.xml
index 50493598..6767d590 100644
--- a/app/src/main/res/layout-land/fragment_simple_slide_large_image.xml
+++ b/app/src/main/res/layout-land/fragment_simple_slide_large_image.xml
@@ -39,7 +39,7 @@
             android:gravity="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Headline"
             tools:ignore="UnusedAttribute"
-            tools:text="Lorem ipsum" />
+            tools:text="Title" />
 
         <TextView
             android:id="@id/mi_description"
@@ -48,7 +48,7 @@
             android:layout_marginTop="@dimen/mi_baseline"
             android:gravity="center"
             android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-            tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />
+            tools:text="Description" />
 
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_album_detail.xml b/app/src/main/res/layout/activity_album_detail.xml
index 1dd1b760..eec4af21 100644
--- a/app/src/main/res/layout/activity_album_detail.xml
+++ b/app/src/main/res/layout/activity_album_detail.xml
@@ -73,8 +73,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -82,8 +80,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_person_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -105,8 +101,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -114,8 +108,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_music_note_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -135,8 +127,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -144,8 +134,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_timer_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -165,8 +153,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -174,8 +160,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_event_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -215,6 +199,7 @@
             android:layout_height="@dimen/detail_header_height"
             android:elevation="@dimen/toolbar_elevation"
             tools:ignore="UnusedAttribute" />
+
     </FrameLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_artist_detail.xml b/app/src/main/res/layout/activity_artist_detail.xml
index 4e10dcad..872f16a1 100644
--- a/app/src/main/res/layout/activity_artist_detail.xml
+++ b/app/src/main/res/layout/activity_artist_detail.xml
@@ -73,8 +73,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -82,8 +80,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_album_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -103,8 +99,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -112,8 +106,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_music_note_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -133,8 +125,6 @@
                         android:gravity="center_vertical"
                         android:orientation="horizontal"
                         android:paddingEnd="16dp"
-                        android:paddingLeft="0dp"
-                        android:paddingRight="16dp"
                         android:paddingStart="0dp">
 
                         <ImageView
@@ -142,8 +132,6 @@
                             android:layout_width="24dp"
                             android:layout_height="24dp"
                             android:layout_marginEnd="8dp"
-                            android:layout_marginLeft="0dp"
-                            android:layout_marginRight="8dp"
                             android:layout_marginStart="0dp"
                             app:srcCompat="@drawable/ic_timer_white_24dp"
                             tools:ignore="ContentDescription,UnusedAttribute" />
@@ -183,6 +171,7 @@
             android:layout_height="@dimen/detail_header_height"
             android:elevation="@dimen/toolbar_elevation"
             tools:ignore="UnusedAttribute" />
+
     </FrameLayout>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index daf280dd..7ea5dae4 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -78,6 +78,6 @@
         android:layout_marginTop="32dp"
         android:paddingTop="8dp"
         android:paddingBottom="8dp"
-        android:text="login" />
+        android:text="@string/login" />
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main_content.xml b/app/src/main/res/layout/activity_main_content.xml
index a9e82bc6..e5b4bd71 100644
--- a/app/src/main/res/layout/activity_main_content.xml
+++ b/app/src/main/res/layout/activity_main_content.xml
@@ -19,4 +19,5 @@
         android:id="@+id/fragment_container"
         android:layout_width="match_parent"
         android:layout_height="match_parent" />
+
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_widget_classic.xml b/app/src/main/res/layout/app_widget_classic.xml
index ee3501a1..010454a0 100644
--- a/app/src/main/res/layout/app_widget_classic.xml
+++ b/app/src/main/res/layout/app_widget_classic.xml
@@ -26,7 +26,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_alignParentBottom="true"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_gravity="bottom"
             android:layout_marginBottom="8dp"
diff --git a/app/src/main/res/layout/card_about_app.xml b/app/src/main/res/layout/card_about_app.xml
index 9c43c709..0877256d 100644
--- a/app/src/main/res/layout/card_about_app.xml
+++ b/app/src/main/res/layout/card_about_app.xml
@@ -59,7 +59,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
@@ -78,6 +77,7 @@
                     android:text="0.0.0"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption"
                     tools:ignore="HardcodedText" />
+
             </LinearLayout>
 
         </LinearLayout>
@@ -104,7 +104,6 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:paddingBottom="8dp"
                 android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/card_author.xml b/app/src/main/res/layout/card_author.xml
index 6ce79c99..87893954 100644
--- a/app/src/main/res/layout/card_author.xml
+++ b/app/src/main/res/layout/card_author.xml
@@ -47,7 +47,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
@@ -91,7 +90,6 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:paddingBottom="8dp"
                 android:paddingTop="8dp"
@@ -122,7 +120,6 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:paddingBottom="8dp"
                 android:paddingTop="8dp"
@@ -153,7 +150,6 @@
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:paddingBottom="8dp"
                 android:paddingTop="8dp"
diff --git a/app/src/main/res/layout/card_special_thanks.xml b/app/src/main/res/layout/card_special_thanks.xml
index 963d4453..5a4faab5 100644
--- a/app/src/main/res/layout/card_special_thanks.xml
+++ b/app/src/main/res/layout/card_special_thanks.xml
@@ -55,6 +55,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/aidan_follestad_summary"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -78,6 +79,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/github"
                     android:textColor="#4183c4" />
+
             </LinearLayout>
 
         </LinearLayout>
@@ -113,6 +115,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/michael_cook_summary"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -136,6 +139,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/website"
                     android:textColor="#4183c4" />
+
             </LinearLayout>
 
         </LinearLayout>
@@ -171,6 +175,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/maarten_corpel_summary"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -186,6 +191,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/google_plus"
                     android:textColor="#dd4b39" />
+
             </LinearLayout>
 
         </LinearLayout>
@@ -221,6 +227,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/aleksandar_tesic_summary"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -236,6 +243,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/google_plus"
                     android:textColor="#dd4b39" />
+
             </LinearLayout>
 
         </LinearLayout>
@@ -271,6 +279,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/eugene_cheung_summary"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+
             </LinearLayout>
 
             <LinearLayout
@@ -330,6 +339,7 @@
                     android:layout_height="wrap_content"
                     android:text="@string/adrian_summary"
                     android:textAppearance="@style/TextAppearance.AppCompat.Caption" />
+
             </LinearLayout>
 
             <LinearLayout
diff --git a/app/src/main/res/layout/card_support_development.xml b/app/src/main/res/layout/card_support_development.xml
index dbe7c4e4..252ee52b 100644
--- a/app/src/main/res/layout/card_support_development.xml
+++ b/app/src/main/res/layout/card_support_development.xml
@@ -48,7 +48,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
@@ -92,7 +91,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
@@ -136,7 +134,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
@@ -180,7 +177,6 @@
             <LinearLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginLeft="32dp"
                 android:layout_marginStart="32dp"
                 android:orientation="vertical"
                 android:paddingBottom="8dp"
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 ae2969f4..86925c19 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
@@ -63,8 +63,6 @@
             android:layout_height="72dp"
             android:layout_centerVertical="true"
             android:layout_marginEnd="-8dp"
-            android:layout_marginRight="-8dp"
-            android:layout_toLeftOf="@+id/dummy_fab"
             android:layout_toStartOf="@+id/dummy_fab"
             android:background="?attr/roundSelector"
             android:padding="22dp"
@@ -77,10 +75,8 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="-8dp"
             android:layout_marginStart="-8dp"
             android:layout_toEndOf="@+id/dummy_fab"
-            android:layout_toRightOf="@+id/dummy_fab"
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
@@ -91,10 +87,8 @@
             android:id="@+id/player_repeat_button"
             android:layout_width="72dp"
             android:layout_height="72dp"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
             android:background="?attr/roundSelector"
             android:padding="22dp"
@@ -107,10 +101,8 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
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 95eecb69..fb2f1ce8 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
@@ -65,8 +65,6 @@
             android:layout_height="72dp"
             android:layout_centerVertical="true"
             android:layout_marginEnd="-8dp"
-            android:layout_marginRight="-8dp"
-            android:layout_toLeftOf="@+id/player_play_pause__button"
             android:layout_toStartOf="@+id/player_play_pause__button"
             android:background="?attr/roundSelector"
             android:padding="22dp"
@@ -79,10 +77,8 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="-8dp"
             android:layout_marginStart="-8dp"
             android:layout_toEndOf="@+id/player_play_pause__button"
-            android:layout_toRightOf="@+id/player_play_pause__button"
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
@@ -93,10 +89,8 @@
             android:id="@+id/player_repeat_button"
             android:layout_width="72dp"
             android:layout_height="72dp"
-            android:layout_alignParentLeft="true"
             android:layout_alignParentStart="true"
             android:layout_centerVertical="true"
-            android:layout_marginLeft="16dp"
             android:layout_marginStart="16dp"
             android:background="?attr/roundSelector"
             android:padding="22dp"
@@ -109,10 +103,8 @@
             android:layout_width="72dp"
             android:layout_height="72dp"
             android:layout_alignParentEnd="true"
-            android:layout_alignParentRight="true"
             android:layout_centerVertical="true"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:background="?attr/roundSelector"
             android:padding="22dp"
             android:scaleType="fitCenter"
diff --git a/app/src/main/res/layout/fragment_mini_player.xml b/app/src/main/res/layout/fragment_mini_player.xml
index 3e28e3a4..8ebce6f1 100644
--- a/app/src/main/res/layout/fragment_mini_player.xml
+++ b/app/src/main/res/layout/fragment_mini_player.xml
@@ -44,7 +44,6 @@
             android:layout_height="40dp"
             android:layout_gravity="center_vertical"
             android:layout_marginEnd="16dp"
-            android:layout_marginRight="16dp"
             android:scaleType="center"
             tools:ignore="ContentDescription" />
 
diff --git a/app/src/main/res/layout/fragment_simple_slide_large_image.xml b/app/src/main/res/layout/fragment_simple_slide_large_image.xml
index 083ebb45..93c0c92f 100644
--- a/app/src/main/res/layout/fragment_simple_slide_large_image.xml
+++ b/app/src/main/res/layout/fragment_simple_slide_large_image.xml
@@ -30,7 +30,7 @@
         android:gravity="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         tools:ignore="UnusedAttribute"
-        tools:text="Lorem ipsum" />
+        tools:text="Title" />
 
     <TextView
         android:id="@id/mi_description"
@@ -39,6 +39,6 @@
         android:layout_marginTop="@dimen/mi_baseline"
         android:gravity="center"
         android:textAppearance="@style/TextAppearance.AppCompat.Subhead"
-        tools:text="Lorem ipsum dolor sit amet, consectetur, adipisci velit, …" />
+        tools:text="Description" />
 
 </com.heinrichreimersoftware.materialintro.view.parallax.ParallaxLinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_grid.xml b/app/src/main/res/layout/item_grid.xml
index 8c5c6242..9ef35f07 100644
--- a/app/src/main/res/layout/item_grid.xml
+++ b/app/src/main/res/layout/item_grid.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout 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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_margin="2dp"
     android:foreground="?rectSelectorStrong">
 
diff --git a/app/src/main/res/layout/item_grid_card_horizontal.xml b/app/src/main/res/layout/item_grid_card_horizontal.xml
index abec79a6..f998cd31 100644
--- a/app/src/main/res/layout/item_grid_card_horizontal.xml
+++ b/app/src/main/res/layout/item_grid_card_horizontal.xml
@@ -4,7 +4,6 @@
     android:layout_width="104dp"
     android:layout_height="148dp"
     android:layout_marginEnd="8dp"
-    android:layout_marginRight="8dp"
     android:foreground="?attr/rectSelectorStrong"
     app:cardBackgroundColor="?cardBackgroundColor">
 
diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml
index a63afe75..c7ad527e 100644
--- a/app/src/main/res/layout/item_list.xml
+++ b/app/src/main/res/layout/item_list.xml
@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical|start"
-        android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
         android:tint="?attr/iconColor"
         android:tintMode="src_in"
@@ -31,8 +30,6 @@
             android:layout_width="wrap_content"
             android:layout_height="match_parent"
             android:paddingEnd="0dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="0dp"
             android:paddingStart="16dp">
 
             <ImageView
@@ -64,8 +61,6 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:paddingEnd="0dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="0dp"
             android:paddingStart="16dp">
 
             <TextView
@@ -84,6 +79,7 @@
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="?android:textColorSecondary" />
+
         </LinearLayout>
 
         <com.kabouzeid.gramophone.views.IconImageView
@@ -107,7 +103,6 @@
         android:layout_width="match_parent"
         android:layout_height="1dp"
         android:layout_gravity="bottom"
-        android:layout_marginLeft="72dp"
         android:layout_marginStart="72dp"
         android:background="?attr/dividerColor" />
 
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 a77b598e..734cbe32 100644
--- a/app/src/main/res/layout/item_list_no_image.xml
+++ b/app/src/main/res/layout/item_list_no_image.xml
@@ -33,8 +33,6 @@
             android:layout_weight="1"
             android:orientation="vertical"
             android:paddingEnd="0dp"
-            android:paddingLeft="16dp"
-            android:paddingRight="0dp"
             android:paddingStart="16dp">
 
             <TextView
@@ -53,6 +51,7 @@
                 android:singleLine="true"
                 android:textAppearance="@style/TextAppearance.AppCompat.Body1"
                 android:textColor="?android:textColorSecondary" />
+
         </LinearLayout>
 
         <com.kabouzeid.gramophone.views.IconImageView
diff --git a/app/src/main/res/layout/item_list_single_row.xml b/app/src/main/res/layout/item_list_single_row.xml
index 4ac18cc4..e61f1029 100644
--- a/app/src/main/res/layout/item_list_single_row.xml
+++ b/app/src/main/res/layout/item_list_single_row.xml
@@ -12,7 +12,6 @@
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_gravity="center_vertical|start"
-        android:layout_marginLeft="-8dp"
         android:layout_marginStart="-8dp"
         android:visibility="gone"
         app:srcCompat="@drawable/ic_drag_vertical_white_24dp"
diff --git a/app/src/main/res/layout/navigation_drawer_header.xml b/app/src/main/res/layout/navigation_drawer_header.xml
index c12a7177..de6dc923 100644
--- a/app/src/main/res/layout/navigation_drawer_header.xml
+++ b/app/src/main/res/layout/navigation_drawer_header.xml
@@ -5,6 +5,7 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
+    android:focusable="true"
     android:foreground="?rectSelectorStrong">
 
     <!--suppress AndroidDomInspection -->
diff --git a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
index d76d4deb..b9ed1f11 100644
--- a/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
+++ b/app/src/main/res/layout/preference_dialog_library_categories_listitem.xml
@@ -33,7 +33,6 @@
         android:gravity="center_vertical"
         android:minHeight="@dimen/md_listitem_height"
         android:paddingBottom="@dimen/md_listitem_vertical_margin_choice"
-        android:paddingLeft="@dimen/md_listitem_control_margin"
         android:paddingStart="@dimen/md_listitem_control_margin"
         android:paddingTop="@dimen/md_listitem_vertical_margin_choice"
         android:singleLine="true"
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 0e12b8ef..48563511 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
@@ -14,7 +14,7 @@
         android:padding="16dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Title"
         android:textColor="?android:textColorSecondary"
-        tools:text="Card layout" />
+        tools:text="Card Layout" />
 
     <ImageView
         android:id="@+id/image"
diff --git a/app/src/main/res/layout/shadow_statusbar_toolbar.xml b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
index e9ca4d00..2d3f068d 100644
--- a/app/src/main/res/layout/shadow_statusbar_toolbar.xml
+++ b/app/src/main/res/layout/shadow_statusbar_toolbar.xml
@@ -5,7 +5,7 @@
     android:orientation="vertical">
 
     <LinearLayout
-        android:id="@+id/dummy_statusbar_actionbar"
+        android:id="@+id/status_bar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:orientation="vertical">
@@ -23,8 +23,8 @@
     <View
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_alignBottom="@id/dummy_statusbar_actionbar"
-        android:layout_alignTop="@id/dummy_statusbar_actionbar"
+        android:layout_alignBottom="@id/status_bar"
+        android:layout_alignTop="@id/status_bar"
         android:background="@drawable/toolbar_gradient" />
 
 </RelativeLayout>
diff --git a/app/src/main/res/layout/sliding_music_panel_layout.xml b/app/src/main/res/layout/sliding_music_panel_layout.xml
index 80ce7ef8..2050ed83 100644
--- a/app/src/main/res/layout/sliding_music_panel_layout.xml
+++ b/app/src/main/res/layout/sliding_music_panel_layout.xml
@@ -25,7 +25,7 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
-        <fragment
+        <FragmentContainerView
             android:id="@+id/mini_player_fragment"
             class="com.kabouzeid.gramophone.ui.fragments.player.MiniPlayerFragment"
             android:layout_width="match_parent"