diff --git a/app/src/main/res/layout/list_item_view.xml b/app/src/main/res/layout/list_item_view.xml
index 4d221151..a0bece90 100644
--- a/app/src/main/res/layout/list_item_view.xml
+++ b/app/src/main/res/layout/list_item_view.xml
@@ -40,7 +40,7 @@
         android:layout_height="wrap_content"
         android:textAppearance="@style/TextViewSubtitle1"
         app:layout_constrainedWidth="true"
-        app:layout_constraintEnd_toStartOf="@android:id/checkbox"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toTopOf="parent"
         tools:maxLines="@string/grid_size_1"
@@ -51,8 +51,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@android:id/checkbox"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
         app:lineHeightHint="24sp"
diff --git a/app/src/main/res/layout/list_item_view_no_title.xml b/app/src/main/res/layout/list_item_view_no_title.xml
index 90eed14e..694c959d 100644
--- a/app/src/main/res/layout/list_item_view_no_title.xml
+++ b/app/src/main/res/layout/list_item_view_no_title.xml
@@ -42,7 +42,7 @@
         android:textAppearance="@style/TextViewSubtitle1"
         app:layout_constrainedWidth="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@android:id/checkbox"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toTopOf="parent"
         tools:maxLines="@string/grid_size_1"
diff --git a/app/src/main/res/layout/list_item_view_seekbar.xml b/app/src/main/res/layout/list_item_view_seekbar.xml
new file mode 100644
index 00000000..f6bfba90
--- /dev/null
+++ b/app/src/main/res/layout/list_item_view_seekbar.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+  ~ Copyright (c) 2019 Hemanth Savarala.
+  ~
+  ~ Licensed under the GNU General Public License v3
+  ~
+  ~ This is free software: you can redistribute it and/or modify it under
+  ~ the terms of the GNU General Public License as published by
+  ~  the Free Software Foundation either version 3 of the License, or (at your option) any later version.
+  ~
+  ~ This software is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+  ~ without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  ~ See the GNU General Public License for more details.
+  -->
+
+<androidx.constraintlayout.widget.ConstraintLayout 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="?attr/rectSelector"
+    android:minHeight="72dp"
+    android:orientation="horizontal"
+    android:padding="16dp"
+    app:layout_constraintEnd_toEndOf="parent"
+    app:layout_constraintStart_toStartOf="parent"
+    tools:ignore="PrivateResource">
+
+    <androidx.appcompat.widget.AppCompatImageView
+        android:id="@android:id/icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:tint="?colorOnSurface"
+        tools:srcCompat="@drawable/ic_telegram_white" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@android:id/title"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:textAppearance="@style/TextViewSubtitle1"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:maxLines="@string/grid_size_1"
+        tools:text="@tools:sample/lorem" />
+
+    <code.name.monkey.retromusic.views.BaselineGridTextView
+        android:id="@android:id/summary"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constrainedWidth="true"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
+        app:layout_constraintTop_toBottomOf="@android:id/title"
+        app:lineHeightHint="24sp"
+        tools:maxLines="2"
+        tools:text="@tools:sample/lorem/random" />
+
+    <androidx.constraintlayout.widget.Guideline
+        android:id="@+id/guideline_front_margin"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:orientation="vertical"
+        app:layout_constraintGuide_begin="52dp" />
+
+    <SeekBar
+        android:id="@+id/seekbar"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="16dp"
+        android:paddingStart="0dp"
+        android:paddingEnd="0dp"
+        android:thumbOffset="3dp"
+        app:layout_constraintEnd_toStartOf="@+id/seekbar_value"
+        app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
+        app:layout_constraintTop_toBottomOf="@android:id/summary" />
+
+    <TextView
+        android:id="@+id/seekbar_value"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="8dp"
+        android:layout_marginEnd="16dp"
+        android:textAppearance="@style/TextViewSubtitle1"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/seekbar"
+        tools:text="20" />
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/list_item_view_switch.xml b/app/src/main/res/layout/list_item_view_switch.xml
index fb69a2ac..d230e8b7 100644
--- a/app/src/main/res/layout/list_item_view_switch.xml
+++ b/app/src/main/res/layout/list_item_view_switch.xml
@@ -53,7 +53,6 @@
         android:paddingStart="0dp"
         android:paddingEnd="16dp"
         app:layout_constrainedWidth="true"
-        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@android:id/checkbox"
         app:layout_constraintStart_toStartOf="@+id/guideline_front_margin"
         app:layout_constraintTop_toBottomOf="@android:id/title"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index c4715a46..63db75f7 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -692,4 +692,6 @@
     <string name="your_account_data_is_only_used_for_authentication">Your account data is only used for authentication.</string>
 
     <string name="label_more_from">More from %s</string>
+    <string name="pref_dialog_corner_summary" >Adjust the bottom sheet dialog corners</string>
+    <string name="pref_filter_song_summary">Filter songs by length</string>
 </resources>
diff --git a/app/src/main/res/xml/pref_advanced.xml b/app/src/main/res/xml/pref_advanced.xml
index bb3f9b98..ea2c6640 100755
--- a/app/src/main/res/xml/pref_advanced.xml
+++ b/app/src/main/res/xml/pref_advanced.xml
@@ -8,16 +8,18 @@
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
             android:defaultValue="30"
             android:key="filter_song"
+            android:layout="@layout/list_item_view_seekbar"
             android:max="60"
             android:title="@string/pref_filter_song_title"
+            android:summary="@string/pref_filter_song_summary"
             app:enableCopying="true"
             app:icon="@drawable/ic_filter_song_white_24dp"
             app:showSeekBarValue="true" />
 
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESwitchPreference
             android:defaultValue="false"
-            android:layout="@layout/list_item_view_switch"
             android:key="pause_on_zero_volume"
+            android:layout="@layout/list_item_view_switch"
             android:summary="@string/pref_keep_pause_on_zero_volume_summary"
             android:title="@string/pref_keep_pause_on_zero_volume_title"
             app:enableCopying="true"
@@ -35,7 +37,9 @@
         <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
             android:defaultValue="16"
             android:key="dialog_corner"
+            android:layout="@layout/list_item_view_seekbar"
             android:max="50"
+            android:summary="@string/pref_dialog_corner_summary"
             android:title="@string/pref_dialog_corner_title"
             app:enableCopying="true"
             app:icon="@drawable/ic_rounded_corner"
diff --git a/app/src/main/res/xml/pref_now_playing_screen.xml b/app/src/main/res/xml/pref_now_playing_screen.xml
index e0a5c68e..30f46651 100644
--- a/app/src/main/res/xml/pref_now_playing_screen.xml
+++ b/app/src/main/res/xml/pref_now_playing_screen.xml
@@ -65,6 +65,7 @@
     <code.name.monkey.appthemehelper.common.prefs.supportv7.ATESeekBarPreference
         android:defaultValue="12"
         android:key="new_blur_amount"
+        android:layout="@layout/list_item_view_seekbar"
         android:max="25"
         android:summary="@string/pref_blur_amount_summary"
         android:title="@string/pref_blur_amount_title"