diff --git a/layouts/apps-list.html b/layouts/apps-list.html
index 6e90620..0db3ac5 100644
--- a/layouts/apps-list.html
+++ b/layouts/apps-list.html
@@ -31,7 +31,7 @@
                     <div class="label">
                         <h2>
                             <span class="flex app-name" style="float: left">
-                                &nbsp;<img src="/icons/apps/{{ $index }}.svg" loading="lazy" class="icon-larger-text" alt=""/> {{ $i18nAppData.name }}
+                                &nbsp;<img src="/icons/apps/svg/{{ $index }}.svg" loading="lazy" class="icon-larger-text" alt=""/> {{ $i18nAppData.name }}
                             </span>
                             <span class="right-icon"><i class="icon-lookup icon-as-text" alt="{{ i18n "learnMore" }}"/></i></span> <!-- Hint that you can click -->
                             &nbsp;
diff --git a/layouts/partials/section-app-header.html b/layouts/partials/section-app-header.html
index 99b9dc7..c69a4fa 100644
--- a/layouts/partials/section-app-header.html
+++ b/layouts/partials/section-app-header.html
@@ -25,7 +25,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
     <div class="columns-container">
         <div class="column col3 center text-right vertical-center {{ if .TextWhite }}text-white{{ end }}">
             <br>
-            <h1 class="flex flex-right">&nbsp;<img src="/icons/apps/{{ .AppIndex | safeHTML }}.svg" class="icon-larger-text shadowed" alt="{{ .AppIndex | safeHTML }} app icon"/>{{ $i18nAppData.name | safeHTML }}</h1>
+            <h1 class="flex flex-right">&nbsp;<img src="/icons/apps/svg/{{ .AppIndex | safeHTML }}.svg" class="icon-larger-text shadowed" alt="{{ .AppIndex | safeHTML }} app icon"/>{{ $i18nAppData.name | safeHTML }}</h1>
             <h2>{{ $i18nAppData.description | safeHTML }}</h2>
             {{ if .ShowPlatforms }}
             <p class="flex flex-right">{{ i18n "availableOn" }}&nbsp;
diff --git a/layouts/shortcodes/appIcon.html b/layouts/shortcodes/appIcon.html
index 4e10c7d..1a550cf 100644
--- a/layouts/shortcodes/appIcon.html
+++ b/layouts/shortcodes/appIcon.html
@@ -16,4 +16,4 @@ GNU Affero General Public License for more details.
 You should have received a copy of the GNU Affero General Public License
 along with this program.  If not, see <https://www.gnu.org/licenses/>.
 -->
-<img class="icon-as-text icon-in-text" alt="{{ .Get 0 }}'s icon" src="/icons/apps/{{ .Get 0 | safeURL }}.svg"></img>
+<img class="icon-as-text icon-in-text" alt="{{ .Get 0 }}'s icon" src="/icons/apps/svg/{{ .Get 0 | safeURL }}.svg"></img>
diff --git a/layouts/shortcodes/previewSkills.html b/layouts/shortcodes/previewSkills.html
index e313b2f..eea6f82 100644
--- a/layouts/shortcodes/previewSkills.html
+++ b/layouts/shortcodes/previewSkills.html
@@ -45,7 +45,7 @@ along with this program.  If not, see <https://www.gnu.org/licenses/>.
    <div class="grid flex">
     {{ $scratch := newScratch }}
     {{ range .RelevantSoft }}
-     {{ $scratch.Set "img" "/icons/apps/" }}
+     {{ $scratch.Set "img" "/icons/apps/svg/" }}
      {{ $scratch.Add "img" (lower .) }}
      {{ $scratch.Add "img" ".svg" }}
      {{ $scratch.Set "url" "https://apps.ad5001.eu/" }}
diff --git a/static/icons/apps/accountfree.svg b/static/icons/apps/svg/accountfree.svg
similarity index 100%
rename from static/icons/apps/accountfree.svg
rename to static/icons/apps/svg/accountfree.svg
diff --git a/static/icons/apps/ad5001.eu.svg b/static/icons/apps/svg/ad5001.eu.svg
similarity index 100%
rename from static/icons/apps/ad5001.eu.svg
rename to static/icons/apps/svg/ad5001.eu.svg
diff --git a/static/icons/apps/logarithmplotter.svg b/static/icons/apps/svg/logarithmplotter.svg
similarity index 100%
rename from static/icons/apps/logarithmplotter.svg
rename to static/icons/apps/svg/logarithmplotter.svg
diff --git a/static/icons/apps/nowox.svg b/static/icons/apps/svg/nowox.svg
similarity index 100%
rename from static/icons/apps/nowox.svg
rename to static/icons/apps/svg/nowox.svg
diff --git a/static/icons/apps/unchecker.svg b/static/icons/apps/svg/unchecker.svg
similarity index 100%
rename from static/icons/apps/unchecker.svg
rename to static/icons/apps/svg/unchecker.svg
diff --git a/static/icons/apps/webp/accountfree.webp b/static/icons/apps/webp/accountfree.webp
new file mode 100644
index 0000000..21fa2f0
Binary files /dev/null and b/static/icons/apps/webp/accountfree.webp differ
diff --git a/static/icons/apps/webp/ad5001.eu.webp b/static/icons/apps/webp/ad5001.eu.webp
new file mode 100644
index 0000000..90f2439
Binary files /dev/null and b/static/icons/apps/webp/ad5001.eu.webp differ
diff --git a/static/icons/apps/webp/logarithmplotter.webp b/static/icons/apps/webp/logarithmplotter.webp
new file mode 100644
index 0000000..109e7df
Binary files /dev/null and b/static/icons/apps/webp/logarithmplotter.webp differ
diff --git a/static/icons/apps/webp/nowox.webp b/static/icons/apps/webp/nowox.webp
new file mode 100644
index 0000000..34f6be1
Binary files /dev/null and b/static/icons/apps/webp/nowox.webp differ
diff --git a/static/icons/apps/webp/unchecker.webp b/static/icons/apps/webp/unchecker.webp
new file mode 100644
index 0000000..6572429
Binary files /dev/null and b/static/icons/apps/webp/unchecker.webp differ