Moving to symbolic icons to match theme colors

242 files changed, 78 insertions, 7709 deletions

diff --git a/data/icons/16x16/actions/remmina-camera-photo.svg b/data/icons/16x16/actions/remmina-camera-photo.svg
deleted file mode 100644
index bdf5a1658..000000000
--- a/data/icons/16x16/actions/remmina-camera-photo.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M5 4h-3v-1h3v1zm12 9c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4zm-1 0c0-1.657-1.342-3-3-3s-3 1.343-3 3 1.342 3 3 3 3-1.343 3-3zm8-8v17h-24v-17h5.93c.669 0 1.293-.334 1.664-.891l1.406-2.109h8l1.406 2.109c.371.557.995.891 1.664.891h3.93zm-19 4c0-.552-.447-1-1-1s-1 .448-1 1 .447 1 1 1 1-.448 1-1zm14 4c0-3.314-2.687-6-6-6s-6 2.686-6 6 2.687 6 6 6 6-2.686 6-6z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-connect.svg b/data/icons/16x16/actions/remmina-connect.svg
deleted file mode 100644
index e8e4fb4ab..000000000
--- a/data/icons/16x16/actions/remmina-connect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M21.921 2.081c2.771 2.772 2.771 7.269 0 10.042l-3.84 3.839-2.121-2.122 3.839-3.84c1.599-1.598 1.599-4.199-.001-5.797-1.598-1.599-4.199-1.599-5.797-.001l-3.84 3.839-2.121-2.121 3.84-3.839c2.771-2.773 7.267-2.773 10.041 0zm-8.082 13.879l-3.84 3.839c-1.598 1.6-4.199 1.599-5.799 0-1.598-1.598-1.598-4.2 0-5.797l3.84-3.84-2.121-2.121-3.84 3.84c-2.771 2.772-2.772 7.268 0 10.041 2.773 2.772 7.27 2.773 10.041 0l3.84-3.84-2.121-2.122z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-disconnect.svg b/data/icons/16x16/actions/remmina-disconnect.svg
deleted file mode 100644
index 959abc6c3..000000000
--- a/data/icons/16x16/actions/remmina-disconnect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M14.008 21.092l-3.392 1.959c-3.384 1.954-7.713.794-9.668-2.592-1.953-3.385-.793-7.713 2.591-9.667l3.393-1.959 1.495 2.589-3.393 1.96c-1.95 1.125-2.622 3.631-1.495 5.581 1.126 1.953 3.631 2.625 5.582 1.495l3.392-1.956 1.495 2.59zm-3.214-17.553l-1.959 3.392 2.589 1.497 1.959-3.393c1.126-1.95 3.631-2.622 5.581-1.495 1.952 1.127 2.624 3.629 1.499 5.582l-1.96 3.392 2.589 1.494 1.96-3.391c1.952-3.387.792-7.714-2.59-9.667-3.387-1.955-7.716-.795-9.668 2.589zm7.398 20.217l-1.724.244-.523-3.688 1.722-.243.525 3.687zm5.808-7.284l-.249 1.724-3.688-.527.247-1.722 3.69.525zm-5.733 3.013l1.229-1.23 2.638 2.636-1.231 1.23-2.636-2.636z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-document-save.svg b/data/icons/16x16/actions/remmina-document-save.svg
deleted file mode 100644
index ac97f301f..000000000
--- a/data/icons/16x16/actions/remmina-document-save.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M15.003 3h2.997v5h-2.997v-5zm8.997 1v20h-24v-24h20l4 4zm-19 5h14v-7h-14v7zm16 4h-18v9h18v-9z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-document-send.svg b/data/icons/16x16/actions/remmina-document-send.svg
deleted file mode 100644
index cd34d345c..000000000
--- a/data/icons/16x16/actions/remmina-document-send.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 0l-6 22-8.129-7.239 7.802-8.234-10.458 7.227-7.215-1.754 24-12zm-15 16.668v7.332l3.258-4.431-3.258-2.901z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-dynres.svg b/data/icons/16x16/actions/remmina-dynres.svg
deleted file mode 100644
index 5e2c89b54..000000000
--- a/data/icons/16x16/actions/remmina-dynres.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870731 18.74617"
-   height="70.851669"
-   width="82.661026">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-212.96639,-204.92443)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path21"
-       d="m 214.52876,204.92443 c -1.56237,0 -1.56237,1.56237 -1.56237,1.56237 v 6.24866 h 3.12447 v -4.68656 h 4.68656 v -3.12447 z m 12.49733,0 v 3.12447 h 4.68656 v 4.68656 h 3.12447 v -6.24866 c 0,-1.56237 -1.5621,-1.56237 -1.5621,-1.56237 z m -3.13955,1.55628 -3.12446,6.24866 h 6.24893 c 0,0.0561 -3.12447,-6.24866 -3.12447,-6.24866 z m -3.12446,9.37286 3.12446,6.24893 3.12447,-6.24893 z m -7.79569,0.006 v 6.24893 c 0,1.5621 1.56237,1.5621 1.56237,1.5621 h 6.24866 v -3.12447 h -4.68656 v -4.68656 z m 18.74626,0 v 4.68656 h -4.68656 v 3.12447 h 6.24893 c 0,0 1.5621,0 1.5621,-1.5621 v -6.24893 z" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/actions/remmina-fit-window.svg b/data/icons/16x16/actions/remmina-fit-window.svg
deleted file mode 100644
index 89092894f..000000000
--- a/data/icons/16x16/actions/remmina-fit-window.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863581 21.863579"
-   height="82.634003"
-   width="82.634003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-229.61131,-170.08308)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path7"
-       d="m 231.77508,170.08308 c -1.20756,0 -2.16377,1.00012 -2.16377,2.22064 v 6.88923 h 3.64411 v -5.46577 h 5.46576 v -3.6441 z m 10.58994,0 v 3.6441 h 5.46603 v 5.46577 h 3.64384 v -6.88923 c 0,-1.22025 -0.9562,-2.22064 -2.1635,-2.22064 z m -5.48719,7.2808 v 7.28795 h 7.28795 v -7.28795 z m -7.26652,5.47291 v 6.88922 c 0,1.22026 0.95621,2.22065 2.16377,2.22065 h 6.9461 v -3.64385 h -5.46576 v -5.46602 z m 18.21974,0 v 5.46602 h -5.46603 v 3.64385 h 6.94637 c 1.2073,0 2.1635,-1.00013 2.1635,-2.22065 v -6.88922 z" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/actions/remmina-folder-symbolic.svg b/data/icons/16x16/actions/remmina-folder-symbolic.svg
deleted file mode 100644
index f138944f5..000000000
--- a/data/icons/16x16/actions/remmina-folder-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-fullscreen.svg b/data/icons/16x16/actions/remmina-fullscreen.svg
deleted file mode 100644
index c28be5457..000000000
--- a/data/icons/16x16/actions/remmina-fullscreen.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 22.98329 19.699818"
-   height="74.456009"
-   width="86.865974">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-155.93039,-137.88226)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path19"
-       d="m 157.57213,137.88226 c -1.64174,0 -1.64174,1.64174 -1.64174,1.64174 v 6.5667 h 3.28347 v -4.92496 h 4.92496 v -3.28348 z m 13.13338,0 v 3.28348 h 4.92496 v 4.92496 h 3.28321 v -6.5667 c 0,-1.64174 -1.64174,-1.64174 -1.64174,-1.64174 z m -14.77512,11.49165 v 6.5667 c 0,1.64147 1.64174,1.64147 1.64174,1.64147 h 6.56669 v -3.28321 h -4.92496 v -4.92496 z m 19.70008,0 v 4.92496 h -4.92496 v 3.28321 h 6.56643 c 0,0 1.64174,0 1.64174,-1.64147 v -6.5667 z" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/actions/remmina-go-bottom.svg b/data/icons/16x16/actions/remmina-go-bottom.svg
deleted file mode 100644
index 16ce7281e..000000000
--- a/data/icons/16x16/actions/remmina-go-bottom.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 7.33l2.829-2.83 9.175 9.339 9.167-9.339 2.829 2.83-11.996 12.17z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-keyboard.svg b/data/icons/16x16/actions/remmina-keyboard.svg
deleted file mode 100644
index 9c009405d..000000000
--- a/data/icons/16x16/actions/remmina-keyboard.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 5v14h24v-14h-24zm16 3h2v2h-2v-2zm-3 0h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-7-3h3v2h-3v-2zm0 3h4v2h-4v-2zm14 5h-10v-2h10v2zm4-3h-4v-2h4v2zm0-3h-2v-2h2v2z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-pan-down-symbolic.svg b/data/icons/16x16/actions/remmina-pan-down-symbolic.svg
deleted file mode 100644
index 590db5f6d..000000000
--- a/data/icons/16x16/actions/remmina-pan-down-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 6h-24v-4h24v4zm0 4h-24v4h24v-4zm0 8h-24v4h24v-4z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-pan-up-symbolic.svg b/data/icons/16x16/actions/remmina-pan-up-symbolic.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/16x16/actions/remmina-pan-up-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-pin-down.svg b/data/icons/16x16/actions/remmina-pin-down.svg
deleted file mode 100644
index 1b8339121..000000000
--- a/data/icons/16x16/actions/remmina-pin-down.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm4.038-9.588c-2.486 0-4.5 2.015-4.5 4.5s2.014 4.5 4.5 4.5c2.484 0 4.5-2.015 4.5-4.5s-2.016-4.5-4.5-4.5zm-.469 6.484l-1.688-1.637.695-.697.992.94 2.115-2.169.697.696-2.811 2.867z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-pin-up.svg b/data/icons/16x16/actions/remmina-pin-up.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/16x16/actions/remmina-pin-up.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-preferences-system.svg b/data/icons/16x16/actions/remmina-preferences-system.svg
deleted file mode 100644
index 7136a9d6f..000000000
--- a/data/icons/16x16/actions/remmina-preferences-system.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z" />
-</svg>
diff --git a/data/icons/16x16/actions/remmina-scale.svg b/data/icons/16x16/actions/remmina-scale.svg
deleted file mode 100644
index 7bb33d89e..000000000
--- a/data/icons/16x16/actions/remmina-scale.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870721 21.863579"
-   height="82.634003"
-   width="82.660988">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-188.25652,-183.69872)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path9"
-       d="m 190.47716,183.69872 c -1.22052,0 -2.22064,0.95621 -2.22064,2.16377 v 6.9461 h 3.6441 v -5.46576 h 5.46576 v -3.64411 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path11"
-       d="m 202.39744,183.69872 2.57651,2.57678 -3.86503,3.86503 2.57677,2.57652 3.86477,-3.86504 2.57678,2.57678 v -7.73007 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path13"
-       d="m 188.26366,194.63051 v 10.93179 h 10.93179 v -10.93179 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path15"
-       d="m 206.47625,196.45243 v 5.46603 h -5.46602 v 3.64384 h 6.88922 c 1.22052,0 2.22064,-0.9562 2.22064,-2.1635 v -6.94637 z" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/actions/remmina-switch-page.svg b/data/icons/16x16/actions/remmina-switch-page.svg
deleted file mode 100644
index d32a4c45a..000000000
--- a/data/icons/16x16/actions/remmina-switch-page.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863561 21.863569"
-   height="82.633965"
-   width="82.633926">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-186.7473,-190.75869)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path17"
-       d="m 188.20483,190.75869 c 0,0 -0.11113,0.006 -0.26459,0.0341 -0.29765,0.0442 -0.52281,0.15081 -0.68897,0.29607 -0.0323,0.0246 -0.0635,0.0513 -0.0939,0.0799 -0.0286,0.0304 -0.055,0.0616 -0.0796,0.0939 -0.14552,0.16616 -0.25214,0.39132 -0.29607,0.68897 -0.0283,0.15346 -0.0344,0.26459 -0.0344,0.26459 v 17.49081 c 0,1.45759 1.45759,1.45759 1.45759,1.45759 h 8.74554 v -2.91518 h -7.28795 v -10.20287 h 14.57563 v 2.91518 h 2.91518 v -8.74553 c 0,0 -0.006,-0.11113 -0.0341,-0.26459 -0.0452,-0.29765 -0.15028,-0.52281 -0.29607,-0.68897 -0.0249,-0.0323 -0.0521,-0.0635 -0.0796,-0.0939 -0.0307,-0.0286 -0.0619,-0.0553 -0.0939,-0.0799 -0.16642,-0.14526 -0.39158,-0.25189 -0.68897,-0.29607 -0.15452,-0.0281 -0.26485,-0.0341 -0.26485,-0.0341 z m 10.93179,11.66045 c 0,0 -0.0542,0.003 -0.13097,0.0172 -0.1487,0.022 -0.26141,0.0754 -0.34449,0.14817 -0.0161,0.0122 -0.0331,0.0254 -0.0484,0.0397 -0.0146,0.0154 -0.0275,0.0323 -0.0397,0.0484 -0.0728,0.0831 -0.12621,0.19552 -0.14817,0.34448 -0.0146,0.0767 -0.0169,0.13097 -0.0169,0.13097 v 8.74527 c 0,0.72893 0.72867,0.72893 0.72867,0.72893 h 8.74527 c 0,0 0.72893,0 0.72893,-0.72893 v -8.74527 c 0,0 -0.003,-0.0542 -0.0172,-0.13097 -0.0217,-0.14896 -0.0751,-0.26141 -0.14791,-0.34448 -0.0116,-0.0161 -0.0254,-0.0331 -0.04,-0.0484 -0.0145,-0.0143 -0.0323,-0.0275 -0.0484,-0.0397 -0.0831,-0.0728 -0.19579,-0.12621 -0.34448,-0.14817 -0.0773,-0.014 -0.13097,-0.0172 -0.13097,-0.0172 z m 0.72866,4.37277 h 7.28795 v 4.37277 h -7.28795 z" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/actions/remmina-system-run.svg b/data/icons/16x16/actions/remmina-system-run.svg
deleted file mode 100644
index 0b590788b..000000000
--- a/data/icons/16x16/actions/remmina-system-run.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M4.5.257l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z" />
-</svg>
diff --git a/data/icons/16x16/emblems/remmina-sftp.svg b/data/icons/16x16/emblems/remmina-sftp.svg
deleted file mode 100644
index 9c96b858d..000000000
--- a/data/icons/16x16/emblems/remmina-sftp.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-235.41273,-151.37414)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path23"
-       d="m 243.17914,172.33905 c 4.26932,4.26906 11.19082,4.26906 15.45987,0 4.26905,-4.26931 4.26905,-11.19081 0,-15.45987 -3.50573,-3.50572 -8.79501,-4.15025 -12.94051,-1.89785 l 2.38099,2.38098 c 2.79797,-1.08796 6.09203,-0.53366 8.35104,1.72535 3.04933,3.04932 3.04933,7.99333 0,11.04265 -3.04932,3.04932 -7.99332,3.04932 -11.04265,0 -1.52585,-1.52559 -2.25345,-3.52319 -2.24313,-5.52132 l 5.54937,-0.006 -6.6257,-6.6257 -6.62543,6.6257 h 4.53337 c 0.006,2.79929 1.06733,5.6007 3.19855,7.73192 z" />
-  </g>
-</svg>
diff --git a/data/icons/16x16/emblems/remmina-ssh.svg b/data/icons/16x16/emblems/remmina-ssh.svg
deleted file mode 100644
index ef8bdf14f..000000000
--- a/data/icons/16x16/emblems/remmina-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <text
-         transform="scale(1.0413034,0.96033492)"
-         id="text4638"
-         y="169.55627"
-         x="173.44473"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;line-height:247.11486816px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49422976"
-         xml:space="preserve"><tspan
-           y="169.55627"
-           x="173.44473"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.49422976"
-           id="tspan4642">$_</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/data/icons/22x22/actions/remmina-camera-photo.svg b/data/icons/22x22/actions/remmina-camera-photo.svg
deleted file mode 100644
index bdf5a1658..000000000
--- a/data/icons/22x22/actions/remmina-camera-photo.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M5 4h-3v-1h3v1zm12 9c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4zm-1 0c0-1.657-1.342-3-3-3s-3 1.343-3 3 1.342 3 3 3 3-1.343 3-3zm8-8v17h-24v-17h5.93c.669 0 1.293-.334 1.664-.891l1.406-2.109h8l1.406 2.109c.371.557.995.891 1.664.891h3.93zm-19 4c0-.552-.447-1-1-1s-1 .448-1 1 .447 1 1 1 1-.448 1-1zm14 4c0-3.314-2.687-6-6-6s-6 2.686-6 6 2.687 6 6 6 6-2.686 6-6z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-connect.svg b/data/icons/22x22/actions/remmina-connect.svg
deleted file mode 100644
index e8e4fb4ab..000000000
--- a/data/icons/22x22/actions/remmina-connect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M21.921 2.081c2.771 2.772 2.771 7.269 0 10.042l-3.84 3.839-2.121-2.122 3.839-3.84c1.599-1.598 1.599-4.199-.001-5.797-1.598-1.599-4.199-1.599-5.797-.001l-3.84 3.839-2.121-2.121 3.84-3.839c2.771-2.773 7.267-2.773 10.041 0zm-8.082 13.879l-3.84 3.839c-1.598 1.6-4.199 1.599-5.799 0-1.598-1.598-1.598-4.2 0-5.797l3.84-3.84-2.121-2.121-3.84 3.84c-2.771 2.772-2.772 7.268 0 10.041 2.773 2.772 7.27 2.773 10.041 0l3.84-3.84-2.121-2.122z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-disconnect.svg b/data/icons/22x22/actions/remmina-disconnect.svg
deleted file mode 100644
index 959abc6c3..000000000
--- a/data/icons/22x22/actions/remmina-disconnect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M14.008 21.092l-3.392 1.959c-3.384 1.954-7.713.794-9.668-2.592-1.953-3.385-.793-7.713 2.591-9.667l3.393-1.959 1.495 2.589-3.393 1.96c-1.95 1.125-2.622 3.631-1.495 5.581 1.126 1.953 3.631 2.625 5.582 1.495l3.392-1.956 1.495 2.59zm-3.214-17.553l-1.959 3.392 2.589 1.497 1.959-3.393c1.126-1.95 3.631-2.622 5.581-1.495 1.952 1.127 2.624 3.629 1.499 5.582l-1.96 3.392 2.589 1.494 1.96-3.391c1.952-3.387.792-7.714-2.59-9.667-3.387-1.955-7.716-.795-9.668 2.589zm7.398 20.217l-1.724.244-.523-3.688 1.722-.243.525 3.687zm5.808-7.284l-.249 1.724-3.688-.527.247-1.722 3.69.525zm-5.733 3.013l1.229-1.23 2.638 2.636-1.231 1.23-2.636-2.636z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-document-save.svg b/data/icons/22x22/actions/remmina-document-save.svg
deleted file mode 100644
index ac97f301f..000000000
--- a/data/icons/22x22/actions/remmina-document-save.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M15.003 3h2.997v5h-2.997v-5zm8.997 1v20h-24v-24h20l4 4zm-19 5h14v-7h-14v7zm16 4h-18v9h18v-9z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-document-send.svg b/data/icons/22x22/actions/remmina-document-send.svg
deleted file mode 100644
index cd34d345c..000000000
--- a/data/icons/22x22/actions/remmina-document-send.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 0l-6 22-8.129-7.239 7.802-8.234-10.458 7.227-7.215-1.754 24-12zm-15 16.668v7.332l3.258-4.431-3.258-2.901z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-dynres.svg b/data/icons/22x22/actions/remmina-dynres.svg
deleted file mode 100644
index 5e2c89b54..000000000
--- a/data/icons/22x22/actions/remmina-dynres.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870731 18.74617"
-   height="70.851669"
-   width="82.661026">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-212.96639,-204.92443)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path21"
-       d="m 214.52876,204.92443 c -1.56237,0 -1.56237,1.56237 -1.56237,1.56237 v 6.24866 h 3.12447 v -4.68656 h 4.68656 v -3.12447 z m 12.49733,0 v 3.12447 h 4.68656 v 4.68656 h 3.12447 v -6.24866 c 0,-1.56237 -1.5621,-1.56237 -1.5621,-1.56237 z m -3.13955,1.55628 -3.12446,6.24866 h 6.24893 c 0,0.0561 -3.12447,-6.24866 -3.12447,-6.24866 z m -3.12446,9.37286 3.12446,6.24893 3.12447,-6.24893 z m -7.79569,0.006 v 6.24893 c 0,1.5621 1.56237,1.5621 1.56237,1.5621 h 6.24866 v -3.12447 h -4.68656 v -4.68656 z m 18.74626,0 v 4.68656 h -4.68656 v 3.12447 h 6.24893 c 0,0 1.5621,0 1.5621,-1.5621 v -6.24893 z" />
-  </g>
-</svg>
diff --git a/data/icons/22x22/actions/remmina-fit-window.svg b/data/icons/22x22/actions/remmina-fit-window.svg
deleted file mode 100644
index 89092894f..000000000
--- a/data/icons/22x22/actions/remmina-fit-window.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863581 21.863579"
-   height="82.634003"
-   width="82.634003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-229.61131,-170.08308)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path7"
-       d="m 231.77508,170.08308 c -1.20756,0 -2.16377,1.00012 -2.16377,2.22064 v 6.88923 h 3.64411 v -5.46577 h 5.46576 v -3.6441 z m 10.58994,0 v 3.6441 h 5.46603 v 5.46577 h 3.64384 v -6.88923 c 0,-1.22025 -0.9562,-2.22064 -2.1635,-2.22064 z m -5.48719,7.2808 v 7.28795 h 7.28795 v -7.28795 z m -7.26652,5.47291 v 6.88922 c 0,1.22026 0.95621,2.22065 2.16377,2.22065 h 6.9461 v -3.64385 h -5.46576 v -5.46602 z m 18.21974,0 v 5.46602 h -5.46603 v 3.64385 h 6.94637 c 1.2073,0 2.1635,-1.00013 2.1635,-2.22065 v -6.88922 z" />
-  </g>
-</svg>
diff --git a/data/icons/22x22/actions/remmina-folder-symbolic.svg b/data/icons/22x22/actions/remmina-folder-symbolic.svg
deleted file mode 100644
index f138944f5..000000000
--- a/data/icons/22x22/actions/remmina-folder-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-fullscreen.svg b/data/icons/22x22/actions/remmina-fullscreen.svg
deleted file mode 100644
index c28be5457..000000000
--- a/data/icons/22x22/actions/remmina-fullscreen.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 22.98329 19.699818"
-   height="74.456009"
-   width="86.865974">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-155.93039,-137.88226)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path19"
-       d="m 157.57213,137.88226 c -1.64174,0 -1.64174,1.64174 -1.64174,1.64174 v 6.5667 h 3.28347 v -4.92496 h 4.92496 v -3.28348 z m 13.13338,0 v 3.28348 h 4.92496 v 4.92496 h 3.28321 v -6.5667 c 0,-1.64174 -1.64174,-1.64174 -1.64174,-1.64174 z m -14.77512,11.49165 v 6.5667 c 0,1.64147 1.64174,1.64147 1.64174,1.64147 h 6.56669 v -3.28321 h -4.92496 v -4.92496 z m 19.70008,0 v 4.92496 h -4.92496 v 3.28321 h 6.56643 c 0,0 1.64174,0 1.64174,-1.64147 v -6.5667 z" />
-  </g>
-</svg>
diff --git a/data/icons/22x22/actions/remmina-go-bottom.svg b/data/icons/22x22/actions/remmina-go-bottom.svg
deleted file mode 100644
index 16ce7281e..000000000
--- a/data/icons/22x22/actions/remmina-go-bottom.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 7.33l2.829-2.83 9.175 9.339 9.167-9.339 2.829 2.83-11.996 12.17z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-keyboard.svg b/data/icons/22x22/actions/remmina-keyboard.svg
deleted file mode 100644
index 9c009405d..000000000
--- a/data/icons/22x22/actions/remmina-keyboard.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 5v14h24v-14h-24zm16 3h2v2h-2v-2zm-3 0h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-7-3h3v2h-3v-2zm0 3h4v2h-4v-2zm14 5h-10v-2h10v2zm4-3h-4v-2h4v2zm0-3h-2v-2h2v2z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-pan-down-symbolic.svg b/data/icons/22x22/actions/remmina-pan-down-symbolic.svg
deleted file mode 100644
index 590db5f6d..000000000
--- a/data/icons/22x22/actions/remmina-pan-down-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 6h-24v-4h24v4zm0 4h-24v4h24v-4zm0 8h-24v4h24v-4z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-pan-up-symbolic.svg b/data/icons/22x22/actions/remmina-pan-up-symbolic.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/22x22/actions/remmina-pan-up-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-pin-down.svg b/data/icons/22x22/actions/remmina-pin-down.svg
deleted file mode 100644
index 1b8339121..000000000
--- a/data/icons/22x22/actions/remmina-pin-down.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm4.038-9.588c-2.486 0-4.5 2.015-4.5 4.5s2.014 4.5 4.5 4.5c2.484 0 4.5-2.015 4.5-4.5s-2.016-4.5-4.5-4.5zm-.469 6.484l-1.688-1.637.695-.697.992.94 2.115-2.169.697.696-2.811 2.867z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-pin-up.svg b/data/icons/22x22/actions/remmina-pin-up.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/22x22/actions/remmina-pin-up.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-preferences-system.svg b/data/icons/22x22/actions/remmina-preferences-system.svg
deleted file mode 100644
index 7136a9d6f..000000000
--- a/data/icons/22x22/actions/remmina-preferences-system.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z" />
-</svg>
diff --git a/data/icons/22x22/actions/remmina-scale.svg b/data/icons/22x22/actions/remmina-scale.svg
deleted file mode 100644
index 7bb33d89e..000000000
--- a/data/icons/22x22/actions/remmina-scale.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870721 21.863579"
-   height="82.634003"
-   width="82.660988">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-188.25652,-183.69872)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path9"
-       d="m 190.47716,183.69872 c -1.22052,0 -2.22064,0.95621 -2.22064,2.16377 v 6.9461 h 3.6441 v -5.46576 h 5.46576 v -3.64411 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path11"
-       d="m 202.39744,183.69872 2.57651,2.57678 -3.86503,3.86503 2.57677,2.57652 3.86477,-3.86504 2.57678,2.57678 v -7.73007 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path13"
-       d="m 188.26366,194.63051 v 10.93179 h 10.93179 v -10.93179 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path15"
-       d="m 206.47625,196.45243 v 5.46603 h -5.46602 v 3.64384 h 6.88922 c 1.22052,0 2.22064,-0.9562 2.22064,-2.1635 v -6.94637 z" />
-  </g>
-</svg>
diff --git a/data/icons/22x22/actions/remmina-switch-page.svg b/data/icons/22x22/actions/remmina-switch-page.svg
deleted file mode 100644
index d32a4c45a..000000000
--- a/data/icons/22x22/actions/remmina-switch-page.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863561 21.863569"
-   height="82.633965"
-   width="82.633926">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-186.7473,-190.75869)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path17"
-       d="m 188.20483,190.75869 c 0,0 -0.11113,0.006 -0.26459,0.0341 -0.29765,0.0442 -0.52281,0.15081 -0.68897,0.29607 -0.0323,0.0246 -0.0635,0.0513 -0.0939,0.0799 -0.0286,0.0304 -0.055,0.0616 -0.0796,0.0939 -0.14552,0.16616 -0.25214,0.39132 -0.29607,0.68897 -0.0283,0.15346 -0.0344,0.26459 -0.0344,0.26459 v 17.49081 c 0,1.45759 1.45759,1.45759 1.45759,1.45759 h 8.74554 v -2.91518 h -7.28795 v -10.20287 h 14.57563 v 2.91518 h 2.91518 v -8.74553 c 0,0 -0.006,-0.11113 -0.0341,-0.26459 -0.0452,-0.29765 -0.15028,-0.52281 -0.29607,-0.68897 -0.0249,-0.0323 -0.0521,-0.0635 -0.0796,-0.0939 -0.0307,-0.0286 -0.0619,-0.0553 -0.0939,-0.0799 -0.16642,-0.14526 -0.39158,-0.25189 -0.68897,-0.29607 -0.15452,-0.0281 -0.26485,-0.0341 -0.26485,-0.0341 z m 10.93179,11.66045 c 0,0 -0.0542,0.003 -0.13097,0.0172 -0.1487,0.022 -0.26141,0.0754 -0.34449,0.14817 -0.0161,0.0122 -0.0331,0.0254 -0.0484,0.0397 -0.0146,0.0154 -0.0275,0.0323 -0.0397,0.0484 -0.0728,0.0831 -0.12621,0.19552 -0.14817,0.34448 -0.0146,0.0767 -0.0169,0.13097 -0.0169,0.13097 v 8.74527 c 0,0.72893 0.72867,0.72893 0.72867,0.72893 h 8.74527 c 0,0 0.72893,0 0.72893,-0.72893 v -8.74527 c 0,0 -0.003,-0.0542 -0.0172,-0.13097 -0.0217,-0.14896 -0.0751,-0.26141 -0.14791,-0.34448 -0.0116,-0.0161 -0.0254,-0.0331 -0.04,-0.0484 -0.0145,-0.0143 -0.0323,-0.0275 -0.0484,-0.0397 -0.0831,-0.0728 -0.19579,-0.12621 -0.34448,-0.14817 -0.0773,-0.014 -0.13097,-0.0172 -0.13097,-0.0172 z m 0.72866,4.37277 h 7.28795 v 4.37277 h -7.28795 z" />
-  </g>
-</svg>
diff --git a/data/icons/22x22/actions/remmina-system-run.svg b/data/icons/22x22/actions/remmina-system-run.svg
deleted file mode 100644
index 0b590788b..000000000
--- a/data/icons/22x22/actions/remmina-system-run.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M4.5.257l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z" />
-</svg>
diff --git a/data/icons/22x22/emblems/remmina-sftp.svg b/data/icons/22x22/emblems/remmina-sftp.svg
deleted file mode 100644
index 9c96b858d..000000000
--- a/data/icons/22x22/emblems/remmina-sftp.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-235.41273,-151.37414)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path23"
-       d="m 243.17914,172.33905 c 4.26932,4.26906 11.19082,4.26906 15.45987,0 4.26905,-4.26931 4.26905,-11.19081 0,-15.45987 -3.50573,-3.50572 -8.79501,-4.15025 -12.94051,-1.89785 l 2.38099,2.38098 c 2.79797,-1.08796 6.09203,-0.53366 8.35104,1.72535 3.04933,3.04932 3.04933,7.99333 0,11.04265 -3.04932,3.04932 -7.99332,3.04932 -11.04265,0 -1.52585,-1.52559 -2.25345,-3.52319 -2.24313,-5.52132 l 5.54937,-0.006 -6.6257,-6.6257 -6.62543,6.6257 h 4.53337 c 0.006,2.79929 1.06733,5.6007 3.19855,7.73192 z" />
-  </g>
-</svg>
diff --git a/data/icons/22x22/emblems/remmina-ssh.svg b/data/icons/22x22/emblems/remmina-ssh.svg
deleted file mode 100644
index ef8bdf14f..000000000
--- a/data/icons/22x22/emblems/remmina-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <text
-         transform="scale(1.0413034,0.96033492)"
-         id="text4638"
-         y="169.55627"
-         x="173.44473"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;line-height:247.11486816px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49422976"
-         xml:space="preserve"><tspan
-           y="169.55627"
-           x="173.44473"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.49422976"
-           id="tspan4642">$_</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/data/icons/24x24/actions/remmina-camera-photo.svg b/data/icons/24x24/actions/remmina-camera-photo.svg
deleted file mode 100644
index bdf5a1658..000000000
--- a/data/icons/24x24/actions/remmina-camera-photo.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M5 4h-3v-1h3v1zm12 9c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4zm-1 0c0-1.657-1.342-3-3-3s-3 1.343-3 3 1.342 3 3 3 3-1.343 3-3zm8-8v17h-24v-17h5.93c.669 0 1.293-.334 1.664-.891l1.406-2.109h8l1.406 2.109c.371.557.995.891 1.664.891h3.93zm-19 4c0-.552-.447-1-1-1s-1 .448-1 1 .447 1 1 1 1-.448 1-1zm14 4c0-3.314-2.687-6-6-6s-6 2.686-6 6 2.687 6 6 6 6-2.686 6-6z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-connect.svg b/data/icons/24x24/actions/remmina-connect.svg
deleted file mode 100644
index e8e4fb4ab..000000000
--- a/data/icons/24x24/actions/remmina-connect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M21.921 2.081c2.771 2.772 2.771 7.269 0 10.042l-3.84 3.839-2.121-2.122 3.839-3.84c1.599-1.598 1.599-4.199-.001-5.797-1.598-1.599-4.199-1.599-5.797-.001l-3.84 3.839-2.121-2.121 3.84-3.839c2.771-2.773 7.267-2.773 10.041 0zm-8.082 13.879l-3.84 3.839c-1.598 1.6-4.199 1.599-5.799 0-1.598-1.598-1.598-4.2 0-5.797l3.84-3.84-2.121-2.121-3.84 3.84c-2.771 2.772-2.772 7.268 0 10.041 2.773 2.772 7.27 2.773 10.041 0l3.84-3.84-2.121-2.122z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-disconnect.svg b/data/icons/24x24/actions/remmina-disconnect.svg
deleted file mode 100644
index 959abc6c3..000000000
--- a/data/icons/24x24/actions/remmina-disconnect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M14.008 21.092l-3.392 1.959c-3.384 1.954-7.713.794-9.668-2.592-1.953-3.385-.793-7.713 2.591-9.667l3.393-1.959 1.495 2.589-3.393 1.96c-1.95 1.125-2.622 3.631-1.495 5.581 1.126 1.953 3.631 2.625 5.582 1.495l3.392-1.956 1.495 2.59zm-3.214-17.553l-1.959 3.392 2.589 1.497 1.959-3.393c1.126-1.95 3.631-2.622 5.581-1.495 1.952 1.127 2.624 3.629 1.499 5.582l-1.96 3.392 2.589 1.494 1.96-3.391c1.952-3.387.792-7.714-2.59-9.667-3.387-1.955-7.716-.795-9.668 2.589zm7.398 20.217l-1.724.244-.523-3.688 1.722-.243.525 3.687zm5.808-7.284l-.249 1.724-3.688-.527.247-1.722 3.69.525zm-5.733 3.013l1.229-1.23 2.638 2.636-1.231 1.23-2.636-2.636z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-document-save.svg b/data/icons/24x24/actions/remmina-document-save.svg
deleted file mode 100644
index ac97f301f..000000000
--- a/data/icons/24x24/actions/remmina-document-save.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M15.003 3h2.997v5h-2.997v-5zm8.997 1v20h-24v-24h20l4 4zm-19 5h14v-7h-14v7zm16 4h-18v9h18v-9z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-document-send.svg b/data/icons/24x24/actions/remmina-document-send.svg
deleted file mode 100644
index cd34d345c..000000000
--- a/data/icons/24x24/actions/remmina-document-send.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 0l-6 22-8.129-7.239 7.802-8.234-10.458 7.227-7.215-1.754 24-12zm-15 16.668v7.332l3.258-4.431-3.258-2.901z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-dynres.svg b/data/icons/24x24/actions/remmina-dynres.svg
deleted file mode 100644
index 5e2c89b54..000000000
--- a/data/icons/24x24/actions/remmina-dynres.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870731 18.74617"
-   height="70.851669"
-   width="82.661026">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-212.96639,-204.92443)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path21"
-       d="m 214.52876,204.92443 c -1.56237,0 -1.56237,1.56237 -1.56237,1.56237 v 6.24866 h 3.12447 v -4.68656 h 4.68656 v -3.12447 z m 12.49733,0 v 3.12447 h 4.68656 v 4.68656 h 3.12447 v -6.24866 c 0,-1.56237 -1.5621,-1.56237 -1.5621,-1.56237 z m -3.13955,1.55628 -3.12446,6.24866 h 6.24893 c 0,0.0561 -3.12447,-6.24866 -3.12447,-6.24866 z m -3.12446,9.37286 3.12446,6.24893 3.12447,-6.24893 z m -7.79569,0.006 v 6.24893 c 0,1.5621 1.56237,1.5621 1.56237,1.5621 h 6.24866 v -3.12447 h -4.68656 v -4.68656 z m 18.74626,0 v 4.68656 h -4.68656 v 3.12447 h 6.24893 c 0,0 1.5621,0 1.5621,-1.5621 v -6.24893 z" />
-  </g>
-</svg>
diff --git a/data/icons/24x24/actions/remmina-fit-window.svg b/data/icons/24x24/actions/remmina-fit-window.svg
deleted file mode 100644
index 89092894f..000000000
--- a/data/icons/24x24/actions/remmina-fit-window.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863581 21.863579"
-   height="82.634003"
-   width="82.634003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-229.61131,-170.08308)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path7"
-       d="m 231.77508,170.08308 c -1.20756,0 -2.16377,1.00012 -2.16377,2.22064 v 6.88923 h 3.64411 v -5.46577 h 5.46576 v -3.6441 z m 10.58994,0 v 3.6441 h 5.46603 v 5.46577 h 3.64384 v -6.88923 c 0,-1.22025 -0.9562,-2.22064 -2.1635,-2.22064 z m -5.48719,7.2808 v 7.28795 h 7.28795 v -7.28795 z m -7.26652,5.47291 v 6.88922 c 0,1.22026 0.95621,2.22065 2.16377,2.22065 h 6.9461 v -3.64385 h -5.46576 v -5.46602 z m 18.21974,0 v 5.46602 h -5.46603 v 3.64385 h 6.94637 c 1.2073,0 2.1635,-1.00013 2.1635,-2.22065 v -6.88922 z" />
-  </g>
-</svg>
diff --git a/data/icons/24x24/actions/remmina-folder-symbolic.svg b/data/icons/24x24/actions/remmina-folder-symbolic.svg
deleted file mode 100644
index f138944f5..000000000
--- a/data/icons/24x24/actions/remmina-folder-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-fullscreen.svg b/data/icons/24x24/actions/remmina-fullscreen.svg
deleted file mode 100644
index c28be5457..000000000
--- a/data/icons/24x24/actions/remmina-fullscreen.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 22.98329 19.699818"
-   height="74.456009"
-   width="86.865974">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-155.93039,-137.88226)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path19"
-       d="m 157.57213,137.88226 c -1.64174,0 -1.64174,1.64174 -1.64174,1.64174 v 6.5667 h 3.28347 v -4.92496 h 4.92496 v -3.28348 z m 13.13338,0 v 3.28348 h 4.92496 v 4.92496 h 3.28321 v -6.5667 c 0,-1.64174 -1.64174,-1.64174 -1.64174,-1.64174 z m -14.77512,11.49165 v 6.5667 c 0,1.64147 1.64174,1.64147 1.64174,1.64147 h 6.56669 v -3.28321 h -4.92496 v -4.92496 z m 19.70008,0 v 4.92496 h -4.92496 v 3.28321 h 6.56643 c 0,0 1.64174,0 1.64174,-1.64147 v -6.5667 z" />
-  </g>
-</svg>
diff --git a/data/icons/24x24/actions/remmina-go-bottom.svg b/data/icons/24x24/actions/remmina-go-bottom.svg
deleted file mode 100644
index 16ce7281e..000000000
--- a/data/icons/24x24/actions/remmina-go-bottom.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 7.33l2.829-2.83 9.175 9.339 9.167-9.339 2.829 2.83-11.996 12.17z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-keyboard.svg b/data/icons/24x24/actions/remmina-keyboard.svg
deleted file mode 100644
index 9c009405d..000000000
--- a/data/icons/24x24/actions/remmina-keyboard.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 5v14h24v-14h-24zm16 3h2v2h-2v-2zm-3 0h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-7-3h3v2h-3v-2zm0 3h4v2h-4v-2zm14 5h-10v-2h10v2zm4-3h-4v-2h4v2zm0-3h-2v-2h2v2z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-pan-down-symbolic.svg b/data/icons/24x24/actions/remmina-pan-down-symbolic.svg
deleted file mode 100644
index 590db5f6d..000000000
--- a/data/icons/24x24/actions/remmina-pan-down-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 6h-24v-4h24v4zm0 4h-24v4h24v-4zm0 8h-24v4h24v-4z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-pan-up-symbolic.svg b/data/icons/24x24/actions/remmina-pan-up-symbolic.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/24x24/actions/remmina-pan-up-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-pin-down.svg b/data/icons/24x24/actions/remmina-pin-down.svg
deleted file mode 100644
index 1b8339121..000000000
--- a/data/icons/24x24/actions/remmina-pin-down.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm4.038-9.588c-2.486 0-4.5 2.015-4.5 4.5s2.014 4.5 4.5 4.5c2.484 0 4.5-2.015 4.5-4.5s-2.016-4.5-4.5-4.5zm-.469 6.484l-1.688-1.637.695-.697.992.94 2.115-2.169.697.696-2.811 2.867z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-pin-up.svg b/data/icons/24x24/actions/remmina-pin-up.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/24x24/actions/remmina-pin-up.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-preferences-system.svg b/data/icons/24x24/actions/remmina-preferences-system.svg
deleted file mode 100644
index 7136a9d6f..000000000
--- a/data/icons/24x24/actions/remmina-preferences-system.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z" />
-</svg>
diff --git a/data/icons/24x24/actions/remmina-scale.svg b/data/icons/24x24/actions/remmina-scale.svg
deleted file mode 100644
index 7bb33d89e..000000000
--- a/data/icons/24x24/actions/remmina-scale.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870721 21.863579"
-   height="82.634003"
-   width="82.660988">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-188.25652,-183.69872)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path9"
-       d="m 190.47716,183.69872 c -1.22052,0 -2.22064,0.95621 -2.22064,2.16377 v 6.9461 h 3.6441 v -5.46576 h 5.46576 v -3.64411 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path11"
-       d="m 202.39744,183.69872 2.57651,2.57678 -3.86503,3.86503 2.57677,2.57652 3.86477,-3.86504 2.57678,2.57678 v -7.73007 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path13"
-       d="m 188.26366,194.63051 v 10.93179 h 10.93179 v -10.93179 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path15"
-       d="m 206.47625,196.45243 v 5.46603 h -5.46602 v 3.64384 h 6.88922 c 1.22052,0 2.22064,-0.9562 2.22064,-2.1635 v -6.94637 z" />
-  </g>
-</svg>
diff --git a/data/icons/24x24/actions/remmina-switch-page.svg b/data/icons/24x24/actions/remmina-switch-page.svg
deleted file mode 100644
index d32a4c45a..000000000
--- a/data/icons/24x24/actions/remmina-switch-page.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863561 21.863569"
-   height="82.633965"
-   width="82.633926">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-186.7473,-190.75869)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path17"
-       d="m 188.20483,190.75869 c 0,0 -0.11113,0.006 -0.26459,0.0341 -0.29765,0.0442 -0.52281,0.15081 -0.68897,0.29607 -0.0323,0.0246 -0.0635,0.0513 -0.0939,0.0799 -0.0286,0.0304 -0.055,0.0616 -0.0796,0.0939 -0.14552,0.16616 -0.25214,0.39132 -0.29607,0.68897 -0.0283,0.15346 -0.0344,0.26459 -0.0344,0.26459 v 17.49081 c 0,1.45759 1.45759,1.45759 1.45759,1.45759 h 8.74554 v -2.91518 h -7.28795 v -10.20287 h 14.57563 v 2.91518 h 2.91518 v -8.74553 c 0,0 -0.006,-0.11113 -0.0341,-0.26459 -0.0452,-0.29765 -0.15028,-0.52281 -0.29607,-0.68897 -0.0249,-0.0323 -0.0521,-0.0635 -0.0796,-0.0939 -0.0307,-0.0286 -0.0619,-0.0553 -0.0939,-0.0799 -0.16642,-0.14526 -0.39158,-0.25189 -0.68897,-0.29607 -0.15452,-0.0281 -0.26485,-0.0341 -0.26485,-0.0341 z m 10.93179,11.66045 c 0,0 -0.0542,0.003 -0.13097,0.0172 -0.1487,0.022 -0.26141,0.0754 -0.34449,0.14817 -0.0161,0.0122 -0.0331,0.0254 -0.0484,0.0397 -0.0146,0.0154 -0.0275,0.0323 -0.0397,0.0484 -0.0728,0.0831 -0.12621,0.19552 -0.14817,0.34448 -0.0146,0.0767 -0.0169,0.13097 -0.0169,0.13097 v 8.74527 c 0,0.72893 0.72867,0.72893 0.72867,0.72893 h 8.74527 c 0,0 0.72893,0 0.72893,-0.72893 v -8.74527 c 0,0 -0.003,-0.0542 -0.0172,-0.13097 -0.0217,-0.14896 -0.0751,-0.26141 -0.14791,-0.34448 -0.0116,-0.0161 -0.0254,-0.0331 -0.04,-0.0484 -0.0145,-0.0143 -0.0323,-0.0275 -0.0484,-0.0397 -0.0831,-0.0728 -0.19579,-0.12621 -0.34448,-0.14817 -0.0773,-0.014 -0.13097,-0.0172 -0.13097,-0.0172 z m 0.72866,4.37277 h 7.28795 v 4.37277 h -7.28795 z" />
-  </g>
-</svg>
diff --git a/data/icons/24x24/actions/remmina-system-run.svg b/data/icons/24x24/actions/remmina-system-run.svg
deleted file mode 100644
index 0b590788b..000000000
--- a/data/icons/24x24/actions/remmina-system-run.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M4.5.257l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z" />
-</svg>
diff --git a/data/icons/24x24/emblems/remmina-sftp.svg b/data/icons/24x24/emblems/remmina-sftp.svg
deleted file mode 100644
index 9c96b858d..000000000
--- a/data/icons/24x24/emblems/remmina-sftp.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-235.41273,-151.37414)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path23"
-       d="m 243.17914,172.33905 c 4.26932,4.26906 11.19082,4.26906 15.45987,0 4.26905,-4.26931 4.26905,-11.19081 0,-15.45987 -3.50573,-3.50572 -8.79501,-4.15025 -12.94051,-1.89785 l 2.38099,2.38098 c 2.79797,-1.08796 6.09203,-0.53366 8.35104,1.72535 3.04933,3.04932 3.04933,7.99333 0,11.04265 -3.04932,3.04932 -7.99332,3.04932 -11.04265,0 -1.52585,-1.52559 -2.25345,-3.52319 -2.24313,-5.52132 l 5.54937,-0.006 -6.6257,-6.6257 -6.62543,6.6257 h 4.53337 c 0.006,2.79929 1.06733,5.6007 3.19855,7.73192 z" />
-  </g>
-</svg>
diff --git a/data/icons/24x24/emblems/remmina-ssh.svg b/data/icons/24x24/emblems/remmina-ssh.svg
deleted file mode 100644
index ef8bdf14f..000000000
--- a/data/icons/24x24/emblems/remmina-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <text
-         transform="scale(1.0413034,0.96033492)"
-         id="text4638"
-         y="169.55627"
-         x="173.44473"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;line-height:247.11486816px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49422976"
-         xml:space="preserve"><tspan
-           y="169.55627"
-           x="173.44473"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.49422976"
-           id="tspan4642">$_</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/data/icons/32x32/actions/remmina-camera-photo.svg b/data/icons/32x32/actions/remmina-camera-photo.svg
deleted file mode 100644
index bdf5a1658..000000000
--- a/data/icons/32x32/actions/remmina-camera-photo.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M5 4h-3v-1h3v1zm12 9c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4zm-1 0c0-1.657-1.342-3-3-3s-3 1.343-3 3 1.342 3 3 3 3-1.343 3-3zm8-8v17h-24v-17h5.93c.669 0 1.293-.334 1.664-.891l1.406-2.109h8l1.406 2.109c.371.557.995.891 1.664.891h3.93zm-19 4c0-.552-.447-1-1-1s-1 .448-1 1 .447 1 1 1 1-.448 1-1zm14 4c0-3.314-2.687-6-6-6s-6 2.686-6 6 2.687 6 6 6 6-2.686 6-6z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-connect.svg b/data/icons/32x32/actions/remmina-connect.svg
deleted file mode 100644
index e8e4fb4ab..000000000
--- a/data/icons/32x32/actions/remmina-connect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M21.921 2.081c2.771 2.772 2.771 7.269 0 10.042l-3.84 3.839-2.121-2.122 3.839-3.84c1.599-1.598 1.599-4.199-.001-5.797-1.598-1.599-4.199-1.599-5.797-.001l-3.84 3.839-2.121-2.121 3.84-3.839c2.771-2.773 7.267-2.773 10.041 0zm-8.082 13.879l-3.84 3.839c-1.598 1.6-4.199 1.599-5.799 0-1.598-1.598-1.598-4.2 0-5.797l3.84-3.84-2.121-2.121-3.84 3.84c-2.771 2.772-2.772 7.268 0 10.041 2.773 2.772 7.27 2.773 10.041 0l3.84-3.84-2.121-2.122z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-disconnect.svg b/data/icons/32x32/actions/remmina-disconnect.svg
deleted file mode 100644
index 959abc6c3..000000000
--- a/data/icons/32x32/actions/remmina-disconnect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M14.008 21.092l-3.392 1.959c-3.384 1.954-7.713.794-9.668-2.592-1.953-3.385-.793-7.713 2.591-9.667l3.393-1.959 1.495 2.589-3.393 1.96c-1.95 1.125-2.622 3.631-1.495 5.581 1.126 1.953 3.631 2.625 5.582 1.495l3.392-1.956 1.495 2.59zm-3.214-17.553l-1.959 3.392 2.589 1.497 1.959-3.393c1.126-1.95 3.631-2.622 5.581-1.495 1.952 1.127 2.624 3.629 1.499 5.582l-1.96 3.392 2.589 1.494 1.96-3.391c1.952-3.387.792-7.714-2.59-9.667-3.387-1.955-7.716-.795-9.668 2.589zm7.398 20.217l-1.724.244-.523-3.688 1.722-.243.525 3.687zm5.808-7.284l-.249 1.724-3.688-.527.247-1.722 3.69.525zm-5.733 3.013l1.229-1.23 2.638 2.636-1.231 1.23-2.636-2.636z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-document-save.svg b/data/icons/32x32/actions/remmina-document-save.svg
deleted file mode 100644
index ac97f301f..000000000
--- a/data/icons/32x32/actions/remmina-document-save.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M15.003 3h2.997v5h-2.997v-5zm8.997 1v20h-24v-24h20l4 4zm-19 5h14v-7h-14v7zm16 4h-18v9h18v-9z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-document-send.svg b/data/icons/32x32/actions/remmina-document-send.svg
deleted file mode 100644
index cd34d345c..000000000
--- a/data/icons/32x32/actions/remmina-document-send.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 0l-6 22-8.129-7.239 7.802-8.234-10.458 7.227-7.215-1.754 24-12zm-15 16.668v7.332l3.258-4.431-3.258-2.901z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-dynres.svg b/data/icons/32x32/actions/remmina-dynres.svg
deleted file mode 100644
index 5e2c89b54..000000000
--- a/data/icons/32x32/actions/remmina-dynres.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870731 18.74617"
-   height="70.851669"
-   width="82.661026">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-212.96639,-204.92443)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path21"
-       d="m 214.52876,204.92443 c -1.56237,0 -1.56237,1.56237 -1.56237,1.56237 v 6.24866 h 3.12447 v -4.68656 h 4.68656 v -3.12447 z m 12.49733,0 v 3.12447 h 4.68656 v 4.68656 h 3.12447 v -6.24866 c 0,-1.56237 -1.5621,-1.56237 -1.5621,-1.56237 z m -3.13955,1.55628 -3.12446,6.24866 h 6.24893 c 0,0.0561 -3.12447,-6.24866 -3.12447,-6.24866 z m -3.12446,9.37286 3.12446,6.24893 3.12447,-6.24893 z m -7.79569,0.006 v 6.24893 c 0,1.5621 1.56237,1.5621 1.56237,1.5621 h 6.24866 v -3.12447 h -4.68656 v -4.68656 z m 18.74626,0 v 4.68656 h -4.68656 v 3.12447 h 6.24893 c 0,0 1.5621,0 1.5621,-1.5621 v -6.24893 z" />
-  </g>
-</svg>
diff --git a/data/icons/32x32/actions/remmina-fit-window.svg b/data/icons/32x32/actions/remmina-fit-window.svg
deleted file mode 100644
index 89092894f..000000000
--- a/data/icons/32x32/actions/remmina-fit-window.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863581 21.863579"
-   height="82.634003"
-   width="82.634003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-229.61131,-170.08308)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path7"
-       d="m 231.77508,170.08308 c -1.20756,0 -2.16377,1.00012 -2.16377,2.22064 v 6.88923 h 3.64411 v -5.46577 h 5.46576 v -3.6441 z m 10.58994,0 v 3.6441 h 5.46603 v 5.46577 h 3.64384 v -6.88923 c 0,-1.22025 -0.9562,-2.22064 -2.1635,-2.22064 z m -5.48719,7.2808 v 7.28795 h 7.28795 v -7.28795 z m -7.26652,5.47291 v 6.88922 c 0,1.22026 0.95621,2.22065 2.16377,2.22065 h 6.9461 v -3.64385 h -5.46576 v -5.46602 z m 18.21974,0 v 5.46602 h -5.46603 v 3.64385 h 6.94637 c 1.2073,0 2.1635,-1.00013 2.1635,-2.22065 v -6.88922 z" />
-  </g>
-</svg>
diff --git a/data/icons/32x32/actions/remmina-folder-symbolic.svg b/data/icons/32x32/actions/remmina-folder-symbolic.svg
deleted file mode 100644
index f138944f5..000000000
--- a/data/icons/32x32/actions/remmina-folder-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-fullscreen.svg b/data/icons/32x32/actions/remmina-fullscreen.svg
deleted file mode 100644
index c28be5457..000000000
--- a/data/icons/32x32/actions/remmina-fullscreen.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 22.98329 19.699818"
-   height="74.456009"
-   width="86.865974">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-155.93039,-137.88226)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path19"
-       d="m 157.57213,137.88226 c -1.64174,0 -1.64174,1.64174 -1.64174,1.64174 v 6.5667 h 3.28347 v -4.92496 h 4.92496 v -3.28348 z m 13.13338,0 v 3.28348 h 4.92496 v 4.92496 h 3.28321 v -6.5667 c 0,-1.64174 -1.64174,-1.64174 -1.64174,-1.64174 z m -14.77512,11.49165 v 6.5667 c 0,1.64147 1.64174,1.64147 1.64174,1.64147 h 6.56669 v -3.28321 h -4.92496 v -4.92496 z m 19.70008,0 v 4.92496 h -4.92496 v 3.28321 h 6.56643 c 0,0 1.64174,0 1.64174,-1.64147 v -6.5667 z" />
-  </g>
-</svg>
diff --git a/data/icons/32x32/actions/remmina-go-bottom.svg b/data/icons/32x32/actions/remmina-go-bottom.svg
deleted file mode 100644
index 16ce7281e..000000000
--- a/data/icons/32x32/actions/remmina-go-bottom.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 7.33l2.829-2.83 9.175 9.339 9.167-9.339 2.829 2.83-11.996 12.17z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-keyboard.svg b/data/icons/32x32/actions/remmina-keyboard.svg
deleted file mode 100644
index 9c009405d..000000000
--- a/data/icons/32x32/actions/remmina-keyboard.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 5v14h24v-14h-24zm16 3h2v2h-2v-2zm-3 0h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-7-3h3v2h-3v-2zm0 3h4v2h-4v-2zm14 5h-10v-2h10v2zm4-3h-4v-2h4v2zm0-3h-2v-2h2v2z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-pan-down-symbolic.svg b/data/icons/32x32/actions/remmina-pan-down-symbolic.svg
deleted file mode 100644
index 590db5f6d..000000000
--- a/data/icons/32x32/actions/remmina-pan-down-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 6h-24v-4h24v4zm0 4h-24v4h24v-4zm0 8h-24v4h24v-4z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-pan-up-symbolic.svg b/data/icons/32x32/actions/remmina-pan-up-symbolic.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/32x32/actions/remmina-pan-up-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-pin-down.svg b/data/icons/32x32/actions/remmina-pin-down.svg
deleted file mode 100644
index 1b8339121..000000000
--- a/data/icons/32x32/actions/remmina-pin-down.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm4.038-9.588c-2.486 0-4.5 2.015-4.5 4.5s2.014 4.5 4.5 4.5c2.484 0 4.5-2.015 4.5-4.5s-2.016-4.5-4.5-4.5zm-.469 6.484l-1.688-1.637.695-.697.992.94 2.115-2.169.697.696-2.811 2.867z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-pin-up.svg b/data/icons/32x32/actions/remmina-pin-up.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/32x32/actions/remmina-pin-up.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-preferences-system.svg b/data/icons/32x32/actions/remmina-preferences-system.svg
deleted file mode 100644
index 7136a9d6f..000000000
--- a/data/icons/32x32/actions/remmina-preferences-system.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z" />
-</svg>
diff --git a/data/icons/32x32/actions/remmina-scale.svg b/data/icons/32x32/actions/remmina-scale.svg
deleted file mode 100644
index 7bb33d89e..000000000
--- a/data/icons/32x32/actions/remmina-scale.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870721 21.863579"
-   height="82.634003"
-   width="82.660988">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-188.25652,-183.69872)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path9"
-       d="m 190.47716,183.69872 c -1.22052,0 -2.22064,0.95621 -2.22064,2.16377 v 6.9461 h 3.6441 v -5.46576 h 5.46576 v -3.64411 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path11"
-       d="m 202.39744,183.69872 2.57651,2.57678 -3.86503,3.86503 2.57677,2.57652 3.86477,-3.86504 2.57678,2.57678 v -7.73007 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path13"
-       d="m 188.26366,194.63051 v 10.93179 h 10.93179 v -10.93179 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path15"
-       d="m 206.47625,196.45243 v 5.46603 h -5.46602 v 3.64384 h 6.88922 c 1.22052,0 2.22064,-0.9562 2.22064,-2.1635 v -6.94637 z" />
-  </g>
-</svg>
diff --git a/data/icons/32x32/actions/remmina-switch-page.svg b/data/icons/32x32/actions/remmina-switch-page.svg
deleted file mode 100644
index d32a4c45a..000000000
--- a/data/icons/32x32/actions/remmina-switch-page.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863561 21.863569"
-   height="82.633965"
-   width="82.633926">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-186.7473,-190.75869)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path17"
-       d="m 188.20483,190.75869 c 0,0 -0.11113,0.006 -0.26459,0.0341 -0.29765,0.0442 -0.52281,0.15081 -0.68897,0.29607 -0.0323,0.0246 -0.0635,0.0513 -0.0939,0.0799 -0.0286,0.0304 -0.055,0.0616 -0.0796,0.0939 -0.14552,0.16616 -0.25214,0.39132 -0.29607,0.68897 -0.0283,0.15346 -0.0344,0.26459 -0.0344,0.26459 v 17.49081 c 0,1.45759 1.45759,1.45759 1.45759,1.45759 h 8.74554 v -2.91518 h -7.28795 v -10.20287 h 14.57563 v 2.91518 h 2.91518 v -8.74553 c 0,0 -0.006,-0.11113 -0.0341,-0.26459 -0.0452,-0.29765 -0.15028,-0.52281 -0.29607,-0.68897 -0.0249,-0.0323 -0.0521,-0.0635 -0.0796,-0.0939 -0.0307,-0.0286 -0.0619,-0.0553 -0.0939,-0.0799 -0.16642,-0.14526 -0.39158,-0.25189 -0.68897,-0.29607 -0.15452,-0.0281 -0.26485,-0.0341 -0.26485,-0.0341 z m 10.93179,11.66045 c 0,0 -0.0542,0.003 -0.13097,0.0172 -0.1487,0.022 -0.26141,0.0754 -0.34449,0.14817 -0.0161,0.0122 -0.0331,0.0254 -0.0484,0.0397 -0.0146,0.0154 -0.0275,0.0323 -0.0397,0.0484 -0.0728,0.0831 -0.12621,0.19552 -0.14817,0.34448 -0.0146,0.0767 -0.0169,0.13097 -0.0169,0.13097 v 8.74527 c 0,0.72893 0.72867,0.72893 0.72867,0.72893 h 8.74527 c 0,0 0.72893,0 0.72893,-0.72893 v -8.74527 c 0,0 -0.003,-0.0542 -0.0172,-0.13097 -0.0217,-0.14896 -0.0751,-0.26141 -0.14791,-0.34448 -0.0116,-0.0161 -0.0254,-0.0331 -0.04,-0.0484 -0.0145,-0.0143 -0.0323,-0.0275 -0.0484,-0.0397 -0.0831,-0.0728 -0.19579,-0.12621 -0.34448,-0.14817 -0.0773,-0.014 -0.13097,-0.0172 -0.13097,-0.0172 z m 0.72866,4.37277 h 7.28795 v 4.37277 h -7.28795 z" />
-  </g>
-</svg>
diff --git a/data/icons/32x32/actions/remmina-system-run.svg b/data/icons/32x32/actions/remmina-system-run.svg
deleted file mode 100644
index 0b590788b..000000000
--- a/data/icons/32x32/actions/remmina-system-run.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M4.5.257l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z" />
-</svg>
diff --git a/data/icons/32x32/emblems/remmina-sftp.svg b/data/icons/32x32/emblems/remmina-sftp.svg
deleted file mode 100644
index 9c96b858d..000000000
--- a/data/icons/32x32/emblems/remmina-sftp.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-235.41273,-151.37414)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path23"
-       d="m 243.17914,172.33905 c 4.26932,4.26906 11.19082,4.26906 15.45987,0 4.26905,-4.26931 4.26905,-11.19081 0,-15.45987 -3.50573,-3.50572 -8.79501,-4.15025 -12.94051,-1.89785 l 2.38099,2.38098 c 2.79797,-1.08796 6.09203,-0.53366 8.35104,1.72535 3.04933,3.04932 3.04933,7.99333 0,11.04265 -3.04932,3.04932 -7.99332,3.04932 -11.04265,0 -1.52585,-1.52559 -2.25345,-3.52319 -2.24313,-5.52132 l 5.54937,-0.006 -6.6257,-6.6257 -6.62543,6.6257 h 4.53337 c 0.006,2.79929 1.06733,5.6007 3.19855,7.73192 z" />
-  </g>
-</svg>
diff --git a/data/icons/32x32/emblems/remmina-ssh.svg b/data/icons/32x32/emblems/remmina-ssh.svg
deleted file mode 100644
index ef8bdf14f..000000000
--- a/data/icons/32x32/emblems/remmina-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <text
-         transform="scale(1.0413034,0.96033492)"
-         id="text4638"
-         y="169.55627"
-         x="173.44473"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;line-height:247.11486816px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49422976"
-         xml:space="preserve"><tspan
-           y="169.55627"
-           x="173.44473"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.49422976"
-           id="tspan4642">$_</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/data/icons/48x48/actions/remmina-camera-photo.svg b/data/icons/48x48/actions/remmina-camera-photo.svg
deleted file mode 100644
index bdf5a1658..000000000
--- a/data/icons/48x48/actions/remmina-camera-photo.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M5 4h-3v-1h3v1zm12 9c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4zm-1 0c0-1.657-1.342-3-3-3s-3 1.343-3 3 1.342 3 3 3 3-1.343 3-3zm8-8v17h-24v-17h5.93c.669 0 1.293-.334 1.664-.891l1.406-2.109h8l1.406 2.109c.371.557.995.891 1.664.891h3.93zm-19 4c0-.552-.447-1-1-1s-1 .448-1 1 .447 1 1 1 1-.448 1-1zm14 4c0-3.314-2.687-6-6-6s-6 2.686-6 6 2.687 6 6 6 6-2.686 6-6z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-connect.svg b/data/icons/48x48/actions/remmina-connect.svg
deleted file mode 100644
index e8e4fb4ab..000000000
--- a/data/icons/48x48/actions/remmina-connect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M21.921 2.081c2.771 2.772 2.771 7.269 0 10.042l-3.84 3.839-2.121-2.122 3.839-3.84c1.599-1.598 1.599-4.199-.001-5.797-1.598-1.599-4.199-1.599-5.797-.001l-3.84 3.839-2.121-2.121 3.84-3.839c2.771-2.773 7.267-2.773 10.041 0zm-8.082 13.879l-3.84 3.839c-1.598 1.6-4.199 1.599-5.799 0-1.598-1.598-1.598-4.2 0-5.797l3.84-3.84-2.121-2.121-3.84 3.84c-2.771 2.772-2.772 7.268 0 10.041 2.773 2.772 7.27 2.773 10.041 0l3.84-3.84-2.121-2.122z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-disconnect.svg b/data/icons/48x48/actions/remmina-disconnect.svg
deleted file mode 100644
index 959abc6c3..000000000
--- a/data/icons/48x48/actions/remmina-disconnect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M14.008 21.092l-3.392 1.959c-3.384 1.954-7.713.794-9.668-2.592-1.953-3.385-.793-7.713 2.591-9.667l3.393-1.959 1.495 2.589-3.393 1.96c-1.95 1.125-2.622 3.631-1.495 5.581 1.126 1.953 3.631 2.625 5.582 1.495l3.392-1.956 1.495 2.59zm-3.214-17.553l-1.959 3.392 2.589 1.497 1.959-3.393c1.126-1.95 3.631-2.622 5.581-1.495 1.952 1.127 2.624 3.629 1.499 5.582l-1.96 3.392 2.589 1.494 1.96-3.391c1.952-3.387.792-7.714-2.59-9.667-3.387-1.955-7.716-.795-9.668 2.589zm7.398 20.217l-1.724.244-.523-3.688 1.722-.243.525 3.687zm5.808-7.284l-.249 1.724-3.688-.527.247-1.722 3.69.525zm-5.733 3.013l1.229-1.23 2.638 2.636-1.231 1.23-2.636-2.636z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-document-save.svg b/data/icons/48x48/actions/remmina-document-save.svg
deleted file mode 100644
index ac97f301f..000000000
--- a/data/icons/48x48/actions/remmina-document-save.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M15.003 3h2.997v5h-2.997v-5zm8.997 1v20h-24v-24h20l4 4zm-19 5h14v-7h-14v7zm16 4h-18v9h18v-9z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-document-send.svg b/data/icons/48x48/actions/remmina-document-send.svg
deleted file mode 100644
index cd34d345c..000000000
--- a/data/icons/48x48/actions/remmina-document-send.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 0l-6 22-8.129-7.239 7.802-8.234-10.458 7.227-7.215-1.754 24-12zm-15 16.668v7.332l3.258-4.431-3.258-2.901z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-dynres.svg b/data/icons/48x48/actions/remmina-dynres.svg
deleted file mode 100644
index 5e2c89b54..000000000
--- a/data/icons/48x48/actions/remmina-dynres.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870731 18.74617"
-   height="70.851669"
-   width="82.661026">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-212.96639,-204.92443)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path21"
-       d="m 214.52876,204.92443 c -1.56237,0 -1.56237,1.56237 -1.56237,1.56237 v 6.24866 h 3.12447 v -4.68656 h 4.68656 v -3.12447 z m 12.49733,0 v 3.12447 h 4.68656 v 4.68656 h 3.12447 v -6.24866 c 0,-1.56237 -1.5621,-1.56237 -1.5621,-1.56237 z m -3.13955,1.55628 -3.12446,6.24866 h 6.24893 c 0,0.0561 -3.12447,-6.24866 -3.12447,-6.24866 z m -3.12446,9.37286 3.12446,6.24893 3.12447,-6.24893 z m -7.79569,0.006 v 6.24893 c 0,1.5621 1.56237,1.5621 1.56237,1.5621 h 6.24866 v -3.12447 h -4.68656 v -4.68656 z m 18.74626,0 v 4.68656 h -4.68656 v 3.12447 h 6.24893 c 0,0 1.5621,0 1.5621,-1.5621 v -6.24893 z" />
-  </g>
-</svg>
diff --git a/data/icons/48x48/actions/remmina-fit-window.svg b/data/icons/48x48/actions/remmina-fit-window.svg
deleted file mode 100644
index 89092894f..000000000
--- a/data/icons/48x48/actions/remmina-fit-window.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863581 21.863579"
-   height="82.634003"
-   width="82.634003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-229.61131,-170.08308)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path7"
-       d="m 231.77508,170.08308 c -1.20756,0 -2.16377,1.00012 -2.16377,2.22064 v 6.88923 h 3.64411 v -5.46577 h 5.46576 v -3.6441 z m 10.58994,0 v 3.6441 h 5.46603 v 5.46577 h 3.64384 v -6.88923 c 0,-1.22025 -0.9562,-2.22064 -2.1635,-2.22064 z m -5.48719,7.2808 v 7.28795 h 7.28795 v -7.28795 z m -7.26652,5.47291 v 6.88922 c 0,1.22026 0.95621,2.22065 2.16377,2.22065 h 6.9461 v -3.64385 h -5.46576 v -5.46602 z m 18.21974,0 v 5.46602 h -5.46603 v 3.64385 h 6.94637 c 1.2073,0 2.1635,-1.00013 2.1635,-2.22065 v -6.88922 z" />
-  </g>
-</svg>
diff --git a/data/icons/48x48/actions/remmina-folder-symbolic.svg b/data/icons/48x48/actions/remmina-folder-symbolic.svg
deleted file mode 100644
index f138944f5..000000000
--- a/data/icons/48x48/actions/remmina-folder-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-fullscreen.svg b/data/icons/48x48/actions/remmina-fullscreen.svg
deleted file mode 100644
index c28be5457..000000000
--- a/data/icons/48x48/actions/remmina-fullscreen.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 22.98329 19.699818"
-   height="74.456009"
-   width="86.865974">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-155.93039,-137.88226)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path19"
-       d="m 157.57213,137.88226 c -1.64174,0 -1.64174,1.64174 -1.64174,1.64174 v 6.5667 h 3.28347 v -4.92496 h 4.92496 v -3.28348 z m 13.13338,0 v 3.28348 h 4.92496 v 4.92496 h 3.28321 v -6.5667 c 0,-1.64174 -1.64174,-1.64174 -1.64174,-1.64174 z m -14.77512,11.49165 v 6.5667 c 0,1.64147 1.64174,1.64147 1.64174,1.64147 h 6.56669 v -3.28321 h -4.92496 v -4.92496 z m 19.70008,0 v 4.92496 h -4.92496 v 3.28321 h 6.56643 c 0,0 1.64174,0 1.64174,-1.64147 v -6.5667 z" />
-  </g>
-</svg>
diff --git a/data/icons/48x48/actions/remmina-go-bottom.svg b/data/icons/48x48/actions/remmina-go-bottom.svg
deleted file mode 100644
index 16ce7281e..000000000
--- a/data/icons/48x48/actions/remmina-go-bottom.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 7.33l2.829-2.83 9.175 9.339 9.167-9.339 2.829 2.83-11.996 12.17z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-keyboard.svg b/data/icons/48x48/actions/remmina-keyboard.svg
deleted file mode 100644
index 9c009405d..000000000
--- a/data/icons/48x48/actions/remmina-keyboard.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 5v14h24v-14h-24zm16 3h2v2h-2v-2zm-3 0h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-7-3h3v2h-3v-2zm0 3h4v2h-4v-2zm14 5h-10v-2h10v2zm4-3h-4v-2h4v2zm0-3h-2v-2h2v2z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-pan-down-symbolic.svg b/data/icons/48x48/actions/remmina-pan-down-symbolic.svg
deleted file mode 100644
index 590db5f6d..000000000
--- a/data/icons/48x48/actions/remmina-pan-down-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 6h-24v-4h24v4zm0 4h-24v4h24v-4zm0 8h-24v4h24v-4z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-pan-up-symbolic.svg b/data/icons/48x48/actions/remmina-pan-up-symbolic.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/48x48/actions/remmina-pan-up-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-pin-down.svg b/data/icons/48x48/actions/remmina-pin-down.svg
deleted file mode 100644
index 1b8339121..000000000
--- a/data/icons/48x48/actions/remmina-pin-down.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm4.038-9.588c-2.486 0-4.5 2.015-4.5 4.5s2.014 4.5 4.5 4.5c2.484 0 4.5-2.015 4.5-4.5s-2.016-4.5-4.5-4.5zm-.469 6.484l-1.688-1.637.695-.697.992.94 2.115-2.169.697.696-2.811 2.867z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-pin-up.svg b/data/icons/48x48/actions/remmina-pin-up.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/48x48/actions/remmina-pin-up.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-preferences-system.svg b/data/icons/48x48/actions/remmina-preferences-system.svg
deleted file mode 100644
index 7136a9d6f..000000000
--- a/data/icons/48x48/actions/remmina-preferences-system.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z" />
-</svg>
diff --git a/data/icons/48x48/actions/remmina-scale.svg b/data/icons/48x48/actions/remmina-scale.svg
deleted file mode 100644
index 7bb33d89e..000000000
--- a/data/icons/48x48/actions/remmina-scale.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870721 21.863579"
-   height="82.634003"
-   width="82.660988">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-188.25652,-183.69872)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path9"
-       d="m 190.47716,183.69872 c -1.22052,0 -2.22064,0.95621 -2.22064,2.16377 v 6.9461 h 3.6441 v -5.46576 h 5.46576 v -3.64411 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path11"
-       d="m 202.39744,183.69872 2.57651,2.57678 -3.86503,3.86503 2.57677,2.57652 3.86477,-3.86504 2.57678,2.57678 v -7.73007 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path13"
-       d="m 188.26366,194.63051 v 10.93179 h 10.93179 v -10.93179 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path15"
-       d="m 206.47625,196.45243 v 5.46603 h -5.46602 v 3.64384 h 6.88922 c 1.22052,0 2.22064,-0.9562 2.22064,-2.1635 v -6.94637 z" />
-  </g>
-</svg>
diff --git a/data/icons/48x48/actions/remmina-switch-page.svg b/data/icons/48x48/actions/remmina-switch-page.svg
deleted file mode 100644
index d32a4c45a..000000000
--- a/data/icons/48x48/actions/remmina-switch-page.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863561 21.863569"
-   height="82.633965"
-   width="82.633926">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-186.7473,-190.75869)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path17"
-       d="m 188.20483,190.75869 c 0,0 -0.11113,0.006 -0.26459,0.0341 -0.29765,0.0442 -0.52281,0.15081 -0.68897,0.29607 -0.0323,0.0246 -0.0635,0.0513 -0.0939,0.0799 -0.0286,0.0304 -0.055,0.0616 -0.0796,0.0939 -0.14552,0.16616 -0.25214,0.39132 -0.29607,0.68897 -0.0283,0.15346 -0.0344,0.26459 -0.0344,0.26459 v 17.49081 c 0,1.45759 1.45759,1.45759 1.45759,1.45759 h 8.74554 v -2.91518 h -7.28795 v -10.20287 h 14.57563 v 2.91518 h 2.91518 v -8.74553 c 0,0 -0.006,-0.11113 -0.0341,-0.26459 -0.0452,-0.29765 -0.15028,-0.52281 -0.29607,-0.68897 -0.0249,-0.0323 -0.0521,-0.0635 -0.0796,-0.0939 -0.0307,-0.0286 -0.0619,-0.0553 -0.0939,-0.0799 -0.16642,-0.14526 -0.39158,-0.25189 -0.68897,-0.29607 -0.15452,-0.0281 -0.26485,-0.0341 -0.26485,-0.0341 z m 10.93179,11.66045 c 0,0 -0.0542,0.003 -0.13097,0.0172 -0.1487,0.022 -0.26141,0.0754 -0.34449,0.14817 -0.0161,0.0122 -0.0331,0.0254 -0.0484,0.0397 -0.0146,0.0154 -0.0275,0.0323 -0.0397,0.0484 -0.0728,0.0831 -0.12621,0.19552 -0.14817,0.34448 -0.0146,0.0767 -0.0169,0.13097 -0.0169,0.13097 v 8.74527 c 0,0.72893 0.72867,0.72893 0.72867,0.72893 h 8.74527 c 0,0 0.72893,0 0.72893,-0.72893 v -8.74527 c 0,0 -0.003,-0.0542 -0.0172,-0.13097 -0.0217,-0.14896 -0.0751,-0.26141 -0.14791,-0.34448 -0.0116,-0.0161 -0.0254,-0.0331 -0.04,-0.0484 -0.0145,-0.0143 -0.0323,-0.0275 -0.0484,-0.0397 -0.0831,-0.0728 -0.19579,-0.12621 -0.34448,-0.14817 -0.0773,-0.014 -0.13097,-0.0172 -0.13097,-0.0172 z m 0.72866,4.37277 h 7.28795 v 4.37277 h -7.28795 z" />
-  </g>
-</svg>
diff --git a/data/icons/48x48/actions/remmina-system-run.svg b/data/icons/48x48/actions/remmina-system-run.svg
deleted file mode 100644
index 0b590788b..000000000
--- a/data/icons/48x48/actions/remmina-system-run.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M4.5.257l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z" />
-</svg>
diff --git a/data/icons/48x48/emblems/remmina-sftp.svg b/data/icons/48x48/emblems/remmina-sftp.svg
deleted file mode 100644
index 9c96b858d..000000000
--- a/data/icons/48x48/emblems/remmina-sftp.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-235.41273,-151.37414)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path23"
-       d="m 243.17914,172.33905 c 4.26932,4.26906 11.19082,4.26906 15.45987,0 4.26905,-4.26931 4.26905,-11.19081 0,-15.45987 -3.50573,-3.50572 -8.79501,-4.15025 -12.94051,-1.89785 l 2.38099,2.38098 c 2.79797,-1.08796 6.09203,-0.53366 8.35104,1.72535 3.04933,3.04932 3.04933,7.99333 0,11.04265 -3.04932,3.04932 -7.99332,3.04932 -11.04265,0 -1.52585,-1.52559 -2.25345,-3.52319 -2.24313,-5.52132 l 5.54937,-0.006 -6.6257,-6.6257 -6.62543,6.6257 h 4.53337 c 0.006,2.79929 1.06733,5.6007 3.19855,7.73192 z" />
-  </g>
-</svg>
diff --git a/data/icons/48x48/emblems/remmina-ssh.svg b/data/icons/48x48/emblems/remmina-ssh.svg
deleted file mode 100644
index ef8bdf14f..000000000
--- a/data/icons/48x48/emblems/remmina-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <text
-         transform="scale(1.0413034,0.96033492)"
-         id="text4638"
-         y="169.55627"
-         x="173.44473"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;line-height:247.11486816px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49422976"
-         xml:space="preserve"><tspan
-           y="169.55627"
-           x="173.44473"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.49422976"
-           id="tspan4642">$_</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/data/icons/64x64/actions/remmina-camera-photo.svg b/data/icons/64x64/actions/remmina-camera-photo.svg
deleted file mode 100644
index bdf5a1658..000000000
--- a/data/icons/64x64/actions/remmina-camera-photo.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M5 4h-3v-1h3v1zm12 9c0 2.206-1.794 4-4 4s-4-1.794-4-4 1.794-4 4-4 4 1.794 4 4zm-1 0c0-1.657-1.342-3-3-3s-3 1.343-3 3 1.342 3 3 3 3-1.343 3-3zm8-8v17h-24v-17h5.93c.669 0 1.293-.334 1.664-.891l1.406-2.109h8l1.406 2.109c.371.557.995.891 1.664.891h3.93zm-19 4c0-.552-.447-1-1-1s-1 .448-1 1 .447 1 1 1 1-.448 1-1zm14 4c0-3.314-2.687-6-6-6s-6 2.686-6 6 2.687 6 6 6 6-2.686 6-6z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-connect.svg b/data/icons/64x64/actions/remmina-connect.svg
deleted file mode 100644
index e8e4fb4ab..000000000
--- a/data/icons/64x64/actions/remmina-connect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M21.921 2.081c2.771 2.772 2.771 7.269 0 10.042l-3.84 3.839-2.121-2.122 3.839-3.84c1.599-1.598 1.599-4.199-.001-5.797-1.598-1.599-4.199-1.599-5.797-.001l-3.84 3.839-2.121-2.121 3.84-3.839c2.771-2.773 7.267-2.773 10.041 0zm-8.082 13.879l-3.84 3.839c-1.598 1.6-4.199 1.599-5.799 0-1.598-1.598-1.598-4.2 0-5.797l3.84-3.84-2.121-2.121-3.84 3.84c-2.771 2.772-2.772 7.268 0 10.041 2.773 2.772 7.27 2.773 10.041 0l3.84-3.84-2.121-2.122z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-disconnect.svg b/data/icons/64x64/actions/remmina-disconnect.svg
deleted file mode 100644
index 959abc6c3..000000000
--- a/data/icons/64x64/actions/remmina-disconnect.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M14.008 21.092l-3.392 1.959c-3.384 1.954-7.713.794-9.668-2.592-1.953-3.385-.793-7.713 2.591-9.667l3.393-1.959 1.495 2.589-3.393 1.96c-1.95 1.125-2.622 3.631-1.495 5.581 1.126 1.953 3.631 2.625 5.582 1.495l3.392-1.956 1.495 2.59zm-3.214-17.553l-1.959 3.392 2.589 1.497 1.959-3.393c1.126-1.95 3.631-2.622 5.581-1.495 1.952 1.127 2.624 3.629 1.499 5.582l-1.96 3.392 2.589 1.494 1.96-3.391c1.952-3.387.792-7.714-2.59-9.667-3.387-1.955-7.716-.795-9.668 2.589zm7.398 20.217l-1.724.244-.523-3.688 1.722-.243.525 3.687zm5.808-7.284l-.249 1.724-3.688-.527.247-1.722 3.69.525zm-5.733 3.013l1.229-1.23 2.638 2.636-1.231 1.23-2.636-2.636z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-document-save.svg b/data/icons/64x64/actions/remmina-document-save.svg
deleted file mode 100644
index ac97f301f..000000000
--- a/data/icons/64x64/actions/remmina-document-save.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M15.003 3h2.997v5h-2.997v-5zm8.997 1v20h-24v-24h20l4 4zm-19 5h14v-7h-14v7zm16 4h-18v9h18v-9z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-document-send.svg b/data/icons/64x64/actions/remmina-document-send.svg
deleted file mode 100644
index cd34d345c..000000000
--- a/data/icons/64x64/actions/remmina-document-send.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 0l-6 22-8.129-7.239 7.802-8.234-10.458 7.227-7.215-1.754 24-12zm-15 16.668v7.332l3.258-4.431-3.258-2.901z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-dynres.svg b/data/icons/64x64/actions/remmina-dynres.svg
deleted file mode 100644
index 5e2c89b54..000000000
--- a/data/icons/64x64/actions/remmina-dynres.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870731 18.74617"
-   height="70.851669"
-   width="82.661026">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-212.96639,-204.92443)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path21"
-       d="m 214.52876,204.92443 c -1.56237,0 -1.56237,1.56237 -1.56237,1.56237 v 6.24866 h 3.12447 v -4.68656 h 4.68656 v -3.12447 z m 12.49733,0 v 3.12447 h 4.68656 v 4.68656 h 3.12447 v -6.24866 c 0,-1.56237 -1.5621,-1.56237 -1.5621,-1.56237 z m -3.13955,1.55628 -3.12446,6.24866 h 6.24893 c 0,0.0561 -3.12447,-6.24866 -3.12447,-6.24866 z m -3.12446,9.37286 3.12446,6.24893 3.12447,-6.24893 z m -7.79569,0.006 v 6.24893 c 0,1.5621 1.56237,1.5621 1.56237,1.5621 h 6.24866 v -3.12447 h -4.68656 v -4.68656 z m 18.74626,0 v 4.68656 h -4.68656 v 3.12447 h 6.24893 c 0,0 1.5621,0 1.5621,-1.5621 v -6.24893 z" />
-  </g>
-</svg>
diff --git a/data/icons/64x64/actions/remmina-fit-window.svg b/data/icons/64x64/actions/remmina-fit-window.svg
deleted file mode 100644
index 89092894f..000000000
--- a/data/icons/64x64/actions/remmina-fit-window.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863581 21.863579"
-   height="82.634003"
-   width="82.634003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-229.61131,-170.08308)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path7"
-       d="m 231.77508,170.08308 c -1.20756,0 -2.16377,1.00012 -2.16377,2.22064 v 6.88923 h 3.64411 v -5.46577 h 5.46576 v -3.6441 z m 10.58994,0 v 3.6441 h 5.46603 v 5.46577 h 3.64384 v -6.88923 c 0,-1.22025 -0.9562,-2.22064 -2.1635,-2.22064 z m -5.48719,7.2808 v 7.28795 h 7.28795 v -7.28795 z m -7.26652,5.47291 v 6.88922 c 0,1.22026 0.95621,2.22065 2.16377,2.22065 h 6.9461 v -3.64385 h -5.46576 v -5.46602 z m 18.21974,0 v 5.46602 h -5.46603 v 3.64385 h 6.94637 c 1.2073,0 2.1635,-1.00013 2.1635,-2.22065 v -6.88922 z" />
-  </g>
-</svg>
diff --git a/data/icons/64x64/actions/remmina-folder-symbolic.svg b/data/icons/64x64/actions/remmina-folder-symbolic.svg
deleted file mode 100644
index f138944f5..000000000
--- a/data/icons/64x64/actions/remmina-folder-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M11 5c-1.629 0-2.305-1.058-4-3h-7v20h24v-17h-13z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-fullscreen.svg b/data/icons/64x64/actions/remmina-fullscreen.svg
deleted file mode 100644
index c28be5457..000000000
--- a/data/icons/64x64/actions/remmina-fullscreen.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 22.98329 19.699818"
-   height="74.456009"
-   width="86.865974">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-155.93039,-137.88226)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path19"
-       d="m 157.57213,137.88226 c -1.64174,0 -1.64174,1.64174 -1.64174,1.64174 v 6.5667 h 3.28347 v -4.92496 h 4.92496 v -3.28348 z m 13.13338,0 v 3.28348 h 4.92496 v 4.92496 h 3.28321 v -6.5667 c 0,-1.64174 -1.64174,-1.64174 -1.64174,-1.64174 z m -14.77512,11.49165 v 6.5667 c 0,1.64147 1.64174,1.64147 1.64174,1.64147 h 6.56669 v -3.28321 h -4.92496 v -4.92496 z m 19.70008,0 v 4.92496 h -4.92496 v 3.28321 h 6.56643 c 0,0 1.64174,0 1.64174,-1.64147 v -6.5667 z" />
-  </g>
-</svg>
diff --git a/data/icons/64x64/actions/remmina-go-bottom.svg b/data/icons/64x64/actions/remmina-go-bottom.svg
deleted file mode 100644
index 16ce7281e..000000000
--- a/data/icons/64x64/actions/remmina-go-bottom.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 7.33l2.829-2.83 9.175 9.339 9.167-9.339 2.829 2.83-11.996 12.17z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-keyboard.svg b/data/icons/64x64/actions/remmina-keyboard.svg
deleted file mode 100644
index 9c009405d..000000000
--- a/data/icons/64x64/actions/remmina-keyboard.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M0 5v14h24v-14h-24zm16 3h2v2h-2v-2zm-3 0h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-6-3h2v2h-2v-2zm3 3v2h-2v-2h2zm-7-3h3v2h-3v-2zm0 3h4v2h-4v-2zm14 5h-10v-2h10v2zm4-3h-4v-2h4v2zm0-3h-2v-2h2v2z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-pan-down-symbolic.svg b/data/icons/64x64/actions/remmina-pan-down-symbolic.svg
deleted file mode 100644
index 590db5f6d..000000000
--- a/data/icons/64x64/actions/remmina-pan-down-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M24 6h-24v-4h24v4zm0 4h-24v4h24v-4zm0 8h-24v4h24v-4z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-pan-up-symbolic.svg b/data/icons/64x64/actions/remmina-pan-up-symbolic.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/64x64/actions/remmina-pan-up-symbolic.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-pin-down.svg b/data/icons/64x64/actions/remmina-pin-down.svg
deleted file mode 100644
index 1b8339121..000000000
--- a/data/icons/64x64/actions/remmina-pin-down.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm4.038-9.588c-2.486 0-4.5 2.015-4.5 4.5s2.014 4.5 4.5 4.5c2.484 0 4.5-2.015 4.5-4.5s-2.016-4.5-4.5-4.5zm-.469 6.484l-1.688-1.637.695-.697.992.94 2.115-2.169.697.696-2.811 2.867z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-pin-up.svg b/data/icons/64x64/actions/remmina-pin-up.svg
deleted file mode 100644
index 464635e10..000000000
--- a/data/icons/64x64/actions/remmina-pin-up.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M8 17h2v5l-2 2v-7zm4.462-6.412c.246.625.437 1.39.506 2.412h-7.936c.297-4.36 2.757-4.163 2.757-7.65 0-1.605-.522-2.35-1.272-3.35h4.512c.518-.807 1.207-1.489 2.019-2h-9.048c0 3.656 1.789 2.979 1.789 5.351 0 1.073-.364 1.59-.915 2.373-1.782 2.532-1.874 4.148-1.874 7.276h12c0-1.27-.021-2.287-.159-3.222-.88-.232-1.688-.64-2.379-1.19zm8.538-5.088c0 2.485-2.018 4.5-4.5 4.5-2.484 0-4.5-2.015-4.5-4.5s2.016-4.5 4.5-4.5c2.482 0 4.5 2.015 4.5 4.5zm-2-.5h-5v1h5v-1z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-preferences-system.svg b/data/icons/64x64/actions/remmina-preferences-system.svg
deleted file mode 100644
index 7136a9d6f..000000000
--- a/data/icons/64x64/actions/remmina-preferences-system.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M17 12.645v-2.289c-1.17-.417-1.907-.533-2.28-1.431-.373-.9.07-1.512.6-2.625l-1.618-1.619c-1.105.525-1.723.974-2.626.6-.9-.374-1.017-1.117-1.431-2.281h-2.29c-.412 1.158-.53 1.907-1.431 2.28h-.001c-.9.374-1.51-.07-2.625-.6l-1.617 1.619c.527 1.11.973 1.724.6 2.625-.375.901-1.123 1.019-2.281 1.431v2.289c1.155.412 1.907.531 2.28 1.431.376.908-.081 1.534-.6 2.625l1.618 1.619c1.107-.525 1.724-.974 2.625-.6h.001c.9.373 1.018 1.118 1.431 2.28h2.289c.412-1.158.53-1.905 1.437-2.282h.001c.894-.372 1.501.071 2.619.602l1.618-1.619c-.525-1.107-.974-1.723-.601-2.625.374-.899 1.126-1.019 2.282-1.43zm-8.5 1.689c-1.564 0-2.833-1.269-2.833-2.834s1.269-2.834 2.833-2.834 2.833 1.269 2.833 2.834-1.269 2.834-2.833 2.834zm15.5 4.205v-1.077c-.55-.196-.897-.251-1.073-.673-.176-.424.033-.711.282-1.236l-.762-.762c-.52.248-.811.458-1.235.283-.424-.175-.479-.525-.674-1.073h-1.076c-.194.545-.25.897-.674 1.073-.424.176-.711-.033-1.235-.283l-.762.762c.248.523.458.812.282 1.236-.176.424-.528.479-1.073.673v1.077c.544.193.897.25 1.073.673.177.427-.038.722-.282 1.236l.762.762c.521-.248.812-.458 1.235-.283.424.175.479.526.674 1.073h1.076c.194-.545.25-.897.676-1.074h.001c.421-.175.706.034 1.232.284l.762-.762c-.247-.521-.458-.812-.282-1.235s.529-.481 1.073-.674zm-4 .794c-.736 0-1.333-.597-1.333-1.333s.597-1.333 1.333-1.333 1.333.597 1.333 1.333-.597 1.333-1.333 1.333z" />
-</svg>
diff --git a/data/icons/64x64/actions/remmina-scale.svg b/data/icons/64x64/actions/remmina-scale.svg
deleted file mode 100644
index 7bb33d89e..000000000
--- a/data/icons/64x64/actions/remmina-scale.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.870721 21.863579"
-   height="82.634003"
-   width="82.660988">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-188.25652,-183.69872)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path9"
-       d="m 190.47716,183.69872 c -1.22052,0 -2.22064,0.95621 -2.22064,2.16377 v 6.9461 h 3.6441 v -5.46576 h 5.46576 v -3.64411 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path11"
-       d="m 202.39744,183.69872 2.57651,2.57678 -3.86503,3.86503 2.57677,2.57652 3.86477,-3.86504 2.57678,2.57678 v -7.73007 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path13"
-       d="m 188.26366,194.63051 v 10.93179 h 10.93179 v -10.93179 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path15"
-       d="m 206.47625,196.45243 v 5.46603 h -5.46602 v 3.64384 h 6.88922 c 1.22052,0 2.22064,-0.9562 2.22064,-2.1635 v -6.94637 z" />
-  </g>
-</svg>
diff --git a/data/icons/64x64/actions/remmina-switch-page.svg b/data/icons/64x64/actions/remmina-switch-page.svg
deleted file mode 100644
index d32a4c45a..000000000
--- a/data/icons/64x64/actions/remmina-switch-page.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 21.863561 21.863569"
-   height="82.633965"
-   width="82.633926">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-186.7473,-190.75869)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path17"
-       d="m 188.20483,190.75869 c 0,0 -0.11113,0.006 -0.26459,0.0341 -0.29765,0.0442 -0.52281,0.15081 -0.68897,0.29607 -0.0323,0.0246 -0.0635,0.0513 -0.0939,0.0799 -0.0286,0.0304 -0.055,0.0616 -0.0796,0.0939 -0.14552,0.16616 -0.25214,0.39132 -0.29607,0.68897 -0.0283,0.15346 -0.0344,0.26459 -0.0344,0.26459 v 17.49081 c 0,1.45759 1.45759,1.45759 1.45759,1.45759 h 8.74554 v -2.91518 h -7.28795 v -10.20287 h 14.57563 v 2.91518 h 2.91518 v -8.74553 c 0,0 -0.006,-0.11113 -0.0341,-0.26459 -0.0452,-0.29765 -0.15028,-0.52281 -0.29607,-0.68897 -0.0249,-0.0323 -0.0521,-0.0635 -0.0796,-0.0939 -0.0307,-0.0286 -0.0619,-0.0553 -0.0939,-0.0799 -0.16642,-0.14526 -0.39158,-0.25189 -0.68897,-0.29607 -0.15452,-0.0281 -0.26485,-0.0341 -0.26485,-0.0341 z m 10.93179,11.66045 c 0,0 -0.0542,0.003 -0.13097,0.0172 -0.1487,0.022 -0.26141,0.0754 -0.34449,0.14817 -0.0161,0.0122 -0.0331,0.0254 -0.0484,0.0397 -0.0146,0.0154 -0.0275,0.0323 -0.0397,0.0484 -0.0728,0.0831 -0.12621,0.19552 -0.14817,0.34448 -0.0146,0.0767 -0.0169,0.13097 -0.0169,0.13097 v 8.74527 c 0,0.72893 0.72867,0.72893 0.72867,0.72893 h 8.74527 c 0,0 0.72893,0 0.72893,-0.72893 v -8.74527 c 0,0 -0.003,-0.0542 -0.0172,-0.13097 -0.0217,-0.14896 -0.0751,-0.26141 -0.14791,-0.34448 -0.0116,-0.0161 -0.0254,-0.0331 -0.04,-0.0484 -0.0145,-0.0143 -0.0323,-0.0275 -0.0484,-0.0397 -0.0831,-0.0728 -0.19579,-0.12621 -0.34448,-0.14817 -0.0773,-0.014 -0.13097,-0.0172 -0.13097,-0.0172 z m 0.72866,4.37277 h 7.28795 v 4.37277 h -7.28795 z" />
-  </g>
-</svg>
diff --git a/data/icons/64x64/actions/remmina-system-run.svg b/data/icons/64x64/actions/remmina-system-run.svg
deleted file mode 100644
index 0b590788b..000000000
--- a/data/icons/64x64/actions/remmina-system-run.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg4"
-   version="1.1"
-   viewBox="0 0 24 24"
-   height="24"
-   width="24">
-  <metadata
-     id="metadata10">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <defs
-     id="defs8" />
-  <path
-     id="path2"
-     d="M4.5.257l3.771 3.771c.409 1.889-2.33 4.66-4.242 4.242l-3.771-3.77c-.172.584-.258 1.188-.258 1.792 0 1.602.607 3.202 1.83 4.426 1.351 1.351 3.164 1.958 4.931 1.821.933-.072 1.852.269 2.514.931l9.662 9.662c.578.578 1.337.868 2.097.868 1.661 0 3.001-1.364 2.966-3.03-.016-.737-.306-1.47-.868-2.033l-9.662-9.663c-.662-.661-1.002-1.581-.931-2.514.137-1.767-.471-3.58-1.82-4.93-1.225-1.224-2.825-1.83-4.428-1.83-.603 0-1.207.086-1.791.257zm17.5 20.743c0 .553-.447 1-1 1-.553 0-1-.448-1-1s.447-1 1-1 1 .447 1 1z" />
-</svg>
diff --git a/data/icons/64x64/emblems/remmina-sftp.svg b/data/icons/64x64/emblems/remmina-sftp.svg
deleted file mode 100644
index 9c96b858d..000000000
--- a/data/icons/64x64/emblems/remmina-sftp.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-235.41273,-151.37414)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path23"
-       d="m 243.17914,172.33905 c 4.26932,4.26906 11.19082,4.26906 15.45987,0 4.26905,-4.26931 4.26905,-11.19081 0,-15.45987 -3.50573,-3.50572 -8.79501,-4.15025 -12.94051,-1.89785 l 2.38099,2.38098 c 2.79797,-1.08796 6.09203,-0.53366 8.35104,1.72535 3.04933,3.04932 3.04933,7.99333 0,11.04265 -3.04932,3.04932 -7.99332,3.04932 -11.04265,0 -1.52585,-1.52559 -2.25345,-3.52319 -2.24313,-5.52132 l 5.54937,-0.006 -6.6257,-6.6257 -6.62543,6.6257 h 4.53337 c 0.006,2.79929 1.06733,5.6007 3.19855,7.73192 z" />
-  </g>
-</svg>
diff --git a/data/icons/64x64/emblems/remmina-ssh.svg b/data/icons/64x64/emblems/remmina-ssh.svg
deleted file mode 100644
index ef8bdf14f..000000000
--- a/data/icons/64x64/emblems/remmina-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <text
-         transform="scale(1.0413034,0.96033492)"
-         id="text4638"
-         y="169.55627"
-         x="173.44473"
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;line-height:247.11486816px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.49422976"
-         xml:space="preserve"><tspan
-           y="169.55627"
-           x="173.44473"
-           style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:14.63316822px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.49422976"
-           id="tspan4642">$_</tspan></text>
-    </g>
-  </g>
-</svg>
diff --git a/data/icons/CMakeLists.txt b/data/icons/CMakeLists.txt
index fa317ff21..b930e7476 100644
--- a/data/icons/CMakeLists.txt
+++ b/data/icons/CMakeLists.txt
@@ -32,157 +32,33 @@
 # files in the program, then also delete it here.
 
 
-set(APPICON16_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/actions")
-set(APPICON22_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/actions")
-set(APPICON24_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/24x24/actions")
-set(APPICON32_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/32x32/actions")
-set(APPICON48_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/48x48/actions")
-set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
-set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")
-set(APPICON24_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/24x24/emblems")
-set(APPICON32_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/32x32/emblems")
-set(APPICON48_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/48x48/emblems")
+set(APPICONSCALE_ACTIONS_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/actions")
+set(APPICONSCALE_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/emblems")
 
-set(APPICON16_ACTIONS_DATA
-    16x16/actions/remmina-camera-photo.svg
-    16x16/actions/remmina-connect.svg
-    16x16/actions/remmina-disconnect.svg
-    16x16/actions/remmina-document-save.svg
-    16x16/actions/remmina-document-send.svg
-    16x16/actions/remmina-dynres.svg
-    16x16/actions/remmina-fit-window.svg
-    16x16/actions/remmina-folder-symbolic.svg
-    16x16/actions/remmina-fullscreen.svg
-    16x16/actions/remmina-go-bottom.svg
-    16x16/actions/remmina-keyboard.svg
-    16x16/actions/remmina-pan-down-symbolic.svg
-    16x16/actions/remmina-pan-up-symbolic.svg
-    16x16/actions/remmina-pin-down.svg
-    16x16/actions/remmina-pin-up.svg
-    16x16/actions/remmina-preferences-system.svg
-    16x16/actions/remmina-scale.svg
-    16x16/actions/remmina-switch-page.svg
-    16x16/actions/remmina-system-run.svg
+set(APPICONSCALE_ACTIONS_DATA
+    scalable/actions/remmina-camera-photo-symbolic.svg
+    scalable/actions/remmina-disconnect-symbolic.svg
+    scalable/actions/remmina-dynres-symbolic.svg
+    scalable/actions/remmina-fit-window-symbolic.svg
+    scalable/actions/remmina-folder-symbolic.svg
+    scalable/actions/remmina-fullscreen-symbolic.svg
+    scalable/actions/remmina-go-bottom-symbolic.svg
+    scalable/actions/remmina-keyboard-symbolic.svg
+    scalable/actions/remmina-pan-down-symbolic.svg
+    scalable/actions/remmina-pan-up-symbolic.svg
+    scalable/actions/remmina-pin-down-symbolic.svg
+    scalable/actions/remmina-pin-up-symbolic.svg
+    scalable/actions/remmina-preferences-system-symbolic.svg
+    scalable/actions/remmina-scale-symbolic.svg
+    scalable/actions/remmina-switch-page-symbolic.svg
+    scalable/actions/remmina-system-run-symbolic.svg
     )
 
-set(APPICON22_ACTIONS_DATA
-    22x22/actions/remmina-camera-photo.svg
-    22x22/actions/remmina-connect.svg
-    22x22/actions/remmina-disconnect.svg
-    22x22/actions/remmina-document-save.svg
-    22x22/actions/remmina-document-send.svg
-    22x22/actions/remmina-dynres.svg
-    22x22/actions/remmina-fit-window.svg
-    22x22/actions/remmina-folder-symbolic.svg
-    22x22/actions/remmina-fullscreen.svg
-    22x22/actions/remmina-go-bottom.svg
-    22x22/actions/remmina-keyboard.svg
-    22x22/actions/remmina-pan-down-symbolic.svg
-    22x22/actions/remmina-pan-up-symbolic.svg
-    22x22/actions/remmina-pin-down.svg
-    22x22/actions/remmina-pin-up.svg
-    22x22/actions/remmina-preferences-system.svg
-    22x22/actions/remmina-scale.svg
-    22x22/actions/remmina-switch-page.svg
-    22x22/actions/remmina-system-run.svg
+set(APPICONSCALE_EMBLEMS_DATA
+    scalable/emblems/remmina-sftp-symbolic.svg
+    scalable/emblems/remmina-ssh-symbolic.svg
     )
 
-set(APPICON24_ACTIONS_DATA
-    24x24/actions/remmina-camera-photo.svg
-    24x24/actions/remmina-connect.svg
-    24x24/actions/remmina-disconnect.svg
-    24x24/actions/remmina-document-save.svg
-    24x24/actions/remmina-document-send.svg
-    24x24/actions/remmina-dynres.svg
-    24x24/actions/remmina-fit-window.svg
-    24x24/actions/remmina-folder-symbolic.svg
-    24x24/actions/remmina-fullscreen.svg
-    24x24/actions/remmina-go-bottom.svg
-    24x24/actions/remmina-keyboard.svg
-    24x24/actions/remmina-pan-down-symbolic.svg
-    24x24/actions/remmina-pan-up-symbolic.svg
-    24x24/actions/remmina-pin-down.svg
-    24x24/actions/remmina-pin-up.svg
-    24x24/actions/remmina-preferences-system.svg
-    24x24/actions/remmina-scale.svg
-    24x24/actions/remmina-switch-page.svg
-    24x24/actions/remmina-system-run.svg
-    )
-
-set(APPICON32_ACTIONS_DATA
-    32x32/actions/remmina-camera-photo.svg
-    32x32/actions/remmina-connect.svg
-    32x32/actions/remmina-disconnect.svg
-    32x32/actions/remmina-document-save.svg
-    32x32/actions/remmina-document-send.svg
-    32x32/actions/remmina-dynres.svg
-    32x32/actions/remmina-fit-window.svg
-    32x32/actions/remmina-folder-symbolic.svg
-    32x32/actions/remmina-fullscreen.svg
-    32x32/actions/remmina-go-bottom.svg
-    32x32/actions/remmina-keyboard.svg
-    32x32/actions/remmina-pan-down-symbolic.svg
-    32x32/actions/remmina-pan-up-symbolic.svg
-    32x32/actions/remmina-pin-down.svg
-    32x32/actions/remmina-pin-up.svg
-    32x32/actions/remmina-preferences-system.svg
-    32x32/actions/remmina-scale.svg
-    32x32/actions/remmina-switch-page.svg
-    32x32/actions/remmina-system-run.svg
-    )
-
-set(APPICON48_ACTIONS_DATA
-    48x48/actions/remmina-camera-photo.svg
-    48x48/actions/remmina-connect.svg
-    48x48/actions/remmina-disconnect.svg
-    48x48/actions/remmina-document-save.svg
-    48x48/actions/remmina-document-send.svg
-    48x48/actions/remmina-dynres.svg
-    48x48/actions/remmina-fit-window.svg
-    48x48/actions/remmina-folder-symbolic.svg
-    48x48/actions/remmina-fullscreen.svg
-    48x48/actions/remmina-go-bottom.svg
-    48x48/actions/remmina-keyboard.svg
-    48x48/actions/remmina-pan-down-symbolic.svg
-    48x48/actions/remmina-pan-up-symbolic.svg
-    48x48/actions/remmina-pin-down.svg
-    48x48/actions/remmina-pin-up.svg
-    48x48/actions/remmina-preferences-system.svg
-    48x48/actions/remmina-scale.svg
-    48x48/actions/remmina-switch-page.svg
-    48x48/actions/remmina-system-run.svg
-    )
-
-set(APPICON16_EMBLEMS_DATA
-    16x16/emblems/remmina-sftp.svg
-    16x16/emblems/remmina-ssh.svg
-    )
-
-set(APPICON22_EMBLEMS_DATA
-    22x22/emblems/remmina-sftp.svg
-    22x22/emblems/remmina-ssh.svg
-    )
-set(APPICON24_EMBLEMS_DATA
-    24x24/emblems/remmina-sftp.svg
-    24x24/emblems/remmina-ssh.svg
-    )
-set(APPICON32_EMBLEMS_DATA
-    32x32/emblems/remmina-sftp.svg
-    32x32/emblems/remmina-ssh.svg
-    )
-set(APPICON48_EMBLEMS_DATA
-    48x48/emblems/remmina-sftp.svg
-    48x48/emblems/remmina-ssh.svg
-    )
-
-install(FILES ${APPICON16_ACTIONS_DATA} DESTINATION ${APPICON16_ACTIONS_DIR})
-install(FILES ${APPICON22_ACTIONS_DATA} DESTINATION ${APPICON22_ACTIONS_DIR})
-install(FILES ${APPICON24_ACTIONS_DATA} DESTINATION ${APPICON24_ACTIONS_DIR})
-install(FILES ${APPICON32_ACTIONS_DATA} DESTINATION ${APPICON32_ACTIONS_DIR})
-install(FILES ${APPICON48_ACTIONS_DATA} DESTINATION ${APPICON48_ACTIONS_DIR})
-install(FILES ${APPICON16_EMBLEMS_DATA} DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES ${APPICON22_EMBLEMS_DATA} DESTINATION ${APPICON22_EMBLEMS_DIR})
-install(FILES ${APPICON24_EMBLEMS_DATA} DESTINATION ${APPICON24_EMBLEMS_DIR})
-install(FILES ${APPICON32_EMBLEMS_DATA} DESTINATION ${APPICON32_EMBLEMS_DIR})
-install(FILES ${APPICON48_EMBLEMS_DATA} DESTINATION ${APPICON48_EMBLEMS_DIR})
+install(FILES ${APPICONSCALE_ACTIONS_DATA} DESTINATION ${APPICONSCALE_ACTIONS_DIR})
+install(FILES ${APPICONSCALE_EMBLEMS_DATA} DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
 
diff --git a/data/icons/scalable/actions/remmina-camera-photo.svg b/data/icons/scalable/actions/remmina-camera-photo-symbolic.svg
index c2a34b9be..c2a34b9be 100644
--- a/data/icons/scalable/actions/remmina-camera-photo.svg
+++ b/data/icons/scalable/actions/remmina-camera-photo-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-connect.svg b/data/icons/scalable/actions/remmina-connect-symbolic.svg
index f0e82b8a7..f0e82b8a7 100644
--- a/data/icons/scalable/actions/remmina-connect.svg
+++ b/data/icons/scalable/actions/remmina-connect-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-disconnect.svg b/data/icons/scalable/actions/remmina-disconnect-symbolic.svg
index 0bd16f48d..0bd16f48d 100644
--- a/data/icons/scalable/actions/remmina-disconnect.svg
+++ b/data/icons/scalable/actions/remmina-disconnect-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-document-save.svg b/data/icons/scalable/actions/remmina-document-save-symbolic.svg
index d383f09a3..d383f09a3 100644
--- a/data/icons/scalable/actions/remmina-document-save.svg
+++ b/data/icons/scalable/actions/remmina-document-save-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-document-send.svg b/data/icons/scalable/actions/remmina-document-send-symbolic.svg
index 8c0134d49..8c0134d49 100644
--- a/data/icons/scalable/actions/remmina-document-send.svg
+++ b/data/icons/scalable/actions/remmina-document-send-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-dynres.svg b/data/icons/scalable/actions/remmina-dynres-symbolic.svg
index 312901b5e..312901b5e 100644
--- a/data/icons/scalable/actions/remmina-dynres.svg
+++ b/data/icons/scalable/actions/remmina-dynres-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-fit-window.svg b/data/icons/scalable/actions/remmina-fit-window-symbolic.svg
index 7277d160a..7277d160a 100644
--- a/data/icons/scalable/actions/remmina-fit-window.svg
+++ b/data/icons/scalable/actions/remmina-fit-window-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-fullscreen.svg b/data/icons/scalable/actions/remmina-fullscreen-symbolic.svg
index 7c35ca1de..7c35ca1de 100644
--- a/data/icons/scalable/actions/remmina-fullscreen.svg
+++ b/data/icons/scalable/actions/remmina-fullscreen-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-go-bottom.svg b/data/icons/scalable/actions/remmina-go-bottom-symbolic.svg
index 001a65928..001a65928 100644
--- a/data/icons/scalable/actions/remmina-go-bottom.svg
+++ b/data/icons/scalable/actions/remmina-go-bottom-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-keyboard.svg b/data/icons/scalable/actions/remmina-keyboard-symbolic.svg
index e553684f2..e553684f2 100644
--- a/data/icons/scalable/actions/remmina-keyboard.svg
+++ b/data/icons/scalable/actions/remmina-keyboard-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-pin-down.svg b/data/icons/scalable/actions/remmina-pin-down-symbolic.svg
index 9a86b829d..9a86b829d 100644
--- a/data/icons/scalable/actions/remmina-pin-down.svg
+++ b/data/icons/scalable/actions/remmina-pin-down-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-pin-up.svg b/data/icons/scalable/actions/remmina-pin-up-symbolic.svg
index 205132d61..205132d61 100644
--- a/data/icons/scalable/actions/remmina-pin-up.svg
+++ b/data/icons/scalable/actions/remmina-pin-up-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-preferences-system.svg b/data/icons/scalable/actions/remmina-preferences-system-symbolic.svg
index f95948c39..f95948c39 100644
--- a/data/icons/scalable/actions/remmina-preferences-system.svg
+++ b/data/icons/scalable/actions/remmina-preferences-system-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-scale.svg b/data/icons/scalable/actions/remmina-scale-symbolic.svg
index 18efc707c..18efc707c 100644
--- a/data/icons/scalable/actions/remmina-scale.svg
+++ b/data/icons/scalable/actions/remmina-scale-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-switch-page.svg b/data/icons/scalable/actions/remmina-switch-page-symbolic.svg
index 884620b76..884620b76 100644
--- a/data/icons/scalable/actions/remmina-switch-page.svg
+++ b/data/icons/scalable/actions/remmina-switch-page-symbolic.svg
diff --git a/data/icons/scalable/actions/remmina-system-run.svg b/data/icons/scalable/actions/remmina-system-run-symbolic.svg
index cde2ebc5f..cde2ebc5f 100644
--- a/data/icons/scalable/actions/remmina-system-run.svg
+++ b/data/icons/scalable/actions/remmina-system-run-symbolic.svg
diff --git a/data/icons/scalable/emblems/remmina-sftp.svg b/data/icons/scalable/emblems/remmina-sftp-symbolic.svg
index 0ec5645a6..0ec5645a6 100644
--- a/data/icons/scalable/emblems/remmina-sftp.svg
+++ b/data/icons/scalable/emblems/remmina-sftp-symbolic.svg
diff --git a/data/icons/scalable/emblems/remmina-ssh.svg b/data/icons/scalable/emblems/remmina-ssh-symbolic.svg
index d18a470cc..d18a470cc 100644
--- a/data/icons/scalable/emblems/remmina-ssh.svg
+++ b/data/icons/scalable/emblems/remmina-ssh-symbolic.svg
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index 284f5e976..45a2f6e66 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -41,8 +41,7 @@ set(FREERDP_REQUIRED_VERSIONSTRING
 
 include_directories(${CMAKE_SOURCE_DIR}/plugins)
 
-set(APPICON16_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/16x16/emblems")
-set(APPICON22_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/22x22/emblems")
+set(APPICONSCALE_EMBLEMS_DIR "${REMMINA_DATADIR}/icons/hicolor/scalable/emblems")
 
 set(REMMINA_COMMON_INCLUDE_DIRS ${GTK_INCLUDE_DIRS})
 set(REMMINA_COMMON_LIBRARIES ${GTK_LIBRARIES} ${CMAKE_THREAD_LIBS_INIT})
diff --git a/plugins/exec/16x16/emblems/remmina-tool.png b/plugins/exec/16x16/emblems/remmina-tool.png
deleted file mode 100644
index 495409779..000000000
--- a/plugins/exec/16x16/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/exec/16x16/emblems/remmina-tool.svg b/plugins/exec/16x16/emblems/remmina-tool.svg
deleted file mode 100644
index ef6526e0f..000000000
--- a/plugins/exec/16x16/emblems/remmina-tool.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.649359"
-   height="100.72199"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-171.36866,-165.16877)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path32"
-       d="m 189.51722,165.16877 v 0.22886 l -8.68441,11.84222 c 0.25135,0.073 0.49873,0.15902 0.74109,0.25797 -0.86016,-0.34845 -1.79599,-0.55112 -2.78077,-0.55112 -1.9685,0 -3.85524,0.78554 -5.24616,2.17831 -0.39237,0.39291 -0.73924,0.82841 -1.03452,1.29858 l 3.4544,3.4544 -2.30399,3.14192 c 0.55113,1.06389 1.41949,1.92987 2.48444,2.47809 l 3.13875,-2.30082 3.45758,3.45758 c 0.46937,-0.29634 0.90381,-0.64426 1.2954,-1.03743 1.39276,-1.39092 2.17646,-3.27793 2.17831,-5.24616 0,-0.95885 -0.19738,-1.86875 -0.52837,-2.71013 0.09,0.21855 0.1696,0.44106 0.23839,0.66702 l 11.83931,-8.90985 z m -13.34082,0.37068 -4.66592,4.6691 6.0579,6.05499 4.66619,-4.66593 z m 15.39029,15.39028 -4.6662,4.66911 6.05817,6.05816 4.66619,-4.66937 z m -18.96401,7.42421 -1.23402,1.81425 1.64968,1.64994 1.68222,-1.23428 c -0.83318,-0.55086 -1.54676,-1.26444 -2.09788,-2.09762 z" />
-  </g>
-</svg>
diff --git a/plugins/exec/22x22/emblems/remmina-tool.png b/plugins/exec/22x22/emblems/remmina-tool.png
deleted file mode 100644
index 885974a9f..000000000
--- a/plugins/exec/22x22/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/exec/22x22/emblems/remmina-tool.svg b/plugins/exec/22x22/emblems/remmina-tool.svg
deleted file mode 100644
index ef6526e0f..000000000
--- a/plugins/exec/22x22/emblems/remmina-tool.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.649359"
-   height="100.72199"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-171.36866,-165.16877)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path32"
-       d="m 189.51722,165.16877 v 0.22886 l -8.68441,11.84222 c 0.25135,0.073 0.49873,0.15902 0.74109,0.25797 -0.86016,-0.34845 -1.79599,-0.55112 -2.78077,-0.55112 -1.9685,0 -3.85524,0.78554 -5.24616,2.17831 -0.39237,0.39291 -0.73924,0.82841 -1.03452,1.29858 l 3.4544,3.4544 -2.30399,3.14192 c 0.55113,1.06389 1.41949,1.92987 2.48444,2.47809 l 3.13875,-2.30082 3.45758,3.45758 c 0.46937,-0.29634 0.90381,-0.64426 1.2954,-1.03743 1.39276,-1.39092 2.17646,-3.27793 2.17831,-5.24616 0,-0.95885 -0.19738,-1.86875 -0.52837,-2.71013 0.09,0.21855 0.1696,0.44106 0.23839,0.66702 l 11.83931,-8.90985 z m -13.34082,0.37068 -4.66592,4.6691 6.0579,6.05499 4.66619,-4.66593 z m 15.39029,15.39028 -4.6662,4.66911 6.05817,6.05816 4.66619,-4.66937 z m -18.96401,7.42421 -1.23402,1.81425 1.64968,1.64994 1.68222,-1.23428 c -0.83318,-0.55086 -1.54676,-1.26444 -2.09788,-2.09762 z" />
-  </g>
-</svg>
diff --git a/plugins/exec/24x24/emblems/remmina-tool.png b/plugins/exec/24x24/emblems/remmina-tool.png
deleted file mode 100644
index 7bf63f082..000000000
--- a/plugins/exec/24x24/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/exec/24x24/emblems/remmina-tool.svg b/plugins/exec/24x24/emblems/remmina-tool.svg
deleted file mode 100644
index ef6526e0f..000000000
--- a/plugins/exec/24x24/emblems/remmina-tool.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.649359"
-   height="100.72199"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-171.36866,-165.16877)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path32"
-       d="m 189.51722,165.16877 v 0.22886 l -8.68441,11.84222 c 0.25135,0.073 0.49873,0.15902 0.74109,0.25797 -0.86016,-0.34845 -1.79599,-0.55112 -2.78077,-0.55112 -1.9685,0 -3.85524,0.78554 -5.24616,2.17831 -0.39237,0.39291 -0.73924,0.82841 -1.03452,1.29858 l 3.4544,3.4544 -2.30399,3.14192 c 0.55113,1.06389 1.41949,1.92987 2.48444,2.47809 l 3.13875,-2.30082 3.45758,3.45758 c 0.46937,-0.29634 0.90381,-0.64426 1.2954,-1.03743 1.39276,-1.39092 2.17646,-3.27793 2.17831,-5.24616 0,-0.95885 -0.19738,-1.86875 -0.52837,-2.71013 0.09,0.21855 0.1696,0.44106 0.23839,0.66702 l 11.83931,-8.90985 z m -13.34082,0.37068 -4.66592,4.6691 6.0579,6.05499 4.66619,-4.66593 z m 15.39029,15.39028 -4.6662,4.66911 6.05817,6.05816 4.66619,-4.66937 z m -18.96401,7.42421 -1.23402,1.81425 1.64968,1.64994 1.68222,-1.23428 c -0.83318,-0.55086 -1.54676,-1.26444 -2.09788,-2.09762 z" />
-  </g>
-</svg>
diff --git a/plugins/exec/32x32/emblems/remmina-tool.png b/plugins/exec/32x32/emblems/remmina-tool.png
deleted file mode 100644
index 740c44e7e..000000000
--- a/plugins/exec/32x32/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/exec/32x32/emblems/remmina-tool.svg b/plugins/exec/32x32/emblems/remmina-tool.svg
deleted file mode 100644
index ef6526e0f..000000000
--- a/plugins/exec/32x32/emblems/remmina-tool.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.649359"
-   height="100.72199"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-171.36866,-165.16877)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path32"
-       d="m 189.51722,165.16877 v 0.22886 l -8.68441,11.84222 c 0.25135,0.073 0.49873,0.15902 0.74109,0.25797 -0.86016,-0.34845 -1.79599,-0.55112 -2.78077,-0.55112 -1.9685,0 -3.85524,0.78554 -5.24616,2.17831 -0.39237,0.39291 -0.73924,0.82841 -1.03452,1.29858 l 3.4544,3.4544 -2.30399,3.14192 c 0.55113,1.06389 1.41949,1.92987 2.48444,2.47809 l 3.13875,-2.30082 3.45758,3.45758 c 0.46937,-0.29634 0.90381,-0.64426 1.2954,-1.03743 1.39276,-1.39092 2.17646,-3.27793 2.17831,-5.24616 0,-0.95885 -0.19738,-1.86875 -0.52837,-2.71013 0.09,0.21855 0.1696,0.44106 0.23839,0.66702 l 11.83931,-8.90985 z m -13.34082,0.37068 -4.66592,4.6691 6.0579,6.05499 4.66619,-4.66593 z m 15.39029,15.39028 -4.6662,4.66911 6.05817,6.05816 4.66619,-4.66937 z m -18.96401,7.42421 -1.23402,1.81425 1.64968,1.64994 1.68222,-1.23428 c -0.83318,-0.55086 -1.54676,-1.26444 -2.09788,-2.09762 z" />
-  </g>
-</svg>
diff --git a/plugins/exec/48x48/emblems/remmina-tool.png b/plugins/exec/48x48/emblems/remmina-tool.png
deleted file mode 100644
index d422e0799..000000000
--- a/plugins/exec/48x48/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/exec/48x48/emblems/remmina-tool.svg b/plugins/exec/48x48/emblems/remmina-tool.svg
deleted file mode 100644
index ef6526e0f..000000000
--- a/plugins/exec/48x48/emblems/remmina-tool.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.649359"
-   height="100.72199"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-171.36866,-165.16877)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path32"
-       d="m 189.51722,165.16877 v 0.22886 l -8.68441,11.84222 c 0.25135,0.073 0.49873,0.15902 0.74109,0.25797 -0.86016,-0.34845 -1.79599,-0.55112 -2.78077,-0.55112 -1.9685,0 -3.85524,0.78554 -5.24616,2.17831 -0.39237,0.39291 -0.73924,0.82841 -1.03452,1.29858 l 3.4544,3.4544 -2.30399,3.14192 c 0.55113,1.06389 1.41949,1.92987 2.48444,2.47809 l 3.13875,-2.30082 3.45758,3.45758 c 0.46937,-0.29634 0.90381,-0.64426 1.2954,-1.03743 1.39276,-1.39092 2.17646,-3.27793 2.17831,-5.24616 0,-0.95885 -0.19738,-1.86875 -0.52837,-2.71013 0.09,0.21855 0.1696,0.44106 0.23839,0.66702 l 11.83931,-8.90985 z m -13.34082,0.37068 -4.66592,4.6691 6.0579,6.05499 4.66619,-4.66593 z m 15.39029,15.39028 -4.6662,4.66911 6.05817,6.05816 4.66619,-4.66937 z m -18.96401,7.42421 -1.23402,1.81425 1.64968,1.64994 1.68222,-1.23428 c -0.83318,-0.55086 -1.54676,-1.26444 -2.09788,-2.09762 z" />
-  </g>
-</svg>
diff --git a/plugins/exec/64x64/emblems/remmina-tool.png b/plugins/exec/64x64/emblems/remmina-tool.png
deleted file mode 100644
index c82d44f82..000000000
--- a/plugins/exec/64x64/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/exec/64x64/emblems/remmina-tool.svg b/plugins/exec/64x64/emblems/remmina-tool.svg
deleted file mode 100644
index ef6526e0f..000000000
--- a/plugins/exec/64x64/emblems/remmina-tool.svg
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.649359"
-   height="100.72199"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-171.36866,-165.16877)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path32"
-       d="m 189.51722,165.16877 v 0.22886 l -8.68441,11.84222 c 0.25135,0.073 0.49873,0.15902 0.74109,0.25797 -0.86016,-0.34845 -1.79599,-0.55112 -2.78077,-0.55112 -1.9685,0 -3.85524,0.78554 -5.24616,2.17831 -0.39237,0.39291 -0.73924,0.82841 -1.03452,1.29858 l 3.4544,3.4544 -2.30399,3.14192 c 0.55113,1.06389 1.41949,1.92987 2.48444,2.47809 l 3.13875,-2.30082 3.45758,3.45758 c 0.46937,-0.29634 0.90381,-0.64426 1.2954,-1.03743 1.39276,-1.39092 2.17646,-3.27793 2.17831,-5.24616 0,-0.95885 -0.19738,-1.86875 -0.52837,-2.71013 0.09,0.21855 0.1696,0.44106 0.23839,0.66702 l 11.83931,-8.90985 z m -13.34082,0.37068 -4.66592,4.6691 6.0579,6.05499 4.66619,-4.66593 z m 15.39029,15.39028 -4.6662,4.66911 6.05817,6.05816 4.66619,-4.66937 z m -18.96401,7.42421 -1.23402,1.81425 1.64968,1.64994 1.68222,-1.23428 c -0.83318,-0.55086 -1.54676,-1.26444 -2.09788,-2.09762 z" />
-  </g>
-</svg>
diff --git a/plugins/exec/CMakeLists.txt b/plugins/exec/CMakeLists.txt
index 13e24f43b..b5f283fac 100644
--- a/plugins/exec/CMakeLists.txt
+++ b/plugins/exec/CMakeLists.txt
@@ -47,8 +47,5 @@ target_link_libraries(remmina-plugin-exec ${REMMINA_COMMON_LIBRARIES})
 install(TARGETS remmina-plugin-exec DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    16x16/emblems/remmina-tool.svg
-    DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES
-    22x22/emblems/remmina-tool.svg
-    DESTINATION ${APPICON22_EMBLEMS_DIR})
+    scalable/emblems/remmina-tool-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/exec/exec_plugin_config.h b/plugins/exec/exec_plugin_config.h
index 758e0ded2..aaba1d1b8 100644
--- a/plugins/exec/exec_plugin_config.h
+++ b/plugins/exec/exec_plugin_config.h
@@ -40,4 +40,4 @@
 #define PLUGIN_NAME        "EXEC"
 #define PLUGIN_DESCRIPTION "Execute a command"
 #define PLUGIN_VERSION     "1.0"
-#define PLUGIN_APPICON     "remmina-tool"
+#define PLUGIN_APPICON     "remmina-tool-symbolic"
diff --git a/plugins/exec/scalable/emblems/remmina-tool.svg b/plugins/exec/scalable/emblems/remmina-tool-symbolic.svg
index e5225de58..e5225de58 100644
--- a/plugins/exec/scalable/emblems/remmina-tool.svg
+++ b/plugins/exec/scalable/emblems/remmina-tool-symbolic.svg
diff --git a/plugins/nx/16x16/emblems/remmina-nx.svg b/plugins/nx/16x16/emblems/remmina-nx.svg
deleted file mode 100644
index af290e9dc..000000000
--- a/plugins/nx/16x16/emblems/remmina-nx.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.52732,-168.29729)"
-     id="layer1">
-    <g
-       transform="translate(0.02606175,-4.0269583)"
-       id="g822">
-      <path
-         d="m 190.52732,192.75511 v -2.00025 h 2.00052 2.00025 v 2.00025 2.00051 h -2.00025 -2.00052 z"
-         id="path25"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 197.72902,185.55341 v -9.2022 h 9.60225 9.60226 v 9.2022 9.20221 h -2.00025 -2.00051 v -7.20169 -7.20169 h -1.60047 -1.60046 v 7.20169 7.20169 h -2.40057 -2.40056 v -7.20169 -7.20169 h -1.20015 -1.20042 v 7.20169 7.20169 h -2.40056 -2.40056 z"
-         id="path27"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 190.52732,182.7528 v -6.40159 h 2.00052 2.00025 v 6.40159 2.9972 3.40439 h -2.00025 -2.00052 z"
-         id="path29"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/nx/22x22/emblems/remmina-nx.svg b/plugins/nx/22x22/emblems/remmina-nx.svg
deleted file mode 100644
index af290e9dc..000000000
--- a/plugins/nx/22x22/emblems/remmina-nx.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.52732,-168.29729)"
-     id="layer1">
-    <g
-       transform="translate(0.02606175,-4.0269583)"
-       id="g822">
-      <path
-         d="m 190.52732,192.75511 v -2.00025 h 2.00052 2.00025 v 2.00025 2.00051 h -2.00025 -2.00052 z"
-         id="path25"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 197.72902,185.55341 v -9.2022 h 9.60225 9.60226 v 9.2022 9.20221 h -2.00025 -2.00051 v -7.20169 -7.20169 h -1.60047 -1.60046 v 7.20169 7.20169 h -2.40057 -2.40056 v -7.20169 -7.20169 h -1.20015 -1.20042 v 7.20169 7.20169 h -2.40056 -2.40056 z"
-         id="path27"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 190.52732,182.7528 v -6.40159 h 2.00052 2.00025 v 6.40159 2.9972 3.40439 h -2.00025 -2.00052 z"
-         id="path29"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/nx/24x24/emblems/remmina-nx.svg b/plugins/nx/24x24/emblems/remmina-nx.svg
deleted file mode 100644
index af290e9dc..000000000
--- a/plugins/nx/24x24/emblems/remmina-nx.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.52732,-168.29729)"
-     id="layer1">
-    <g
-       transform="translate(0.02606175,-4.0269583)"
-       id="g822">
-      <path
-         d="m 190.52732,192.75511 v -2.00025 h 2.00052 2.00025 v 2.00025 2.00051 h -2.00025 -2.00052 z"
-         id="path25"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 197.72902,185.55341 v -9.2022 h 9.60225 9.60226 v 9.2022 9.20221 h -2.00025 -2.00051 v -7.20169 -7.20169 h -1.60047 -1.60046 v 7.20169 7.20169 h -2.40057 -2.40056 v -7.20169 -7.20169 h -1.20015 -1.20042 v 7.20169 7.20169 h -2.40056 -2.40056 z"
-         id="path27"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 190.52732,182.7528 v -6.40159 h 2.00052 2.00025 v 6.40159 2.9972 3.40439 h -2.00025 -2.00052 z"
-         id="path29"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/nx/32x32/emblems/remmina-nx.svg b/plugins/nx/32x32/emblems/remmina-nx.svg
deleted file mode 100644
index af290e9dc..000000000
--- a/plugins/nx/32x32/emblems/remmina-nx.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.52732,-168.29729)"
-     id="layer1">
-    <g
-       transform="translate(0.02606175,-4.0269583)"
-       id="g822">
-      <path
-         d="m 190.52732,192.75511 v -2.00025 h 2.00052 2.00025 v 2.00025 2.00051 h -2.00025 -2.00052 z"
-         id="path25"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 197.72902,185.55341 v -9.2022 h 9.60225 9.60226 v 9.2022 9.20221 h -2.00025 -2.00051 v -7.20169 -7.20169 h -1.60047 -1.60046 v 7.20169 7.20169 h -2.40057 -2.40056 v -7.20169 -7.20169 h -1.20015 -1.20042 v 7.20169 7.20169 h -2.40056 -2.40056 z"
-         id="path27"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 190.52732,182.7528 v -6.40159 h 2.00052 2.00025 v 6.40159 2.9972 3.40439 h -2.00025 -2.00052 z"
-         id="path29"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/nx/48x48/emblems/remmina-nx.svg b/plugins/nx/48x48/emblems/remmina-nx.svg
deleted file mode 100644
index af290e9dc..000000000
--- a/plugins/nx/48x48/emblems/remmina-nx.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.52732,-168.29729)"
-     id="layer1">
-    <g
-       transform="translate(0.02606175,-4.0269583)"
-       id="g822">
-      <path
-         d="m 190.52732,192.75511 v -2.00025 h 2.00052 2.00025 v 2.00025 2.00051 h -2.00025 -2.00052 z"
-         id="path25"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 197.72902,185.55341 v -9.2022 h 9.60225 9.60226 v 9.2022 9.20221 h -2.00025 -2.00051 v -7.20169 -7.20169 h -1.60047 -1.60046 v 7.20169 7.20169 h -2.40057 -2.40056 v -7.20169 -7.20169 h -1.20015 -1.20042 v 7.20169 7.20169 h -2.40056 -2.40056 z"
-         id="path27"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 190.52732,182.7528 v -6.40159 h 2.00052 2.00025 v 6.40159 2.9972 3.40439 h -2.00025 -2.00052 z"
-         id="path29"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/nx/64x64/emblems/remmina-nx.svg b/plugins/nx/64x64/emblems/remmina-nx.svg
deleted file mode 100644
index af290e9dc..000000000
--- a/plugins/nx/64x64/emblems/remmina-nx.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.52732,-168.29729)"
-     id="layer1">
-    <g
-       transform="translate(0.02606175,-4.0269583)"
-       id="g822">
-      <path
-         d="m 190.52732,192.75511 v -2.00025 h 2.00052 2.00025 v 2.00025 2.00051 h -2.00025 -2.00052 z"
-         id="path25"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 197.72902,185.55341 v -9.2022 h 9.60225 9.60226 v 9.2022 9.20221 h -2.00025 -2.00051 v -7.20169 -7.20169 h -1.60047 -1.60046 v 7.20169 7.20169 h -2.40057 -2.40056 v -7.20169 -7.20169 h -1.20015 -1.20042 v 7.20169 7.20169 h -2.40056 -2.40056 z"
-         id="path27"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-      <path
-         d="m 190.52732,182.7528 v -6.40159 h 2.00052 2.00025 v 6.40159 2.9972 3.40439 h -2.00025 -2.00052 z"
-         id="path29"
-         style="isolation:isolate;fill:#171717;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/nx/CMakeLists.txt b/plugins/nx/CMakeLists.txt
index 0c33aaba1..7d073a3a5 100644
--- a/plugins/nx/CMakeLists.txt
+++ b/plugins/nx/CMakeLists.txt
@@ -58,8 +58,5 @@ target_link_libraries(remmina-plugin-nx
 install(TARGETS remmina-plugin-nx DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    16x16/emblems/remmina-nx.svg
-    DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES
-    22x22/emblems/remmina-nx.svg
-    DESTINATION ${APPICON22_EMBLEMS_DIR})
+    scalable/emblems/remmina-nx-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/nx/nx_plugin.c b/plugins/nx/nx_plugin.c
index 0155d1487..f4af62963 100644
--- a/plugins/nx/nx_plugin.c
+++ b/plugins/nx/nx_plugin.c
@@ -736,8 +736,8 @@ static RemminaProtocolPlugin remmina_plugin_nx =
 	N_("NX - NX Technology"),                       // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	VERSION,                                        // Version number
-	"remmina-nx",                                   // Icon for normal connection
-	"remmina-nx",                                   // Icon for SSH connection
+	"remmina-nx-symbolic",                          // Icon for normal connection
+	"remmina-nx-symbolic",                          // Icon for SSH connection
 	remmina_plugin_nx_basic_settings,               // Array for basic settings
 	remmina_plugin_nx_advanced_settings,            // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            // SSH settings type
diff --git a/plugins/nx/scalable/emblems/remmina-nx.svg b/plugins/nx/scalable/emblems/remmina-nx-symbolic.svg
index a6c7bd1e6..a6c7bd1e6 100644
--- a/plugins/nx/scalable/emblems/remmina-nx.svg
+++ b/plugins/nx/scalable/emblems/remmina-nx-symbolic.svg
diff --git a/plugins/rdp/16x16/emblems/remmina-rdp-ssh.svg b/plugins/rdp/16x16/emblems/remmina-rdp-ssh.svg
deleted file mode 100644
index 838f9c0a3..000000000
--- a/plugins/rdp/16x16/emblems/remmina-rdp-ssh.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <path
-         d="m 191.49748,160.50133 0.99192,0.99192 0.99166,0.99166 c 0.44397,0.44424 0.44397,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99193,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99193,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m 4.91754,-4.44156 0.99193,0.99192 0.99166,0.99166 c 0.44423,0.44424 0.44423,1.16496 0,1.6092 l -0.99166,0.99165 -0.99193,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m -4.98766,-4.34763 0.98796,0.98795 0.98795,0.98795 c 0.44635,0.44609 0.44635,1.17052 0,1.61661 l -0.98795,0.98822 -0.98796,0.98795 c -0.44608,0.44609 -1.17051,0.44609 -1.6166,0 l -0.98822,-0.98795 -0.98795,-0.98822 c -0.44609,-0.44609 -0.44609,-1.17052 0,-1.61661 l 0.98795,-0.98795 0.98822,-0.98795 c 0.44609,-0.44636 1.17052,-0.44636 1.6166,0 z m -4.91913,4.34763 0.99192,0.99192 0.99166,0.99166 c 0.44424,0.44424 0.44424,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99193,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99193,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z"
-         id="path81"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/16x16/emblems/remmina-rdp.svg b/plugins/rdp/16x16/emblems/remmina-rdp.svg
deleted file mode 100644
index a234dfce9..000000000
--- a/plugins/rdp/16x16/emblems/remmina-rdp.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(0.20117925,-0.3392995)"
-       id="g831">
-      <path
-         d="m 198.46707,202.16094 1.37716,1.37742 1.37742,1.37742 c 0.44661,0.44635 0.44661,1.17131 0,1.61793 l -1.37742,1.37742 -1.37716,1.37742 c -0.44662,0.44635 -1.17157,0.44635 -1.61793,0 l -1.37742,-1.37742 -1.37742,-1.37742 c -0.44662,-0.44662 -0.44662,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37742,-1.37742 c 0.44636,-0.44635 1.17131,-0.44635 1.61793,0 z"
-         id="path71"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,197.21164 1.37742,1.37743 1.37742,1.37742 c 0.44662,0.44661 0.44662,1.17131 0,1.61792 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44636 -1.17131,0.44636 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44661 -0.44661,-1.17131 0,-1.61792 l 1.37742,-1.37742 1.37716,-1.37743 c 0.44662,-0.44635 1.17158,-0.44635 1.61793,0 z"
-         id="path73"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 210.43179,202.16094 1.37742,1.37742 1.37742,1.37742 c 0.44636,0.44635 0.44636,1.17131 0,1.61793 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44635 -1.17131,0.44635 -1.61792,0 l -1.37743,-1.37742 -1.37742,-1.37742 c -0.44635,-0.44662 -0.44635,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37743,-1.37742 c 0.44661,-0.44635 1.17157,-0.44635 1.61792,0 z"
-         id="path75"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,207.56691 1.37742,1.37742 1.37742,1.37742 c 0.44662,0.44635 0.44662,1.17131 0,1.61766 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44662 -1.17131,0.44662 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44635 -0.44661,-1.17131 0,-1.61766 l 1.37742,-1.37742 1.37716,-1.37742 c 0.44662,-0.44662 1.17158,-0.44662 1.61793,0 z"
-         id="path77"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/22x22/emblems/remmina-rdp-ssh.svg b/plugins/rdp/22x22/emblems/remmina-rdp-ssh.svg
deleted file mode 100644
index 838f9c0a3..000000000
--- a/plugins/rdp/22x22/emblems/remmina-rdp-ssh.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <path
-         d="m 191.49748,160.50133 0.99192,0.99192 0.99166,0.99166 c 0.44397,0.44424 0.44397,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99193,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99193,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m 4.91754,-4.44156 0.99193,0.99192 0.99166,0.99166 c 0.44423,0.44424 0.44423,1.16496 0,1.6092 l -0.99166,0.99165 -0.99193,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m -4.98766,-4.34763 0.98796,0.98795 0.98795,0.98795 c 0.44635,0.44609 0.44635,1.17052 0,1.61661 l -0.98795,0.98822 -0.98796,0.98795 c -0.44608,0.44609 -1.17051,0.44609 -1.6166,0 l -0.98822,-0.98795 -0.98795,-0.98822 c -0.44609,-0.44609 -0.44609,-1.17052 0,-1.61661 l 0.98795,-0.98795 0.98822,-0.98795 c 0.44609,-0.44636 1.17052,-0.44636 1.6166,0 z m -4.91913,4.34763 0.99192,0.99192 0.99166,0.99166 c 0.44424,0.44424 0.44424,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99193,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99193,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z"
-         id="path81"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/22x22/emblems/remmina-rdp.svg b/plugins/rdp/22x22/emblems/remmina-rdp.svg
deleted file mode 100644
index a234dfce9..000000000
--- a/plugins/rdp/22x22/emblems/remmina-rdp.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(0.20117925,-0.3392995)"
-       id="g831">
-      <path
-         d="m 198.46707,202.16094 1.37716,1.37742 1.37742,1.37742 c 0.44661,0.44635 0.44661,1.17131 0,1.61793 l -1.37742,1.37742 -1.37716,1.37742 c -0.44662,0.44635 -1.17157,0.44635 -1.61793,0 l -1.37742,-1.37742 -1.37742,-1.37742 c -0.44662,-0.44662 -0.44662,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37742,-1.37742 c 0.44636,-0.44635 1.17131,-0.44635 1.61793,0 z"
-         id="path71"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,197.21164 1.37742,1.37743 1.37742,1.37742 c 0.44662,0.44661 0.44662,1.17131 0,1.61792 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44636 -1.17131,0.44636 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44661 -0.44661,-1.17131 0,-1.61792 l 1.37742,-1.37742 1.37716,-1.37743 c 0.44662,-0.44635 1.17158,-0.44635 1.61793,0 z"
-         id="path73"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 210.43179,202.16094 1.37742,1.37742 1.37742,1.37742 c 0.44636,0.44635 0.44636,1.17131 0,1.61793 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44635 -1.17131,0.44635 -1.61792,0 l -1.37743,-1.37742 -1.37742,-1.37742 c -0.44635,-0.44662 -0.44635,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37743,-1.37742 c 0.44661,-0.44635 1.17157,-0.44635 1.61792,0 z"
-         id="path75"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,207.56691 1.37742,1.37742 1.37742,1.37742 c 0.44662,0.44635 0.44662,1.17131 0,1.61766 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44662 -1.17131,0.44662 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44635 -0.44661,-1.17131 0,-1.61766 l 1.37742,-1.37742 1.37716,-1.37742 c 0.44662,-0.44662 1.17158,-0.44662 1.61793,0 z"
-         id="path77"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/24x24/emblems/remmina-rdp-ssh.svg b/plugins/rdp/24x24/emblems/remmina-rdp-ssh.svg
deleted file mode 100644
index 838f9c0a3..000000000
--- a/plugins/rdp/24x24/emblems/remmina-rdp-ssh.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <path
-         d="m 191.49748,160.50133 0.99192,0.99192 0.99166,0.99166 c 0.44397,0.44424 0.44397,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99193,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99193,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m 4.91754,-4.44156 0.99193,0.99192 0.99166,0.99166 c 0.44423,0.44424 0.44423,1.16496 0,1.6092 l -0.99166,0.99165 -0.99193,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m -4.98766,-4.34763 0.98796,0.98795 0.98795,0.98795 c 0.44635,0.44609 0.44635,1.17052 0,1.61661 l -0.98795,0.98822 -0.98796,0.98795 c -0.44608,0.44609 -1.17051,0.44609 -1.6166,0 l -0.98822,-0.98795 -0.98795,-0.98822 c -0.44609,-0.44609 -0.44609,-1.17052 0,-1.61661 l 0.98795,-0.98795 0.98822,-0.98795 c 0.44609,-0.44636 1.17052,-0.44636 1.6166,0 z m -4.91913,4.34763 0.99192,0.99192 0.99166,0.99166 c 0.44424,0.44424 0.44424,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99193,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99193,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z"
-         id="path81"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/24x24/emblems/remmina-rdp.svg b/plugins/rdp/24x24/emblems/remmina-rdp.svg
deleted file mode 100644
index a234dfce9..000000000
--- a/plugins/rdp/24x24/emblems/remmina-rdp.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(0.20117925,-0.3392995)"
-       id="g831">
-      <path
-         d="m 198.46707,202.16094 1.37716,1.37742 1.37742,1.37742 c 0.44661,0.44635 0.44661,1.17131 0,1.61793 l -1.37742,1.37742 -1.37716,1.37742 c -0.44662,0.44635 -1.17157,0.44635 -1.61793,0 l -1.37742,-1.37742 -1.37742,-1.37742 c -0.44662,-0.44662 -0.44662,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37742,-1.37742 c 0.44636,-0.44635 1.17131,-0.44635 1.61793,0 z"
-         id="path71"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,197.21164 1.37742,1.37743 1.37742,1.37742 c 0.44662,0.44661 0.44662,1.17131 0,1.61792 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44636 -1.17131,0.44636 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44661 -0.44661,-1.17131 0,-1.61792 l 1.37742,-1.37742 1.37716,-1.37743 c 0.44662,-0.44635 1.17158,-0.44635 1.61793,0 z"
-         id="path73"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 210.43179,202.16094 1.37742,1.37742 1.37742,1.37742 c 0.44636,0.44635 0.44636,1.17131 0,1.61793 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44635 -1.17131,0.44635 -1.61792,0 l -1.37743,-1.37742 -1.37742,-1.37742 c -0.44635,-0.44662 -0.44635,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37743,-1.37742 c 0.44661,-0.44635 1.17157,-0.44635 1.61792,0 z"
-         id="path75"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,207.56691 1.37742,1.37742 1.37742,1.37742 c 0.44662,0.44635 0.44662,1.17131 0,1.61766 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44662 -1.17131,0.44662 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44635 -0.44661,-1.17131 0,-1.61766 l 1.37742,-1.37742 1.37716,-1.37742 c 0.44662,-0.44662 1.17158,-0.44662 1.61793,0 z"
-         id="path77"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/32x32/emblems/remmina-rdp-ssh.svg b/plugins/rdp/32x32/emblems/remmina-rdp-ssh.svg
deleted file mode 100644
index 838f9c0a3..000000000
--- a/plugins/rdp/32x32/emblems/remmina-rdp-ssh.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <path
-         d="m 191.49748,160.50133 0.99192,0.99192 0.99166,0.99166 c 0.44397,0.44424 0.44397,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99193,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99193,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m 4.91754,-4.44156 0.99193,0.99192 0.99166,0.99166 c 0.44423,0.44424 0.44423,1.16496 0,1.6092 l -0.99166,0.99165 -0.99193,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m -4.98766,-4.34763 0.98796,0.98795 0.98795,0.98795 c 0.44635,0.44609 0.44635,1.17052 0,1.61661 l -0.98795,0.98822 -0.98796,0.98795 c -0.44608,0.44609 -1.17051,0.44609 -1.6166,0 l -0.98822,-0.98795 -0.98795,-0.98822 c -0.44609,-0.44609 -0.44609,-1.17052 0,-1.61661 l 0.98795,-0.98795 0.98822,-0.98795 c 0.44609,-0.44636 1.17052,-0.44636 1.6166,0 z m -4.91913,4.34763 0.99192,0.99192 0.99166,0.99166 c 0.44424,0.44424 0.44424,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99193,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99193,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z"
-         id="path81"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/32x32/emblems/remmina-rdp.svg b/plugins/rdp/32x32/emblems/remmina-rdp.svg
deleted file mode 100644
index a234dfce9..000000000
--- a/plugins/rdp/32x32/emblems/remmina-rdp.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(0.20117925,-0.3392995)"
-       id="g831">
-      <path
-         d="m 198.46707,202.16094 1.37716,1.37742 1.37742,1.37742 c 0.44661,0.44635 0.44661,1.17131 0,1.61793 l -1.37742,1.37742 -1.37716,1.37742 c -0.44662,0.44635 -1.17157,0.44635 -1.61793,0 l -1.37742,-1.37742 -1.37742,-1.37742 c -0.44662,-0.44662 -0.44662,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37742,-1.37742 c 0.44636,-0.44635 1.17131,-0.44635 1.61793,0 z"
-         id="path71"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,197.21164 1.37742,1.37743 1.37742,1.37742 c 0.44662,0.44661 0.44662,1.17131 0,1.61792 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44636 -1.17131,0.44636 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44661 -0.44661,-1.17131 0,-1.61792 l 1.37742,-1.37742 1.37716,-1.37743 c 0.44662,-0.44635 1.17158,-0.44635 1.61793,0 z"
-         id="path73"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 210.43179,202.16094 1.37742,1.37742 1.37742,1.37742 c 0.44636,0.44635 0.44636,1.17131 0,1.61793 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44635 -1.17131,0.44635 -1.61792,0 l -1.37743,-1.37742 -1.37742,-1.37742 c -0.44635,-0.44662 -0.44635,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37743,-1.37742 c 0.44661,-0.44635 1.17157,-0.44635 1.61792,0 z"
-         id="path75"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,207.56691 1.37742,1.37742 1.37742,1.37742 c 0.44662,0.44635 0.44662,1.17131 0,1.61766 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44662 -1.17131,0.44662 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44635 -0.44661,-1.17131 0,-1.61766 l 1.37742,-1.37742 1.37716,-1.37742 c 0.44662,-0.44662 1.17158,-0.44662 1.61793,0 z"
-         id="path77"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/48x48/emblems/remmina-rdp-ssh.svg b/plugins/rdp/48x48/emblems/remmina-rdp-ssh.svg
deleted file mode 100644
index 838f9c0a3..000000000
--- a/plugins/rdp/48x48/emblems/remmina-rdp-ssh.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <path
-         d="m 191.49748,160.50133 0.99192,0.99192 0.99166,0.99166 c 0.44397,0.44424 0.44397,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99193,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99193,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m 4.91754,-4.44156 0.99193,0.99192 0.99166,0.99166 c 0.44423,0.44424 0.44423,1.16496 0,1.6092 l -0.99166,0.99165 -0.99193,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m -4.98766,-4.34763 0.98796,0.98795 0.98795,0.98795 c 0.44635,0.44609 0.44635,1.17052 0,1.61661 l -0.98795,0.98822 -0.98796,0.98795 c -0.44608,0.44609 -1.17051,0.44609 -1.6166,0 l -0.98822,-0.98795 -0.98795,-0.98822 c -0.44609,-0.44609 -0.44609,-1.17052 0,-1.61661 l 0.98795,-0.98795 0.98822,-0.98795 c 0.44609,-0.44636 1.17052,-0.44636 1.6166,0 z m -4.91913,4.34763 0.99192,0.99192 0.99166,0.99166 c 0.44424,0.44424 0.44424,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99193,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99193,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z"
-         id="path81"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/48x48/emblems/remmina-rdp.svg b/plugins/rdp/48x48/emblems/remmina-rdp.svg
deleted file mode 100644
index a234dfce9..000000000
--- a/plugins/rdp/48x48/emblems/remmina-rdp.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(0.20117925,-0.3392995)"
-       id="g831">
-      <path
-         d="m 198.46707,202.16094 1.37716,1.37742 1.37742,1.37742 c 0.44661,0.44635 0.44661,1.17131 0,1.61793 l -1.37742,1.37742 -1.37716,1.37742 c -0.44662,0.44635 -1.17157,0.44635 -1.61793,0 l -1.37742,-1.37742 -1.37742,-1.37742 c -0.44662,-0.44662 -0.44662,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37742,-1.37742 c 0.44636,-0.44635 1.17131,-0.44635 1.61793,0 z"
-         id="path71"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,197.21164 1.37742,1.37743 1.37742,1.37742 c 0.44662,0.44661 0.44662,1.17131 0,1.61792 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44636 -1.17131,0.44636 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44661 -0.44661,-1.17131 0,-1.61792 l 1.37742,-1.37742 1.37716,-1.37743 c 0.44662,-0.44635 1.17158,-0.44635 1.61793,0 z"
-         id="path73"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 210.43179,202.16094 1.37742,1.37742 1.37742,1.37742 c 0.44636,0.44635 0.44636,1.17131 0,1.61793 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44635 -1.17131,0.44635 -1.61792,0 l -1.37743,-1.37742 -1.37742,-1.37742 c -0.44635,-0.44662 -0.44635,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37743,-1.37742 c 0.44661,-0.44635 1.17157,-0.44635 1.61792,0 z"
-         id="path75"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,207.56691 1.37742,1.37742 1.37742,1.37742 c 0.44662,0.44635 0.44662,1.17131 0,1.61766 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44662 -1.17131,0.44662 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44635 -0.44661,-1.17131 0,-1.61766 l 1.37742,-1.37742 1.37716,-1.37742 c 0.44662,-0.44662 1.17158,-0.44662 1.61793,0 z"
-         id="path77"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/64x64/emblems/remmina-rdp-ssh.svg b/plugins/rdp/64x64/emblems/remmina-rdp-ssh.svg
deleted file mode 100644
index 838f9c0a3..000000000
--- a/plugins/rdp/64x64/emblems/remmina-rdp-ssh.svg
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-      <path
-         d="m 191.49748,160.50133 0.99192,0.99192 0.99166,0.99166 c 0.44397,0.44424 0.44397,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99193,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99193,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m 4.91754,-4.44156 0.99193,0.99192 0.99166,0.99166 c 0.44423,0.44424 0.44423,1.16496 0,1.6092 l -0.99166,0.99165 -0.99193,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99192,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99192,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z m -4.98766,-4.34763 0.98796,0.98795 0.98795,0.98795 c 0.44635,0.44609 0.44635,1.17052 0,1.61661 l -0.98795,0.98822 -0.98796,0.98795 c -0.44608,0.44609 -1.17051,0.44609 -1.6166,0 l -0.98822,-0.98795 -0.98795,-0.98822 c -0.44609,-0.44609 -0.44609,-1.17052 0,-1.61661 l 0.98795,-0.98795 0.98822,-0.98795 c 0.44609,-0.44636 1.17052,-0.44636 1.6166,0 z m -4.91913,4.34763 0.99192,0.99192 0.99166,0.99166 c 0.44424,0.44424 0.44424,1.16496 0,1.6092 l -0.99166,0.99165 -0.99192,0.99193 c -0.44397,0.44397 -1.16496,0.44397 -1.60893,0 l -0.99192,-0.99193 -0.99193,-0.99165 c -0.44397,-0.44424 -0.44397,-1.16496 0,-1.6092 l 0.99193,-0.99166 0.99192,-0.99192 c 0.44397,-0.44397 1.16496,-0.44397 1.60893,0 z"
-         id="path81"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/64x64/emblems/remmina-rdp.svg b/plugins/rdp/64x64/emblems/remmina-rdp.svg
deleted file mode 100644
index a234dfce9..000000000
--- a/plugins/rdp/64x64/emblems/remmina-rdp.svg
+++ /dev/null
@@ -1,81 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <g
-       transform="translate(0.20117925,-0.3392995)"
-       id="g831">
-      <path
-         d="m 198.46707,202.16094 1.37716,1.37742 1.37742,1.37742 c 0.44661,0.44635 0.44661,1.17131 0,1.61793 l -1.37742,1.37742 -1.37716,1.37742 c -0.44662,0.44635 -1.17157,0.44635 -1.61793,0 l -1.37742,-1.37742 -1.37742,-1.37742 c -0.44662,-0.44662 -0.44662,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37742,-1.37742 c 0.44636,-0.44635 1.17131,-0.44635 1.61793,0 z"
-         id="path71"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,197.21164 1.37742,1.37743 1.37742,1.37742 c 0.44662,0.44661 0.44662,1.17131 0,1.61792 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44636 -1.17131,0.44636 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44661 -0.44661,-1.17131 0,-1.61792 l 1.37742,-1.37742 1.37716,-1.37743 c 0.44662,-0.44635 1.17158,-0.44635 1.61793,0 z"
-         id="path73"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 210.43179,202.16094 1.37742,1.37742 1.37742,1.37742 c 0.44636,0.44635 0.44636,1.17131 0,1.61793 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44635 -1.17131,0.44635 -1.61792,0 l -1.37743,-1.37742 -1.37742,-1.37742 c -0.44635,-0.44662 -0.44635,-1.17158 0,-1.61793 l 1.37742,-1.37742 1.37743,-1.37742 c 0.44661,-0.44635 1.17157,-0.44635 1.61792,0 z"
-         id="path75"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-      <path
-         d="m 204.53926,207.56691 1.37742,1.37742 1.37742,1.37742 c 0.44662,0.44635 0.44662,1.17131 0,1.61766 l -1.37742,1.37742 -1.37742,1.37742 c -0.44635,0.44662 -1.17131,0.44662 -1.61793,0 l -1.37716,-1.37742 -1.37742,-1.37742 c -0.44661,-0.44635 -0.44661,-1.17131 0,-1.61766 l 1.37742,-1.37742 1.37716,-1.37742 c 0.44662,-0.44662 1.17158,-0.44662 1.61793,0 z"
-         id="path77"
-         style="isolation:isolate;fill:#ffffff;stroke-width:0.26458332" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/rdp/CMakeLists.txt b/plugins/rdp/CMakeLists.txt
index 97bfca909..179df2ae7 100644
--- a/plugins/rdp/CMakeLists.txt
+++ b/plugins/rdp/CMakeLists.txt
@@ -69,10 +69,6 @@ target_link_libraries(remmina-plugin-rdp
 install(TARGETS remmina-plugin-rdp DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    16x16/emblems/remmina-rdp-ssh.svg
-    16x16/emblems/remmina-rdp.svg
-    DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES
-    22x22/emblems/remmina-rdp-ssh.svg
-    22x22/emblems/remmina-rdp.svg
-    DESTINATION ${APPICON22_EMBLEMS_DIR})
+    scalable/emblems/remmina-rdp-ssh-symbolic.svg
+    scalable/emblems/remmina-rdp-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/rdp/rdp_plugin.c b/plugins/rdp/rdp_plugin.c
index 575e6c22c..c9d989060 100644
--- a/plugins/rdp/rdp_plugin.c
+++ b/plugins/rdp/rdp_plugin.c
@@ -1462,8 +1462,8 @@ static RemminaProtocolPlugin remmina_rdp =
 	N_("RDP - Remote Desktop Protocol"),            // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	remmina_plugin_rdp_version,                     // Version number
-	"remmina-rdp",                                  // Icon for normal connection
-	"remmina-rdp-ssh",                              // Icon for SSH connection
+	"remmina-rdp-symbolic",                         // Icon for normal connection
+	"remmina-rdp-ssh-symbolic",                     // Icon for SSH connection
 	remmina_rdp_basic_settings,                     // Array for basic settings
 	remmina_rdp_advanced_settings,                  // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            // SSH settings type
diff --git a/plugins/rdp/scalable/emblems/remmina-rdp-ssh.svg b/plugins/rdp/scalable/emblems/remmina-rdp-ssh-symbolic.svg
index 45912fc91..45912fc91 100644
--- a/plugins/rdp/scalable/emblems/remmina-rdp-ssh.svg
+++ b/plugins/rdp/scalable/emblems/remmina-rdp-ssh-symbolic.svg
diff --git a/plugins/rdp/scalable/emblems/remmina-rdp.svg b/plugins/rdp/scalable/emblems/remmina-rdp-symbolic.svg
index 9332c55bb..9332c55bb 100644
--- a/plugins/rdp/scalable/emblems/remmina-rdp.svg
+++ b/plugins/rdp/scalable/emblems/remmina-rdp-symbolic.svg
diff --git a/plugins/spice/16x16/emblems/remmina-spice-ssh.svg b/plugins/spice/16x16/emblems/remmina-spice-ssh.svg
deleted file mode 100644
index a3a00fcb1..000000000
--- a/plugins/spice/16x16/emblems/remmina-spice-ssh.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.83396843,0,0,0.83396843,39.920727,35.024416)"
-       id="g837">
-      <g
-         id="g817"
-         transform="matrix(1.1087066,0,0,1.1087066,45.9421,19.072628)">
-        <path
-           style="isolation:isolate;fill:#000000;stroke-width:0.26458332"
-           id="path79"
-           d="m 178.60731,150.93908 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.13341 z" />
-      </g>
-      <g
-         id="g822"
-         transform="matrix(0.65160764,0,0,0.79754876,80.032738,36.675708)"
-         style="fill:#ffffff">
-        <path
-           id="polygon65"
-           d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3" />
-        <path
-           id="polygon67"
-           d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none" />
-        <polygon
-           transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)"
-           points="165.707,559.786 196.032,612.311 135.381,612.311 "
-           stroke-miterlimit="3"
-           id="polygon820"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/16x16/emblems/remmina-spice.svg b/plugins/spice/16x16/emblems/remmina-spice.svg
deleted file mode 100644
index 754fc1130..000000000
--- a/plugins/spice/16x16/emblems/remmina-spice.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.85100655,0,0,1.0416072,33.247302,-14.623309)"
-       id="g822">
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3"
-         d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-         id="polygon65" />
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none"
-         d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-         id="polygon67" />
-      <polygon
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke"
-         id="polygon820"
-         stroke-miterlimit="3"
-         points="165.707,559.786 196.032,612.311 135.381,612.311 "
-         transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/22x22/emblems/remmina-spice-ssh.svg b/plugins/spice/22x22/emblems/remmina-spice-ssh.svg
deleted file mode 100644
index a3a00fcb1..000000000
--- a/plugins/spice/22x22/emblems/remmina-spice-ssh.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.83396843,0,0,0.83396843,39.920727,35.024416)"
-       id="g837">
-      <g
-         id="g817"
-         transform="matrix(1.1087066,0,0,1.1087066,45.9421,19.072628)">
-        <path
-           style="isolation:isolate;fill:#000000;stroke-width:0.26458332"
-           id="path79"
-           d="m 178.60731,150.93908 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.13341 z" />
-      </g>
-      <g
-         id="g822"
-         transform="matrix(0.65160764,0,0,0.79754876,80.032738,36.675708)"
-         style="fill:#ffffff">
-        <path
-           id="polygon65"
-           d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3" />
-        <path
-           id="polygon67"
-           d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none" />
-        <polygon
-           transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)"
-           points="165.707,559.786 196.032,612.311 135.381,612.311 "
-           stroke-miterlimit="3"
-           id="polygon820"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/22x22/emblems/remmina-spice.svg b/plugins/spice/22x22/emblems/remmina-spice.svg
deleted file mode 100644
index 754fc1130..000000000
--- a/plugins/spice/22x22/emblems/remmina-spice.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.85100655,0,0,1.0416072,33.247302,-14.623309)"
-       id="g822">
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3"
-         d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-         id="polygon65" />
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none"
-         d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-         id="polygon67" />
-      <polygon
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke"
-         id="polygon820"
-         stroke-miterlimit="3"
-         points="165.707,559.786 196.032,612.311 135.381,612.311 "
-         transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/24x24/emblems/remmina-spice-ssh.svg b/plugins/spice/24x24/emblems/remmina-spice-ssh.svg
deleted file mode 100644
index a3a00fcb1..000000000
--- a/plugins/spice/24x24/emblems/remmina-spice-ssh.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.83396843,0,0,0.83396843,39.920727,35.024416)"
-       id="g837">
-      <g
-         id="g817"
-         transform="matrix(1.1087066,0,0,1.1087066,45.9421,19.072628)">
-        <path
-           style="isolation:isolate;fill:#000000;stroke-width:0.26458332"
-           id="path79"
-           d="m 178.60731,150.93908 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.13341 z" />
-      </g>
-      <g
-         id="g822"
-         transform="matrix(0.65160764,0,0,0.79754876,80.032738,36.675708)"
-         style="fill:#ffffff">
-        <path
-           id="polygon65"
-           d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3" />
-        <path
-           id="polygon67"
-           d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none" />
-        <polygon
-           transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)"
-           points="165.707,559.786 196.032,612.311 135.381,612.311 "
-           stroke-miterlimit="3"
-           id="polygon820"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/24x24/emblems/remmina-spice.svg b/plugins/spice/24x24/emblems/remmina-spice.svg
deleted file mode 100644
index 754fc1130..000000000
--- a/plugins/spice/24x24/emblems/remmina-spice.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.85100655,0,0,1.0416072,33.247302,-14.623309)"
-       id="g822">
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3"
-         d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-         id="polygon65" />
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none"
-         d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-         id="polygon67" />
-      <polygon
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke"
-         id="polygon820"
-         stroke-miterlimit="3"
-         points="165.707,559.786 196.032,612.311 135.381,612.311 "
-         transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/32x32/emblems/remmina-spice-ssh.svg b/plugins/spice/32x32/emblems/remmina-spice-ssh.svg
deleted file mode 100644
index a3a00fcb1..000000000
--- a/plugins/spice/32x32/emblems/remmina-spice-ssh.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.83396843,0,0,0.83396843,39.920727,35.024416)"
-       id="g837">
-      <g
-         id="g817"
-         transform="matrix(1.1087066,0,0,1.1087066,45.9421,19.072628)">
-        <path
-           style="isolation:isolate;fill:#000000;stroke-width:0.26458332"
-           id="path79"
-           d="m 178.60731,150.93908 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.13341 z" />
-      </g>
-      <g
-         id="g822"
-         transform="matrix(0.65160764,0,0,0.79754876,80.032738,36.675708)"
-         style="fill:#ffffff">
-        <path
-           id="polygon65"
-           d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3" />
-        <path
-           id="polygon67"
-           d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none" />
-        <polygon
-           transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)"
-           points="165.707,559.786 196.032,612.311 135.381,612.311 "
-           stroke-miterlimit="3"
-           id="polygon820"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/32x32/emblems/remmina-spice.svg b/plugins/spice/32x32/emblems/remmina-spice.svg
deleted file mode 100644
index 754fc1130..000000000
--- a/plugins/spice/32x32/emblems/remmina-spice.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.85100655,0,0,1.0416072,33.247302,-14.623309)"
-       id="g822">
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3"
-         d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-         id="polygon65" />
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none"
-         d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-         id="polygon67" />
-      <polygon
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke"
-         id="polygon820"
-         stroke-miterlimit="3"
-         points="165.707,559.786 196.032,612.311 135.381,612.311 "
-         transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/48x48/emblems/remmina-spice-ssh.svg b/plugins/spice/48x48/emblems/remmina-spice-ssh.svg
deleted file mode 100644
index a3a00fcb1..000000000
--- a/plugins/spice/48x48/emblems/remmina-spice-ssh.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.83396843,0,0,0.83396843,39.920727,35.024416)"
-       id="g837">
-      <g
-         id="g817"
-         transform="matrix(1.1087066,0,0,1.1087066,45.9421,19.072628)">
-        <path
-           style="isolation:isolate;fill:#000000;stroke-width:0.26458332"
-           id="path79"
-           d="m 178.60731,150.93908 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.13341 z" />
-      </g>
-      <g
-         id="g822"
-         transform="matrix(0.65160764,0,0,0.79754876,80.032738,36.675708)"
-         style="fill:#ffffff">
-        <path
-           id="polygon65"
-           d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3" />
-        <path
-           id="polygon67"
-           d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none" />
-        <polygon
-           transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)"
-           points="165.707,559.786 196.032,612.311 135.381,612.311 "
-           stroke-miterlimit="3"
-           id="polygon820"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/48x48/emblems/remmina-spice.svg b/plugins/spice/48x48/emblems/remmina-spice.svg
deleted file mode 100644
index 754fc1130..000000000
--- a/plugins/spice/48x48/emblems/remmina-spice.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.85100655,0,0,1.0416072,33.247302,-14.623309)"
-       id="g822">
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3"
-         d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-         id="polygon65" />
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none"
-         d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-         id="polygon67" />
-      <polygon
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke"
-         id="polygon820"
-         stroke-miterlimit="3"
-         points="165.707,559.786 196.032,612.311 135.381,612.311 "
-         transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/64x64/emblems/remmina-spice-ssh.svg b/plugins/spice/64x64/emblems/remmina-spice-ssh.svg
deleted file mode 100644
index a3a00fcb1..000000000
--- a/plugins/spice/64x64/emblems/remmina-spice-ssh.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.83396843,0,0,0.83396843,39.920727,35.024416)"
-       id="g837">
-      <g
-         id="g817"
-         transform="matrix(1.1087066,0,0,1.1087066,45.9421,19.072628)">
-        <path
-           style="isolation:isolate;fill:#000000;stroke-width:0.26458332"
-           id="path79"
-           d="m 178.60731,150.93908 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.13341 z" />
-      </g>
-      <g
-         id="g822"
-         transform="matrix(0.65160764,0,0,0.79754876,80.032738,36.675708)"
-         style="fill:#ffffff">
-        <path
-           id="polygon65"
-           d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3" />
-        <path
-           id="polygon67"
-           d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none" />
-        <polygon
-           transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)"
-           points="165.707,559.786 196.032,612.311 135.381,612.311 "
-           stroke-miterlimit="3"
-           id="polygon820"
-           style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#ffffff;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke" />
-      </g>
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/64x64/emblems/remmina-spice.svg b/plugins/spice/64x64/emblems/remmina-spice.svg
deleted file mode 100644
index 754fc1130..000000000
--- a/plugins/spice/64x64/emblems/remmina-spice.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-223.14604,-181.92338)"
-     id="layer1">
-    <g
-       transform="matrix(0.85100655,0,0,1.0416072,33.247302,-14.623309)"
-       id="g822">
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:0.79374999;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3"
-         d="m 246.21287,194.41092 -3.04322,5.27151 4.98005,8.62583 h 6.08697 z"
-         id="polygon65" />
-      <path
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;fill-opacity:1;stroke:none;stroke-width:2.64583325;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none"
-         d="m 238.79737,194.47917 -3.25561,5.63893 4.76766,8.25841 h 6.51175 z"
-         id="polygon67" />
-      <polygon
-         style="isolation:isolate;vector-effect:non-scaling-stroke;fill:#000000;stroke:none;stroke-width:10;stroke-linecap:square;stroke-linejoin:miter;stroke-miterlimit:3;stroke-dasharray:none;paint-order:fill markers stroke"
-         id="polygon820"
-         stroke-miterlimit="3"
-         points="165.707,559.786 196.032,612.311 135.381,612.311 "
-         transform="matrix(0.26458333,0,0,0.26458333,187.32648,46.374434)" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/spice/CMakeLists.txt b/plugins/spice/CMakeLists.txt
index 969cba4a6..19849d9fc 100644
--- a/plugins/spice/CMakeLists.txt
+++ b/plugins/spice/CMakeLists.txt
@@ -45,7 +45,7 @@ target_link_libraries(remmina-plugin-spice ${REMMINA_COMMON_LIBRARIES} ${SPICE_L
 
 install(TARGETS remmina-plugin-spice DESTINATION ${REMMINA_PLUGINDIR})
 
-install(FILES 16x16/emblems/remmina-spice.svg DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES 22x22/emblems/remmina-spice.svg DESTINATION ${APPICON22_EMBLEMS_DIR})
-install(FILES 16x16/emblems/remmina-spice-ssh.svg DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES 22x22/emblems/remmina-spice-ssh.svg DESTINATION ${APPICON22_EMBLEMS_DIR})
+install(FILES
+    scalable/emblems/remmina-spice-ssh-symbolic.svg
+    scalable/emblems/remmina-spice-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/spice/scalable/emblems/remmina-spice-ssh.svg b/plugins/spice/scalable/emblems/remmina-spice-ssh-symbolic.svg
index 5a96a6f52..5a96a6f52 100644
--- a/plugins/spice/scalable/emblems/remmina-spice-ssh.svg
+++ b/plugins/spice/scalable/emblems/remmina-spice-ssh-symbolic.svg
diff --git a/plugins/spice/scalable/emblems/remmina-spice.svg b/plugins/spice/scalable/emblems/remmina-spice-symbolic.svg
index 7019006d5..7019006d5 100644
--- a/plugins/spice/scalable/emblems/remmina-spice.svg
+++ b/plugins/spice/scalable/emblems/remmina-spice-symbolic.svg
diff --git a/plugins/spice/spice_plugin.c b/plugins/spice/spice_plugin.c
index a87e2c005..771daa216 100644
--- a/plugins/spice/spice_plugin.c
+++ b/plugins/spice/spice_plugin.c
@@ -469,8 +469,8 @@ static RemminaProtocolPlugin remmina_plugin_spice =
 	N_("SPICE - Simple Protocol for Independent Computing Environments"),   // Description
 	GETTEXT_PACKAGE,                                                        // Translation domain
 	VERSION,                                                                // Version number
-	"remmina-spice",                                                        // Icon for normal connection
-	"remmina-spice-ssh",                                                        // Icon for SSH connection
+	"remmina-spice-symbolic",                                               // Icon for normal connection
+	"remmina-spice-ssh-symbolic",                                               // Icon for SSH connection
 	remmina_plugin_spice_basic_settings,                                    // Array for basic settings
 	remmina_plugin_spice_advanced_settings,                                 // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,                                    // SSH settings type
diff --git a/plugins/tool_hello_world/16x16/emblems/remmina-tool.png b/plugins/tool_hello_world/16x16/emblems/remmina-tool.png
deleted file mode 100644
index 96bc6828a..000000000
--- a/plugins/tool_hello_world/16x16/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/tool_hello_world/22x22/emblems/remmina-tool.png b/plugins/tool_hello_world/22x22/emblems/remmina-tool.png
deleted file mode 100644
index a28ca75ad..000000000
--- a/plugins/tool_hello_world/22x22/emblems/remmina-tool.png
+++ /dev/null
diff --git a/plugins/tool_hello_world/CMakeLists.txt b/plugins/tool_hello_world/CMakeLists.txt
index 1cd2fc1ba..62e7da7ed 100644
--- a/plugins/tool_hello_world/CMakeLists.txt
+++ b/plugins/tool_hello_world/CMakeLists.txt
@@ -47,8 +47,5 @@ target_link_libraries(remmina-plugin-tool_hello_world ${REMMINA_COMMON_LIBRARIES
 install(TARGETS remmina-plugin-tool_hello_world DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    16x16/emblems/remmina-tool.png
-    DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES
-    22x22/emblems/remmina-tool.png
-    DESTINATION ${APPICON22_EMBLEMS_DIR})
+    scalable/emblems/remmina-tool-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/vnc/16x16/emblems/remmina-vnc-ssh.svg b/plugins/vnc/16x16/emblems/remmina-vnc-ssh.svg
deleted file mode 100644
index a3aefe8c3..000000000
--- a/plugins/vnc/16x16/emblems/remmina-vnc-ssh.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.398028"
-   height="99.772079"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-162.79579,-187.48289)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path34"
-       d="m 175.99485,195.20186 c -1.73487,0 -3.13161,1.42611 -3.13161,3.18029 v 1.51686 h -0.7829 c -0.43365,0 -0.7829,0.34925 -0.7829,0.7829 v 4.69715 c 0,0.43365 0.34925,0.7829 0.7829,0.7829 h 7.82875 c 0.43366,0 0.78291,-0.34925 0.78291,-0.7829 v -4.69715 c 0,-0.43365 -0.34925,-0.7829 -0.78291,-0.7829 h -0.7829 v -1.51686 c 0,-1.75365 -1.39673,-3.18029 -3.13134,-3.18029 z m 0,1.56581 c 0.8673,0 1.56554,0.69823 1.56554,1.56554 v 1.5658 h -3.13135 v -1.5658 c 0,-0.86731 0.69824,-1.56554 1.56581,-1.56554 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path36"
-       d="m 187.30817,213.88092 c 0,0 0.14367,-0.008 0.34237,-0.0442 0.38523,-0.0569 0.67627,-0.195 0.89138,-0.38312 0.0415,-0.0317 0.082,-0.0661 0.12144,-0.10319 0.037,-0.0394 0.0712,-0.0796 0.10319,-0.12144 0.18785,-0.21484 0.32623,-0.50615 0.38285,-0.89112 0.0368,-0.1987 0.0444,-0.34263 0.0444,-0.34263 v -22.62691 c 0,-1.88542 -1.88568,-1.88542 -1.88568,-1.88542 h -22.6269 c 0,0 -1.88543,0 -1.88543,1.88542 v 22.6269 c 0,0 0.008,0.14393 0.0442,0.34264 0.0585,0.38497 0.19447,0.67627 0.38285,0.89111 0.032,0.0418 0.0675,0.082 0.10319,0.12145 0.0397,0.037 0.0802,0.0714 0.12144,0.10318 0.21511,0.18812 0.50668,0.32624 0.89138,0.38312 0.19976,0.0363 0.34238,0.0442 0.34238,0.0442 z m -1.88569,-4.5347 h -18.85553 v -18.09221 h 18.85553 z" />
-  </g>
-</svg>
diff --git a/plugins/vnc/16x16/emblems/remmina-vnc.svg b/plugins/vnc/16x16/emblems/remmina-vnc.svg
deleted file mode 100644
index 62e140ae2..000000000
--- a/plugins/vnc/16x16/emblems/remmina-vnc.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2">
-    <mask
-       height="400%"
-       width="400%"
-       y="-200%"
-       x="-200%"
-       id="_mask_t2Us8opi94eYjaS69EfyEcHSNVQ03DDZ">
-      <rect
-         id="rect40"
-         style="fill:#ffffff"
-         height="100%"
-         width="100%"
-         y="0"
-         x="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         id="path42"
-         d="m 850.286,202.852 c 0,0 0.452,-0.025 1.077,-0.139 1.211,-0.179 2.128,-0.614 2.804,-1.205 0.13,-0.1 0.257,-0.208 0.382,-0.324 0.116,-0.125 0.224,-0.251 0.324,-0.382 0.592,-0.677 1.026,-1.593 1.205,-2.804 0.115,-0.625 0.139,-1.077 0.139,-1.077 V 125.75 c 0,-5.931 -5.931,-5.931 -5.931,-5.931 h -71.171 c 0,0 -5.931,0 -5.931,5.931 v 71.171 c 0,0 0.026,0.452 0.139,1.077 0.184,1.211 0.612,2.127 1.205,2.804 0.101,0.131 0.212,0.257 0.324,0.382 0.125,0.116 0.252,0.224 0.383,0.324 0.676,0.591 1.593,1.026 2.803,1.205 0.628,0.114 1.077,0.139 1.077,0.139 z m -5.931,-14.263 h -59.309 v -56.908 h 59.309 z" />
-    </mask>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-146.65306,-134.97453)"
-     id="layer1">
-    <g
-       transform="matrix(1.0697634,0,0,1.0697634,-9.2735492,-11.925523)"
-       id="g820">
-      <path
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615"
-         d="m 147.83075,137.94029 c 0,0 -1.17769,2e-5 -1.17769,1.17769 v 14.13263 c 0,0 0.005,0.09 0.0274,0.21405 0.0365,0.24056 0.12144,0.42255 0.23928,0.55686 0.02,0.0261 0.0421,0.051 0.0644,0.0757 0.0248,0.023 0.0503,0.0445 0.0761,0.0644 0.13431,0.11739 0.31608,0.20363 0.55643,0.23928 0.12474,0.0227 0.21405,0.0278 0.21405,0.0278 h 4.62807 v -2.83218 H 149.0084 V 140.2961 h 11.77727 v 4.05511 h 2.35536 v -5.23323 c 0,-1.17767 -1.17768,-1.17769 -1.17768,-1.17769 z m 12.95495,10.06883 v 3.58743 h -4.66941 v 2.83218 h 5.84709 c 0,0 0.09,-0.005 0.21405,-0.0278 0.24056,-0.0356 0.4221,-0.1219 0.55643,-0.23928 0.0258,-0.0199 0.0514,-0.0414 0.0761,-0.0644 0.023,-0.0247 0.0445,-0.0497 0.0644,-0.0757 0.11738,-0.13431 0.20386,-0.3163 0.23927,-0.55686 0.023,-0.12408 0.0274,-0.21405 0.0274,-0.21405 v -5.24149 z"
-         id="path38" />
-      <path
-         d="m 168.41828,161.43286 c 0,0 0.0898,-0.005 0.21384,-0.0276 0.24056,-0.0356 0.42232,-0.12185 0.55664,-0.23923 0.0258,-0.0199 0.0513,-0.0414 0.0759,-0.0644 0.0229,-0.0248 0.0445,-0.0499 0.0644,-0.0759 0.11739,-0.13432 0.20381,-0.31608 0.23923,-0.55665 0.023,-0.12407 0.0276,-0.21405 0.0276,-0.21405 v -14.13259 c 0,-1.17766 -1.17767,-1.17766 -1.17767,-1.17766 h -14.13279 c 0,0 -1.17765,0 -1.17765,1.17766 v 14.13258 c 0,0 0.005,0.09 0.0276,0.21406 0.0365,0.24057 0.1214,0.42233 0.23924,0.55664 0.02,0.0261 0.0421,0.0512 0.0644,0.0759 0.0248,0.023 0.0501,0.0445 0.0759,0.0644 0.13432,0.11738 0.3163,0.20359 0.55664,0.23923 0.12474,0.0227 0.21384,0.0276 0.21384,0.0276 z m -1.17788,-2.83222 v -11.30036 h -11.77704 11.77704 z"
-         id="path38-5"
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/vnc/22x22/emblems/remmina-vnc-ssh.svg b/plugins/vnc/22x22/emblems/remmina-vnc-ssh.svg
deleted file mode 100644
index a3aefe8c3..000000000
--- a/plugins/vnc/22x22/emblems/remmina-vnc-ssh.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.398028"
-   height="99.772079"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-162.79579,-187.48289)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path34"
-       d="m 175.99485,195.20186 c -1.73487,0 -3.13161,1.42611 -3.13161,3.18029 v 1.51686 h -0.7829 c -0.43365,0 -0.7829,0.34925 -0.7829,0.7829 v 4.69715 c 0,0.43365 0.34925,0.7829 0.7829,0.7829 h 7.82875 c 0.43366,0 0.78291,-0.34925 0.78291,-0.7829 v -4.69715 c 0,-0.43365 -0.34925,-0.7829 -0.78291,-0.7829 h -0.7829 v -1.51686 c 0,-1.75365 -1.39673,-3.18029 -3.13134,-3.18029 z m 0,1.56581 c 0.8673,0 1.56554,0.69823 1.56554,1.56554 v 1.5658 h -3.13135 v -1.5658 c 0,-0.86731 0.69824,-1.56554 1.56581,-1.56554 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path36"
-       d="m 187.30817,213.88092 c 0,0 0.14367,-0.008 0.34237,-0.0442 0.38523,-0.0569 0.67627,-0.195 0.89138,-0.38312 0.0415,-0.0317 0.082,-0.0661 0.12144,-0.10319 0.037,-0.0394 0.0712,-0.0796 0.10319,-0.12144 0.18785,-0.21484 0.32623,-0.50615 0.38285,-0.89112 0.0368,-0.1987 0.0444,-0.34263 0.0444,-0.34263 v -22.62691 c 0,-1.88542 -1.88568,-1.88542 -1.88568,-1.88542 h -22.6269 c 0,0 -1.88543,0 -1.88543,1.88542 v 22.6269 c 0,0 0.008,0.14393 0.0442,0.34264 0.0585,0.38497 0.19447,0.67627 0.38285,0.89111 0.032,0.0418 0.0675,0.082 0.10319,0.12145 0.0397,0.037 0.0802,0.0714 0.12144,0.10318 0.21511,0.18812 0.50668,0.32624 0.89138,0.38312 0.19976,0.0363 0.34238,0.0442 0.34238,0.0442 z m -1.88569,-4.5347 h -18.85553 v -18.09221 h 18.85553 z" />
-  </g>
-</svg>
diff --git a/plugins/vnc/22x22/emblems/remmina-vnc.svg b/plugins/vnc/22x22/emblems/remmina-vnc.svg
deleted file mode 100644
index 62e140ae2..000000000
--- a/plugins/vnc/22x22/emblems/remmina-vnc.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2">
-    <mask
-       height="400%"
-       width="400%"
-       y="-200%"
-       x="-200%"
-       id="_mask_t2Us8opi94eYjaS69EfyEcHSNVQ03DDZ">
-      <rect
-         id="rect40"
-         style="fill:#ffffff"
-         height="100%"
-         width="100%"
-         y="0"
-         x="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         id="path42"
-         d="m 850.286,202.852 c 0,0 0.452,-0.025 1.077,-0.139 1.211,-0.179 2.128,-0.614 2.804,-1.205 0.13,-0.1 0.257,-0.208 0.382,-0.324 0.116,-0.125 0.224,-0.251 0.324,-0.382 0.592,-0.677 1.026,-1.593 1.205,-2.804 0.115,-0.625 0.139,-1.077 0.139,-1.077 V 125.75 c 0,-5.931 -5.931,-5.931 -5.931,-5.931 h -71.171 c 0,0 -5.931,0 -5.931,5.931 v 71.171 c 0,0 0.026,0.452 0.139,1.077 0.184,1.211 0.612,2.127 1.205,2.804 0.101,0.131 0.212,0.257 0.324,0.382 0.125,0.116 0.252,0.224 0.383,0.324 0.676,0.591 1.593,1.026 2.803,1.205 0.628,0.114 1.077,0.139 1.077,0.139 z m -5.931,-14.263 h -59.309 v -56.908 h 59.309 z" />
-    </mask>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-146.65306,-134.97453)"
-     id="layer1">
-    <g
-       transform="matrix(1.0697634,0,0,1.0697634,-9.2735492,-11.925523)"
-       id="g820">
-      <path
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615"
-         d="m 147.83075,137.94029 c 0,0 -1.17769,2e-5 -1.17769,1.17769 v 14.13263 c 0,0 0.005,0.09 0.0274,0.21405 0.0365,0.24056 0.12144,0.42255 0.23928,0.55686 0.02,0.0261 0.0421,0.051 0.0644,0.0757 0.0248,0.023 0.0503,0.0445 0.0761,0.0644 0.13431,0.11739 0.31608,0.20363 0.55643,0.23928 0.12474,0.0227 0.21405,0.0278 0.21405,0.0278 h 4.62807 v -2.83218 H 149.0084 V 140.2961 h 11.77727 v 4.05511 h 2.35536 v -5.23323 c 0,-1.17767 -1.17768,-1.17769 -1.17768,-1.17769 z m 12.95495,10.06883 v 3.58743 h -4.66941 v 2.83218 h 5.84709 c 0,0 0.09,-0.005 0.21405,-0.0278 0.24056,-0.0356 0.4221,-0.1219 0.55643,-0.23928 0.0258,-0.0199 0.0514,-0.0414 0.0761,-0.0644 0.023,-0.0247 0.0445,-0.0497 0.0644,-0.0757 0.11738,-0.13431 0.20386,-0.3163 0.23927,-0.55686 0.023,-0.12408 0.0274,-0.21405 0.0274,-0.21405 v -5.24149 z"
-         id="path38" />
-      <path
-         d="m 168.41828,161.43286 c 0,0 0.0898,-0.005 0.21384,-0.0276 0.24056,-0.0356 0.42232,-0.12185 0.55664,-0.23923 0.0258,-0.0199 0.0513,-0.0414 0.0759,-0.0644 0.0229,-0.0248 0.0445,-0.0499 0.0644,-0.0759 0.11739,-0.13432 0.20381,-0.31608 0.23923,-0.55665 0.023,-0.12407 0.0276,-0.21405 0.0276,-0.21405 v -14.13259 c 0,-1.17766 -1.17767,-1.17766 -1.17767,-1.17766 h -14.13279 c 0,0 -1.17765,0 -1.17765,1.17766 v 14.13258 c 0,0 0.005,0.09 0.0276,0.21406 0.0365,0.24057 0.1214,0.42233 0.23924,0.55664 0.02,0.0261 0.0421,0.0512 0.0644,0.0759 0.0248,0.023 0.0501,0.0445 0.0759,0.0644 0.13432,0.11738 0.3163,0.20359 0.55664,0.23923 0.12474,0.0227 0.21384,0.0276 0.21384,0.0276 z m -1.17788,-2.83222 v -11.30036 h -11.77704 11.77704 z"
-         id="path38-5"
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/vnc/24x24/emblems/remmina-vnc-ssh.svg b/plugins/vnc/24x24/emblems/remmina-vnc-ssh.svg
deleted file mode 100644
index a3aefe8c3..000000000
--- a/plugins/vnc/24x24/emblems/remmina-vnc-ssh.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.398028"
-   height="99.772079"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-162.79579,-187.48289)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path34"
-       d="m 175.99485,195.20186 c -1.73487,0 -3.13161,1.42611 -3.13161,3.18029 v 1.51686 h -0.7829 c -0.43365,0 -0.7829,0.34925 -0.7829,0.7829 v 4.69715 c 0,0.43365 0.34925,0.7829 0.7829,0.7829 h 7.82875 c 0.43366,0 0.78291,-0.34925 0.78291,-0.7829 v -4.69715 c 0,-0.43365 -0.34925,-0.7829 -0.78291,-0.7829 h -0.7829 v -1.51686 c 0,-1.75365 -1.39673,-3.18029 -3.13134,-3.18029 z m 0,1.56581 c 0.8673,0 1.56554,0.69823 1.56554,1.56554 v 1.5658 h -3.13135 v -1.5658 c 0,-0.86731 0.69824,-1.56554 1.56581,-1.56554 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path36"
-       d="m 187.30817,213.88092 c 0,0 0.14367,-0.008 0.34237,-0.0442 0.38523,-0.0569 0.67627,-0.195 0.89138,-0.38312 0.0415,-0.0317 0.082,-0.0661 0.12144,-0.10319 0.037,-0.0394 0.0712,-0.0796 0.10319,-0.12144 0.18785,-0.21484 0.32623,-0.50615 0.38285,-0.89112 0.0368,-0.1987 0.0444,-0.34263 0.0444,-0.34263 v -22.62691 c 0,-1.88542 -1.88568,-1.88542 -1.88568,-1.88542 h -22.6269 c 0,0 -1.88543,0 -1.88543,1.88542 v 22.6269 c 0,0 0.008,0.14393 0.0442,0.34264 0.0585,0.38497 0.19447,0.67627 0.38285,0.89111 0.032,0.0418 0.0675,0.082 0.10319,0.12145 0.0397,0.037 0.0802,0.0714 0.12144,0.10318 0.21511,0.18812 0.50668,0.32624 0.89138,0.38312 0.19976,0.0363 0.34238,0.0442 0.34238,0.0442 z m -1.88569,-4.5347 h -18.85553 v -18.09221 h 18.85553 z" />
-  </g>
-</svg>
diff --git a/plugins/vnc/24x24/emblems/remmina-vnc.svg b/plugins/vnc/24x24/emblems/remmina-vnc.svg
deleted file mode 100644
index 62e140ae2..000000000
--- a/plugins/vnc/24x24/emblems/remmina-vnc.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2">
-    <mask
-       height="400%"
-       width="400%"
-       y="-200%"
-       x="-200%"
-       id="_mask_t2Us8opi94eYjaS69EfyEcHSNVQ03DDZ">
-      <rect
-         id="rect40"
-         style="fill:#ffffff"
-         height="100%"
-         width="100%"
-         y="0"
-         x="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         id="path42"
-         d="m 850.286,202.852 c 0,0 0.452,-0.025 1.077,-0.139 1.211,-0.179 2.128,-0.614 2.804,-1.205 0.13,-0.1 0.257,-0.208 0.382,-0.324 0.116,-0.125 0.224,-0.251 0.324,-0.382 0.592,-0.677 1.026,-1.593 1.205,-2.804 0.115,-0.625 0.139,-1.077 0.139,-1.077 V 125.75 c 0,-5.931 -5.931,-5.931 -5.931,-5.931 h -71.171 c 0,0 -5.931,0 -5.931,5.931 v 71.171 c 0,0 0.026,0.452 0.139,1.077 0.184,1.211 0.612,2.127 1.205,2.804 0.101,0.131 0.212,0.257 0.324,0.382 0.125,0.116 0.252,0.224 0.383,0.324 0.676,0.591 1.593,1.026 2.803,1.205 0.628,0.114 1.077,0.139 1.077,0.139 z m -5.931,-14.263 h -59.309 v -56.908 h 59.309 z" />
-    </mask>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-146.65306,-134.97453)"
-     id="layer1">
-    <g
-       transform="matrix(1.0697634,0,0,1.0697634,-9.2735492,-11.925523)"
-       id="g820">
-      <path
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615"
-         d="m 147.83075,137.94029 c 0,0 -1.17769,2e-5 -1.17769,1.17769 v 14.13263 c 0,0 0.005,0.09 0.0274,0.21405 0.0365,0.24056 0.12144,0.42255 0.23928,0.55686 0.02,0.0261 0.0421,0.051 0.0644,0.0757 0.0248,0.023 0.0503,0.0445 0.0761,0.0644 0.13431,0.11739 0.31608,0.20363 0.55643,0.23928 0.12474,0.0227 0.21405,0.0278 0.21405,0.0278 h 4.62807 v -2.83218 H 149.0084 V 140.2961 h 11.77727 v 4.05511 h 2.35536 v -5.23323 c 0,-1.17767 -1.17768,-1.17769 -1.17768,-1.17769 z m 12.95495,10.06883 v 3.58743 h -4.66941 v 2.83218 h 5.84709 c 0,0 0.09,-0.005 0.21405,-0.0278 0.24056,-0.0356 0.4221,-0.1219 0.55643,-0.23928 0.0258,-0.0199 0.0514,-0.0414 0.0761,-0.0644 0.023,-0.0247 0.0445,-0.0497 0.0644,-0.0757 0.11738,-0.13431 0.20386,-0.3163 0.23927,-0.55686 0.023,-0.12408 0.0274,-0.21405 0.0274,-0.21405 v -5.24149 z"
-         id="path38" />
-      <path
-         d="m 168.41828,161.43286 c 0,0 0.0898,-0.005 0.21384,-0.0276 0.24056,-0.0356 0.42232,-0.12185 0.55664,-0.23923 0.0258,-0.0199 0.0513,-0.0414 0.0759,-0.0644 0.0229,-0.0248 0.0445,-0.0499 0.0644,-0.0759 0.11739,-0.13432 0.20381,-0.31608 0.23923,-0.55665 0.023,-0.12407 0.0276,-0.21405 0.0276,-0.21405 v -14.13259 c 0,-1.17766 -1.17767,-1.17766 -1.17767,-1.17766 h -14.13279 c 0,0 -1.17765,0 -1.17765,1.17766 v 14.13258 c 0,0 0.005,0.09 0.0276,0.21406 0.0365,0.24057 0.1214,0.42233 0.23924,0.55664 0.02,0.0261 0.0421,0.0512 0.0644,0.0759 0.0248,0.023 0.0501,0.0445 0.0759,0.0644 0.13432,0.11738 0.3163,0.20359 0.55664,0.23923 0.12474,0.0227 0.21384,0.0276 0.21384,0.0276 z m -1.17788,-2.83222 v -11.30036 h -11.77704 11.77704 z"
-         id="path38-5"
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/vnc/32x32/emblems/remmina-vnc-ssh.svg b/plugins/vnc/32x32/emblems/remmina-vnc-ssh.svg
deleted file mode 100644
index a3aefe8c3..000000000
--- a/plugins/vnc/32x32/emblems/remmina-vnc-ssh.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.398028"
-   height="99.772079"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-162.79579,-187.48289)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path34"
-       d="m 175.99485,195.20186 c -1.73487,0 -3.13161,1.42611 -3.13161,3.18029 v 1.51686 h -0.7829 c -0.43365,0 -0.7829,0.34925 -0.7829,0.7829 v 4.69715 c 0,0.43365 0.34925,0.7829 0.7829,0.7829 h 7.82875 c 0.43366,0 0.78291,-0.34925 0.78291,-0.7829 v -4.69715 c 0,-0.43365 -0.34925,-0.7829 -0.78291,-0.7829 h -0.7829 v -1.51686 c 0,-1.75365 -1.39673,-3.18029 -3.13134,-3.18029 z m 0,1.56581 c 0.8673,0 1.56554,0.69823 1.56554,1.56554 v 1.5658 h -3.13135 v -1.5658 c 0,-0.86731 0.69824,-1.56554 1.56581,-1.56554 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path36"
-       d="m 187.30817,213.88092 c 0,0 0.14367,-0.008 0.34237,-0.0442 0.38523,-0.0569 0.67627,-0.195 0.89138,-0.38312 0.0415,-0.0317 0.082,-0.0661 0.12144,-0.10319 0.037,-0.0394 0.0712,-0.0796 0.10319,-0.12144 0.18785,-0.21484 0.32623,-0.50615 0.38285,-0.89112 0.0368,-0.1987 0.0444,-0.34263 0.0444,-0.34263 v -22.62691 c 0,-1.88542 -1.88568,-1.88542 -1.88568,-1.88542 h -22.6269 c 0,0 -1.88543,0 -1.88543,1.88542 v 22.6269 c 0,0 0.008,0.14393 0.0442,0.34264 0.0585,0.38497 0.19447,0.67627 0.38285,0.89111 0.032,0.0418 0.0675,0.082 0.10319,0.12145 0.0397,0.037 0.0802,0.0714 0.12144,0.10318 0.21511,0.18812 0.50668,0.32624 0.89138,0.38312 0.19976,0.0363 0.34238,0.0442 0.34238,0.0442 z m -1.88569,-4.5347 h -18.85553 v -18.09221 h 18.85553 z" />
-  </g>
-</svg>
diff --git a/plugins/vnc/32x32/emblems/remmina-vnc.svg b/plugins/vnc/32x32/emblems/remmina-vnc.svg
deleted file mode 100644
index 62e140ae2..000000000
--- a/plugins/vnc/32x32/emblems/remmina-vnc.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2">
-    <mask
-       height="400%"
-       width="400%"
-       y="-200%"
-       x="-200%"
-       id="_mask_t2Us8opi94eYjaS69EfyEcHSNVQ03DDZ">
-      <rect
-         id="rect40"
-         style="fill:#ffffff"
-         height="100%"
-         width="100%"
-         y="0"
-         x="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         id="path42"
-         d="m 850.286,202.852 c 0,0 0.452,-0.025 1.077,-0.139 1.211,-0.179 2.128,-0.614 2.804,-1.205 0.13,-0.1 0.257,-0.208 0.382,-0.324 0.116,-0.125 0.224,-0.251 0.324,-0.382 0.592,-0.677 1.026,-1.593 1.205,-2.804 0.115,-0.625 0.139,-1.077 0.139,-1.077 V 125.75 c 0,-5.931 -5.931,-5.931 -5.931,-5.931 h -71.171 c 0,0 -5.931,0 -5.931,5.931 v 71.171 c 0,0 0.026,0.452 0.139,1.077 0.184,1.211 0.612,2.127 1.205,2.804 0.101,0.131 0.212,0.257 0.324,0.382 0.125,0.116 0.252,0.224 0.383,0.324 0.676,0.591 1.593,1.026 2.803,1.205 0.628,0.114 1.077,0.139 1.077,0.139 z m -5.931,-14.263 h -59.309 v -56.908 h 59.309 z" />
-    </mask>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-146.65306,-134.97453)"
-     id="layer1">
-    <g
-       transform="matrix(1.0697634,0,0,1.0697634,-9.2735492,-11.925523)"
-       id="g820">
-      <path
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615"
-         d="m 147.83075,137.94029 c 0,0 -1.17769,2e-5 -1.17769,1.17769 v 14.13263 c 0,0 0.005,0.09 0.0274,0.21405 0.0365,0.24056 0.12144,0.42255 0.23928,0.55686 0.02,0.0261 0.0421,0.051 0.0644,0.0757 0.0248,0.023 0.0503,0.0445 0.0761,0.0644 0.13431,0.11739 0.31608,0.20363 0.55643,0.23928 0.12474,0.0227 0.21405,0.0278 0.21405,0.0278 h 4.62807 v -2.83218 H 149.0084 V 140.2961 h 11.77727 v 4.05511 h 2.35536 v -5.23323 c 0,-1.17767 -1.17768,-1.17769 -1.17768,-1.17769 z m 12.95495,10.06883 v 3.58743 h -4.66941 v 2.83218 h 5.84709 c 0,0 0.09,-0.005 0.21405,-0.0278 0.24056,-0.0356 0.4221,-0.1219 0.55643,-0.23928 0.0258,-0.0199 0.0514,-0.0414 0.0761,-0.0644 0.023,-0.0247 0.0445,-0.0497 0.0644,-0.0757 0.11738,-0.13431 0.20386,-0.3163 0.23927,-0.55686 0.023,-0.12408 0.0274,-0.21405 0.0274,-0.21405 v -5.24149 z"
-         id="path38" />
-      <path
-         d="m 168.41828,161.43286 c 0,0 0.0898,-0.005 0.21384,-0.0276 0.24056,-0.0356 0.42232,-0.12185 0.55664,-0.23923 0.0258,-0.0199 0.0513,-0.0414 0.0759,-0.0644 0.0229,-0.0248 0.0445,-0.0499 0.0644,-0.0759 0.11739,-0.13432 0.20381,-0.31608 0.23923,-0.55665 0.023,-0.12407 0.0276,-0.21405 0.0276,-0.21405 v -14.13259 c 0,-1.17766 -1.17767,-1.17766 -1.17767,-1.17766 h -14.13279 c 0,0 -1.17765,0 -1.17765,1.17766 v 14.13258 c 0,0 0.005,0.09 0.0276,0.21406 0.0365,0.24057 0.1214,0.42233 0.23924,0.55664 0.02,0.0261 0.0421,0.0512 0.0644,0.0759 0.0248,0.023 0.0501,0.0445 0.0759,0.0644 0.13432,0.11738 0.3163,0.20359 0.55664,0.23923 0.12474,0.0227 0.21384,0.0276 0.21384,0.0276 z m -1.17788,-2.83222 v -11.30036 h -11.77704 11.77704 z"
-         id="path38-5"
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/vnc/48x48/emblems/remmina-vnc-ssh.svg b/plugins/vnc/48x48/emblems/remmina-vnc-ssh.svg
deleted file mode 100644
index a3aefe8c3..000000000
--- a/plugins/vnc/48x48/emblems/remmina-vnc-ssh.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.398028"
-   height="99.772079"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-162.79579,-187.48289)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path34"
-       d="m 175.99485,195.20186 c -1.73487,0 -3.13161,1.42611 -3.13161,3.18029 v 1.51686 h -0.7829 c -0.43365,0 -0.7829,0.34925 -0.7829,0.7829 v 4.69715 c 0,0.43365 0.34925,0.7829 0.7829,0.7829 h 7.82875 c 0.43366,0 0.78291,-0.34925 0.78291,-0.7829 v -4.69715 c 0,-0.43365 -0.34925,-0.7829 -0.78291,-0.7829 h -0.7829 v -1.51686 c 0,-1.75365 -1.39673,-3.18029 -3.13134,-3.18029 z m 0,1.56581 c 0.8673,0 1.56554,0.69823 1.56554,1.56554 v 1.5658 h -3.13135 v -1.5658 c 0,-0.86731 0.69824,-1.56554 1.56581,-1.56554 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path36"
-       d="m 187.30817,213.88092 c 0,0 0.14367,-0.008 0.34237,-0.0442 0.38523,-0.0569 0.67627,-0.195 0.89138,-0.38312 0.0415,-0.0317 0.082,-0.0661 0.12144,-0.10319 0.037,-0.0394 0.0712,-0.0796 0.10319,-0.12144 0.18785,-0.21484 0.32623,-0.50615 0.38285,-0.89112 0.0368,-0.1987 0.0444,-0.34263 0.0444,-0.34263 v -22.62691 c 0,-1.88542 -1.88568,-1.88542 -1.88568,-1.88542 h -22.6269 c 0,0 -1.88543,0 -1.88543,1.88542 v 22.6269 c 0,0 0.008,0.14393 0.0442,0.34264 0.0585,0.38497 0.19447,0.67627 0.38285,0.89111 0.032,0.0418 0.0675,0.082 0.10319,0.12145 0.0397,0.037 0.0802,0.0714 0.12144,0.10318 0.21511,0.18812 0.50668,0.32624 0.89138,0.38312 0.19976,0.0363 0.34238,0.0442 0.34238,0.0442 z m -1.88569,-4.5347 h -18.85553 v -18.09221 h 18.85553 z" />
-  </g>
-</svg>
diff --git a/plugins/vnc/48x48/emblems/remmina-vnc.svg b/plugins/vnc/48x48/emblems/remmina-vnc.svg
deleted file mode 100644
index 62e140ae2..000000000
--- a/plugins/vnc/48x48/emblems/remmina-vnc.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2">
-    <mask
-       height="400%"
-       width="400%"
-       y="-200%"
-       x="-200%"
-       id="_mask_t2Us8opi94eYjaS69EfyEcHSNVQ03DDZ">
-      <rect
-         id="rect40"
-         style="fill:#ffffff"
-         height="100%"
-         width="100%"
-         y="0"
-         x="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         id="path42"
-         d="m 850.286,202.852 c 0,0 0.452,-0.025 1.077,-0.139 1.211,-0.179 2.128,-0.614 2.804,-1.205 0.13,-0.1 0.257,-0.208 0.382,-0.324 0.116,-0.125 0.224,-0.251 0.324,-0.382 0.592,-0.677 1.026,-1.593 1.205,-2.804 0.115,-0.625 0.139,-1.077 0.139,-1.077 V 125.75 c 0,-5.931 -5.931,-5.931 -5.931,-5.931 h -71.171 c 0,0 -5.931,0 -5.931,5.931 v 71.171 c 0,0 0.026,0.452 0.139,1.077 0.184,1.211 0.612,2.127 1.205,2.804 0.101,0.131 0.212,0.257 0.324,0.382 0.125,0.116 0.252,0.224 0.383,0.324 0.676,0.591 1.593,1.026 2.803,1.205 0.628,0.114 1.077,0.139 1.077,0.139 z m -5.931,-14.263 h -59.309 v -56.908 h 59.309 z" />
-    </mask>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-146.65306,-134.97453)"
-     id="layer1">
-    <g
-       transform="matrix(1.0697634,0,0,1.0697634,-9.2735492,-11.925523)"
-       id="g820">
-      <path
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615"
-         d="m 147.83075,137.94029 c 0,0 -1.17769,2e-5 -1.17769,1.17769 v 14.13263 c 0,0 0.005,0.09 0.0274,0.21405 0.0365,0.24056 0.12144,0.42255 0.23928,0.55686 0.02,0.0261 0.0421,0.051 0.0644,0.0757 0.0248,0.023 0.0503,0.0445 0.0761,0.0644 0.13431,0.11739 0.31608,0.20363 0.55643,0.23928 0.12474,0.0227 0.21405,0.0278 0.21405,0.0278 h 4.62807 v -2.83218 H 149.0084 V 140.2961 h 11.77727 v 4.05511 h 2.35536 v -5.23323 c 0,-1.17767 -1.17768,-1.17769 -1.17768,-1.17769 z m 12.95495,10.06883 v 3.58743 h -4.66941 v 2.83218 h 5.84709 c 0,0 0.09,-0.005 0.21405,-0.0278 0.24056,-0.0356 0.4221,-0.1219 0.55643,-0.23928 0.0258,-0.0199 0.0514,-0.0414 0.0761,-0.0644 0.023,-0.0247 0.0445,-0.0497 0.0644,-0.0757 0.11738,-0.13431 0.20386,-0.3163 0.23927,-0.55686 0.023,-0.12408 0.0274,-0.21405 0.0274,-0.21405 v -5.24149 z"
-         id="path38" />
-      <path
-         d="m 168.41828,161.43286 c 0,0 0.0898,-0.005 0.21384,-0.0276 0.24056,-0.0356 0.42232,-0.12185 0.55664,-0.23923 0.0258,-0.0199 0.0513,-0.0414 0.0759,-0.0644 0.0229,-0.0248 0.0445,-0.0499 0.0644,-0.0759 0.11739,-0.13432 0.20381,-0.31608 0.23923,-0.55665 0.023,-0.12407 0.0276,-0.21405 0.0276,-0.21405 v -14.13259 c 0,-1.17766 -1.17767,-1.17766 -1.17767,-1.17766 h -14.13279 c 0,0 -1.17765,0 -1.17765,1.17766 v 14.13258 c 0,0 0.005,0.09 0.0276,0.21406 0.0365,0.24057 0.1214,0.42233 0.23924,0.55664 0.02,0.0261 0.0421,0.0512 0.0644,0.0759 0.0248,0.023 0.0501,0.0445 0.0759,0.0644 0.13432,0.11738 0.3163,0.20359 0.55664,0.23923 0.12474,0.0227 0.21384,0.0276 0.21384,0.0276 z m -1.17788,-2.83222 v -11.30036 h -11.77704 11.77704 z"
-         id="path38-5"
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/vnc/64x64/emblems/remmina-vnc-ssh.svg b/plugins/vnc/64x64/emblems/remmina-vnc-ssh.svg
deleted file mode 100644
index a3aefe8c3..000000000
--- a/plugins/vnc/64x64/emblems/remmina-vnc-ssh.svg
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.39801 26.398028"
-   height="99.772079"
-   width="99.772003">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-162.79579,-187.48289)"
-     id="layer1">
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path34"
-       d="m 175.99485,195.20186 c -1.73487,0 -3.13161,1.42611 -3.13161,3.18029 v 1.51686 h -0.7829 c -0.43365,0 -0.7829,0.34925 -0.7829,0.7829 v 4.69715 c 0,0.43365 0.34925,0.7829 0.7829,0.7829 h 7.82875 c 0.43366,0 0.78291,-0.34925 0.78291,-0.7829 v -4.69715 c 0,-0.43365 -0.34925,-0.7829 -0.78291,-0.7829 h -0.7829 v -1.51686 c 0,-1.75365 -1.39673,-3.18029 -3.13134,-3.18029 z m 0,1.56581 c 0.8673,0 1.56554,0.69823 1.56554,1.56554 v 1.5658 h -3.13135 v -1.5658 c 0,-0.86731 0.69824,-1.56554 1.56581,-1.56554 z" />
-    <path
-       style="isolation:isolate;fill:#171717;stroke-width:0.26458332"
-       id="path36"
-       d="m 187.30817,213.88092 c 0,0 0.14367,-0.008 0.34237,-0.0442 0.38523,-0.0569 0.67627,-0.195 0.89138,-0.38312 0.0415,-0.0317 0.082,-0.0661 0.12144,-0.10319 0.037,-0.0394 0.0712,-0.0796 0.10319,-0.12144 0.18785,-0.21484 0.32623,-0.50615 0.38285,-0.89112 0.0368,-0.1987 0.0444,-0.34263 0.0444,-0.34263 v -22.62691 c 0,-1.88542 -1.88568,-1.88542 -1.88568,-1.88542 h -22.6269 c 0,0 -1.88543,0 -1.88543,1.88542 v 22.6269 c 0,0 0.008,0.14393 0.0442,0.34264 0.0585,0.38497 0.19447,0.67627 0.38285,0.89111 0.032,0.0418 0.0675,0.082 0.10319,0.12145 0.0397,0.037 0.0802,0.0714 0.12144,0.10318 0.21511,0.18812 0.50668,0.32624 0.89138,0.38312 0.19976,0.0363 0.34238,0.0442 0.34238,0.0442 z m -1.88569,-4.5347 h -18.85553 v -18.09221 h 18.85553 z" />
-  </g>
-</svg>
diff --git a/plugins/vnc/64x64/emblems/remmina-vnc.svg b/plugins/vnc/64x64/emblems/remmina-vnc.svg
deleted file mode 100644
index 62e140ae2..000000000
--- a/plugins/vnc/64x64/emblems/remmina-vnc.svg
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458335 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2">
-    <mask
-       height="400%"
-       width="400%"
-       y="-200%"
-       x="-200%"
-       id="_mask_t2Us8opi94eYjaS69EfyEcHSNVQ03DDZ">
-      <rect
-         id="rect40"
-         style="fill:#ffffff"
-         height="100%"
-         width="100%"
-         y="0"
-         x="0" />
-      <path
-         style="fill:#000000;stroke:none"
-         id="path42"
-         d="m 850.286,202.852 c 0,0 0.452,-0.025 1.077,-0.139 1.211,-0.179 2.128,-0.614 2.804,-1.205 0.13,-0.1 0.257,-0.208 0.382,-0.324 0.116,-0.125 0.224,-0.251 0.324,-0.382 0.592,-0.677 1.026,-1.593 1.205,-2.804 0.115,-0.625 0.139,-1.077 0.139,-1.077 V 125.75 c 0,-5.931 -5.931,-5.931 -5.931,-5.931 h -71.171 c 0,0 -5.931,0 -5.931,5.931 v 71.171 c 0,0 0.026,0.452 0.139,1.077 0.184,1.211 0.612,2.127 1.205,2.804 0.101,0.131 0.212,0.257 0.324,0.382 0.125,0.116 0.252,0.224 0.383,0.324 0.676,0.591 1.593,1.026 2.803,1.205 0.628,0.114 1.077,0.139 1.077,0.139 z m -5.931,-14.263 h -59.309 v -56.908 h 59.309 z" />
-    </mask>
-  </defs>
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-146.65306,-134.97453)"
-     id="layer1">
-    <g
-       transform="matrix(1.0697634,0,0,1.0697634,-9.2735492,-11.925523)"
-       id="g820">
-      <path
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615"
-         d="m 147.83075,137.94029 c 0,0 -1.17769,2e-5 -1.17769,1.17769 v 14.13263 c 0,0 0.005,0.09 0.0274,0.21405 0.0365,0.24056 0.12144,0.42255 0.23928,0.55686 0.02,0.0261 0.0421,0.051 0.0644,0.0757 0.0248,0.023 0.0503,0.0445 0.0761,0.0644 0.13431,0.11739 0.31608,0.20363 0.55643,0.23928 0.12474,0.0227 0.21405,0.0278 0.21405,0.0278 h 4.62807 v -2.83218 H 149.0084 V 140.2961 h 11.77727 v 4.05511 h 2.35536 v -5.23323 c 0,-1.17767 -1.17768,-1.17769 -1.17768,-1.17769 z m 12.95495,10.06883 v 3.58743 h -4.66941 v 2.83218 h 5.84709 c 0,0 0.09,-0.005 0.21405,-0.0278 0.24056,-0.0356 0.4221,-0.1219 0.55643,-0.23928 0.0258,-0.0199 0.0514,-0.0414 0.0761,-0.0644 0.023,-0.0247 0.0445,-0.0497 0.0644,-0.0757 0.11738,-0.13431 0.20386,-0.3163 0.23927,-0.55686 0.023,-0.12408 0.0274,-0.21405 0.0274,-0.21405 v -5.24149 z"
-         id="path38" />
-      <path
-         d="m 168.41828,161.43286 c 0,0 0.0898,-0.005 0.21384,-0.0276 0.24056,-0.0356 0.42232,-0.12185 0.55664,-0.23923 0.0258,-0.0199 0.0513,-0.0414 0.0759,-0.0644 0.0229,-0.0248 0.0445,-0.0499 0.0644,-0.0759 0.11739,-0.13432 0.20381,-0.31608 0.23923,-0.55665 0.023,-0.12407 0.0276,-0.21405 0.0276,-0.21405 v -14.13259 c 0,-1.17766 -1.17767,-1.17766 -1.17767,-1.17766 h -14.13279 c 0,0 -1.17765,0 -1.17765,1.17766 v 14.13258 c 0,0 0.005,0.09 0.0276,0.21406 0.0365,0.24057 0.1214,0.42233 0.23924,0.55664 0.02,0.0261 0.0421,0.0512 0.0644,0.0759 0.0248,0.023 0.0501,0.0445 0.0759,0.0644 0.13432,0.11738 0.3163,0.20359 0.55664,0.23923 0.12474,0.0227 0.21384,0.0276 0.21384,0.0276 z m -1.17788,-2.83222 v -11.30036 h -11.77704 11.77704 z"
-         id="path38-5"
-         style="isolation:isolate;fill:#171717;stroke-width:0.22274615" />
-    </g>
-  </g>
-</svg>
diff --git a/plugins/vnc/CMakeLists.txt b/plugins/vnc/CMakeLists.txt
index e0793eda1..f32ec87a6 100644
--- a/plugins/vnc/CMakeLists.txt
+++ b/plugins/vnc/CMakeLists.txt
@@ -47,8 +47,6 @@ target_link_libraries(remmina-plugin-vnc ${REMMINA_COMMON_LIBRARIES} ${LIBVNCSER
 install(TARGETS remmina-plugin-vnc DESTINATION ${REMMINA_PLUGINDIR})
 
 install(FILES
-    16x16/emblems/remmina-vnc-ssh.svg
-    16x16/emblems/remmina-vnc.svg DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES
-    22x22/emblems/remmina-vnc-ssh.svg
-    22x22/emblems/remmina-vnc.svg DESTINATION ${APPICON22_EMBLEMS_DIR})
+    scalable/emblems/remmina-vnc-ssh-symbolic.svg
+    scalable/emblems/remmina-vnc-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/vnc/scalable/emblems/remmina-vnc-ssh.svg b/plugins/vnc/scalable/emblems/remmina-vnc-ssh-symbolic.svg
index 6c1da590e..6c1da590e 100644
--- a/plugins/vnc/scalable/emblems/remmina-vnc-ssh.svg
+++ b/plugins/vnc/scalable/emblems/remmina-vnc-ssh-symbolic.svg
diff --git a/plugins/vnc/scalable/emblems/remmina-vnc.svg b/plugins/vnc/scalable/emblems/remmina-vnc-symbolic.svg
index 060a62a94..060a62a94 100644
--- a/plugins/vnc/scalable/emblems/remmina-vnc.svg
+++ b/plugins/vnc/scalable/emblems/remmina-vnc-symbolic.svg
diff --git a/plugins/vnc/vnc_plugin.c b/plugins/vnc/vnc_plugin.c
index bf5d5ce07..577e3fcd6 100644
--- a/plugins/vnc/vnc_plugin.c
+++ b/plugins/vnc/vnc_plugin.c
@@ -1944,8 +1944,8 @@ static RemminaProtocolPlugin remmina_plugin_vnci =
 	N_("VNCI - VNC viewer listen mode"),            // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	VERSION,                                        // Version number
-	"remmina-vnc",                                  // Icon for normal connection
-	"remmina-vnc-ssh",                              // Icon for SSH connection
+	"remmina-vnc-symbolic",                         // Icon for normal connection
+	"remmina-vnc-ssh-symbolic",                     // Icon for SSH connection
 	remmina_plugin_vnci_basic_settings,             // Array for basic settings
 	remmina_plugin_vnc_advanced_settings,           // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_REVERSE_TUNNEL,    // SSH settings type
diff --git a/plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.svg
deleted file mode 100644
index ea9137f58..000000000
--- a/plugins/xdmcp/16x16/emblems/remmina-xdmcp-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-    </g>
-    <text
-       transform="scale(1.1307703,0.8843529)"
-       id="text878"
-       y="189.5112"
-       x="162.67989"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629363"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629363"
-         y="189.5112"
-         x="162.67989"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/16x16/emblems/remmina-xdmcp.svg b/plugins/xdmcp/16x16/emblems/remmina-xdmcp.svg
deleted file mode 100644
index 1bf069269..000000000
--- a/plugins/xdmcp/16x16/emblems/remmina-xdmcp.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <text
-       transform="scale(1.1307703,0.88435289)"
-       id="text878"
-       y="241.33113"
-       x="172.4735"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629366"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629366"
-         y="241.33113"
-         x="172.4735"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.svg
deleted file mode 100644
index ea9137f58..000000000
--- a/plugins/xdmcp/22x22/emblems/remmina-xdmcp-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-    </g>
-    <text
-       transform="scale(1.1307703,0.8843529)"
-       id="text878"
-       y="189.5112"
-       x="162.67989"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629363"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629363"
-         y="189.5112"
-         x="162.67989"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/22x22/emblems/remmina-xdmcp.svg b/plugins/xdmcp/22x22/emblems/remmina-xdmcp.svg
deleted file mode 100644
index 1bf069269..000000000
--- a/plugins/xdmcp/22x22/emblems/remmina-xdmcp.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <text
-       transform="scale(1.1307703,0.88435289)"
-       id="text878"
-       y="241.33113"
-       x="172.4735"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629366"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629366"
-         y="241.33113"
-         x="172.4735"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/24x24/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/24x24/emblems/remmina-xdmcp-ssh.svg
deleted file mode 100644
index ea9137f58..000000000
--- a/plugins/xdmcp/24x24/emblems/remmina-xdmcp-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-    </g>
-    <text
-       transform="scale(1.1307703,0.8843529)"
-       id="text878"
-       y="189.5112"
-       x="162.67989"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629363"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629363"
-         y="189.5112"
-         x="162.67989"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/24x24/emblems/remmina-xdmcp.svg b/plugins/xdmcp/24x24/emblems/remmina-xdmcp.svg
deleted file mode 100644
index 1bf069269..000000000
--- a/plugins/xdmcp/24x24/emblems/remmina-xdmcp.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <text
-       transform="scale(1.1307703,0.88435289)"
-       id="text878"
-       y="241.33113"
-       x="172.4735"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629366"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629366"
-         y="241.33113"
-         x="172.4735"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/32x32/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/32x32/emblems/remmina-xdmcp-ssh.svg
deleted file mode 100644
index ea9137f58..000000000
--- a/plugins/xdmcp/32x32/emblems/remmina-xdmcp-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-    </g>
-    <text
-       transform="scale(1.1307703,0.8843529)"
-       id="text878"
-       y="189.5112"
-       x="162.67989"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629363"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629363"
-         y="189.5112"
-         x="162.67989"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/32x32/emblems/remmina-xdmcp.svg b/plugins/xdmcp/32x32/emblems/remmina-xdmcp.svg
deleted file mode 100644
index 1bf069269..000000000
--- a/plugins/xdmcp/32x32/emblems/remmina-xdmcp.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <text
-       transform="scale(1.1307703,0.88435289)"
-       id="text878"
-       y="241.33113"
-       x="172.4735"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629366"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629366"
-         y="241.33113"
-         x="172.4735"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/48x48/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/48x48/emblems/remmina-xdmcp-ssh.svg
deleted file mode 100644
index ea9137f58..000000000
--- a/plugins/xdmcp/48x48/emblems/remmina-xdmcp-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-    </g>
-    <text
-       transform="scale(1.1307703,0.8843529)"
-       id="text878"
-       y="189.5112"
-       x="162.67989"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629363"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629363"
-         y="189.5112"
-         x="162.67989"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/48x48/emblems/remmina-xdmcp.svg b/plugins/xdmcp/48x48/emblems/remmina-xdmcp.svg
deleted file mode 100644
index 1bf069269..000000000
--- a/plugins/xdmcp/48x48/emblems/remmina-xdmcp.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <text
-       transform="scale(1.1307703,0.88435289)"
-       id="text878"
-       y="241.33113"
-       x="172.4735"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629366"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629366"
-         y="241.33113"
-         x="172.4735"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/64x64/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/64x64/emblems/remmina-xdmcp-ssh.svg
deleted file mode 100644
index ea9137f58..000000000
--- a/plugins/xdmcp/64x64/emblems/remmina-xdmcp-ssh.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458332"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-179.27135,-141.84345)"
-     id="layer1">
-    <g
-       transform="matrix(0.93878631,0,0,0.93878631,13.549948,10.22929)"
-       id="g817">
-      <path
-         d="m 198.19488,149.24807 v -1.36551 c 0,-4.22699 -3.44647,-7.60863 -7.60836,-7.60863 -4.22698,0 -7.60836,3.44673 -7.60836,7.60863 v 1.36551 h -3.70681 v 19.05371 h 6.05499 16.64044 v -19.05371 z m -11.25009,-1.36551 c 0,-2.01613 1.62587,-3.57664 3.57664,-3.57664 2.01586,0 3.57664,1.6256 3.57664,3.57664 v 1.36551 h -7.21836 v -1.36551 z"
-         id="path79"
-         style="isolation:isolate;fill:#000000;stroke-width:0.26458332" />
-    </g>
-    <text
-       transform="scale(1.1307703,0.8843529)"
-       id="text878"
-       y="189.5112"
-       x="162.67989"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629363"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629363"
-         y="189.5112"
-         x="162.67989"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/64x64/emblems/remmina-xdmcp.svg b/plugins/xdmcp/64x64/emblems/remmina-xdmcp.svg
deleted file mode 100644
index 1bf069269..000000000
--- a/plugins/xdmcp/64x64/emblems/remmina-xdmcp.svg
+++ /dev/null
@@ -1,72 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   id="svg8"
-   version="1.1"
-   viewBox="0 0 26.458334 26.458333"
-   height="100"
-   width="100">
-  <defs
-     id="defs2" />
-  <metadata
-     id="metadata5">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-        <cc:license
-           rdf:resource="" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     transform="translate(-190.61238,-192.38458)"
-     id="layer1">
-    <g
-       id="RDP Icons"
-       style="isolation:isolate"
-       transform="matrix(0.26458333,0,0,0.26458333,153.78079,124.26165)">
-      <g
-         id="Group" />
-      <g
-         id="g50">
-        <path
-           style="fill:#000000"
-           id="path48"
-           d="m 139.626,307.472 c 0,-27.364 22.216,-49.58 49.58,-49.58 27.364,0 49.58,22.216 49.58,49.58 0,27.364 -22.216,49.581 -49.58,49.581 -27.364,0 -49.58,-22.217 -49.58,-49.581 z" />
-      </g>
-      <g
-         id="g62">
-        <g
-           id="g52" />
-        <g
-           id="g54" />
-        <g
-           id="g56" />
-        <g
-           id="g60">
-          <g
-             id="g58" />
-        </g>
-      </g>
-    </g>
-    <text
-       transform="scale(1.1307703,0.88435289)"
-       id="text878"
-       y="241.33113"
-       x="172.4735"
-       style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;line-height:158.14682007px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.31629366"
-       xml:space="preserve"><tspan
-         style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:25.30349159px;font-family:monospace;-inkscape-font-specification:'monospace, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;fill:#ffffff;stroke-width:0.31629366"
-         y="241.33113"
-         x="172.4735"
-         id="tspan876">X</tspan></text>
-  </g>
-</svg>
diff --git a/plugins/xdmcp/CMakeLists.txt b/plugins/xdmcp/CMakeLists.txt
index cb9d066c6..590c3b88d 100644
--- a/plugins/xdmcp/CMakeLists.txt
+++ b/plugins/xdmcp/CMakeLists.txt
@@ -43,11 +43,8 @@ target_link_libraries(remmina-plugin-xdmcp ${REMMINA_COMMON_LIBRARIES})
 
 install(TARGETS remmina-plugin-xdmcp DESTINATION ${REMMINA_PLUGINDIR})
 
+
 install(FILES
-    16x16/emblems/remmina-xdmcp-ssh.svg
-    16x16/emblems/remmina-xdmcp.svg
-    DESTINATION ${APPICON16_EMBLEMS_DIR})
-install(FILES
-    22x22/emblems/remmina-xdmcp-ssh.svg
-    22x22/emblems/remmina-xdmcp.svg
-    DESTINATION ${APPICON22_EMBLEMS_DIR})
+    scalable/emblems/remmina-xdmcp-ssh-symbolic.svg
+    scalable/emblems/remmina-xdmcp-symbolic.svg
+    DESTINATION ${APPICONSCALE_EMBLEMS_DIR})
diff --git a/plugins/xdmcp/scalable/emblems/remmina-xdmcp-ssh.svg b/plugins/xdmcp/scalable/emblems/remmina-xdmcp-ssh-symbolic.svg
index 93c14e293..93c14e293 100644
--- a/plugins/xdmcp/scalable/emblems/remmina-xdmcp-ssh.svg
+++ b/plugins/xdmcp/scalable/emblems/remmina-xdmcp-ssh-symbolic.svg
diff --git a/plugins/xdmcp/scalable/emblems/remmina-xdmcp.svg b/plugins/xdmcp/scalable/emblems/remmina-xdmcp-symbolic.svg
index 0c05782a8..0c05782a8 100644
--- a/plugins/xdmcp/scalable/emblems/remmina-xdmcp.svg
+++ b/plugins/xdmcp/scalable/emblems/remmina-xdmcp-symbolic.svg
diff --git a/plugins/xdmcp/xdmcp_plugin.c b/plugins/xdmcp/xdmcp_plugin.c
index e0a3d632a..bc5c78c9a 100644
--- a/plugins/xdmcp/xdmcp_plugin.c
+++ b/plugins/xdmcp/xdmcp_plugin.c
@@ -389,8 +389,8 @@ static RemminaProtocolPlugin remmina_plugin_xdmcp =
 	N_("XDMCP - X Remote Session"),                 // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	VERSION,                                        // Version number
-	"remmina-xdmcp",                                // Icon for normal connection
-	"remmina-xdmcp-ssh",                            // Icon for SSH connection
+	"remmina-xdmcp-symbolic",                       // Icon for normal connection
+	"remmina-xdmcp-ssh-symbolic",                   // Icon for SSH connection
 	remmina_plugin_xdmcp_basic_settings,            // Array for basic settings
 	NULL,                                           // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            // SSH settings type
diff --git a/src/remmina_chat_window.c b/src/remmina_chat_window.c
index dd869f1ff..349c525c2 100644
--- a/src/remmina_chat_window.c
+++ b/src/remmina_chat_window.c
@@ -224,7 +224,7 @@ remmina_chat_window_new(GtkWindow* parent, const gchar* chat_with)
 	window->send_text = widget;
 
 	/* Send button */
-	image = gtk_image_new_from_icon_name("remmina-document-send", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("remmina-document-send-symbolic", GTK_ICON_SIZE_BUTTON);
 	gtk_widget_show(image);
 
 	widget = gtk_button_new_with_mnemonic(_("_Send"));
diff --git a/src/remmina_connection_window.c b/src/remmina_connection_window.c
index 7b8d95313..36b373fc1 100644
--- a/src/remmina_connection_window.c
+++ b/src/remmina_connection_window.c
@@ -1879,7 +1879,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Auto-Fit */
 	toolitem = gtk_tool_button_new(NULL, NULL);
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-fit-window");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-fit-window-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Resize the window to fit in remote resolution"),
 		remmina_pref.shortcutkey_autofit, 0);
 	g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(remmina_connection_holder_toolbar_autofit), cnnhld);
@@ -1889,7 +1889,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Fullscreen toggle */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-fullscreen");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-fullscreen-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Toggle fullscreen mode"),
 		remmina_pref.shortcutkey_fullscreen, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -1931,7 +1931,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Switch tabs */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-switch-page");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-switch-page-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Switch tab pages"), remmina_pref.shortcutkey_prevtab,
 		remmina_pref.shortcutkey_nexttab);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -1945,7 +1945,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Dynamic Resolution Update */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-dynres");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-dynres-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Toggle dynamic resolution update"),
 		remmina_pref.shortcutkey_dynres, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -1955,7 +1955,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Scaler button */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-scale");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-scale-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Toggle scaled mode"), remmina_pref.shortcutkey_scale, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -1991,7 +1991,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 
 	/* Grab keyboard button */
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-keyboard");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-keyboard-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Grab all keyboard events"),
 		remmina_pref.shortcutkey_grab, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2000,7 +2000,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	priv->toolitem_grab = toolitem;
 
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-preferences-system");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-preferences-system-symbolic");
 	gtk_tool_item_set_tooltip_text(toolitem, _("Preferences"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2008,7 +2008,7 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	priv->toolitem_preferences = toolitem;
 
 	toolitem = gtk_toggle_tool_button_new();
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-system-run");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-system-run-symbolic");
 	gtk_tool_button_set_label(GTK_TOOL_BUTTON(toolitem), _("Tools"));
 	gtk_tool_item_set_tooltip_text(toolitem, _("Tools"));
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
@@ -2021,21 +2021,21 @@ remmina_connection_holder_create_toolbar(RemminaConnectionHolder* cnnhld, gint m
 	gtk_widget_show(GTK_WIDGET(toolitem));
 
 	toolitem = gtk_tool_button_new(NULL, "_Screenshot");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-camera-photo");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-camera-photo-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Screenshot"), remmina_pref.shortcutkey_screenshot, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
 	g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(remmina_connection_holder_toolbar_screenshot), cnnhld);
 
 	toolitem = gtk_tool_button_new(NULL, "_Bottom");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-go-bottom");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-go-bottom-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Minimize window"), remmina_pref.shortcutkey_minimize, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
 	g_signal_connect(G_OBJECT(toolitem), "clicked", G_CALLBACK(remmina_connection_holder_toolbar_minimize), cnnhld);
 
 	toolitem = gtk_tool_button_new(NULL, "_Disconnect");
-	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-disconnect");
+	gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(toolitem), "remmina-disconnect-symbolic");
 	remmina_connection_holder_set_tooltip(GTK_WIDGET(toolitem), _("Disconnect"), remmina_pref.shortcutkey_disconnect, 0);
 	gtk_toolbar_insert(GTK_TOOLBAR(toolbar), toolitem, -1);
 	gtk_widget_show(GTK_WIDGET(toolitem));
@@ -2430,10 +2430,10 @@ static void remmina_connection_holder_update_pin(RemminaConnectionHolder* cnnhld
 	TRACE_CALL(__func__);
 	if (cnnhld->cnnwin->priv->pin_down) {
 		gtk_button_set_image(GTK_BUTTON(cnnhld->cnnwin->priv->pin_button),
-			gtk_image_new_from_icon_name("remmina-pin-down", GTK_ICON_SIZE_MENU));
+			gtk_image_new_from_icon_name("remmina-pin-down-symbolic", GTK_ICON_SIZE_MENU));
 	}else {
 		gtk_button_set_image(GTK_BUTTON(cnnhld->cnnwin->priv->pin_button),
-			gtk_image_new_from_icon_name("remmina-pin-up", GTK_ICON_SIZE_MENU));
+			gtk_image_new_from_icon_name("remmina-pin-up-symbolic", GTK_ICON_SIZE_MENU));
 	}
 }
 
diff --git a/src/remmina_ftp_client.c b/src/remmina_ftp_client.c
index e50efc175..f1cfc0884 100644
--- a/src/remmina_ftp_client.c
+++ b/src/remmina_ftp_client.c
@@ -657,14 +657,14 @@ static void remmina_ftp_client_popup_menu(RemminaFTPClient *client, GdkEventButt
 
 	menuitem = gtk_menu_item_new_with_label(_("Download"));
 	gtk_widget_show(menuitem);
-	image = gtk_image_new_from_icon_name("remmina-document-save", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name("remmina-document-save-symbolic", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_download), client);
 
 	menuitem = gtk_menu_item_new_with_label(_("Upload"));
 	gtk_widget_show(menuitem);
-	image = gtk_image_new_from_icon_name("remmina-document-send", GTK_ICON_SIZE_MENU);
+	image = gtk_image_new_from_icon_name("remmina-document-send-symbolic", GTK_ICON_SIZE_MENU);
 	gtk_widget_show(image);
 	gtk_menu_shell_append(GTK_MENU_SHELL(menu), menuitem);
 	g_signal_connect(G_OBJECT(menuitem), "activate", G_CALLBACK(remmina_ftp_client_action_upload), client);
@@ -781,7 +781,7 @@ static GtkWidget* remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Download from server"));
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	image = gtk_image_new_from_icon_name("remmina-document-save", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("remmina-document-save-symbolic", GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image(GTK_BUTTON(button), image);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_download), client);
@@ -792,7 +792,7 @@ static GtkWidget* remmina_ftp_client_create_toolbar(RemminaFTPClient *client)
 	gtk_widget_show(button);
 	gtk_widget_set_tooltip_text(button, _("Upload to server"));
 	gtk_button_set_relief(GTK_BUTTON(button), GTK_RELIEF_NONE);
-	image = gtk_image_new_from_icon_name("remmina-document-send", GTK_ICON_SIZE_BUTTON);
+	image = gtk_image_new_from_icon_name("remmina-document-send-symbolic", GTK_ICON_SIZE_BUTTON);
 	gtk_button_set_image(GTK_BUTTON(button), image);
 	gtk_box_pack_start(GTK_BOX(box), button, FALSE, FALSE, 0);
 	g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(remmina_ftp_client_action_upload), client);
diff --git a/src/remmina_sftp_plugin.c b/src/remmina_sftp_plugin.c
index 20dabe440..fdf2e16e4 100644
--- a/src/remmina_sftp_plugin.c
+++ b/src/remmina_sftp_plugin.c
@@ -370,8 +370,8 @@ static RemminaProtocolPlugin remmina_plugin_sftp =
 	N_("SFTP - Secure File Transfer"),              // Description
 	GETTEXT_PACKAGE,                                // Translation domain
 	VERSION,                                        // Version number
-	"remmina-sftp",                                 // Icon for normal connection
-	"remmina-sftp",                                 // Icon for SSH connection
+	"remmina-sftp-symbolic",                        // Icon for normal connection
+	"remmina-sftp-symbolic",                        // Icon for SSH connection
 	remmina_sftp_basic_settings,                    // Array for basic settings
 	NULL,                                           // Array for advanced settings
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            // SSH settings type
diff --git a/src/remmina_ssh_plugin.c b/src/remmina_ssh_plugin.c
index 02e1f5508..c4921e394 100644
--- a/src/remmina_ssh_plugin.c
+++ b/src/remmina_ssh_plugin.c
@@ -1023,8 +1023,8 @@ static RemminaProtocolPlugin remmina_plugin_ssh =
 	N_("SSH - Secure Shell"),                       /**< Description */
 	GETTEXT_PACKAGE,                                /**< Translation domain */
 	VERSION,                                        /**< Version number */
-	"remmina-ssh",                           /**< Icon for normal connection */
-	"remmina-ssh",                           /**< Icon for SSH connection */
+	"remmina-ssh-symbolic",                         /**< Icon for normal connection */
+	"remmina-ssh-symbolic",                         /**< Icon for SSH connection */
 	remmina_ssh_basic_settings,                     /**< Array for basic settings */
 	remmina_ssh_advanced_settings,                  /**< Array for advanced settings */
 	REMMINA_PROTOCOL_SSH_SETTING_TUNNEL,            /**< SSH settings type */