diff --git a/devicon.json b/devicon.json
index 2d8d56092..849eea94f 100644
--- a/devicon.json
+++ b/devicon.json
@@ -16951,6 +16951,26 @@
             }
         ]
     },
+    {
+        "name": "xampp",
+        "altnames": [],
+        "tags": [
+            "server",
+            "php",
+            "database"
+        ],
+        "versions": {
+            "svg": [
+                "original",
+                "plain"
+            ],
+            "font": [
+                "plain"
+            ]
+        },
+        "color": "#fb7a24",
+        "aliases": []
+    },
     {
         "name": "xcode",
         "altnames": [],
diff --git a/icons/xampp/xampp-original.svg b/icons/xampp/xampp-original.svg
new file mode 100644
index 000000000..4d23ec082
--- /dev/null
+++ b/icons/xampp/xampp-original.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#fb7a24" d="M63.965.001 113.34 0c2.065 0 4.112.18 6.093.785 4.297 1.312 6.572 4.398 7.464 8.652.354 1.686.454 3.406.458 5.124.026 11.546.046 23.091.047 34.637.001 21.028.004 42.055-.04 63.083-.006 2.943-.163 5.919-1.614 8.6-1.609 2.974-3.813 5.327-7.157 6.363-.604.187-1.236.4-1.855.4-1.428.001-2.817.356-4.24.356-32.229-.003-64.459.016-96.688-.035-2.621-.004-5.285-.196-7.775-1.264-.496-.213-.996-.391-1.431-.724-3.171-2.42-5.323-5.438-5.784-9.522-.166-1.473-.219-2.937-.219-4.41.005-32.72.008-65.441.025-98.161.001-1.898.021-3.829.603-5.645C2.78 3.397 6.176.755 11.212.218a34 34 0 0 1 3.526-.207C31.147-.002 47.556.002 63.965.002zm.521 81.42c.342 1.936.616 3.631 1.195 5.255 3.557 9.976 14.125 18.222 27.913 14.899 9.875-2.38 17.053-11.481 17.365-21.631.149-4.864-1.013-9.342-3.646-13.423-.454-.705-.491-1.252-.136-2.01a40.2 40.2 0 0 0 3.31-10.803c.595-3.758.721-7.517-.001-11.281-1.708-8.905-10.762-18.492-22.985-18.379-12.061.112-20.57 9.208-22.407 17.901-.222 1.048-.391 2.107-.628 3.391-.157-.708-.293-1.18-.365-1.66-1.426-9.568-10.562-18.077-20.424-19.009-11.217-1.061-19.591 5.333-23.406 12.866-1.302 2.572-1.999 5.318-2.224 8.188-.422 5.371.74 10.345 3.734 14.85.349.525.355.935.075 1.477-1.95 3.793-3.2 7.815-3.637 12.054-.409 3.968-.522 7.943.607 11.841 3.117 10.759 13.482 17.685 24.706 16.448 9.495-1.046 15.828-6.302 19.544-14.926.794-1.84 1.047-3.838 1.409-6.048z"/><path fill="#fff" d="M64.486 81.421c-.361 2.21-.614 4.207-1.408 6.048-3.717 8.625-10.05 13.88-19.544 14.926-11.223 1.236-21.589-5.69-24.706-16.448-1.13-3.899-1.016-7.873-.607-11.841.437-4.24 1.686-8.261 3.637-12.054.279-.542.274-.952-.075-1.477-2.995-4.504-4.157-9.479-3.734-14.85.225-2.871.922-5.617 2.224-8.188 3.814-7.534 12.189-13.927 23.406-12.866 9.863.933 18.998 9.441 20.424 19.009.072.48.207.952.365 1.66.236-1.283.407-2.342.628-3.391 1.837-8.693 10.346-17.789 22.407-17.901 12.224-.113 21.277 9.474 22.985 18.379.722 3.763.596 7.523.001 11.281a40.2 40.2 0 0 1-3.31 10.803c-.356.759-.319 1.305.136 2.01 2.633 4.08 3.795 8.559 3.646 13.423-.312 10.149-7.49 19.251-17.365 21.631-13.788 3.322-24.356-4.923-27.913-14.899-.58-1.623-.855-3.319-1.196-5.255zm25.049-17.832c.147-.574.592-.918.911-1.342 3.457-4.594 5.275-9.725 4.869-15.504-.295-4.218-3.764-7.188-7.963-7.031-4.201.157-7.367 3.398-7.427 7.602-.004.344.016.689-.005 1.031-.289 4.481-2.761 6.935-6.507 7.209-.684.05-1.37.111-2.055.113-4.862.011-9.724.009-14.586.004-2.124-.002-4.229.229-6.251.853-9.44 2.913-14.944 9.368-16.767 18.989-.361 1.904-.686 3.879-.062 5.835.895 2.804 2.564 4.89 5.52 5.588 3.063.723 5.731-.077 7.85-2.483 1.37-1.555 1.802-3.403 1.905-5.432.265-5.217 3.106-7.825 7.843-7.785 7.268.06 14.537.013 21.805.018 1.29.001 1.302.018 1.308 1.294.013 2.357-.06 4.717.031 7.071.148 3.843 3.53 7.038 7.45 7.15 4.042.116 7.646-2.874 7.909-6.778a77 77 0 0 0-.009-10.158c-.172-2.617-1.588-4.482-3.987-5.565-.576-.259-1.181-.453-1.781-.68zm-45.56-7.929c1.563 0 2.839-.014 4.114.006.632.01.867-.262.861-.882-.021-2.452.106-4.913-.05-7.356-.207-3.224-1.921-5.554-4.922-6.729-3.077-1.205-5.893-.517-8.274 1.755-2.392 2.283-2.711 5.076-1.874 8.133.769 2.809 2.585 4.404 5.441 4.887 1.659.279 3.328.145 4.703.186z"/><path fill="#fb7a24" d="M89.535 63.589c.602.227 1.207.421 1.782.681 2.399 1.082 3.815 2.948 3.987 5.565a77 77 0 0 1 .009 10.158c-.263 3.903-3.867 6.892-7.909 6.778-3.919-.112-7.301-3.307-7.45-7.15-.091-2.353-.018-4.714-.031-7.071-.007-1.276-.018-1.293-1.308-1.294-7.269-.005-14.537.042-21.805-.018-4.737-.04-7.579 2.569-7.843 7.785-.103 2.028-.534 3.876-1.905 5.432-2.119 2.405-4.787 3.206-7.85 2.483-2.955-.698-4.624-2.784-5.52-5.588-.624-1.955-.299-3.931.062-5.835 1.823-9.621 7.326-16.077 16.767-18.989 2.022-.624 4.127-.855 6.251-.853 4.862.004 9.724.006 14.586-.004.685-.002 1.371-.063 2.055-.113 3.746-.274 6.218-2.728 6.507-7.209.022-.342.001-.688.005-1.031.059-4.203 3.225-7.444 7.427-7.602 4.199-.157 7.667 2.813 7.963 7.031.405 5.778-1.412 10.91-4.869 15.504-.321.423-.766.767-.912 1.341zm-45.56-7.929c-1.377-.04-3.044.094-4.703-.186-2.856-.482-4.673-2.078-5.441-4.887-.836-3.057-.518-5.85 1.874-8.133 2.381-2.273 5.197-2.96 8.274-1.755 3.001 1.174 4.715 3.506 4.922 6.729.156 2.442.03 4.904.05 7.356.005.62-.23.893-.861.882-1.275-.022-2.55-.006-4.114-.006z"/></svg>
diff --git a/icons/xampp/xampp-plain.svg b/icons/xampp/xampp-plain.svg
new file mode 100644
index 000000000..749c45bdf
--- /dev/null
+++ b/icons/xampp/xampp-plain.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128"><path fill="#fb7a24" d="M63.965 0h49.375c2.065 0 4.112.18 6.093.785 4.297 1.312 6.572 4.398 7.464 8.651.354 1.687.454 3.406.458 5.125.026 11.545.046 23.09.047 34.636 0 21.028.003 42.056-.04 63.084-.006 2.943-.162 5.919-1.613 8.6-1.61 2.974-3.813 5.327-7.158 6.363-.604.186-1.235.4-1.855.4-1.428 0-2.817.355-4.24.355-32.23-.003-64.459.016-96.688-.035-2.621-.005-5.285-.196-7.775-1.265-.496-.212-.996-.391-1.431-.723-3.171-2.42-5.323-5.438-5.785-9.522-.166-1.472-.219-2.937-.219-4.41.005-32.72.008-65.44.025-98.161.001-1.898.02-3.829.604-5.645C2.779 3.396 6.176.753 11.212.216c1.17-.124 2.35-.205 3.526-.206C31.146-.004 47.556 0 63.965 0m1.717 86.675c3.01 8.444 11.043 15.648 21.8 15.647 1.953 0 3.995-.237 6.114-.747 9.875-2.38 17.053-11.482 17.365-21.632.149-4.864-1.013-9.343-3.646-13.423-.455-.705-.492-1.25-.137-2.01a40.2 40.2 0 0 0 3.31-10.802c.596-3.758.721-7.518 0-11.28-1.699-8.854-10.656-18.38-22.772-18.38H87.5c-12.06.113-20.57 9.209-22.407 17.901-.221 1.048-.39 2.107-.627 3.389-.158-.707-.292-1.178-.364-1.658-1.426-9.569-10.561-18.076-20.424-19.01a26 26 0 0 0-3.005-.108c-9.706.226-16.936 6.13-20.402 12.974-1.302 2.572-2 5.318-2.225 8.188-.422 5.37.74 10.345 3.735 14.85.35.526.355.935.075 1.477-1.95 3.793-3.2 7.815-3.636 12.054-.409 3.968-.522 7.943.607 11.841 2.904 10.026 12.103 16.723 22.425 16.589q1.133-.014 2.281-.14c9.495-1.047 15.828-6.302 19.545-14.927.793-1.84 1.046-3.838 1.407-6.047.217 1.227.406 2.357.664 3.434.149.622.32 1.226.532 1.82M89.535 63.59c.602.228 1.207.422 1.782.681 2.4 1.082 3.816 2.948 3.987 5.565.221 3.381.236 6.78.01 10.159-.264 3.903-3.868 6.892-7.91 6.777-3.92-.112-7.3-3.307-7.45-7.15-.09-2.353-.018-4.714-.03-7.071-.008-1.276-.018-1.293-1.309-1.294-7.268-.005-14.537.042-21.805-.018-4.737-.04-7.578 2.569-7.843 7.785-.104 2.028-.535 3.876-1.905 5.432-2.119 2.404-4.787 3.205-7.85 2.482-2.955-.697-4.624-2.783-5.52-5.587-.623-1.955-.298-3.932.063-5.835 1.823-9.621 7.326-16.077 16.767-18.99 2.022-.624 4.127-.854 6.251-.853 4.863.005 9.724.007 14.586-.003.685-.002 1.371-.063 2.056-.113 3.746-.274 6.218-2.728 6.507-7.209.022-.342 0-.688.005-1.03.06-4.204 3.226-7.444 7.427-7.603 4.199-.157 7.667 2.814 7.963 7.031.405 5.778-1.413 10.91-4.87 15.504-.32.423-.766.767-.912 1.34m-45.56-7.93c-1.376-.04-3.044.095-4.703-.185-2.857-.482-4.673-2.078-5.442-4.887-.836-3.056-.518-5.85 1.874-8.132 2.382-2.273 5.198-2.96 8.275-1.756 3 1.175 4.715 3.506 4.921 6.73.156 2.442.03 4.903.05 7.355.006.62-.23.893-.86.882-1.276-.021-2.55-.006-4.115-.006"/></svg>