diff --git a/etc/raspberrypios/controller-logo.png b/etc/raspberrypios/controller-logo.png
new file mode 100644
index 00000000..85946a99
Binary files /dev/null and b/etc/raspberrypios/controller-logo.png differ
diff --git a/etc/raspberrypios/controller.desktop b/etc/raspberrypios/controller.desktop
new file mode 100644
index 00000000..13ee500f
--- /dev/null
+++ b/etc/raspberrypios/controller.desktop
@@ -0,0 +1,6 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=WROLPi Controller
+Type=Link
+URL=http://127.0.0.1:8087
+Icon=/opt/wrolpi/etc/raspberrypios/controller-logo.png
diff --git a/repair.sh b/repair.sh
index f0b6f8ad..0a25e0fc 100755
--- a/repair.sh
+++ b/repair.sh
@@ -194,6 +194,19 @@ chown -R wrolpi:wrolpi /home/wrolpi /opt/wrolpi*
 cp /opt/wrolpi/etc/raspberrypios/motd/30-wrolpi.motd /etc/update-motd.d/30-wrolpi
 chmod +x /etc/update-motd.d/*
 
+# Copy desktop shortcuts to existing users (new users get them from /etc/skel).
+if [[ ${rpi} == true ]]; then
+  for user_home in /home/wrolpi /home/pi; do
+    if [ -d "${user_home}/Desktop" ]; then
+      cp /opt/wrolpi/etc/raspberrypios/*.desktop "${user_home}/Desktop/"
+      chown -R "$(basename ${user_home})":"$(basename ${user_home})" "${user_home}/Desktop/"
+    fi
+  done
+  # Update skeleton for future users.
+  mkdir -p /etc/skel/Desktop
+  cp /opt/wrolpi/etc/raspberrypios/*.desktop /etc/skel/Desktop/
+fi
+
 systemctl restart renderd
 systemctl restart wrolpi-help
 systemctl start wrolpi.target