diff --git a/README.md b/README.md
index 475095872..f7e1730a4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <picture>
-  <source media="(prefers-color-scheme: dark)" srcset="./images/siteicons/blue/walloswhite.png">
-  <source media="(prefers-color-scheme: light)" srcset="./images/siteicons/blue/wallos.png">
-  <img alt="Wallos" src="./images/siteicons/blue/wallos.png">
+  <source media="(prefers-color-scheme: dark)" srcset="./images/siteicons/walloswhite.png">
+  <source media="(prefers-color-scheme: light)" srcset="./images/siteicons/wallos.png">
+  <img alt="Wallos" src="./images/siteicons/wallos.png">
 </picture>
 
 Wallos: Open-Source Personal Subscription Tracker
diff --git a/admin.php b/admin.php
index 5aaa0bc21..ccf803303 100644
--- a/admin.php
+++ b/admin.php
@@ -130,16 +130,14 @@ class="fa-solid <?= $userIcon ?>"></i><?= $user['username'] ?></div>
                             <?php
                             if ($user['id'] != 1) {
                                 ?>
-                                <button class="image-button medium" onClick="removeUser(<?= $user['id'] ?>)">
-                                    <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                        title="<?= translate('delete_user', $i18n) ?>">
+                                <button class="image-button medium" onClick="removeUser(<?= $user['id'] ?>)" title="<?= translate('delete_user', $i18n) ?>">
+                                    <?php include "images/siteicons/svg/delete.php"; ?>
                                 </button>
                                 <?php
                             } else {
                                 ?>
-                                <button class="image-button medium disabled" disabled>
-                                    <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                        title="<?= translate('delete_user', $i18n) ?>">
+                                <button class="image-button medium disabled" disabled  title="<?= translate('delete_user', $i18n) ?>">
+                                    <?php include "images/siteicons/svg/delete.php"; ?>
                                 </button>
                                 <?php
                             }
diff --git a/endpoints/cronjobs/sendresetpasswordemails.php b/endpoints/cronjobs/sendresetpasswordemails.php
index d31117a47..901d625f7 100644
--- a/endpoints/cronjobs/sendresetpasswordemails.php
+++ b/endpoints/cronjobs/sendresetpasswordemails.php
@@ -49,7 +49,7 @@
                 $mail->addAddress($user['email']);
                 $mail->isHTML(true);
                 $mail->Subject = 'Wallos - Reset Password';
-                $mail->Body = '<img src="' . $server_url . '/images/siteicons/blue/wallos.png" alt="Logo" />
+                $mail->Body = '<img src="' . $server_url . '/images/siteicons/wallos.png" alt="Logo" />
                     <br>
                     A password reset was requested for your account.
                     <br>
diff --git a/endpoints/cronjobs/sendverificationemails.php b/endpoints/cronjobs/sendverificationemails.php
index cdf7564be..1322f130c 100644
--- a/endpoints/cronjobs/sendverificationemails.php
+++ b/endpoints/cronjobs/sendverificationemails.php
@@ -53,7 +53,7 @@
                 $mail->addAddress($user['email']);
                 $mail->isHTML(true);
                 $mail->Subject = 'Wallos - Email Verification';
-                $mail->Body = '<img src="' . $server_url . '/images/siteicons/blue/wallos.png" alt="Logo" />
+                $mail->Body = '<img src="' . $server_url . '/images/siteicons/wallos.png" alt="Logo" />
                     <br>
                     Registration on Wallos was successful.
                     <br>
diff --git a/endpoints/subscriptions/get.php b/endpoints/subscriptions/get.php
index ea9302bf9..c721fd72d 100644
--- a/endpoints/subscriptions/get.php
+++ b/endpoints/subscriptions/get.php
@@ -68,14 +68,13 @@
     }
   }
 
-  $defaultLogo = $theme == "light" ? "images/siteicons/" . $colorTheme . "/wallos.png" : "images/siteicons/" . $colorTheme . "/walloswhite.png";
   foreach ($subscriptions as $subscription) {
     if ($subscription['inactive'] == 1 && isset($settings['hideDisabledSubscriptions']) && $settings['hideDisabledSubscriptions'] === 'true') {
       continue;
     }
     $id = $subscription['id'];
     $print[$id]['id'] = $id;
-    $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/" . $subscription['logo'] : $defaultLogo;
+    $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/" . $subscription['logo'] : "";
     $print[$id]['name'] = htmlspecialchars_decode($subscription['name'] ?? "");
     $cycle = $subscription['cycle'];
     $frequency = $subscription['frequency'];
@@ -105,7 +104,7 @@
   }
 
   if (isset($print)) {
-    printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme);
+    printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "../../");
   }
 
   if (count($subscriptions) == 0) {
diff --git a/images/siteicons/blue/category.png b/images/siteicons/blue/category.png
deleted file mode 100644
index 27b706c2d..000000000
Binary files a/images/siteicons/blue/category.png and /dev/null differ
diff --git a/images/siteicons/blue/check.png b/images/siteicons/blue/check.png
deleted file mode 100644
index 972b25d98..000000000
Binary files a/images/siteicons/blue/check.png and /dev/null differ
diff --git a/images/siteicons/blue/clone.png b/images/siteicons/blue/clone.png
deleted file mode 100644
index 022e3d6ed..000000000
Binary files a/images/siteicons/blue/clone.png and /dev/null differ
diff --git a/images/siteicons/blue/delete.png b/images/siteicons/blue/delete.png
deleted file mode 100644
index fe1c3016b..000000000
Binary files a/images/siteicons/blue/delete.png and /dev/null differ
diff --git a/images/siteicons/blue/edit.png b/images/siteicons/blue/edit.png
deleted file mode 100644
index 46ed9d42b..000000000
Binary files a/images/siteicons/blue/edit.png and /dev/null differ
diff --git a/images/siteicons/blue/notes.png b/images/siteicons/blue/notes.png
deleted file mode 100644
index 3bb5cd8bc..000000000
Binary files a/images/siteicons/blue/notes.png and /dev/null differ
diff --git a/images/siteicons/blue/payment.png b/images/siteicons/blue/payment.png
deleted file mode 100644
index 7446be933..000000000
Binary files a/images/siteicons/blue/payment.png and /dev/null differ
diff --git a/images/siteicons/blue/save.png b/images/siteicons/blue/save.png
deleted file mode 100644
index da27cc40b..000000000
Binary files a/images/siteicons/blue/save.png and /dev/null differ
diff --git a/images/siteicons/blue/subscription.png b/images/siteicons/blue/subscription.png
deleted file mode 100644
index ffda5894c..000000000
Binary files a/images/siteicons/blue/subscription.png and /dev/null differ
diff --git a/images/siteicons/blue/web.png b/images/siteicons/blue/web.png
deleted file mode 100644
index 2a7b42f21..000000000
Binary files a/images/siteicons/blue/web.png and /dev/null differ
diff --git a/images/siteicons/blue/websearch.png b/images/siteicons/blue/websearch.png
deleted file mode 100644
index 5b2fbecb9..000000000
Binary files a/images/siteicons/blue/websearch.png and /dev/null differ
diff --git a/images/siteicons/green/category.png b/images/siteicons/green/category.png
deleted file mode 100644
index 5bf004d35..000000000
Binary files a/images/siteicons/green/category.png and /dev/null differ
diff --git a/images/siteicons/green/check.png b/images/siteicons/green/check.png
deleted file mode 100644
index 05a8b33a5..000000000
Binary files a/images/siteicons/green/check.png and /dev/null differ
diff --git a/images/siteicons/green/clone.png b/images/siteicons/green/clone.png
deleted file mode 100644
index 2e407ffd9..000000000
Binary files a/images/siteicons/green/clone.png and /dev/null differ
diff --git a/images/siteicons/green/delete.png b/images/siteicons/green/delete.png
deleted file mode 100644
index 6d07ebcfa..000000000
Binary files a/images/siteicons/green/delete.png and /dev/null differ
diff --git a/images/siteicons/green/edit.png b/images/siteicons/green/edit.png
deleted file mode 100644
index db60c939a..000000000
Binary files a/images/siteicons/green/edit.png and /dev/null differ
diff --git a/images/siteicons/green/notes.png b/images/siteicons/green/notes.png
deleted file mode 100644
index d28c2a2ac..000000000
Binary files a/images/siteicons/green/notes.png and /dev/null differ
diff --git a/images/siteicons/green/payment.png b/images/siteicons/green/payment.png
deleted file mode 100644
index 0f95e3af2..000000000
Binary files a/images/siteicons/green/payment.png and /dev/null differ
diff --git a/images/siteicons/green/save.png b/images/siteicons/green/save.png
deleted file mode 100644
index c7e955c3d..000000000
Binary files a/images/siteicons/green/save.png and /dev/null differ
diff --git a/images/siteicons/green/subscription.png b/images/siteicons/green/subscription.png
deleted file mode 100644
index d113a6a27..000000000
Binary files a/images/siteicons/green/subscription.png and /dev/null differ
diff --git a/images/siteicons/green/wallos.png b/images/siteicons/green/wallos.png
deleted file mode 100644
index 3a57f9d9c..000000000
Binary files a/images/siteicons/green/wallos.png and /dev/null differ
diff --git a/images/siteicons/green/walloswhite.png b/images/siteicons/green/walloswhite.png
deleted file mode 100644
index d7ae6b45c..000000000
Binary files a/images/siteicons/green/walloswhite.png and /dev/null differ
diff --git a/images/siteicons/green/web.png b/images/siteicons/green/web.png
deleted file mode 100644
index 3bc98f6a9..000000000
Binary files a/images/siteicons/green/web.png and /dev/null differ
diff --git a/images/siteicons/green/websearch.png b/images/siteicons/green/websearch.png
deleted file mode 100644
index 0e4640c01..000000000
Binary files a/images/siteicons/green/websearch.png and /dev/null differ
diff --git a/images/siteicons/purple/category.png b/images/siteicons/purple/category.png
deleted file mode 100644
index 6c73a3827..000000000
Binary files a/images/siteicons/purple/category.png and /dev/null differ
diff --git a/images/siteicons/purple/check.png b/images/siteicons/purple/check.png
deleted file mode 100644
index 487174fa8..000000000
Binary files a/images/siteicons/purple/check.png and /dev/null differ
diff --git a/images/siteicons/purple/clone.png b/images/siteicons/purple/clone.png
deleted file mode 100644
index fcdd9ef6e..000000000
Binary files a/images/siteicons/purple/clone.png and /dev/null differ
diff --git a/images/siteicons/purple/delete.png b/images/siteicons/purple/delete.png
deleted file mode 100644
index e2f7d6b71..000000000
Binary files a/images/siteicons/purple/delete.png and /dev/null differ
diff --git a/images/siteicons/purple/edit.png b/images/siteicons/purple/edit.png
deleted file mode 100644
index 5ae3b793a..000000000
Binary files a/images/siteicons/purple/edit.png and /dev/null differ
diff --git a/images/siteicons/purple/notes.png b/images/siteicons/purple/notes.png
deleted file mode 100644
index bf2f5fd4f..000000000
Binary files a/images/siteicons/purple/notes.png and /dev/null differ
diff --git a/images/siteicons/purple/payment.png b/images/siteicons/purple/payment.png
deleted file mode 100644
index 10edded80..000000000
Binary files a/images/siteicons/purple/payment.png and /dev/null differ
diff --git a/images/siteicons/purple/save.png b/images/siteicons/purple/save.png
deleted file mode 100644
index 1e7024833..000000000
Binary files a/images/siteicons/purple/save.png and /dev/null differ
diff --git a/images/siteicons/purple/subscription.png b/images/siteicons/purple/subscription.png
deleted file mode 100644
index 6bdc6e70e..000000000
Binary files a/images/siteicons/purple/subscription.png and /dev/null differ
diff --git a/images/siteicons/purple/wallos.png b/images/siteicons/purple/wallos.png
deleted file mode 100644
index 4798eae53..000000000
Binary files a/images/siteicons/purple/wallos.png and /dev/null differ
diff --git a/images/siteicons/purple/walloswhite.png b/images/siteicons/purple/walloswhite.png
deleted file mode 100644
index 42b94667d..000000000
Binary files a/images/siteicons/purple/walloswhite.png and /dev/null differ
diff --git a/images/siteicons/purple/web.png b/images/siteicons/purple/web.png
deleted file mode 100644
index 961544d7c..000000000
Binary files a/images/siteicons/purple/web.png and /dev/null differ
diff --git a/images/siteicons/purple/websearch.png b/images/siteicons/purple/websearch.png
deleted file mode 100644
index 2d62fb85b..000000000
Binary files a/images/siteicons/purple/websearch.png and /dev/null differ
diff --git a/images/siteicons/red/category.png b/images/siteicons/red/category.png
deleted file mode 100644
index 74e4d2057..000000000
Binary files a/images/siteicons/red/category.png and /dev/null differ
diff --git a/images/siteicons/red/check.png b/images/siteicons/red/check.png
deleted file mode 100644
index 6f963b610..000000000
Binary files a/images/siteicons/red/check.png and /dev/null differ
diff --git a/images/siteicons/red/clone.png b/images/siteicons/red/clone.png
deleted file mode 100644
index 239f8768d..000000000
Binary files a/images/siteicons/red/clone.png and /dev/null differ
diff --git a/images/siteicons/red/delete.png b/images/siteicons/red/delete.png
deleted file mode 100644
index 405102bce..000000000
Binary files a/images/siteicons/red/delete.png and /dev/null differ
diff --git a/images/siteicons/red/edit.png b/images/siteicons/red/edit.png
deleted file mode 100644
index 31c472bce..000000000
Binary files a/images/siteicons/red/edit.png and /dev/null differ
diff --git a/images/siteicons/red/notes.png b/images/siteicons/red/notes.png
deleted file mode 100644
index 522f88ecd..000000000
Binary files a/images/siteicons/red/notes.png and /dev/null differ
diff --git a/images/siteicons/red/payment.png b/images/siteicons/red/payment.png
deleted file mode 100644
index 074a09a96..000000000
Binary files a/images/siteicons/red/payment.png and /dev/null differ
diff --git a/images/siteicons/red/save.png b/images/siteicons/red/save.png
deleted file mode 100644
index b39509d61..000000000
Binary files a/images/siteicons/red/save.png and /dev/null differ
diff --git a/images/siteicons/red/subscription.png b/images/siteicons/red/subscription.png
deleted file mode 100644
index ea1df27f1..000000000
Binary files a/images/siteicons/red/subscription.png and /dev/null differ
diff --git a/images/siteicons/red/wallos.png b/images/siteicons/red/wallos.png
deleted file mode 100644
index 248061851..000000000
Binary files a/images/siteicons/red/wallos.png and /dev/null differ
diff --git a/images/siteicons/red/walloswhite.png b/images/siteicons/red/walloswhite.png
deleted file mode 100644
index 8aaff7497..000000000
Binary files a/images/siteicons/red/walloswhite.png and /dev/null differ
diff --git a/images/siteicons/red/web.png b/images/siteicons/red/web.png
deleted file mode 100644
index d394827e1..000000000
Binary files a/images/siteicons/red/web.png and /dev/null differ
diff --git a/images/siteicons/red/websearch.png b/images/siteicons/red/websearch.png
deleted file mode 100644
index 84aa15098..000000000
Binary files a/images/siteicons/red/websearch.png and /dev/null differ
diff --git a/images/siteicons/svg/category.php b/images/siteicons/svg/category.php
new file mode 100644
index 000000000..d65f4b109
--- /dev/null
+++ b/images/siteicons/svg/category.php
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Page-Setting--Streamline-Plump.svg" height="48" width="48">
+  <desc>Page Setting Streamline Icon: https://streamlinehq.com</desc>
+  <g id="page-setting--page-setting-square-triangle-circle-line-combination-variation">
+    <path id="Union" class="main-color" fill-rule="evenodd" d="M28 27a2 2 0 1 0 0 4h16a2 2 0 1 0 0 -4H28Zm-2 9a2 2 0 0 1 2 -2h16a2 2 0 1 1 0 4H28a2 2 0 0 1 -2 -2Zm0 7a2 2 0 0 1 2 -2h16a2 2 0 1 1 0 4H28a2 2 0 0 1 -2 -2Z" clip-rule="evenodd" stroke-width="1"></path>
+    <path id="Union_2" class="accent-color" fill-rule="evenodd" d="M18.122 1.829C16.724 1.646 14.748 1.5 12 1.5c-2.748 0 -4.724 0.146 -6.122 0.329 -2.5 0.326 -4.097 2.314 -4.24 4.677C1.56 7.776 1.5 9.55 1.5 12c0 2.45 0.06 4.225 0.137 5.494 0.144 2.363 1.742 4.351 4.241 4.677 1.398 0.183 3.374 0.329 6.122 0.329 2.748 0 4.724 -0.146 6.122 -0.329 2.5 -0.326 4.097 -2.314 4.24 -4.677 0.078 -1.27 0.138 -3.044 0.138 -5.494 0 -2.45 -0.06 -4.225 -0.137 -5.494 -0.144 -2.363 -1.742 -4.351 -4.241 -4.677ZM1.5 36c0 -5.799 4.701 -10.5 10.5 -10.5S22.5 30.201 22.5 36 17.799 46.5 12 46.5 1.5 41.799 1.5 36ZM32.793 3.45a4.02 4.02 0 0 1 6.384 0 51.43 51.43 0 0 1 4.057 5.997 51.492 51.492 0 0 1 3.165 6.51 4.021 4.021 0 0 1 -3.193 5.53c-1.83 0.261 -4.338 0.513 -7.22 0.513a51.48 51.48 0 0 1 -7.22 -0.514 4.02 4.02 0 0 1 -3.193 -5.529 51.447 51.447 0 0 1 3.165 -6.51 51.494 51.494 0 0 1 4.055 -5.996Z" clip-rule="evenodd" stroke-width="1"></path>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/check.php b/images/siteicons/svg/check.php
new file mode 100644
index 000000000..8e399ac2c
--- /dev/null
+++ b/images/siteicons/svg/check.php
@@ -0,0 +1,10 @@
+<?php
+header('Content-Type: image/svg+xml');
+echo '
+<svg xmlns="http://www.w3.org/2000/svg" fill="currentColor" viewBox="-0.5 -0.5 16 16" id="Check-Thick--Streamline-Plump.svg" height="16" width="16">
+  <desc>Check Thick Streamline Icon: https://streamlinehq.com</desc>
+  <g id="check-thick--check-form-validation-checkmark-success-add-addition-1-tick">
+    <path id="Union" fill="currentColor" d="M6.320125 7.069593749999999C6.423687500000001 7.188750000000001 6.516437499999999 7.296375 6.59834375 7.3925C6.787875 7.11834375 7.0450937499999995 6.747062499999999 7.36459375 6.289125C8.392468749999999 4.815781250000001 9.428374999999999 3.3480937500000003 10.472312500000001 1.8861249999999998C10.985093749999999 1.1675625 11.975093750000001 0.74753125 12.868593749999999 1.2433750000000001C13.4003125 1.5385312500000001 14.034593749999999 1.9957812499999998 14.53415625 2.67675C15.02965625 3.35196875 14.883781250000002 4.20115625 14.49759375 4.786031250000001C11.599375 9.17684375 9.50771875 11.851 8.34309375 13.24271875C7.5815624999999995 14.1531875 6.2510625 14.216125 5.3961250000000005 13.4051875C3.6985312500000003 11.7910625 2.10321875 10.072656250000001 0.61946875 8.259968749999999C0.09556250000000001 7.61825 -0.05946875 6.6445 0.5169374999999999 5.90565625C0.8909374999999999 5.426375 1.3136562500000002 5.0205625 1.6896875 4.70309375C2.5205937499999997 4.00146875 3.6814999999999998 4.1906875 4.36959375 4.91971875C5.03440625 5.6230625 5.68471875 6.3399375000000004 6.320125 7.0699375Z" stroke-width="1"></path>
+  </g>
+</svg>';
+?>
\ No newline at end of file
diff --git a/images/siteicons/svg/clone.php b/images/siteicons/svg/clone.php
new file mode 100644
index 000000000..4024ff63a
--- /dev/null
+++ b/images/siteicons/svg/clone.php
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48" height="48" width="48">
+  <g id="add-layer-2--layer-add-design-plus-layers-square-box">
+    <path id="Union" class="main-color" d="M28.5 1.5c5.166 0 8.966 0.172 11.56 0.357 3.3 0.236 5.847 2.782 6.083 6.084 0.185 2.593 0.357 6.393 0.357 11.559 0 5.166 -0.172 8.966 -0.357 11.56 -0.236 3.3 -2.782 5.847 -6.084 6.083 -2.593 0.185 -6.393 0.357 -11.559 0.357 -5.166 0 -8.966 -0.172 -11.56 -0.357 -3.3 -0.236 -5.847 -2.782 -6.083 -6.084 -0.185 -2.593 -0.357 -6.393 -0.357 -11.559 0 -5.166 0.172 -8.966 0.357 -11.56 0.236 -3.3 2.782 -5.847 6.084 -6.083C19.534 1.672 23.334 1.5 28.5 1.5Z" stroke-width="1"/>
+    <path id="Union_2" class="accent-color" d="M19.5 10.5c5.166 0 8.966 0.172 11.56 0.357 3.3 0.236 5.847 2.782 6.083 6.084 0.185 2.593 0.357 6.393 0.357 11.559 0 5.166 -0.172 8.966 -0.357 11.56 -0.236 3.3 -2.782 5.847 -6.084 6.083 -2.593 0.185 -6.393 0.357 -11.559 0.357 -5.166 0 -8.966 -0.172 -11.56 -0.357 -3.3 -0.236 -5.847 -2.782 -6.083 -6.084C1.672 37.466 1.5 33.666 1.5 28.5c0 -5.166 0.172 -8.966 0.357 -11.56 0.236 -3.3 2.782 -5.847 6.084 -6.083 2.593 -0.185 6.393 -0.357 11.559 -0.357Z" stroke-width="1"/>
+    <path id="Subtract" class="main-color" fill-rule="evenodd" d="M16.113 21.628c0.047 -1.067 0.733 -1.95 1.795 -2.055 0.436 -0.043 0.963 -0.073 1.592 -0.073 0.628 0 1.156 0.03 1.592 0.073 1.062 0.106 1.748 0.988 1.795 2.055 0.034 0.788 0.068 1.89 0.09 3.395 1.504 0.022 2.607 0.056 3.395 0.09 1.067 0.047 1.95 0.733 2.055 1.795 0.043 0.436 0.073 0.963 0.073 1.592 0 0.628 -0.03 1.156 -0.073 1.592 -0.106 1.062 -0.989 1.748 -2.055 1.795 -0.788 0.034 -1.89 0.068 -3.395 0.09a119.605 119.605 0 0 1 -0.09 3.395c-0.047 1.066 -0.733 1.95 -1.795 2.055 -0.436 0.043 -0.963 0.073 -1.592 0.073 -0.628 0 -1.156 -0.03 -1.592 -0.073 -1.062 -0.106 -1.748 -0.989 -1.795 -2.055 -0.034 -0.788 -0.068 -1.89 -0.09 -3.395a119.605 119.605 0 0 1 -3.395 -0.09c-1.066 -0.047 -1.95 -0.733 -2.055 -1.795A16.127 16.127 0 0 1 10.5 28.5c0 -0.628 0.03 -1.156 0.073 -1.592 0.106 -1.062 0.989 -1.748 2.055 -1.795 0.788 -0.034 1.89 -0.068 3.395 -0.09 0.022 -1.504 0.056 -2.607 0.09 -3.395Z" clip-rule="evenodd" stroke-width="1"/>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/delete.php b/images/siteicons/svg/delete.php
new file mode 100644
index 000000000..17599ac1d
--- /dev/null
+++ b/images/siteicons/svg/delete.php
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Recycle-Bin-2--Streamline-Plump.svg" height="48" width="48">
+  <g id="recycle-bin-2--remove-delete-empty-bin-trash-garbage">
+    <path id="Union" class="accent-color" d="M43.318 15.934a1.5 1.5 0 0 0 -1.618 -1.591c-3.016 0.246 -8.46 0.52 -17.721 0.52 -9.215 0 -14.65 -0.271 -17.675 -0.516a1.5 1.5 0 0 0 -1.618 1.59c0.888 13.84 1.74 21.07 2.253 24.547 0.332 2.252 1.85 4.217 4.226 4.788 2.445 0.588 6.55 1.227 12.837 1.227 6.286 0 10.392 -0.64 12.837 -1.227 2.375 -0.57 3.894 -2.536 4.226 -4.788 0.513 -3.477 1.365 -10.708 2.253 -24.55Z" stroke-width="1"/>
+    <path id="Union_2" class="main-color" d="M23.37 1a8 8 0 0 0 -7.034 4.188c-3.411 0.072 -6 0.182 -7.814 0.282 -2.312 0.127 -4.692 1.242 -5.7 3.605 -0.244 0.57 -0.475 1.212 -0.663 1.919 -0.68 2.548 1.302 4.622 3.657 4.822 3.057 0.258 8.614 0.548 18.161 0.548 9.549 0 15.106 -0.29 18.162 -0.549 2.374 -0.2 4.291 -2.261 3.751 -4.785a16.68 16.68 0 0 0 -0.294 -1.167c-0.824 -2.831 -3.517 -4.277 -6.188 -4.411a260.66 260.66 0 0 0 -7.744 -0.264A8 8 0 0 0 24.631 1H23.37Z" stroke-width="1"/>
+    <path id="Vector_831_Stroke" class="main-color" fill-rule="evenodd" d="M17.8 23.01a2 2 0 0 1 2.19 1.791l1 10a2 2 0 0 1 -3.98 0.398l-1 -10a2 2 0 0 1 1.79 -2.189Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Vector_832_Stroke" class="main-color" fill-rule="evenodd" d="M30.2 23.01a2 2 0 0 0 -2.19 1.791l-1 10a2 2 0 0 0 3.98 0.398l1 -10a2 2 0 0 0 -1.79 -2.189Z" clip-rule="evenodd" stroke-width="1"/>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/edit.php b/images/siteicons/svg/edit.php
new file mode 100644
index 000000000..2d2a4f0b5
--- /dev/null
+++ b/images/siteicons/svg/edit.php
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Pencil-Square--Streamline-Plump.svg" height="48" width="48">
+  <desc>Pencil Square Streamline Icon: https://streamlinehq.com</desc>
+  <g id="pencil-square--change-document-edit-modify-paper-pencil-write-writing">
+    <path id="Rectangle_1098" class="main-color" d="M44.42 14.557c1.546 -1.546 2.146 -3.798 0.937 -5.62 -0.655 -0.986 -1.574 -2.156 -2.856 -3.438 -1.282 -1.282 -2.452 -2.201 -3.438 -2.856 -1.822 -1.21 -4.074 -0.61 -5.62 0.937L16.198 20.825c-0.578 0.578 -0.974 1.312 -1.053 2.126 -0.133 1.381 -0.256 3.962 0.024 7.967a2.063 2.063 0 0 0 1.913 1.913c4.005 0.28 6.586 0.157 7.967 0.024 0.814 -0.079 1.548 -0.475 2.126 -1.053L44.42 14.557Z" stroke-width="1"/>
+    <path id="Subtract" class="accent-color" d="m29.206 3.574 -15.13 15.13c-0.982 0.982 -1.76 2.337 -1.917 3.958 -0.15 1.562 -0.273 4.31 0.018 8.465a5.063 5.063 0 0 0 4.695 4.696c4.156 0.29 6.904 0.169 8.465 0.018 1.622 -0.157 2.977 -0.935 3.96 -1.918l15.129 -15.13c0.046 1.854 0.074 3.92 0.074 6.207 0 6.899 -0.254 11.783 -0.502 14.91 -0.261 3.291 -2.797 5.827 -6.087 6.088 -3.128 0.248 -8.012 0.502 -14.911 0.502 -6.899 0 -11.783 -0.254 -14.91 -0.502 -3.291 -0.261 -5.827 -2.797 -6.088 -6.087C1.754 36.782 1.5 31.898 1.5 25c0 -6.899 0.254 -11.783 0.502 -14.91 0.261 -3.291 2.797 -5.827 6.087 -6.088C11.217 3.754 16.101 3.5 23 3.5c2.287 0 4.352 0.028 6.206 0.074Z" stroke-width="1"/>
+    <path id="Intersect" class="accent-color" d="M43.775 15.202c-1.083 -1.72 -2.654 -3.79 -4.92 -6.057 -2.267 -2.266 -4.337 -3.838 -6.057 -4.92L29.15 7.873c1.516 0.84 3.668 2.307 6.169 4.808 2.5 2.5 3.967 4.653 4.808 6.169l3.648 -3.648Z" stroke-width="1"/>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/logo.php b/images/siteicons/svg/logo.php
new file mode 100644
index 000000000..9cb5f791d
--- /dev/null
+++ b/images/siteicons/svg/logo.php
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" xmlns="http://www.w3.org/2000/svg" width="2146" height="798" viewBox="0 0 2146 798" preserveAspectRatio="xMidYMid meet">
+<path d="M0 0 C0.76655914 -0.01243744 1.53311829 -0.02487488 2.32290649 -0.03768921 C63.37476978 -0.83358072 63.37476978 -0.83358072 82.09375 16.875 C84.97342812 19.89873706 87.67151866 23.06656261 90.34375 26.2734375 C91.17519531 27.25699219 92.00664063 28.24054687 92.86328125 29.25390625 C104.34375 43.05712324 104.34375 43.05712324 104.34375 46.2734375 C105.21386719 46.65628906 105.21386719 46.65628906 106.1015625 47.046875 C116.77422212 52.88522887 122.85483536 64.93315104 127.94921875 75.40625 C130.76891834 81.18645209 133.74473121 86.88401076 136.71875 92.5859375 C137.56614746 94.21269409 137.56614746 94.21269409 138.43066406 95.87231445 C142.04093355 102.79545773 145.67691529 109.70470745 149.32373047 116.60864258 C153.73879587 124.98813102 158.06679845 133.41262347 162.40444946 141.83233643 C166.35311724 149.49591359 170.311297 157.15349182 174.34375 164.7734375 C178.73731325 173.07575701 183.04193906 181.42335853 187.34375 189.7734375 C192.49878639 199.77883769 197.68495073 209.76617733 202.94140625 219.71875 C210.69555882 234.40303561 218.32102238 249.15471703 225.94238281 263.90820312 C230.16902416 272.08852411 234.42067912 280.25479158 238.71850586 288.39794922 C246.87898084 303.86007838 254.92313639 319.38262285 262.94641113 334.91625977 C266.69645693 342.17535432 270.46141688 349.4257765 274.28125 356.6484375 C279.05520521 365.67518266 283.72744131 374.75399725 288.4039917 383.8314209 C292.74677593 392.25959449 297.11347552 400.67374053 301.546875 409.0546875 C305.693482 416.90706621 309.7600578 424.80072056 313.83380127 432.69104004 C317.62111084 440.02535897 321.42148637 447.35189803 325.28125 454.6484375 C329.69452565 462.99299282 334.02033082 471.38212154 338.34375 479.7734375 C342.88119547 488.57828636 347.42114228 497.38132157 352.03125 506.1484375 C352.40443359 506.85935547 352.77761719 507.57027344 353.16210938 508.30273438 C356.50681719 514.64361556 359.97649421 520.91291482 363.5546875 527.125 C370.61928174 539.40041581 376.62470814 551.64646926 381.15625 565.0859375 C381.4464502 565.94533936 381.73665039 566.80474121 382.03564453 567.69018555 C385.72598417 579.01702446 386.6507061 589.26788202 386.21875 601.1484375 C386.19452972 601.87820801 386.17030945 602.60797852 386.14535522 603.35986328 C385.21433697 629.90350969 378.18779951 660.80845406 361.34375 682.2734375 C360.35375 682.6034375 359.36375 682.9334375 358.34375 683.2734375 C358.034375 684.0778125 357.725 684.8821875 357.40625 685.7109375 C356.12432087 688.80264894 355.25503311 688.90877354 352.34375 690.2734375 C352.06789063 690.86253906 351.79203125 691.45164062 351.5078125 692.05859375 C345.89672537 702.73472263 327.17815705 714.6993958 316.34375 719.2734375 C313.94877625 719.52232647 313.94877625 719.52232647 311.2331543 719.52067566 C309.68128575 719.52697117 309.68128575 719.52697117 308.09806633 719.53339386 C306.40016803 719.52496082 306.40016803 719.52496082 304.66796875 719.51635742 C303.46832552 719.51823311 302.26868229 719.5201088 301.03268623 719.52204132 C297.726094 719.52507355 294.41974766 719.51911024 291.11318445 719.50905585 C287.60466258 719.50037763 284.09614605 719.50274958 280.58761597 719.50361633 C273.8367131 719.50334341 267.08587469 719.49181568 260.33499205 719.47602159 C254.90319918 719.46353135 249.47141657 719.45564993 244.03961182 719.45068359 C206.57185984 719.41526062 169.11266754 719.25683772 131.65052795 718.55973816 C130.44714279 718.53744644 129.24375763 718.51515472 128.00390625 718.4921875 C126.84600082 718.47066116 125.6880954 718.44913483 124.49510193 718.42695618 C111.148675 718.19400404 97.80365433 718.24092617 84.45581055 718.28369141 C69.51285802 718.32733388 54.58695131 718.16345594 39.64746094 717.84619141 C13.81278848 717.29800482 -12.00426219 717.22701112 -37.84375 717.2734375 C-69.0981899 717.32950771 -100.33974407 717.16109857 -131.59134293 716.73699951 C-151.31392652 716.46935927 -171.0331003 716.22884403 -190.7578125 716.2421875 C-191.96491127 716.24295036 -191.96491127 716.24295036 -193.19639587 716.24372864 C-200.78547434 716.25000682 -208.37445194 716.26682622 -215.9634552 716.30132294 C-228.67918678 716.35791115 -241.39092669 716.36991292 -254.1015625 715.9609375 C-255.06005096 715.93845947 -256.01853943 715.91598145 -257.006073 715.89282227 C-264.75541003 715.58530682 -270.77388775 713.59001122 -277.50390625 709.63671875 C-278.34904785 709.14606934 -279.19418945 708.65541992 -280.06494141 708.14990234 C-281.37857666 707.37573975 -281.37857666 707.37573975 -282.71875 706.5859375 C-288.39112194 703.27514883 -294.05020064 700.02202987 -299.92407227 697.08178711 C-306.64691753 693.70313094 -311.89843452 689.84338785 -317.2890625 684.5703125 C-319.61086532 682.2356244 -319.61086532 682.2356244 -322.2109375 680.27734375 C-324.75367154 678.19360164 -326.63539209 676.04812455 -328.65625 673.4609375 C-329.6153125 672.24470703 -329.6153125 672.24470703 -330.59375 671.00390625 C-331.274375 670.10285156 -331.955 669.20179688 -332.65625 668.2734375 C-333.46835937 667.25121094 -334.28046875 666.22898437 -335.1171875 665.17578125 C-338.47893327 660.41802361 -340.33613438 655.10311834 -342.28125 649.6484375 C-342.67368896 648.54902832 -343.06612793 647.44961914 -343.47045898 646.31689453 C-346.95090936 636.14033638 -349.05849584 626.01366762 -349.65625 615.2734375 C-349.7176416 614.24476563 -349.7790332 613.21609375 -349.84228516 612.15625 C-350.17853242 601.10154537 -348.37103992 590.52020065 -346.45800781 579.66552734 C-345.90529368 576.51799154 -345.37716777 573.36700719 -344.8515625 570.21484375 C-344.50145151 568.17683345 -344.14993707 566.13906364 -343.796875 564.1015625 C-343.64252991 563.17732483 -343.48818481 562.25308716 -343.3291626 561.30084229 C-341.51572514 551.18539354 -337.8773061 542.13616631 -332.96875 533.1484375 C-332.07938425 531.4909084 -331.19006221 529.83335585 -330.30078125 528.17578125 C-329.85686035 527.3544873 -329.41293945 526.53319336 -328.95556641 525.68701172 C-327.74180723 523.43236625 -326.54444393 521.17013677 -325.35546875 518.90234375 C-320.29967684 509.25971589 -315.05374609 499.73150426 -309.74609375 490.22558594 C-306.12805911 483.74489486 -302.62450656 477.24482467 -299.34375 470.5859375 C-296.39549052 464.63071425 -293.20546915 458.85401433 -289.91601562 453.08178711 C-287.78013488 449.31815853 -285.74407774 445.53852017 -283.84375 441.6484375 C-280.57424109 434.97394279 -276.97462962 428.48854639 -273.39794922 421.97558594 C-269.84374468 415.48891637 -266.37808275 408.96227863 -262.96875 402.3984375 C-259.34904034 395.43188661 -255.60684561 388.55639209 -251.71801758 381.73681641 C-249.05075505 377.03824286 -246.62417323 372.25230277 -244.25 367.3984375 C-241.96442237 362.91691273 -239.46193975 358.56593568 -236.97265625 354.1953125 C-234.7490888 350.27225073 -232.63849911 346.32603567 -230.65625 342.2734375 C-228.32268595 337.50259545 -225.78321142 332.88618896 -223.15625 328.2734375 C-220.60028724 323.78228324 -218.11286757 319.29376963 -215.84375 314.6484375 C-213.11292088 309.0745534 -210.14819614 303.64724628 -207.15625 298.2109375 C-201.78058718 288.44087689 -196.62134982 278.56824043 -191.55273438 268.63647461 C-188.53583245 262.75836759 -185.38009243 257.03722991 -181.93359375 251.40039062 C-180.42032629 248.88059205 -179.10636802 246.30193951 -177.84375 243.6484375 C-175.44597236 238.75218815 -172.85456024 234.00737403 -170.15625 229.2734375 C-167.52895443 224.6608934 -164.98979941 220.04424962 -162.65625 215.2734375 C-160.32268043 210.50258416 -157.78309577 205.88626318 -155.15625 201.2734375 C-152.03670057 195.78901654 -149.09479804 190.2627242 -146.3125 184.59765625 C-141.50648711 174.95162566 -136.55095355 165.34438761 -131.03125 156.0859375 C-127.95012392 150.91456391 -125.28559515 145.59413494 -122.63623047 140.19458008 C-120.12676842 135.1168878 -117.34420685 130.26056532 -114.4375 125.3984375 C-112.36150885 121.75634776 -110.50225627 118.03576987 -108.65625 114.2734375 C-105.76383234 108.38356249 -102.66152652 102.6927522 -99.296875 97.0546875 C-97.72385869 94.38805032 -96.24222907 91.69023907 -94.78125 88.9609375 C-91.32058926 82.57202537 -87.59800711 76.35718767 -83.79882812 70.16552734 C-82.71457669 68.3700255 -81.67417328 66.55548669 -80.640625 64.73046875 C-75.52966768 55.96124591 -69.09949667 49.55394715 -61.5234375 42.84375 C-56.2916332 38.15146937 -51.78346813 32.936375 -47.71875 27.2109375 C-37.58824601 13.52540176 -17.19372546 0.25306864 0 0 Z M-5.65625 317.2734375 C-6.88472656 317.61375 -8.11320312 317.9540625 -9.37890625 318.3046875 C-45.14701043 329.25335227 -73.58383706 355.1875031 -91.03125 387.8359375 C-102.68871392 410.50791506 -107.88605557 434.19934572 -107.90625 459.6484375 C-107.90692474 460.41043457 -107.90759949 461.17243164 -107.90829468 461.95751953 C-107.89229312 473.32550186 -107.41189941 484.20744382 -104.65625 495.2734375 C-104.48996094 495.99273438 -104.32367187 496.71203125 -104.15234375 497.453125 C-96.1055296 531.90541075 -75.07697562 565.94383794 -44.94921875 585.29296875 C-43.86253906 585.94652344 -42.77585937 586.60007812 -41.65625 587.2734375 C-41.04990723 587.64903809 -40.44356445 588.02463867 -39.81884766 588.41162109 C-12.67051817 605.14425046 21.60319019 611.53519416 52.90234375 604.2421875 C54.03800781 603.9225 55.17367187 603.6028125 56.34375 603.2734375 C57.57222656 602.933125 58.80070313 602.5928125 60.06640625 602.2421875 C95.83451043 591.29352273 124.27133706 565.3593719 141.71875 532.7109375 C153.37621392 510.03895994 158.57355557 486.34752928 158.59375 460.8984375 C158.59442474 460.13644043 158.59509949 459.37444336 158.59579468 458.58935547 C158.57979312 447.22137314 158.09939941 436.33943118 155.34375 425.2734375 C155.17746094 424.55414063 155.01117187 423.83484375 154.83984375 423.09375 C146.7930296 388.64146425 125.76447562 354.60303706 95.63671875 335.25390625 C94.55003906 334.60035156 93.46335937 333.94679688 92.34375 333.2734375 C91.73740723 332.89783691 91.13106445 332.52223633 90.50634766 332.13525391 C62.55579679 314.90818259 26.29678072 308.27871376 -5.65625 317.2734375 Z " fill="#8EBEF9" transform="translate(876.65625,31.7265625)" class="accent-color"/>
+<path d="M0 0 C10.81138995 7.3905986 14.39230898 20.38000632 17.52734375 32.46875 C17.90318604 33.91697395 17.90318604 33.91697395 18.28662109 35.39445496 C22.83811775 53.29244117 26.72671162 71.35896137 30.76063156 89.37862015 C32.01130145 94.96250137 33.26573326 100.54553746 34.51977539 106.12866211 C36.08333521 113.09095539 37.64634038 120.05337175 39.20729065 127.01625061 C42.6607968 142.41922583 46.13234482 157.81803861 49.61523056 173.21439552 C51.15298227 180.01492448 52.68763712 186.81615286 54.22208977 193.61742687 C55.44892253 199.05433334 56.67752289 204.49082755 57.91015625 209.92642212 C59.06413516 215.01568601 60.21307407 220.10606151 61.3581562 225.19733429 C61.77880496 227.06341029 62.20131317 228.92906825 62.62580681 230.79427338 C63.20396518 233.33580469 63.77552854 235.87873215 64.34545898 238.42211914 C64.51509407 239.16050176 64.68472916 239.89888437 64.8595047 240.65964222 C65.66564395 244.2906227 66.19214369 247.64461268 66 251.3671875 C66.66 251.3671875 67.32 251.3671875 68 251.3671875 C68.08763611 250.78816177 68.17527222 250.20913605 68.26556396 249.61256409 C69.82861978 240.1821088 72.38643633 231.04501273 74.890625 221.83203125 C75.38865247 219.9864127 75.88626126 218.14068113 76.38348389 216.29484558 C77.72230126 211.3289555 79.06647693 206.36453064 80.41168213 201.40036774 C81.82051709 196.19792283 83.2246265 190.99420333 84.62890625 185.79052734 C85.20128175 183.66973548 85.7736695 181.54894692 86.34606934 179.42816162 C86.77371834 177.84368351 86.77371834 177.84368351 87.21000671 176.22719574 C88.08243492 172.99575498 88.95550778 169.76448899 89.82873535 166.53326416 C93.39903998 153.31928587 96.95147938 140.10066826 100.48375702 126.87647438 C101.22973114 124.08379133 101.97615535 121.29122896 102.72271729 118.498703 C105.53667204 107.9734392 105.53667204 107.9734392 108.34436035 97.44650269 C112.53498514 81.71727462 116.74794336 65.99502318 121.24136353 50.34905624 C121.78730576 48.44714475 122.32870003 46.54392954 122.86987305 44.64065552 C127.38155573 29.10708898 132.74264547 11.8126888 147.41796875 2.8984375 C160.57004633 -3.94621407 177.55821584 -5.38572092 191.875 -1.0703125 C202.97103217 3.54499363 211.53510148 12.40895075 216.27392578 23.38037109 C219.73061508 31.80236479 222.09387829 40.51428606 224.5390625 49.26953125 C225.06301417 51.12590768 225.58732474 52.98218284 226.11196899 54.83836365 C231.74461068 74.82476722 237.1634315 94.86996409 242.56391144 114.92007446 C243.95349952 120.07625914 245.34670075 125.23146724 246.73974609 130.38671875 C247.31046326 132.49892974 247.88117246 134.61114288 248.45187378 136.72335815 C248.73559719 137.77343929 249.0193206 138.82352043 249.31164169 139.90542221 C250.17065055 143.08531108 251.02924965 146.26531031 251.88772583 149.44534302 C257.53523914 170.36349771 263.21250578 191.27353943 268.8952713 212.18214035 C270.09627749 216.60125976 271.29689905 221.02048366 272.49755859 225.43969727 C274.66461584 233.41564239 276.83211814 241.39146646 279 249.3671875 C280.70371662 246.2779687 281.5824788 243.37328033 282.34768677 239.93510437 C282.59656647 238.82898804 282.84544617 237.7228717 283.10186768 236.58323669 C283.36876404 235.37200638 283.6356604 234.16077606 283.91064453 232.9128418 C284.19735016 231.63154388 284.48405579 230.35024597 284.77944946 229.03012085 C285.5701973 225.4957451 286.35442662 221.95995038 287.13761377 218.42389274 C287.97503632 214.64857098 288.81864664 210.8746322 289.66159058 207.10054016 C291.27575543 199.86923943 292.88467345 192.63678206 294.49161136 185.40387231 C296.25612523 177.46246414 298.02519397 169.5220742 299.79526567 161.58190322 C300.31774255 159.23814618 300.84012381 156.89436785 301.36248398 154.55058479 C303.1124322 146.69905599 304.86316189 138.84770189 306.61480713 130.99655151 C306.78920106 130.21484537 306.96359499 129.43313924 307.14327359 128.62774503 C308.02522759 124.6744949 308.90731091 120.7212737 309.78958511 116.76809502 C311.7925133 107.79184998 313.78935714 98.81428002 315.78053439 89.83542103 C317.2378087 83.26606116 318.70093684 76.69802066 320.16812742 70.13086849 C321.03308894 66.25825038 321.89539364 62.38508917 322.7506752 58.51032066 C323.54569609 54.90874251 324.34823152 51.30891746 325.1562314 47.71022964 C325.58439558 45.79449551 326.00482541 43.87703765 326.42486191 41.95950508 C330.04449189 25.92488135 334.20398548 8.7828331 349 -0.6328125 C357.77321472 -4.27376379 370.59061667 -4.32903252 379.5625 -1.1953125 C386.81311309 2.39824881 394.20572937 8.48579595 397.31640625 16.12109375 C403.61822959 36.82708472 395.65485072 59.15063472 390.60549545 79.43080902 C389.85961643 82.4341009 389.12162872 85.439311 388.38356876 88.44453239 C385.85976055 98.72042318 383.31275349 108.99051723 380.7635498 119.26013184 C378.96909932 126.48981388 377.17802373 133.72032992 375.38722932 140.9509182 C368.94465014 166.96324723 362.49496074 192.97381274 356.03344727 218.98144531 C355.84453261 219.74185057 355.65561796 220.50225582 355.46097863 221.28570366 C353.40877425 229.54548616 351.35466307 237.8047893 349.29658508 246.06311035 C348.75325565 248.24356139 348.20994522 250.42401715 347.66665852 252.60447884 C347.31040402 254.03428469 346.95411875 255.46408287 346.59780204 256.89387321 C344.43460474 265.57587114 342.2849872 274.2609967 340.15405941 282.95097923 C338.98834278 287.70206104 337.81648139 292.45161609 336.64383888 297.20099258 C336.11623604 299.34505433 335.59157374 301.48984258 335.07034874 303.63546371 C332.52733438 314.10137191 329.80779914 324.47721649 326.51049805 334.73388672 C326.24944432 335.57230165 325.9883906 336.41071659 325.71942616 337.27453804 C322.16160791 347.95726891 315.04158075 358.4706606 305.03515625 364.0078125 C299.35147597 366.5020379 294.19013817 368.06766469 288 368.3671875 C287.23300781 368.40585937 286.46601563 368.44453125 285.67578125 368.484375 C272.53167161 368.85579411 261.49228462 365.87709903 251.75 356.8046875 C243.11124047 348.44132466 239.64213837 336.17246933 236.2578125 324.95703125 C235.82843613 323.55832708 235.39900129 322.15964086 234.96951294 320.76097107 C230.10013672 304.77776023 225.81999069 288.63259617 221.55051041 272.4811821 C220.38697676 268.08635742 219.21515243 263.69374501 218.04370117 259.30102539 C217.55642673 257.47349962 217.06916795 255.64596968 216.58192444 253.81843567 C216.21565288 252.44466735 216.21565288 252.44466735 215.84198189 251.04314613 C215.09422802 248.23713529 214.34739496 245.43088084 213.60081482 242.6245575 C208.14326137 222.11510371 202.61114676 201.62584525 197.07736969 181.13685226 C194.90073901 173.07720917 192.72562582 165.01715647 190.55078125 156.95703125 C190.3231031 156.11334299 190.09542496 155.26965473 189.86084747 154.40040016 C184.5526313 134.72837166 179.27416959 115.04836718 174 95.3671875 C169.52599619 109.03461432 165.79066871 122.88938409 162.04961967 136.77177691 C161.15031108 140.10606425 160.24727364 143.43934153 159.34460449 146.77272034 C157.81048793 152.43952088 156.27833416 158.10684871 154.74749756 163.77453613 C152.36591403 172.59137238 149.9788339 181.40671544 147.59033203 190.22167969 C147.39325079 190.94904414 147.19616954 191.67640859 146.99311614 192.42581439 C146.00325597 196.07900969 145.01331641 199.73218347 144.02331924 203.38534164 C143.04157283 207.0081185 142.06007052 210.63096144 141.07864082 214.25382411 C135.41085847 235.17564603 129.74171723 256.09707579 124.00421143 276.99990845 C123.26748959 279.68415967 122.53303499 282.36901152 121.80096436 285.05453491 C118.33815948 297.74399621 114.77713603 310.40325093 110.9558754 322.98987579 C110.40632804 324.80513614 109.86602535 326.62318744 109.32614136 328.44134521 C104.68851032 343.497614 98.52664845 356.36515049 84.31640625 364.21875 C73.21930253 369.72051812 59.7800719 369.69389266 48 366.3671875 C35.36673866 361.64372477 28.41667851 353.89444249 22.80810547 341.78735352 C20.74174421 336.94697731 19.25465392 331.98357283 17.8046875 326.9296875 C17.50581131 325.89480698 17.20693512 324.85992645 16.89900208 323.79368591 C13.02593829 310.18770001 9.6504894 296.45268434 6.25495529 282.72177505 C5.47645512 279.5772268 4.69422211 276.43361162 3.91199589 273.28998852 C1.26482675 262.6514855 -1.36948582 252.0098192 -4 241.3671875 C-4.18543365 240.61710419 -4.37086731 239.86702087 -4.56192017 239.09420776 C-7.95740326 225.35911132 -11.34725677 211.62263094 -14.7265625 197.88354492 C-19.01885916 180.43524147 -23.33060358 162.99190255 -27.66301155 145.55351067 C-28.51515953 142.1229676 -29.36685198 138.69231179 -30.21836853 135.26161194 C-30.64040605 133.56126313 -30.64040605 133.56126313 -31.07096958 131.82656384 C-31.63940133 129.536337 -32.20781347 127.24610529 -32.77620602 124.95586872 C-34.44218076 118.24426445 -36.11103937 111.53338558 -37.78198051 104.82301617 C-38.83362408 100.5966341 -39.88244027 96.36955376 -40.93058014 92.14230156 C-41.41561422 90.18858008 -41.90178636 88.23514067 -42.3892746 86.28203011 C-44.98863538 75.86532718 -47.47554762 65.43230959 -49.77026367 54.94384766 C-49.97988141 53.98950018 -50.18949915 53.0351527 -50.40546894 52.0518856 C-53.22087054 39.00599999 -55.56087831 25.68322223 -49 13.3671875 C-46.90336451 10.41599916 -44.60697316 7.87297677 -42 5.3671875 C-41.236875 4.6246875 -40.47375 3.8821875 -39.6875 3.1171875 C-28.69273247 -4.04219601 -12.08968599 -6.08682107 0 0 Z " fill="#FFFFFF" transform="translate(145,193.6328125)" class="text-color"/>
+<path d="M0 0 C35.84808566 -0.85992409 68.72655009 13.86279043 94.48046875 38.125 C95.14433594 38.72441406 95.80820313 39.32382812 96.4921875 39.94140625 C103.33897079 46.37154958 110.59668849 54.85225169 114.55078125 63.453125 C115.35939464 65.3010285 115.35939464 65.3010285 117.3984375 65.98046875 C124.48837726 69.87794032 127.8219759 85.60425199 130.29296875 92.9375 C130.58276611 93.79577393 130.87256348 94.65404785 131.17114258 95.53833008 C134.86233892 106.86633441 135.78747466 117.11807461 135.35546875 129 C135.31913834 130.09465576 135.31913834 130.09465576 135.28207397 131.21142578 C134.35105572 157.75507219 127.32451826 188.66001656 110.48046875 210.125 C109.49046875 210.455 108.50046875 210.785 107.48046875 211.125 C107.17109375 211.929375 106.86171875 212.73375 106.54296875 213.5625 C105.26103962 216.65421144 104.39175186 216.76033604 101.48046875 218.125 C101.20460938 218.71410156 100.92875 219.30320312 100.64453125 219.91015625 C95.00525687 230.63991656 76.33511235 242.46766159 65.48046875 247.125 C63.31721878 247.37109566 63.31721878 247.37109566 60.93731689 247.36550903 C60.03150375 247.36825836 59.12569061 247.37100769 58.19242859 247.37384033 C56.71320671 247.3630545 56.71320671 247.3630545 55.20410156 247.35205078 C53.63777733 247.35248886 53.63777733 247.35248886 52.03981018 247.35293579 C48.58765357 247.35154224 45.13571267 247.33597962 41.68359375 247.3203125 C39.29034544 247.31658247 36.8970956 247.31373545 34.50384521 247.31173706 C28.20407904 247.30409988 21.90440504 247.28445055 15.60467529 247.2623291 C9.17656705 247.24187258 2.74844391 247.23273575 -3.6796875 247.22265625 C-16.29300808 247.20120483 -28.90626476 247.16745207 -41.51953125 247.125 C-41.51953125 246.465 -41.51953125 245.805 -41.51953125 245.125 C-42.50050781 245.22941406 -43.48148438 245.33382812 -44.4921875 245.44140625 C-59.29491892 246.52714951 -68.26655763 239.93034489 -79.26953125 230.75 C-81.38479825 228.90870313 -83.45804965 227.02615899 -85.51953125 225.125 C-86.93878906 223.82949219 -86.93878906 223.82949219 -88.38671875 222.5078125 C-109.24372713 202.59616427 -121.7959598 176.36733277 -126.51953125 148.125 C-126.65230469 147.36316406 -126.78507813 146.60132813 -126.921875 145.81640625 C-130.26684608 122.30996564 -125.28951 98.92580104 -116.328125 77.2421875 C-115.35487445 74.9621093 -115.35487445 74.9621093 -115.14453125 71.6875 C-114.42571806 67.59026481 -113.12222345 65.34009036 -110.51953125 62.125 C-109.03453125 61.63 -109.03453125 61.63 -107.51953125 61.125 C-105.84881628 58.94606055 -104.29783365 56.77460841 -102.76953125 54.5 C-99.08526211 49.17349964 -95.32685735 44.49415836 -90.51953125 40.125 C-89.75640625 39.34125 -88.99328125 38.5575 -88.20703125 37.75 C-87.32015625 36.88375 -86.43328125 36.0175 -85.51953125 35.125 C-84.84664062 34.46757813 -84.17375 33.81015625 -83.48046875 33.1328125 C-60.90972496 11.8854348 -30.58239742 1.51726623 0 0 Z " fill="#2858C5" transform="translate(1127.51953125,503.875)" class="main-color"/>
+<path d="M0 0 C0.73283203 0.19335938 1.46566406 0.38671875 2.22070312 0.5859375 C19.41256843 5.32650291 33.55631276 13.2396321 46 26 C46.73734375 26.72832031 47.4746875 27.45664062 48.234375 28.20703125 C68.25055796 49.11540841 73.13407704 79.44066264 73.203125 107.1796875 C73.20736607 108.33980032 73.20736607 108.33980032 73.21169281 109.52334976 C73.22661969 113.62364279 73.23588782 117.72390128 73.24023438 121.82421875 C73.2446041 125.17361433 73.25844598 128.52275017 73.28125 131.87207031 C73.50792641 165.8372186 72.30852983 200.53986772 48 227 C47.26394531 227.82757812 46.52789063 228.65515625 45.76953125 229.5078125 C29.13542329 247.25447907 4.232332 257.07553786 -19.8737793 258.17700195 C-21.27383018 258.20317356 -22.67400309 258.22333081 -24.07421875 258.23828125 C-24.83183502 258.2480751 -25.58945129 258.25786896 -26.37002563 258.26795959 C-58.19429958 258.59487255 -58.19429958 258.59487255 -73 254 C-73.70801758 253.78569336 -74.41603516 253.57138672 -75.14550781 253.35058594 C-98.49212752 246.04346624 -117.71527471 230.34618212 -129.1875 208.6796875 C-139.51939592 188.18006774 -142.14680045 166.04884842 -142.16796875 143.3359375 C-142.17129715 142.0638443 -142.17462555 140.7917511 -142.17805481 139.48110962 C-142.18308866 136.80361397 -142.18590045 134.12622004 -142.18530273 131.44873047 C-142.18522169 128.74358402 -142.19213844 126.03860768 -142.20581055 123.33349609 C-142.39149625 86.00721507 -139.30880584 50.71482947 -111.80859375 22.7734375 C-83.33435517 -3.61235067 -36.74168409 -9.74131105 0 0 Z M-57 58 C-57.87785156 58.4125 -58.75570313 58.825 -59.66015625 59.25 C-69.96210483 64.71951116 -76.26377919 74.1244115 -80 85 C-82.24534705 93.03957091 -82.31008219 100.80830756 -82.30078125 109.11328125 C-82.3046783 110.57382832 -82.309015 112.03437428 -82.31376648 113.49491882 C-82.3211921 116.54507126 -82.32096463 119.59510787 -82.31567383 122.64526367 C-82.30989074 126.52155778 -82.32679968 130.39737226 -82.3500185 134.27358723 C-82.36487315 137.28766066 -82.36561165 140.30162176 -82.36250877 143.31572533 C-82.36301634 144.74322647 -82.36814576 146.17073487 -82.37832069 147.59819984 C-82.47978577 163.82363387 -79.31314901 178.05575996 -67.97265625 190.21875 C-57.7778462 199.42436066 -45.40018765 201.98538693 -32 202 C-18.01242667 201.10648486 -6.44194831 196.53788873 3 186 C12.76533669 173.35136346 14.14422936 158.15442025 14.203125 142.75 C14.20882507 141.57848389 14.21452515 140.40696777 14.22039795 139.19995117 C14.22981475 136.72559502 14.23636867 134.25122652 14.24023438 131.77685547 C14.24989707 128.03980894 14.2809357 124.303323 14.3125 120.56640625 C14.40386608 100.20978974 14.11914888 80.60463981 -0.80859375 64.96875 C-12.90121867 54.1047875 -27.01877662 52.98456374 -42.59179688 53.78857422 C-47.82476893 54.24799776 -52.30468799 55.71309004 -57 58 Z " fill="#FFFFFF" transform="translate(1734,306)" class="text-color"/>
+<path d="M0 0 C-1.52848492 5.07882646 -4.65105172 8.33386385 -8.125 12.1875 C-9.31131538 13.52869363 -10.49621382 14.87114193 -11.6796875 16.21484375 C-12.25299805 16.86437012 -12.82630859 17.51389648 -13.41699219 18.18310547 C-16.07640665 21.2354439 -18.58234535 24.40193654 -21.0859375 27.58203125 C-24.0421601 31.3165247 -27.08425348 34.98006301 -30.1171875 38.65234375 C-32.09774658 41.05145848 -32.09774658 41.05145848 -34 44 C-37.35200764 43.31556885 -40.08493261 42.05033835 -43.12109375 40.48828125 C-56.48224196 33.75216032 -69.38230745 28.28472769 -84 25 C-85.13953125 24.73703125 -86.2790625 24.4740625 -87.453125 24.203125 C-104.44429851 20.97915874 -126.50646013 20.91775213 -141.9453125 29.546875 C-146.64751407 32.87238637 -150.61353984 37.31551333 -152 43 C-152.44172322 48.56571258 -152.33863108 52.30505005 -149 57 C-139.85862181 64.88667922 -127.11019634 65.55741089 -115.61221313 66.70678711 C-112.44906757 67.02412167 -109.28850032 67.3643314 -106.12760925 67.70327759 C-104.49783233 67.87798062 -102.86795885 68.05178512 -101.23799133 68.22470093 C-30.88944085 75.69396589 -30.88944085 75.69396589 -12 98 C1.91562321 116.44033505 3.02544534 140.35173998 0.5703125 162.61328125 C-1.69787949 176.7684794 -7.18739546 189.48649513 -17 200 C-17.62648438 200.70511719 -18.25296875 201.41023437 -18.8984375 202.13671875 C-36.02784411 220.48965441 -63.88515335 227.95308369 -88.27560425 229.10772705 C-90.62682595 229.16308415 -92.97628887 229.19027737 -95.328125 229.203125 C-96.19106674 229.21018463 -97.05400848 229.21724426 -97.94309998 229.22451782 C-133.84742069 229.45166205 -133.84742069 229.45166205 -149 226 C-150.35883301 225.70198486 -150.35883301 225.70198486 -151.74511719 225.39794922 C-174.45383332 220.29937269 -194.66902165 211.99265624 -213.8125 198.75 C-214.41819824 198.33766113 -215.02389648 197.92532227 -215.64794922 197.50048828 C-217.8937693 195.89540086 -219.7305273 194.43933834 -221.18359375 192.0703125 C-220.8780923 188.62529611 -218.49856179 186.56592643 -216.25 184.125 C-215.21911266 182.9590092 -214.19053274 181.79097499 -213.1640625 180.62109375 C-212.36983887 179.72173096 -212.36983887 179.72173096 -211.55957031 178.80419922 C-209.14518223 176.01109842 -206.8840037 173.10664822 -204.625 170.1875 C-198.53702753 162.36026619 -192.27302148 154.67921548 -186 147 C-181.68506687 149.38229957 -177.37504446 151.76961865 -173.11328125 154.24609375 C-152.14861033 166.38453752 -130.23909393 174.43240005 -105.8125 174.3125 C-104.62648193 174.30758545 -103.44046387 174.3026709 -102.21850586 174.29760742 C-87.16327555 174.09728194 -70.72725633 172.45729963 -59 162 C-54.60436719 156.10468071 -53.27667122 150.25959069 -54 143 C-54.94127487 138.90878956 -56.21244544 135.85915042 -59.0625 132.75 C-65.55716307 128.88083902 -72.03496754 126.82055204 -79.4765625 125.53125 C-80.57470779 125.33963539 -80.57470779 125.33963539 -81.69503784 125.14414978 C-90.48609802 123.67110739 -99.33961773 122.77949322 -108.20281982 121.8659668 C-176.01531195 114.82367695 -176.01531195 114.82367695 -194 95 C-208.18646826 76.37515491 -209.01167584 53.85718733 -206.72753906 31.31054688 C-204.46253745 16.43725019 -196.82911525 2.29434413 -186 -8 C-185.34128906 -8.64324219 -184.68257812 -9.28648437 -184.00390625 -9.94921875 C-138.1887483 -52.44577371 -45.06825336 -33.9337437 0 0 Z " fill="#FFFFFF" transform="translate(2071,335)" class="text-color"/>
+<path d="M0 0 C19.47 0 38.94 0 59 0 C59.01458252 8.59160156 59.02916504 17.18320313 59.04418945 26.03515625 C59.09295165 53.52794707 59.15636208 81.02068666 59.22898628 108.5134244 C59.24025439 112.78417717 59.25139285 117.05493027 59.26245117 121.32568359 C59.26465486 122.17591032 59.26685854 123.02613705 59.269129 123.90212822 C59.3044972 137.66718227 59.32936403 151.43223627 59.35034702 165.19731891 C59.37211287 179.32254891 59.40517076 193.44771996 59.44870156 207.57289982 C59.47520476 216.28823456 59.49290994 225.00349587 59.49934604 233.71886891 C59.504604 239.69608641 59.52083467 245.67321151 59.54566566 251.65037948 C59.55966672 255.0984193 59.56885671 258.54629377 59.56500816 261.99436378 C59.56335858 265.73585686 59.58002914 269.47683871 59.60127258 273.21826172 C59.59642501 274.30387925 59.59157743 275.38949678 59.58658296 276.50801182 C59.644664 282.70331354 60.31171664 287.38421297 63 293 C72.33004539 301.87492123 77.72610297 298.64384191 94 300 C94 318.48 94 336.96 94 356 C83.605 356.12375 83.605 356.12375 73 356.25 C70.84855469 356.28641602 68.69710938 356.32283203 66.48046875 356.36035156 C47.42165918 356.54843263 31.00968748 353.82298501 16.625 340.1875 C3.25486262 325.98172903 -0.33724668 308.19247314 -0.24050903 289.21211243 C-0.24221788 287.96948094 -0.24392673 286.72684945 -0.24568737 285.44656247 C-0.24839518 282.02805291 -0.24220934 278.60977645 -0.23213124 275.19129527 C-0.22344461 271.49343116 -0.22642057 267.79557347 -0.22793579 264.09770203 C-0.22898136 257.70105114 -0.22273915 251.30444125 -0.21146011 244.90780067 C-0.19516346 235.65948921 -0.18999286 226.41119744 -0.18748413 217.16287317 C-0.18311355 202.1558528 -0.16982176 187.14885424 -0.15087891 172.1418457 C-0.1325036 157.56925566 -0.11835518 142.99667156 -0.10986328 128.42407227 C-0.10933783 127.52488956 -0.10881239 126.62570685 -0.10827102 125.69927619 C-0.10566083 121.18806368 -0.10313344 116.67685114 -0.10064721 112.16563857 C-0.07993455 74.77707299 -0.04307551 37.38854781 0 0 Z " fill="#FFFFFF" transform="translate(1454,205)" class="text-color"/>
+<path d="M0 0 C19.47 0 38.94 0 59 0 C59.01458252 8.55607178 59.02916504 17.11214355 59.04418945 25.92749023 C59.09295956 53.31175397 59.15637219 80.69596632 59.22898628 108.0801768 C59.24025428 112.33461952 59.25139276 116.58906258 59.26245117 120.84350586 C59.26465486 121.69047966 59.26685854 122.53745346 59.269129 123.41009314 C59.3044898 137.11950612 59.32936081 150.82891905 59.35034702 164.53836071 C59.37211877 178.60822504 59.40518226 192.67803025 59.44870156 206.74784428 C59.4751946 215.42786026 59.49290726 224.1078026 59.49934604 232.787857 C59.50460711 238.7421882 59.52084821 244.69642677 59.54566566 250.65070831 C59.55965608 254.08469527 59.56886071 257.5185165 59.56500816 260.95253372 C59.56335647 264.68053993 59.58004717 268.40803498 59.60127258 272.13597107 C59.59642501 273.21478481 59.59157743 274.29359856 59.58658296 275.40510362 C59.64512868 281.64073186 60.18758294 287.34099656 63 293 C72.11563772 301.89330509 78.33841876 298.69486823 94 300 C94 318.48 94 336.96 94 356 C83.5121875 356.0928125 83.5121875 356.0928125 72.8125 356.1875 C70.63374268 356.21481201 68.45498535 356.24212402 66.21020508 356.27026367 C47.44195845 356.40865513 31.38471469 353.97857628 17.25 340.41015625 C-0.63937627 321.24740424 -0.45881262 297.44118597 -0.34819686 272.78005314 C-0.33510095 269.11022624 -0.33963542 265.44041258 -0.34190369 261.77056885 C-0.34346796 255.43018766 -0.33414801 249.08989992 -0.31719017 242.74954224 C-0.29268888 233.58274608 -0.28498359 224.41599458 -0.2812262 215.24916923 C-0.27467906 200.37246749 -0.25476534 185.49581543 -0.22631836 170.61914062 C-0.19873261 156.17773688 -0.1775212 141.73634669 -0.16479492 127.29492188 C-0.16400675 126.40302678 -0.16321858 125.51113168 -0.16240653 124.59220946 C-0.15849109 120.11731832 -0.15470004 115.64242708 -0.15097082 111.16753578 C-0.11992908 74.11164639 -0.06465543 37.05584898 0 0 Z " fill="#FFFFFF" transform="translate(1308,205)" class="text-color"/>
+</svg>
diff --git a/images/siteicons/svg/notes.php b/images/siteicons/svg/notes.php
new file mode 100644
index 000000000..3ad502d6f
--- /dev/null
+++ b/images/siteicons/svg/notes.php
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Notepad-Text--Streamline-Plump.svg" height="48" width="48">
+  <desc>Notepad Text Streamline Icon: https://streamlinehq.com</desc>
+  <g id="notepad-text--content-notes-book-notepad-notebook">
+    <path id="Union" class="accent-color" d="M24 5.531c-7.4 0 -12.588 0.252 -15.855 0.492 -3.277 0.241 -5.853 2.735 -6.135 6.033 -0.256 2.984 -0.51 7.566 -0.51 13.975 0 6.41 0.254 10.991 0.51 13.976 0.282 3.297 2.858 5.791 6.135 6.032 3.267 0.24 8.455 0.492 15.855 0.492s12.588 -0.251 15.855 -0.492c3.277 -0.24 5.853 -2.735 6.135 -6.032 0.256 -2.985 0.51 -7.567 0.51 -13.976 0 -6.409 -0.254 -10.99 -0.51 -13.975 -0.282 -3.298 -2.858 -5.792 -6.135 -6.033 -3.267 -0.24 -8.455 -0.492 -15.855 -0.492Z" stroke-width="1"/>
+    <path id="Subtract" class="main-color" fill-rule="evenodd" d="M12.75 24A2.25 2.25 0 0 1 15 21.75h18a2.25 2.25 0 0 1 0 4.5H15A2.25 2.25 0 0 1 12.75 24ZM15 32.75a2.25 2.25 0 0 0 0 4.5h9a2.25 2.25 0 0 0 0 -4.5h-9Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Union_2" class="main-color" d="M13 12.531c-0.35 0 -0.665 -0.009 -0.944 -0.025 -1.58 -0.09 -2.465 -1.399 -2.513 -2.83a79.157 79.157 0 0 1 0 -5.29c0.048 -1.43 0.933 -2.74 2.513 -2.83a17.564 17.564 0 0 1 1.888 0c1.58 0.09 2.465 1.4 2.513 2.83a78.983 78.983 0 0 1 0 5.29c-0.048 1.431 -0.933 2.74 -2.513 2.83 -0.28 0.016 -0.593 0.025 -0.944 0.025Z" stroke-width="1"/>
+    <path id="Union_3" class="main-color" d="M24 12.531c-0.35 0 -0.665 -0.009 -0.944 -0.025 -1.58 -0.09 -2.465 -1.399 -2.513 -2.83a78.983 78.983 0 0 1 0 -5.29c0.048 -1.43 0.933 -2.74 2.513 -2.83a17.564 17.564 0 0 1 1.888 0c1.58 0.09 2.465 1.4 2.513 2.83a78.983 78.983 0 0 1 0 5.29c-0.048 1.431 -0.933 2.74 -2.513 2.83 -0.28 0.016 -0.593 0.025 -0.944 0.025Z" stroke-width="1"/>
+    <path id="Union_4" class="main-color" d="M35 12.531c-0.35 0 -0.665 -0.009 -0.944 -0.025 -1.58 -0.09 -2.465 -1.399 -2.513 -2.83a78.983 78.983 0 0 1 0 -5.29c0.048 -1.43 0.933 -2.74 2.513 -2.83a17.564 17.564 0 0 1 1.888 0c1.58 0.09 2.465 1.4 2.513 2.83a78.983 78.983 0 0 1 0 5.29c-0.048 1.431 -0.933 2.74 -2.513 2.83 -0.28 0.016 -0.593 0.025 -0.944 0.025Z" stroke-width="1"/>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/payment.php b/images/siteicons/svg/payment.php
new file mode 100644
index 000000000..7cc5b6926
--- /dev/null
+++ b/images/siteicons/svg/payment.php
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Payment-Recieve-7--Streamline-Plump.svg" height="48" width="48">
+  <desc>Payment Recieve 7 Streamline Icon: https://streamlinehq.com</desc>
+  <g id="payment-recieve-7--deposit-payment-finance-atm-withdraw-dollar">
+    <path id="Union" class="accent-color" fill="#8fbffa" d="M24 47.52C16.1987 47.52 10.7556 47.3224 7.3573 47.1364C4.0247 46.9545 1.2421 44.5335 0.9034 41.0985C0.6765 38.7988 0.48 35.575 0.48 31.3173C0.48 27.0597 0.6765 23.8359 0.9034 21.5362C1.2421 18.1001 4.0247 15.6802 7.3573 15.4983C10.7546 15.3122 16.1987 15.1147 24 15.1147C31.8013 15.1147 37.2444 15.3122 40.6428 15.4983C43.9753 15.6802 46.758 18.1012 47.0966 21.5362C47.3235 23.8359 47.52 27.0597 47.52 31.3173C47.52 35.575 47.3235 38.7988 47.0966 41.0985C46.758 44.5345 43.9753 46.9545 40.6428 47.1364C37.2454 47.3224 31.8013 47.52 24 47.52Z" stroke-width="1"/>
+    <path id="Vector_1565_Stroke" class="main-color" fill="#2859c5" fill-rule="evenodd" d="M23.4773 10.9333C24.6319 10.9333 25.568 9.9973 25.568 8.8427V2.5707C25.5715 0.9613 23.8315 -0.0484 22.436 0.7532C21.7855 1.1269 21.385 1.8205 21.3867 2.5707V8.8427C21.3867 9.9973 22.3227 10.9333 23.4773 10.9333Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Vector_1566_Stroke" class="main-color" fill="#2859c5" fill-rule="evenodd" d="M31.84 13.024C32.9946 13.0239 33.9307 12.0879 33.9307 10.9333V5.7067C33.9342 4.0973 32.1942 3.0876 30.7986 3.8892C30.1481 4.2629 29.7477 4.9565 29.7493 5.7067V10.9333C29.7493 12.088 30.6853 13.0241 31.84 13.024Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Vector_1567_Stroke" class="main-color" fill="#2859c5" fill-rule="evenodd" d="M15.1147 13.024C13.96 13.024 13.024 12.088 13.024 10.9333V5.7067C13.0205 4.0973 14.7605 3.0876 16.156 3.8892C16.8065 4.2629 17.207 4.9565 17.2053 5.7067V10.9333C17.2053 12.0879 16.2693 13.024 15.1147 13.024Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Subtract" class="main-color" fill="#2859c5" fill-rule="evenodd" d="M25.0453 22.432C25.0453 21.2249 23.7387 20.4705 22.6933 21.0741C22.2082 21.3542 21.9093 21.8718 21.9093 22.432V23.5725C20.8692 23.7502 19.8145 24.1139 18.9542 24.7704C17.9015 25.5732 17.2053 26.7733 17.2053 28.312C17.2053 29.1984 17.4165 29.9992 17.8503 30.6891C18.2778 31.3706 18.8622 31.8494 19.4653 32.1933C20.5629 32.8205 21.9428 33.1153 23.031 33.3484L23.1491 33.3735C24.3972 33.6401 25.3067 33.8512 25.9339 34.2098C26.2119 34.3687 26.3625 34.5202 26.4492 34.6593C26.5297 34.7868 26.6133 34.9938 26.6133 35.368C26.6133 35.8551 26.4335 36.1604 26.098 36.4165C25.7039 36.7175 25.0568 36.9611 24.1965 37.0614C23.327 37.1554 22.448 37.1081 21.5936 36.9214C20.7354 36.7332 20.102 36.4405 19.7559 36.1614C18.8149 35.405 17.4078 35.951 17.2233 37.1442C17.1377 37.698 17.354 38.2554 17.7907 38.6064C18.6468 39.2932 19.7894 39.7364 20.9215 39.9852C21.2424 40.0553 21.5727 40.1117 21.9093 40.1546V41.248C21.9093 42.455 23.216 43.2094 24.2613 42.6059C24.7465 42.3258 25.0453 41.8082 25.0453 41.248V40.1075C26.0854 39.9309 27.1402 39.5661 28.0005 38.9096C29.0531 38.1068 29.7493 36.9067 29.7493 35.368C29.7493 34.4816 29.5392 33.6808 29.1054 32.9899C28.6768 32.3094 28.0914 31.8306 27.4893 31.4867C26.3917 30.8595 25.0119 30.5647 23.9237 30.3316L23.8056 30.3065C22.5585 30.0389 21.648 29.8288 21.0218 29.4702C20.7427 29.3113 20.5922 29.1598 20.5055 29.0207C20.425 28.8932 20.3413 28.6862 20.3413 28.312C20.3413 27.8249 20.5211 27.5196 20.8567 27.2635C21.2508 26.9625 21.8978 26.7189 22.7581 26.6186C23.628 26.5246 24.5073 26.5719 25.3621 26.7586C26.2192 26.9468 26.8527 27.2395 27.1998 27.5186C28.1409 28.2746 29.5475 27.7283 29.7316 26.5353C29.8171 25.9816 29.6007 25.4244 29.164 25.0736C28.3078 24.3868 27.1653 23.9435 26.0332 23.6948C25.7066 23.6236 25.377 23.5671 25.0453 23.5254V22.432Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Subtract_2" class="main-color" fill="#2859c5" d="M11.9787 31.84C11.9787 30.6854 11.0426 29.7494 9.888 29.7493H8.8427C7.2333 29.7458 6.2236 31.4858 7.0252 32.8814C7.3989 33.5319 8.0925 33.9323 8.8427 33.9307H9.888C11.0426 33.9307 11.9787 32.9946 11.9787 31.84Z" stroke-width="1"/>
+    <path id="Subtract_3" class="main-color" fill="#2859c5" d="M37.0667 29.7493C35.4573 29.7458 34.4476 31.4858 35.2492 32.8814C35.6229 33.5319 36.3165 33.9323 37.0667 33.9307H38.112C39.7214 33.9342 40.7311 32.1942 39.9294 30.7986C39.5557 30.1481 38.8622 29.7477 38.112 29.7493H37.0667Z" stroke-width="1"/>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/save.php b/images/siteicons/svg/save.php
new file mode 100644
index 000000000..8053db6b8
--- /dev/null
+++ b/images/siteicons/svg/save.php
@@ -0,0 +1,9 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="File-Check-Alternate--Streamline-Plump.svg" height="48" width="48">
+  <desc>File Check Alternate Streamline Icon: https://streamlinehq.com</desc>
+  <g id="file-check-alternate--file-common-check">
+    <path id="Subtract" class="accent-color" d="M13.582 2.137C16.326 1.823 20.685 1.5 27 1.5a165 165 0 0 1 5.13 0.077 1.5 1.5 0 0 1 0.4 0.068c1.098 0.343 4.029 1.564 8.123 5.578 3.862 3.787 5.195 6.563 5.63 7.781a1.5 1.5 0 0 1 0.087 0.45c0.08 2.153 0.13 4.655 0.13 7.546 0 7.57 -0.343 12.478 -0.669 15.432 -0.32 2.9 -2.518 5.1 -5.413 5.431 -2.744 0.314 -7.103 0.637 -13.418 0.637 -1.044 0 -2.035 -0.009 -2.974 -0.025A14.458 14.458 0 0 0 28.5 34c0 -8.008 -6.492 -14.5 -14.5 -14.5a14.44 14.44 0 0 0 -6.492 1.531c0.053 -6.464 0.364 -10.773 0.66 -13.463 0.32 -2.9 2.519 -5.1 5.414 -5.431Z" stroke-width="1"></path>
+    <path id="Intersect" class="main-color" d="M46.348 15.25c-2.42 -0.001 -6.57 -0.04 -8.948 -0.268 -2.598 -0.249 -4.641 -2.321 -4.896 -4.975 -0.214 -2.233 -0.253 -5.99 -0.254 -8.421 0.095 0.01 0.188 0.03 0.28 0.059 1.098 0.343 4.029 1.564 8.123 5.578 3.862 3.787 5.195 6.563 5.63 7.781 0.029 0.08 0.05 0.163 0.065 0.246Z" stroke-width="1"></path>
+    <path id="Subtract_2" class="main-color" fill-rule="evenodd" d="M14 46c6.627 0 12 -5.373 12 -12s-5.373 -12 -12 -12S2 27.373 2 34s5.373 12 12 12Z" clip-rule="evenodd" stroke-width="1"></path>
+    <path id="Subtract_3" class="accent-color" fill-rule="evenodd" d="M20.611 31.185a2 2 0 1 0 -3.222 -2.37l-4.413 6.002L10.5 32.01a2 2 0 0 0 -3 2.647l4.118 4.666a2 2 0 0 0 3.111 -0.138l5.882 -8Z" clip-rule="evenodd" stroke-width="1"></path>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/subscription.php b/images/siteicons/svg/subscription.php
new file mode 100644
index 000000000..6e65569f4
--- /dev/null
+++ b/images/siteicons/svg/subscription.php
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Layers-1--Streamline-Plump.svg" height="48" width="48">
+  <desc>Layers 1 Streamline Icon: https://streamlinehq.com</desc>
+  <g id="layers-1--design-layer-layers-pile-stack-align">
+    <path id="Union" class="accent-color" d="M25.65 22.818a7.074 7.074 0 0 0 -3.3 0c-2.005 0.48 -6.01 1.62 -10.995 3.994 -3.882 1.848 -6.57 3.453 -8.228 4.542 -1.945 1.28 -1.945 4.012 0 5.29 1.657 1.09 4.346 2.695 8.228 4.543 4.984 2.373 8.99 3.514 10.995 3.994 1.087 0.26 2.212 0.26 3.3 0 2.005 -0.48 6.01 -1.62 10.995 -3.994 3.881 -1.848 6.57 -3.453 8.228 -4.543 1.945 -1.278 1.945 -4.01 0 -5.29 -1.658 -1.09 -4.346 -2.694 -8.228 -4.542 -4.985 -2.374 -8.99 -3.515 -10.995 -3.994Z" stroke-width="1"></path>
+    <path id="Union_2" class="main-color" d="M25.65 12.818a7.074 7.074 0 0 0 -3.3 0c-2.005 0.48 -6.01 1.62 -10.995 3.994 -3.882 1.848 -6.57 3.453 -8.228 4.542 -1.945 1.28 -1.945 4.012 0 5.29 1.657 1.09 4.346 2.695 8.228 4.543 4.984 2.373 8.99 3.514 10.995 3.994 1.087 0.26 2.212 0.26 3.3 0 2.005 -0.48 6.01 -1.62 10.995 -3.994 3.881 -1.849 6.57 -3.453 8.228 -4.543 1.945 -1.278 1.945 -4.01 0 -5.29 -1.658 -1.09 -4.346 -2.694 -8.228 -4.542 -4.985 -2.374 -8.99 -3.515 -10.995 -3.994Z" stroke-width="1"></path>
+    <path id="Union_3" class="accent-color" d="M25.65 2.818a7.076 7.076 0 0 0 -3.3 0c-2.005 0.48 -6.01 1.62 -10.995 3.994 -3.882 1.848 -6.57 3.453 -8.228 4.542 -1.945 1.28 -1.945 4.012 0 5.29 1.658 1.09 4.346 2.695 8.228 4.543 4.984 2.373 8.99 3.514 10.995 3.993 1.088 0.26 2.212 0.26 3.3 0 2.005 -0.479 6.01 -1.62 10.995 -3.993 3.882 -1.849 6.57 -3.453 8.228 -4.543 1.945 -1.278 1.945 -4.01 0 -5.29 -1.658 -1.09 -4.346 -2.694 -8.228 -4.542 -4.984 -2.374 -8.99 -3.514 -10.995 -3.994Z" stroke-width="1"></path>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/images/siteicons/svg/web.php b/images/siteicons/svg/web.php
new file mode 100644
index 000000000..6a40ce51a
--- /dev/null
+++ b/images/siteicons/svg/web.php
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Web--Streamline-Plump.svg" height="48" width="48">
+  <desc>Web Streamline Icon: https://streamlinehq.com</desc>
+  <g id="web--server-world-internet-earth-www-globe-worldwide-web-network">
+    <path id="Union" class="accent-color" d="M24 1.5C11.574 1.5 1.5 11.574 1.5 24S11.574 46.5 24 46.5 46.5 36.426 46.5 24 36.426 1.5 24 1.5Z" stroke-width="1"></path>
+    <path id="Intersect" class="main-color" fill-rule="evenodd" d="M17.091 32.5c0.443 3.068 1.116 5.815 1.952 8.076 0.779 2.106 1.67 3.713 2.585 4.765 0.486 0.558 0.94 0.92 1.355 1.137a22.473 22.473 0 0 1 -4.769 -0.729c-0.75 -1.184 -1.412 -2.584 -1.985 -4.133 -0.957 -2.589 -1.7 -5.694 -2.167 -9.116H3.16a22.332 22.332 0 0 1 -0.984 -3H13.73a64.97 64.97 0 0 1 -0.23 -5.5c0 -1.881 0.08 -3.722 0.231 -5.5H2.177c0.259 -1.03 0.588 -2.032 0.984 -3h10.903c0.469 -3.422 1.214 -6.527 2.173 -9.116 0.574 -1.55 1.237 -2.951 1.988 -4.136a22.475 22.475 0 0 1 4.764 -0.726c-0.413 0.217 -0.866 0.579 -1.352 1.137 -0.914 1.053 -1.807 2.66 -2.587 4.766 -0.837 2.262 -1.512 5.008 -1.957 8.075h13.813c-0.445 -3.067 -1.12 -5.813 -1.957 -8.075 -0.78 -2.106 -1.672 -3.713 -2.587 -4.766 -0.485 -0.558 -0.938 -0.92 -1.352 -1.137 1.64 0.073 3.234 0.32 4.764 0.726 0.751 1.185 1.415 2.585 1.989 4.136 0.958 2.589 1.703 5.694 2.172 9.116H44.84c0.395 0.968 0.725 1.97 0.984 3H34.268c0.152 1.778 0.232 3.619 0.232 5.5 0 1.881 -0.08 3.723 -0.231 5.5h11.554a22.319 22.319 0 0 1 -0.984 3H33.938c-0.468 3.422 -1.21 6.527 -2.167 9.116 -0.573 1.549 -1.236 2.95 -1.986 4.133a22.473 22.473 0 0 1 -4.769 0.729c0.416 -0.218 0.87 -0.58 1.355 -1.137 0.915 -1.052 1.807 -2.659 2.586 -4.765 0.836 -2.261 1.508 -5.008 1.951 -8.076H17.091ZM31.5 24c0 -1.894 -0.085 -3.736 -0.244 -5.5H16.743A61.529 61.529 0 0 0 16.5 24a61.8 61.8 0 0 0 0.242 5.5h14.516A61.8 61.8 0 0 0 31.5 24Z" clip-rule="evenodd" stroke-width="1"></path>
+  </g>
+</svg>
diff --git a/images/siteicons/svg/websearch.php b/images/siteicons/svg/websearch.php
new file mode 100644
index 000000000..dc180daf9
--- /dev/null
+++ b/images/siteicons/svg/websearch.php
@@ -0,0 +1,8 @@
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Search-Visual--Streamline-Plump.svg" height="48" width="48">
+  <desc>Search Visual Streamline Icon: https://streamlinehq.com</desc>
+  <g id="search-visual">
+    <path id="Subtract" class="main-color" fill-rule="evenodd" d="M35 22c0 2.542 -0.73 4.913 -1.99 6.916l0.55 0.456c1.205 1 2.393 1.984 3.564 3.078 1.158 1.082 1.302 2.718 0.207 3.863a32.717 32.717 0 0 1 -1.018 1.018c-1.145 1.095 -2.781 0.951 -3.863 -0.207 -1.094 -1.171 -2.078 -2.358 -3.078 -3.565l-0.456 -0.55A12.939 12.939 0 0 1 22 35c-7.18 0 -13 -5.82 -13 -13S14.82 9 22 9s13 5.82 13 13Z" clip-rule="evenodd" stroke-width="1"></path>
+    <path id="Subtract_2" class="accent-color" fill-rule="evenodd" d="M14.5 22a7.5 7.5 0 1 1 15 0 7.5 7.5 0 0 1 -15 0Z" clip-rule="evenodd" stroke-width="1"></path>
+    <path id="Union" class="accent-color" fill-rule="evenodd" d="M13.924 1.501a2.5 2.5 0 1 1 0.152 4.998l-6.31 0.192A1.159 1.159 0 0 0 6.69 7.765l-0.19 6.311a2.5 2.5 0 1 1 -4.998 -0.152l0.194 -6.357 0.003 -0.072a6.16 6.16 0 0 1 5.87 -5.8l6.356 -0.194Zm27.577 32.423a2.5 2.5 0 1 1 4.998 0.152l-0.194 6.357 -0.003 0.072a6.16 6.16 0 0 1 -5.87 5.8l-6.356 0.194a2.5 2.5 0 0 1 -0.152 -4.998l6.31 -0.192a1.158 1.158 0 0 0 1.075 -1.074l0.192 -6.311ZM3.924 31.5a2.5 2.5 0 0 1 2.575 2.423l0.192 6.311a1.159 1.159 0 0 0 1.074 1.074l6.311 0.192a2.5 2.5 0 1 1 -0.152 4.998l-6.356 -0.194 -0.072 -0.003a6.16 6.16 0 0 1 -5.801 -5.87L1.5 34.077a2.5 2.5 0 0 1 2.423 -2.575ZM31.5 3.924a2.5 2.5 0 0 1 2.575 -2.423l6.356 0.194 0.072 0.003a6.16 6.16 0 0 1 5.801 5.87l0.194 6.356a2.5 2.5 0 0 1 -4.998 0.152l-0.192 -6.311a1.158 1.158 0 0 0 -1.074 -1.074l-6.311 -0.192A2.5 2.5 0 0 1 31.5 3.924Z" clip-rule="evenodd" stroke-width="1"></path>
+  </g>
+</svg>
\ No newline at end of file
diff --git a/images/siteicons/blue/wallos.png b/images/siteicons/wallos.png
similarity index 100%
rename from images/siteicons/blue/wallos.png
rename to images/siteicons/wallos.png
diff --git a/images/siteicons/blue/walloswhite.png b/images/siteicons/walloswhite.png
similarity index 100%
rename from images/siteicons/blue/walloswhite.png
rename to images/siteicons/walloswhite.png
diff --git a/images/siteicons/yellow/category.png b/images/siteicons/yellow/category.png
deleted file mode 100644
index 84c80cc4f..000000000
Binary files a/images/siteicons/yellow/category.png and /dev/null differ
diff --git a/images/siteicons/yellow/check.png b/images/siteicons/yellow/check.png
deleted file mode 100644
index 4e8f44c8e..000000000
Binary files a/images/siteicons/yellow/check.png and /dev/null differ
diff --git a/images/siteicons/yellow/clone.png b/images/siteicons/yellow/clone.png
deleted file mode 100644
index 25c1f5532..000000000
Binary files a/images/siteicons/yellow/clone.png and /dev/null differ
diff --git a/images/siteicons/yellow/delete.png b/images/siteicons/yellow/delete.png
deleted file mode 100644
index 4e53c6f97..000000000
Binary files a/images/siteicons/yellow/delete.png and /dev/null differ
diff --git a/images/siteicons/yellow/edit.png b/images/siteicons/yellow/edit.png
deleted file mode 100644
index 85bdaf71c..000000000
Binary files a/images/siteicons/yellow/edit.png and /dev/null differ
diff --git a/images/siteicons/yellow/notes.png b/images/siteicons/yellow/notes.png
deleted file mode 100644
index a0aac118e..000000000
Binary files a/images/siteicons/yellow/notes.png and /dev/null differ
diff --git a/images/siteicons/yellow/payment.png b/images/siteicons/yellow/payment.png
deleted file mode 100644
index 3069406e7..000000000
Binary files a/images/siteicons/yellow/payment.png and /dev/null differ
diff --git a/images/siteicons/yellow/save.png b/images/siteicons/yellow/save.png
deleted file mode 100644
index 971ecf514..000000000
Binary files a/images/siteicons/yellow/save.png and /dev/null differ
diff --git a/images/siteicons/yellow/subscription.png b/images/siteicons/yellow/subscription.png
deleted file mode 100644
index 41f811bdd..000000000
Binary files a/images/siteicons/yellow/subscription.png and /dev/null differ
diff --git a/images/siteicons/yellow/wallos.png b/images/siteicons/yellow/wallos.png
deleted file mode 100644
index 7a8bf5fd1..000000000
Binary files a/images/siteicons/yellow/wallos.png and /dev/null differ
diff --git a/images/siteicons/yellow/walloswhite.png b/images/siteicons/yellow/walloswhite.png
deleted file mode 100644
index 8f088e9c1..000000000
Binary files a/images/siteicons/yellow/walloswhite.png and /dev/null differ
diff --git a/images/siteicons/yellow/web.png b/images/siteicons/yellow/web.png
deleted file mode 100644
index d2a6f9854..000000000
Binary files a/images/siteicons/yellow/web.png and /dev/null differ
diff --git a/images/siteicons/yellow/websearch.png b/images/siteicons/yellow/websearch.png
deleted file mode 100644
index 8162e62da..000000000
Binary files a/images/siteicons/yellow/websearch.png and /dev/null differ
diff --git a/includes/header.php b/includes/header.php
index 15a33373a..3a91ab14c 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -91,7 +91,9 @@
     <div class="contain">
       <div class="logo">
           <a href=".">
-              <div class="logo-image"></div>
+              <div class="logo-image">
+              <?php include "images/siteicons/svg/logo.php"; ?>
+              </div>
           </a>
       </div>
       <nav>
diff --git a/includes/list_subscriptions.php b/includes/list_subscriptions.php
index ea0e105d1..f37789b67 100644
--- a/includes/list_subscriptions.php
+++ b/includes/list_subscriptions.php
@@ -48,7 +48,7 @@ function getPriceConverted($price, $currency, $database) {
         }
     }
 
-    function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme) {
+    function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n, $colorTheme, $imagePath) {
         if ($sort === "price") {
             usort($subscriptions, function($a, $b) {
                 return $a['price'] < $b['price'] ? 1 : -1;
@@ -92,7 +92,17 @@ function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n,
         ?>
             <div class="subscription<?= $subscription['inactive'] ? ' inactive' : '' ?>" onClick="toggleOpenSubscription(<?= $subscription['id'] ?>)" data-id="<?= $subscription['id'] ?>" data-name="<?= $subscription['name'] ?>">
                 <div class="subscription-main">
-                    <span class="logo"><img src="<?= $subscription['logo'] ?>"></span>
+                    <span class="logo">
+                        <?php
+                            if ($subscription['logo'] != "") {
+                                ?>
+                                <img src="<?= $subscription['logo'] ?>">
+                                <?php
+                            } else {
+                                include $imagePath . "images/siteicons/svg/logo.php";
+                            }
+                        ?>
+                    </span>
                     <span class="name"><?= $subscription['name'] ?></span>
                     <span class="cycle"><?= $subscription['billing_cycle'] ?></span>
                     <span class="next"><?= $subscription['next_payment'] ?></span>
@@ -105,23 +115,23 @@ function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n,
                     </button>
                     <ul class="actions">
                         <li class="edit" title="<?= translate('edit_subscription', $i18n) ?>" onClick="openEditSubscription(event, <?= $subscription['id'] ?>)">
-                            <img src="images/siteicons/<?= $colorTheme ?>/edit.png" title="<?= translate('edit_subscription', $i18n) ?>">
+                            <?php include $imagePath . "images/siteicons/svg/edit.php"; ?>
                             <?= translate('edit_subscription', $i18n) ?>
                         </li>
                         <li class="delete" title="<?= translate('delete', $i18n) ?>" onClick="deleteSubscription(event, <?= $subscription['id'] ?>)">
-                            <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= translate('edit_subscription', $i18n) ?>">
+                            <?php include $imagePath . "images/siteicons/svg/delete.php"; ?>
                             <?= translate('delete', $i18n) ?>
                         </li>
                         <li class="clone" title="<?= translate('clone', $i18n) ?>" onClick="cloneSubscription(event, <?= $subscription['id'] ?>)">
-                            <img src="images/siteicons/<?= $colorTheme ?>/clone.png" title="<?= translate('edit_subscription', $i18n) ?>">
+                            <?php include $imagePath . "images/siteicons/svg/clone.php"; ?>
                             <?= translate('clone', $i18n) ?>
                         </li>
                     </ul>
                 </div>
                 <div class="subscription-secondary">
-                    <span class="name"><img src="images/siteicons/<?= $colorTheme ?>/subscription.png" alt="<?= translate('subscription', $i18n) ?>" /><?= $subscription['name'] ?></span>
-                    <span class="payer_user" title="<?= translate('paid_by', $i18n) ?>"><img src="images/siteicons/<?= $colorTheme ?>/payment.png" alt="<?= translate('paid_by', $i18n) ?>" /><?= $members[$subscription['payer_user_id']]['name'] ?></span>
-                    <span class="category" title="<?= translate('category', $i18n) ?>" ><img src="images/siteicons/<?= $colorTheme ?>/category.png" alt="<?= translate('category', $i18n) ?>" /><?= $categories[$subscription['category_id']]['name'] ?></span>
+                    <span class="name"><?php include $imagePath . "images/siteicons/svg/subscription.php"; ?><?= $subscription['name'] ?></span>
+                    <span class="payer_user" title="<?= translate('paid_by', $i18n) ?>"><?php include $imagePath . "images/siteicons/svg/payment.php"; ?><?= $members[$subscription['payer_user_id']]['name'] ?></span>
+                    <span class="category" title="<?= translate('category', $i18n) ?>" ><?php include $imagePath . "images/siteicons/svg/category.php"; ?><?= $categories[$subscription['category_id']]['name'] ?></span>
                     <?php
                         if ($subscription['url'] != "") {
                             $url = $subscription['url'];
@@ -129,7 +139,7 @@ function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n,
                                 $url = "https://" . $url;
                             }
                             ?>
-                                <span class="url" title="<?= translate('external_url', $i18n) ?>"><a href="<?= $url ?>" target="_blank"><img src="images/siteicons/<?= $colorTheme ?>/web.png" alt="<?= translate('url', $i18n) ?>" /></a></span>
+                                <span class="url" title="<?= translate('external_url', $i18n) ?>"><a href="<?= $url ?>" target="_blank"><?php include $imagePath . "images/siteicons/svg/web.php"; ?></a></span>
                             <?php
                         }
                     ?>
@@ -139,7 +149,7 @@ function printSubscriptions($subscriptions, $sort, $categories, $members, $i18n,
                         ?>
                             <div class="subscription-notes">
                                 <span class="notes">
-                                    <img src="images/siteicons/<?= $colorTheme ?>/notes.png" alt="<?= translate('notes', $i18n) ?>" />
+                                    <?php include $imagePath . "images/siteicons/svg/notes.php"; ?>
                                     <?= $subscription['notes'] ?>
                                 </span>
                             </div>
diff --git a/includes/version.php b/includes/version.php
index d560e187c..6b6eb93e1 100644
--- a/includes/version.php
+++ b/includes/version.php
@@ -1,3 +1,3 @@
 <?php
-$version = "v2.10.0";
+$version = "v2.11.0";
 ?>
\ No newline at end of file
diff --git a/index.php b/index.php
index b93247a39..6b9770d29 100644
--- a/index.php
+++ b/index.php
@@ -29,7 +29,6 @@
 }
 
 $headerClass = count($subscriptions) > 0 ? "main-actions" : "main-actions hidden";
-$defaultLogo = $theme == "light" ? "images/siteicons/" . $colorTheme . "/wallos.png" : "images/siteicons/" . $colorTheme . "/walloswhite.png";
 ?>
 <style>
   .logo-preview:after {
@@ -168,7 +167,7 @@
       }
       $id = $subscription['id'];
       $print[$id]['id'] = $id;
-      $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/" . $subscription['logo'] : $defaultLogo;
+      $print[$id]['logo'] = $subscription['logo'] != "" ? "images/uploads/logos/" . $subscription['logo'] : "";
       $print[$id]['name'] = $subscription['name'];
       $cycle = $subscription['cycle'];
       $frequency = $subscription['frequency'];
@@ -198,7 +197,7 @@
     }
 
     if (isset($print)) {
-      printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme);
+      printSubscriptions($print, $sort, $categories, $members, $i18n, $colorTheme, "");
     }
     $db->close();
 
@@ -238,7 +237,7 @@
         <input type="hidden" id="logo-url" name="logo-url">
         <div id="logo-search-button" class="image-button medium disabled" title="<?= translate('search_logo', $i18n) ?>"
           onClick="searchLogo()">
-          <img src="images/siteicons/<?= $colorTheme ?>/websearch.png">
+          <?php include "images/siteicons/svg/websearch.php"; ?>
         </div>
         <input type="hidden" id="id" name="id">
         <div id="logo-search-results" class="logo-search">
diff --git a/login.php b/login.php
index 079827c0b..23673e283 100644
--- a/login.php
+++ b/login.php
@@ -207,15 +207,9 @@
     <div class="content">
         <section class="container">
             <header>
-                <?php
-                if ($theme == "light") {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php
-                } else {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php
-                }
-                ?>
+                <div class="logo-image">
+                    <?php include "images/siteicons/svg/logo.php"; ?>
+                </div>
                 <p>
                     <?= translate('please_login', $i18n) ?>
                 </p>
diff --git a/passwordreset.php b/passwordreset.php
index 02c74181b..4d6b5184e 100644
--- a/passwordreset.php
+++ b/passwordreset.php
@@ -128,15 +128,9 @@
     <div class="content">
         <section class="container">
             <header>
-                <?php
-                if ($theme == "light") {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" /> <?php
-                } else {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" /> <?php
-                }
-                ?>
+                <div class="logo-image">
+                    <?php include "images/siteicons/svg/logo.php"; ?>
+                </div>
                 <p>
                     <?= translate('reset_password', $i18n) ?>
                 </p>
diff --git a/registration.php b/registration.php
index efaa954a1..c84041d04 100644
--- a/registration.php
+++ b/registration.php
@@ -327,15 +327,9 @@ function validate($value)
     <div class="content">
         <section class="container">
             <header>
-                <?php
-                if ($theme == "light") {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php
-                } else {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" id="wallos-logo" /> <?php
-                }
-                ?>
+                <div class="logo-image">
+                    <?php include "images/siteicons/svg/logo.php"; ?>
+                </div>
                 <p>
                     <?= translate('create_account', $i18n) ?>
                 </p>
@@ -364,7 +358,7 @@ function validate($value)
                         foreach ($currencies as $currency) {
                             ?>
                             <option value="<?= $currency['code'] ?>"><?= $currency['name'] ?></option>
-                        <?php
+                            <?php
                         }
                         ?>
                     </select>
diff --git a/scripts/dashboard.js b/scripts/dashboard.js
index 9e098b93f..c69ba4c3b 100644
--- a/scripts/dashboard.js
+++ b/scripts/dashboard.js
@@ -45,10 +45,11 @@ function fillEditFormFields(subscription) {
   const formTitle = document.querySelector("#form-title");
   formTitle.textContent = translate('edit_subscription');
   const logo = document.querySelector("#form-logo");
-  const defaultLogo = window.theme && window.theme == "light" ? "images/siteicons/" + colorTheme + "/wallos.png" : "images/siteicons/" + colorTheme + "/walloswhite.png";
-  const logoFile = subscription.logo !== null ? "images/uploads/logos/" + subscription.logo : defaultLogo;
-  logo.src = logoFile;
-  logo.style = 'display: block';
+  const logoFile = subscription.logo !== null ? "images/uploads/logos/" + subscription.logo : "";
+  if (logoFile) {
+    logo.src = logoFile;
+    logo.style = 'display: block';
+  }
   const logoSearchButton = document.querySelector("#logo-search-button");
   logoSearchButton.classList.remove("disabled");
   const id = document.querySelector("#id");
diff --git a/scripts/login.js b/scripts/login.js
index bc6956a57..2cf93b75e 100644
--- a/scripts/login.js
+++ b/scripts/login.js
@@ -8,11 +8,6 @@ document.addEventListener('DOMContentLoaded', function () {
       document.body.className = themePreference;
       const themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
       themeColorMetaTag.setAttribute('content', themePreference === 'dark' ? '#222222' : '#FFFFFF');
-      const logoImage = document.querySelector('#wallos-logo');
-      const imageName = themePreference === 'dark' ? 'walloswhite' : 'wallos';
-      const colorTheme = window.color_theme ?? 'blue';
-      logoImage.src = `images/siteicons/${colorTheme}/${imageName}.png`;
-
     }
 
 });
\ No newline at end of file
diff --git a/scripts/registration.js b/scripts/registration.js
index ca188f840..442ba7377 100644
--- a/scripts/registration.js
+++ b/scripts/registration.js
@@ -166,10 +166,6 @@ function checkThemeNeedsUpdate() {
     document.body.className = themePreference;
     const themeColorMetaTag = document.querySelector('meta[name="theme-color"]');
     themeColorMetaTag.setAttribute('content', themePreference === 'dark' ? '#222222' : '#FFFFFF');
-    const logoImage = document.querySelector('#wallos-logo');
-    const imageName = themePreference === 'dark' ? 'walloswhite' : 'wallos';
-    const colorTheme = window.color_theme ?? 'blue';
-    logoImage.src = `images/siteicons/${colorTheme}/${imageName}.png`;
   }
 }
 
diff --git a/scripts/settings.js b/scripts/settings.js
index 426abd194..781ff3d55 100644
--- a/scripts/settings.js
+++ b/scripts/settings.js
@@ -1,3 +1,23 @@
+const deleteSvgContent = `
+<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="Recycle-Bin-2--Streamline-Plump.svg" height="48" width="48">
+  <g id="recycle-bin-2--remove-delete-empty-bin-trash-garbage">
+    <path id="Union" class="accent-color" d="M43.318 15.934a1.5 1.5 0 0 0 -1.618 -1.591c-3.016 0.246 -8.46 0.52 -17.721 0.52 -9.215 0 -14.65 -0.271 -17.675 -0.516a1.5 1.5 0 0 0 -1.618 1.59c0.888 13.84 1.74 21.07 2.253 24.547 0.332 2.252 1.85 4.217 4.226 4.788 2.445 0.588 6.55 1.227 12.837 1.227 6.286 0 10.392 -0.64 12.837 -1.227 2.375 -0.57 3.894 -2.536 4.226 -4.788 0.513 -3.477 1.365 -10.708 2.253 -24.55Z" stroke-width="1"/>
+    <path id="Union_2" class="main-color" d="M23.37 1a8 8 0 0 0 -7.034 4.188c-3.411 0.072 -6 0.182 -7.814 0.282 -2.312 0.127 -4.692 1.242 -5.7 3.605 -0.244 0.57 -0.475 1.212 -0.663 1.919 -0.68 2.548 1.302 4.622 3.657 4.822 3.057 0.258 8.614 0.548 18.161 0.548 9.549 0 15.106 -0.29 18.162 -0.549 2.374 -0.2 4.291 -2.261 3.751 -4.785a16.68 16.68 0 0 0 -0.294 -1.167c-0.824 -2.831 -3.517 -4.277 -6.188 -4.411a260.66 260.66 0 0 0 -7.744 -0.264A8 8 0 0 0 24.631 1H23.37Z" stroke-width="1"/>
+    <path id="Vector_831_Stroke" class="main-color" fill-rule="evenodd" d="M17.8 23.01a2 2 0 0 1 2.19 1.791l1 10a2 2 0 0 1 -3.98 0.398l-1 -10a2 2 0 0 1 1.79 -2.189Z" clip-rule="evenodd" stroke-width="1"/>
+    <path id="Vector_832_Stroke" class="main-color" fill-rule="evenodd" d="M30.2 23.01a2 2 0 0 0 -2.19 1.791l-1 10a2 2 0 0 0 3.98 0.398l1 -10a2 2 0 0 0 -1.79 -2.189Z" clip-rule="evenodd" stroke-width="1"/>
+  </g>
+</svg>
+`;
+
+const editSvgContent = `<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 48 48" id="File-Check-Alternate--Streamline-Plump.svg" height="48" width="48">
+  <g id="file-check-alternate--file-common-check">
+    <path id="Subtract" class="accent-color" d="M13.582 2.137C16.326 1.823 20.685 1.5 27 1.5a165 165 0 0 1 5.13 0.077 1.5 1.5 0 0 1 0.4 0.068c1.098 0.343 4.029 1.564 8.123 5.578 3.862 3.787 5.195 6.563 5.63 7.781a1.5 1.5 0 0 1 0.087 0.45c0.08 2.153 0.13 4.655 0.13 7.546 0 7.57 -0.343 12.478 -0.669 15.432 -0.32 2.9 -2.518 5.1 -5.413 5.431 -2.744 0.314 -7.103 0.637 -13.418 0.637 -1.044 0 -2.035 -0.009 -2.974 -0.025A14.458 14.458 0 0 0 28.5 34c0 -8.008 -6.492 -14.5 -14.5 -14.5a14.44 14.44 0 0 0 -6.492 1.531c0.053 -6.464 0.364 -10.773 0.66 -13.463 0.32 -2.9 2.519 -5.1 5.414 -5.431Z" stroke-width="1"></path>
+    <path id="Intersect" class="main-color" d="M46.348 15.25c-2.42 -0.001 -6.57 -0.04 -8.948 -0.268 -2.598 -0.249 -4.641 -2.321 -4.896 -4.975 -0.214 -2.233 -0.253 -5.99 -0.254 -8.421 0.095 0.01 0.188 0.03 0.28 0.059 1.098 0.343 4.029 1.564 8.123 5.578 3.862 3.787 5.195 6.563 5.63 7.781 0.029 0.08 0.05 0.163 0.065 0.246Z" stroke-width="1"></path>
+    <path id="Subtract_2" class="main-color" fill-rule="evenodd" d="M14 46c6.627 0 12 -5.373 12 -12s-5.373 -12 -12 -12S2 27.373 2 34s5.373 12 12 12Z" clip-rule="evenodd" stroke-width="1"></path>
+    <path id="Subtract_3" class="accent-color" fill-rule="evenodd" d="M20.611 31.185a2 2 0 1 0 -3.222 -2.37l-4.413 6.002L10.5 32.01a2 2 0 0 0 -3 2.647l4.118 4.666a2 2 0 0 0 3.111 -0.138l5.882 -8Z" clip-rule="evenodd" stroke-width="1"></path>
+  </g>
+</svg>`;
+
 function toggleAvatarSelect() {
   var avatarSelect = document.getElementById("avatarSelect");
   if (avatarSelect.classList.contains("is-open")) {
@@ -136,11 +156,8 @@ function addMemberButton(memberId) {
         editMember(newMemberId);
       };
 
-      let editImage = document.createElement("img");
-      editImage.src = "images/siteicons/" + colorTheme + "/save.png";
-      editImage.title = translate('save_member');
-
-      editLink.appendChild(editImage);
+      editLink.innerHTML = editSvgContent;
+      editLink.title = translate('save_member');
 
       let deleteLink = document.createElement("button");
       deleteLink.className = "image-button medium"
@@ -149,11 +166,8 @@ function addMemberButton(memberId) {
         removeMember(newMemberId);
       };
 
-      let deleteImage = document.createElement("img");
-      deleteImage.src = "images/siteicons/" + colorTheme + "/delete.png";
-      deleteImage.title = translate('delete_member');
-
-      deleteLink.appendChild(deleteImage);
+      deleteLink.innerHTML = deleteSvgContent;
+      deleteLink.title = translate('delete_member');
 
       div.appendChild(input);
       div.appendChild(emailInput);
@@ -265,11 +279,8 @@ function addCategoryButton(categoryId) {
         editCategory(newCategoryId);
       };
 
-      let editImage = document.createElement("img");
-      editImage.src = "images/siteicons/" + colorTheme + "/save.png";
-      editImage.title = translate('save_category');
-
-      editLink.appendChild(editImage);
+      editLink.innerHTML = editSvgContent;
+      editLink.title = translate('save_member');
 
       let deleteLink = document.createElement("button");
       deleteLink.className = "image-button medium"
@@ -278,11 +289,8 @@ function addCategoryButton(categoryId) {
         removeCategory(newCategoryId);
       };
 
-      let deleteImage = document.createElement("img");
-      deleteImage.src = "images/siteicons/"  + colorTheme + "/delete.png";
-      deleteImage.title = translate('delete_category');
-
-      deleteLink.appendChild(deleteImage);
+      deleteLink.innerHTML = deleteSvgContent;
+      deleteLink.title = translate('delete_member');
 
       row.appendChild(dragIcon);
       row.appendChild(input);
@@ -403,11 +411,8 @@ function addCurrencyButton(currencyId) {
         editCurrency(newCurrencyId);
       };
 
-      let editImage = document.createElement("img");
-      editImage.src = "images/siteicons/" + colorTheme + "/save.png";
-      editImage.title = translate('save_currency');
-
-      editLink.appendChild(editImage);
+      editLink.innerHTML = editSvgContent;
+      editLink.title = translate('save_member');
 
       let deleteLink = document.createElement("button");
       deleteLink.className = "image-button medium"
@@ -416,11 +421,8 @@ function addCurrencyButton(currencyId) {
         removeCurrency(newCurrencyId);
       };
 
-      let deleteImage = document.createElement("img");
-      deleteImage.src = "images/siteicons/" + colorTheme + "/delete.png";
-      deleteImage.title = translate('delete_currency');
-
-      deleteLink.appendChild(deleteImage);
+      deleteLink.innerHTML = deleteSvgContent;
+      deleteLink.title = translate('delete_member');
 
       div.appendChild(inputSymbol);
       div.appendChild(inputName);
diff --git a/service-worker.js b/service-worker.js
index 229119d9b..700c903d0 100644
--- a/service-worker.js
+++ b/service-worker.js
@@ -59,16 +59,8 @@ self.addEventListener('install', function(event) {
                 'images/icon/favicon.ico',
                 'images/icon/android-chrome-192x192.png',
                 'images/screenshots/desktop.png',
-                'images/siteicons/blue/wallos.png',
-                'images/siteicons/blue/walloswhite.png',
-                'images/siteicons/green/wallos.png',
-                'images/siteicons/green/walloswhite.png',
-                'images/siteicons/red/wallos.png',
-                'images/siteicons/red/walloswhite.png',
-                'images/siteicons/yellow/wallos.png',
-                'images/siteicons/yellow/walloswhite.png',
-                'images/siteicons/purple/wallos.png',
-                'images/siteicons/purple/walloswhite.png',
+                'images/siteicons/wallos.png',
+                'images/siteicons/walloswhite.png',
                 'images/siteimages/empty.png',
                 'images/avatars/1.svg',
                 'images/avatars/2.svg',
@@ -79,56 +71,18 @@ self.addEventListener('install', function(event) {
                 'images/avatars/7.svg',
                 'images/avatars/8.svg',
                 'images/avatars/9.svg',
-                'images/siteicons/blue/category.png',
-                'images/siteicons/blue/check.png',
-                'images/siteicons/blue/delete.png',
-                'images/siteicons/blue/edit.png',
-                'images/siteicons/blue/notes.png',
-                'images/siteicons/blue/payment.png',
-                'images/siteicons/blue/save.png',
-                'images/siteicons/blue/subscription.png',
-                'images/siteicons/blue/web.png',
-                'images/siteicons/blue/websearch.png',
-                'images/siteicons/red/category.png',
-                'images/siteicons/red/check.png',
-                'images/siteicons/red/delete.png',
-                'images/siteicons/red/edit.png',
-                'images/siteicons/red/notes.png',
-                'images/siteicons/red/payment.png',
-                'images/siteicons/red/save.png',
-                'images/siteicons/red/subscription.png',
-                'images/siteicons/red/web.png',
-                'images/siteicons/red/websearch.png',
-                'images/siteicons/green/category.png',
-                'images/siteicons/green/check.png',
-                'images/siteicons/green/delete.png',
-                'images/siteicons/green/edit.png',
-                'images/siteicons/green/notes.png',
-                'images/siteicons/green/payment.png',
-                'images/siteicons/green/save.png',
-                'images/siteicons/green/subscription.png',
-                'images/siteicons/green/web.png',
-                'images/siteicons/green/websearch.png',
-                'images/siteicons/yellow/category.png',
-                'images/siteicons/yellow/check.png',
-                'images/siteicons/yellow/delete.png',
-                'images/siteicons/yellow/edit.png',
-                'images/siteicons/yellow/notes.png',
-                'images/siteicons/yellow/payment.png',
-                'images/siteicons/yellow/save.png',
-                'images/siteicons/yellow/subscription.png',
-                'images/siteicons/yellow/web.png',
-                'images/siteicons/yellow/websearch.png',
-                'images/siteicons/purple/category.png',
-                'images/siteicons/purple/check.png',
-                'images/siteicons/purple/delete.png',
-                'images/siteicons/purple/edit.png',
-                'images/siteicons/purple/notes.png',
-                'images/siteicons/purple/payment.png',
-                'images/siteicons/purple/save.png',
-                'images/siteicons/purple/subscription.png',
-                'images/siteicons/purple/web.png',
-                'images/siteicons/purple/websearch.png',
+                'images/siteicons/svg/logo.php',
+                'images/siteicons/svg/category.php',
+                'images/siteicons/svg/check.php',
+                'images/siteicons/svg/delete.php',
+                'images/siteicons/svg/edit.php',
+                'images/siteicons/svg/notes.php',
+                'images/siteicons/scg/payment.php',
+                'images/siteicons/svg/save.php',
+                'images/siteicons/svg/subscription.php',
+                'images/siteicons/svg/web.php',
+                'images/siteicons/svg/websearch.php',
+                'images/siteicons/svg/clone.php',
                 'images/siteicons/pwa/stats.png',
                 'images/siteicons/pwa/settings.png',
                 'images/siteicons/pwa/about.png',
diff --git a/settings.php b/settings.php
index 126717c89..e2d6b2c3b 100644
--- a/settings.php
+++ b/settings.php
@@ -178,23 +178,20 @@ class="avatar-option" data-src="images/uploads/logos/avatars/<?= $image ?>" />
                             <?php
                         }
                         ?>
-                        <button class="image-button medium" onClick="editMember(<?= $member['id'] ?>)" name="save">
-                            <img src="images/siteicons/<?= $colorTheme ?>/save.png"
-                                title="<?= translate('save_member', $i18n) ?>">
+                        <button class="image-button medium" onClick="editMember(<?= $member['id'] ?>)" name="save" title="<?= translate('save_member', $i18n) ?>">
+                            <?php include "images/siteicons/svg/save.php"; ?>
                         </button>
                         <?php
                         if ($index !== 0) {
                             ?>
-                            <button class="image-button medium" onClick="removeMember(<?= $member['id'] ?>)">
-                                <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                    title="<?= translate('delete_member', $i18n) ?>">
+                            <button class="image-button medium" onClick="removeMember(<?= $member['id'] ?>)" title="<?= translate('delete_member', $i18n) ?>">
+                                <?php include "images/siteicons/svg/delete.php"; ?>
                             </button>
                             <?php
                         } else {
                             ?>
-                            <button class="image-button medium disabled">
-                                <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                    title="<?= translate('cant_delete_member', $i18n) ?>">
+                            <button class="image-button medium disabled" title="<?= translate('cant_delete_member', $i18n) ?>">
+                                <?php include "images/siteicons/svg/delete.php"; ?>
                             </button>
                             <?php
                         }
@@ -750,23 +747,20 @@ class="capitalize"><?= translate('request_method', $i18n) ?>:</label>
                         <div class="form-group-inline" data-categoryid="<?= $category['id'] ?>">
                             <div class=" drag-icon"><i class="fa-solid fa-grip-vertical"></i></div>
                             <input type="text" name="category" value="<?= $category['name'] ?>" placeholder="Category">
-                            <button class="image-button medium" onClick="editCategory(<?= $category['id'] ?>)" name="save">
-                                <img src="images/siteicons/<?= $colorTheme ?>/save.png"
-                                    title="<?= translate('save_category', $i18n) ?>">
+                            <button class="image-button medium" onClick="editCategory(<?= $category['id'] ?>)" name="save" title="<?= translate('save_category', $i18n) ?>">
+                                <?php include "images/siteicons/svg/save.php"; ?>
                             </button>
                             <?php
                             if ($canDelete) {
                                 ?>
-                                <button class="image-button medium" onClick="removeCategory(<?= $category['id'] ?>)">
-                                    <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                        title="<?= translate('delete_category', $i18n) ?>">
+                                <button class="image-button medium" onClick="removeCategory(<?= $category['id'] ?>)" title="<?= translate('delete_category', $i18n) ?>">
+                                    <?php include "images/siteicons/svg/delete.php"; ?>
                                 </button>
                                 <?php
                             } else {
                                 ?>
-                                <button class="image-button medium disabled">
-                                    <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                        title="<?= translate('cant_delete_category_in_use', $i18n) ?>">
+                                <button class="image-button medium disabled" title="<?= translate('cant_delete_category_in_use', $i18n) ?>">
+                                    <?php include "images/siteicons/svg/delete.php"; ?>
                                 </button>
                                 <?php
                             }
@@ -841,23 +835,21 @@ class="capitalize"><?= translate('request_method', $i18n) ?>:</label>
                         <input type="text" name="currency" value="<?= $currency['name'] ?>" placeholder="Currency Name">
                         <input type="text" name="code" value="<?= $currency['code'] ?>" placeholder="Currency Code"
                             <?= !$canDelete ? 'disabled' : '' ?>>
-                        <button class="image-button medium" onClick="editCurrency(<?= $currency['id'] ?>)" name="save">
-                            <img src="images/siteicons/<?= $colorTheme ?>/save.png"
-                                title="<?= translate('save_currency', $i18n) ?>">
+                        <button class="image-button medium" onClick="editCurrency(<?= $currency['id'] ?>)" name="save" title="<?= translate('save_currency', $i18n) ?>">
+                            <?php include "images/siteicons/svg/save.php"; ?>
                         </button>
                         <?php
                         if ($canDelete) {
                             ?>
-                            <button class="image-button medium" onClick="removeCurrency(<?= $currency['id'] ?>)">
-                                <img src="images/siteicons/<?= $colorTheme ?>/delete.png"
-                                    title="<?= translate('delete_currency', $i18n) ?>">
+                            <button class="image-button medium" onClick="removeCurrency(<?= $currency['id'] ?>)" title="<?= translate('delete_currency', $i18n) ?>">
+                                <?php include "images/siteicons/svg/delete.php"; ?>
                             </button>
                             <?php
                         } else {
                             $cantDeleteMessage = $isMainCurrency ? translate('cant_delete_main_currency', $i18n) : translate('cant_delete_currency_in_use', $i18n);
                             ?>
-                            <button class="image-button medium disabled">
-                                <img src="images/siteicons/<?= $colorTheme ?>/delete.png" title="<?= $cantDeleteMessage ?>">
+                            <button class="image-button medium disabled" title="<?= $cantDeleteMessage ?>">
+                                <?php include "images/siteicons/svg/delete.php"; ?>
                             </button>
                             <?php
                         }
@@ -1044,7 +1036,7 @@ class="hidden-input">
                         <input type="hidden" id="icon-url" name="icon-url">
                         <div id="icon-search-button" class="image-button medium disabled"
                             title="<?= translate('search_logo', $i18n) ?>" onClick="searchPaymentIcon()">
-                            <img src="images/siteicons/<?= $colorTheme ?>/websearch.png">
+                            <?php include "images/siteicons/svg/websearch.php"; ?>
                         </div>
                         <div id="icon-search-results" class="icon-search">
                             <header>
diff --git a/styles/dark-theme.css b/styles/dark-theme.css
index 1daf3c607..2ce4d0cbb 100644
--- a/styles/dark-theme.css
+++ b/styles/dark-theme.css
@@ -7,8 +7,8 @@ body > header {
     background-color: #222;
 }
 
-header .logo .logo-image {
-    background-image: url("../images/siteicons/blue/walloswhite.png");
+svg .text-color {
+    fill: #E0E0E0;
 }
 
 .split-header > h2 .header-subtitle {
diff --git a/styles/login-dark-theme.css b/styles/login-dark-theme.css
index ba57463fa..1774c72f4 100644
--- a/styles/login-dark-theme.css
+++ b/styles/login-dark-theme.css
@@ -3,6 +3,10 @@ body {
     color: #E0E0E0;
 }
 
+svg .text-color {
+    fill: #E0E0E0;
+}
+
 .container {
     background-color: #222;
     border: 1px solid #333;
diff --git a/styles/login.css b/styles/login.css
index b73c9a136..24ce7efcf 100644
--- a/styles/login.css
+++ b/styles/login.css
@@ -45,6 +45,17 @@ body, html {
     text-align: center;
 }
 
+header .logo-image {
+  height: 50px;
+  width: 134px;
+  margin: 0px auto;
+}
+
+header .logo-image svg {
+  height: 50px;
+  width: 134px;
+}
+
 .container > .message {
   text-align: center;
   font-size: 18px;
diff --git a/styles/styles.css b/styles/styles.css
index fc6b7cf3c..4dc564550 100644
--- a/styles/styles.css
+++ b/styles/styles.css
@@ -67,8 +67,11 @@ header .logo .logo-image {
   height: 50px;
   width: 134px;
   margin-right: 10px;
-  background-image: url("../images/siteicons/blue/wallos.png");
-  background-size: 100%;
+}
+
+header .logo .logo-image svg {
+  height: 50px;
+  width: 134px;
 }
 
 .button-icon {
@@ -356,6 +359,17 @@ main > .contain {
   overflow: hidden;
 }
 
+.subscription-main .actions svg {
+  width: 32px;
+  height: 32px;
+}
+
+.subscription-secondary svg,
+.subscription-notes svg {
+  width: 20px;
+  height: 20px;
+}
+
 .subscription-main > span,
 .subscription-secondary > span {
   display: flex;
@@ -378,6 +392,11 @@ main > .contain {
   min-width: 32px;
 }
 
+.subscription .logo svg {
+  max-width: 100%;
+  height: 42px;
+}
+
 .subscription .name {
   flex-basis: 25%;
   font-weight: 600;
@@ -797,7 +816,13 @@ header #avatar {
   padding: 2px;
 }
 
-.image-button.disabled > img {
+.image-button > svg {
+  width: 32px;
+  height: 32px;
+}
+
+.image-button.disabled > img,
+.image-button.disabled > svg {
   -webkit-filter: grayscale(100%);
   filter: grayscale(100%);
 }
@@ -1421,11 +1446,18 @@ textarea.thin {
   background-color: #EEE;
 }
 
-.sort-options > ul > li.selected {
-  background-image: url("../images/siteicons/check.png");
-  background-size: 16px;
-  background-repeat: no-repeat;
-  background-position: center right 10px;
+.sort-options > ul > li.selected::after {
+  content: "";
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 16px;
+  height: 16px;
+  background-color: var(--main-color);
+  -webkit-mask: url("../images/siteicons/svg/check.php") no-repeat center;
+  mask: url("../images/siteicons/svg/check.php") no-repeat center;
+  background-size: 100% 100%;
 }
 
 .rtl .sort-options > ul > li.selected {
@@ -1775,10 +1807,21 @@ textarea.thin {
 }
 
 .filtermenu-content .filter-item.selected {
-  background-image: url(../images/siteicons/check.png);
-  background-size: 16px;
-  background-repeat: no-repeat;
-  background-position: center right 10px;
+  position: relative;
+}
+
+.filtermenu-content .filter-item.selected::after {
+  content: "";
+  position: absolute;
+  right: 10px;
+  top: 50%;
+  transform: translateY(-50%);
+  width: 16px; /* Explicitly set the size */
+  height: 16px; /* Explicitly set the size */
+  background-color: var(--main-color); /* Set your desired color here */
+  -webkit-mask: url("../images/siteicons/svg/check.php") no-repeat center;
+  mask: url("../images/siteicons/svg/check.php") no-repeat center;
+  background-size: 100% 100%; /* Ensure the icon scales correctly */
 }
 
 .rtl .filtermenu-content .filter-item.selected {
diff --git a/styles/theme.css b/styles/theme.css
index 188ba1f80..435658100 100644
--- a/styles/theme.css
+++ b/styles/theme.css
@@ -9,4 +9,16 @@
     --error-color-rgb: 244, 90, 64;
     --success-color: #188823;
     --success-color-rgb: 24, 136, 35;
+}
+
+svg .main-color {
+    fill: var(--main-color);
+}
+
+svg .accent-color {
+    fill: var(--accent-color);
+}
+
+svg .text-color {
+    fill: #202020;
 }
\ No newline at end of file
diff --git a/styles/themes/green.css b/styles/themes/green.css
index 33309e0c3..1fbe9c198 100644
--- a/styles/themes/green.css
+++ b/styles/themes/green.css
@@ -5,17 +5,4 @@
     --accent-color-rgb: 154, 205, 50;
     --hover-color: #556B2F; /* Olive Drab */
     --hover-color-rgb: 85, 107, 47;
-}
-
-header .logo .logo-image {
-    background-image: url("../../images/siteicons/green/wallos.png");
-}
-
-.dark header .logo .logo-image {
-    background-image: url("../../images/siteicons/green/walloswhite.png");
-}
-
-.sort-options > ul > li.selected,
-.filtermenu-content .filter-item.selected {
-    background-image: url("../../images/siteicons/green/check.png");
 }
\ No newline at end of file
diff --git a/styles/themes/purple.css b/styles/themes/purple.css
index b70203182..4e0e042fa 100644
--- a/styles/themes/purple.css
+++ b/styles/themes/purple.css
@@ -6,16 +6,3 @@
     --hover-color: #5e42cd;
     --hover-color-rgb: 50, 48, 108;
 }
-
-header .logo .logo-image {
-    background-image: url("../../images/siteicons/purple/wallos.png");
-}
-
-.dark header .logo .logo-image {
-    background-image: url("../../images/siteicons/purple/walloswhite.png");
-}
-
-.sort-options > ul > li.selected,
-.filtermenu-content .filter-item.selected {
-    background-image: url("../../images/siteicons/purple/check.png");
-}
\ No newline at end of file
diff --git a/styles/themes/red.css b/styles/themes/red.css
index a351aefe5..1f8fdc820 100644
--- a/styles/themes/red.css
+++ b/styles/themes/red.css
@@ -6,16 +6,3 @@
     --hover-color: #c73f29;
     --hover-color-rgb: 199, 63, 41;
 }
-
-header .logo .logo-image {
-    background-image: url("../../images/siteicons/red/wallos.png");
-}
-
-.dark header .logo .logo-image {
-    background-image: url("../../images/siteicons/red/walloswhite.png");
-}
-
-.sort-options > ul > li.selected,
-.filtermenu-content .filter-item.selected {
-    background-image: url("../../images/siteicons/red/check.png");
-}
\ No newline at end of file
diff --git a/styles/themes/yellow.css b/styles/themes/yellow.css
index 802850802..c1b98178f 100644
--- a/styles/themes/yellow.css
+++ b/styles/themes/yellow.css
@@ -5,17 +5,4 @@
     --accent-color-rgb: 250, 234, 143;
     --hover-color: #cd930c;
     --hover-color-rgb: 179, 124, 0;
-}
-
-header .logo .logo-image {
-    background-image: url("../../images/siteicons/yellow/wallos.png");
-}
-
-.dark header .logo .logo-image {
-    background-image: url("../../images/siteicons/yellow/walloswhite.png");
-}
-
-.sort-options > ul > li.selected,
-.filtermenu-content .filter-item.selected {
-    background-image: url("../../images/siteicons/yellow/check.png");
 }
\ No newline at end of file
diff --git a/verifyemail.php b/verifyemail.php
index 99a6052b2..f75a57816 100644
--- a/verifyemail.php
+++ b/verifyemail.php
@@ -96,15 +96,9 @@
     <div class="content">
         <section class="container">
             <header>
-                <?php
-                if ($theme == "light") {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/wallos.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" /> <?php
-                } else {
-                    ?> <img src="images/siteicons/<?= $colorTheme ?>/walloswhite.png" alt="Wallos Logo"
-                        title="Wallos - Subscription Tracker" width="215" /> <?php
-                }
-                ?>
+                <div class="logo-image">
+                    <?php include "images/siteicons/svg/logo.php"; ?>
+                </div>
             </header>
             <div class="message">
                 <?php