diff --git a/app/src/main/res/layout/app_widget_card.xml b/app/src/main/res/layout/app_widget_card.xml
index 4fe732f82..a14ab1992 100755
--- a/app/src/main/res/layout/app_widget_card.xml
+++ b/app/src/main/res/layout/app_widget_card.xml
@@ -1,98 +1,93 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="wrap_content"
+    android:layout_gravity="center"
+    android:background="@drawable/card"
+    android:orientation="horizontal">
+
+    <ImageView
+        android:id="@+id/image"
+        android:layout_width="@dimen/app_widget_card_image_size"
+        android:layout_height="@dimen/app_widget_card_image_size"
+        android:scaleType="centerInside"
+        tools:ignore="ContentDescription"
+        tools:src="@drawable/default_audio_art" />
 
     <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:background="@drawable/card"
+        android:id="@+id/media_titles"
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_marginRight="8dp"
+        android:layout_weight="1"
+        android:gravity="center"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/title"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewBody1"
+            android:textColor="@color/ate_primary_text_light"
+            tools:text="Title" />
+
+        <TextView
+            android:id="@+id/text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="4dp"
+            android:gravity="center_vertical"
+            android:singleLine="true"
+            android:textAppearance="@style/TextViewCaption"
+            android:textColor="@color/ate_secondary_text_light"
+            tools:text="Text" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/media_actions"
+        android:layout_width="@dimen/app_widget_card_buttons_width"
+        android:layout_height="match_parent"
+        android:layout_gravity="center_vertical"
+        android:layout_margin="4dp"
+        android:focusable="true"
+        android:gravity="center"
+        android:layoutDirection="ltr"
         android:orientation="horizontal">
 
-        <ImageView
-            android:id="@+id/image"
-            android:layout_width="@dimen/app_widget_card_image_size"
-            android:layout_height="@dimen/app_widget_card_image_size"
-            android:scaleType="centerInside"
-            tools:ignore="ContentDescription"
-            tools:src="@drawable/default_audio_art" />
-
-        <LinearLayout
-            android:id="@+id/media_titles"
+        <ImageButton
+            android:id="@+id/button_prev"
             android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
             android:layout_weight="1"
-            android:gravity="center"
-            android:orientation="vertical">
+            android:background="@drawable/widget_selector_light"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_skip_previous"
+            tools:tint="@color/ate_secondary_text_light" />
 
-            <TextView
-                android:id="@+id/title"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewBody1"
-                android:textColor="@color/ate_primary_text_light"
-                tools:text="Title" />
-
-            <TextView
-                android:id="@+id/text"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="4dp"
-                android:gravity="center_vertical"
-                android:singleLine="true"
-                android:textAppearance="@style/TextViewCaption"
-                android:textColor="@color/ate_secondary_text_light"
-                tools:text="Text" />
-
-        </LinearLayout>
-
-        <LinearLayout
-            android:id="@+id/media_actions"
-            android:layout_width="@dimen/app_widget_card_buttons_width"
+        <ImageButton
+            android:id="@+id/button_toggle_play_pause"
+            android:layout_width="0dp"
             android:layout_height="match_parent"
-            android:layout_gravity="center_vertical"
-            android:layout_margin="4dp"
-            android:focusable="true"
-            android:gravity="center"
-            android:layoutDirection="ltr"
-            android:orientation="horizontal">
+            android:layout_weight="1"
+            android:background="@drawable/widget_selector_light"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_play_arrow"
+            tools:tint="@color/ate_secondary_text_light" />
 
-            <ImageButton
-                android:id="@+id/button_prev"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@drawable/widget_selector_light"
-                tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_skip_previous"
-                tools:tint="@color/ate_secondary_text_light" />
+        <ImageButton
+            android:id="@+id/button_next"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:background="@drawable/widget_selector_light"
+            tools:ignore="ContentDescription"
+            tools:src="@drawable/ic_skip_next"
+            tools:tint="@color/ate_secondary_text_light" />
 
-            <ImageButton
-                android:id="@+id/button_toggle_play_pause"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@drawable/widget_selector_light"
-                tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_play_arrow"
-                tools:tint="@color/ate_secondary_text_light" />
-
-            <ImageButton
-                android:id="@+id/button_next"
-                android:layout_width="0dp"
-                android:layout_height="match_parent"
-                android:layout_weight="1"
-                android:background="@drawable/widget_selector_light"
-                tools:ignore="ContentDescription"
-                tools:src="@drawable/ic_skip_next"
-                tools:tint="@color/ate_secondary_text_light" />
-
-        </LinearLayout>
     </LinearLayout>
-</FrameLayout>
+</LinearLayout>
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 c0b591a21..c823c9f3e 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
@@ -1,82 +1,75 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:orientation="vertical"
     android:paddingStart="24dp"
     android:paddingEnd="24dp"
     android:paddingBottom="32dp">
 
+    <FrameLayout
+        android:id="@+id/volumeFragmentContainer"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp" />
+
+    <include
+        android:id="@+id/media_button"
+        layout="@layout/media_button" />
+
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom"
-        android:orientation="vertical"
-        tools:ignore="MissingPrefix">
-
-        <FrameLayout
-            android:id="@+id/volumeFragmentContainer"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp" />
-
-        <include
-            android:id="@+id/media_button"
-            layout="@layout/media_button" />
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:gravity="center_vertical"
-            android:orientation="horizontal"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp">
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/songCurrentProgress"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:textStyle="bold"
-                tools:text="22.00" />
-
-            <com.google.android.material.textview.MaterialTextView
-                android:id="@+id/songTotalTime"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="0"
-                android:paddingStart="8dp"
-                android:paddingEnd="8dp"
-                android:textStyle="bold"
-                tools:text="22.00" />
-        </LinearLayout>
-
-        <androidx.appcompat.widget.AppCompatSeekBar
-            android:id="@+id/progressSlider"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:maxHeight="2dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:progressDrawable="@drawable/color_progress_seek"
-            tools:progress="20" />
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp">
 
         <com.google.android.material.textview.MaterialTextView
-            android:id="@+id/songInfo"
-            android:layout_width="match_parent"
+            android:id="@+id/songCurrentProgress"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxLines="1"
-            android:paddingStart="16dp"
-            android:paddingTop="8dp"
-            android:paddingEnd="16dp"
-            android:paddingBottom="8dp"
-            android:textSize="12sp"
-            tools:text="@tools:sample/lorem/random" />
+            android:layout_weight="1"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:textStyle="bold"
+            tools:text="22.00" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/songTotalTime"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="0"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:textStyle="bold"
+            tools:text="22.00" />
     </LinearLayout>
-</FrameLayout>
\ No newline at end of file
+
+    <androidx.appcompat.widget.AppCompatSeekBar
+        android:id="@+id/progressSlider"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:maxHeight="2dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:progressDrawable="@drawable/color_progress_seek"
+        tools:progress="20" />
+
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/songInfo"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:ellipsize="end"
+        android:gravity="center"
+        android:maxLines="1"
+        android:paddingStart="16dp"
+        android:paddingTop="8dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="8dp"
+        android:textSize="12sp"
+        tools:text="@tools:sample/lorem/random" />
+</LinearLayout>
\ No newline at end of file