diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index e5baf8a8a..b5efba744 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -278,9 +278,9 @@
 
         <service
             android:name=".services.ClosingService"
-            android:stopWithTask="false"
             android:enabled="true"
-            android:exported="false"/>
+            android:exported="false"
+            android:stopWithTask="false" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
index 620d93eb9..3e0c725e5 100644
--- a/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
+++ b/app/src/main/java/com/github/libretube/fragments/PlayerFragment.kt
@@ -1,6 +1,5 @@
 package com.github.libretube.fragments
 
-import android.R.attr.mimeType
 import android.annotation.SuppressLint
 import android.app.NotificationManager
 import android.app.PictureInPictureParams
diff --git a/app/src/main/res/layout/chapter_column.xml b/app/src/main/res/layout/chapter_column.xml
index ff16c0e82..f323807ab 100644
--- a/app/src/main/res/layout/chapter_column.xml
+++ b/app/src/main/res/layout/chapter_column.xml
@@ -1,17 +1,17 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="100dp"
     android:layout_height="wrap_content"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_marginHorizontal="5dp"
     android:orientation="vertical">
 
     <com.google.android.material.imageview.ShapeableImageView
-        app:shapeAppearanceOverlay="@style/roundedImageViewRounded"
         android:id="@+id/chapter_image"
         android:layout_width="match_parent"
         android:layout_height="55dp"
-        android:src="@mipmap/ic_launcher" />
+        android:src="@mipmap/ic_launcher"
+        app:shapeAppearanceOverlay="@style/roundedImageViewRounded" />
 
     <TextView
         android:id="@+id/chapter_title"
diff --git a/app/src/main/res/layout/fragment_player.xml b/app/src/main/res/layout/fragment_player.xml
index 87d4a0557..769cac9e3 100644
--- a/app/src/main/res/layout/fragment_player.xml
+++ b/app/src/main/res/layout/fragment_player.xml
@@ -23,13 +23,14 @@
             android:id="@+id/linLayout"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:orientation="vertical"
-            android:animateLayoutChanges="true" >
+            android:animateLayoutChanges="true"
+            android:orientation="vertical">
 
             <RelativeLayout
                 android:id="@+id/player_title_layout"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_marginTop="5dp"
                 android:orientation="horizontal">
 
                 <TextView
@@ -153,12 +154,7 @@
 
                     <LinearLayout
                         android:id="@+id/relPlayer_share"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight=".25"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center"
-                        android:orientation="vertical">
+                        style="@style/PlayerActionsLayout">
 
                         <ImageView
                             android:layout_width="24dp"
@@ -173,12 +169,7 @@
 
                     <LinearLayout
                         android:id="@+id/relPlayer_download"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight=".25"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center"
-                        android:orientation="vertical">
+                        style="@style/PlayerActionsLayout">
 
                         <ImageView
                             android:layout_width="24dp"
@@ -196,12 +187,7 @@
 
                     <LinearLayout
                         android:id="@+id/relPlayer_vlc"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight=".25"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center"
-                        android:orientation="vertical">
+                        style="@style/PlayerActionsLayout">
 
                         <ImageView
                             android:layout_width="24dp"
@@ -218,12 +204,7 @@
 
                     <LinearLayout
                         android:id="@+id/save"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_weight=".25"
-                        android:background="?android:attr/selectableItemBackground"
-                        android:gravity="center"
-                        android:orientation="vertical">
+                        style="@style/PlayerActionsLayout">
 
                         <ImageView
                             android:layout_width="24dp"
diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
index 766a9256b..7b63c7620 100644
--- a/app/src/main/res/values/style.xml
+++ b/app/src/main/res/values/style.xml
@@ -63,4 +63,15 @@
 
     </style>
 
+    <style name="PlayerActionsLayout">
+
+        <item name="android:layout_width">0dp</item>
+        <item name="android:layout_height">wrap_content</item>
+        <item name="android:layout_weight">1</item>
+        <item name="android:background">?attr/selectableItemBackgroundBorderless</item>
+        <item name="android:gravity">center</item>
+        <item name="android:orientation">vertical</item>
+
+    </style>
+
 </resources>
\ No newline at end of file