diff --git a/guacamole/src/main/frontend/src/app/client/styles/client.css b/guacamole/src/main/frontend/src/app/client/styles/client.css
index 16bd2d4a7..bc14d7ad9 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/client.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/client.css
@@ -125,5 +125,5 @@ body.client {
     background-size: 1em;
     background-position: 0.75em center;
     padding-left: 2.5em;
-    background-image: url('images/x.png');
+    background-image: url('images/x.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/client/styles/connection-warning.css b/guacamole/src/main/frontend/src/app/client/styles/connection-warning.css
index 87af0a882..daeb0f45a 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/connection-warning.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/connection-warning.css
@@ -48,7 +48,7 @@
     height: 100%;
     margin: 0 0.375em;
 
-    background: url('images/warning.png');
+    background: url('images/warning.svg');
     background-size: contain;
     background-position: center;
     background-repeat: no-repeat;
diff --git a/guacamole/src/main/frontend/src/app/client/styles/file-browser.css b/guacamole/src/main/frontend/src/app/client/styles/file-browser.css
index dda0e9107..bafaa0328 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/file-browser.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/file-browser.css
@@ -37,13 +37,13 @@
 /* Directory / file icons */
 
 .file-browser .normal-file > .caption .icon {
-    background-image: url('images/file.png');
+    background-image: url('images/file.svg');
 }
 
 .file-browser .directory > .caption .icon {
-    background-image: url('images/folder-closed.png');
+    background-image: url('images/folder-closed.svg');
 }
 
 .file-browser .directory.previous > .caption .icon {
-    background-image: url('images/folder-up.png');
+    background-image: url('images/folder-up.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/client/styles/filesystem-menu.css b/guacamole/src/main/frontend/src/app/client/styles/filesystem-menu.css
index 946bfa14b..aed541aee 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/filesystem-menu.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/filesystem-menu.css
@@ -64,7 +64,7 @@
     -khtml-background-size:  1.5em 1.5em;
     background-repeat: no-repeat;
     background-position: center center;
-    background-image: url('images/drive.png');
+    background-image: url('images/drive.svg');
     width: 2em;
     height: 2em;
     padding: 0;
diff --git a/guacamole/src/main/frontend/src/app/client/styles/guac-menu.css b/guacamole/src/main/frontend/src/app/client/styles/guac-menu.css
index 0f76c52b9..7f3879c6e 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/guac-menu.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/guac-menu.css
@@ -138,7 +138,7 @@
 }
 
 #guac-menu #devices .device.filesystem {
-    background-image: url('images/drive.png');
+    background-image: url('images/drive.svg');
 }
 
 #guac-menu #share-links {
diff --git a/guacamole/src/main/frontend/src/app/client/styles/share-menu.css b/guacamole/src/main/frontend/src/app/client/styles/share-menu.css
index 6d6659b01..8e1ae7cba 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/share-menu.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/share-menu.css
@@ -53,6 +53,6 @@
     background-repeat: no-repeat;
     background-size: 1em;
     background-position: 0.5em center;
-    background-image: url('images/share.png');
+    background-image: url('images/share.svg');
 
 }
diff --git a/guacamole/src/main/frontend/src/app/client/styles/transfer.css b/guacamole/src/main/frontend/src/app/client/styles/transfer.css
index 6ab2bd993..2c9c624d7 100644
--- a/guacamole/src/main/frontend/src/app/client/styles/transfer.css
+++ b/guacamole/src/main/frontend/src/app/client/styles/transfer.css
@@ -69,7 +69,7 @@
 .transfer.in-progress .progress {
 
     background-color: #EEE;
-    background-image: url('images/progress.png');
+    background-image: url('images/progress.svg');
 
     background-size: 16px 16px;
     -moz-background-size: 16px 16px;
diff --git a/guacamole/src/main/frontend/src/app/client/templates/client.html b/guacamole/src/main/frontend/src/app/client/templates/client.html
index 56ac835a5..543470e9a 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/client.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/client.html
@@ -139,7 +139,7 @@
 
                         <!-- Text input -->
                         <div class="choice">
-                            <div class="figure"><label for="ime-text"><img src="images/settings/tablet-keys.png" alt=""></label></div>
+                            <div class="figure"><label for="ime-text"><img src="images/settings/tablet-keys.svg" alt=""></label></div>
                             <label><input id="ime-text" name="input-method" ng-change="closeMenu()" ng-model="menu.inputMethod" type="radio" value="text"> {{'CLIENT.NAME_INPUT_METHOD_TEXT' | translate}}</label>
                             <p class="caption"><label for="ime-text">{{'CLIENT.HELP_INPUT_METHOD_TEXT' | translate}} </label></p>
                         </div>
@@ -163,7 +163,7 @@
                         <div class="choice">
                             <input name="mouse-mode" ng-change="closeMenu()" ng-model="menu.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute">
                             <div class="figure">
-                                <label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'CLIENT.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label>
+                                <label for="absolute"><img src="images/settings/touchscreen.svg" alt="{{'CLIENT.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label>
                                 <p class="caption"><label for="absolute">{{'CLIENT.HELP_MOUSE_MODE_ABSOLUTE' | translate}}</label></p>
                             </div>
                         </div>
@@ -172,7 +172,7 @@
                         <div class="choice">
                             <input name="mouse-mode" ng-change="closeMenu()" ng-model="menu.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative">
                             <div class="figure">
-                                <label for="relative"><img src="images/settings/touchpad.png" alt="{{'CLIENT.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label>
+                                <label for="relative"><img src="images/settings/touchpad.svg" alt="{{'CLIENT.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label>
                                 <p class="caption"><label for="relative">{{'CLIENT.HELP_MOUSE_MODE_RELATIVE' | translate}}</label></p>
                             </div>
                         </div>
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html b/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html
index fd4ab6eba..e741e4cb9 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/guacClientPanel.html
@@ -15,7 +15,7 @@
             <button class="close-other-connection" ng-click="disconnect(clientGroup)">
                 <img ng-attr-alt="{{ 'CLIENT.ACTION_DISCONNECT' | translate }}"
                      ng-attr-title="{{ 'CLIENT.ACTION_DISCONNECT' | translate }}"
-                     src="images/x.png">
+                     src="images/x.svg">
             </button>
 
             <!-- Thumbnail -->
diff --git a/guacamole/src/main/frontend/src/app/client/templates/guacClientZoom.html b/guacamole/src/main/frontend/src/app/client/templates/guacClientZoom.html
index df0045927..d2e74101a 100644
--- a/guacamole/src/main/frontend/src/app/client/templates/guacClientZoom.html
+++ b/guacamole/src/main/frontend/src/app/client/templates/guacClientZoom.html
@@ -1,13 +1,13 @@
 <div class="client-zoom">
     <div class="client-zoom-editor">
-        <div ng-click="zoomOut()" class="client-zoom-out"><img src="images/settings/zoom-out.png" alt="-"></div>
+        <div ng-click="zoomOut()" class="client-zoom-out"><img src="images/settings/zoom-out.svg" alt="-"></div>
         <div class="client-zoom-state">
             <input type="number" guac-zoom-ctrl
                     ng-model="client.clientProperties.scale"
                     ng-model-options="{ updateOn: 'blur submit' }"
                     ng-change="zoomSet()">%
         </div>
-        <div ng-click="zoomIn()" class="client-zoom-in"><img src="images/settings/zoom-in.png" alt="+"></div>
+        <div ng-click="zoomIn()" class="client-zoom-in"><img src="images/settings/zoom-in.svg" alt="+"></div>
     </div>
     <div class="client-zoom-autofit">
         <label><input ng-model="client.clientProperties.autoFit"
@@ -15,4 +15,4 @@
                       ng-disabled="autoFitDisabled()" type="checkbox" id="auto-fit">
             {{'CLIENT.TEXT_ZOOM_AUTO_FIT' | translate}}</label>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/guacamole/src/main/frontend/src/app/clipboard/styles/clipboard.css b/guacamole/src/main/frontend/src/app/clipboard/styles/clipboard.css
index 3d61c2be3..91fb328bb 100644
--- a/guacamole/src/main/frontend/src/app/clipboard/styles/clipboard.css
+++ b/guacamole/src/main/frontend/src/app/clipboard/styles/clipboard.css
@@ -47,7 +47,7 @@
     display: block;
     margin: 0 auto;
     border: 1px solid black;
-    background: url('images/checker.png');
+    background: url('images/checker.svg');
 }
 
 .clipboard-service-target {
diff --git a/guacamole/src/main/frontend/src/app/form/styles/form-field.css b/guacamole/src/main/frontend/src/app/form/styles/form-field.css
index 5083be0bb..a94b94a0d 100644
--- a/guacamole/src/main/frontend/src/app/form/styles/form-field.css
+++ b/guacamole/src/main/frontend/src/app/form/styles/form-field.css
@@ -38,10 +38,10 @@
 
 /* Icon for unmasking passwords */
 .form-field .password-field input[type=password] ~ .icon.toggle-password {
-    background-image: url('images/action-icons/guac-show-pass.png');
+    background-image: url('images/action-icons/guac-show-pass.svg');
 }
 
 /* Icon for masking passwords */
 .form-field .password-field input[type=text] ~ .icon.toggle-password {
-    background-image: url('images/action-icons/guac-hide-pass.png');
+    background-image: url('images/action-icons/guac-hide-pass.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/index/styles/buttons.css b/guacamole/src/main/frontend/src/app/index/styles/buttons.css
index e5597e352..2f2ce9e2e 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/buttons.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/buttons.css
@@ -105,30 +105,30 @@ input[type="submit"]:disabled, button:disabled, button.danger:disabled {
 
 .button.logout::before,
 button.logout::before {
-    background-image: url('images/action-icons/guac-logout.png');
+    background-image: url('images/action-icons/guac-logout.svg');
 }
 
 .button.reconnect::before,
 button.reconnect::before {
-    background-image: url('images/circle-arrows.png');
+    background-image: url('images/circle-arrows.svg');
 }
 
 .button.manage::before,
 button.manage::before {
-    background-image: url('images/action-icons/guac-config.png');
+    background-image: url('images/action-icons/guac-config.svg');
 }
 
 .button.back::before,
 button.back::before {
-    background-image: url('images/action-icons/guac-back.png');
+    background-image: url('images/action-icons/guac-back.svg');
 }
 
 .button.home::before,
 button.home::before {
-    background-image: url('images/action-icons/guac-home.png');
+    background-image: url('images/action-icons/guac-home.svg');
 }
 
 .button.change-password::before,
 button.change-password::before {
-    background-image: url('images/action-icons/guac-key.png');
+    background-image: url('images/action-icons/guac-key.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css b/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css
index bbfe40615..26841189c 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/fatal-page-error.css
@@ -38,7 +38,7 @@
 .fatal-page-error h1::before {
     content: ' ';
     display: inline-block;
-    background: url('images/warning.png');
+    background: url('images/warning.svg');
     background-repeat: no-repeat;
     height: 1em;
     width: 1em;
diff --git a/guacamole/src/main/frontend/src/app/index/styles/loading.css b/guacamole/src/main/frontend/src/app/index/styles/loading.css
index f4c077f0c..d7d81aeef 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/loading.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/loading.css
@@ -49,7 +49,7 @@
     top: 50%;
     left: 50%;
     
-    background-image: url('images/cog.png');
+    background-image: url('images/cog.svg');
     background-size: 96px 96px;
     background-position: center center;
     background-repeat: no-repeat;
diff --git a/guacamole/src/main/frontend/src/app/index/styles/other-connections.css b/guacamole/src/main/frontend/src/app/index/styles/other-connections.css
index 428d7852f..056ab63cb 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/other-connections.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/other-connections.css
@@ -56,7 +56,7 @@
     background-repeat: no-repeat;
     background-size: contain;
     background-position: center center;
-    background-image: url(images/arrows/right.png);
+    background-image: url(images/arrows/right.svg);
     opacity: 0.5;
 
 }
@@ -66,7 +66,7 @@
 }
 
 #other-connections .client-panel.hidden .client-panel-handle {
-    background-image: url(images/arrows/left.png);
+    background-image: url(images/arrows/left.svg);
 }
 
 #other-connections .client-panel-connection-list {
@@ -119,7 +119,7 @@
     width: 100%;
     z-index: 1;
 
-    background: url('images/warning-white.png');
+    background: url('images/warning-white.svg');
     background-size: 48px;
     background-position: center;
     background-repeat: no-repeat;
diff --git a/guacamole/src/main/frontend/src/app/index/styles/sorted-tables.css b/guacamole/src/main/frontend/src/app/index/styles/sorted-tables.css
index 080027e55..70c43bb1b 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/sorted-tables.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/sorted-tables.css
@@ -52,10 +52,10 @@ table.sorted th.sort-primary:after {
     background-size: 1em 1em;
     background-position: right center;
     background-repeat: no-repeat;
-    background-image: url('images/arrows/down.png');
+    background-image: url('images/arrows/down.svg');
 
 }
 
 table.sorted th.sort-primary.sort-descending:after {
-    background-image: url('images/arrows/up.png');
+    background-image: url('images/arrows/up.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/index/styles/ui.css b/guacamole/src/main/frontend/src/app/index/styles/ui.css
index b90e271c9..453831fa8 100644
--- a/guacamole/src/main/frontend/src/app/index/styles/ui.css
+++ b/guacamole/src/main/frontend/src/app/index/styles/ui.css
@@ -149,27 +149,27 @@ div.section {
  */
 
 .icon.user {
-    background-image: url('images/user-icons/guac-user.png');
+    background-image: url('images/user-icons/guac-user.svg');
 }
 
 .icon.user.add {
-    background-image: url('images/action-icons/guac-user-add.png');
+    background-image: url('images/action-icons/guac-user-add.svg');
 }
 
 .icon.user-group {
-    background-image: url('images/user-icons/guac-user-group.png');
+    background-image: url('images/user-icons/guac-user-group.svg');
 }
 
 .icon.user-group.add {
-    background-image: url('images/action-icons/guac-user-group-add.png');
+    background-image: url('images/action-icons/guac-user-group-add.svg');
 }
 
 .icon.connection {
-    background-image: url('images/protocol-icons/guac-plug.png');
+    background-image: url('images/protocol-icons/guac-plug.svg');
 }
 
 .icon.connection.add {
-    background-image: url('images/action-icons/guac-monitor-add.png');
+    background-image: url('images/action-icons/guac-monitor-add.svg');
 }
 
 .connection .icon,
@@ -187,30 +187,30 @@ div.section {
 }
 
 .connection-group > .caption .icon {
-    background-image: url('images/folder-closed.png');
+    background-image: url('images/folder-closed.svg');
 }
 
 .connection-group.expanded > .caption .icon {
-    background-image: url('images/folder-open.png');
+    background-image: url('images/folder-open.svg');
 }
 
 .connection .icon {
-    background-image: url('images/protocol-icons/guac-plug.png');
+    background-image: url('images/protocol-icons/guac-plug.svg');
 }
 
 .connection .icon.kubernetes,
 .connection .icon.ssh,
 .connection .icon.telnet {
-    background-image: url('images/protocol-icons/guac-text.png');
+    background-image: url('images/protocol-icons/guac-text.svg');
 }
 
 .connection .icon.vnc,
 .connection .icon.rdp {
-    background-image: url('images/protocol-icons/guac-monitor.png');
+    background-image: url('images/protocol-icons/guac-monitor.svg');
 }
 
 .sharing-profile .icon {
-    background-image: url('images/share.png');
+    background-image: url('images/share.svg');
 }
 
 /*
@@ -223,7 +223,7 @@ div.section {
 }
  
 .connection-group.empty.balancer .icon {
-    background-image: url('images/protocol-icons/guac-monitor.png');
+    background-image: url('images/protocol-icons/guac-monitor.svg');
 }
 
 .expandable.expanded > .children > .list-item {
@@ -259,16 +259,16 @@ div.section {
 }
 
 .expandable > .caption .icon.expand {
-    background-image: url('images/group-icons/guac-closed.png');
+    background-image: url('images/group-icons/guac-closed.svg');
 }
 
 .expandable.expanded > .caption .icon.expand {
-    background-image: url('images/group-icons/guac-open.png');
+    background-image: url('images/group-icons/guac-open.svg');
 }
 
 .expandable.empty > .caption .icon.expand {
     opacity: 0.25;
-    background-image: url('images/group-icons/guac-open.png');
+    background-image: url('images/group-icons/guac-open.svg');
 }
 
 .history th,
diff --git a/guacamole/src/main/frontend/src/app/list/styles/filter.css b/guacamole/src/main/frontend/src/app/list/styles/filter.css
index eb82bc107..ff4b568c8 100644
--- a/guacamole/src/main/frontend/src/app/list/styles/filter.css
+++ b/guacamole/src/main/frontend/src/app/list/styles/filter.css
@@ -22,7 +22,7 @@
 }
 
 .filter .search-string {
-    background-image: url('images/magnifier.png');
+    background-image: url('images/magnifier.svg');
     background-repeat: no-repeat;
     background-size: 1.75em;
     background-position: 0.25em center;
diff --git a/guacamole/src/main/frontend/src/app/list/styles/pager.css b/guacamole/src/main/frontend/src/app/list/styles/pager.css
index b02fbc4fd..7baa665b8 100644
--- a/guacamole/src/main/frontend/src/app/list/styles/pager.css
+++ b/guacamole/src/main/frontend/src/app/list/styles/pager.css
@@ -71,17 +71,17 @@
 }
 
 .pager .icon.first-page {
-    background-image: url('images/action-icons/guac-first-page.png');
+    background-image: url('images/action-icons/guac-first-page.svg');
 }
 
 .pager .icon.prev-page {
-    background-image: url('images/action-icons/guac-prev-page.png');
+    background-image: url('images/action-icons/guac-prev-page.svg');
 }
 
 .pager .icon.next-page {
-    background-image: url('images/action-icons/guac-next-page.png');
+    background-image: url('images/action-icons/guac-next-page.svg');
 }
 
 .pager .icon.last-page {
-    background-image: url('images/action-icons/guac-last-page.png');
+    background-image: url('images/action-icons/guac-last-page.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/login/styles/dialog.css b/guacamole/src/main/frontend/src/app/login/styles/dialog.css
index 48c583ef0..81ab8a98f 100644
--- a/guacamole/src/main/frontend/src/app/login/styles/dialog.css
+++ b/guacamole/src/main/frontend/src/app/login/styles/dialog.css
@@ -103,7 +103,7 @@
     -moz-background-size:    3em 3em;
     -webkit-background-size: 3em 3em;
     -khtml-background-size:  3em 3em;
-    background-image: url("images/guac-tricolor.png");
+    background-image: url("images/guac-tricolor.svg");
 }
 
 .login-ui.continuation .login-dialog {
diff --git a/guacamole/src/main/frontend/src/app/manage/styles/manage-user-group.css b/guacamole/src/main/frontend/src/app/manage/styles/manage-user-group.css
index df9e80df9..4c5adc9f7 100644
--- a/guacamole/src/main/frontend/src/app/manage/styles/manage-user-group.css
+++ b/guacamole/src/main/frontend/src/app/manage/styles/manage-user-group.css
@@ -39,11 +39,11 @@
 }
 
 .manage-user-group .page-tabs .page-list li.read-only a[href]:before {
-    background-image: url('images/lock.png');
+    background-image: url('images/lock.svg');
 }
 
 .manage-user-group .page-tabs .page-list li.unlinked a[href]:before {
-    background-image: url('images/plus.png');
+    background-image: url('images/plus.svg');
 }
 
 .manage-user-group .page-tabs .page-list li.unlinked a[href] {
@@ -56,7 +56,7 @@
 }
 
 .manage-user-group .page-tabs .page-list li.linked a[href]:before {
-    background-image: url('images/checkmark.png');
+    background-image: url('images/checkmark.svg');
 }
 
 .manage-user-group .notice.read-only {
diff --git a/guacamole/src/main/frontend/src/app/manage/styles/manage-user.css b/guacamole/src/main/frontend/src/app/manage/styles/manage-user.css
index d54c6b391..0afaf4e67 100644
--- a/guacamole/src/main/frontend/src/app/manage/styles/manage-user.css
+++ b/guacamole/src/main/frontend/src/app/manage/styles/manage-user.css
@@ -39,11 +39,11 @@
 }
 
 .manage-user .page-tabs .page-list li.read-only a[href]:before {
-    background-image: url('images/lock.png');
+    background-image: url('images/lock.svg');
 }
 
 .manage-user .page-tabs .page-list li.unlinked a[href]:before {
-    background-image: url('images/plus.png');
+    background-image: url('images/plus.svg');
 }
 
 .manage-user .page-tabs .page-list li.unlinked a[href] {
@@ -56,7 +56,7 @@
 }
 
 .manage-user .page-tabs .page-list li.linked a[href]:before {
-    background-image: url('images/checkmark.png');
+    background-image: url('images/checkmark.svg');
 }
 
 .manage-user .notice.read-only {
diff --git a/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html b/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html
index 794e1bd16..e6a309a78 100644
--- a/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html
+++ b/guacamole/src/main/frontend/src/app/manage/templates/identifierSetEditor.html
@@ -12,12 +12,12 @@
 
         <!-- Abbreviated list of only the currently selected objects -->
         <div class="abbreviated-related-objects">
-            <img src="images/arrows/right.png" alt="Expand" class="expand" ng-hide="expanded" ng-click="expand()">
-            <img src="images/arrows/down.png" alt="Collapse" class="collapse" ng-show="expanded" ng-click="collapse()">
+            <img src="images/arrows/right.svg" alt="Expand" class="expand" ng-hide="expanded" ng-click="expand()">
+            <img src="images/arrows/down.svg" alt="Collapse" class="collapse" ng-show="expanded" ng-click="collapse()">
             <p ng-hide="identifiers.length" class="no-related-objects">{{ emptyPlaceholder | translate }}</p>
             <ul>
                 <li ng-repeat="identifier in identifiers | filter: filterString">
-                    <label><img src="images/x-red.png" alt="Remove" class="remove"
+                    <label><img src="images/x-red.svg" alt="Remove" class="remove"
                                 ng-click="removeIdentifier(identifier)"
                                 ng-show="isEditable[identifier]"><span class="identifier">{{ identifier }}</span>
                     </label>
diff --git a/guacamole/src/main/frontend/src/app/navigation/styles/menu.css b/guacamole/src/main/frontend/src/app/navigation/styles/menu.css
index 65e010bf6..608650ea8 100644
--- a/guacamole/src/main/frontend/src/app/navigation/styles/menu.css
+++ b/guacamole/src/main/frontend/src/app/navigation/styles/menu.css
@@ -92,7 +92,7 @@
     background-repeat: no-repeat;
     background-size: 1em;
     background-position: center center;
-    background-image: url('images/arrows/down.png');
+    background-image: url('images/arrows/down.svg');
 
 }
 
diff --git a/guacamole/src/main/frontend/src/app/navigation/styles/user-menu.css b/guacamole/src/main/frontend/src/app/navigation/styles/user-menu.css
index d7759acd5..0af3f82c6 100644
--- a/guacamole/src/main/frontend/src/app/navigation/styles/user-menu.css
+++ b/guacamole/src/main/frontend/src/app/navigation/styles/user-menu.css
@@ -54,7 +54,7 @@
     background-repeat: no-repeat;
     background-size: 1em;
     background-position: 0.5em center;
-    background-image: url('images/user-icons/guac-user.png');
+    background-image: url('images/user-icons/guac-user.svg');
 
 }
 
@@ -64,23 +64,23 @@
     background-size: 1em;
     background-position: 0.75em center;
     padding-left: 2.5em;
-    background-image: url('images/protocol-icons/guac-monitor.png');
+    background-image: url('images/protocol-icons/guac-monitor.svg');
 
 }
 
 .user-menu .menu-dropdown .menu-contents li a[href="#/"] {
-    background-image: url('images/action-icons/guac-home-dark.png');
+    background-image: url('images/action-icons/guac-home-dark.svg');
 }
 
 .user-menu .menu-dropdown .menu-contents li a[href="#/settings/users"],
 .user-menu .menu-dropdown .menu-contents li a[href="#/settings/connections"],
 .user-menu .menu-dropdown .menu-contents li a[href="#/settings/sessions"],
 .user-menu .menu-dropdown .menu-contents li a[href="#/settings/preferences"] {
-    background-image: url('images/action-icons/guac-config-dark.png');
+    background-image: url('images/action-icons/guac-config-dark.svg');
 }
 
 .user-menu .menu-dropdown .menu-contents li a.logout {
-    background-image: url('images/action-icons/guac-logout-dark.png');
+    background-image: url('images/action-icons/guac-logout-dark.svg');
 }
 
 .user-menu .menu-dropdown .menu-contents .profile {
diff --git a/guacamole/src/main/frontend/src/app/notification/styles/notification.css b/guacamole/src/main/frontend/src/app/notification/styles/notification.css
index ac21ecb22..f5b99fe0b 100644
--- a/guacamole/src/main/frontend/src/app/notification/styles/notification.css
+++ b/guacamole/src/main/frontend/src/app/notification/styles/notification.css
@@ -74,7 +74,7 @@
 .notification .progress {
 
     width: 100%;
-    background: #C2C2C2 url('images/progress.png');
+    background: #C2C2C2 url('images/progress.svg');
     background-size: 16px 16px;
     -moz-background-size: 16px 16px;
     -webkit-background-size: 16px 16px;
diff --git a/guacamole/src/main/frontend/src/app/settings/styles/buttons.css b/guacamole/src/main/frontend/src/app/settings/styles/buttons.css
index e530510a6..f925c5121 100644
--- a/guacamole/src/main/frontend/src/app/settings/styles/buttons.css
+++ b/guacamole/src/main/frontend/src/app/settings/styles/buttons.css
@@ -45,17 +45,17 @@ a.button.add-connection-group::before {
 }
 
 a.button.add-user::before {
-    background-image: url('images/action-icons/guac-user-add.png');
+    background-image: url('images/action-icons/guac-user-add.svg');
 }
 
 a.button.add-user-group::before {
-    background-image: url('images/action-icons/guac-user-group-add.png');
+    background-image: url('images/action-icons/guac-user-group-add.svg');
 }
 
 a.button.add-connection::before {
-    background-image: url('images/action-icons/guac-monitor-add.png');
+    background-image: url('images/action-icons/guac-monitor-add.svg');
 }
 
 a.button.add-connection-group::before {
-    background-image: url('images/action-icons/guac-group-add.png');
+    background-image: url('images/action-icons/guac-group-add.svg');
 }
diff --git a/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html b/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html
index 09c1a97ed..cabd2ae9f 100644
--- a/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html
+++ b/guacamole/src/main/frontend/src/app/settings/templates/settingsPreferences.html
@@ -72,7 +72,7 @@
             <div class="choice">
                 <input name="mouse-mode" ng-model="preferences.emulateAbsoluteMouse" type="radio" ng-value="true" checked="checked" id="absolute">
                 <div class="figure">
-                    <label for="absolute"><img src="images/settings/touchscreen.png" alt="{{'SETTINGS_PREFERENCES.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label>
+                    <label for="absolute"><img src="images/settings/touchscreen.svg" alt="{{'SETTINGS_PREFERENCES.NAME_MOUSE_MODE_ABSOLUTE' | translate}}"></label>
                     <p class="caption"><label for="absolute">{{'SETTINGS_PREFERENCES.HELP_MOUSE_MODE_ABSOLUTE' | translate}}</label></p>
                 </div>
             </div>
@@ -81,7 +81,7 @@
             <div class="choice">
                 <input name="mouse-mode" ng-model="preferences.emulateAbsoluteMouse" type="radio" ng-value="false" id="relative">
                 <div class="figure">
-                    <label for="relative"><img src="images/settings/touchpad.png" alt="{{'SETTINGS_PREFERENCES.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label>
+                    <label for="relative"><img src="images/settings/touchpad.svg" alt="{{'SETTINGS_PREFERENCES.NAME_MOUSE_MODE_RELATIVE' | translate}}"></label>
                     <p class="caption"><label for="relative">{{'SETTINGS_PREFERENCES.HELP_MOUSE_MODE_RELATIVE' | translate}}</label></p>
                 </div>
             </div>
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-back.png b/guacamole/src/main/frontend/src/images/action-icons/guac-back.png
deleted file mode 100644
index 6435f4a73..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-back.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-back.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-back.svg
new file mode 100644
index 000000000..d40ac3ce9
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-back.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;stroke:none" d="M41.249 6.437a9593.495 9593.495 0 0 1-25.563 25.52c8.532 8.525 17.045 17.068 25.563 25.606l7.065-7.065L29.816 32l18.498-18.498z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-config-dark.png b/guacamole/src/main/frontend/src/images/action-icons/guac-config-dark.png
deleted file mode 100644
index 132a253b5..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-config-dark.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-config-dark.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-config-dark.svg
new file mode 100644
index 000000000..3622f7c68
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-config-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;stroke:none" d="m28.031 4.813-2 5.25a22.529 22.529 0 0 0-5.312 2.218L15 10.562 10.562 15l1.72 5.719a22.529 22.529 0 0 0-2.22 5.312l-5.25 2v7.938l5.25 2a22.529 22.529 0 0 0 2.22 5.312L10.561 49 15 53.438l5.719-1.72a22.529 22.529 0 0 0 5.312 2.22l2 5.25h7.938l2-5.25a22.529 22.529 0 0 0 5.312-2.22L49 53.439 53.438 49l-1.72-5.719a22.529 22.529 0 0 0 2.22-5.312l5.25-2V28.03l-5.25-2a22.529 22.529 0 0 0-2.22-5.312L53.439 15 49 10.562l-5.719 1.72a22.529 22.529 0 0 0-5.312-2.22l-2-5.25zM32 16.5c8.552 0 15.5 6.948 15.5 15.5S40.552 47.5 32 47.5 16.5 40.552 16.5 32 23.448 16.5 32 16.5z"/><path transform="translate(.31 .77)" d="M42.854 31.23a11.164 11.164 0 1 1-22.327 0 11.164 11.164 0 1 1 22.327 0z" style="fill:#000;stroke:none"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-config.png b/guacamole/src/main/frontend/src/images/action-icons/guac-config.png
deleted file mode 100644
index 5c4700b04..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-config.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-config.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-config.svg
new file mode 100644
index 000000000..d14026443
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-config.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;stroke:none" d="m28.031 4.813-2 5.25a22.529 22.529 0 0 0-5.312 2.218L15 10.562 10.562 15l1.72 5.719a22.529 22.529 0 0 0-2.22 5.312l-5.25 2v7.938l5.25 2a22.529 22.529 0 0 0 2.22 5.312L10.561 49 15 53.438l5.719-1.72a22.529 22.529 0 0 0 5.312 2.22l2 5.25h7.938l2-5.25a22.529 22.529 0 0 0 5.312-2.22L49 53.439 53.438 49l-1.72-5.719a22.529 22.529 0 0 0 2.22-5.312l5.25-2V28.03l-5.25-2a22.529 22.529 0 0 0-2.22-5.312L53.439 15 49 10.562l-5.719 1.72a22.529 22.529 0 0 0-5.312-2.22l-2-5.25zM32 16.5c8.552 0 15.5 6.948 15.5 15.5S40.552 47.5 32 47.5 16.5 40.552 16.5 32 23.448 16.5 32 16.5z"/><path transform="translate(.31 .77)" d="M42.854 31.23a11.164 11.164 0 1 1-22.327 0 11.164 11.164 0 1 1 22.327 0z" style="fill:#fff;stroke:none"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-first-page.png b/guacamole/src/main/frontend/src/images/action-icons/guac-first-page.png
deleted file mode 100644
index 86c7a97cc..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-first-page.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-first-page.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-first-page.svg
new file mode 100644
index 000000000..cc83f1223
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-first-page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;stroke:none" d="M-88.192 11.032h7.29v37.312h-7.29zm32.66 0a7001.475 7001.475 0 0 1-18.656 18.624c6.227 6.222 12.44 12.457 18.657 18.688l5.156-5.156-13.5-13.5 13.5-13.5z" transform="translate(126.933 -8.678) scale(1.3702)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-group-add.png b/guacamole/src/main/frontend/src/images/action-icons/guac-group-add.png
deleted file mode 100644
index be9b63014..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-group-add.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-group-add.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-group-add.svg
new file mode 100644
index 000000000..f4fd82e38
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-group-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.05000003;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" d="M328.653 258.485c-8.817 0-15.841 13.705-17.413 31.686H195.06c-11.575 0-20.838 10.086-20.838 22.551v224.94c0 12.466 9.263 22.266 20.838 22.266h292.594c11.575 0 21.124-9.8 21.124-22.265v-224.94c0-8.152.026-54.131-18.84-54.238zm-79.643 88.778h184.977c7.313 0 13.131 5.656 13.131 12.845v129.883c0 7.19-5.818 12.846-13.131 12.846H249.01c-7.313 0-13.13-5.657-13.13-12.846V360.108c0-7.189 5.817-12.845 13.13-12.845z" transform="translate(-19.073 1.734) scale(.10947)"/><path style="fill:#fff;stroke:none" d="M57.322 8.871h7.518v22.135h-7.518z" transform="translate(-15.013 -2.006)"/><path transform="rotate(90 -6.504 -8.51)" style="fill:#fff;stroke:none" d="M16.179-72.149h7.518v22.135h-7.518z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-hide-pass.png b/guacamole/src/main/frontend/src/images/action-icons/guac-hide-pass.png
deleted file mode 100644
index 816d0b26d..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-hide-pass.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-hide-pass.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-hide-pass.svg
new file mode 100644
index 000000000..27e876d27
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-hide-pass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(-31.663 -41) scale(.19138)" style="fill:#000"><rect ry="10" rx="10" y="359.24" x="196.801" height="158.064" width="184.408" style="fill:#000;fill-opacity:1;stroke:none"/><path d="M391.226 235.731c-36.12 0-65.643 29.524-65.643 65.643v69.887c0 .55-.013 1.087 0 1.633h31.352c-.026-.564 0-1.06 0-1.633v-69.887c0-19.281 15.01-34.291 34.29-34.291h4.573c19.28 0 34.29 15.01 34.29 34.29v69.888c0 .573.027 1.069 0 1.633h31.352c.014-.546 0-1.083 0-1.633v-69.887c0-36.12-29.523-65.643-65.642-65.643z" style="font-size:medium;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000;fill:#000;fill-opacity:1;stroke:none;stroke-width:31.37258148;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-home-dark.png b/guacamole/src/main/frontend/src/images/action-icons/guac-home-dark.png
deleted file mode 100644
index e1e35d4b1..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-home-dark.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-home-dark.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-home-dark.svg
new file mode 100644
index 000000000..5c2998b35
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-home-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="m-69 10.156-19.063 14.5h5.313V41.25h11.063v-6.875h5.374v6.875h11.063V24.656h5.313L-69 10.156zm5.406 15.719h4.282v4.281h-4.282v-4.281zm-15.093.094h4.28v4.281h-4.28v-4.281z" style="fill:#000;fill-opacity:1;stroke:none" transform="translate(147.925 -11.148) scale(1.67869)"/><path style="fill:#000;fill-opacity:1;stroke:none" d="M-61 13.5h4.75v7.75H-61z" transform="translate(147.925 -11.148) scale(1.67869)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-home.png b/guacamole/src/main/frontend/src/images/action-icons/guac-home.png
deleted file mode 100644
index d5613d4d1..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-home.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-home.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-home.svg
new file mode 100644
index 000000000..8c26557bc
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-home.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="m-69 10.156-19.063 14.5h5.313V41.25h11.063v-6.875h5.374v6.875h11.063V24.656h5.313L-69 10.156zm5.406 15.719h4.282v4.281h-4.282v-4.281zm-15.093.094h4.28v4.281h-4.28v-4.281z" style="fill:#fff;fill-opacity:1;stroke:none" transform="translate(147.925 -11.148) scale(1.67869)"/><path style="fill:#fff;fill-opacity:1;stroke:none" d="M-61 13.5h4.75v7.75H-61z" transform="translate(147.925 -11.148) scale(1.67869)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-key.png b/guacamole/src/main/frontend/src/images/action-icons/guac-key.png
deleted file mode 100644
index 89ea62b6b..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-key.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-key.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-key.svg
new file mode 100644
index 000000000..2bb543cff
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-key.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;fill-opacity:1;stroke:none" d="M31.844 9.594c-9.553.074-13.219-.126-13.219 4.656v15a2.716 2.716 0 0 0 2.719 2.719H41.75a2.716 2.716 0 0 0 2.719-2.719v-15c0-3.789-3.073-4.73-12.625-4.656zm-.407 3.719c4.165-.02 4.965 2.797 4.407 4.718-.559 1.922-2.906 1.856-4.375 1.844-1.47-.012-3.553.155-4.188-1.844-.635-1.998-.008-4.7 4.157-4.718z" transform="translate(.453)"/><path style="fill:#fff;fill-opacity:1;stroke:none" d="M77.702 20.455h7.305s.104 17.639 0 17.86c-.105.222-2.182 1.792-3.074 1.725-.892-.068-4.13-1.37-4.231-1.724-.101-.355 1.51-2.698 1.498-3.194-.011-.497-1.522-2.735-1.498-3.381.023-.646 1.492-2.338 1.498-2.727.006-.39-1.548-2.375-1.498-2.805.05-.43 1.57-2.067 1.498-2.497-.071-.43-1.498-3.257-1.498-3.257z" transform="translate(-94.13 -2.653) scale(1.54998)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-last-page.png b/guacamole/src/main/frontend/src/images/action-icons/guac-last-page.png
deleted file mode 100644
index b03932c82..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-last-page.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-last-page.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-last-page.svg
new file mode 100644
index 000000000..2d6c7a69e
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-last-page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;stroke:none" d="M-88.192 11.032h7.29v37.312h-7.29zm32.66 0a7001.475 7001.475 0 0 1-18.656 18.624c6.227 6.222 12.44 12.457 18.657 18.688l5.156-5.156-13.5-13.5 13.5-13.5z" transform="matrix(-1.3702 0 0 1.3702 -62.933 -8.678)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-logout-dark.png b/guacamole/src/main/frontend/src/images/action-icons/guac-logout-dark.png
deleted file mode 100644
index bfb9e1119..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-logout-dark.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-logout-dark.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-logout-dark.svg
new file mode 100644
index 000000000..4c9a285b3
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-logout-dark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:.00547374;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M2.094 1.486C.934 1.486 0 2.496 0 3.744v42.66c0 1.249.935 2.242 2.094 2.242h.302V5.17l19.272 14v29.476h7.9c1.16 0 2.094-.991 2.094-2.24V3.744c0-1.248-.934-2.258-2.094-2.258H2.094z"/><path d="M208.19 52.448c-10.236 0-18.485 9.336-18.485 20.894V468.33c0 11.558 8.249 20.743 18.486 20.743h242.637c10.237 0 18.486-9.185 18.486-20.743V73.342c0-11.558-8.249-20.894-18.486-20.894z" style="fill:none;fill-opacity:1;stroke:#000;stroke-width:47.44955063;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" transform="matrix(.07096 .05263 0 .10015 -11.461 -11.512)"/><path transform="matrix(.64819 .48075 0 .91482 .415 -3.146)" d="M26.5 30.125a1.625 1.625 0 1 1-3.25 0 1.625 1.625 0 0 1 3.25 0z" style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:5.19446087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path transform="rotate(90 -12.504 -.51)" style="fill:#000;stroke:none" d="M16.179-72.149h7.518v12.885h-7.518z"/><path style="fill:#000;fill-opacity:1;stroke:none" d="M48.023 17.5 29.988 27.913V7.087z" transform="matrix(-.6396 0 0 1 68.454 14.5)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-logout.png b/guacamole/src/main/frontend/src/images/action-icons/guac-logout.png
deleted file mode 100644
index 579301441..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-logout.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-logout.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-logout.svg
new file mode 100644
index 000000000..a2d2f96ae
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-logout.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.00547374;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M2.094 1.486C.934 1.486 0 2.496 0 3.744v42.66c0 1.249.935 2.242 2.094 2.242h.302V5.17l19.272 14v29.476h7.9c1.16 0 2.094-.991 2.094-2.24V3.744c0-1.248-.934-2.258-2.094-2.258H2.094z"/><path d="M208.19 52.448c-10.236 0-18.485 9.336-18.485 20.894V468.33c0 11.558 8.249 20.743 18.486 20.743h242.637c10.237 0 18.486-9.185 18.486-20.743V73.342c0-11.558-8.249-20.894-18.486-20.894z" style="fill:none;fill-opacity:1;stroke:#fff;stroke-width:47.44955063;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" transform="matrix(.07096 .05263 0 .10015 -11.461 -11.512)"/><path transform="matrix(.64819 .48075 0 .91482 .415 -3.146)" d="M26.5 30.125a1.625 1.625 0 1 1-3.25 0 1.625 1.625 0 0 1 3.25 0z" style="fill:#fff;fill-opacity:1;stroke:#fff;stroke-width:5.19446087;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path transform="rotate(90 -12.504 -.51)" style="fill:#fff;stroke:none" d="M16.179-72.149h7.518v12.885h-7.518z"/><path style="fill:#fff;fill-opacity:1;stroke:none" d="M48.023 17.5 29.988 27.913V7.087z" transform="matrix(-.6396 0 0 1 68.454 14.5)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-monitor-add.png b/guacamole/src/main/frontend/src/images/action-icons/guac-monitor-add.png
deleted file mode 100644
index 2ed062acd..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-monitor-add.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-monitor-add.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-monitor-add.svg
new file mode 100644
index 000000000..6c322615b
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-monitor-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(-19.073 1.734) scale(.10947)" style="fill:#fff"><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.00956892;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" d="M4 .656c-2.215 0-4 1.927-4 4.313V48.03c0 2.386 1.785 4.282 4 4.282h56c2.215 0 4-1.896 4-4.282V4.97c0-2.386-1.785-4.313-4-4.313H4zm10.313 10.938h35.374c1.4 0 2.532 1.093 2.532 2.469v24.843c0 1.376-1.132 2.469-2.532 2.469H14.313c-1.4 0-2.532-1.093-2.532-2.469V14.063c0-1.376 1.132-2.47 2.531-2.47z" transform="translate(174.22 231.813) scale(5.22525)"/><rect ry="18" rx="18" y="524.187" x="244.268" height="38.636" width="197.179" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.05000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"/></g><path style="fill:#fff;stroke:none" d="M57.322 8.871h7.518v22.135h-7.518z" transform="translate(-15.013 -2.006)"/><path transform="rotate(90 -6.504 -8.51)" style="fill:#fff;stroke:none" d="M16.179-72.149h7.518v22.135h-7.518z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-next-page.png b/guacamole/src/main/frontend/src/images/action-icons/guac-next-page.png
deleted file mode 100644
index d4022a452..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-next-page.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-next-page.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-next-page.svg
new file mode 100644
index 000000000..f21cc03ee
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-next-page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;stroke:none" d="M22.751 6.437a9593.495 9593.495 0 0 0 25.563 25.52c-8.532 8.525-17.045 17.068-25.563 25.606l-7.065-7.065L34.184 32 15.686 13.502z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-prev-page.png b/guacamole/src/main/frontend/src/images/action-icons/guac-prev-page.png
deleted file mode 100644
index 6f6819dee..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-prev-page.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-prev-page.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-prev-page.svg
new file mode 100644
index 000000000..f7a4b831e
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-prev-page.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;stroke:none" d="M41.249 6.437a9593.495 9593.495 0 0 1-25.563 25.52c8.532 8.525 17.045 17.068 25.563 25.606l7.065-7.065L29.816 32l18.498-18.498z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-show-pass.png b/guacamole/src/main/frontend/src/images/action-icons/guac-show-pass.png
deleted file mode 100644
index ce7ee2b2a..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-show-pass.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-show-pass.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-show-pass.svg
new file mode 100644
index 000000000..5dbcd1520
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-show-pass.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(-31.663 -41) scale(.19138)" style="fill:#000"><rect ry="10" rx="10" y="359.24" x="196.801" height="158.064" width="184.408" style="fill:#000;fill-opacity:1;stroke:none"/><path d="M286.72 277.533c-36.118 0-65.642 29.524-65.642 65.643v69.887c0 .55-.013 1.087 0 1.633h31.352c-.026-.564 0-1.06 0-1.633v-69.887c0-19.281 15.01-34.291 34.29-34.291h4.573c19.28 0 34.29 15.01 34.29 34.29v69.888c0 .573.027 1.069 0 1.633h31.352c.014-.546 0-1.083 0-1.633v-69.887c0-36.12-29.523-65.643-65.642-65.643z" style="font-size:medium;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;color:#000;fill:#000;fill-opacity:1;stroke:none;stroke-width:31.37258148;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-user-add.png b/guacamole/src/main/frontend/src/images/action-icons/guac-user-add.png
deleted file mode 100644
index 8a9f22fa5..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-user-add.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-user-add.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-user-add.svg
new file mode 100644
index 000000000..62808c621
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-user-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.09023736;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" d="M474.341 504.195c.005 31.957-.398 24.504-.398 58.628H208.914c0-52.862-.398-8.867-.398-58.628 0-47.522 67.134-73.133 131.412-73.133 64.277 0 134.405 18.656 134.413 73.133z" transform="translate(-19.633 -7.276) scale(.12552)"/><path style="fill:#fff;fill-rule:evenodd;stroke:none" d="M48.002 28.63c0 9.116-7.39 16.506-16.506 16.506S14.99 37.746 14.99 28.63s7.39-16.506 16.506-16.506 16.506 7.39 16.506 16.506z" transform="translate(2.566 16.574) scale(.65589)"/><path style="fill:#fff;stroke:none" d="M57.322 8.871h7.518v22.135h-7.518z" transform="translate(-15.013 -2.006)"/><path transform="rotate(90 -6.504 -8.51)" style="fill:#fff;stroke:none" d="M16.179-72.149h7.518v22.135h-7.518z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-user-group-add.png b/guacamole/src/main/frontend/src/images/action-icons/guac-user-group-add.png
deleted file mode 100644
index a8334333e..000000000
Binary files a/guacamole/src/main/frontend/src/images/action-icons/guac-user-group-add.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/action-icons/guac-user-group-add.svg b/guacamole/src/main/frontend/src/images/action-icons/guac-user-group-add.svg
new file mode 100644
index 000000000..8502ff379
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/action-icons/guac-user-group-add.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#fff;stroke:none" d="M57.322 8.871h7.518v22.135h-7.518z" transform="translate(-15.013 -2.006)"/><path transform="rotate(90 -6.504 -8.51)" style="fill:#fff;stroke:none" d="M16.179-72.149h7.518v22.135h-7.518z"/><g style="stroke-width:1.27789712"><g style="stroke-width:1.27789712;fill:#fff"><path style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#fff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2.55579424;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M31.773 43.098c4.756 0 9.723.71 13.377 2.35 3.654 1.639 5.918 4.007 5.918 7.69.001 4.273-.042 4.398-.052 7.854h-38.03c-.004-2.044-.013-3.433-.025-3.656-.016-.284-.03-.443-.03-4.197 0-3.117 2.172-5.546 5.727-7.315 3.556-1.768 8.396-2.726 13.115-2.726z" transform="matrix(.7825 0 0 .78257 .438 15.647)"/><path style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#fff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.55579424;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M32 16.268c6.651 0 12.021 5.37 12.021 12.021 0 6.651-5.37 12.024-12.021 12.024a12.008 12.008 0 0 1-12.021-12.024c0-6.651 5.37-12.021 12.021-12.021z" transform="matrix(.7825 0 0 .78257 .438 15.647)"/></g><g style="stroke-width:1.27789712;fill:#fff"><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.02206861;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" d="M16.531 41.025c-7.103 0-14.523 2.83-14.523 8.082 0 5.5.045.64.045 6.48h8.898c-.008-.523-.02-.31-.02-2.448 0-4.059 2.898-7.147 6.837-9.106 1.87-.93 4.003-1.631 6.255-2.119-2.324-.617-4.947-.889-7.492-.889z" transform="matrix(.7825 0 0 .78257 .438 15.647)"/><path style="fill:#fff;fill-rule:evenodd;stroke:none;stroke-width:1.27789712" d="M16.697 21.389a9.53 9.531 0 0 0-9.531 9.53 9.53 9.531 0 0 0 9.531 9.532 9.53 9.531 0 0 0 5.74-1.933c-2.736-2.561-4.458-6.194-4.458-10.229 0-2.328.58-4.52 1.587-6.455a9.53 9.531 0 0 0-2.869-.445z" transform="matrix(.7825 0 0 .78257 .438 15.647)"/></g><g style="stroke-width:1.27789712;fill:#fff"><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:.02206861;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" d="M47.139 41.025c-2.3 0-4.63.304-6.733.883 1.98.4 3.87.954 5.563 1.713 4.066 1.825 7.099 4.976 7.1 9.518 0 1.373-.011 1.757-.018 2.449h8.896c0-3.771.046-2.949.045-6.48 0-6.02-7.75-8.083-14.853-8.083z" transform="matrix(.7825 0 0 .78257 .438 15.647)"/><path style="fill:#fff;fill-rule:evenodd;stroke:none;stroke-width:1.27789712" d="M47.303 21.389a9.53 9.531 0 0 0-2.865.453 13.922 13.922 0 0 1 1.583 6.447c0 4.034-1.721 7.666-4.457 10.227a9.53 9.531 0 0 0 5.739 1.935 9.53 9.531 0 0 0 9.531-9.531 9.53 9.531 0 0 0-9.531-9.531z" transform="matrix(.7825 0 0 .78257 .438 15.647)"/></g></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/arrows/down.png b/guacamole/src/main/frontend/src/images/arrows/down.png
deleted file mode 100644
index cfa9885d8..000000000
Binary files a/guacamole/src/main/frontend/src/images/arrows/down.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/arrows/down.svg b/guacamole/src/main/frontend/src/images/arrows/down.svg
new file mode 100644
index 000000000..d546fa1ae
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/arrows/down.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" d="m88.625 45.491-16.88-29.237h33.76z" transform="matrix(.94788 0 0 .54726 -52.005 15.105)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/arrows/left.png b/guacamole/src/main/frontend/src/images/arrows/left.png
deleted file mode 100644
index 920a4fd76..000000000
Binary files a/guacamole/src/main/frontend/src/images/arrows/left.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/arrows/left.svg b/guacamole/src/main/frontend/src/images/arrows/left.svg
new file mode 100644
index 000000000..a0a57b913
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/arrows/left.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" d="m88.625 45.491-16.88-29.237h33.76z" transform="matrix(0 .94788 -.54726 0 48.895 -52.005)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/arrows/right.png b/guacamole/src/main/frontend/src/images/arrows/right.png
deleted file mode 100644
index 1b3483edf..000000000
Binary files a/guacamole/src/main/frontend/src/images/arrows/right.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/arrows/right.svg b/guacamole/src/main/frontend/src/images/arrows/right.svg
new file mode 100644
index 000000000..9f2522dda
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/arrows/right.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" d="m88.625 45.491-16.88-29.237h33.76z" transform="matrix(0 .94788 .54726 0 15.105 -52.005)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/arrows/up.png b/guacamole/src/main/frontend/src/images/arrows/up.png
deleted file mode 100644
index e751af83d..000000000
Binary files a/guacamole/src/main/frontend/src/images/arrows/up.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/arrows/up.svg b/guacamole/src/main/frontend/src/images/arrows/up.svg
new file mode 100644
index 000000000..6a20e1fdf
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/arrows/up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" d="m88.625 45.491-16.88-29.237h33.76z" transform="matrix(.94788 0 0 -.54726 -52.005 48.895)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/checker.png b/guacamole/src/main/frontend/src/images/checker.png
deleted file mode 100644
index 06f89032d..000000000
Binary files a/guacamole/src/main/frontend/src/images/checker.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/checker.svg b/guacamole/src/main/frontend/src/images/checker.svg
new file mode 100644
index 000000000..d69dfec94
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/checker.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 4.233 4.233"><path style="fill:#999;fill-opacity:1;stroke:none;stroke-width:.73147172" d="M0 0h4.233v4.233H0z"/><path style="fill:#666;fill-opacity:1;stroke:none;stroke-width:.36582226" d="M2.117 292.767h2.117v2.117H2.117z" transform="translate(0 -292.767)"/><path style="fill:#666;fill-opacity:1;stroke:none;stroke-width:.36582229" d="M0 294.883h2.117V297H0z" transform="translate(0 -292.767)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/checkmark.png b/guacamole/src/main/frontend/src/images/checkmark.png
deleted file mode 100644
index c54feb265..000000000
Binary files a/guacamole/src/main/frontend/src/images/checkmark.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/checkmark.svg b/guacamole/src/main/frontend/src/images/checkmark.svg
new file mode 100644
index 000000000..677cccfef
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/checkmark.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;stroke:none" transform="matrix(.05 -.08901 .0695 .0695 .298 -8.018)" d="M-203.492 487.824h325.537v71.505h-325.537z"/><path style="fill:#000;stroke:none" transform="matrix(-.0695 -.0695 -.05 .08901 .298 -8.018)" d="M-559.33 131.987h147.872v71.505H-559.33z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/circle-arrows.png b/guacamole/src/main/frontend/src/images/circle-arrows.png
deleted file mode 100644
index e5c33a1e9..000000000
Binary files a/guacamole/src/main/frontend/src/images/circle-arrows.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/circle-arrows.svg b/guacamole/src/main/frontend/src/images/circle-arrows.svg
new file mode 100644
index 000000000..c4200e21b
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/circle-arrows.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g style="stroke:#fff"><g style="stroke:#fff"><path style="opacity:1;fill:none;fill-opacity:1;stroke:#fff;stroke-width:7;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M2.65 27.905a19.125 19.125 0 0 1 19.126 0 19.125 19.125 0 0 1 9.562 16.562" transform="rotate(-30 -.47 .924)"/><path style="opacity:1;fill:#000;fill-opacity:1;stroke:#fff;stroke-width:21.38647461;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M48.013 34.996h9.974L53 43.633z" transform="matrix(.29472 -.17016 .1574 .27263 28.935 24.096)"/></g><g style="stroke:#fff"><path style="opacity:1;fill:none;fill-opacity:1;stroke:#fff;stroke-width:7;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M2.65 27.905a19.125 19.125 0 0 1 19.126 0 19.125 19.125 0 0 1 9.562 16.562" transform="rotate(150 23.673 40.7)"/><path style="opacity:1;fill:#000;fill-opacity:1;stroke:#fff;stroke-width:21.38647461;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" d="M48.013 34.996h9.974L53 43.633z" transform="matrix(-.29472 .17016 -.1574 -.27263 35.065 39.904)"/></g></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/cog.png b/guacamole/src/main/frontend/src/images/cog.png
deleted file mode 100644
index f5eb681a0..000000000
Binary files a/guacamole/src/main/frontend/src/images/cog.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/cog.svg b/guacamole/src/main/frontend/src/images/cog.svg
new file mode 100644
index 000000000..592717f2a
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/cog.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><g style="opacity:.25"><path d="m28.031 196.813-2 5.25a22.529 22.529 0 0 0-5.312 2.218L15 202.562 10.562 207l1.72 5.719a22.529 22.529 0 0 0-2.22 5.312l-5.25 2v7.938l5.25 2a22.529 22.529 0 0 0 2.22 5.312L10.561 241 15 245.438l5.719-1.72a22.529 22.529 0 0 0 5.312 2.22l2 5.25h7.938l2-5.25a22.529 22.529 0 0 0 5.312-2.22L49 245.439 53.438 241l-1.72-5.719a22.529 22.529 0 0 0 2.22-5.312l5.25-2v-7.939l-5.25-2a22.529 22.529 0 0 0-2.22-5.312L53.439 207 49 202.562l-5.719 1.72a22.529 22.529 0 0 0-5.312-2.22l-2-5.25zM32 208.5c8.552 0 15.5 6.948 15.5 15.5s-6.948 15.5-15.5 15.5-15.5-6.948-15.5-15.5 6.948-15.5 15.5-15.5z" style="fill:#000;stroke:none" transform="matrix(4 0 0 4 0 -768)"/><path style="fill:#000;stroke:none" d="M43.164 224a11.164 11.164 0 1 1-22.327 0 11.164 11.164 0 1 1 22.327 0z" transform="matrix(4 0 0 4 0 -768)"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/drive.png b/guacamole/src/main/frontend/src/images/drive.png
deleted file mode 100644
index 916d58e82..000000000
Binary files a/guacamole/src/main/frontend/src/images/drive.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/drive.svg b/guacamole/src/main/frontend/src/images/drive.svg
new file mode 100644
index 000000000..9b16d7e5c
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/drive.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="matrix(.5 0 0 .54546 -93.482 -177.995)"><path style="opacity:1;fill:#000;fill-opacity:1;stroke:#000;stroke-width:1.91485417;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" d="M212 353.105h76c2.216 0 3.549 1.678 4 3.667l8 35.262c.451 1.99-1.784 7.334-4 7.334h-92c-2.216 0-4.451-5.345-4-7.334l8-35.262c.451-1.99 1.784-3.667 4-3.667z"/><rect style="opacity:1;fill:#fff;fill-opacity:1;stroke:#000;stroke-width:1.91485417;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="100.086" height="27.5" x="199.923" y="389.528" rx="4" ry="3.667"/><rect style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="16" height="7.333" x="278" y="404.195" rx="1" ry="1"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/file.png b/guacamole/src/main/frontend/src/images/file.png
deleted file mode 100644
index d45e227d3..000000000
Binary files a/guacamole/src/main/frontend/src/images/file.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/file.svg b/guacamole/src/main/frontend/src/images/file.svg
new file mode 100644
index 000000000..9d0ffcf98
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/file.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="M200 327.361v125h100v-100l-25.002-25H200z" style="opacity:1;fill:#fff;fill-opacity:1;stroke:#000;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(.4 0 0 .4 -68 -123.945)"/><path d="M295 352.362h-20v-20z" style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="matrix(.4 0 0 .4 -68 -123.945)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/folder-closed.png b/guacamole/src/main/frontend/src/images/folder-closed.png
deleted file mode 100644
index 46a918ad5..000000000
Binary files a/guacamole/src/main/frontend/src/images/folder-closed.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/folder-closed.svg b/guacamole/src/main/frontend/src/images/folder-closed.svg
new file mode 100644
index 000000000..546a76bc8
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/folder-closed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="m296.805 525.621-4 17.455h-76v84.545h125v-102z" style="opacity:1;fill:#fff;fill-opacity:1;stroke:#000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(-75.425 -189.777) scale(.38462)"/><path d="m217.338 627.536-.448-90.545 66.307-.284 13.845 10.83h44.678l-.97 80z" style="opacity:1;fill:#000;fill-opacity:1;stroke:#000;stroke-width:5.17023516;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(-75.425 -189.777) scale(.38462)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/folder-open.png b/guacamole/src/main/frontend/src/images/folder-open.png
deleted file mode 100644
index f04b0be73..000000000
Binary files a/guacamole/src/main/frontend/src/images/folder-open.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/folder-open.svg b/guacamole/src/main/frontend/src/images/folder-open.svg
new file mode 100644
index 000000000..a28246a59
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/folder-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="m131.5 527.362-4 17.455h-76v84.545h125v-102z" style="opacity:1;fill:#fff;fill-opacity:1;stroke:#000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(-11.788 -190.448) scale(.38462)"/><path d="m51.437 629.55-13.706-72.149 66.529-.227 15.486 8.63h44.856l10.74 63.746z" style="opacity:1;fill:#000;fill-opacity:1;stroke:#000;stroke-width:4.62439919;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(-11.788 -190.448) scale(.38462)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/folder-up.png b/guacamole/src/main/frontend/src/images/folder-up.png
deleted file mode 100644
index 5271b2eb8..000000000
Binary files a/guacamole/src/main/frontend/src/images/folder-up.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/folder-up.svg b/guacamole/src/main/frontend/src/images/folder-up.svg
new file mode 100644
index 000000000..8c5cadca3
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/folder-up.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="m296.805 525.621-4 17.455h-76v84.545h125v-102z" style="opacity:1;fill:#fff;fill-opacity:1;stroke:#000;stroke-width:5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(-75.425 -189.777) scale(.38462)"/><path d="m217.338 627.536-.448-90.545 66.307-.284 13.845 10.83h44.678l-.97 80z" style="opacity:1;fill:#000;fill-opacity:1;stroke:#000;stroke-width:5.17023516;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(-75.425 -189.777) scale(.38462)"/><g style="fill:#fff"><path transform="rotate(90 -40.18 -33.859) scale(1.66174)" style="fill:#fff;stroke:none" d="M15.56-73.256h3.887v13.993H15.56z"/><path style="fill:#fff;fill-opacity:1;stroke:none" d="M48.023 17.5 29.988 27.913V7.087z" transform="matrix(-.82092 0 0 1.2835 51.66 12.946)"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/group-icons/guac-closed.png b/guacamole/src/main/frontend/src/images/group-icons/guac-closed.png
deleted file mode 100644
index bfa036be8..000000000
Binary files a/guacamole/src/main/frontend/src/images/group-icons/guac-closed.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/group-icons/guac-closed.svg b/guacamole/src/main/frontend/src/images/group-icons/guac-closed.svg
new file mode 100644
index 000000000..ccae1a2e4
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/group-icons/guac-closed.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="matrix(1.50673 0 0 1.50947 35.954 -12.06)"><rect ry="5.193" rx="5.193" y="15.256" x="-16.557" height="27.866" width="27.866" style="fill:#fff;stroke:#000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path style="fill:#000;stroke:none" d="M-12.091 26.67H6.843v5.038h-18.934z"/><path transform="rotate(90)" style="fill:#000;stroke:none" d="M19.722.105h18.934v5.038H19.722z"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/group-icons/guac-open.png b/guacamole/src/main/frontend/src/images/group-icons/guac-open.png
deleted file mode 100644
index c6396eda8..000000000
Binary files a/guacamole/src/main/frontend/src/images/group-icons/guac-open.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/group-icons/guac-open.svg b/guacamole/src/main/frontend/src/images/group-icons/guac-open.svg
new file mode 100644
index 000000000..0d0ccaafe
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/group-icons/guac-open.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(35.954 -11.98) scale(1.50673)"><rect ry="5.193" rx="5.193" y="15.256" x="-16.557" height="27.866" width="27.866" style="fill:#fff;stroke:#000;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"/><path style="fill:#000;stroke:none" d="M-12.091 26.67H6.843v5.038h-18.934z"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/guac-tricolor.png b/guacamole/src/main/frontend/src/images/guac-tricolor.png
deleted file mode 100644
index 5ff25d18f..000000000
Binary files a/guacamole/src/main/frontend/src/images/guac-tricolor.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/guac-tricolor.svg b/guacamole/src/main/frontend/src/images/guac-tricolor.svg
new file mode 100644
index 000000000..a9811e6d7
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/guac-tricolor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 67.733 67.733"><g transform="translate(-76.056 -79.753) scale(1.04688)" style="stroke-width:.95521659"><circle 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;enable-background:accumulate" cx="105" cy="108.531" r="32.35"/><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.953-5.844 0-11.118-1.137-14.982-2.953-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.293a4.27 4.27 0 0 1 .573-1.048zm-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.867z" style="fill:#fff;fill-opacity:1;stroke:none;stroke-width:2.62722731" transform="translate(178.772 216.44) scale(1.05874)"/><g style="fill:#fff;stroke:#000;stroke-width:5.59483862;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"><path d="M89.509-167.731c-.07.008-.11.02-.119.03-.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.281.21.117.44.25.578.489.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.487 4.487 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.754 4.754 0 0 0-1.022-.251 1.263 1.263 0 0 0-.296 0z" style="fill:#e4c548;fill-opacity:1;stroke:none;stroke-width:5.59483862" transform="translate(26.348 265.256) scale(1.05874)"/><path transform="translate(79.027 87.17) scale(.36074)" d="M72.656 3.469a4.03 4.03 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.688 2.75-1.737.757-3.487 1.649-3.843 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.688 5.406-.83 1.439-1.187 2.527-1.187 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.688 9.98-4.652 14.937-10.609 14.937-15.78 0-1.617-.155-2.134-.812-3.938-.083-.228-.274-.587-.375-.844a1169.814 1169.814 0 0 1-7.906 4.5c-.01.006-.054-.006-.063 0l-.938.563-3.937 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.019 17.019 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-.031z" style="display:inline;fill:#598d36;fill-opacity:1;stroke:none;stroke-width:5.59483862"/></g></g></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/lock.png b/guacamole/src/main/frontend/src/images/lock.png
deleted file mode 100644
index 399d51182..000000000
Binary files a/guacamole/src/main/frontend/src/images/lock.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/lock.svg b/guacamole/src/main/frontend/src/images/lock.svg
new file mode 100644
index 000000000..e15cfcce5
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/lock.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(-8.981 -24.355) scale(.1418)" style="fill:#000"><rect ry="10" rx="10" y="359.24" x="196.801" height="158.064" width="184.408" style="fill:#000;fill-opacity:1;stroke:none"/><path d="M286.72 277.533c-36.118 0-65.642 29.524-65.642 65.643v69.887c0 .55-.013 1.087 0 1.633h31.352c-.026-.564 0-1.06 0-1.633v-69.887c0-19.281 15.01-34.291 34.29-34.291h4.573c19.28 0 34.29 15.01 34.29 34.29v69.888c0 .573.027 1.069 0 1.633h31.352c.014-.546 0-1.083 0-1.633v-69.887c0-36.12-29.523-65.643-65.642-65.643z" style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#000;fill-opacity:1;stroke:none;stroke-width:31.37258148;marker:none;enable-background:accumulate"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/magnifier.png b/guacamole/src/main/frontend/src/images/magnifier.png
deleted file mode 100644
index 15261209e..000000000
Binary files a/guacamole/src/main/frontend/src/images/magnifier.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/magnifier.svg b/guacamole/src/main/frontend/src/images/magnifier.svg
new file mode 100644
index 000000000..4a198d31e
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/magnifier.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="rotate(-30 -4.365 73.476) scale(.14612)" style="opacity:.25"><circle r="16.506" cy="28.63" cx="31.496" style="fill:none;fill-rule:evenodd;stroke:#000;stroke-width:5.49999952;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" transform="translate(176.854 190.011) scale(5.22525)"/><rect style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:8;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" width="36.577" height="125.406" x="324.447" y="424.444" rx="10" ry="10"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/plus.png b/guacamole/src/main/frontend/src/images/plus.png
deleted file mode 100644
index 14bedbe48..000000000
Binary files a/guacamole/src/main/frontend/src/images/plus.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/plus.svg b/guacamole/src/main/frontend/src/images/plus.svg
new file mode 100644
index 000000000..3d6624663
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path transform="translate(36.003 -19.467) scale(.0983)" style="fill:#000;stroke:none" d="M-203.492 487.824h325.537v71.505h-325.537z"/><path transform="matrix(0 -.0983 -.0983 0 36.003 -19.467)" style="fill:#000;stroke:none" d="M-686.345 4.971h325.537v71.505h-325.537z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/progress.png b/guacamole/src/main/frontend/src/images/progress.png
deleted file mode 100644
index 72e0495bb..000000000
Binary files a/guacamole/src/main/frontend/src/images/progress.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/progress.svg b/guacamole/src/main/frontend/src/images/progress.svg
new file mode 100644
index 000000000..9cc0c9fff
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/progress.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g style="opacity:.2"><path transform="rotate(45)" style="opacity:1;fill:#000;fill-opacity:1;stroke:none;stroke-width:1.42166996" d="M35.755-64h19V64h-19zm-45 0h19V64h-19zm90 0h19V64h-19z"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/protocol-icons/guac-monitor.png b/guacamole/src/main/frontend/src/images/protocol-icons/guac-monitor.png
deleted file mode 100644
index 6608c2935..000000000
Binary files a/guacamole/src/main/frontend/src/images/protocol-icons/guac-monitor.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/protocol-icons/guac-monitor.svg b/guacamole/src/main/frontend/src/images/protocol-icons/guac-monitor.svg
new file mode 100644
index 000000000..5514678c4
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/protocol-icons/guac-monitor.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(-33.342 -44.364) scale(.19138)"><path style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:.00956892;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" d="M4 .656c-2.215 0-4 1.927-4 4.313V48.03c0 2.386 1.785 4.282 4 4.282h56c2.215 0 4-1.896 4-4.282V4.97c0-2.386-1.785-4.313-4-4.313H4zm10.313 10.938h35.374c1.4 0 2.532 1.093 2.532 2.469v24.843c0 1.376-1.132 2.469-2.532 2.469H14.313c-1.4 0-2.532-1.093-2.532-2.469V14.063c0-1.376 1.132-2.47 2.531-2.47z" transform="translate(174.22 231.813) scale(5.22525)"/><rect ry="18" rx="18" y="524.187" x="244.268" height="38.636" width="197.179" style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:.05000001;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/protocol-icons/guac-plug.png b/guacamole/src/main/frontend/src/images/protocol-icons/guac-plug.png
deleted file mode 100644
index d54ee53d4..000000000
Binary files a/guacamole/src/main/frontend/src/images/protocol-icons/guac-plug.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/protocol-icons/guac-plug.svg b/guacamole/src/main/frontend/src/images/protocol-icons/guac-plug.svg
new file mode 100644
index 000000000..e4e1eaefc
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/protocol-icons/guac-plug.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path d="M195 553.515c-21.945 0-40.118 15.552-44.156 36.281h-71c-5.936 0-10.719 6.136-10.719 13.781v38.125c0 7.646 4.783 13.813 10.719 13.813h71.969c5.466 18.69 22.683 32.281 43.187 32.281h48.406V657.64h44.313v-20h-44.313v-34h44.313v-20h-44.313v-23.125c0-2.382.21-4.72.563-7H195zm163.69 0c21.945 0 40.117 15.552 44.156 36.281h71c5.936 0 10.719 6.136 10.719 13.781v38.125c0 7.645-4.783 13.813-10.719 13.813h-71.969c-5.467 18.69-22.683 32.281-43.187 32.281h-48.407V560.515c0-2.382-.209-4.72-.562-7h48.969z" style="fill:#000;stroke:none" transform="translate(-10.649 -63.614) scale(.15405)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/protocol-icons/guac-text.png b/guacamole/src/main/frontend/src/images/protocol-icons/guac-text.png
deleted file mode 100644
index 8d5eff62a..000000000
Binary files a/guacamole/src/main/frontend/src/images/protocol-icons/guac-text.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/protocol-icons/guac-text.svg b/guacamole/src/main/frontend/src/images/protocol-icons/guac-text.svg
new file mode 100644
index 000000000..6b7000b5c
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/protocol-icons/guac-text.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="translate(-16.868 -118.574) scale(.18109)"><rect ry="18" rx="18" y="893.791" x="263.714" height="60" width="182.857" style="fill:#000;fill-opacity:1;stroke:none"/><path d="M128.156 709.221a17.986 17.986 0 0 0-12.75 5.281l-16.969 16.97a17.939 17.939 0 0 0 0 25.437L173 831.502l-74.563 74.563a17.976 17.976 0 0 0 0 25.469l16.97 16.968a17.976 17.976 0 0 0 25.468 0L244.719 844.66c3.63-3.63 5.357-8.42 5.25-13.157.116-4.746-1.612-9.518-5.25-13.156L140.875 714.502a17.915 17.915 0 0 0-12.719-5.28z" style="fill:#000;fill-opacity:1;stroke:none"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/settings/tablet-keys.png b/guacamole/src/main/frontend/src/images/settings/tablet-keys.png
deleted file mode 100644
index 14eb5777e..000000000
Binary files a/guacamole/src/main/frontend/src/images/settings/tablet-keys.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/settings/tablet-keys.svg b/guacamole/src/main/frontend/src/images/settings/tablet-keys.svg
new file mode 100644
index 000000000..685128d3c
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/settings/tablet-keys.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="236" height="186"><path style="fill:#fff;stroke:#000;stroke-width:16;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M17 853.362h220v170H17z" transform="translate(-9 -845.375)"/><g style="opacity:.5"><path style="fill:#999;stroke:#000;stroke-width:1;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M16 963.612h204v72.75H16z" transform="translate(0 -866.375)"/><g transform="translate(-7.75 -826.688)"><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="31.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="47.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="63.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="79.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="95.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="111.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="127.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="143.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="159.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="175.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="27.75" height="12" x="191.25" y="931.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="31.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="47.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="63.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="79.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="95.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="111.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="127.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="143.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="159.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="175.25" y="947.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="191.25" y="947.425" rx="2" ry="2.233"/><path transform="translate(-1.25 777.675)" d="M210.5 169.75c-1.108 0-2 .982-2 2.219v13.781h-14c-1.108 0-2 .982-2 2.219v7.562c0 1.237.892 2.219 2 2.219h23.75c1.108 0 2-.982 2-2.219-.008-7.917-.033-16.554-.031-23.562 0-1.237-.892-2.219-2-2.219z" style="fill:#ccc;fill-opacity:1;stroke:none"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="31.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="47.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="63.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="79.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="95.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="111.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="127.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="143.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="159.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="175.25" y="963.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="31.25" y="979.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="47.25" y="979.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="63.25" y="979.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="91.75" height="12" x="79.25" y="979.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="175.25" y="979.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="191.25" y="979.425" rx="2" ry="2.233"/><rect style="fill:#ccc;fill-opacity:1;stroke:none" width="12" height="12" x="207.25" y="979.425" rx="2" ry="2.233"/></g></g><path style="opacity:.5;fill:#fff;fill-opacity:1;stroke:none" d="M235 143.5a6.5 6.5 0 1 1-13 0 6.5 6.5 0 0 1 13 0z" transform="translate(99.042 11.93) scale(.56486)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/settings/touchpad.png b/guacamole/src/main/frontend/src/images/settings/touchpad.png
deleted file mode 100644
index 3facb5d38..000000000
Binary files a/guacamole/src/main/frontend/src/images/settings/touchpad.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/settings/touchpad.svg b/guacamole/src/main/frontend/src/images/settings/touchpad.svg
new file mode 100644
index 000000000..4add6d44d
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/settings/touchpad.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="640" height="256"><path style="fill:none;stroke:#3771c8;stroke-width:6;stroke-miterlimit:4;stroke-dasharray:none" d="M485 106c0 12.15-9.85 22-22 22s-22-9.85-22-22 9.85-22 22-22 22 9.85 22 22z" transform="translate(-344.117 -6.169)"/><path d="M110.26 888.66c-9.813.312-11.485 7.959-11.485 13.615v70.503c-2.348-7.368-18.912-12.078-20.163 2.913-1.064 12.753 7.47 33.273 15.963 46.684 5.004 7.902 18.958 14.254 45.788 13.984 44.774.667 57.807-30.985 48.832-80.35-2.025-11.134-19.229-6.22-25.46 0l-40.288 6.759v-60.493c0-6.084-3.374-13.925-13.187-13.614z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262282999999975;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(8 -800.362)"/><path d="M123.434 944.675c3.083-6.814 20.375-7.852 23.554 0 9.58 23.668 0 62.627 0 62.627h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262282999999975;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(8 -800.362)"/><path d="M147.274 948.76c3.183-7.777 20.976-6.359 21.964 1.028 3.708 27.724 1.391 19.528 1.59 61.598h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262282999999975;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(8 -800.362)"/><path transform="matrix(.9958 .0916 -.0813 .99669 8 -800.362)" style="fill:#fff;fill-opacity:1;stroke:none" d="M193.763 952.558h64.493v47.373h-64.493z"/><path style="fill:#000;stroke:#fff;stroke-width:3.50631141999999985;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M65.753 821.99v47.276l10.824-9.62 11.856 26.54 7.146-3.219-11.892-26.645H99.94L65.753 821.99z" transform="translate(-36 -792.362)"/><path style="fill:none;stroke:#3771c8;stroke-width:6;stroke-miterlimit:4;stroke-dasharray:none" d="M485 106c0 12.15-9.85 22-22 22s-22-9.85-22-22 9.85-22 22-22 22 9.85 22 22z" transform="translate(1)"/><g style="opacity:.1"><path d="M110.26 888.66c-9.813.312-11.485 7.959-11.485 13.615v70.503c-2.348-7.368-18.912-12.078-20.163 2.913-1.064 12.753 7.47 33.273 15.963 46.684 5.004 7.902 18.958 14.254 45.788 13.984 44.774.667 57.807-30.985 48.832-80.35-2.025-11.134-19.229-6.22-25.46 0l-40.288 6.759v-60.493c0-6.084-3.374-13.925-13.187-13.614z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(253.875 -795.356)"/><path d="M123.434 944.675c3.083-6.814 20.375-7.852 23.554 0 9.58 23.668 0 62.627 0 62.627h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(253.875 -795.356)"/><path d="M147.274 948.76c3.183-7.777 20.976-6.359 21.964 1.028 3.708 27.724 1.391 19.528 1.59 61.598h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(253.875 -795.356)"/><path transform="matrix(.9958 .0916 -.0813 .99669 253.875 -795.356)" style="fill:#fff;fill-opacity:1;stroke:none" d="M193.763 952.558h64.493v47.373h-64.493z"/><path style="fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M225.628 830.997v47.276l10.824-9.62 11.856 26.54 7.146-3.22-11.892-26.645h16.253l-34.187-34.33z" transform="translate(50 -796.362)"/></g><g style="opacity:.2"><path d="M110.26 888.66c-9.813.312-11.485 7.959-11.485 13.615v70.503c-2.348-7.368-18.912-12.078-20.163 2.913-1.064 12.753 7.47 33.273 15.963 46.684 5.004 7.902 18.958 14.254 45.788 13.984 44.774.667 57.807-30.985 48.832-80.35-2.025-11.134-19.229-6.22-25.46 0l-40.288 6.759v-60.493c0-6.084-3.374-13.925-13.187-13.614z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(297.316 -796.057)"/><path d="M123.434 944.675c3.083-6.814 20.375-7.852 23.554 0 9.58 23.668 0 62.627 0 62.627h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(297.316 -796.057)"/><path d="M147.274 948.76c3.183-7.777 20.976-6.359 21.964 1.028 3.708 27.724 1.391 19.528 1.59 61.598h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(297.316 -796.057)"/><path transform="matrix(.9958 .0916 -.0813 .99669 297.316 -796.057)" style="fill:#fff;fill-opacity:1;stroke:none" d="M193.763 952.558h64.493v47.373h-64.493z"/><path style="fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M225.628 830.997v47.276l10.824-9.62 11.856 26.54 7.146-3.22-11.892-26.645h16.253l-34.187-34.33z" transform="translate(93.44 -797.063)"/></g><path d="M110.26 888.66c-9.813.312-11.485 7.959-11.485 13.615v70.503c-2.348-7.368-18.912-12.078-20.163 2.913-1.064 12.753 7.47 33.273 15.963 46.684 5.004 7.902 18.958 14.254 45.788 13.984 44.774.667 57.807-30.985 48.832-80.35-2.025-11.134-19.229-6.22-25.46 0l-40.288 6.759v-60.493c0-6.084-3.374-13.925-13.187-13.614z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(352.808 -794.51)"/><path d="M123.434 944.675c3.083-6.814 20.375-7.852 23.554 0 9.58 23.668 0 62.627 0 62.627h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(352.808 -794.51)"/><path d="M147.274 948.76c3.183-7.777 20.976-6.359 21.964 1.028 3.708 27.724 1.391 19.528 1.59 61.598h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(352.808 -794.51)"/><path transform="matrix(.9958 .0916 -.0813 .99669 352.808 -794.51)" style="fill:#fff;fill-opacity:1;stroke:none" d="M193.763 952.558h64.493v47.373h-64.493z"/><path style="fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M311.907 830.265v47.275l10.823-9.62 11.857 26.54 7.145-3.219-11.891-26.645h16.252l-34.186-34.331z" transform="translate(50 -796.362)"/><path d="M370.95 886.787v9.56H304v9.998h66.949v9.56l9.587-7.259 9.588-7.286-9.588-7.287-9.587-7.286z" style="fill:#3771c8;fill-opacity:1;stroke:none" transform="translate(50 -796.362)"/><path d="M0 796.362v20h20v-20H0zm9.281 4.5h1.688v9.375h2.094v1.625H6.936v-1.625h2.25v-7.5l-2.156 1.625v-1.719l2.25-1.78z" style="opacity:.5;fill:#000;fill-opacity:1;stroke:none" transform="translate(0 -796.362)"/><path style="opacity:.5;fill:#000;stroke:none" d="M239 816.416h2.464v238.107H239z" transform="translate(17 -796.416)"/><path style="opacity:.5;fill:#000;fill-opacity:1;stroke:none" d="M239 796.416v20h20v-20h-20zm10 4.406a3.6 3.6 0 0 1 1.281.219c.375.135.683.328.938.593.26.266.463.615.594 1 .135.38.218.792.218 1.282 0 .515-.083.99-.25 1.406a5.264 5.264 0 0 1-.656 1.156c-.26.35-.557.693-.875 1l-.906.875c-.302.292-.594.61-.844.906a3.017 3.017 0 0 0-.531.938h4.187v1.812h-6.312v-1.53a6.825 6.825 0 0 1 .75-1.47c.297-.442.614-.854.937-1.218.323-.37.62-.72.938-1.032.317-.317.625-.614.875-.906a4.56 4.56 0 0 0 .594-.875c.161-.297.25-.635.25-.969 0-.49-.11-.828-.313-1.062-.198-.234-.484-.375-.875-.375-.385 0-.672.151-.875.406-.198.25-.344.62-.406 1.125l-1.813-.125a5.34 5.34 0 0 1 .282-1.219c.135-.38.317-.713.562-1 .245-.286.537-.526.906-.687.37-.167.828-.25 1.344-.25z" transform="translate(17 -796.416)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/settings/touchscreen.png b/guacamole/src/main/frontend/src/images/settings/touchscreen.png
deleted file mode 100644
index 11ad40d9e..000000000
Binary files a/guacamole/src/main/frontend/src/images/settings/touchscreen.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/settings/touchscreen.svg b/guacamole/src/main/frontend/src/images/settings/touchscreen.svg
new file mode 100644
index 000000000..e64715c1b
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/settings/touchscreen.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="640" height="256"><path d="M110.26 888.66c-9.813.312-11.485 7.959-11.485 13.615v70.503c-2.348-7.368-18.912-12.078-20.163 2.913-1.064 12.753 7.47 33.273 15.963 46.684 5.004 7.902 18.958 14.254 45.788 13.984 44.774.667 57.807-30.985 48.832-80.35-2.025-11.134-19.229-6.22-25.46 0l-40.288 6.759v-60.493c0-6.084-3.374-13.925-13.187-13.614z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(3.316 -799.057)"/><path d="M123.434 944.675c3.083-6.814 20.375-7.852 23.554 0 9.58 23.668 0 62.627 0 62.627h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(3.316 -799.057)"/><path d="M147.274 948.76c3.183-7.777 20.976-6.359 21.964 1.028 3.708 27.724 1.391 19.528 1.59 61.598h-23.554z" style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" transform="translate(3.316 -799.057)"/><path transform="matrix(.9958 .0916 -.0813 .99669 3.316 -799.057)" style="fill:#fff;fill-opacity:1;stroke:none" d="M193.763 952.558h64.493v47.373h-64.493z"/><path style="fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M65.753 821.99v47.276l10.824-9.62 11.856 26.54 7.146-3.219-11.892-26.645H99.94L65.753 821.99z" transform="translate(-40.684 -791.057)"/><path style="opacity:.2;fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M251.907 847.265v47.275l10.823-9.62 11.857 26.54 7.145-3.219-11.891-26.645h16.252l-34.186-34.331z" transform="translate(70 -790.362)"/><path style="fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M301.075 879.49v47.275l10.823-9.62 11.857 26.54 7.146-3.219-11.892-26.645h16.253l-34.187-34.331z" transform="translate(70 -790.362)"/><path style="fill:#3771c8;fill-opacity:1;stroke:none" d="M74.746 815.509h4.95v19.799h-4.95z" transform="translate(277.334 -934.498) scale(1.21296)"/><path style="fill:#3771c8;fill-opacity:1;stroke:none" transform="rotate(90 605.916 -328.582) scale(1.21296)" d="M851.218-115.405h4.95v19.799h-4.95zm0 56.569h4.95v19.799h-4.95z"/><path transform="rotate(45 1396.972 927.736) scale(1.21296)" style="fill:#3771c8;fill-opacity:1;stroke:none" d="M69.175 842.816h4.95v19.799h-4.95z"/><path style="fill:#3771c8;fill-opacity:1;stroke:none" transform="rotate(135 332.216 -409.821) scale(1.213)" d="M546.574-639.871h4.95v19.799h-4.95z"/><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" d="M110.26 888.66c-9.813.312-11.485 7.959-11.485 13.615v70.503c-2.348-7.368-18.912-12.078-20.163 2.913-1.064 12.753 7.47 33.273 15.963 46.684 5.004 7.902 18.958 14.254 45.788 13.984 44.774.667 57.807-30.985 48.832-80.35-2.025-11.134-19.229-6.22-25.46 0l-40.288 6.759v-60.493c0-6.084-3.374-13.925-13.187-13.614z" transform="translate(260 -800.362)"/><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" d="M123.434 944.675c3.083-6.814 20.375-7.852 23.554 0 9.58 23.668 0 62.627 0 62.627h-23.554z" transform="translate(260 -800.362)"/><path style="fill:#fff;fill-opacity:1;stroke:#000;stroke-width:7.01262283;stroke-miterlimit:4;stroke-dasharray:none" d="M147.274 948.76c3.183-7.777 20.976-6.359 21.964 1.028 3.708 27.724 1.391 19.528 1.59 61.598h-23.554z" transform="translate(260 -800.362)"/><path style="fill:#fff;fill-opacity:1;stroke:none" transform="matrix(.9958 .0916 -.0813 .99669 260 -800.362)" d="M193.763 952.558h64.493v47.373h-64.493z"/><path style="opacity:.1;fill:#000;stroke:#fff;stroke-width:3.50631142;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" d="M211.97 821.217v47.276l10.823-9.62 11.856 26.54 7.146-3.22-11.892-26.645h16.253l-34.187-34.331z" transform="translate(70 -790.362)"/><path d="M0 796.362v20h20v-20H0zm9.281 4.5h1.688v9.375h2.094v1.625H6.936v-1.625h2.25v-7.5l-2.156 1.625v-1.719l2.25-1.78z" style="opacity:.5;fill:#000;fill-opacity:1;stroke:none" transform="translate(0 -796.362)"/><path style="opacity:.5;fill:#000;stroke:none" d="M239 816.416h2.464v238.107H239z" transform="translate(17 -796.416)"/><path style="opacity:.5;fill:#000;fill-opacity:1;stroke:none" d="M239 796.416v20h20v-20h-20zm10 4.406a3.6 3.6 0 0 1 1.281.219c.375.135.683.328.938.593.26.266.463.615.594 1 .135.38.218.792.218 1.282 0 .515-.083.99-.25 1.406a5.264 5.264 0 0 1-.656 1.156c-.26.35-.557.693-.875 1l-.906.875c-.302.292-.594.61-.844.906a3.017 3.017 0 0 0-.531.938h4.187v1.812h-6.312v-1.53a6.825 6.825 0 0 1 .75-1.47c.297-.442.614-.854.937-1.218.323-.37.62-.72.938-1.032.317-.317.625-.614.875-.906a4.56 4.56 0 0 0 .594-.875c.161-.297.25-.635.25-.969 0-.49-.11-.828-.313-1.062-.198-.234-.484-.375-.875-.375-.385 0-.672.151-.875.406-.198.25-.344.62-.406 1.125l-1.813-.125a5.34 5.34 0 0 1 .282-1.219c.135-.38.317-.713.562-1 .245-.286.537-.526.906-.687.37-.167.828-.25 1.344-.25z" transform="translate(17 -796.416)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/settings/zoom-in.png b/guacamole/src/main/frontend/src/images/settings/zoom-in.png
deleted file mode 100644
index ef36301b4..000000000
Binary files a/guacamole/src/main/frontend/src/images/settings/zoom-in.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/settings/zoom-in.svg b/guacamole/src/main/frontend/src/images/settings/zoom-in.svg
new file mode 100644
index 000000000..234d45c15
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/settings/zoom-in.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path style="fill:#000;stroke:none" d="M112 860.362h32v128h-32z" transform="translate(0 -796.362)"/><path style="fill:#000;stroke:none" transform="rotate(90 398.181 -398.181)" d="M908.362-192h32v128h-32z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/settings/zoom-out.png b/guacamole/src/main/frontend/src/images/settings/zoom-out.png
deleted file mode 100644
index 358632cf8..000000000
Binary files a/guacamole/src/main/frontend/src/images/settings/zoom-out.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/settings/zoom-out.svg b/guacamole/src/main/frontend/src/images/settings/zoom-out.svg
new file mode 100644
index 000000000..8d57a4514
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/settings/zoom-out.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256"><path style="fill:#000;stroke:none" transform="rotate(90 398.181 -398.181)" d="M908.362-192h32v128h-32z"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/share.png b/guacamole/src/main/frontend/src/images/share.png
deleted file mode 100644
index 75dfde06f..000000000
Binary files a/guacamole/src/main/frontend/src/images/share.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/share.svg b/guacamole/src/main/frontend/src/images/share.svg
new file mode 100644
index 000000000..3d50eed3e
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/share.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g transform="matrix(.58084 0 0 .59932 29.139 12.2)"><path d="M-7 4.625v59.25" style="fill:none;fill-rule:evenodd;stroke:#000;stroke-width:10.16935631;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><path d="M-5.778 34.144c24.641 7.382 21.575-11.481 31.525-21.51" style="fill:none;fill-rule:evenodd;stroke:#000;stroke-width:10.16935635;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"/><ellipse cy="-1.76" cx="-7.997" style="fill:none;stroke:#000;stroke-width:8.47446346;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" rx="8.465" ry="8.228"/><ellipse cy="6" cx="27.113" style="fill:none;stroke:#000;stroke-width:8.47446346;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" rx="8.465" ry="8.228"/><ellipse cy="69.483" cx="-7.256" style="fill:none;stroke:#000;stroke-width:8.47446346;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" rx="8.465" ry="8.228"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/user-icons/guac-user-group.png b/guacamole/src/main/frontend/src/images/user-icons/guac-user-group.png
deleted file mode 100644
index 4eb0aa4e2..000000000
Binary files a/guacamole/src/main/frontend/src/images/user-icons/guac-user-group.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/user-icons/guac-user-group.svg b/guacamole/src/main/frontend/src/images/user-icons/guac-user-group.svg
new file mode 100644
index 000000000..3c724905c
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/user-icons/guac-user-group.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M31.773 43.098c4.756 0 9.723.71 13.377 2.35 3.654 1.639 5.918 4.007 5.918 7.69.001 4.273-.042 4.398-.052 7.854h-38.03c-.004-2.044-.013-3.433-.025-3.656-.016-.284-.03-.443-.03-4.197 0-3.117 2.172-5.546 5.727-7.315 3.556-1.768 8.396-2.726 13.115-2.726z" transform="translate(0 -6.63)"/><path style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-feature-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;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;vector-effect:none;fill:#000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M32 16.268c6.651 0 12.021 5.37 12.021 12.021 0 6.651-5.37 12.024-12.021 12.024a12.008 12.008 0 0 1-12.021-12.024c0-6.651 5.37-12.021 12.021-12.021z" transform="translate(0 -6.63)"/><path style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:.01726948;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" d="M16.531 41.025c-7.103 0-14.523 2.83-14.523 8.082 0 5.5.045.64.045 6.48h8.898c-.008-.523-.02-.31-.02-2.448 0-4.059 2.898-7.147 6.837-9.106 1.87-.93 4.003-1.631 6.255-2.119-2.324-.617-4.947-.889-7.492-.889z" transform="translate(0 -6.63)"/><path style="fill:#000;fill-rule:evenodd;stroke:none;stroke-width:1" d="M16.697 21.389a9.53 9.531 0 0 0-9.531 9.53 9.53 9.531 0 0 0 9.531 9.532 9.53 9.531 0 0 0 5.74-1.933c-2.736-2.561-4.458-6.194-4.458-10.229 0-2.328.58-4.52 1.587-6.455a9.53 9.531 0 0 0-2.869-.445z" transform="translate(0 -6.63)"/><path style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:.01726948;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1" d="M47.139 41.025c-2.3 0-4.63.304-6.733.883 1.98.4 3.87.954 5.563 1.713 4.066 1.825 7.099 4.976 7.1 9.518 0 1.373-.011 1.757-.018 2.449h8.896c0-3.771.046-2.949.045-6.48 0-6.02-7.75-8.083-14.853-8.083z" transform="translate(0 -6.63)"/><path style="fill:#000;fill-rule:evenodd;stroke:none;stroke-width:1" d="M47.303 21.389a9.53 9.531 0 0 0-2.865.453 13.922 13.922 0 0 1 1.583 6.447c0 4.034-1.721 7.666-4.457 10.227a9.53 9.531 0 0 0 5.739 1.935 9.53 9.531 0 0 0 9.531-9.531 9.53 9.531 0 0 0-9.531-9.531z" transform="translate(0 -6.63)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/user-icons/guac-user.png b/guacamole/src/main/frontend/src/images/user-icons/guac-user.png
deleted file mode 100644
index 527004040..000000000
Binary files a/guacamole/src/main/frontend/src/images/user-icons/guac-user.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/user-icons/guac-user.svg b/guacamole/src/main/frontend/src/images/user-icons/guac-user.svg
new file mode 100644
index 000000000..691295351
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/user-icons/guac-user.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><path style="fill:#000;fill-opacity:1;stroke:#000;stroke-width:.09023736;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dashoffset:0" d="M474.341 504.195c.005 31.957-.398 24.504-.398 58.628H208.914c0-52.862-.398-8.867-.398-58.628 0-47.522 67.134-73.133 131.412-73.133 64.277 0 134.405 18.656 134.413 73.133z" transform="translate(-33.342 -44.364) scale(.19138)"/><path style="fill:#000;fill-rule:evenodd;stroke:none" d="M48.002 28.63a16.506 16.506 0 1 1-33.012 0 16.506 16.506 0 1 1 33.012 0z" transform="translate(.504 -8)"/></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/warning-white.png b/guacamole/src/main/frontend/src/images/warning-white.png
deleted file mode 100644
index 7254ea736..000000000
Binary files a/guacamole/src/main/frontend/src/images/warning-white.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/warning-white.svg b/guacamole/src/main/frontend/src/images/warning-white.svg
new file mode 100644
index 000000000..67dfe1ec4
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/warning-white.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="288" height="288"><g style="stroke-width:1.04766428"><path d="M180.197 312.633c-5.446.289-10.654 3.481-13.379 8.203L90.285 453.334c-2.868 4.967-2.87 11.463-.002 16.431 2.867 4.968 8.494 8.22 14.232 8.226h153.099c5.739-.006 11.365-3.258 14.232-8.226 2.868-4.968 2.867-11.464-.002-16.431l-76.533-132.498a16.545 16.545 0 0 0-6.399-6.233 16.557 16.557 0 0 0-8.715-1.97z" style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;stroke:#fff;stroke-width:19.24487495;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" transform="matrix(1.40314 0 0 1.4028 -110.06 -410.53)"/><g style="font-style:normal;font-weight:400;font-size:142.55773926px;line-height:100%;font-family:Sans;letter-spacing:0;word-spacing:0;fill:#fff;fill-opacity:1;stroke:none;stroke-width:3.207479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><path d="m194.36 354.693-2.993 69.26h-19.073l-2.993-69.26zm-25.686 90.84q0-5.013 3.62-8.354 3.62-3.41 9.397-3.41 5.778 0 9.328 3.41 3.62 3.341 3.62 8.353t-3.62 8.423q-3.55 3.341-9.328 3.341-5.777 0-9.397-3.341-3.62-3.411-3.62-8.423z" style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:142.55773926px;line-height:100%;font-family:Roboto;-inkscape-font-specification:'Roboto Heavy';text-align:center;text-anchor:middle;fill:#fff;stroke-width:3.207479px" transform="matrix(1.40314 0 0 1.4028 -110.06 -410.53)" aria-label="!"/></g></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/warning.png b/guacamole/src/main/frontend/src/images/warning.png
deleted file mode 100644
index 1933417c5..000000000
Binary files a/guacamole/src/main/frontend/src/images/warning.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/warning.svg b/guacamole/src/main/frontend/src/images/warning.svg
new file mode 100644
index 000000000..91dccbb6b
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/warning.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g style="stroke-width:1.04766428"><path d="M180.197 312.633c-5.446.289-10.654 3.481-13.379 8.203L90.285 453.334c-2.868 4.967-2.87 11.463-.002 16.431 2.867 4.968 8.494 8.22 14.232 8.226h153.099c5.739-.006 11.365-3.258 14.232-8.226 2.868-4.968 2.867-11.464-.002-16.431l-76.533-132.498a16.545 16.545 0 0 0-6.399-6.233 16.557 16.557 0 0 0-8.715-1.97z" style="color:#000;font-style:normal;font-variant:normal;font-weight:400;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;stroke:#000;stroke-width:19.24487495;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" transform="matrix(.3118 0 0 .31173 -24.457 -91.229)"/><g style="font-style:normal;font-weight:400;font-size:142.55773926px;line-height:100%;font-family:Sans;letter-spacing:0;word-spacing:0;fill:#000;fill-opacity:1;stroke:none;stroke-width:3.207479px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><path d="m194.36 354.693-2.993 69.26h-19.073l-2.993-69.26zm-25.686 90.84q0-5.013 3.62-8.354 3.62-3.41 9.397-3.41 5.778 0 9.328 3.41 3.62 3.341 3.62 8.353t-3.62 8.423q-3.55 3.341-9.328 3.341-5.777 0-9.397-3.341-3.62-3.411-3.62-8.423z" style="font-style:normal;font-variant:normal;font-weight:900;font-stretch:normal;font-size:142.55773926px;line-height:100%;font-family:Roboto;-inkscape-font-specification:'Roboto Heavy';text-align:center;text-anchor:middle;fill:#000;stroke-width:3.207479px" transform="matrix(.3118 0 0 .31173 -24.457 -91.229)" aria-label="!"/></g></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/x-red.png b/guacamole/src/main/frontend/src/images/x-red.png
deleted file mode 100644
index e5497f34a..000000000
Binary files a/guacamole/src/main/frontend/src/images/x-red.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/x-red.svg b/guacamole/src/main/frontend/src/images/x-red.svg
new file mode 100644
index 000000000..995a9c782
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/x-red.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g style="fill:#c00;fill-opacity:1"><path transform="rotate(-45 -70.224 18.065) scale(.19138)" style="fill:#c00;stroke:none;fill-opacity:1" d="M-203.492 487.824h325.537v71.505h-325.537z"/><path transform="scale(-.19138 .19138) rotate(-45 -192.713 -326.21)" style="fill:#c00;stroke:none;fill-opacity:1" d="M-686.345 4.971h325.537v71.505h-325.537z"/></g></svg>
\ No newline at end of file
diff --git a/guacamole/src/main/frontend/src/images/x.png b/guacamole/src/main/frontend/src/images/x.png
deleted file mode 100644
index 294b93994..000000000
Binary files a/guacamole/src/main/frontend/src/images/x.png and /dev/null differ
diff --git a/guacamole/src/main/frontend/src/images/x.svg b/guacamole/src/main/frontend/src/images/x.svg
new file mode 100644
index 000000000..1998fb6d8
--- /dev/null
+++ b/guacamole/src/main/frontend/src/images/x.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="64" height="64"><g style="fill:#fff;fill-opacity:1"><path transform="rotate(-45 -70.224 18.065) scale(.19138)" style="fill:#fff;stroke:none;fill-opacity:1" d="M-203.492 487.824h325.537v71.505h-325.537z"/><path transform="scale(-.19138 .19138) rotate(-45 -192.713 -326.21)" style="fill:#fff;stroke:none;fill-opacity:1" d="M-686.345 4.971h325.537v71.505h-325.537z"/></g></svg>
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 033df7507..b33a6db14 100644
--- a/pom.xml
+++ b/pom.xml
@@ -103,6 +103,7 @@
                                 <exclude>.ratignore</exclude>
                                 <exclude>**/*.md</exclude>
                                 <exclude>**/*.json</exclude>
+                                <exclude>**/*.svg</exclude>
                                 <exclude>**/node_modules/**/*</exclude>
                                 <exclude>**/templates/*.html</exclude>
                                 <exclude>src/licenses/**/*</exclude>