diff --git a/install b/install
index f7be6615..f1c70041 100755
--- a/install
+++ b/install
@@ -193,7 +193,7 @@ if [ "$(id -u)" == "0" ]; then
 	# Desktop entries
 	mkdir -vp /usr/local/share/applications/
 	# These are bound to exist on my systems
-	cp -v local/share/applications/{a-signal,a-syncplay,plasma-update,a-firefox-cups,a-firefox-gmail,a-firefox,foot-ncdu,foot-systemd-inhibit}.desktop /usr/local/share/applications/
+	cp -v local/share/applications/{a-signal,a-syncplay,plasma-update,a-firefox-cups,a-firefox-gmail,a-firefox,a-thunderbird,foot-ncdu,foot-systemd-inhibit}.desktop /usr/local/share/applications/
 	if [ -f "/usr/bin/vivaldi-stable" ]; then
 		cp -v local/share/applications/{a-vivaldi,vivaldi-{apps,youtube-music,yle-areena,discord,gmail,gmessages,google-calendar,telegram,twitch,whatsapp,mtv-katsomo,radioplayer,ruutu}}.desktop /usr/local/share/applications/
 	elif [ -f "/usr/bin/chromium-browser" ]; then
@@ -533,6 +533,7 @@ else
 		fi
 		# scripts repo
 		ln -nsfv /usr/local/share/applications/a-firefox.desktop $DESKTOP/
+		ln -nsfv /usr/local/share/applications/a-thunderbird.desktop $DESKTOP/
 		if [ -f "/usr/bin/vivaldi-stable" ]; then
 			ln -nsfv /usr/local/share/applications/a-vivaldi.desktop $DESKTOP/
 			if [ -f /etc/chromium/policies/managed/aminda-pwa.json ]; then
@@ -597,7 +598,11 @@ else
 		ln -nsfv /var/lib/flatpak/exports/share/applications/com.github.wwmm.easyeffects.desktop $DESKTOP/
 		ln -nsfv /var/lib/flatpak/exports/share/applications/org.fedoraproject.MediaWriter.desktop $DESKTOP/
 		ln -nsfv /var/lib/flatpak/exports/share/applications/org.jitsi.jitsi-meet.desktop $DESKTOP/
-		ln -nsfv /var/lib/flatpak/exports/share/applications/info.mumble.Mumble.desktop $DESKTOP/
+		if [ -f "/usr/share/applications/info.mumble.Mumble.desktop" ]; then
+			ln -nsfv /usr/share/applications/info.mumble.Mumble.desktop $DESKTOP/
+		else
+			ln -nsfv /var/lib/flatpak/exports/share/applications/info.mumble.Mumble.desktop $DESKTOP/
+		fi
 		# snaps
 		# No libdvdcss!
 		#ln -nsfv /var/lib/snapd/desktop/applications/vlc_vlc.desktop $DESKTOP/
@@ -613,6 +618,15 @@ else
 	elif [ -f "/usr/share/icons/HighContrast/256x256/apps/firefox.png" ]; then
 		ln -nsfv /usr/share/icons/HighContrast/256x256/apps/firefox.png ~/.local/share/icons/hicolor/128x128/apps/a-firefox.png
 	fi
+	# Ensure a-thunderbird.desktop has an icon
+	mkdir -p $HOME/.local/share/icons/hicolor/128x128/apps/
+	if [ -f "$HOME/.local/thunderbird/browser/chrome/icons/default/default128.png" ]; then
+		ln -nsfv $HOME/.local/thunderbird/browser/chrome/icons/default/default128.png ~/.local/share/icons/hicolor/128x128/apps/a-thunderbird.png
+	elif [ -f "/usr/share/icons/hicolor/256x256/apps/thunderbird.png" ]; then
+		ln -nsfv /usr/share/icons/hicolor/256x256/apps/thunderbird.png ~/.local/share/icons/hicolor/128x128/apps/a-thunderbird.png
+	elif [ -f "/usr/share/icons/HighContrast/256x256/apps/thunderbird.png" ]; then
+		ln -nsfv /usr/share/icons/HighContrast/256x256/apps/thunderbird.png ~/.local/share/icons/hicolor/128x128/apps/a-thunderbird.png
+	fi
 
 	# Remove dead symlinks
 	if hash symlinks 2> /dev/null; then