diff --git a/app/javascript/images/mailer-new/heading/LICENSE b/app/javascript/images/mailer-new/heading/LICENSE
new file mode 100644
index 0000000000..974db1ac4b
--- /dev/null
+++ b/app/javascript/images/mailer-new/heading/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/javascript/images/mailer-new/heading/README.md b/app/javascript/images/mailer-new/heading/README.md
new file mode 100644
index 0000000000..ecd4b949e7
--- /dev/null
+++ b/app/javascript/images/mailer-new/heading/README.md
@@ -0,0 +1 @@
+Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
diff --git a/app/javascript/images/mailer-new/welcome/btn-app-store.png b/app/javascript/images/mailer-new/store-icons/btn-app-store.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/btn-app-store.png
rename to app/javascript/images/mailer-new/store-icons/btn-app-store.png
diff --git a/app/javascript/images/mailer-new/welcome/btn-google-play.png b/app/javascript/images/mailer-new/store-icons/btn-google-play.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/btn-google-play.png
rename to app/javascript/images/mailer-new/store-icons/btn-google-play.png
diff --git a/app/javascript/images/mailer-new/welcome-icons/LICENSE b/app/javascript/images/mailer-new/welcome-icons/LICENSE
new file mode 100644
index 0000000000..974db1ac4b
--- /dev/null
+++ b/app/javascript/images/mailer-new/welcome-icons/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2020-2024 Paweł Kuna
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/app/javascript/images/mailer-new/welcome-icons/README.md b/app/javascript/images/mailer-new/welcome-icons/README.md
new file mode 100644
index 0000000000..ecd4b949e7
--- /dev/null
+++ b/app/javascript/images/mailer-new/welcome-icons/README.md
@@ -0,0 +1 @@
+Images in this folder are based on [Tabler.io icons](https://tabler.io/icons).
diff --git a/app/javascript/images/mailer-new/welcome/apps_step-off.png b/app/javascript/images/mailer-new/welcome-icons/apps_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/apps_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/apps_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/apps_step-on.png b/app/javascript/images/mailer-new/welcome-icons/apps_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/apps_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/apps_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/edit_profile_step-off.png b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/edit_profile_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/edit_profile_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/edit_profile_step-on.png b/app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/edit_profile_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/edit_profile_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/follow_step-off.png b/app/javascript/images/mailer-new/welcome-icons/follow_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/follow_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/follow_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/follow_step-on.png b/app/javascript/images/mailer-new/welcome-icons/follow_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/follow_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/follow_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/post_step-off.png b/app/javascript/images/mailer-new/welcome-icons/post_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/post_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/post_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/post_step-on.png b/app/javascript/images/mailer-new/welcome-icons/post_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/post_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/post_step-on.png
diff --git a/app/javascript/images/mailer-new/welcome/share_step-off.png b/app/javascript/images/mailer-new/welcome-icons/share_step-off.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/share_step-off.png
rename to app/javascript/images/mailer-new/welcome-icons/share_step-off.png
diff --git a/app/javascript/images/mailer-new/welcome/share_step-on.png b/app/javascript/images/mailer-new/welcome-icons/share_step-on.png
similarity index 100%
rename from app/javascript/images/mailer-new/welcome/share_step-on.png
rename to app/javascript/images/mailer-new/welcome-icons/share_step-on.png
diff --git a/app/views/application/mailer/_checklist.html.haml b/app/views/application/mailer/_checklist.html.haml
index 31cd5bf35d..324fd7e6f8 100644
--- a/app/views/application/mailer/_checklist.html.haml
+++ b/app/views/application/mailer/_checklist.html.haml
@@ -16,7 +16,7 @@
                           = image_tag frontend_asset_url('images/mailer-new/welcome/checkbox-off.png'), alt: '', width: 20, height: 20
                       %td.email-checklist-icons-step-td
                         - if defined?(key)
-                          = image_tag frontend_asset_url("images/mailer-new/welcome/#{key}-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
+                          = image_tag frontend_asset_url("images/mailer-new/welcome-icons/#{key}-#{checked ? 'on' : 'off'}.png"), alt: '', width: 40, height: 40
                 %td.email-checklist-text-td
                   .email-desktop-flex
                     /[if mso]
@@ -31,8 +31,8 @@
                     %div
                       - if defined?(show_apps_buttons) && show_apps_buttons
                         .email-welcome-apps-btns
-                          = link_to image_tag(frontend_asset_url('images/mailer-new/welcome/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
-                          = link_to image_tag(frontend_asset_url('images/mailer-new/welcome/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-app-store.png'), alt: t('user_mailer.welcome.apps_ios_action'), width: 120, height: 40), 'https://apps.apple.com/app/mastodon-for-iphone-and-ipad/id1571998974'
+                          = link_to image_tag(frontend_asset_url('images/mailer-new/store-icons/btn-google-play.png'), alt: t('user_mailer.welcome.apps_android_action'), width: 120, height: 40), 'https://play.google.com/store/apps/details?id=org.joinmastodon.android'
                       - elsif defined?(button_text) && defined?(button_url) && defined?(checked) && !checked
                         = render 'application/mailer/button', text: button_text, url: button_url, has_arrow: false
                     /[if mso]