diff --git a/i3/config b/i3/config
index ef26589..d59ad22 100644
--- a/i3/config
+++ b/i3/config
@@ -107,8 +107,6 @@ client.unfocused        $inactive-bg-color  $inactive-bg-color $inactive-text-co
 client.focused_inactive $inactive-bg-color  $inactive-bg-color $inactive-text-color $bg-color
 client.urgent           $urgent-bg-color    $urgent-bg-color   $text-color          $bg-color
 
-exec_always --no-startup-id feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
-
 # Window rules
 for_window [class="Pinentry"] floating enable
 for_window [class="Pavucontrol"] floating enable
diff --git a/scripts/4screens b/scripts/4screens
index 2dc43ed..08cb6e5 100755
--- a/scripts/4screens
+++ b/scripts/4screens
@@ -10,5 +10,3 @@ xrandr --output $BOTTOM_LEFT --primary --mode 1920x1080 --pos 0x1080 --rotate no
        --output $TOP_LEFT --mode 1920x1080 --pos 0x0 --rotate inverted \
        --output $TOP_RIGHT --mode 1920x1080 --pos 1920x0 --rotate inverted \
        --output $BOTTOM_RIGHT --mode 1920x1080 --pos 1920x1080 --rotate normal
-
-feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
diff --git a/scripts/dock-displays b/scripts/dock-displays
index fc18e86..ac7244f 100755
--- a/scripts/dock-displays
+++ b/scripts/dock-displays
@@ -15,5 +15,3 @@ MODENAME=${MODELINE%% *}
 xrandr --newmode $MODELINE 2>/dev/null || true
 xrandr --addmode $OUTPUT $MODENAME 2>/dev/null || true
 xrandr --output  $OUTPUT --mode $MODENAME
-
-feh --no-fehbg --no-xinerama --bg-fill $DOTFILES/lakesidesunrise.jpg
diff --git a/systemd/user/wallpaper.service b/systemd/user/wallpaper.service
index de56e80..7bde829 100644
--- a/systemd/user/wallpaper.service
+++ b/systemd/user/wallpaper.service
@@ -5,7 +5,10 @@ After=graphical-session.target
 
 [Service]
 Type=simple
-ExecStart=/bin/sh -c "xev -root -event randr 2>&1 | while awk -v RS='\n\n' '{exit;}'; do echo 'Applying wallpaper'; feh --no-fehbg --no-xinerama --bg-fill ~/.config/lakesidesunrise.jpg; done"
+Environment=FEH_OPTIONS="--no-fehbg --no-xinerama"
+Environment=WALLPAPER=/home/frebib/pictures/lakesidesunrise.jpg
+ExecStartPre=feh $FEH_OPTIONS --bg-fill $WALLPAPER
+ExecStart=/bin/sh -c "xev -root -event randr 2>&1 | while awk -v RS=\\n\\n '{exit;}'; do echo 'Applying wallpaper'; feh $FEH_OPTIONS --bg-fill $WALLPAPER; done"
 Restart=always
 
 [Install]