diff --git a/app/src/main/res/layout/notification.xml b/app/src/main/res/layout/notification.xml
index 9d2a7a71..c338ece1 100644
--- a/app/src/main/res/layout/notification.xml
+++ b/app/src/main/res/layout/notification.xml
@@ -14,125 +14,139 @@
   ~ limitations under the License
   -->
 
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:internal="http://schemas.android.com/apk/prv/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
     android:layout_width="match_parent"
     android:layout_height="64dp"
-    android:background="#00000000"
-    android:orientation="horizontal"
     internal:layout_maxHeight="64dp"
-    internal:layout_minHeight="64dp"
-    tools:ignore="DisableBaselineAlignment">
+    internal:layout_minHeight="64dp">
 
-    <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    <LinearLayout
+        android:id="@+id/root"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:internal="http://schemas.android.com/apk/prv/res/android"
-        android:id="@+id/icon_group"
-        android:layout_width="@dimen/notification_large_icon_width"
-        android:layout_height="@dimen/notification_large_icon_height"
-        android:layout_weight="0">
-
-        <ImageView
-            android:id="@+id/icon"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginBottom="12dp"
-            android:layout_marginEnd="12dp"
-            android:layout_marginStart="12dp"
-            android:layout_marginTop="12dp"
-            android:scaleType="centerInside"
-            tools:ignore="ContentDescription" />
-    </FrameLayout>
-
-    <LinearLayout
+        xmlns:tools="http://schemas.android.com/tools"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_gravity="fill_vertical"
-        android:layout_weight="1"
-        android:minHeight="@dimen/notification_large_icon_height"
-        android:orientation="vertical">
-
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:gravity="bottom"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-            android:textColor="@color/notification_content_color"
-            tools:ignore="NestedWeights" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.MaterialMusic.Notification"
-            android:textColor="@color/notification_secondary_content_color" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/media_actions"
-        android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:layout_gravity="center_vertical|end"
-        android:layout_marginEnd="6dp"
-        android:layout_marginRight="6dp"
-        android:layoutDirection="ltr"
+        android:background="#00000000"
+        android:baselineAligned="false"
         android:orientation="horizontal"
-        tools:ignore="UnusedAttribute">
-        <!-- media buttons will be added here -->
-        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/action_prev"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_weight="1"
-            android:background="@drawable/notification_selector"
-            android:gravity="center"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_previous_white_36dp"
-            tools:ignore="ContentDescription" />
+        tools:ignore="UselessParent">
 
-        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/action_play_pause"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_weight="1"
-            android:background="@drawable/notification_selector"
-            android:gravity="center"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_play_arrow_white_36dp"
-            tools:ignore="ContentDescription" />
+        <FrameLayout
+            android:id="@+id/icon_group"
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            xmlns:internal="http://schemas.android.com/apk/prv/res/android"
+            android:layout_width="@dimen/notification_large_icon_width"
+            android:layout_height="@dimen/notification_large_icon_height"
+            android:layout_weight="0">
 
-        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/action_next"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
+            <ImageView
+                android:id="@+id/icon"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:layout_marginBottom="12dp"
+                android:layout_marginEnd="12dp"
+                android:layout_marginStart="12dp"
+                android:layout_marginTop="12dp"
+                android:scaleType="centerInside"
+                tools:ignore="ContentDescription" />
+        </FrameLayout>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_gravity="fill_vertical"
             android:layout_weight="1"
-            android:background="@drawable/notification_selector"
-            android:gravity="center"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_next_white_36dp"
-            tools:ignore="ContentDescription" />
+            android:minHeight="@dimen/notification_large_icon_height"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:gravity="bottom"
+                android:singleLine="true"
+                android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
+                android:textColor="@color/notification_content_color"
+                tools:ignore="NestedWeights" />
+
+            <TextView
+                android:id="@+id/text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:textAppearance="@style/Theme.MaterialMusic.Notification"
+                android:textColor="@color/notification_secondary_content_color" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/media_actions"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_gravity="center_vertical|end"
+            android:layout_marginEnd="6dp"
+            android:layout_marginRight="6dp"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal"
+            tools:ignore="UnusedAttribute">
+            <!-- media buttons will be added here -->
+            <ImageButton
+                android:id="@+id/action_prev"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:background="@drawable/notification_selector"
+                android:gravity="center"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_skip_previous_white_36dp"
+                tools:ignore="ContentDescription" />
+
+            <ImageButton
+                android:id="@+id/action_play_pause"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:background="@drawable/notification_selector"
+                android:gravity="center"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_play_arrow_white_36dp"
+                tools:ignore="ContentDescription" />
+
+            <ImageButton
+                android:id="@+id/action_next"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:background="@drawable/notification_selector"
+                android:gravity="center"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_skip_next_white_36dp"
+                tools:ignore="ContentDescription" />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
+</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/notification_big.xml b/app/src/main/res/layout/notification_big.xml
index 93f8d49e..9d52593c 100644
--- a/app/src/main/res/layout/notification_big.xml
+++ b/app/src/main/res/layout/notification_big.xml
@@ -15,142 +15,154 @@
   -->
 
 <!-- Layout to be used with only max 3 actions. It has a much larger picture at the left side-->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<!--This FrameLayout IS necessary in order tp prevent fucking TouchWiz to interpret the "background="#00000000" as making the whole notification transparent-->
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/root"
-    android:background="#00000000"
     android:layout_width="match_parent"
     android:layout_height="128dp">
 
-    <ImageView
-        android:id="@+id/icon"
-        android:layout_width="@dimen/notification_big_image_size"
-        android:layout_height="@dimen/notification_big_image_size"
-        android:scaleType="centerCrop"
-        tools:ignore="ContentDescription" />
-
-    <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/action_quit"
-        style="@style/Widget.AppCompat.Button.Borderless"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
-        android:layout_alignParentEnd="true"
-        android:layout_alignParentRight="true"
-        android:layout_marginEnd="2dp"
-        android:layout_marginRight="2dp"
-        android:layout_marginTop="2dp"
-        android:background="@drawable/notification_selector"
-        android:src="@drawable/ic_close_white_24dp"
-        tools:ignore="ContentDescription" />
-
-    <LinearLayout
-        android:id="@+id/text_container"
+    <RelativeLayout
+        android:id="@+id/root"
         android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginLeft="12dp"
-        android:layout_marginStart="12dp"
-        android:layout_marginTop="8dp"
-        android:layout_toEndOf="@id/icon"
-        android:layout_toLeftOf="@id/action_quit"
-        android:layout_toRightOf="@id/icon"
-        android:layout_toStartOf="@id/action_quit"
-        android:minHeight="@dimen/notification_large_icon_height"
-        android:orientation="vertical">
+        android:layout_height="match_parent"
+        android:background="#00000000"
+        tools:ignore="UselessParent">
 
-        <TextView
-            android:id="@+id/title"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
-            android:textColor="@color/notification_content_color" />
-
-        <TextView
-            android:id="@+id/text"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginBottom="-1dp"
-            android:layout_marginTop="-1dp"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.MaterialMusic.Notification"
-            android:textColor="@color/notification_secondary_content_color" />
-
-        <TextView
-            android:id="@+id/text2"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:layout_weight="1"
-            android:ellipsize="marquee"
-            android:fadingEdge="horizontal"
-            android:singleLine="true"
-            android:textAppearance="@style/Theme.MaterialMusic.Notification"
-            android:textColor="@color/notification_secondary_content_color" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:id="@+id/media_actions"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:layout_below="@+id/text_container"
-        android:layout_marginEnd="12dp"
-        android:layout_marginStart="12dp"
-        android:layout_toEndOf="@id/icon"
-        android:layout_toRightOf="@id/icon"
-        android:layoutDirection="ltr"
-        android:orientation="horizontal"
-        tools:ignore="UnusedAttribute">
-        <!-- media buttons will be added here -->
-        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/action_prev"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_weight="1"
-            android:background="@drawable/notification_selector"
-            android:gravity="center"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_previous_white_36dp"
+        <ImageView
+            android:id="@+id/icon"
+            android:layout_width="@dimen/notification_big_image_size"
+            android:layout_height="@dimen/notification_big_image_size"
+            android:scaleType="centerCrop"
             tools:ignore="ContentDescription" />
 
-        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/action_play_pause"
+        <ImageButton
+            android:id="@+id/action_quit"
             style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="2dp"
+            xmlns:android="http://schemas.android.com/apk/res/android"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_alignParentEnd="true"
+            android:layout_alignParentRight="true"
+            android:layout_marginEnd="2dp"
             android:layout_marginRight="2dp"
-            android:layout_weight="1"
+            android:layout_marginTop="2dp"
             android:background="@drawable/notification_selector"
-            android:gravity="center"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_play_arrow_white_36dp"
+            android:src="@drawable/ic_close_white_24dp"
             tools:ignore="ContentDescription" />
 
-        <ImageButton xmlns:android="http://schemas.android.com/apk/res/android"
-            android:id="@+id/action_next"
-            style="@style/Widget.AppCompat.Button.Borderless"
-            android:layout_width="48dp"
-            android:layout_height="match_parent"
-            android:layout_marginLeft="2dp"
-            android:layout_marginRight="2dp"
-            android:layout_weight="1"
-            android:background="@drawable/notification_selector"
-            android:gravity="center"
-            android:padding="8dp"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_skip_next_white_36dp"
-            tools:ignore="ContentDescription" />
-    </LinearLayout>
-</RelativeLayout>
+        <LinearLayout
+            android:id="@+id/text_container"
+            android:layout_width="match_parent"
+            android:layout_height="64dp"
+            android:layout_marginBottom="8dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_marginTop="8dp"
+            android:layout_toEndOf="@id/icon"
+            android:layout_toLeftOf="@id/action_quit"
+            android:layout_toRightOf="@id/icon"
+            android:layout_toStartOf="@id/action_quit"
+            android:minHeight="@dimen/notification_large_icon_height"
+            android:orientation="vertical">
+
+            <TextView
+                android:id="@+id/title"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:textAppearance="@style/Theme.MaterialMusic.Notification.Title"
+                android:textColor="@color/notification_content_color" />
+
+            <TextView
+                android:id="@+id/text"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginBottom="-1dp"
+                android:layout_marginTop="-1dp"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:textAppearance="@style/Theme.MaterialMusic.Notification"
+                android:textColor="@color/notification_secondary_content_color" />
+
+            <TextView
+                android:id="@+id/text2"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:layout_weight="1"
+                android:ellipsize="marquee"
+                android:fadingEdge="horizontal"
+                android:singleLine="true"
+                android:textAppearance="@style/Theme.MaterialMusic.Notification"
+                android:textColor="@color/notification_secondary_content_color" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/media_actions"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_below="@+id/text_container"
+            android:layout_marginEnd="12dp"
+            android:layout_marginStart="12dp"
+            android:layout_toEndOf="@id/icon"
+            android:layout_toRightOf="@id/icon"
+            android:layoutDirection="ltr"
+            android:orientation="horizontal"
+            tools:ignore="UnusedAttribute">
+            <!-- media buttons will be added here -->
+            <ImageButton
+                android:id="@+id/action_prev"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:background="@drawable/notification_selector"
+                android:gravity="center"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_skip_previous_white_36dp"
+                tools:ignore="ContentDescription" />
+
+            <ImageButton
+                android:id="@+id/action_play_pause"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:background="@drawable/notification_selector"
+                android:gravity="center"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_play_arrow_white_36dp"
+                tools:ignore="ContentDescription" />
+
+            <ImageButton
+                android:id="@+id/action_next"
+                style="@style/Widget.AppCompat.Button.Borderless"
+                xmlns:android="http://schemas.android.com/apk/res/android"
+                android:layout_width="48dp"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="2dp"
+                android:layout_marginRight="2dp"
+                android:layout_weight="1"
+                android:background="@drawable/notification_selector"
+                android:gravity="center"
+                android:padding="8dp"
+                android:scaleType="fitCenter"
+                android:src="@drawable/ic_skip_next_white_36dp"
+                tools:ignore="ContentDescription" />
+        </LinearLayout>
+    </RelativeLayout>
+</FrameLayout>
\ No newline at end of file