diff --git a/opensuse-welcome-launcher.changes b/opensuse-welcome-launcher.changes
index 7f4c1ec..abbdb9b 100644
--- a/opensuse-welcome-launcher.changes
+++ b/opensuse-welcome-launcher.changes
@@ -1,3 +1,39 @@
+-------------------------------------------------------------------
+Tue Aug 19 07:46:04 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Change autostart to always launch, but internally decide if we
+  already showed the greeter. This allows us to bump the version
+  for next Leap versions and have the welcome screen show at least
+  once every while.
+
+-------------------------------------------------------------------
+Mon Aug 18 15:30:12 UTC 2025 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Ensure ${HOME}/.config/autostart exists before copying to it
+  (boo#1248197).
+- Install autostart to /usr/etc/xdg/autosttart
+- Build as noarch: this package only consists of a shell script.
+
+-------------------------------------------------------------------
+Tue Jul 29 21:22:16 UTC 2025 - Lubos Kocman <lubos.kocman@suse.com>
+
+- For the transition period let's limit scope to executing
+  opensuse-welcome. For the time being make
+  opensuse-welcome recommended as we replace it in pattern-base.
+
+- Use Hidden=True for .config/autostart
+  Introduce org.opensuse.opensuse_welcome_launcher-hidden.desktop
+
+- Remove legacy org.opensuse.opensuse_welcome.desktop
+  from .config/autostart now when it was dropped from
+  opensuse-welcome
+
+- Add svg files from opensuse-welcome for icon reference in
+  .desktop files. Also adds Buildrequires on hicolor icons
+
+- Related to code-o-o#leap/features/208
+ 
+
 -------------------------------------------------------------------
 Fri Jun 13 12:18:41 UTC 2025 - Lubos Kocman <lubos.kocman@suse.com>
 
diff --git a/opensuse-welcome-launcher.sh b/opensuse-welcome-launcher.sh
index 38c5f9a..c682e98 100644
--- a/opensuse-welcome-launcher.sh
+++ b/opensuse-welcome-launcher.sh
@@ -3,15 +3,25 @@
 # Mimic behavior of old openSUSE-welcome with "Show on next boot" unchecked
 
 LAUNCHER_XDG_FILE=org.opensuse.opensuse_welcome_launcher.desktop
-ORIG_XDG_FILE=/org.opensuse.opensuse_welcome.desktop
+LEGACY_XDG_FILE=org.opensuse.opensuse_welcome.desktop
+OSWL_VERSION_TAG=1
 
-# Override also the original's openSUSE-welcome startup
-if [[ -e "/etc/xdg/autostart/${LAUNCHER_XDG_FILE}" && \
-      ! -e "$HOME/.config/autostart/${LAUNCHER_XDG_FILE}" ]]; then
-    cp /etc/xdg/autostart/${LAUNCHER_XDG_FILE} ${HOME}/.config/autostart/${LAUNCHER_XDG_FILE}
-    cp /etc/xdg/autostart/${LAUNCHER_XDG_FILE} ${HOME}/.config/autostart/${ORIG_XDG_FILE}
+# The legacy autostart was dropped let's remove it from homedir
+if [[ -e "$HOME/.config/autostart/${LEGACY_XDG_FILE}" && \
+      ! -e "/etc/xdg/autostart/${LEGACY_XDG_FILE}" ]]; then
+    rm -f "$HOME/.config/autostart/${LEGACY_XDG_FILE}"
 fi
 
+# Show only once per version
+if [ -f ${HOME}/.local/share/opensuse-welcome/launched ]; then
+  if [ "$(cat ${HOME}/.local/share/opensuse-welcome/launched)" = "${OSWL_VERSION_TAG}" ]; then
+    # We have already shown the laucher at this version - skipping
+    exit 0
+  fi
+fi
+
+test -d ${HOME}/.local/share/opensuse-welcome || mkdir -p ${HOME}/.local/share/opensuse-welcome
+echo "${OSWL_VERSION_TAG}" > ${HOME}/.local/share/opensuse-welcome/launched
 
 detect_de() {
     if [ -n "$XDG_CURRENT_DESKTOP" ]; then
@@ -38,9 +48,11 @@ if [ -z "$welcome_binary" ]; then
     welcome_binary=$(command -v opensuse-welcome)
 fi
 
+# XXX: hack for the initial integration
+# keep legacy behavior and only trigger opensuse-welcome
+# rest would be the next step
+welcome_binary=$(command -v opensuse-welcome)
+
 if [ ! -z "$welcome_binary" ]; then
     $welcome_binary
-else
-    echo "No matching welcome tool is available; however, we can't leave it like this!"
-    echo "So let me at least say: Welcome, and have a lot of fun!"
 fi
diff --git a/opensuse-welcome-launcher.spec b/opensuse-welcome-launcher.spec
index c1d8a06..2a274ca 100644
--- a/opensuse-welcome-launcher.spec
+++ b/opensuse-welcome-launcher.spec
@@ -16,7 +16,6 @@
 #
 
 
-
 Name:           opensuse-welcome-launcher
 Version:        1.0
 Release:        0
@@ -27,23 +26,45 @@ URL:            https://github.com/openSUSE/openSUSE-welcome
 Source0:        opensuse-welcome-launcher.sh
 # Original filename was org.opensuse.opensuse_welcome.desktop
 Source1:        org.opensuse.opensuse_welcome_launcher.desktop
-Suggests:       opensuse-welcome
+Source3:        org.opensuse.opensuse_welcome_launcher.svg
+Source4:        org.opensuse.opensuse_welcome_launcher-symbolic.svg
+Recommends:     opensuse-welcome >= 0.1.10
+BuildRequires:  hicolor-icon-theme
+BuildRequires:  hicolor-icon-theme-branding-openSUSE
+BuildArch: noarch
 
 %description
 A simple wrapper to spawn relevant welcome tool on given desktop
 
 %prep
 
-%install
-mkdir -p %{buildroot}%{_bindir}
-mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
+%build
 
+%install
+# Create necessary directories
+mkdir -p %{buildroot}%{_bindir}
+mkdir -p %{buildroot}%{_distconfdir}/xdg/autostart
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_datadir}/opensuse-welcome-launcher
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/scalable/apps
+mkdir -p %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps
+
+# Install launcher script
 install -m 0755 %{SOURCE0} %{buildroot}%{_bindir}/opensuse-welcome-launcher
-install -m 0644 %{SOURCE1} %{buildroot}%{_sysconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop
+
+# Install desktop entries
+install -m 0644 %{SOURCE1} %{buildroot}%{_distconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop
+install -m 0644 %{SOURCE1} %{buildroot}%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop
+
+# Install icons
+install -m 0644 %{SOURCE3} %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg
+install -m 0644 %{SOURCE4} %{buildroot}%{_datadir}/icons/hicolor/symbolic/apps/org.opensuse.opensuse_welcome_launcher-symbolic.svg
 
 %files
 %{_bindir}/opensuse-welcome-launcher
-%{_sysconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop
-
-
+%{_distconfdir}/xdg/autostart/org.opensuse.opensuse_welcome_launcher.desktop
+%{_datadir}/applications/org.opensuse.opensuse_welcome_launcher.desktop
+%dir %{_datadir}/opensuse-welcome-launcher
+%{_datadir}/icons/hicolor/scalable/apps/org.opensuse.opensuse_welcome_launcher.svg
+%{_datadir}/icons/hicolor/symbolic/apps/org.opensuse.opensuse_welcome_launcher-symbolic.svg
 %changelog
diff --git a/org.opensuse.opensuse_welcome_launcher-symbolic.svg b/org.opensuse.opensuse_welcome_launcher-symbolic.svg
new file mode 100644
index 0000000..7611db4
--- /dev/null
+++ b/org.opensuse.opensuse_welcome_launcher-symbolic.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
+<path d="m 0,0 c 0,5.3333333 0,10.666667 0,16 4.6666667,0 9.3333333,0 14,0 1.108,0 2,-0.892 2,-2 v -1 c 0,1.108 -0.892,2 -2,2 -4.3333333,0 -8.6666667,0 -13,0 V 14 H 2 V 0 Z m 3,0 v 14 h 11 c 1.108,0 2,-0.892 2,-2 V 2 C 16,0.892 15.108,0 14,0 Z m 6,3 c 2.209141,-1.28e-5 4.000008,1.7908542 4,4 8e-6,2.209146 -1.790859,4.000013 -4,4 -1.1550633,-0.0014 -2.2531461,-0.501988 -3.0117188,-1.3730469 0.2882101,-0.20849 0.7608869,-0.1554477 1.3417969,-0.089844 0.28306,0.033 0.6057932,0.069172 0.9394531,0.076172 0.93159,0.0059 1.9342748,-0.1650068 2.5527348,-0.4355468 0.40011,-0.17389 0.656416,-0.2900669 0.816406,-0.4355469 0.05757,-0.04768 0.08804,-0.1256844 0.11914,-0.2089844 l 0.02149,-0.054687 c 0.0259,-0.06751 0.06338,-0.2091093 0.08008,-0.2871094 0.0068,-0.0343 0.01473,-0.067844 -0.01367,-0.089844 -0.0259,-0.0201 -0.08594,0.015625 -0.08594,0.015625 -0.27158,0.16346 -0.949255,0.4731281 -1.583985,0.4863281 C 9.3877256,8.6194134 7.79042,7.80465 7.625,7.71875 7.51427,7.45511 7.4033256,7.1926575 7.2910156,6.9296875 c 1.14233,0.75267 2.0891729,1.1682219 2.8144534,1.2324219 0.80744,0.07192 1.437757,-0.3694544 1.710937,-0.5527344 0.03575,-0.0238 0.07072,-0.050572 0.103516,-0.076172 0.0058,-0.0046 0.01958,-0.016244 0.01758,-0.027344 -0.04529,-0.28302 -0.466016,-1.654305 -0.785156,-1.984375 -0.08793,-0.0899 -0.158211,-0.1783188 -0.300782,-0.2617188 -1.154509,-0.67277 -3.8931639,-1.0790562 -4.0214839,-1.0976562 0,0 -0.012484,-0.00314 -0.021484,0.00586 -0.007,0.0068 -0.00977,0.019531 -0.00977,0.019531 0,0 -0.00972,0.5673594 -0.011719,0.6308594 C 6.6836917,4.7836094 6.3394525,4.6713656 5.8515625,4.5410156 6.6081025,3.5703587 7.7693419,3.0019853 9,3 Z m 0.8925781,2.3203125 c 0.6455899,0.02308 1.1530579,0.5680106 1.1308599,1.2128906 -0.01217,0.31288 -0.142904,0.6040863 -0.371094,0.8164063 -0.22888,0.21497 -0.527287,0.3249531 -0.8417971,0.3144531 -0.6449,-0.02378 -1.1524594,-0.5674306 -1.1308594,-1.2128906 0.0116,-0.31288 0.1423137,-0.6034263 0.3710937,-0.8164063 0.2288801,-0.21369 0.5287069,-0.3244531 0.8417969,-0.3144531 z m -0.00977,0.3457031 c -0.21903,-0.00789 -0.4272375,0.0699 -0.5859375,0.21875 -0.1587,0.14884 -0.2527656,0.3500194 -0.2597656,0.5683594 -0.01519,0.45116 0.3389325,0.8310562 0.7890625,0.8476562 0.2189101,0.00662 0.4282621,-0.071863 0.5878901,-0.2207031 0.159421,-0.14953 0.250813,-0.3508394 0.257813,-0.5683593 0.0152,-0.4510501 -0.337883,-0.8297032 -0.7890625,-0.8457032 z m 0.1328125,0.4101563 c 0.20046,0 0.363281,0.1079675 0.363281,0.2421875 0,0.13295 -0.162931,0.2421875 -0.363281,0.2421875 -0.2004604,0 -0.3613281,-0.1092375 -0.3613281,-0.2421875 0,-0.13422 0.1608677,-0.2421875 0.3613281,-0.2421875 z" />
+</svg>
diff --git a/org.opensuse.opensuse_welcome_launcher.desktop b/org.opensuse.opensuse_welcome_launcher.desktop
index e27d764..a0ed216 100644
--- a/org.opensuse.opensuse_welcome_launcher.desktop
+++ b/org.opensuse.opensuse_welcome_launcher.desktop
@@ -1,30 +1,9 @@
 # Copy me to /etc/xdg/autostart and /usr/share/applications
 [Desktop Entry]
 Type=Application
-Name=Welcome
-Exec=/usr/bin/opensuse-welcome
-Icon=org.opensuse.opensuse_welcome
-Comment=The openSUSE Welcome utility.
+Name=Welcome launcher
+Exec=/usr/bin/opensuse-welcome-launcher
+Icon=org.opensuse.opensuse_welcome_launcher
+Comment=The openSUSE Welcome launcher utility.
 Categories=Qt;System;Documentation
-GenericName=Welcome Utility
-# Danish translation
-Name[da]=Velkomst
-Comment[da]=Redskabet openSUSE Velkomst.
-GenericName[da]=Velkomst-redskab
-# Spanish translation
-Name[es]=Bienvenida
-Comment[es]=La utilidad de bienvenida de openSUSE.
-GenericName[es]=Utilidad de bienvenida
-# French translation
-Name[fr]=Bienvenue
-Comment[fr]=Utilitaire de bienvenue
-GenericName[fr]=L'utilitaire de bienvenue d'openSUSE.
-# Polish translation
-Name[pl]=Witaj
-Comment[pl]=Program do powitania
-GenericName[pl]=Program do powitania w openSUSE.
-# Simplified Chinese translation
-Name[zh_CN]=欢迎
-Comment[zh_CN]=openSUSE 欢迎程序。
-GenericName[zh_CN]=欢迎程序
-NotShowIn=GNOME;
+GenericName=Welcome launcher Utility
diff --git a/org.opensuse.opensuse_welcome_launcher.svg b/org.opensuse.opensuse_welcome_launcher.svg
new file mode 100644
index 0000000..c52a7fb
--- /dev/null
+++ b/org.opensuse.opensuse_welcome_launcher.svg
@@ -0,0 +1,17 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 128 128">
+<defs>
+  <linearGradient id="lg0" x1="108" y1="106" x2="116" y2="106" gradientUnits="userSpaceOnUse">
+    <stop offset="0"   stop-color="#e8e7e4" />
+    <stop offset="0.5" stop-color="#ffffff" />
+    <stop offset="1"   stop-color="#c2bfba" />
+  </linearGradient>
+</defs>
+<path fill="#5f991f" d="m 20,48 c -4.432,0 -8,3.568 -8,8 v 60 c 30.544433,0 64.232608,0 96,0 4.432,0 8,-3.568 8,-8 V 56 c 0,-4.432 -3.568,-8 -8,-8 z" />
+<rect fill="#081b27" width="12" height="12" x="12" y="104" />
+<path fill="url(#lg0)" d="m 116,100 c 0,4.432 -3.568,8 -8,8 H 14 v 6 h 94 c 4.432,0 8,-3.568 8,-8 z" />
+<path fill="#73ba25" d="m 12,12 v 94 c 30.544433,0 64.232608,0 96,0 4.432,0 8,-3.568 8,-8 V 20 c 0,-4.432 -3.568,-8 -8,-8 -32,0 -64,0 -96,0 z" />
+<rect fill="#173f4f" width="12" height="94" x="12" y="12" />
+<rect fill="#19557b" width="2" height="94" x="14" y="12" />
+<path fill="#5f991f" d="M 68,27.00005 A 31.999817,31.999889 0 0 0 42.807886,39.328956 c 3.90311,1.042772 6.665667,1.938966 7.493036,2.216936 0.01296,-0.507628 0.09715,-5.047756 0.09715,-5.047756 0,0 0.01069,-0.103928 0.06614,-0.158115 0.07142,-0.06974 0.174666,-0.04868 0.174666,-0.04868 1.026578,0.148695 22.938579,3.396656 32.174604,8.778792 1.140608,0.667277 1.703605,1.376728 2.407074,2.095969 2.553108,2.640532 5.926657,13.62012 6.288983,15.884258 0.01423,0.08895 -0.09569,0.185578 -0.142626,0.222196 h -0.0011 c -0.262308,0.204681 -0.547974,0.417511 -0.834052,0.607693 -2.185448,1.466263 -7.220211,4.990659 -13.679714,4.415246 -5.802277,-0.51329 -13.382834,-3.841578 -22.52149,-9.862945 0.89852,2.103748 1.783822,4.214004 2.669589,6.323096 1.323438,0.687386 14.097281,7.196483 20.401743,7.069325 5.077847,-0.10578 10.508681,-2.582536 12.681318,-3.890208 0,0 0.477452,-0.287654 0.685224,-0.127105 0.227277,0.175576 0.164401,0.444604 0.110585,0.719346 -0.133662,0.623674 -0.437959,1.761537 -0.644911,2.301656 l -0.174668,0.440265 c -0.248703,0.666324 -0.487421,1.285659 -0.947743,1.667081 -1.279885,1.163792 -3.322681,2.089724 -6.523589,3.480899 -4.947684,2.164284 -12.974843,3.540695 -20.427582,3.493334 -2.669314,-0.05943 -5.248176,-0.355598 -7.512674,-0.620128 -4.647242,-0.524667 -8.428492,-0.950327 -10.734169,0.717283 A 31.999817,31.999889 0 0 0 67.999974,90.999944 31.999817,31.999889 0 0 0 99.999903,58.999971 31.999817,31.999889 0 0 0 67.999974,26.999945 Z m 7.137508,18.567283 c -2.504689,-0.07985 -4.893036,0.804013 -6.724096,2.513533 -1.830221,1.703858 -2.877584,4.026786 -2.970346,6.529841 -0.173037,5.163643 3.881037,9.514542 9.040223,9.704777 2.516066,0.08446 4.899232,-0.799991 6.730298,-2.519724 1.825562,-1.698566 2.872926,-4.0216 2.970345,-6.524655 0.177271,-5.15904 -3.881682,-9.519094 -9.046424,-9.703772 z m -0.07855,2.761605 c 3.609425,0.128058 6.43534,3.160173 6.313791,6.768548 -0.05572,1.740158 -0.789798,3.353264 -2.064973,4.549547 -1.277033,1.190727 -2.9461,1.809903 -4.697367,1.756986 -3.601065,-0.13282 -6.427069,-3.16848 -6.30552,-6.777807 0.05292,-1.746668 0.801556,-3.359933 2.071175,-4.550659 1.269572,-1.190727 2.930674,-1.809744 4.682894,-1.746615 z m 1.069694,3.281404 c -1.60373,0 -2.899029,0.863068 -2.899029,1.93685 0,1.063621 1.295299,1.931663 2.899029,1.931663 1.602783,0 2.903168,-0.868095 2.903168,-1.931663 0,-1.073782 -1.299485,-1.93685 -2.903168,-1.93685 z" />
+<path fill="#ffffff" d="M 68.000027,28.00015 A 31.999817,31.999889 0 0 0 42.807913,40.329056 c 3.90311,1.042772 6.665667,1.938966 7.493036,2.216936 0.01296,-0.507628 0.09715,-5.047756 0.09715,-5.047756 0,0 0.01069,-0.103928 0.06615,-0.158115 0.07142,-0.06974 0.174666,-0.04868 0.174666,-0.04868 1.026578,0.148695 22.938579,3.396656 32.174604,8.778792 1.140608,0.667277 1.703605,1.376728 2.407074,2.095969 2.553108,2.640532 5.926657,13.62012 6.288983,15.884258 0.01423,0.08895 -0.09569,0.185578 -0.142626,0.222196 h -0.0011 c -0.262308,0.204681 -0.547974,0.417511 -0.834052,0.607693 -2.185448,1.466263 -7.220211,4.990659 -13.679714,4.415246 -5.802277,-0.51329 -13.382834,-3.841578 -22.52149,-9.862945 0.89852,2.103748 1.783822,4.214004 2.669589,6.323096 1.323438,0.687386 14.097281,7.196483 20.401743,7.069325 5.077847,-0.10578 10.508681,-2.582536 12.681318,-3.890208 0,0 0.477452,-0.287654 0.685224,-0.127105 0.227277,0.175576 0.164401,0.444604 0.110585,0.719346 -0.133662,0.623674 -0.437959,1.761537 -0.644911,2.301656 l -0.174668,0.440265 c -0.248703,0.666324 -0.487421,1.285659 -0.947743,1.667081 -1.279885,1.163792 -3.322681,2.089724 -6.523589,3.480899 C 77.640458,79.581289 69.613299,80.9577 62.16056,80.910339 59.491282,80.850911 56.91242,80.554738 54.647922,80.290208 50.00068,79.765541 46.21943,79.339881 43.913753,81.007491 A 31.999817,31.999889 0 0 0 68.000001,92.000044 31.999817,31.999889 0 0 0 99.99993,60.000071 31.999817,31.999889 0 0 0 68.000001,28.000045 Z m 7.137508,18.567283 c -2.504689,-0.07985 -4.893036,0.804013 -6.724096,2.513533 -1.830221,1.703858 -2.877584,4.026786 -2.970346,6.529841 -0.173037,5.163643 3.881037,9.514542 9.040223,9.704777 2.516066,0.08446 4.899232,-0.799991 6.730298,-2.519724 1.825562,-1.698566 2.872926,-4.0216 2.970345,-6.524655 0.177271,-5.15904 -3.881682,-9.519094 -9.046424,-9.703772 z m -0.07855,2.761605 c 3.609425,0.128058 6.43534,3.160173 6.313791,6.768548 -0.05572,1.740158 -0.789798,3.353264 -2.064973,4.549547 -1.277033,1.190727 -2.9461,1.809903 -4.697367,1.756986 -3.601065,-0.13282 -6.427069,-3.16848 -6.30552,-6.777807 0.05292,-1.746668 0.801556,-3.359933 2.071175,-4.550659 1.269572,-1.190727 2.930674,-1.809744 4.682894,-1.746615 z m 1.069694,3.281404 c -1.60373,0 -2.899029,0.863068 -2.899029,1.93685 0,1.063621 1.295299,1.931663 2.899029,1.931663 1.602783,0 2.903168,-0.868095 2.903168,-1.931663 0,-1.073782 -1.299485,-1.93685 -2.903168,-1.93685 z" />
+</svg>