diff --git a/src/wmcads/assets/icon/general/arrow.svg b/src/wmcads/assets/icon/general/arrow.svg
old mode 100755
new mode 100644
index 2cd702c8..9b8d28b3
--- a/src/wmcads/assets/icon/general/arrow.svg
+++ b/src/wmcads/assets/icon/general/arrow.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M152.213 18l98.995 98.995a14.965 14.965 0 0 1 3.092 4.485c2.58 5.55 1.58 12.353-3 16.932l-98.994 98.995c-5.858 5.858-15.356 5.858-21.213 0-5.858-5.857-5.858-15.355 0-21.213L204.286 143H15c-8.284 0-15-6.716-15-15 0-8.284 6.716-15 15-15h189.786L131 39.213c-5.858-5.858-5.858-15.355 0-21.213 5.858-5.858 15.355-5.858 21.213 0z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M125.258 8.921c2.665-2.561 6.986-2.561 9.651 0l119.092 114.442c2.665 2.561 2.665 6.714 0 9.274L134.91 247.08c-2.665 2.561-6.986 2.561-9.65 0l-11.26-10.82c-2.665-2.56-2.665-6.713 0-9.274L201.187 143H5c-2.761 0-5-2.239-5-5v-20c0-2.761 2.239-5 5-5h196.189l-87.19-83.985c-2.603-2.502-2.664-6.522-.182-9.093l.182-.182z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/caret-down.svg b/src/wmcads/assets/icon/general/caret-down.svg
old mode 100755
new mode 100644
index 1f297661..37bb6f96
--- a/src/wmcads/assets/icon/general/caret-down.svg
+++ b/src/wmcads/assets/icon/general/caret-down.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M40.525 71h173.95c12.034 0 18.051 14.533 9.533 23.05l-86.942 86.996c-5.273 5.272-13.859 5.272-19.132 0L30.992 94.05C22.474 85.533 28.491 71 40.525 71z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M40.525 71h173.95c12.034 0 18.051 14.533 9.533 23.05l-86.942 86.996c-5.273 5.272-13.859 5.272-19.132 0L30.992 94.05C22.474 85.533 28.491 71 40.525 71z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/caret.svg b/src/wmcads/assets/icon/general/caret.svg
new file mode 100644
index 00000000..80abcfc0
--- /dev/null
+++ b/src/wmcads/assets/icon/general/caret.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M40.525 71h173.95c12.034 0 18.051 14.533 9.533 23.05l-86.942 86.996c-5.273 5.272-13.859 5.272-19.132 0L30.992 94.05C22.474 85.533 28.491 71 40.525 71z" transform="rotate(-180 127.5 128)"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/chat.svg b/src/wmcads/assets/icon/general/chat.svg
new file mode 100644
index 00000000..989c31cc
--- /dev/null
+++ b/src/wmcads/assets/icon/general/chat.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M245.753 227.097c4.088 0 7.775-2.444 9.42-6.22 1.6-3.777.844-8.131-1.955-11.108-.223-.178-10.042-10.752-16.84-24.393 12.219-12.041 19.55-27.148 19.55-43.632 0-35.545-33.99-64.914-78.288-70.157C163.688 45.995 130.764 28 92.42 28 41.368 28 .003 59.813.003 99.09c0 16.44 7.331 31.547 19.55 43.632-6.798 13.64-16.573 24.215-16.751 24.393-2.8 2.977-3.599 7.33-1.955 11.107 1.6 3.777 5.332 6.22 9.42 6.22 23.77 0 42.965-8.974 55.628-17.239 4.043.934 8.175 1.645 12.44 2.133 13.996 25.548 46.876 43.543 85.22 43.543 9.242 0 18.128-1.066 26.57-3.021 12.663 8.22 31.813 17.239 55.628 17.239zm-226.6-57.405c3.91-5.021 8.975-12.263 13.107-20.616l4.621-9.242-7.331-7.242c-7.02-6.887-15.329-18.306-15.329-33.502 0-31.368 35.1-56.872 78.2-56.872 43.098 0 78.198 25.504 78.198 56.872 0 31.369-35.1 56.872-78.199 56.872-7.864 0-15.729-.888-23.37-2.665l-5.866-1.333-5.065 3.288c-8.93 5.82-22.438 12.529-38.966 14.44zm217.58 42.61c-16.484-1.867-29.99-8.62-38.921-14.396l-5.066-3.288-5.865 1.377c-7.642 1.777-15.506 2.666-23.37 2.666-28.925 0-54.207-11.508-67.714-28.57 49.452-1.421 89.04-32.612 89.04-71 0-4.222-.577-8.31-1.466-12.308 33.501 6.442 58.339 28.614 58.339 54.961 0 15.196-8.309 26.615-15.33 33.502l-7.33 7.242 4.576 9.197c4.177 8.398 9.242 15.64 13.107 20.616z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/checkmark.svg b/src/wmcads/assets/icon/general/checkmark.svg
old mode 100755
new mode 100644
index 8e238cae..03b48aca
--- a/src/wmcads/assets/icon/general/checkmark.svg
+++ b/src/wmcads/assets/icon/general/checkmark.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M92.722 206.779l-71.5-71.475c-4.296-4.294-4.296-11.257 0-15.551l15.556-15.551c4.295-4.295 11.26-4.295 15.556 0L100.5 152.35 203.666 49.22c4.295-4.294 11.26-4.294 15.556 0l15.556 15.552c4.296 4.294 4.296 11.256 0 15.55l-126.5 126.457c-4.296 4.295-11.26 4.295-15.556 0z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M92.722 206.779l-71.5-71.475c-4.296-4.294-4.296-11.257 0-15.551l15.556-15.551c4.295-4.295 11.26-4.295 15.556 0L100.5 152.35 203.666 49.22c4.295-4.294 11.26-4.294 15.556 0l15.556 15.552c4.296 4.294 4.296 11.256 0 15.55l-126.5 126.457c-4.296 4.295-11.26 4.295-15.556 0z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/chevron-right.svg b/src/wmcads/assets/icon/general/chevron-right.svg
old mode 100755
new mode 100644
index e007b65e..37c6beda
--- a/src/wmcads/assets/icon/general/chevron-right.svg
+++ b/src/wmcads/assets/icon/general/chevron-right.svg
@@ -1,3 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M64.258 8.921l-11.26 10.82c-2.664 2.56-2.664 6.712 0 9.274L155.762 128 52.999 226.985c-2.665 2.56-2.665 6.713 0 9.274l11.26 10.82c2.664 2.561 6.985 2.561 9.65 0l119.092-114.442c2.665-2.56 2.665-6.713 0-9.274L73.91 8.921c-2.665-2.561-6.986-2.561-9.65 0z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <g>
+                <path d="M13.258 1.921l-11.26 10.82c-2.664 2.56-2.664 6.712 0 9.274L104.762 121 1.999 219.985c-2.665 2.56-2.665 6.713 0 9.274l11.26 10.82c2.664 2.561 6.985 2.561 9.65 0l119.092-114.442c2.665-2.56 2.665-6.713 0-9.274L22.91 1.921c-2.665-2.561-6.986-2.561-9.65 0z" transform="translate(56 7)"/>
+            </g>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/circle-hollow.svg b/src/wmcads/assets/icon/general/circle-hollow.svg
old mode 100755
new mode 100644
index bb3d74bf..98601786
--- a/src/wmcads/assets/icon/general/circle-hollow.svg
+++ b/src/wmcads/assets/icon/general/circle-hollow.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M128 0C57.29 0 0 57.29 0 128c0 70.71 57.29 128 128 128 70.71 0 128-57.29 128-128C256 57.29 198.71 0 128 0zm0 231c-56.907 0-103-46.093-103-103S71.093 25 128 25s103 46.093 103 103-46.093 103-103 103z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M128 0C57.29 0 0 57.29 0 128c0 70.71 57.29 128 128 128 70.71 0 128-57.29 128-128C256 57.29 198.71 0 128 0zm0 231c-56.907 0-103-46.093-103-103S71.093 25 128 25s103 46.093 103 103-46.093 103-103 103z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/circle-solid.svg b/src/wmcads/assets/icon/general/circle-solid.svg
old mode 100755
new mode 100644
index 8164bd2d..6573b575
--- a/src/wmcads/assets/icon/general/circle-solid.svg
+++ b/src/wmcads/assets/icon/general/circle-solid.svg
@@ -1,3 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M0 128c0 70.708 57.313 128 128 128s128-57.292 128-128C256 57.333 198.687 0 128 0S0 57.333 0 128z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <g>
+                <path d="M256 128c0 70.708-57.313 128-128 128S0 198.708 0 128C0 57.333 57.313 0 128 0s128 57.333 128 128z" transform="matrix(-1 0 0 1 256 0)"/>
+            </g>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/clock.svg b/src/wmcads/assets/icon/general/clock.svg
deleted file mode 100755
index 7a566ee2..00000000
--- a/src/wmcads/assets/icon/general/clock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M128 0C57.29 0 0 57.29 0 128c0 70.71 57.29 128 128 128 70.71 0 128-57.29 128-128C256 57.29 198.71 0 128 0zm0 231.226c-57.032 0-103.226-46.194-103.226-103.226S70.968 24.774 128 24.774 231.226 70.968 231.226 128 185.032 231.226 128 231.226zm31.897-53.884l-43.82-31.845a6.234 6.234 0 0 1-2.529-5.007V55.742c0-3.407 2.787-6.194 6.194-6.194h16.516c3.407 0 6.194 2.787 6.194 6.194v73.135l34.477 25.084c2.787 2.013 3.355 5.884 1.342 8.671L168.568 176c-2.013 2.735-5.884 3.355-8.671 1.342z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/general/cross.svg b/src/wmcads/assets/icon/general/cross.svg
old mode 100755
new mode 100644
index c38efa49..9efb7e8e
--- a/src/wmcads/assets/icon/general/cross.svg
+++ b/src/wmcads/assets/icon/general/cross.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M176.524 128l72.778-72.778c8.93-8.931 8.93-23.411 0-32.35L233.127 6.699c-8.93-8.93-23.41-8.93-32.349 0L128 79.476 55.222 6.698c-8.931-8.93-23.411-8.93-32.35 0L6.699 22.873c-8.93 8.93-8.93 23.41 0 32.349L79.476 128 6.698 200.778c-8.93 8.931-8.93 23.411 0 32.35l16.175 16.174c8.93 8.93 23.418 8.93 32.349 0L128 176.524l72.778 72.778c8.931 8.93 23.418 8.93 32.35 0l16.174-16.175c8.93-8.93 8.93-23.41 0-32.349L176.524 128z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M40.707 19.494l86.973 86.973 86.975-86.973c1.894-1.894 4.928-1.95 6.89-.172l.181.172 14.143 14.142c1.952 1.953 1.952 5.118 0 7.071l-86.975 86.973 86.975 86.975c1.952 1.953 1.952 5.119 0 7.071l-14.143 14.143c-1.952 1.952-5.118 1.952-7.07 0l-86.976-86.975-86.973 86.975c-1.893 1.893-4.928 1.95-6.89.172l-.181-.172-14.142-14.143c-1.953-1.952-1.953-5.118 0-7.07l86.973-86.976-86.973-86.973c-1.953-1.953-1.953-5.118 0-7.071l14.142-14.142c1.953-1.953 5.118-1.953 7.071 0z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/current-location.svg b/src/wmcads/assets/icon/general/current-location.svg
deleted file mode 100755
index c6d83f3b..00000000
--- a/src/wmcads/assets/icon/general/current-location.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M248 112h-25.44c-6.755-40.17-38.39-71.805-78.56-78.56V8c0-4.42-3.58-8-8-8h-16c-4.42 0-8 3.58-8 8v25.44C71.83 40.195 40.195 71.83 33.44 112H8c-4.42 0-8 3.58-8 8v16c0 4.42 3.58 8 8 8h25.44c6.755 40.17 38.39 71.805 78.56 78.56V248c0 4.42 3.58 8 8 8h16c4.42 0 8-3.58 8-8v-25.44c40.17-6.755 71.805-38.39 78.56-78.56H248c4.42 0 8-3.58 8-8v-16c0-4.42-3.58-8-8-8zm-120 80c-35.35 0-64-28.655-64-64s28.65-64 64-64 64 28.655 64 64-28.65 64-64 64zm0-108c-24.3 0-44 19.7-44 44s19.7 44 44 44 44-19.7 44-44-19.7-44-44-44z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/general/download.svg b/src/wmcads/assets/icon/general/download.svg
new file mode 100644
index 00000000..8f933573
--- /dev/null
+++ b/src/wmcads/assets/icon/general/download.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M217.973 112.783c2.703-2.693 2.703-7.047 0-9.682l-4.081-4.068c-2.702-2.692-7.072-2.692-9.774 0l-66.345 66.397L138 27.875c0-3.781-3.105-6.875-6.899-6.875h-5.749c-3.794 0-6.899 3.094-6.899 6.875l-.226 137.555-66.345-66.454c-2.702-2.692-7.072-2.692-9.774 0l-4.081 4.068c-2.703 2.692-2.703 7.046 0 9.739l85.086 85.072c2.702 2.693 7.072 2.693 9.774 0l85.086-85.072zM238 229.125c0 3.712-3.094 6.75-6.875 6.75H24.875c-3.781 0-6.875-3.038-6.875-6.75v-4.5c0-3.713 3.094-6.75 6.875-6.75h206.25c3.781 0 6.875 3.037 6.875 6.75v4.5z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/expand.svg b/src/wmcads/assets/icon/general/expand.svg
old mode 100755
new mode 100644
index 01ae919a..b7f10487
--- a/src/wmcads/assets/icon/general/expand.svg
+++ b/src/wmcads/assets/icon/general/expand.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M245.333 106.667h-96v-96C149.333 4.773 144.56 0 138.667 0h-21.334c-5.893 0-10.666 4.773-10.666 10.667v96h-96C4.773 106.667 0 111.44 0 117.333v21.334c0 5.893 4.773 10.666 10.667 10.666h96v96c0 5.894 4.773 10.667 10.666 10.667h21.334c5.893 0 10.666-4.773 10.666-10.667v-96h96c5.894 0 10.667-4.773 10.667-10.666v-21.334c0-5.893-4.773-10.666-10.667-10.666z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M245.333 106.667h-96v-96C149.333 4.773 144.56 0 138.667 0h-21.334c-5.893 0-10.666 4.773-10.666 10.667v96h-96C4.773 106.667 0 111.44 0 117.333v21.334c0 5.893 4.773 10.666 10.667 10.666h96v96c0 5.894 4.773 10.667 10.666 10.667h21.334c5.893 0 10.666-4.773 10.666-10.667v-96h96c5.894 0 10.667-4.773 10.667-10.666v-21.334c0-5.893-4.773-10.666-10.667-10.666z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/external-link.svg b/src/wmcads/assets/icon/general/external-link.svg
new file mode 100644
index 00000000..98766251
--- /dev/null
+++ b/src/wmcads/assets/icon/general/external-link.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M228.571 0H27.43C12.28 0 0 12.28 0 27.429V228.57C0 243.72 12.28 256 27.429 256H228.57C243.72 256 256 243.72 256 228.571V27.43C256 12.28 243.72 0 228.571 0zm8.64 228.061c0 5.045-4.105 9.15-9.15 9.15H26.765c-5.046 0-9.15-4.105-9.15-9.15V26.765c0-5.046 4.104-9.15 9.15-9.15H228.06c5.045 0 9.15 4.104 9.15 9.15V228.06zM57.208 195.55c-2.687-2.688-2.687-7.044 0-9.731L169.106 73.919l-.405-.405-51.582.196c-3.8 0-6.88-3.081-6.88-6.881v-5.733c0-3.8 3.08-6.881 6.88-6.881l77.982-.197c3.8 0 6.88 3.08 6.88 6.881l-.196 77.982c0 3.8-3.08 6.88-6.88 6.88h-5.734c-3.8 0-6.88-3.08-6.88-6.88l.195-51.582-.405-.405L70.182 198.792c-2.686 2.687-7.043 2.687-9.73 0l-3.244-3.243z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/favourite.svg b/src/wmcads/assets/icon/general/favourite.svg
old mode 100755
new mode 100644
index 127c3bfe..1ebe21b1
--- a/src/wmcads/assets/icon/general/favourite.svg
+++ b/src/wmcads/assets/icon/general/favourite.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="evenodd" d="M128.305 64.402l14.477-14.107c23.884-23.274 62.04-23.027 85.62.554.161.16.321.322.48.485 22.957 23.49 22.525 61.141-.964 84.098l-86.249 85.273c-6.154 6.085-16.03 6.173-22.292.2l-90.175-86.002c-23.48-22.393-24.36-59.58-1.967-83.059.32-.336.644-.667.972-.995 23.581-23.581 61.736-23.828 85.62-.554l14.478 14.107z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF">
+            <path d="M128.305 64.402l14.477-14.107c23.884-23.274 62.04-23.027 85.62.554.161.16.321.322.48.485 22.957 23.49 22.525 61.141-.964 84.098l-86.249 85.273c-6.154 6.085-16.03 6.173-22.292.2l-90.175-86.002c-23.48-22.393-24.36-59.58-1.967-83.059.32-.336.644-.667.972-.995 23.581-23.581 61.736-23.828 85.62-.554l14.478 14.107z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/file.svg b/src/wmcads/assets/icon/general/file.svg
old mode 100755
new mode 100644
index 6da15047..d0169796
--- a/src/wmcads/assets/icon/general/file.svg
+++ b/src/wmcads/assets/icon/general/file.svg
@@ -1 +1,7 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="file" class="svg-inline--fa fa-file fa-w-12" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 384 512"><path fill="currentColor" d="M224 136V0H24C10.7 0 0 10.7 0 24v464c0 13.3 10.7 24 24 24h336c13.3 0 24-10.7 24-24V160H248c-13.2 0-24-10.8-24-24zm160-14.1v6.1H256V0h6.1c6.4 0 12.5 2.5 17 7l97.9 98c4.5 4.5 7 10.6 7 16.9z"></path></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M144 68V0H44c-6.65 0-12 5.35-12 12v232c0 6.65 5.35 12 12 12h168c6.65 0 12-5.35 12-12V80h-68c-6.6 0-12-5.4-12-12zm80-6v3.103h-64V0h3.05c3.2 0 6.25 1.272 8.5 3.56l48.95 49.845c2.25 2.289 3.5 5.392 3.5 8.596z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/filter.svg b/src/wmcads/assets/icon/general/filter.svg
old mode 100755
new mode 100644
index c9af436b..c366918a
--- a/src/wmcads/assets/icon/general/filter.svg
+++ b/src/wmcads/assets/icon/general/filter.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M243.988 0H12.014C1.354 0-4.024 12.933 3.529 20.485l92.47 92.485V216c0 3.915 1.911 7.585 5.12 9.83l40 27.99c7.89 5.525 18.88-.074 18.88-9.83V112.97l92.474-92.485C260.01 12.948 254.67 0 243.988 0z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M243.988 0H12.014C1.354 0-4.024 12.933 3.529 20.485l92.47 92.485V216c0 3.915 1.911 7.585 5.12 9.83l40 27.99c7.89 5.525 18.88-.074 18.88-9.83V112.97l92.474-92.485C260.01 12.948 254.67 0 243.988 0z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/hamburger.svg b/src/wmcads/assets/icon/general/hamburger.svg
new file mode 100644
index 00000000..739eb9c2
--- /dev/null
+++ b/src/wmcads/assets/icon/general/hamburger.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M243.5 191c6.904 0 12.5 5.596 12.5 12.5s-5.596 12.5-12.5 12.5h-231C5.596 216 0 210.404 0 203.5S5.596 191 12.5 191h231zm0-75c6.904 0 12.5 5.596 12.5 12.5s-5.596 12.5-12.5 12.5h-231C5.596 141 0 135.404 0 128.5S5.596 116 12.5 116h231zm0-75c6.904 0 12.5 5.596 12.5 12.5S250.404 66 243.5 66h-231C5.596 66 0 60.404 0 53.5S5.596 41 12.5 41h231z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/home.svg b/src/wmcads/assets/icon/general/home.svg
new file mode 100644
index 00000000..9592d79f
--- /dev/null
+++ b/src/wmcads/assets/icon/general/home.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF">
+            <path d="M152.992 240.011l64.008-.165c4.416 0 8-3.584 8-8v-121.54l20.433 16.691c.609.495 1.739.896 2.522.896 1.05 0 2.44-.661 3.104-1.476l5.05-6.206c.492-.607.891-1.734.891-2.516 0-1.059-.67-2.456-1.496-3.119L139.065 19.564C136.625 17.597 132.102 16 128.97 16c-3.134 0-7.657 1.597-10.097 3.564L2.473 114.576C1.66 115.239 1 116.628 1 117.677c0 .783.4 1.912.893 2.52l5.051 6.205c.663.813 2.052 1.473 3.1 1.473.776 0 1.895-.393 2.5-.878l20.433-16.692V231.82c0 4.417 3.584 8.001 8.001 8.001h64.008c4.416 0 8-3.584 8-8v-64.009l32.005.15v64.048c0 4.417 3.584 8.001 8 8.001zm7.996-15.977v-64.093c-.014-4.389-3.587-7.973-7.976-8l-48.006-.135h-.025c-4.417 0-8.001 3.584-8.001 8v64.078H48.979V97.25l80.01-65.293 80.01 65.293-.056 126.635h.05l-48.005.15z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/id-card.svg b/src/wmcads/assets/icon/general/id-card.svg
old mode 100755
new mode 100644
index e6f05958..1b5aff34
--- a/src/wmcads/assets/icon/general/id-card.svg
+++ b/src/wmcads/assets/icon/general/id-card.svg
@@ -1,3 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M221.333 41H34.667C24.36 41 16 49.35 16 59.643v136.714C16 206.65 24.361 215 34.667 215h186.666C231.64 215 240 206.65 240 196.357V59.643C240 49.35 231.639 41 221.333 41zM84.444 78.286c13.728 0 24.89 11.147 24.89 24.857 0 13.71-11.162 24.857-24.89 24.857-13.727 0-24.888-11.147-24.888-24.857 0-13.71 11.16-24.857 24.888-24.857zM128 170.257c0 4.117-3.889 7.457-8.711 7.457H49.6c-4.822 0-8.711-3.34-8.711-7.457V162.8c0-12.35 11.705-22.371 26.133-22.371h1.945c4.783 1.98 9.994 3.107 15.477 3.107a40.177 40.177 0 0 0 15.478-3.107h1.945c14.427 0 26.133 10.02 26.133 22.371v7.457zm87.111-20.507c0 1.709-1.4 3.107-3.111 3.107h-56a3.118 3.118 0 0 1-3.111-3.107v-6.214c0-1.71 1.4-3.107 3.111-3.107h56a3.118 3.118 0 0 1 3.111 3.107v6.214zm0-24.857c0 1.709-1.4 3.107-3.111 3.107h-56a3.118 3.118 0 0 1-3.111-3.107v-6.214c0-1.71 1.4-3.108 3.111-3.108h56a3.118 3.118 0 0 1 3.111 3.108v6.214zm0-24.857c0 1.709-1.4 3.107-3.111 3.107h-56a3.118 3.118 0 0 1-3.111-3.107V93.82c0-1.709 1.4-3.107 3.111-3.107h56a3.118 3.118 0 0 1 3.111 3.107v6.215z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <g>
+                <path d="M205.333 0H18.667C8.36 0 0 8.35 0 18.643v136.714C0 165.65 8.361 174 18.667 174h186.666C215.64 174 224 165.65 224 155.357V18.643C224 8.35 215.639 0 205.333 0zM68.444 37.286c13.728 0 24.89 11.147 24.89 24.857C93.333 75.853 82.171 87 68.443 87c-13.727 0-24.888-11.147-24.888-24.857 0-13.71 11.16-24.857 24.888-24.857zM112 129.257c0 4.117-3.889 7.457-8.711 7.457H33.6c-4.822 0-8.711-3.34-8.711-7.457V121.8c0-12.35 11.705-22.371 26.133-22.371h1.945c4.783 1.98 9.994 3.107 15.477 3.107 5.484 0 10.734-1.127 15.478-3.107h1.945c14.427 0 26.133 10.02 26.133 22.371v7.457zm87.111-20.507c0 1.709-1.4 3.107-3.111 3.107h-56c-1.711 0-3.111-1.398-3.111-3.107v-6.214c0-1.71 1.4-3.107 3.111-3.107h56c1.711 0 3.111 1.398 3.111 3.107v6.214zm0-24.857c0 1.709-1.4 3.107-3.111 3.107h-56c-1.711 0-3.111-1.398-3.111-3.107v-6.214c0-1.71 1.4-3.108 3.111-3.108h56c1.711 0 3.111 1.399 3.111 3.108v6.214zm0-24.857c0 1.709-1.4 3.107-3.111 3.107h-56c-1.711 0-3.111-1.398-3.111-3.107V52.82c0-1.709 1.4-3.107 3.111-3.107h56c1.711 0 3.111 1.398 3.111 3.107v6.215z" transform="translate(16 41)"/>
+            </g>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/info.svg b/src/wmcads/assets/icon/general/info.svg
old mode 100755
new mode 100644
index 2527734a..d0125068
--- a/src/wmcads/assets/icon/general/info.svg
+++ b/src/wmcads/assets/icon/general/info.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M128 0C57.313 0 0 57.333 0 128c0 70.708 57.313 128 128 128s128-57.292 128-128C256 57.333 198.687 0 128 0zm-.5 57c11.874 0 21.5 9.626 21.5 21.5s-9.626 21.5-21.5 21.5S106 90.374 106 78.5 115.626 57 127.5 57zM157 187.775c0 3.438-2.782 6.225-6.214 6.225h-45.572c-3.432 0-6.214-2.787-6.214-6.225v-12.45c0-3.438 2.782-6.225 6.214-6.225h6.215v-33.2h-6.215c-3.432 0-6.214-2.787-6.214-6.225v-12.45c0-3.438 2.782-6.225 6.214-6.225h33.143c3.432 0 6.214 2.787 6.214 6.225V169.1h6.215c3.432 0 6.214 2.787 6.214 6.225v12.45z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M128 0C57.313 0 0 57.333 0 128c0 70.708 57.313 128 128 128s128-57.292 128-128C256 57.333 198.687 0 128 0zm0 56.774c11.972 0 21.677 9.705 21.677 21.678 0 11.972-9.705 21.677-21.677 21.677s-21.677-9.705-21.677-21.677c0-11.973 9.705-21.678 21.677-21.678zm28.903 131.097c0 3.42-2.773 6.194-6.193 6.194h-45.42c-3.42 0-6.193-2.774-6.193-6.194v-12.387c0-3.42 2.773-6.194 6.193-6.194h6.194v-33.032h-6.194c-3.42 0-6.193-2.773-6.193-6.193v-12.388c0-3.42 2.773-6.193 6.193-6.193h33.033c3.42 0 6.193 2.773 6.193 6.193v51.613h6.194c3.42 0 6.193 2.773 6.193 6.194v12.387z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/list.svg b/src/wmcads/assets/icon/general/list.svg
new file mode 100644
index 00000000..d5e5d0c6
--- /dev/null
+++ b/src/wmcads/assets/icon/general/list.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M33.574 64.967c4.633 0 8.393-3.76 8.393-8.393v-25.18c0-4.634-3.76-8.394-8.393-8.394H8.394C3.76 23 0 26.76 0 31.393v25.18c0 4.634 3.76 8.394 8.393 8.394h25.18zm218.23-12.59c2.316 0 4.196-1.88 4.196-4.197v-8.393c0-2.317-1.88-4.197-4.197-4.197H75.541c-2.317 0-4.197 1.88-4.197 4.197v8.393c0 2.317 1.88 4.197 4.197 4.197h176.262zm-218.23 96.525c4.633 0 8.393-3.76 8.393-8.394v-25.18c0-4.633-3.76-8.394-8.393-8.394H8.394c-4.634 0-8.394 3.76-8.394 8.394v25.18c0 4.633 3.76 8.394 8.393 8.394h25.18zm218.23-12.59c2.316 0 4.196-1.88 4.196-4.197v-8.394c0-2.316-1.88-4.196-4.197-4.196H75.541c-2.317 0-4.197 1.88-4.197 4.196v8.394c0 2.316 1.88 4.196 4.197 4.196h176.262zm-218.23 96.524c4.633 0 8.393-3.76 8.393-8.393v-25.18c0-4.634-3.76-8.394-8.393-8.394H8.394c-4.634 0-8.394 3.76-8.394 8.393v25.18c0 4.634 3.76 8.394 8.393 8.394h25.18zm218.23-12.59c2.316 0 4.196-1.88 4.196-4.197v-8.393c0-2.317-1.88-4.197-4.197-4.197H75.541c-2.317 0-4.197 1.88-4.197 4.197v8.393c0 2.317 1.88 4.197 4.197 4.197h176.262z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/location-arrow.svg b/src/wmcads/assets/icon/general/location-arrow.svg
old mode 100755
new mode 100644
index 3a19ddc6..f434af44
--- a/src/wmcads/assets/icon/general/location-arrow.svg
+++ b/src/wmcads/assets/icon/general/location-arrow.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M223.126 1.766L14.423 98.09c-24.079 11.238-16.053 46.555 9.632 46.555h88.3v88.298c0 25.684 35.317 33.716 46.556 9.632l96.325-208.7c8.026-19.27-12.845-40.14-32.11-32.109z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M223.126 1.766L14.423 98.09c-24.079 11.238-16.053 46.555 9.632 46.555h88.3v88.298c0 25.684 35.317 33.716 46.556 9.632l96.325-208.7c8.026-19.27-12.845-40.14-32.11-32.109z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/location-pin.svg b/src/wmcads/assets/icon/general/location-pin.svg
deleted file mode 100755
index 21bb9e70..00000000
--- a/src/wmcads/assets/icon/general/location-pin.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M118.031 250.835C44.625 145.515 31 134.706 31 96c0-53.02 43.428-96 97-96s97 42.98 97 96c0 38.706-13.625 49.515-87.031 154.835-4.817 6.887-15.121 6.886-19.938 0zM128.5 136c22.368 0 40.5-17.909 40.5-40s-18.132-40-40.5-40S88 73.909 88 96s18.132 40 40.5 40z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/general/map.svg b/src/wmcads/assets/icon/general/map.svg
new file mode 100644
index 00000000..8ddb6472
--- /dev/null
+++ b/src/wmcads/assets/icon/general/map.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M170.78 227.111c2.489 0 6.43-.625 8.798-1.395l67.48-23.472c4.936-1.973 8.942-7.888 8.942-13.204V35.12c0-4.084-3.347-7.12-7.102-7.12-.872 0-1.77.164-2.65.516l-75.577 27.928h-.004L94.222 29.458C91.805 28.654 87.774 28 85.227 28c-2.974 0-5.943.467-8.805 1.395L8.942 52.867C4.007 54.84 0 60.757 0 66.07v153.92c0 4.085 3.347 7.12 7.107 7.12.87 0 1.764-.164 2.649-.516l75.577-27.928 76.445 26.982c2.419.807 6.451 1.462 9.001 1.462zM14.181 209.8l-.569-143.498 64.61-22.475v142.306L14.182 209.8zm149.374 1.396l-71.112-25.103V43.911l71.112 25.102v142.183zm14.222.088V68.978l64.04-23.671.569 143.497-64.61 22.48z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/minimise.svg b/src/wmcads/assets/icon/general/minimise.svg
old mode 100755
new mode 100644
index 02687ac2..dec6440d
--- a/src/wmcads/assets/icon/general/minimise.svg
+++ b/src/wmcads/assets/icon/general/minimise.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M245.333 106.667H10.667C4.773 106.667 0 111.44 0 117.333v21.334c0 5.893 4.773 10.666 10.667 10.666h234.666c5.894 0 10.667-4.773 10.667-10.666v-21.334c0-5.893-4.773-10.666-10.667-10.666z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M245.333 106.667H10.667C4.773 106.667 0 111.44 0 117.333v21.334c0 5.893 4.773 10.666 10.667 10.666h234.666c5.894 0 10.667-4.773 10.667-10.666v-21.334c0-5.893-4.773-10.666-10.667-10.666z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/n-ticket.svg b/src/wmcads/assets/icon/general/n-ticket.svg
deleted file mode 100755
index cc0521da..00000000
--- a/src/wmcads/assets/icon/general/n-ticket.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="119px" height="114px" viewBox="0 0 119 114" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Shape</title>
-    <g id="Page-1" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M90.99226,8 C92.3830744,8.00439842 93.626864,8.86674861 94.11876,10.16768 L110.10091,52.84268 C111.10399,55.5207791 111.10399,58.4714109 110.10091,61.14951 L94.31169,103.3094 C93.8197882,104.610334 92.5759892,105.472681 91.18517,105.47707 L27.668,105.47707 C26.2771808,105.472681 25.0333818,104.610334 24.54148,103.3094 L8.75224,61.14958 C7.74915971,58.4714671 7.74915971,55.5208229 8.75224,52.84271 L24.73442,10.16765 C25.22631,8.86673143 26.4700896,8.00439184 27.86089,8 L90.99226,8 M90.99226,0 L27.86089,0 C23.1326749,0 18.9008113,2.93404508 17.24257,7.36194 L1.26036,50.037 C-0.420119826,54.5242658 -0.420119826,59.4680542 1.26036,63.95532 L17.04958,106.11519 C18.7078701,110.543078 22.9397541,113.4771 27.66798,113.4771 L91.18517,113.4771 C95.9133912,113.4771 100.14527,110.543081 101.80354,106.11519 L117.59276,63.95532 C119.27327,59.4680596 119.27327,54.5242604 117.59276,50.037 L101.61061,7.362 C99.9523677,2.9340842 95.7204949,0 90.99226,0 Z M47.51438,86.04616 L30.19946,86.04616 L30.19946,27.96916 L46.99363,27.96916 L46.99363,35.91057 C50.89918,29.27095 58.58029,26.27676 65.48037,26.27676 C81.36318,26.27676 88.65369,37.60296 88.65369,51.6634 L88.65369,86.04616 L71.33894,86.04616 L71.33894,54.6576 C71.33894,47.49741 67.82366,41.89929 59.49165,41.89929 C51.94065,41.89929 47.51438,47.7577 47.51438,55.17836 L47.51438,86.04616 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/src/wmcads/assets/icon/general/paperclip.svg b/src/wmcads/assets/icon/general/paperclip.svg
old mode 100755
new mode 100644
index 20f2a41e..e2fdf6de
--- a/src/wmcads/assets/icon/general/paperclip.svg
+++ b/src/wmcads/assets/icon/general/paperclip.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M37.623 233.07c-29.215-30.144-28.67-78.754.693-108.79L143.196 17c22.158-22.666 58.175-22.668 80.335 0 21.945 22.447 21.972 58.665 0 81.138l-91.424 93.426a37.306 37.306 0 0 1-53.991-.499c-14.138-14.985-13.684-38.736.726-53.476l71.871-73.418a8 8 0 0 1 11.313-.12l11.43 11.19a8 8 0 0 1 .121 11.312l-71.864 73.41c-2.466 2.523-2.618 6.715-.324 9.147 2.186 2.316 5.623 2.355 7.844.082l91.425-93.425c9.806-10.031 9.806-26.363-.006-36.4-9.594-9.813-24.978-9.818-34.577 0l-104.88 107.28c-17.382 17.78-17.65 46.56-.596 64.157 17.005 17.546 44.493 17.568 61.53.143l86.03-88a8 8 0 0 1 11.312-.127l11.439 11.182a8 8 0 0 1 .128 11.313l-86.03 87.998c-29.788 30.47-77.972 30.108-107.385-.242z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M74.484 256c16.56 0 33.12-6.295 45.726-18.886l109.013-108.868c2.346-2.344 2.346-6.143 0-8.486l-2.834-2.83c-2.347-2.344-6.15-2.344-8.497 0L108.88 225.799c-18.965 18.94-49.825 18.94-68.791 0-18.966-18.942-18.966-49.76 0-68.7L171.294 26.063c13.443-13.424 35.316-13.425 48.76 0 13.444 13.427 13.444 35.272 0 48.697l-111.46 111.313c-7.92 7.91-20.809 7.91-28.729 0-7.921-7.91-7.921-20.782-.001-28.693l85.261-85.148c2.346-2.343 2.346-6.143 0-8.485l-2.834-2.83c-2.346-2.344-6.15-2.344-8.496 0l-85.262 85.148c-14.168 14.15-14.168 37.174 0 51.325 14.17 14.151 37.226 14.15 51.392 0l111.46-111.313c19.692-19.665 19.692-51.663 0-71.329-19.691-19.665-51.731-19.665-71.423 0L28.757 145.782c-25.214 25.18-25.214 66.152 0 91.332C41.364 249.705 57.924 256 74.484 256z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/parking.svg b/src/wmcads/assets/icon/general/parking.svg
deleted file mode 100755
index f7aed2cf..00000000
--- a/src/wmcads/assets/icon/general/parking.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 756 1000" style="enable-background:new 0 0 756 1000;" xml:space="preserve">
-<style type="text/css">
-	.st0{fill:#FFFFFF;}
-</style>
-<path style="st0" d="M535.2,0H0.4v999.8h213.4V603.8h321.3c121.8,0,220.6-98.6,220.6-220.2V220.9C755.7,99.3,657,0,535.2,0z
-	 M543.6,346.3c0,53.1-43.6,96.2-96.8,96.2H215.6V165h231.7c53.2,0,96.3,43.1,96.3,96.2V346.3z"/>
-</svg>
\ No newline at end of file
diff --git a/src/wmcads/assets/icon/general/route.svg b/src/wmcads/assets/icon/general/route.svg
deleted file mode 100755
index 3fbd0726..00000000
--- a/src/wmcads/assets/icon/general/route.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="256px" height="256px" viewBox="0 0 256 256" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Icons/Route</title>
-    <g id="Icons/Route" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M208,160 L160,160 C151.2,160 144,152.8 144,144 C144,135.2 151.2,128 160,128 L208,128 C208,128 256,74.5 256,48 C256,21.5 234.5,0 208,0 C181.5,0 160,21.5 160,48 C160,60.75 171.1,79.7 182.65,96 L160,96 C133.55,96 112,117.55 112,144 C112,170.45 133.55,192 160,192 L208,192 C216.8,192 224,199.2 224,208 C224,216.8 216.8,224 208,224 L92.75,224 C84.75,236.4 75.85,247.85 69.1,256 L208,256 C234.45,256 256,234.45 256,208 C256,181.55 234.45,160 208,160 Z M208,32 C216.85,32 224,39.15 224,48 C224,56.85 216.85,64 208,64 C199.15,64 192,56.85 192,48 C192,39.15 199.15,32 208,32 Z M48,128 C21.5,128 0,149.5 0,176 C0,202.5 48,256 48,256 C48,256 96,202.5 96,176 C96,149.5 74.5,128 48,128 Z M48,192 C39.15,192 32,184.85 32,176 C32,167.15 39.15,160 48,160 C56.85,160 64,167.15 64,176 C64,184.85 56.85,192 48,192 Z" id="Shape" fill="#FFFFFF" fill-rule="nonzero"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/src/wmcads/assets/icon/general/search.svg b/src/wmcads/assets/icon/general/search.svg
old mode 100755
new mode 100644
index fb4e8639..3cdac514
--- a/src/wmcads/assets/icon/general/search.svg
+++ b/src/wmcads/assets/icon/general/search.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="233" height="234" viewBox="0 0 233 234">
-    <path fill="#FFF" fill-rule="nonzero" d="M99.874 0c55.16 0 99.874 44.742 99.874 99.934 0 21.939-7.065 42.226-19.043 58.709l47.528 47.557c6.357 6.36 6.357 16.67 0 23.03-6.352 6.356-16.654 6.36-23.01.007a14.785 14.785 0 0 1-.006-.007l-47.67-47.698c-16.29 11.548-36.19 18.336-57.673 18.336C44.715 199.868 0 155.126 0 99.934S44.715 0 99.874 0zm0 31.979c-37.508 0-67.914 30.424-67.914 67.955 0 37.53 30.406 67.955 67.914 67.955s67.915-30.425 67.915-67.955-30.407-67.955-67.915-67.955z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M99.874 0c55.16 0 99.874 44.742 99.874 99.934 0 21.939-7.065 42.226-19.043 58.709l47.528 47.557c6.357 6.36 6.357 16.67 0 23.03-6.352 6.356-16.654 6.36-23.01.007l-.006-.007-47.67-47.698c-16.29 11.548-36.19 18.336-57.673 18.336C44.715 199.868 0 155.126 0 99.934S44.715 0 99.874 0zm0 31.979c-37.508 0-67.914 30.424-67.914 67.955 0 37.53 30.406 67.955 67.914 67.955s67.915-30.425 67.915-67.955-30.407-67.955-67.915-67.955z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/share.svg b/src/wmcads/assets/icon/general/share.svg
deleted file mode 100755
index e4ed923c..00000000
--- a/src/wmcads/assets/icon/general/share.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M251.83 94.918l-88.346-75.993c-7.734-6.652-19.921-1.252-19.921 9.082v40.027C62.934 68.954-1 85.05-1 161.163c0 30.72 19.868 61.154 41.83 77.066 6.852 4.965 16.62-1.267 14.093-9.316-22.761-72.506 10.795-91.755 88.64-92.87V180c0 10.35 12.197 15.726 19.92 9.082l88.346-76c5.557-4.781 5.565-13.377 0-18.164z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/general/star-empty.svg b/src/wmcads/assets/icon/general/star-empty.svg
deleted file mode 100755
index 27126645..00000000
--- a/src/wmcads/assets/icon/general/star-empty.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M242.675 87.388l-69.78-10.173-31.188-63.236c-5.588-11.272-21.779-11.415-27.414 0L83.104 77.215 13.325 87.388C.812 89.203-4.203 104.63 4.872 113.466l50.483 49.194-11.94 69.492c-2.15 12.561 11.08 21.97 22.161 16.096L128 215.436l62.424 32.812c11.08 5.827 24.31-3.535 22.161-16.096l-11.94-69.492 50.483-49.194c9.075-8.836 4.06-24.263-8.453-26.078zm-66.627 67.248l11.32 66.101L128 189.55l-59.367 31.188 11.32-66.101-48.049-46.806 66.389-9.648L128 38.003l29.707 60.18 66.389 9.647-48.048 46.806z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/general/star.svg b/src/wmcads/assets/icon/general/star.svg
deleted file mode 100755
index 10b9249d..00000000
--- a/src/wmcads/assets/icon/general/star.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M114.267 14.523L83.02 77.87 13.11 88.061c-12.537 1.818-17.56 17.273-8.47 26.124l50.579 49.281-11.963 69.615c-2.153 12.584 11.101 22.01 22.203 16.124l62.54-32.87 62.54 32.87c11.102 5.838 24.356-3.54 22.203-16.124l-11.963-69.615 50.578-49.28c9.092-8.852 4.068-24.307-8.47-26.125l-69.909-10.19-31.246-63.348c-5.598-11.292-21.82-11.436-27.466 0z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/general/success.svg b/src/wmcads/assets/icon/general/success.svg
old mode 100755
new mode 100644
index cc1b4822..d036d3fe
--- a/src/wmcads/assets/icon/general/success.svg
+++ b/src/wmcads/assets/icon/general/success.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M256 128c0 70.693-57.307 128-128 128S0 198.693 0 128 57.307 0 128 0s128 57.307 128 128zm-142.291 67.585l94.875-94.843a8.245 8.245 0 0 0 0-11.663l-11.667-11.663a8.252 8.252 0 0 0-11.668 0l-77.374 77.347-36.124-36.112a8.253 8.253 0 0 0-11.668 0l-11.667 11.663a8.245 8.245 0 0 0 0 11.663l53.625 53.607a8.252 8.252 0 0 0 11.668 0z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M256 128c0 70.693-57.307 128-128 128S0 198.693 0 128 57.307 0 128 0s128 57.307 128 128zm-142.291 67.585l94.875-94.843c3.221-3.22 3.221-8.443 0-11.663l-11.667-11.663c-3.222-3.221-8.446-3.221-11.668 0l-77.374 77.347-36.124-36.112c-3.222-3.22-8.446-3.22-11.668 0l-11.667 11.663c-3.221 3.22-3.221 8.443 0 11.663l53.625 53.607c3.222 3.221 8.446 3.221 11.668 0z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/swap.svg b/src/wmcads/assets/icon/general/swap.svg
old mode 100755
new mode 100644
index 0ed7201a..495d2ccf
--- a/src/wmcads/assets/icon/general/swap.svg
+++ b/src/wmcads/assets/icon/general/swap.svg
@@ -1,3 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M113.946 197.714H91.07v-183C91.071 9.902 87.347 6 82.753 6h-8.318c-4.594 0-8.318 3.902-8.318 8.714v183H43.242c-2.492-.001-4.745 1.55-5.732 3.948-.986 2.396-.517 5.178 1.193 7.076l35.352 39.214c1.179 1.306 2.818 2.046 4.534 2.046 1.715 0 3.355-.74 4.533-2.046l35.352-39.214c1.71-1.896 2.18-4.676 1.195-7.071-.984-2.396-3.233-3.95-5.723-3.953zm104.35-150.452L182.946 8.048c-1.179-1.306-2.818-2.046-4.534-2.046-1.715 0-3.355.74-4.533 2.046l-35.352 39.214c-1.71 1.897-2.18 4.678-1.194 7.074.985 2.396 3.237 3.949 5.727 3.95h22.875v183c0 4.812 3.724 8.714 8.318 8.714h8.318c4.594 0 8.318-3.902 8.318-8.714v-183h22.875c2.49-.001 4.742-1.554 5.728-3.95.985-2.396.516-5.177-1.194-7.074z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <g>
+                <path d="M76.946 191.714H54.07v-183C54.071 3.902 50.347 0 45.753 0h-8.318c-4.594 0-8.318 3.902-8.318 8.714v183H6.242c-2.492-.001-4.745 1.55-5.732 3.948-.986 2.396-.517 5.178 1.193 7.076l35.352 39.214c1.179 1.306 2.818 2.046 4.534 2.046 1.715 0 3.355-.74 4.533-2.046l35.352-39.214c1.71-1.896 2.18-4.676 1.195-7.071-.984-2.396-3.233-3.95-5.723-3.953zm104.35-150.452L145.946 2.048C144.766.742 143.127.002 141.41.002c-1.715 0-3.355.74-4.533 2.046l-35.352 39.214c-1.71 1.897-2.18 4.678-1.194 7.074.985 2.396 3.237 3.949 5.727 3.95h22.875v183c0 4.812 3.724 8.714 8.318 8.714h8.318c4.594 0 8.318-3.902 8.318-8.714v-183h22.875c2.49-.001 4.742-1.554 5.728-3.95.985-2.396.516-5.177-1.194-7.074z" transform="translate(37 6)"/>
+            </g>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/sync.svg b/src/wmcads/assets/icon/general/sync.svg
deleted file mode 100755
index adacb5d1..00000000
--- a/src/wmcads/assets/icon/general/sync.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="sync-alt" class="svg-inline--fa fa-sync-alt fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M370.72 133.28C339.458 104.008 298.888 87.962 255.848 88c-77.458.068-144.328 53.178-162.791 126.85-1.344 5.363-6.122 9.15-11.651 9.15H24.103c-7.498 0-13.194-6.807-11.807-14.176C33.933 94.924 134.813 8 256 8c66.448 0 126.791 26.136 171.315 68.685L463.03 40.97C478.149 25.851 504 36.559 504 57.941V192c0 13.255-10.745 24-24 24H345.941c-21.382 0-32.09-25.851-16.971-40.971l41.75-41.749zM32 296h134.059c21.382 0 32.09 25.851 16.971 40.971l-41.75 41.75c31.262 29.273 71.835 45.319 114.876 45.28 77.418-.07 144.315-53.144 162.787-126.849 1.344-5.363 6.122-9.15 11.651-9.15h57.304c7.498 0 13.194 6.807 11.807 14.176C478.067 417.076 377.187 504 256 504c-66.448 0-126.791-26.136-171.315-68.685L48.97 471.03C33.851 486.149 8 475.441 8 454.059V320c0-13.255 10.745-24 24-24z"></path></svg>
\ No newline at end of file
diff --git a/src/wmcads/assets/icon/general/ticket.svg b/src/wmcads/assets/icon/general/ticket.svg
deleted file mode 100755
index 1e32668e..00000000
--- a/src/wmcads/assets/icon/general/ticket.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="ticket-alt" class="svg-inline--fa fa-ticket-alt fa-w-18" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 576 512"><path fill="currentColor" d="M128 160h320v192H128V160zm400 96c0 26.51 21.49 48 48 48v96c0 26.51-21.49 48-48 48H48c-26.51 0-48-21.49-48-48v-96c26.51 0 48-21.49 48-48s-21.49-48-48-48v-96c0-26.51 21.49-48 48-48h480c26.51 0 48 21.49 48 48v96c-26.51 0-48 21.49-48 48zm-48-104c0-13.255-10.745-24-24-24H120c-13.255 0-24 10.745-24 24v208c0 13.255 10.745 24 24 24h336c13.255 0 24-10.745 24-24V152z"></path></svg>
\ No newline at end of file
diff --git a/src/wmcads/assets/icon/general/toolkit.svg b/src/wmcads/assets/icon/general/toolkit.svg
new file mode 100644
index 00000000..38e9674e
--- /dev/null
+++ b/src/wmcads/assets/icon/general/toolkit.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M206.06 256c4.1 0 8.198-1.55 11.298-4.699l33.943-33.943c6.199-6.299 6.199-16.397-.05-22.646l-62.188-62.238c-7.798-7.798-18.046-11.698-28.294-11.698-7.699 0-15.397 2.2-22.046 6.65L95.981 84.683V47.99L31.994 0 0 31.994 47.99 95.98h36.694l42.742 42.742c-10.299 15.547-8.599 36.643 5.098 50.34l62.238 62.238c3.1 3.1 7.199 4.699 11.298 4.699zm13.248-115.877c5.198-3.1 10.098-6.799 14.497-11.248 18.896-18.896 26.345-45.691 19.846-71.636-1.15-4.75-4.85-8.498-9.548-9.798-4.75-1.3-9.849 0-13.348 3.5l-31.943 31.943-22.096-3.7-3.7-22.095 31.944-31.944c3.45-3.449 4.8-8.548 3.5-13.247-1.3-4.75-5.1-8.399-9.849-9.599-25.845-6.448-52.64.95-71.586 19.847-6.448 6.449-11.447 13.947-15.047 21.995v33.894l11.048 11.048c-4.799-20.196.8-41.092 15.347-55.64 11.348-11.347 26.295-17.446 41.892-17.446 3.45 0 6.899.3 10.348.9L155.97 51.59l6.898 41.492 41.543 6.899 34.643-34.644c3.35 19.097-2.65 38.393-16.547 52.24-4.45 4.45-9.548 7.999-14.997 10.748l11.798 11.798zM79.985 79.984H55.989l-34.843-46.49 12.348-12.348 46.49 34.843v23.995zM37.943 255.95c10.148 0 19.696-3.95 26.844-11.148l50.89-50.84c-3.349-4.599-5.898-9.648-7.748-14.897l-54.44 54.44c-8.297 8.298-22.795 8.298-31.093 0-8.548-8.549-8.548-22.546 0-31.094l73.036-73.036-11.298-11.298-73.036 73.036c-14.797 14.797-14.797 38.892 0 53.74C18.247 252 27.795 255.95 37.943 255.95zm168.067-15.997l-62.188-62.238c-4.55-4.548-7.049-10.547-7.049-16.946 0-6.4 2.5-12.448 7.05-16.947 4.548-4.55 10.547-7.049 16.946-7.049 6.399 0 12.447 2.5 16.947 7.05l62.237 62.187-33.943 33.943zM39.992 223.956c4.4 0 7.999-3.599 7.999-7.998 0-4.4-3.6-7.998-7.999-7.998-4.399 0-7.998 3.599-7.998 7.998s3.6 7.998 7.998 7.998z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/general/trash.svg b/src/wmcads/assets/icon/general/trash.svg
old mode 100755
new mode 100644
index 62baa952..19e442d9
--- a/src/wmcads/assets/icon/general/trash.svg
+++ b/src/wmcads/assets/icon/general/trash.svg
@@ -1,3 +1,7 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M211.571 38h-48.214l-3.777-7.597c-1.632-3.313-4.978-5.406-8.638-5.403h-45.924c-3.654-.014-6.993 2.085-8.598 5.403L92.643 38H44.429C40.879 38 38 40.91 38 44.5v13c0 3.59 2.878 6.5 6.429 6.5H211.57c3.55 0 6.429-2.91 6.429-6.5v-13c0-3.59-2.878-6.5-6.429-6.5zM59.502 212.953C60.137 223.097 68.55 231 78.712 231h98.576c10.163 0 18.575-7.903 19.21-18.047L205 77H51l8.502 135.953z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M211.571 38h-48.214l-3.777-7.597c-1.632-3.313-4.978-5.406-8.638-5.403h-45.924c-3.654-.014-6.993 2.085-8.598 5.403L92.643 38H44.429C40.879 38 38 40.91 38 44.5v13c0 3.59 2.878 6.5 6.429 6.5H211.57c3.55 0 6.429-2.91 6.429-6.5v-13c0-3.59-2.878-6.5-6.429-6.5zM59.502 212.953C60.137 223.097 68.55 231 78.712 231h98.576c10.163 0 18.575-7.903 19.21-18.047L205 77H51l8.502 135.953z"/>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/wallet.svg b/src/wmcads/assets/icon/general/wallet.svg
deleted file mode 100755
index 98c6c0ae..00000000
--- a/src/wmcads/assets/icon/general/wallet.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg aria-hidden="true" focusable="false" data-prefix="fas" data-icon="wallet" class="svg-inline--fa fa-wallet fa-w-16" role="img" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 512 512"><path fill="currentColor" d="M461.2 128H80c-8.84 0-16-7.16-16-16s7.16-16 16-16h384c8.84 0 16-7.16 16-16 0-26.51-21.49-48-48-48H64C28.65 32 0 60.65 0 96v320c0 35.35 28.65 64 64 64h397.2c28.02 0 50.8-21.53 50.8-48V176c0-26.47-22.78-48-50.8-48zM416 336c-17.67 0-32-14.33-32-32s14.33-32 32-32 32 14.33 32 32-14.33 32-32 32z"></path></svg>
\ No newline at end of file
diff --git a/src/wmcads/assets/icon/general/warning-circle.svg b/src/wmcads/assets/icon/general/warning-circle.svg
old mode 100755
new mode 100644
index 778c9247..57ff0e53
--- a/src/wmcads/assets/icon/general/warning-circle.svg
+++ b/src/wmcads/assets/icon/general/warning-circle.svg
@@ -1,3 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M0 128c0 70.708 57.313 128 128 128s128-57.292 128-128C256 57.333 198.687 0 128 0S0 57.333 0 128zm128 25.806c13.112 0 23.742 10.63 23.742 23.742 0 13.113-10.63 23.742-23.742 23.742s-23.742-10.63-23.742-23.742 10.63-23.742 23.742-23.742zm22.54-85.34l-3.828 70.194a6.193 6.193 0 0 1-6.184 5.856h-25.056a6.193 6.193 0 0 1-6.184-5.856l-3.829-70.193a6.194 6.194 0 0 1 6.184-6.532h32.714a6.193 6.193 0 0 1 6.184 6.532z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <g>
+                <path d="M256 128c0 70.708-57.313 128-128 128S0 198.708 0 128C0 57.333 57.313 0 128 0s128 57.333 128 128zm-128 25.806c-13.112 0-23.742 10.63-23.742 23.742 0 13.113 10.63 23.742 23.742 23.742s23.742-10.63 23.742-23.742-10.63-23.742-23.742-23.742zm-22.54-85.34l3.828 70.194c.179 3.285 2.895 5.856 6.184 5.856h25.056c3.29 0 6.005-2.571 6.184-5.856l3.829-70.193c.193-3.548-2.631-6.532-6.184-6.532h-32.714c-3.553 0-6.377 2.984-6.184 6.532z" transform="matrix(-1 0 0 1 256 0)"/>
+            </g>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/general/warning-triangle.svg b/src/wmcads/assets/icon/general/warning-triangle.svg
old mode 100755
new mode 100644
index 2b71c2c3..771d7e7a
--- a/src/wmcads/assets/icon/general/warning-triangle.svg
+++ b/src/wmcads/assets/icon/general/warning-triangle.svg
@@ -1,3 +1,9 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M252.13 207.787c8.171 13.872-2.086 31.213-18.407 31.213H21.274c-16.352 0-26.562-17.368-18.406-31.213L109.094 27.4c8.175-13.88 28.652-13.854 36.813 0L252.13 207.787zM127.5 170.492c-11.247 0-20.364 8.93-20.364 19.946 0 11.015 9.117 19.945 20.364 19.945s20.365-8.93 20.365-19.946c0-11.015-9.118-19.945-20.365-19.945zM108.166 98.8l3.284 58.969c.153 2.76 2.483 4.92 5.304 4.92h21.492c2.821 0 5.15-2.16 5.304-4.92l3.284-58.969c.167-2.98-2.256-5.486-5.304-5.486h-28.06c-3.048 0-5.47 2.506-5.304 5.486z"/>
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <g>
+                <path d="M252.13 190.787c8.171 13.872-2.086 31.213-18.407 31.213H21.274c-16.352 0-26.562-17.368-18.406-31.213L109.094 10.4c8.175-13.88 28.652-13.854 36.813 0L252.13 190.787zM127.5 153.492c-11.247 0-20.364 8.93-20.364 19.946 0 11.015 9.117 19.945 20.364 19.945s20.365-8.93 20.365-19.946c0-11.015-9.118-19.945-20.365-19.945zM108.166 81.8l3.284 58.969c.153 2.76 2.483 4.92 5.304 4.92h21.492c2.821 0 5.15-2.16 5.304-4.92l3.284-58.969c.167-2.98-2.256-5.486-5.304-5.486h-28.06c-3.048 0-5.47 2.506-5.304 5.486z" transform="translate(0 17)"/>
+            </g>
+        </g>
+    </g>
 </svg>
diff --git a/src/wmcads/assets/icon/modes/bg/bus.svg b/src/wmcads/assets/icon/modes/bg/bus.svg
deleted file mode 100755
index bcacd63d..00000000
--- a/src/wmcads/assets/icon/modes/bg/bus.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="nonzero" d="M229.346.658c13.99 0 25.434 11.443 25.434 25.436v203.47c0 13.99-11.443 25.436-25.434 25.436H25.436C11.446 255 0 243.554 0 229.564L.012 26.1C.012 12.11 11.457.664 25.448.664zM138.03 43.044c-5.817.006-15.357.009-21.192.006h-31.83c-5.846.003-10.597 4.769-10.6 10.603l-.003 132.471c.003 5.814 4.763 10.597 10.588 10.597l.003-.003.012 12.714a3.172 3.172 0 0 0 3.17 3.176l9.538.006c1.753-.006 3.185-1.435 3.188-3.167l-.01-12.726 15.894.01c5.837-.01 15.369-.013 21.194-.01h15.896v12.714c0 1.744 1.44 3.173 3.19 3.17l9.532.003a3.168 3.168 0 0 0 3.183-3.173l.003-12.705c5.825-.009 10.588-4.786 10.59-10.606l.004-132.471c.003-5.834-4.769-10.588-10.594-10.6zm23.799 121.88c4.376.006 7.96 3.584 7.96 7.968-.01 4.367-3.576 7.928-7.966 7.93-4.364-.002-7.942-3.55-7.942-7.938-.006-4.38 3.578-7.96 7.948-7.96zm-68.888.006c4.385 0 7.954 3.578 7.963 7.954 0 4.387-3.578 7.939-7.948 7.927-4.388 0-7.948-3.537-7.948-7.924-.009-4.38 3.563-7.957 7.933-7.957zm71.546-47.69c2.905-.004 5.299 2.384 5.296 5.295v26.487c0 2.917-2.39 5.307-5.302 5.305H90.285c-2.894.002-5.287-2.379-5.275-5.293l-.012-26.502c0-2.908 2.387-5.293 5.299-5.293zm-19.07-21.201c1.742 0 3.165 1.438 3.162 3.173l.003 4.248a3.189 3.189 0 0 1-3.173 3.18l-36.042-.013c-1.73.012-3.168-1.417-3.159-3.167l-.009-4.248a3.177 3.177 0 0 1 3.168-3.173zm19.07-42.395c2.914 0 5.296 2.4 5.299 5.31l-.003 21.19c.003 2.913-2.382 5.298-5.296 5.307H90.303c-2.927-.01-5.296-2.4-5.305-5.308V58.955c.012-2.92 2.384-5.31 5.31-5.305z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/coach.svg b/src/wmcads/assets/icon/modes/bg/coach.svg
deleted file mode 100755
index d123649e..00000000
--- a/src/wmcads/assets/icon/modes/bg/coach.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="nonzero" d="M229.126.416c13.999 0 25.458 11.456 25.458 25.458v203.668c0 14.001-11.46 25.458-25.458 25.458H25.458C11.457 255 0 243.543 0 229.542V25.874C0 11.872 11.457.416 25.458.416zM80.598 44.682c-5.71 0-10.382 4.669-10.382 10.376v25.95h-7.785c-4.292 0-7.786 3.493-7.786 7.782v23.35a5.19 5.19 0 0 0 5.19 5.19 5.19 5.19 0 0 0 5.192-5.19V91.386h5.19v93.404c0 5.707 4.668 10.378 10.378 10.378v12.45a3.12 3.12 0 0 0 3.114 3.115h9.336c1.717 0 3.118-1.4 3.118-3.114v-12.45h62.289v12.45a3.124 3.124 0 0 0 3.114 3.114h9.319c1.713 0 3.114-1.4 3.114-3.114v-12.454c5.698-.012 10.354-4.677 10.354-10.375V91.386h5.16v20.754a5.19 5.19 0 0 0 10.379 0h-.001V88.79c0-4.289-3.49-7.783-7.783-7.783h-7.755V55.082c0-5.704-4.671-10.378-10.378-10.378zM88.38 164.03c4.289 0 7.783 3.502 7.783 7.797 0 4.292-3.494 7.77-7.783 7.77-4.286 0-7.785-3.478-7.785-7.77 0-4.295 3.5-7.797 7.785-7.797zm77.857 0c4.295 0 7.783 3.502 7.783 7.797 0 4.292-3.488 7.77-7.783 7.77-4.285 0-7.785-3.478-7.785-7.77 0-4.295 3.5-7.797 7.785-7.797zM168.81 55.06c2.853 0 5.187 2.334 5.187 5.19v67.46c0 2.852-2.334 5.186-5.187 5.186H85.781c-2.852 0-5.19-2.334-5.19-5.186V60.25c0-2.856 2.338-5.19 5.19-5.19z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/cycle.svg b/src/wmcads/assets/icon/modes/bg/cycle.svg
deleted file mode 100755
index 03f8412e..00000000
--- a/src/wmcads/assets/icon/modes/bg/cycle.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="nonzero" d="M229.424.566c13.996 0 25.444 11.45 25.444 25.447v203.54c0 13.996-11.448 25.447-25.444 25.447H25.444C11.447 255 0 243.55 0 229.554L.012 26.019C.012 12.023 11.462.572 25.455.572zm-43.969 108.237c-2.162 0-4.132 0-6.098.394l2.755 10.424c1.181 0 2.163-.199 3.343-.199 16.324 0 29.7 13.376 29.7 29.702 0 16.125-13.376 29.5-29.7 29.5-16.323 0-29.5-13.375-29.5-29.5 0-8.655 3.735-16.718 10.225-22.422l-3.147-11.213c-11.21 7.671-17.896 20.064-17.896 33.635 0 22.025 18.095 40.319 40.318 40.319 22.224 0 40.319-18.294 40.319-40.319 0-22.226-18.095-40.321-40.319-40.321zm-116.043 0c-22.224 0-40.318 18.095-40.318 40.321 0 22.025 18.094 40.319 40.318 40.319 18.884 0 35.403-13.571 39.337-31.862H97.735c-3.738 12.39-15.342 21.044-28.323 21.044-16.324 0-29.5-13.376-29.5-29.5 0-16.327 13.176-29.703 29.5-29.703 2.166 0 4.132.2 6.099.59l5.704-9.637c-3.737-1.178-7.87-1.572-11.803-1.572zm74.74-42.68c-1.18 0-1.77.59-1.967 1.967l-.59 3.933c-.196.985 0 2.557 2.163 2.756l9.05 1.572c1.964.395 3.34 1.575 3.933 3.738l1.768 6.294h-47.2l-.985-5.704h8.261c1.572 0 2.557-.985 2.557-2.557v-2.951c0-1.967-1.18-2.949-3.542-3.148L94.196 68.88c-.395-.199-.985-.199-1.376-.199-3.542 0-5.9 2.361-5.9 5.509 0 4.129 2.554 6.291 7.276 6.291h6.295l.587 5.313-38.548 60.184c-1.18 1.768-1.376 4.13-.394 5.701.985 1.576 2.36 2.362 4.129 2.362h44.646c1.97 3.933 5.903 6.294 10.231 6.294 6.292 0 11.406-4.918 11.406-11.21 0-1.77-.392-3.346-1.18-4.722l32.06-40.517 9.833 35.599c1.18 4.918 4.72 10.228 9.047 14.161.985.79 2.163 1.18 3.542 1.18 1.967 0 3.539-.785 4.72-1.966.785-1.18 1.376-2.557 1.177-3.933 0-1.771-.783-3.148-2.162-4.13-3.148-2.755-5.114-5.113-5.705-7.67l-16.323-58.808c-1.771-6.49-4.524-9.048-11.409-10.228 0 0-11.8-1.967-11.996-1.967zm-39.728 30.094c1.964 14.748 5.11 30.09 9.243 45.628-1.18 1.18-1.97 2.557-2.756 4.132-10.62-.59-27.338-.789-36.58.196l-.395-.786c4.328-6.494 9.05-13.571 13.375-20.456l5.31-8.261c4.523-7.277 8.457-14.357 11.408-20.453zm56.248-1.18l.198.394c-13.176 14.158-25.175 29.108-36.192 44.252-.982-.395-1.964-.59-3.144-.787-1.967-13.965-9.048-43.86-9.048-43.86h48.186z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/metro.svg b/src/wmcads/assets/icon/modes/bg/metro.svg
deleted file mode 100755
index e10e8273..00000000
--- a/src/wmcads/assets/icon/modes/bg/metro.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="254" height="254" viewBox="0 0 254 254">
-    <path fill="#FFF" fill-rule="nonzero" d="M228.489.605c13.94 0 25.338 11.404 25.338 25.34v202.711c0 13.94-11.398 25.344-25.338 25.344H25.34C11.401 254 0 242.596 0 228.656L.012 25.952C.012 12.015 11.416.61 25.356.61zM158.547 181.37h-5.364l1.801 10.705 3.036 18.313c.301 1.819 1.992 3.2 3.757 3.2h6.98c1.766 0 2.656-1.381 1.992-2.998l-7.719-18.515-4.483-10.705zm-59.026 0h-5.36l-4.475 10.705-7.715 18.515c-.676 1.617.214 2.998 1.98 2.998h6.977c1.777 0 3.459-1.381 3.76-3.2l3.047-18.313 1.786-10.705zM126.42 42.124c-1.155 0-2.292.42-3.158 1.274l-15.98 15.95c-1.744 1.723-1.744 4.599 0 6.313l8.404 8.36h-14.642c-11.815 0-22.305 9.623-23.344 21.405l-5.18 59.19c-1.027 11.764 7.782 21.405 19.608 21.405h68.522c11.815 0 20.635-9.641 19.596-21.406l-5.168-59.19c-1.039-11.781-11.538-21.405-23.346-21.405h-14.64l8.391-8.466c1.724-1.711 1.724-4.483-.011-6.305L129.557 43.4a4.455 4.455 0 0 0-3.138-1.275zm-34.944 101.68c4.439 0 8.044 3.64 8.044 8.028 0 4.495-3.605 8.028-8.044 8.028-4.432 0-8.049-3.533-8.049-8.028 0-4.388 3.617-8.028 8.05-8.028zm69.826 0c4.417 0 8.037 3.64 8.037 8.028a8.007 8.007 0 0 1-8.037 8.028c-4.441 0-8.05-3.533-8.05-8.028 0-4.388 3.609-8.028 8.05-8.028zm-8.23-59.08c5.908 0 11.15 4.817 11.662 10.702l2.828 32.324c.256 2.89-1.959 5.353-4.915 5.353H90.112c-2.95 0-5.156-2.462-4.903-5.353l2.828-32.324c.515-5.885 5.77-10.702 11.666-10.702zm-26.652-33.062l10.83 10.796-10.842 10.92-10.877-10.92 10.89-10.796z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/p-r.svg b/src/wmcads/assets/icon/modes/bg/p-r.svg
deleted file mode 100755
index 34e33dbf..00000000
--- a/src/wmcads/assets/icon/modes/bg/p-r.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="evenodd" d="M23.194.876C10.939.876 1 10.812 1 23.067v209.74C1 245.063 10.939 255 23.194 255H232.93c12.258 0 22.197-9.936 22.197-22.194V23.067c0-12.255-9.94-22.19-22.197-22.19H23.194zM47.482 167v-29.637h14.097c15.54 0 25.863-10.212 25.863-24.531 0-14.208-10.323-24.531-25.863-24.531H32.164V167h15.318zm12.21-42.846H47.593v-22.533h12.099c7.659 0 12.321 4.329 12.321 11.322 0 6.771-4.662 11.211-12.321 11.211zm56.875 44.289c8.436 0 15.207-3.996 21.09-9.99L145.76 167h19.092l-17.76-18.648 10.989-11.544v-18.426l-19.869 20.757-11.877-12.543 2.997-2.22c5.661-4.218 11.1-9.99 11.1-17.982 0-11.766-9.324-19.869-21.867-19.869-10.656 0-21.756 7.326-21.756 20.535 0 7.104 4.884 13.098 8.658 17.094l1.221 1.332-.555.333c-8.214 6.105-13.431 11.766-13.431 21.534 0 10.545 8.436 21.09 23.865 21.09zm.999-50.949l-2.109-2.331c-1.998-1.998-4.662-5.217-4.662-8.547 0-5.328 3.996-7.881 7.659-7.881 4.662 0 7.992 3.33 7.992 7.548 0 2.886-1.332 5.661-4.995 8.325l-3.885 2.886zm-.777 38.073c-5.772 0-9.435-4.551-9.435-9.102 0-4.662 2.553-7.659 6.327-10.434l1.665-1.221 13.431 14.208c-3.774 3.996-7.215 6.549-11.988 6.549zM187.872 167v-30.303h7.992L211.293 167h17.094l-16.872-32.19c10.323-2.997 16.761-11.322 16.761-22.311 0-13.653-9.768-24.198-25.086-24.198h-30.747V167h15.429zm12.432-43.512h-12.432v-21.867h12.432c7.77 0 12.321 4.329 12.321 10.989 0 6.438-4.551 10.878-12.321 10.878z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/plane.svg b/src/wmcads/assets/icon/modes/bg/plane.svg
deleted file mode 100755
index b6d4124a..00000000
--- a/src/wmcads/assets/icon/modes/bg/plane.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="nonzero" d="M207.437 66.905l-36.908 36.912 23.564 84.373c.675 2.432-.227 5.879-2.01 7.662l-1.848 1.852c-1.783 1.783-4.382 1.52-5.772-.587l-27.196-41.171c-1.393-2.105-3.986-5.29-5.769-7.076l-12.984-13.041-32.72 32.723 10.028 35.906c.34 1.214-.113 2.938-1.006 3.83l-2.905 2.91c-.893.892-2.206.767-2.918-.272l-24.986-36.691-36.656-24.954c-1.042-.712-1.167-2.024-.274-2.914l2.911-2.909c.89-.893 2.617-1.342 3.829-1.003l35.676 9.963 32.804-32.803-12.964-12.913c-1.786-1.778-4.974-4.37-7.079-5.763L61.16 73.812c-2.107-1.39-2.37-3.986-.59-5.77l1.855-1.85c1.78-1.784 5.227-2.686 7.66-2.01l84.14 23.501 36.995-36.992c4.48-4.48 11.743-4.48 16.217 0 4.477 4.474 4.477 11.737 0 16.214zM229.347.658L25.447.664C11.458.664.012 12.11.012 26.1L0 229.564C0 243.554 11.446 255 25.436 255h203.91c13.99 0 25.434-11.446 25.434-25.436V26.094c0-13.993-11.443-25.436-25.434-25.436z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/rail-nr.svg b/src/wmcads/assets/icon/modes/bg/rail-nr.svg
deleted file mode 100755
index 963f2016..00000000
--- a/src/wmcads/assets/icon/modes/bg/rail-nr.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="476" height="256" viewBox="0 0 476 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M450.132.015c14.072 0 25.582 11.517 25.582 25.597v204.791c0 14.077-11.51 25.597-25.582 25.597H25.585C11.516 256 0 244.48 0 230.403L.009 25.618c0-14.08 11.516-25.6 25.59-25.6zM169.063 185.817h-4.769c-1.202 0-1.945 1.313-1.324 2.343l12.017 20.022a5.646 5.646 0 0 0 4.84 2.738h13.613c1.321 0 2.02-1.572 1.131-2.554l-20.343-20.394a7.27 7.27 0 0 0-5.165-2.155zm-66.732 0h-4.769a7.263 7.263 0 0 0-5.161 2.155l-20.346 20.394c-.887.982-.19 2.554 1.133 2.554h13.614a5.636 5.636 0 0 0 4.834-2.738l12.022-20.022c.619-1.03-.125-2.343-1.327-2.343zm31.054-146.64h-.14c-.334.003-1.772.012-1.98.015-15.195.265-27.913 2.024-37.317 5.07a.512.512 0 0 1-.063.02l-.056.018c-9.119 2.834-13.39 5.79-15.426 10.46-.687 1.548-1.121 3.295-1.401 5.31 0 0-10.68 47.554-10.686 68.633-.003.63.065 4.134.065 4.137.711 21.617 11.338 43.913 28.84 43.913h76.187c17.499 0 28.125-22.296 28.836-43.913 0-.003.069-3.506.069-4.137-.01-21.079-10.69-68.632-10.69-68.632-.276-2.016-.713-3.763-1.4-5.31-2.036-4.671-6.31-7.627-15.426-10.461l-.054-.018c-.02-.006-.044-.012-.065-.02-9.404-3.046-22.122-4.805-37.318-5.07-.208-.003-1.64-.012-1.975-.015zm185.752 33.26l-40.436.014 57.293 24.716-88.703.006v16.848l88.688.015-41.552 20.224h-47.142l.006 16.851 47.148.003 51.652 24.728 40.454.006-57.343-24.74h88.759v-16.845l-88.76.003 41.603-20.245 47.13-.006V97.167l-47.097-.012-51.7-24.719zM174 125.846a8.643 8.643 0 0 1 8.595 8.654c0 4.766-3.847 8.636-8.595 8.666-4.751-.03-8.613-3.9-8.613-8.666 0-4.777 3.862-8.623 8.613-8.653zm-81.37 0c4.746.03 8.61 3.877 8.61 8.654 0 4.766-3.864 8.636-8.61 8.666-4.748-.03-8.594-3.9-8.594-8.666a8.643 8.643 0 0 1 8.595-8.653zm26.172-63.237c1.362 0 2.716.682 2.716 2.491v41.389c0 2.268-.681 3.4-3.166 3.4h-30.02c-1.812 0-2.72-.905-2.493-2.495.898-12.47 3.59-30.166 6.455-42.067.545-2.25 2.044-2.718 3.175-2.718zm52.357 0c1.13 0 2.633.467 3.174 2.718 2.868 11.9 5.557 29.597 6.456 42.067.226 1.59-.681 2.494-2.49 2.494h-30.021c-2.487 0-3.168-1.13-3.168-3.399V65.101c0-1.81 1.356-2.491 2.719-2.491z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/rail.svg b/src/wmcads/assets/icon/modes/bg/rail.svg
deleted file mode 100755
index 4c438acf..00000000
--- a/src/wmcads/assets/icon/modes/bg/rail.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M229.945 0c14.074 0 25.585 11.511 25.585 25.585V230.27c0 14.071-11.511 25.585-25.585 25.585H25.532c-14.072 0-25.589-11.514-25.589-25.585l.01-204.678C-.048 11.517 11.468.003 25.545.003zm-66.873 191.658h-4.769c-1.202 0-1.947 1.312-1.324 2.342l12.014 20.01a5.65 5.65 0 0 0 4.843 2.739h13.616c1.318 0 2.018-1.572 1.128-2.554l-20.346-20.382a7.262 7.262 0 0 0-5.162-2.155zm-66.739 0h-4.768a7.257 7.257 0 0 0-5.162 2.155l-20.349 20.382c-.887.982-.188 2.554 1.134 2.554h13.613a5.637 5.637 0 0 0 4.837-2.739L97.661 194c.616-1.03-.125-2.342-1.328-2.342zM127.34 45.092h-.036c-.19.001-1.811.012-2.033.015-15.199.265-27.916 2.024-37.32 5.066a.422.422 0 0 1-.065.02c-.02.007-.032.013-.053.022-9.12 2.83-13.393 5.784-15.429 10.454-.684 1.545-1.122 3.292-1.402 5.305 0 0-10.677 47.53-10.683 68.599-.003.63.062 4.131.062 4.134.712 21.606 11.342 43.892 28.842 43.892h76.193c17.5 0 28.127-22.286 28.841-43.892 0-.003.066-3.503.066-4.134-.01-21.07-10.69-68.6-10.69-68.6-.273-2.012-.714-3.759-1.399-5.304-2.036-4.67-6.313-7.623-15.428-10.454-.018-.01-.036-.015-.05-.021-.022-.006-.048-.012-.07-.021-9.403-3.042-22.122-4.801-37.319-5.066-.235-.003-2.045-.015-2.045-.015zm40.665 86.629a8.64 8.64 0 0 1 8.597 8.647c0 4.76-3.846 8.633-8.597 8.663-4.747-.03-8.611-3.903-8.611-8.663 0-4.774 3.864-8.617 8.611-8.647zm-81.375 0c4.751.03 8.612 3.873 8.612 8.647 0 4.76-3.86 8.633-8.612 8.663-4.745-.03-8.594-3.903-8.594-8.663a8.641 8.641 0 0 1 8.594-8.647zm26.175-63.208c1.36 0 2.715.681 2.715 2.491v41.368c0 2.268-.68 3.397-3.165 3.397H82.331c-1.81 0-2.718-.905-2.492-2.492.9-12.464 3.59-30.151 6.454-42.046.548-2.25 2.05-2.718 3.176-2.718zm52.36 0c1.132 0 2.635.467 3.177 2.718 2.866 11.895 5.557 29.582 6.456 42.046.227 1.587-.681 2.492-2.488 2.492h-30.024c-2.488 0-3.17-1.129-3.17-3.397V71.004c0-1.81 1.355-2.491 2.718-2.491z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/roads.svg b/src/wmcads/assets/icon/modes/bg/roads.svg
deleted file mode 100755
index 996786c6..00000000
--- a/src/wmcads/assets/icon/modes/bg/roads.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="nonzero" d="M229.346.658c13.99 0 25.434 11.443 25.434 25.436v203.47c0 13.99-11.443 25.436-25.434 25.436H25.436C11.446 255 0 243.554 0 229.564L.012 26.1C.012 12.11 11.457.664 25.448.664zm-65.884 59.478H91.398c-5.656 0-11.187 4.546-12.291 10.106l-6.326 31.402c-1.119 5.552-4.328 12.39-7.129 15.202-2.795 2.813-5.087 9.74-5.087 15.408v35.977c0 5.656 4.61 10.282 10.27 10.3v12.347a3.095 3.095 0 0 0 3.09 3.09h9.266a3.1 3.1 0 0 0 3.09-3.09V178.53h82.328v12.348a3.092 3.092 0 0 0 3.087 3.09h9.257a3.095 3.095 0 0 0 3.09-3.09V178.53h.021c5.665 0 10.3-4.631 10.3-10.3v-35.976c0-5.668-2.343-12.595-5.195-15.408-2.852-2.813-6.06-9.662-7.123-15.22l-6.198-31.404c-1.152-5.55-6.73-10.086-12.386-10.086zm-10.24 90.288a5.141 5.141 0 0 1 5.144 5.144 5.142 5.142 0 0 1-5.144 5.147h-51.474a5.145 5.145 0 0 1-5.147-5.147 5.144 5.144 0 0 1 5.147-5.144zm-74.663-23.376c4.248 0 7.722 3.482 7.722 7.742s-3.474 7.704-7.722 7.704c-4.25 0-7.724-3.444-7.724-7.704s3.473-7.742 7.724-7.742zm97.76 0c4.26 0 7.724 3.482 7.724 7.742s-3.465 7.704-7.724 7.704c-4.248 0-7.722-3.444-7.722-7.704s3.474-7.742 7.722-7.742zm-15.435-56.61c2.834 0 5.57 2.275 6.09 5.058l4.897 25.964c1.066 5.557-2.703 10.103-8.37 10.103H91.356c-5.664 0-9.415-4.546-8.332-10.095l4.939-25.954c.473-2.792 3.179-5.075 6.01-5.075z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/bg/walk.svg b/src/wmcads/assets/icon/modes/bg/walk.svg
deleted file mode 100755
index 8ad4918c..00000000
--- a/src/wmcads/assets/icon/modes/bg/walk.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="255" height="255" viewBox="0 0 255 255">
-    <path fill="#FFF" fill-rule="nonzero" d="M179.043 127.06l-9.812.925c-1.668 0-3.334-.37-4.445-1.479l-19.07-17.034s0-.184-.185-.184l-2.593-4.446h-.183l-2.777-7.035h-.741l.74 39.623v.37l16.108 34.25v.187l.924 3.517 9.629 37.771c.557 2.033-.187 3.147-2.223 3.885l-8.33 2.593c-2.04.928-3.518-.183-4.075-2.036l-12.032-41.842c0-.187-.184-.187-.184-.187l-13.333-24.624v-.184c-.367-1.111-1.111-2.039-2.22-2.039-1.111 0-2.039.557-2.41 2.04l-8.33 28.325c-.557 1.295-.924 2.223-2.036 3.704l-25.551 31.103c-1.48 1.668-3.148 2.41-5.367.74l-5.74-4.625c-1.112-.928-1.299-2.04.186-4.262v-.184l23.326-31.289c0-.187.184-.187.184-.37l8.7-36.66v-.183l.745-29.44c.183-4.63.37-7.036.74-10.737h-.557l-7.406 12.589v.184l-7.59 29.253c-.556 1.852-2.963 2.223-4.074.74l-5.37-8.33c-.925-1.481-1.108-3.147-.554-4.812l5.556-21.848c.184-1.111.555-2.039 1.296-3.147l14.254-21.477c3.888-6.298 6.849-6.668 15.183-6.668h10.182c7.777 0 11.665 0 15.737 7.222l11.297 20.736c0 .187.184.187.184.187l23.326 21.106c1.482 1.295.744 3.702-1.109 4.072M125.536 35.23c7.96 0 14.258 7.035 14.258 15.736 0 8.888-6.298 15.923-14.258 15.923-7.963 0-14.257-7.035-14.257-15.923 0-8.701 6.294-15.736 14.257-15.736M229.427.566L25.455.572C11.463.572.012 12.022.012 26.02L0 229.554C0 243.549 11.448 255 25.44 255h203.987c13.993 0 25.44-11.45 25.44-25.446V26.013c0-13.996-11.447-25.447-25.44-25.447"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/bus.svg b/src/wmcads/assets/icon/modes/isolated/bus.svg
deleted file mode 100755
index cf246bac..00000000
--- a/src/wmcads/assets/icon/modes/isolated/bus.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M71 112h112.005c4.386-.004 8 3.6 7.995 7.996v39.994c0 4.405-3.609 8.014-8.004 8.01H70.986c-4.373.004-7.986-3.591-7.968-7.992L63 119.992C63 115.6 66.604 112 71 112zm88-20.497c-.004 2.474-2.158 4.497-4.788 4.497l-54.429-.013c-2.612.013-4.783-2.01-4.77-4.484L95 85.489C95 83.01 97.153 81 99.783 81h54.438c2.63 0 4.779 2.031 4.775 4.489l.004 6.014zM63 23.177c.018-4.495 3.6-8.177 8.017-8.168L183.001 15c4.4 0 7.995 3.696 7.999 8.177l-.004 32.651C191 60.313 187.4 63.982 183 64H71.008c-4.422-.018-7.995-3.696-8.008-8.172V23.177zm129 172.852c-.009 6.592-5.39 11.967-12.016 11.971-6.585-.004-11.984-5.36-11.984-11.984-.009-6.61 5.4-12.016 11.993-12.016 6.603.009 12.007 5.41 12.007 12.03zM76 208c-6.625 0-12-5.345-12-11.973C63.987 189.408 69.38 184 75.978 184c6.62 0 12.009 5.408 12.022 12.022 0 6.633-5.402 12-12 11.978zm-12.014 24.007l.005-.005.018 19.194a4.79 4.79 0 0 0 4.786 4.795l14.4.009c2.647-.009 4.808-2.166 4.813-4.782l-.014-19.211 23.995.013c8.813-.013 23.204-.018 32-.013h23.999V251.2c0 2.634 2.175 4.791 4.817 4.787l14.391.004a4.784 4.784 0 0 0 4.804-4.79l.005-19.18c8.795-.014 15.986-7.227 15.99-16.013L208 16.017C208.004 7.208 200.8.03 192.005.013L144.06 0c-8.782.009-23.186.013-31.994.009H64.009c-8.827.004-16 7.2-16.005 16.008L48 216.008c.004 8.777 7.19 15.999 15.986 15.999z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/coach.svg b/src/wmcads/assets/icon/modes/isolated/coach.svg
deleted file mode 100755
index 1cd923dd..00000000
--- a/src/wmcads/assets/icon/modes/isolated/coach.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FEFEFE" fill-rule="evenodd" d="M188.867 207.998c-6.639 0-12.06-5.363-12.06-11.98 0-6.62 5.421-12.02 12.06-12.02 6.653 0 12.056 5.4 12.056 12.02 0 6.617-5.403 11.98-12.056 11.98zM64.232 136c-4.418 0-8.038-3.598-8.038-8V24c0-4.4 3.62-8.004 8.038-8.004h128.62c4.418 0 8.034 3.603 8.034 8.005V128c0 4.402-3.616 8-8.034 8H64.232zm4.022 71.998c-6.634 0-12.06-5.363-12.06-11.98 0-6.62 5.426-12.02 12.06-12.02 6.648 0 12.056 5.4 12.056 12.02 0 6.617-5.408 11.98-12.056 11.98zM200.854.033L56.197 0c-8.841 0-16.077 7.197-16.077 15.996v40.006H28.06C21.406 56.002 16 61.384 16 68v36c0 4.415 3.602 8 8.039 8 4.441 0 8.043-3.585 8.043-8V71.997h8.039v144.005c0 8.8 7.231 15.996 16.073 15.996v19.2c0 2.642 2.169 4.801 4.828 4.801h14.464c2.659 0 4.824-2.16 4.824-4.801v-19.2h96.497v19.2c0 2.642 2.174 4.801 4.824 4.801h14.435c2.655 0 4.824-2.16 4.824-4.801v-19.205c8.828-.013 16.04-7.206 16.04-15.99V71.997h7.993v32.001c0 4.416 3.597 8 8.038 8 4.437 0 8.039-3.584 8.039-8V68c0-6.616-5.407-11.998-12.056-11.998h-12.013V16.038c0-8.804-7.237-16.005-16.078-16.005z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/cycle.svg b/src/wmcads/assets/icon/modes/isolated/cycle.svg
deleted file mode 100755
index f5ce2e0f..00000000
--- a/src/wmcads/assets/icon/modes/isolated/cycle.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <g fill="#FEFEFE" fill-rule="evenodd">
-        <path d="M122.947 143.257c-1.274-.511-2.548-.765-4.08-1.018-2.55-18.085-11.736-56.798-11.736-56.798h62.507l.258.511c-17.093 18.335-32.658 37.695-46.95 57.305zm-17.859 8.151c-13.776-.764-35.463-1.022-47.453.254l-.512-1.018c5.614-8.409 11.74-17.574 17.35-26.49l6.888-10.698c5.869-9.423 10.971-18.592 14.8-26.486h.512c2.547 19.1 6.63 38.966 11.99 59.087-1.532 1.529-2.555 3.311-3.575 5.351zM185.969 143c1.531 6.37 6.122 13.245 11.736 18.339 1.278 1.022 2.806 1.529 4.595 1.529 2.551 0 4.59-1.018 6.122-2.547 1.02-1.529 1.785-3.311 1.528-5.094 0-2.293-1.016-4.075-2.806-5.347-4.082-3.568-6.633-6.622-7.4-9.933L178.57 63.792c-2.297-8.405-5.868-11.716-14.8-13.245 0 0-15.306-2.547-15.56-2.547-1.532 0-2.298.764-2.552 2.547l-.765 5.093c-.254 1.276 0 3.312 2.805 3.569l11.74 2.036c2.547.51 4.333 2.04 5.103 4.84l2.293 8.151h-61.23l-1.277-7.387h10.717c2.04 0 3.317-1.275 3.317-3.31v-3.823c0-2.547-1.532-3.818-4.595-4.076l-30.36-4.071c-.512-.258-1.278-.258-1.786-.258-4.594 0-7.653 3.058-7.653 7.134 0 5.347 3.313 8.147 9.439 8.147h8.165l.762 6.88-50.005 77.936c-1.531 2.29-1.785 5.347-.511 7.383 1.277 2.04 3.063 3.058 5.356 3.058h57.916c2.555 5.093 7.658 8.151 13.272 8.151 8.161 0 14.795-6.369 14.795-14.516 0-2.294-.508-4.333-1.531-6.116L173.213 96.9l12.756 46.1z"/>
-        <path d="M52.728 117.548c2.832 0 5.404.256 7.976.76l7.46-12.41c-4.888-1.517-10.292-2.025-15.436-2.025C23.664 103.873 0 127.174 0 155.797c0 28.363 23.664 51.921 52.728 51.921 24.696 0 46.3-17.476 51.444-41.03H89.768c-4.888 15.956-20.064 27.099-37.04 27.099-21.348 0-38.58-17.224-38.58-37.99 0-21.025 17.232-38.249 38.58-38.249"/>
-        <path d="M87.25 117L80 127.68c5.501 5.209 9.498 12.246 11.252 20.06 4.498 0 8.747.26 12.748.26-1.998-12.243-8.001-23.185-16.75-31M202.85 207.718c28.736 0 52.133-23.557 52.133-51.92 0-28.623-23.397-51.925-52.132-51.925-2.796 0-5.343 0-7.886.508l3.563 13.423c1.527 0 2.796-.256 4.323-.256 21.106 0 38.4 17.225 38.4 38.25 0 20.765-17.294 37.99-38.4 37.99-21.107 0-38.144-17.225-38.144-37.99 0-11.147 4.828-21.53 13.22-28.875l-4.069-14.44c-14.494 9.879-23.14 25.838-23.14 43.315 0 28.363 23.397 51.92 52.133 51.92"/>
-    </g>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/metro.svg b/src/wmcads/assets/icon/modes/isolated/metro.svg
deleted file mode 100755
index a1b4bf34..00000000
--- a/src/wmcads/assets/icon/modes/isolated/metro.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M178.81 209.227l6.815 15.54 11.74 26.881c1.005 2.347-.348 4.352-3.028 4.352H183.72c-2.684 0-5.255-2.005-5.712-4.646l-4.616-26.587-2.738-15.54h8.155zm-88.146-1.328l-7.26 43.323c-.45 2.716-2.976 4.778-5.644 4.778H67.282c-2.646 0-3.987-2.062-2.972-4.475l11.586-27.644 6.722-15.982h8.046zM131.057 0c1.699 0 3.402.627 4.707 1.902l23.895 23.666c2.606 2.72 2.606 6.858.018 9.414l-12.6 12.64h21.982c17.732 0 33.501 14.368 35.057 31.959l7.76 88.372c1.56 17.564-11.685 31.96-29.425 31.96H79.56c-17.759 0-30.985-14.396-29.438-31.96l7.773-88.372c1.56-17.591 17.311-31.96 35.056-31.96h21.983l-12.618-12.48c-2.62-2.56-2.62-6.853 0-9.426L126.31 1.902C127.611.627 129.318 0 131.057 0zM78.582 151.81c-6.655 0-12.086 5.436-12.086 11.987 0 6.711 5.43 11.987 12.086 11.987 6.669 0 12.082-5.276 12.082-11.987 0-6.55-5.413-11.986-12.082-11.986zm104.848 0c-6.665 0-12.087 5.436-12.087 11.987 0 6.711 5.422 11.987 12.087 11.987 6.633 0 12.068-5.276 12.068-11.987 0-6.55-5.435-11.986-12.068-11.986zm-12.355-88.207H90.941c-8.855 0-16.744 7.191-17.522 15.978l-4.241 48.261c-.38 4.316 2.927 7.991 7.361 7.991h108.915c4.439 0 7.764-3.675 7.38-7.99l-4.246-48.262c-.77-8.787-8.645-15.978-17.513-15.978zM131.053 14.24l-16.346 16.12 16.332 16.301 16.28-16.302-16.266-16.12z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/plane.svg b/src/wmcads/assets/icon/modes/isolated/plane.svg
deleted file mode 100755
index cd2f8130..00000000
--- a/src/wmcads/assets/icon/modes/isolated/plane.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FEFEFE" fill-rule="evenodd" d="M250.765 5.227c-6.975-6.97-18.286-6.97-25.266 0l-57.637 57.586L36.77 26.23c-3.784-1.057-9.155.352-11.933 3.127l-2.88 2.878c-2.782 2.78-2.374 6.82.91 8.984l64.027 42.226c3.279 2.164 8.241 6.2 11.028 8.97l20.193 20.101-51.103 51.057-55.582-15.508c-1.892-.528-4.582.176-5.969 1.566l-4.53 4.527c-1.392 1.385-1.197 3.424.426 4.532l57.103 38.843 38.934 57.113c1.108 1.622 3.149 1.812 4.54.427l4.531-4.532c1.391-1.385 2.096-4.073 1.568-5.959l-15.625-55.895 50.978-50.932 20.23 20.295c2.777 2.785 6.816 7.743 8.987 11.014l42.365 64.092c2.17 3.276 6.215 3.684 8.997.908l2.88-2.877c2.773-2.776 4.183-8.142 3.13-11.927L193.264 87.922l57.502-57.452c6.98-6.973 6.98-18.274 0-25.243"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/rail.svg b/src/wmcads/assets/icon/modes/isolated/rail.svg
deleted file mode 100755
index 2520b35b..00000000
--- a/src/wmcads/assets/icon/modes/isolated/rail.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M183.763 218.707c2.85 0 5.591 1.15 7.604 3.203l29.976 30.293c1.31 1.46.28 3.796-1.663 3.796h-20.06a8.31 8.31 0 0 1-7.134-4.07l-17.7-29.74c-.917-1.53.18-3.482 1.951-3.482h7.026zm-102.5 0c1.772 0 2.864 1.951 1.956 3.482l-17.713 29.74a8.29 8.29 0 0 1-7.126 4.07H38.326c-1.948 0-2.978-2.336-1.671-3.796l29.978-30.293a10.645 10.645 0 0 1 7.605-3.203h7.025zM132.055.021c22.68.394 41.664 3.011 55.699 7.538.03.013.07.022.102.031.022.009.049.018.075.031 13.604 4.212 19.988 8.606 23.027 15.555 1.022 2.299 1.68 4.899 2.088 7.893 0 0 15.94 70.72 15.954 102.069 0 .939-.098 6.147-.098 6.152-1.066 32.146-16.927 65.307-43.046 65.307H72.14c-26.12 0-41.985-33.16-43.046-65.307 0-.005-.098-5.213-.094-6.152.01-31.35 15.945-102.07 15.945-102.07.418-2.993 1.071-5.593 2.093-7.892 3.039-6.95 9.414-11.343 23.027-15.555.03-.013.049-.022.08-.03a.63.63 0 0 0 .097-.032c14.035-4.527 33.015-7.144 55.7-7.538.32-.004 2.607-.02 3.002-.022h.116c.394.003 2.674.018 2.995.022zm57.563 128.985c-7.246.045-13.143 5.863-13.143 13.092 0 7.205 5.897 13.068 13.143 13.113 7.25-.045 13.12-5.908 13.12-13.113 0-7.229-5.87-13.047-13.12-13.092zm-121.238 0c-7.242.045-13.117 5.863-13.117 13.092 0 7.205 5.875 13.068 13.117 13.113 7.252-.045 13.145-5.908 13.145-13.113 0-7.229-5.893-13.047-13.145-13.092zm40.389-92.724h-34.98c-1.686 0-3.94.688-4.76 4-4.293 17.505-8.327 43.535-9.675 61.877-.339 2.335 1.022 3.666 3.735 3.666h45.006c3.726 0 4.744-1.66 4.744-4.998V39.949c0-2.664-2.03-3.667-4.07-3.667zm76.449 0h-34.972c-2.044 0-4.074 1.003-4.074 3.667v60.878c0 3.338 1.022 4.998 4.752 4.998h45.002c2.708 0 4.07-1.331 3.73-3.666-1.347-18.342-5.38-44.372-9.678-61.877-.812-3.312-3.065-4-4.76-4z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/roads.svg b/src/wmcads/assets/icon/modes/isolated/roads.svg
deleted file mode 100755
index 0a56eac8..00000000
--- a/src/wmcads/assets/icon/modes/isolated/roads.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#FFF" fill-rule="nonzero" d="M187.19 18c9.3 0 18.472 7.457 20.366 16.579l10.19 51.624c1.748 9.136 7.024 20.396 11.713 25.02 4.689 4.624 8.541 16.011 8.541 25.328v59.141c0 9.317-7.62 16.931-16.935 16.931h-.034v20.298c0 2.799-2.281 5.079-5.08 5.079h-15.223c-2.8 0-5.076-2.28-5.076-5.08v-20.297H60.284v20.298c0 2.799-2.296 5.079-5.08 5.079H39.966c-2.8 0-5.08-2.28-5.08-5.08v-20.297C25.581 212.593 18 204.99 18 195.693V136.55c0-9.317 3.769-20.704 8.365-25.328 4.606-4.624 9.882-15.864 11.722-24.99l10.401-51.62C50.304 25.473 59.398 18 68.698 18H187.19zm-16.601 150H86.416c-4.648 0-8.416 3.801-8.416 8.498 0 4.7 3.768 8.502 8.416 8.502h84.173c4.648 0 8.411-3.801 8.411-8.502 0-4.697-3.763-8.498-8.411-8.498zM48.502 127C41.622 127 36 132.637 36 139.531 36 146.426 41.622 152 48.502 152 55.378 152 61 146.426 61 139.531 61 132.637 55.378 127 48.502 127zm159.996 0c-6.876 0-12.498 5.637-12.498 12.531 0 6.895 5.622 12.469 12.498 12.469 6.894 0 12.502-5.574 12.502-12.469 0-6.894-5.608-12.531-12.502-12.531zm-25.774-94H73.223c-4.633 0-9.061 3.775-9.836 8.392L55.305 84.31C53.532 93.484 59.67 101 68.941 101h118.065c9.276 0 15.443-7.516 13.699-16.706l-8.014-42.931c-.852-4.602-5.33-8.363-9.967-8.363z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/modes/isolated/walk.svg b/src/wmcads/assets/icon/modes/isolated/walk.svg
deleted file mode 100755
index ca7ca978..00000000
--- a/src/wmcads/assets/icon/modes/isolated/walk.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <g fill="#FEFEFE" fill-rule="evenodd">
-        <path d="M147 21.373C147 9.556 138.387 0 127.5 0 116.609 0 108 9.556 108 21.373 108 33.444 116.609 43 127.5 43c10.887 0 19.5-9.556 19.5-21.627M102.355 141.378v.254l-12.12 50.683c0 .254-.256.254-.256.512l-32.493 43.258v.254c-2.069 3.073-1.809 4.61-.26 5.892l7.996 6.396c3.092 2.307 5.416 1.282 7.476-1.024l35.594-43c1.548-2.05 2.06-3.332 2.836-5.122l11.604-39.162c.517-2.048 1.809-2.819 3.357-2.819 1.544 0 2.58 1.283 3.092 2.82v.253l18.573 34.044s.256 0 .256.258l16.76 57.85c.777 2.56 2.837 4.097 5.677 2.814l11.604-3.585c2.836-1.02 3.873-2.56 3.096-5.371l-13.412-52.22-1.288-4.863v-.258L148.01 141.89v-.512l-1.032-54.78h1.032l3.868 9.727h.256l3.612 6.145c.256 0 .256.254.256.254l26.565 23.551c1.548 1.533 3.868 2.045 6.193 2.045l13.668-1.278c2.58-.513 3.608-3.84 1.544-5.63l-32.493-29.18s-.256 0-.256-.259l-15.737-28.668c-5.672-9.985-11.088-9.985-21.921-9.985H119.38c-11.608 0-15.732.512-21.149 9.219L78.374 92.23c-1.032 1.533-1.548 2.815-1.804 4.352l-7.74 30.205c-.772 2.302-.516 4.605.772 6.653l7.48 11.518c1.548 2.048 4.9 1.536 5.677-1.025l10.572-40.443v-.254l10.317-17.405h.776c-.516 5.117-.776 8.444-1.032 14.844l-1.037 40.702z"/>
-    </g>
-</svg>
diff --git a/src/wmcads/assets/icon/social/email.svg b/src/wmcads/assets/icon/social/email.svg
new file mode 100644
index 00000000..e61d73c8
--- /dev/null
+++ b/src/wmcads/assets/icon/social/email.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M176 124v-8c0-2.21-1.79-4-4-4H84c-2.21 0-4 1.79-4 4v8c0 2.21 1.79 4 4 4h88c2.21 0 4-1.79 4-4zM84 96h88c2.21 0 4-1.79 4-4v-8c0-2.21-1.79-4-4-4H84c-2.21 0-4 1.79-4 4v8c0 2.21 1.79 4 4 4zm163.295-13.74L224 63.495V48c0-8.835-7.165-16-16-16h-23.235l-5.1-4.07C168.615 19.095 149.72 0 128 0c-20.334 0-38.108 16.706-49.591 26.234L71.23 32H48c-8.835 0-16 7.165-16 16v15.49L8.76 82.205C3.926 86.18 0 94.482 0 100.74V232c0 13.255 10.745 24 24 24h208c13.255 0 24-10.745 24-24V100.755c0-7.155-3.19-13.94-8.705-18.495zM128.523 16c10.853 0 22.254 8.36 31.477 16H97.067c9.237-7.635 20.649-16 31.456-16zM48 48h160v86.674l-43.295 34.67c-8.425 6.715-25.095 22.84-36.705 22.654-11.605.19-28.28-15.94-36.705-22.66L48 134.668V48zm-32 52.791c0-1.897.682-3.703 1.904-5.121l1.016-.987c.62-.504 5.81-4.635 13.08-10.416V121.6l-16-12.74v-8.069zm224 131.181c0 4.426-3.59 8.028-8 8.028H24c-4.41 0-8-3.602-8-8.028v-102.9l65.34 52.592c10.245 8.208 28.37 26.355 46.66 26.22 18.225.13 36.135-17.791 46.655-26.22l19.17-15.356c14.61-11.745 31.922-25.722 46.175-37.241v102.905zm0-131.174v8.056L224 121.6V84.267l13.1 10.438c1.845 1.507 2.9 3.726 2.9 6.093z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/social/facebook.svg b/src/wmcads/assets/icon/social/facebook.svg
old mode 100755
new mode 100644
index 6007dc8b..9e61d99a
--- a/src/wmcads/assets/icon/social/facebook.svg
+++ b/src/wmcads/assets/icon/social/facebook.svg
@@ -1,3 +1,7 @@
-<svg id="facebook" viewBox="0 0 32 32">
-<path d="M31.997 15.999c0-8.836-7.163-15.999-15.999-15.999s-15.999 7.163-15.999 15.999c0 7.985 5.851 14.604 13.499 15.804v-11.18h-4.062v-4.625h4.062v-3.525c0-4.010 2.389-6.225 6.043-6.225 1.75 0 3.581 0.313 3.581 0.313v3.937h-2.017c-1.987 0-2.607 1.233-2.607 2.498v3.001h4.437l-0.709 4.625h-3.728v11.18c7.649-1.2 13.499-7.819 13.499-15.804z"></path>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M100.752 256.35h46.881V139.531h38.902l5.985-45.392h-44.887V65.1c0-13.35 3.658-22.362 22.277-22.362h23.94V2.353C189.86 1.685 175.563.35 158.938.35c-34.58 0-58.186 21.361-58.186 60.078v33.71H61.85v45.393h38.902V256.35z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/social/linkedin.svg b/src/wmcads/assets/icon/social/linkedin.svg
new file mode 100644
index 00000000..597688d4
--- /dev/null
+++ b/src/wmcads/assets/icon/social/linkedin.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M237.714 0H18.23C8.17 0 0 8.286 0 18.457v219.086C0 247.714 8.171 256 18.229 256h219.485c10.057 0 18.286-8.286 18.286-18.457V18.457C256 8.286 247.771 0 237.714 0zM77.43 219.429h-38V97.257h38V219.43zM58.4 80.57c-12.171 0-22-9.885-22-22 0-12.114 9.829-22 22-22 12.115 0 22 9.886 22 22 0 12.172-9.829 22-22 22zM219.6 219.43h-37.943l-.01-62.52c-.128-13.591-1.663-29.31-19.704-29.31-19.277 0-22.638 14.668-22.794 30.178l-.006 61.652H101.2V97.257h36.4v16.686h.514c5.086-9.6 17.486-19.714 35.943-19.714 37.76 0 45.296 24.477 45.537 56.589l.006 68.61z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/social/twitter.svg b/src/wmcads/assets/icon/social/twitter.svg
old mode 100755
new mode 100644
index 39b86703..a40c29e1
--- a/src/wmcads/assets/icon/social/twitter.svg
+++ b/src/wmcads/assets/icon/social/twitter.svg
@@ -1,11 +1,7 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="48px" height="39px" viewBox="0 0 48 39" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>Group 4</title>
-    <g id="Header-and-Footer" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <g id="Footer-/-Large-Device-(≥-1280px)" transform="translate(-896.000000, -259.000000)" fill="#FFFFFE">
-            <g id="Twitter_Logo_WhiteOnImage" transform="translate(896.000000, 259.000000)">
-                <path d="M15.095616,39 C33.209664,39 43.115328,23.9970026 43.115328,10.9875971 C43.115328,10.5612763 43.106688,10.1368751 43.087104,9.71477719 C45.009792,8.32525175 46.681344,6.59136816 48,4.61716328 C46.235328,5.40070283 44.336448,5.928949 42.344448,6.1669669 C44.377728,4.94846883 45.938688,3.01975608 46.674816,0.720963884 C44.771712,1.84866964 42.664896,2.66887163 40.42176,3.11054839 C38.624832,1.19699968 36.065472,0 33.233472,0 C27.794496,0 23.384064,4.40928152 23.384064,9.84472728 C23.384064,10.6175176 23.470656,11.3686177 23.639424,12.0895815 C15.45504,11.6782329 8.19744,7.76034315 3.3408,1.80317751 C2.494272,3.25777397 2.007168,4.94846883 2.007168,6.75145439 C2.007168,10.1673951 3.745728,13.1827363 6.389376,14.946756 C4.774272,14.897041 3.256512,14.4532528 1.929216,13.7150134 C1.926912,13.7560907 1.926912,13.79736 1.926912,13.8405487 C1.926912,18.6093524 5.322048,22.5900097 9.827712,23.4927502 C9.000768,23.7177155 8.13024,23.8390278 7.23168,23.8390278 C6.597312,23.8390278 5.980224,23.7762602 5.380416,23.6614742 C6.634176,27.5730296 10.269504,30.4194549 14.580288,30.4996899 C11.209152,33.1403449 6.963264,34.7139503 2.349312,34.7139503 C1.554624,34.7139503 0.77088,34.6686501 0,34.5776659 C4.358592,37.3699613 9.533376,39 15.095616,39" id="Fill-2"></path>
-            </g>
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M80.68 238c96.341 0 149.448-79.924 149.448-149.306 0-2.38 0-4.42-.34-6.802C240 74.41 249.19 65.227 256 54.684c-9.532 4.081-19.745 7.142-30.298 8.163 10.894-6.462 19.404-17.006 23.15-28.91-10.214 6.123-21.448 10.204-33.363 12.585-19.744-21.087-53.106-22.107-74.212-2.381-13.617 12.584-19.405 31.97-14.98 50.335C84.086 92.436 44.597 72.37 18.044 39.72c-13.958 23.807-6.809 54.756 16.34 70.06-8.17-.34-16.68-2.38-23.83-6.461v.68c0 24.828 17.702 46.254 41.873 51.356-7.83 2.04-16 2.38-23.83 1.02 6.808 21.427 26.553 36.051 49.021 36.391-18.723 14.625-41.532 22.447-65.021 22.447-4.085 0-8.17-.34-12.596-1.02C24.17 229.838 52.426 238 80.68 238"/>
         </g>
     </g>
-</svg>
\ No newline at end of file
+</svg>
diff --git a/src/wmcads/assets/icon/social/youtube.svg b/src/wmcads/assets/icon/social/youtube.svg
new file mode 100644
index 00000000..579b744e
--- /dev/null
+++ b/src/wmcads/assets/icon/social/youtube.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
+    <g fill="none" fill-rule="evenodd">
+        <g fill="#FFF" fill-rule="nonzero">
+            <path d="M228.02 212.618c11.013-2.962 19.688-11.33 22.632-22.416 4.973-18.68 5.323-56.224 5.348-61.419v-1.203c-.025-5.195-.375-42.738-5.348-61.418-2.944-11.086-11.619-19.818-22.633-22.78-18.367-4.954-87.594-5.35-98.553-5.382h-2.93c-10.96.032-80.186.428-98.553 5.382-11.015 2.963-19.69 11.694-22.634 22.78C.151 85.691.004 125.837 0 128.083v.197c.004 2.246.15 42.393 5.35 61.922 2.944 11.086 11.618 19.454 22.633 22.416 18.367 4.954 87.594 5.35 98.553 5.382h2.93c10.959-.032 80.186-.428 98.553-5.382zM102 166V90l67 38-67 38z"/>
+        </g>
+    </g>
+</svg>
diff --git a/src/wmcads/assets/icon/swift/bird-icon.svg b/src/wmcads/assets/icon/swift/bird-icon.svg
deleted file mode 100755
index bcc89a67..00000000
--- a/src/wmcads/assets/icon/swift/bird-icon.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="256" height="256" viewBox="0 0 256 256">
-    <defs>
-        <path id="a" d="M0 .24h228.66v178.657H0z"/>
-    </defs>
-    <g fill="none" fill-rule="evenodd">
-        <g transform="translate(14 38)">
-            <mask id="b" fill="#fff">
-                <use xlink:href="#a"/>
-            </mask>
-            <path fill="#FEFEFE" d="M32.683 135.123l2.408 1.792c16.872 12.55 36.994 19.184 58.195 19.184 26.103 0 50.643-10.159 69.098-28.608l34.024-34.007-61.034-61.006-102.69 102.645zm60.603 43.774c-32.193 0-62.46-12.532-85.222-35.284L0 135.552 135.374.24l93.286 93.244-50.15 50.129c-22.765 22.752-53.031 35.284-85.224 35.284z" mask="url(#b)"/>
-        </g>
-        <path fill="#FEFEFE" d="M146.206 134c-3.37 0-6.415-1.014-9.132-3.047-2.718-2.033-4.074-5.136-4.074-9.31 0-2.306.459-4.474 1.383-6.507.924-2.033 2.146-3.792 3.67-5.274 1.52-1.483 3.287-2.662 5.3-3.542 2.008-.878 4.156-1.32 6.439-1.32 3.366 0 6.412 1.016 9.13 3.05 2.717 2.032 4.078 5.135 4.078 9.31 0 2.305-.466 4.476-1.388 6.507-.924 2.035-2.148 3.79-3.668 5.274a17.687 17.687 0 0 1-5.298 3.542c-2.014.88-4.157 1.317-6.44 1.317"/>
-    </g>
-</svg>
diff --git a/src/wmcads/assets/icon/swift/card-full-logo.svg b/src/wmcads/assets/icon/swift/card-full-logo.svg
deleted file mode 100755
index 086fd0e0..00000000
--- a/src/wmcads/assets/icon/swift/card-full-logo.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#3C1053" fill-rule="evenodd" d="M221.333 41C231.64 41 240 49.35 240 59.643v136.714C240 206.65 231.639 215 221.333 215H34.667C24.36 215 16 206.65 16 196.357V59.643C16 49.35 24.361 41 34.667 41zm-18.691 60.5c-4.702 0-8.349 1.152-10.939 3.453-2.59 2.303-4.383 5.558-5.378 9.765l-8.333 34.945c-.398 1.667-1.125 3.056-2.181 4.168-1.056 1.11-2.68 1.667-4.872 1.667-.796 0-1.664-.09-2.6-.268-.927-.177-1.747-.442-2.46-.795l-1.79 7.44c.514.179 1.112.365 1.8.56 1.335.376 2.899.565 4.692.565 4.702 0 8.348-1.152 10.937-3.453 2.591-2.303 4.384-5.558 5.38-9.765l6.216-25.959-3.622 15.008 3.646-15.182h10.46l.44-1.787 1.318-5.477h-10.484l.358-1.548c.398-1.667 1.125-3.056 2.182-4.168 1.055-1.11 2.679-1.667 4.871-1.667.796 0 1.663.09 2.6.268.75.143 1.428.347 2.038.605l1.779-7.396a35.741 35.741 0 0 0-1.367-.413c-1.335-.377-2.899-.566-4.691-.566zm-99.466 14c-4.534 0-7.986.933-10.352 2.8-2.368 1.866-3.551 4.408-3.551 7.624 0 1.231.188 2.293.567 3.187a7.942 7.942 0 0 0 1.551 2.383 9.749 9.749 0 0 0 2.298 1.787c.874.497 1.81.963 2.805 1.4.874.397 1.59.744 2.148 1.042.556.297.993.586 1.312.864.318.278.547.576.686.894.14.318.21.695.21 1.131 0 .676-.379 1.301-1.135 1.877-.755.576-2.148.863-4.177.863-2.028 0-3.758-.298-5.191-.894-1.432-.595-2.486-1.091-3.163-1.488l-3.043 6.79c.358.2.865.457 1.522.775.656.318 1.461.625 2.417.923.954.298 2.058.546 3.311.745 1.253.197 2.655.297 4.208.297 2.505 0 4.654-.297 6.444-.893 1.79-.596 3.261-1.37 4.416-2.323 1.153-.953 1.999-2.045 2.535-3.277.537-1.23.806-2.48.806-3.752 0-1.231-.14-2.303-.418-3.217a6.689 6.689 0 0 0-1.342-2.442c-.618-.715-1.443-1.39-2.476-2.026-1.035-.635-2.328-1.33-3.88-2.085-1.113-.555-1.979-1.031-2.595-1.43-.617-.395-.925-.991-.925-1.786 0-.596.139-1.072.418-1.43a2.769 2.769 0 0 1 1.104-.834 5.162 5.162 0 0 1 1.492-.387 13.384 13.384 0 0 1 5.52.506c1.312.398 2.387.815 3.222 1.251l3.043-6.612c-1.035-.555-2.388-1.072-4.058-1.549-1.671-.476-3.58-.714-5.729-.714zm117.745-7.037h-8.877l-5.808 24.609c-.476 2.03-.755 3.96-.834 5.79-.08 1.831.198 3.454.834 4.866.634 1.413 1.705 2.528 3.214 3.343 1.508.816 3.632 1.224 6.37 1.224 1.905 0 3.552-.16 4.942-.478a31.673 31.673 0 0 0 3.869-1.133l-.654-6.807a20.43 20.43 0 0 1-2.71.747c-.892.179-1.815.268-2.767.268-1.112 0-1.986-.159-2.62-.477-.635-.318-1.081-.766-1.34-1.343-.258-.577-.357-1.264-.297-2.06s.208-1.652.447-2.567l2.62-10.985h9.822l1.786-7.284h-9.883l1.886-7.713zm-42.467 7.871h-8.902l-7.468 31.416h8.842l7.528-31.416zm-52.776-.084h-8.705c.119 3.09.308 6.15.565 9.179a272.955 272.955 0 0 0 1.85 16.13c.337 2.298.665 4.278.984 5.941h6.916c.716-1.108 1.53-2.385 2.445-3.832.914-1.445 1.857-2.97 2.832-4.575a145.515 145.515 0 0 0 2.862-4.93 78.504 78.504 0 0 0 2.534-4.961c.08 3.01.238 6 .477 8.97.238 2.971.597 6.081 1.073 9.328h6.917a89.834 89.834 0 0 0 5.963-8.377 124.212 124.212 0 0 0 4.83-8.376 131.924 131.924 0 0 0 3.786-7.813 215.736 215.736 0 0 0 2.832-6.684h-9.42a338.132 338.132 0 0 1-1.64 4.515 122.434 122.434 0 0 1-4.62 10.783 70.09 70.09 0 0 1-2.983 5.496c-.398-3.96-.646-7.703-.745-11.229-.1-3.525-.15-6.713-.15-9.565h-7.393a137.776 137.776 0 0 1-4.562 10.19 172.488 172.488 0 0 1-2.802 5.405 141.585 141.585 0 0 1-2.951 5.2c-.2-1.822-.359-3.664-.478-5.527-.12-1.86-.208-3.683-.268-5.465a241.75 241.75 0 0 1-.119-5.17c-.021-1.662-.03-3.207-.03-4.633zm-64.75-23.19L27 126.888l2.021 2.015c5.705 5.688 13.29 8.821 21.358 8.821 8.069 0 15.654-3.133 21.36-8.82l12.568-12.533-23.38-23.311zm0 8.06l15.296 15.25-8.527 8.503c-4.625 4.612-10.776 7.152-17.318 7.152-5.313 0-10.356-1.659-14.584-4.796l-.604-.448 25.736-25.662zm.104 8.63c-.572 0-1.11.11-1.613.33a4.3 4.3 0 0 0-2.248 2.204 3.875 3.875 0 0 0-.347 1.627c0 1.043.34 1.819 1.02 2.327a3.732 3.732 0 0 0 2.29.762c.572 0 1.109-.11 1.614-.33.503-.219.945-.514 1.327-.885.381-.371.688-.81.92-1.318.23-.508.347-1.05.347-1.627 0-1.044-.34-1.82-1.022-2.328a3.734 3.734 0 0 0-2.288-.762zm115.51-7.75c-.836 0-1.623.16-2.36.478a6.459 6.459 0 0 0-1.941 1.284 6.225 6.225 0 0 0-1.344 1.91 5.579 5.579 0 0 0-.508 2.36c0 1.513.497 2.639 1.494 3.375a5.481 5.481 0 0 0 3.345 1.104c.837 0 1.622-.158 2.36-.477a6.477 6.477 0 0 0 1.942-1.284 6.266 6.266 0 0 0 1.344-1.911 5.593 5.593 0 0 0 .508-2.36c0-1.512-.498-2.637-1.494-3.374a5.492 5.492 0 0 0-3.345-1.105z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/swift/card.svg b/src/wmcads/assets/icon/swift/card.svg
deleted file mode 100755
index 25f6b96a..00000000
--- a/src/wmcads/assets/icon/swift/card.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="256" height="256" viewBox="0 0 256 256">
-    <path fill="#3C1053" fill-rule="evenodd" d="M221.333 41c10.194 0 18.485 8.17 18.664 18.308l.003.335v136.714c0 10.18-8.18 18.461-18.331 18.64l-.336.003H34.667c-10.194 0-18.485-8.17-18.664-18.308l-.003-.335V59.643c0-10.18 8.18-18.461 18.331-18.64l.336-.003h186.666zm-78.2 24.5L49 159.416l5.608 5.594c15.828 15.792 36.874 24.49 59.26 24.49 22.144 0 42.978-8.512 58.748-23.983l.512-.507L208 130.218 143.133 65.5zm0 22.375l42.44 42.343-23.658 23.603c-12.833 12.805-29.897 19.856-48.048 19.856-14.496 0-28.268-4.452-39.877-12.883l-.589-.432-1.674-1.244 71.406-71.243zm.062 24.125c-1.522 0-2.955.29-4.293.865a11.765 11.765 0 0 0-3.533 2.32 11.268 11.268 0 0 0-2.447 3.456 10.029 10.029 0 0 0-.922 4.262c0 2.736.904 4.769 2.716 6.1 1.811 1.333 3.84 1.997 6.088 1.997a10.75 10.75 0 0 0 4.294-.863 11.807 11.807 0 0 0 3.532-2.32 11.318 11.318 0 0 0 2.445-3.456 10.05 10.05 0 0 0 .925-4.263c0-2.735-.907-4.768-2.72-6.1-1.81-1.332-3.842-1.998-6.085-1.998z"/>
-</svg>
diff --git a/src/wmcads/assets/icon/swift/full-logo.svg b/src/wmcads/assets/icon/swift/full-logo.svg
deleted file mode 100755
index 2283d1e8..00000000
--- a/src/wmcads/assets/icon/swift/full-logo.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 336.03 116.48"><title>Swift</title><path fill="currentColor" d="M114 80.41c3.38 0 5.7-.47 7-1.44a4 4 0 001.89-3.13 4.71 4.71 0 00-.39-1.84 4.34 4.34 0 00-1.14-1.5 12.57 12.57 0 00-2.19-1.5c-.93-.49-2.12-1.07-3.58-1.74a49.56 49.56 0 01-4.67-2.26 16.39 16.39 0 01-3.83-3 13.37 13.37 0 01-2.58-4 13.59 13.59 0 01-.94-5.31A15.33 15.33 0 01109.48 42q5.91-4.68 17.24-4.68a34.55 34.55 0 019.54 1.2 34.07 34.07 0 016.74 2.54l-5.07 11a32 32 0 00-5.34-2.06 22.3 22.3 0 00-6.46-1 24.75 24.75 0 00-2.74.15 8.62 8.62 0 00-2.48.65 4.54 4.54 0 00-1.84 1.39 3.79 3.79 0 00-.7 2.38 3.32 3.32 0 001.54 3 46.25 46.25 0 004.33 2.43q3.87 1.89 6.46 3.48a17.38 17.38 0 014.12 3.38 11.19 11.19 0 012.24 4.07 18.68 18.68 0 01.69 5.37 15.43 15.43 0 01-1.34 6.26 14.67 14.67 0 01-4.22 5.44 22.52 22.52 0 01-7.36 3.88 34.22 34.22 0 01-10.73 1.49 45.18 45.18 0 01-7-.5 38.8 38.8 0 01-5.51-1.24 30.43 30.43 0 01-4-1.54c-1.09-.53-1.93-1-2.53-1.29l5.07-11.33a45.45 45.45 0 005.27 2.48 22.29 22.29 0 008.6 1.46zM184.86 60.34q-1.89 4.08-4.23 8.3c-1.55 2.82-3.14 5.56-4.77 8.25s-3.19 5.23-4.72 7.65-2.88 4.56-4.07 6.41h-11.53c-.53-2.78-1.08-6.1-1.64-9.94s-1.11-8-1.64-12.57-1-9.34-1.44-14.41-.75-10.19-.94-15.35h14.51c0 2.38 0 5 .05 7.75s.1 5.66.19 8.64.25 6 .45 9.15.46 6.19.8 9.24q2.48-4.17 4.92-8.7t4.67-9q2.24-4.52 4.17-8.9c1.29-2.91 2.44-5.63 3.43-8.14h12.32q0 7.16.25 16t1.24 18.78q2.69-4.47 5-9.19t4.23-9.3q1.93-4.56 3.47-8.74t2.74-7.55H228q-2 5-4.72 11.18T217 62.92q-3.59 6.87-8.05 14A150.51 150.51 0 01199 91h-11.56q-1.19-8.15-1.79-15.6t-.79-15.06zM239.61 91h-14.7l12.42-52.27h14.81zm7.16-58.63a9.15 9.15 0 01-5.56-1.84 6.53 6.53 0 01-2.49-5.62 9.15 9.15 0 01.85-3.92 10.19 10.19 0 012.23-3.18 10.64 10.64 0 013.2-2.19 9.83 9.83 0 013.93-.8 9.15 9.15 0 015.56 1.84 6.53 6.53 0 012.51 5.62 9.3 9.3 0 01-.85 3.92 10.35 10.35 0 01-2.23 3.18 10.77 10.77 0 01-3.23 2.14 9.83 9.83 0 01-3.92.8z"/><path d="M279.17 38.68l.59-2.59a14.83 14.83 0 013.63-7q2.63-2.79 8.1-2.79a22.91 22.91 0 014.32.45 16.67 16.67 0 013.39 1l3-12.35c-.68-.22-1.44-.45-2.27-.69a29.13 29.13 0 00-7.8-.94q-11.73 0-18.19 5.76T265 35.89l-13.9 58.33a14.91 14.91 0 01-3.63 7q-2.62 2.77-8.1 2.78a23 23 0 01-4.32-.45 16.1 16.1 0 01-4.09-1.32l-3 12.41c.85.3 1.84.61 3 .94a28.73 28.73 0 007.8.94q11.73 0 18.18-5.76t9-16.3l10.33-43.33-6 25 6.07-25.34h17.39l.73-3 2.19-9.14zM307.86 25.84l-9.7 41a52.23 52.23 0 00-1.39 9.64 17.64 17.64 0 001.39 8.1 11.73 11.73 0 005.37 5.56q3.78 2 10.63 2a37.48 37.48 0 008.25-.79 53.07 53.07 0 006.46-1.89l-1.09-11.33a34.7 34.7 0 01-4.52 1.24 23.53 23.53 0 01-4.63.45 9.91 9.91 0 01-4.37-.8 4.56 4.56 0 01-2.26-2.23 6.9 6.9 0 01-.5-3.43 24.72 24.72 0 01.74-4.27l4.38-18.29H333l3-12.12h-16.5l3.15-12.84z"/><path d="M296.6 38.68l-2.19 9.14 2.25-9.14h-.06zM38.94 74.6A50 50 0 013.37 59.87L0 56.5 56.5 0l38.94 38.94-20.93 20.93A50 50 0 0138.94 74.6zm-25.3-18.28l1 .75a40.82 40.82 0 0053.13-3.93L82 38.94 56.5 13.46z"/><path d="M55.07 39.72a6.28 6.28 0 01-3.81-1.25 4.48 4.48 0 01-1.7-3.84 6.47 6.47 0 01.58-2.69 7.16 7.16 0 011.53-2.17 7.27 7.27 0 012.21-1.46 6.68 6.68 0 012.68-.54 6.28 6.28 0 013.8 1.23 4.48 4.48 0 011.7 3.84 6.24 6.24 0 01-.58 2.68 7.06 7.06 0 01-1.48 2.2 7.52 7.52 0 01-2.21 1.46 6.72 6.72 0 01-2.72.54z"/></svg>
\ No newline at end of file
diff --git a/src/www/pages/styles/icons/index.njk b/src/www/pages/styles/icons/index.njk
index 8188fae8..15468c43 100755
--- a/src/www/pages/styles/icons/index.njk
+++ b/src/www/pages/styles/icons/index.njk
@@ -10,9 +10,7 @@
   "chevron-right",
   "circle-hollow",
   "circle-solid",
-  "clock",
   "cross",
-  "current-location",
   "expand",
   "favourite",
   "file",
@@ -20,61 +18,23 @@
   "id-card",
   "info",
   "location-arrow",
-  "location-pin",
   "minimise",
-  "n-ticket",
   "paperclip",
-  "parking",
-  "route",
   "search",
-  "share",
-  "star",
-  "star-empty",
   "success",
   "swap",
-  "sync",
-  "ticket",
   "trash",
-  "wallet",
   "warning-circle",
   "warning-triangle"
 ] %}
 
-{% set iconSwift = [
-  "bird-icon",
-  "card",
-  "card-full-logo",
-  "full-logo"
-] %}
-
 {% set iconSocial = [
   "facebook",
   "twitter",
-  "instagram"
-] %}
-
-{% set iconModesIsolated = [
-  "bus",
-  "coach",
-  "cycle",
-  "metro",
-  "plane",
-  "rail",
-  "roads",
-  "walk"
-] %}
-
-{% set iconModesBackground = [
-  "bus",
-  "coach",
-  "cycle",
-  "metro",
-  "p-r",
-  "plane",
-  "rail-nr",
-  "rail",
-  "roads",
-  "walk"
+  "instagram",
+  "linkedin",
+  "youtube",
+  "email"
 ] %}
 
 {% from "wmcads/components/icon/_icon.njk" import wmcadsIcon %}
@@ -174,21 +134,6 @@
   {% endfor %}
 </div>
 
-{# Swift #}
-<h3>Swift</h3>
-<div class="wmcads-grid website-icons">
-  {% for icon in iconSwift %}
-    <div class="wmcads-col-1-2 wmcads-col-sm-1-6 text-center">
-      {{
-        wmcadsIcon({
-          icon: 'swift-' + icon
-        })
-      }}
-      <p>{{ 'swift-' + icon }}</p>
-    </div>
-  {% endfor %}
-</div>
-
 {# Social #}
 <h3>Social</h3>
 <div class="wmcads-grid website-icons">
@@ -204,37 +149,4 @@
   {% endfor %}
 </div>
 
-{# Modal #}
-<h3>Modal</h3>
-
-<strong>Isolated</strong>
-<br><br>
-<div class="wmcads-grid website-icons">
-  {% for icon in iconModesIsolated %}
-    <div class="wmcads-col-1-2 wmcads-col-lg-1-4 text-center">
-      {{
-        wmcadsIcon({
-          icon: 'modes-isolated-' + icon
-        })
-      }}
-      <p>{{ 'modes-isolated-' + icon }}</p>
-    </div>
-  {% endfor %}
-</div>
-
-<strong>With background</strong>
-<br><br>
-<div class="wmcads-grid website-icons">
-  {% for icon in iconModesBackground %}
-    <div class="wmcads-col-1-2 wmcads-col-lg-1-4 text-center">
-      {{
-        wmcadsIcon({
-          icon: 'modes-bg-' + icon
-        })
-      }}
-      <p>{{ 'modes-bg-' + icon }}</p>
-    </div>
-  {% endfor %}
-</div>
-
 {% endblock %}