diff --git a/guacamole/src/main/frontend/src/images/logo-192.png b/guacamole/src/main/frontend/src/images/logo-192.png
new file mode 100644
index 000000000..d5e7f6b92
Binary files /dev/null and b/guacamole/src/main/frontend/src/images/logo-192.png differ
diff --git a/guacamole/src/main/frontend/src/images/logo-512.png b/guacamole/src/main/frontend/src/images/logo-512.png
new file mode 100644
index 000000000..5fcd201c2
Binary files /dev/null and b/guacamole/src/main/frontend/src/images/logo-512.png differ
diff --git a/guacamole/src/main/frontend/src/images/logo-vector.svg b/guacamole/src/main/frontend/src/images/logo-vector.svg
new file mode 100644
index 000000000..2ec0cf1bc
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/logo-vector.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 67.733 67.733"><g style="stroke-width:.95521659" transform="matrix(1.04688 0 0 1.04688 -76.056 -79.753)"><circle cx="105" cy="108.531" r="32.35" style="color:#000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000;solid-opacity:1;fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:.47760829;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:markers fill stroke;color-rendering:auto;image-rendering:optimizeQuality;shape-rendering:auto;text-rendering:auto"/><g style="display:inline;stroke-width:2.62722731"><path d="M-87.772-115.708c-3.995 2.057-6.417 4.636-6.417 6.972 0 .916-.23 3.817.763 4.77.093 1.382.246 2.684.469 3.914 2.188 2.8 11.35 7.898 23.167 7.898 11.588 0 20.851-4.809 23.306-7.618.301-1.255.545-2.571.711-3.967.695-1.033.625-3.277.625-4.997 0-1.735-1.454-3.462-2.467-4.001-.386.274-.96.741-1.358 1 .571.762.738 1.74.773 2.686 0 2.939-2.5 5.49-6.365 7.304-3.864 1.816-9.172 2.953-15.017 2.953s-11.118-1.137-14.982-2.953c-3.865-1.815-6.364-4.365-6.364-7.304 0-1.677 1.013-2.806 2.046-4.316.201-.294.34-.782.537-1.293.137-.354.32-.715.573-1.048m-3.278 21.824c3.93 8.509 12.17 11.673 21.867 11.673 8.87 0 16.246-3.608 20.306-11.166-3.117 3.013-11.045 6.36-20.896 6.36-10.228 0-18.587-3.823-21.277-6.867" style="fill:#fff;fill-opacity:1;stroke:none;stroke-width:2.62722731" transform="matrix(1.05874 0 0 1.05874 178.772 216.44)"/><g stroke="none" style="fill:#fff;stroke:#000;stroke-width:5.59483862;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path d="M89.509-167.731q-.105.014-.119.03c-.394.407-.918 1.297-1.451 2.443-.507 1.09-1.015 2.438-1.496 3.835.126.05.241.083.385.134.218.077.453.18.667.414.233.256.312.565.385.8.072.235.129.42.31.563.084.065.294.164.504.281s.44.25.578.489c.142.249.36.605.503.977.63-.345 2.123-1.145 3.688-2.162.823-.535 1.645-1.103 2.28-1.673.636-.571 1.075-1.15 1.215-1.6.019-.06.014-.195-.134-.414a4.5 4.5 0 0 0-.725-.785c-.641-.564-1.559-1.19-2.518-1.748-.959-.557-1.953-1.046-2.754-1.333a4.8 4.8 0 0 0-1.022-.251 1.3 1.3 0 0 0-.296 0" style="fill:#e4c548;fill-opacity:1;stroke:none;stroke-width:5.59483862" transform="matrix(1.05874 0 0 1.05874 26.348 265.256)"/><path d="M72.656 3.469a4 4 0 0 0-.531.031c-3.883.49-6.844.875-7.594 1.469-3.762 2.976-8.156 4.111-12.469 3.687-1.59-.156-6.474.813-8.624 1.719-1.812.763-4.295 4.392-8.438 7.063-1.875 1.208-3.922 1.98-5.687 2.75-1.738.757-3.488 1.649-3.844 1.937-.369.298-.696.834-1.125 1.938-.406 1.043-.817 2.803-2.094 4.656-1.547 2.244-2.858 3.967-3.687 5.406-.83 1.439-1.188 2.527-1.188 3.781 0 5.201 4.995 11.132 14.969 15.782 9.983 4.653 24.224 7.687 40.062 7.687 15.839 0 30.204-3.034 40.188-7.687 9.98-4.653 14.937-10.61 14.937-15.782 0-1.616-.155-2.133-.812-3.937-.083-.228-.274-.587-.375-.844a1170 1170 0 0 1-7.906 4.5c-.01.006-.054-.006-.063 0l-.937.563-3.938 2.374c-.533-2.026-.296-4.58-1.281-6.343-.218-.36-.484-.937-.813-1.469-.207-.1-.423-.174-.562-.25a17 17 0 0 1-2.219-1.469c-1.69-1.324-2.274-3.123-2.562-4.062-.165-.535-.309-.804-.344-.907-.037 0-.074-.02-.281-.093-2.217-.715-3.605-1.634-5.5-2.938l.812-2.281.188-.469c.01-.028-.01-.064 0-.093.943-2.779 2.016-5.278 3.03-7.782-3.483-2.076-5.447-4.416-7.25-5.062-2.372-.852-7.74-.78-12.28-1-3.15-.153-5.666-1.198-7.626-1.907-1.483-.536-2.657-.872-3.656-.937-.148-.01-.323-.029-.5-.031" style="display:inline;fill:#598d36;fill-opacity:1;stroke:none;stroke-width:5.59483862" transform="matrix(.36074 0 0 .36074 79.027 87.17)"/></g></g></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/index.html b/guacamole/src/main/frontend/src/index.html
index fd6337872..7a26c121f 100644
--- a/guacamole/src/main/frontend/src/index.html
+++ b/guacamole/src/main/frontend/src/index.html
@@ -28,6 +28,7 @@
         <link rel="icon" type="image/png" href="images/logo-64.png">
         <link rel="icon" type="image/png" sizes="144x144" href="images/logo-144.png">
         <link rel="apple-touch-icon" type="image/png" href="images/logo-144.png">
+        <link rel="manifest" href="manifest.json">
 
         <!-- Web application CSS (bundled by Webpack) -->
         <% for (var index in htmlWebpackPlugin.files.css) { %>
diff --git a/guacamole/src/main/frontend/src/manifest.json b/guacamole/src/main/frontend/src/manifest.json
new file mode 100644
index 000000000..8ec765339
--- /dev/null
+++ b/guacamole/src/main/frontend/src/manifest.json
@@ -0,0 +1,24 @@
+{
+    "name": "Guacamole",
+    "short_name": "Guacamole",
+    "description": "Guacamole",
+    "start_url": ".",
+    "display": "standalone",
+    "icons": [
+        {
+            "src": "./images/logo-vector.svg",
+            "type": "image/svg+xml",
+            "sizes": "512x512"
+        },
+        {
+            "src": "./images/logo-512.png",
+            "type": "image/png",
+            "sizes": "512x512"
+        },
+        {
+            "src": "./images/logo-192.png",
+            "type": "image/png",
+            "sizes": "192x192"
+        }
+    ]
+}
diff --git a/guacamole/src/main/frontend/webpack.config.js b/guacamole/src/main/frontend/webpack.config.js
index dc6ad08cf..9a9679911 100644
--- a/guacamole/src/main/frontend/webpack.config.js
+++ b/guacamole/src/main/frontend/webpack.config.js
@@ -137,6 +137,7 @@ module.exports = {
             { from: 'fonts/**/*' },
             { from: 'images/**/*' },
             { from: 'layouts/**/*' },
+            { from: 'manifest.json' },
             { from: 'translations/**/*' },
             { from: 'verifyCachedVersion.js' }
         ], {