diff --git a/states/thunderbird/defaults.yaml b/states/thunderbird/defaults.yaml
index a53bc9b..a598808 100644
--- a/states/thunderbird/defaults.yaml
+++ b/states/thunderbird/defaults.yaml
@@ -8,3 +8,4 @@ thunderbird:
   version: "125.0"
   platform: "linux-x86_64"
   lang: "en-GB"
+  profile: default
diff --git a/states/thunderbird/install.sls b/states/thunderbird/install.sls
index e446809..22c9793 100644
--- a/states/thunderbird/install.sls
+++ b/states/thunderbird/install.sls
@@ -38,14 +38,6 @@ thunderbird-shortcut:
     - require:
       - archive: thunderbird-archive-extract
 
-thunderbird-icon:
-  file.managed:
-    - name: /usr/share/icons/thunderbird.png
-    - source: /usr/local/apps/thunderbird/chrome/icons/default/default128.png
-    - user: root
-    - group: root
-    - mode: 644
-
 thunderbird-cleanup:
   software.cleanup:
     - name: thunderbird
diff --git a/states/thunderbird/templates/thunderbird.desktop.j2 b/states/thunderbird/templates/thunderbird.desktop.j2
index 3633794..3955178 100644
--- a/states/thunderbird/templates/thunderbird.desktop.j2
+++ b/states/thunderbird/templates/thunderbird.desktop.j2
@@ -1,10 +1,11 @@
 ## Managed by PaulBSD Salt (https://git.paulbsd.com/paulbsd/paulbsd-salt)
+{%- from "thunderbird/map.jinja" import thunderbird with context %}
 [Desktop Entry]
 Encoding=UTF-8
 Version=1.0
 Name=Thunderbird
 Comment=Thunderbird mail client
-Exec=/usr/local/apps/thunderbird/thunderbird
+Exec=/usr/local/apps/thunderbird/thunderbird -p {{ thunderbird.profile }}
 Icon=/usr/local/apps/thunderbird/chrome/icons/default/default128.png
 Terminal=false
 StartupWMClass=Thunderbird