diff --git a/app/src/main/java/org/schabi/newpipe/BackgroundPlayer.java b/app/src/main/java/org/schabi/newpipe/BackgroundPlayer.java
index dbca70d05..47afac5b1 100644
--- a/app/src/main/java/org/schabi/newpipe/BackgroundPlayer.java
+++ b/app/src/main/java/org/schabi/newpipe/BackgroundPlayer.java
@@ -305,13 +305,7 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
             view.setTextViewText(R.id.notificationArtist, channelName);
             view.setOnClickPendingIntent(R.id.notificationStop, stopPI);
             view.setOnClickPendingIntent(R.id.notificationPlayPause, playPI);
-
-            // todo: fix terrible lazy workaround
-            // sh*** because android 6.0 f**** around with z order when doing event handling
-            // Who ever designed android that way wanted to harm humanity.
-            if(android.os.Build.VERSION.SDK_INT < 23) {
-                view.setOnClickPendingIntent(R.id.notificationBackgroundButton, openDetailView);
-            }
+            view.setOnClickPendingIntent(R.id.notificationContent, openDetailView);
 
             //possibly found the expandedView problem,
             //but can't test it as I don't have a 5.0 device. -medavox
@@ -322,13 +316,8 @@ public class BackgroundPlayer extends Service /*implements MediaPlayer.OnPrepare
                 expandedView.setTextViewText(R.id.notificationArtist, channelName);
             expandedView.setOnClickPendingIntent(R.id.notificationStop, stopPI);
             expandedView.setOnClickPendingIntent(R.id.notificationPlayPause, playPI);
+            expandedView.setOnClickPendingIntent(R.id.notificationContent, openDetailView);
 
-            // todo: fix terrible lazy workaround
-            // sh*** because android 6.0 f**** around with z order when doing event handling
-            // Who ever designed android that way wanted to harm humanity.
-            if(android.os.Build.VERSION.SDK_INT < 23) {
-                expandedView.setOnClickPendingIntent(R.id.notificationBackgroundButton, openDetailView);
-            }
 
             noteBuilder.setCategory(Notification.CATEGORY_TRANSPORT);
 
diff --git a/app/src/main/res/layout-v23/player_notification.xml b/app/src/main/res/layout-v23/player_notification.xml
deleted file mode 100644
index ea8aa46e5..000000000
--- a/app/src/main/res/layout-v23/player_notification.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/content"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:gravity="center_vertical"
-    android:orientation="horizontal"
-    android:background="@color/background_notification_color"
-    tools:targetApi="jelly_bean">
-
-    <Button
-        android:id="@+id/notificationBackgroundButton"
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:background="@android:color/transparent" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="64dp"
-        android:gravity="center_vertical"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/notificationCover"
-            android:layout_width="64dp"
-            android:layout_height="64dp"
-            android:src="@drawable/dummy_thumbnail"
-            android:scaleType="centerCrop"/>
-
-        <LinearLayout
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="8dp"
-            android:layout_weight="1"
-            android:orientation="vertical" >
-
-            <TextView
-                android:id="@+id/notificationSongName"
-                style="@android:style/TextAppearance.StatusBar.EventContent.Title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:singleLine="true"
-                android:text="title" />
-
-            <TextView
-                android:id="@+id/notificationArtist"
-                style="@android:style/TextAppearance.StatusBar.EventContent"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:ellipsize="marquee"
-                android:singleLine="true"
-                android:text="artist" />
-        </LinearLayout>
-
-        <ImageButton
-            android:id="@+id/notificationPlayPause"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_margin="5dp"
-            android:background="#00ffffff"
-            android:clickable="true"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_pause_white_24dp" />
-
-        <ImageButton
-            android:id="@+id/notificationStop"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_margin="5dp"
-            android:background="#00ffffff"
-            android:clickable="true"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_close_white_24dp" />
-    </LinearLayout>
-
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-v23/player_notification_expanded.xml b/app/src/main/res/layout-v23/player_notification_expanded.xml
deleted file mode 100644
index e680d0099..000000000
--- a/app/src/main/res/layout-v23/player_notification_expanded.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/content"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:clickable="true"
-    android:background="@color/background_notification_color"
-    tools:targetApi="jelly_bean" >
-
-    <ImageView
-        android:id="@+id/notificationCover"
-        android:layout_width="128dp"
-        android:layout_height="128dp"
-        android:layout_marginRight="8dp"
-        android:src="@drawable/dummy_thumbnail"
-        android:scaleType="centerCrop"/>
-
-    <LinearLayout
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:layout_above="@+id/notificationButtons"
-        android:layout_toRightOf="@+id/notificationCover"
-        android:gravity="center_vertical"
-        android:orientation="vertical" >
-
-        <TextView
-            android:id="@+id/notificationSongName"
-            style="@android:style/TextAppearance.StatusBar.EventContent.Title"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginRight="40dp"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="title" />
-
-        <TextView
-            android:id="@+id/notificationArtist"
-            style="@android:style/TextAppearance.StatusBar.EventContent"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:ellipsize="marquee"
-            android:singleLine="true"
-            android:text="artist" />
-    </LinearLayout>
-
-    <ImageButton
-        android:id="@+id/notificationStop"
-        android:layout_width="30dp"
-        android:layout_height="30dp"
-        android:layout_alignParentRight="true"
-        android:layout_margin="5dp"
-        android:background="#00ffffff"
-        android:clickable="true"
-        android:scaleType="fitXY"
-        android:src="@drawable/ic_close_white_24dp" />
-
-    <RelativeLayout
-        android:id="@+id/notificationButtons"
-        android:layout_width="match_parent"
-        android:layout_height="50dp"
-        android:layout_alignBottom="@id/notificationCover"
-        android:layout_alignParentRight="true"
-        android:layout_toRightOf="@+id/notificationCover"
-        android:orientation="horizontal" >
-
-        <ImageButton
-            android:id="@+id/notificationPlayPause"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:background="#00ffffff"
-            android:clickable="true"
-            android:scaleType="fitXY"
-            android:src="@drawable/ic_pause_white_24dp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true" />
-    </RelativeLayout>
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/player_notification.xml b/app/src/main/res/layout/player_notification.xml
index 1bf284b65..64311e5c6 100644
--- a/app/src/main/res/layout/player_notification.xml
+++ b/app/src/main/res/layout/player_notification.xml
@@ -1,14 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/content"
+    android:id="@+id/notificationContent"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
     android:gravity="center_vertical"
     android:orientation="horizontal"
-    android:background="@color/background_notification_color"
-    tools:targetApi="jelly_bean">
+    android:background="@color/background_notification_color">
 
     <LinearLayout
         android:layout_width="match_parent"
diff --git a/app/src/main/res/layout/player_notification_expanded.xml b/app/src/main/res/layout/player_notification_expanded.xml
index b9fb92154..cd0ac924f 100644
--- a/app/src/main/res/layout/player_notification_expanded.xml
+++ b/app/src/main/res/layout/player_notification_expanded.xml
@@ -1,18 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/content"
+    android:id="@+id/notificationContent"
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:clickable="true"
-    android:background="@color/background_notification_color"
-    tools:targetApi="jelly_bean" >
-
-    <Button
-        android:id="@+id/notificationBackgroundButton"
-        android:layout_width="match_parent"
-        android:layout_height="128dp"
-        android:background="@android:color/transparent"/>
+    android:background="@color/background_notification_color">
 
     <ImageView
         android:id="@+id/notificationCover"