diff --git a/bin/i3-companion b/bin/i3-companion
index b9bd548..8ac8e24 100755
--- a/bin/i3-companion
+++ b/bin/i3-companion
@@ -43,6 +43,7 @@ application_icons = {
     "chromium": icon(3, ""),
     "d-feet": icon(2, ""),
     "darktable": icon(2, ""),
+    "deezer": icon(3, ""),
     "discord": icon(3, ""),
     "draw.io": icon(2, ""),
     "emacs": icon(2, ""),
@@ -58,6 +59,7 @@ application_icons = {
     "jitsi meet": icon(2, ""),
     "libreoffice": icon(2, "📄"),
     "mednafen": icon(2, ""),
+    "mellowplayer3": icon(3, ""),
     "mpv": icon(2, ""),
     "nestopia": icon(2, ""),
     "org.gnome.maps": icon(2, ""),
diff --git a/bin/rofi-mediaplayer b/bin/rofi-mediaplayer
index ea94f76..0e95b09 100755
--- a/bin/rofi-mediaplayer
+++ b/bin/rofi-mediaplayer
@@ -41,7 +41,7 @@ media-playback-pause      Pause
 media-playback-stop       Stop
 go-next                   Next track
 multimedia-volume-control Open mixer panel
-com.spotify.Client        Open ${Mediaplayer}
+com.gitlab.ColinDuquesnoy.MellowPlayer Open ${Mediaplayer}
 EOF
 
         # Player status
diff --git a/bin/spotify-clean b/bin/spotify-clean
deleted file mode 100755
index 924adb3..0000000
--- a/bin/spotify-clean
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-# Kill all spotify streams, except the most recent one.
-
-pactl list short clients \
-    | awk '($3 == "spotify") {print $1}' \
-    | head -n-1 \
-    | xargs -rn1 pacmd kill-client
diff --git a/config b/config
index b839fb2..f12ca6c 100644
--- a/config
+++ b/config
@@ -6,7 +6,7 @@ set $down k
 set $left j
 set $right semicolon
 set $term vbeterm
-set $mediaplayer spotify
+set $mediaplayer MellowPlayer3
 set $borderpx 3
 
 font pango:Iosevka Aile 9
diff --git a/dotfiles/systemd/spotify-clean.service b/dotfiles/systemd/spotify-clean.service
deleted file mode 100644
index 190068c..0000000
--- a/dotfiles/systemd/spotify-clean.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Clean spotify extra PulseAudio streams
-After=sound.target
-
-[Service]
-ExecStart=%h/.config/i3/bin/spotify-clean
-Type=oneshot
-RemainAfterExit=false
diff --git a/dotfiles/systemd/spotify-clean.timer b/dotfiles/systemd/spotify-clean.timer
deleted file mode 100644
index 2bd5c80..0000000
--- a/dotfiles/systemd/spotify-clean.timer
+++ /dev/null
@@ -1,7 +0,0 @@
-[Unit]
-Description=Timer for cleaning spotify extra PA streams
-After=pulseaudio.socket
-
-[Timer]
-OnUnitActiveSec=1h
-OnStartupSec=1h
diff --git a/dotfiles/systemd/xsession.target b/dotfiles/systemd/xsession.target
index fd198d5..80ff1b6 100644
--- a/dotfiles/systemd/xsession.target
+++ b/dotfiles/systemd/xsession.target
@@ -8,7 +8,6 @@ Wants=picom.service
 Wants=policykit-agent.service
 Wants=pulseaudio.socket
 Wants=redshift.service
-Wants=spotify-clean.timer
 Wants=ssh-agent.service
 Wants=weather.service
 Wants=weather.timer