diff --git a/surfn-icons/Surfn-Breeze-Arc/scalable/apps/GammaRay.svg b/surfn-icons/Surfn-Breeze-Arc/scalable/apps/GammaRay.svg
index b0d73a41b..be6d43017 100644
--- a/surfn-icons/Surfn-Breeze-Arc/scalable/apps/GammaRay.svg
+++ b/surfn-icons/Surfn-Breeze-Arc/scalable/apps/GammaRay.svg
@@ -1,25 +1,29 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)">
-   <stop style="stop-color:#3d3d3d;stop-opacity:1"/>
-   <stop offset="1" style="stop-color:#474747;stop-opacity:1"/>
+  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientTransform="matrix(0 -1 1 0 -1.5e-6 48)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3d3d3d" offset="0"/>
+   <stop stop-color="#474747" offset="1"/>
   </linearGradient>
  </defs>
- <g>
-  <path d="m 36.31 5 c 5.859 4.062 9.688 10.831 9.688 18.5 c 0 12.426 -10.07 22.5 -22.5 22.5 c -7.669 0 -14.438 -3.828 -18.5 -9.688 c 1.037 1.822 2.306 3.499 3.781 4.969 c 4.085 3.712 9.514 5.969 15.469 5.969 c 12.703 0 23 -10.298 23 -23 c 0 -5.954 -2.256 -11.384 -5.969 -15.469 c -1.469 -1.475 -3.147 -2.744 -4.969 -3.781 z m 4.969 3.781 c 3.854 4.113 6.219 9.637 6.219 15.719 c 0 12.703 -10.297 23 -23 23 c -6.081 0 -11.606 -2.364 -15.719 -6.219 c 4.16 4.144 9.883 6.719 16.219 6.719 c 12.703 0 23 -10.298 23 -23 c 0 -6.335 -2.575 -12.06 -6.719 -16.219 z" style="opacity:0.05"/>
-  <path d="m 41.28 8.781 c 3.712 4.085 5.969 9.514 5.969 15.469 c 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 c 4.113 3.854 9.637 6.219 15.719 6.219 c 12.703 0 23 -10.298 23 -23 c 0 -6.081 -2.364 -11.606 -6.219 -15.719 z" style="opacity:0.1"/>
-  <path d="m 31.25 2.375 c 8.615 3.154 14.75 11.417 14.75 21.13 c 0 12.426 -10.07 22.5 -22.5 22.5 c -9.708 0 -17.971 -6.135 -21.12 -14.75 a 23 23 0 0 0 44.875 -7 a 23 23 0 0 0 -16 -21.875 z" style="opacity:0.2"/>
+ <path d="m36.31 5c5.859 4.062 9.688 10.831 9.688 18.5 0 12.426-10.07 22.5-22.5 22.5-7.669 0-14.438-3.828-18.5-9.688 1.037 1.822 2.306 3.499 3.781 4.969 4.085 3.712 9.514 5.969 15.469 5.969 12.703 0 23-10.298 23-23 0-5.954-2.256-11.384-5.969-15.469-1.469-1.475-3.147-2.744-4.969-3.781zm4.969 3.781c3.854 4.113 6.219 9.637 6.219 15.719 0 12.703-10.297 23-23 23-6.081 0-11.606-2.364-15.719-6.219 4.16 4.144 9.883 6.719 16.219 6.719 12.703 0 23-10.298 23-23 0-6.335-2.575-12.06-6.719-16.219z" opacity=".05"/>
+ <path d="m41.28 8.781c3.712 4.085 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.113 3.854 9.637 6.219 15.719 6.219 12.703 0 23-10.298 23-23 0-6.081-2.364-11.606-6.219-15.719z" opacity=".1"/>
+ <path d="m31.25 2.375c8.615 3.154 14.75 11.417 14.75 21.13 0 12.426-10.07 22.5-22.5 22.5-9.708 0-17.971-6.135-21.12-14.75a23 23 0 0 0 44.875-7 23 23 0 0 0-16-21.875z" opacity=".2"/>
+ <path d="m24 1c12.703 0 23 10.297 23 23s-10.297 23-23 23-23-10.297-23-23 10.297-23 23-23z" fill="url(#linearGradient3764)"/>
+ <path d="m40.03 7.531c3.712 4.084 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.178 4.291 10.01 6.969 16.469 6.969 12.703 0 23-10.298 23-23 0-6.462-2.677-12.291-6.969-16.469z" opacity=".1"/>
+ <g transform="matrix(.99824 0 0 1.0018 1 1)" opacity=".1">
+  <path d="m25.19 20.89c0.027-0.054 0.231-0.368 0.612-0.939 1.721-2.159 2.781-4.66 4.322-6.82 0.326-0.408 0.652-0.762 0.979-1.062 0.353-0.327 0.707-0.558 1.06-0.694 0.381-0.163 0.775-0.218 1.182-0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386-0.53 3.185-3.569 3.813-6.9 7.816-9.01 12.497-1.18 2.464-1.776 5.122-3.02 7.433-1 1.863-2.509 2.483-4.159 1.715-0.81-0.377-0.883-1.17-0.693-1.879 0.865-3.218 2.905-5.854 4.567-8.821 0.393-4.067 1.046-9.866-2.813-12.211-0.463-0.281-1.047 0.054-1.59 0.653-0.544 0.572-1.033 1.266-1.468 2.083-0.272 0.408-0.639 0.708-1.101 0.898-0.435 0.163-0.816 0.037-1.223-0.286-0.384-0.305-0.618-0.748-0.449-1.389 0.658-2.486 2.466-3.883 4.811-4.533 0.566-0.157 1.182-0.176 1.835-0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78z"/>
  </g>
- <g>
-  <path d="m 24 1 c 12.703 0 23 10.297 23 23 c 0 12.703 -10.297 23 -23 23 -12.703 0 -23 -10.297 -23 -23 0 -12.703 10.297 -23 23 -23 z" style="fill:url(#linearGradient3764);fill-opacity:1"/>
- </g>
- <g>
-  <path d="m 40.03 7.531 c 3.712 4.084 5.969 9.514 5.969 15.469 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 4.178 4.291 10.01 6.969 16.469 6.969 c 12.703 0 23 -10.298 23 -23 0 -6.462 -2.677 -12.291 -6.969 -16.469 z" style="opacity:0.1"/>
- </g>
- <g transform="matrix(0.99823582,0,0,1.0017673,0.99999962,0.99999976)" style="fill:#000;opacity:0.1;fill-opacity:1;">
-  <path d="m 25.19 20.89 c 0.027 -0.054 0.231 -0.368 0.612 -0.939 1.721 -2.159 2.781 -4.66 4.322 -6.82 0.326 -0.408 0.652 -0.762 0.979 -1.062 0.353 -0.327 0.707 -0.558 1.06 -0.694 0.381 -0.163 0.775 -0.218 1.182 -0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386 -0.53 3.185 -3.569 3.813 -6.9 7.816 -9.01 12.497 -1.18 2.464 -1.776 5.122 -3.02 7.433 -1 1.863 -2.509 2.483 -4.159 1.715 -0.81 -0.377 -0.883 -1.17 -0.693 -1.879 0.865 -3.218 2.905 -5.854 4.567 -8.821 0.393 -4.067 1.046 -9.866 -2.813 -12.211 -0.463 -0.281 -1.047 0.054 -1.59 0.653 -0.544 0.572 -1.033 1.266 -1.468 2.083 -0.272 0.408 -0.639 0.708 -1.101 0.898 -0.435 0.163 -0.816 0.037 -1.223 -0.286 -0.384 -0.305 -0.618 -0.748 -0.449 -1.389 0.658 -2.486 2.466 -3.883 4.811 -4.533 0.566 -0.157 1.182 -0.176 1.835 -0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78 z" style="fill:#000"/>
- </g>
- <g transform="scale(0.99823582,1.0017673)" style="fill:#a4d7dc;fill-opacity:1;">
-  <path d="m 25.19 20.89 c 0.027 -0.054 0.231 -0.368 0.612 -0.939 1.721 -2.159 2.781 -4.66 4.322 -6.82 0.326 -0.408 0.652 -0.762 0.979 -1.062 0.353 -0.327 0.707 -0.558 1.06 -0.694 0.381 -0.163 0.775 -0.218 1.182 -0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386 -0.53 3.185 -3.569 3.813 -6.9 7.816 -9.01 12.497 -1.18 2.464 -1.776 5.122 -3.02 7.433 -1 1.863 -2.509 2.483 -4.159 1.715 -0.81 -0.377 -0.883 -1.17 -0.693 -1.879 0.865 -3.218 2.905 -5.854 4.567 -8.821 0.393 -4.067 1.046 -9.866 -2.813 -12.211 -0.463 -0.281 -1.047 0.054 -1.59 0.653 -0.544 0.572 -1.033 1.266 -1.468 2.083 -0.272 0.408 -0.639 0.708 -1.101 0.898 -0.435 0.163 -0.816 0.037 -1.223 -0.286 -0.384 -0.305 -0.618 -0.748 -0.449 -1.389 0.658 -2.486 2.466 -3.883 4.811 -4.533 0.566 -0.157 1.182 -0.176 1.835 -0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78 z"/>
+ <g transform="matrix(1.0432 0 0 1.0468 -1.08 -1.08)" fill="#fff">
+  <path d="m25.19 20.89c0.027-0.054 0.231-0.368 0.612-0.939 1.721-2.159 2.781-4.66 4.322-6.82 0.326-0.408 0.652-0.762 0.979-1.062 0.353-0.327 0.707-0.558 1.06-0.694 0.381-0.163 0.775-0.218 1.182-0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386-0.53 3.185-3.569 3.813-6.9 7.816-9.01 12.497-1.18 2.464-1.776 5.122-3.02 7.433-1 1.863-2.509 2.483-4.159 1.715-0.81-0.377-0.883-1.17-0.693-1.879 0.865-3.218 2.905-5.854 4.567-8.821 0.393-4.067 1.046-9.866-2.813-12.211-0.463-0.281-1.047 0.054-1.59 0.653-0.544 0.572-1.033 1.266-1.468 2.083-0.272 0.408-0.639 0.708-1.101 0.898-0.435 0.163-0.816 0.037-1.223-0.286-0.384-0.305-0.618-0.748-0.449-1.389 0.658-2.486 2.466-3.883 4.811-4.533 0.566-0.157 1.182-0.176 1.835-0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78z" fill="#fff"/>
  </g>
 </svg>
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/GammaRay.svg b/surfn-icons/Surfn/scalable/apps/scalable/GammaRay.svg
index b0d73a41b..be6d43017 100644
--- a/surfn-icons/Surfn/scalable/apps/scalable/GammaRay.svg
+++ b/surfn-icons/Surfn/scalable/apps/scalable/GammaRay.svg
@@ -1,25 +1,29 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 48 48">
+<?xml version="1.0" encoding="UTF-8"?>
+<svg version="1.1" viewBox="0 0 48 48" xmlns="http://www.w3.org/2000/svg" xmlns:cc="http://creativecommons.org/ns#" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+ <metadata>
+  <rdf:RDF>
+   <cc:Work rdf:about="">
+    <dc:format>image/svg+xml</dc:format>
+    <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
+    <dc:title/>
+   </cc:Work>
+  </rdf:RDF>
+ </metadata>
  <defs>
-  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientUnits="userSpaceOnUse" gradientTransform="matrix(0,-1,1,0,-1.5e-6,47.999998)">
-   <stop style="stop-color:#3d3d3d;stop-opacity:1"/>
-   <stop offset="1" style="stop-color:#474747;stop-opacity:1"/>
+  <linearGradient id="linearGradient3764" x1="1" x2="47" gradientTransform="matrix(0 -1 1 0 -1.5e-6 48)" gradientUnits="userSpaceOnUse">
+   <stop stop-color="#3d3d3d" offset="0"/>
+   <stop stop-color="#474747" offset="1"/>
   </linearGradient>
  </defs>
- <g>
-  <path d="m 36.31 5 c 5.859 4.062 9.688 10.831 9.688 18.5 c 0 12.426 -10.07 22.5 -22.5 22.5 c -7.669 0 -14.438 -3.828 -18.5 -9.688 c 1.037 1.822 2.306 3.499 3.781 4.969 c 4.085 3.712 9.514 5.969 15.469 5.969 c 12.703 0 23 -10.298 23 -23 c 0 -5.954 -2.256 -11.384 -5.969 -15.469 c -1.469 -1.475 -3.147 -2.744 -4.969 -3.781 z m 4.969 3.781 c 3.854 4.113 6.219 9.637 6.219 15.719 c 0 12.703 -10.297 23 -23 23 c -6.081 0 -11.606 -2.364 -15.719 -6.219 c 4.16 4.144 9.883 6.719 16.219 6.719 c 12.703 0 23 -10.298 23 -23 c 0 -6.335 -2.575 -12.06 -6.719 -16.219 z" style="opacity:0.05"/>
-  <path d="m 41.28 8.781 c 3.712 4.085 5.969 9.514 5.969 15.469 c 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 c 4.113 3.854 9.637 6.219 15.719 6.219 c 12.703 0 23 -10.298 23 -23 c 0 -6.081 -2.364 -11.606 -6.219 -15.719 z" style="opacity:0.1"/>
-  <path d="m 31.25 2.375 c 8.615 3.154 14.75 11.417 14.75 21.13 c 0 12.426 -10.07 22.5 -22.5 22.5 c -9.708 0 -17.971 -6.135 -21.12 -14.75 a 23 23 0 0 0 44.875 -7 a 23 23 0 0 0 -16 -21.875 z" style="opacity:0.2"/>
+ <path d="m36.31 5c5.859 4.062 9.688 10.831 9.688 18.5 0 12.426-10.07 22.5-22.5 22.5-7.669 0-14.438-3.828-18.5-9.688 1.037 1.822 2.306 3.499 3.781 4.969 4.085 3.712 9.514 5.969 15.469 5.969 12.703 0 23-10.298 23-23 0-5.954-2.256-11.384-5.969-15.469-1.469-1.475-3.147-2.744-4.969-3.781zm4.969 3.781c3.854 4.113 6.219 9.637 6.219 15.719 0 12.703-10.297 23-23 23-6.081 0-11.606-2.364-15.719-6.219 4.16 4.144 9.883 6.719 16.219 6.719 12.703 0 23-10.298 23-23 0-6.335-2.575-12.06-6.719-16.219z" opacity=".05"/>
+ <path d="m41.28 8.781c3.712 4.085 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.113 3.854 9.637 6.219 15.719 6.219 12.703 0 23-10.298 23-23 0-6.081-2.364-11.606-6.219-15.719z" opacity=".1"/>
+ <path d="m31.25 2.375c8.615 3.154 14.75 11.417 14.75 21.13 0 12.426-10.07 22.5-22.5 22.5-9.708 0-17.971-6.135-21.12-14.75a23 23 0 0 0 44.875-7 23 23 0 0 0-16-21.875z" opacity=".2"/>
+ <path d="m24 1c12.703 0 23 10.297 23 23s-10.297 23-23 23-23-10.297-23-23 10.297-23 23-23z" fill="url(#linearGradient3764)"/>
+ <path d="m40.03 7.531c3.712 4.084 5.969 9.514 5.969 15.469 0 12.703-10.297 23-23 23-5.954 0-11.384-2.256-15.469-5.969 4.178 4.291 10.01 6.969 16.469 6.969 12.703 0 23-10.298 23-23 0-6.462-2.677-12.291-6.969-16.469z" opacity=".1"/>
+ <g transform="matrix(.99824 0 0 1.0018 1 1)" opacity=".1">
+  <path d="m25.19 20.89c0.027-0.054 0.231-0.368 0.612-0.939 1.721-2.159 2.781-4.66 4.322-6.82 0.326-0.408 0.652-0.762 0.979-1.062 0.353-0.327 0.707-0.558 1.06-0.694 0.381-0.163 0.775-0.218 1.182-0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386-0.53 3.185-3.569 3.813-6.9 7.816-9.01 12.497-1.18 2.464-1.776 5.122-3.02 7.433-1 1.863-2.509 2.483-4.159 1.715-0.81-0.377-0.883-1.17-0.693-1.879 0.865-3.218 2.905-5.854 4.567-8.821 0.393-4.067 1.046-9.866-2.813-12.211-0.463-0.281-1.047 0.054-1.59 0.653-0.544 0.572-1.033 1.266-1.468 2.083-0.272 0.408-0.639 0.708-1.101 0.898-0.435 0.163-0.816 0.037-1.223-0.286-0.384-0.305-0.618-0.748-0.449-1.389 0.658-2.486 2.466-3.883 4.811-4.533 0.566-0.157 1.182-0.176 1.835-0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78z"/>
  </g>
- <g>
-  <path d="m 24 1 c 12.703 0 23 10.297 23 23 c 0 12.703 -10.297 23 -23 23 -12.703 0 -23 -10.297 -23 -23 0 -12.703 10.297 -23 23 -23 z" style="fill:url(#linearGradient3764);fill-opacity:1"/>
- </g>
- <g>
-  <path d="m 40.03 7.531 c 3.712 4.084 5.969 9.514 5.969 15.469 0 12.703 -10.297 23 -23 23 c -5.954 0 -11.384 -2.256 -15.469 -5.969 4.178 4.291 10.01 6.969 16.469 6.969 c 12.703 0 23 -10.298 23 -23 0 -6.462 -2.677 -12.291 -6.969 -16.469 z" style="opacity:0.1"/>
- </g>
- <g transform="matrix(0.99823582,0,0,1.0017673,0.99999962,0.99999976)" style="fill:#000;opacity:0.1;fill-opacity:1;">
-  <path d="m 25.19 20.89 c 0.027 -0.054 0.231 -0.368 0.612 -0.939 1.721 -2.159 2.781 -4.66 4.322 -6.82 0.326 -0.408 0.652 -0.762 0.979 -1.062 0.353 -0.327 0.707 -0.558 1.06 -0.694 0.381 -0.163 0.775 -0.218 1.182 -0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386 -0.53 3.185 -3.569 3.813 -6.9 7.816 -9.01 12.497 -1.18 2.464 -1.776 5.122 -3.02 7.433 -1 1.863 -2.509 2.483 -4.159 1.715 -0.81 -0.377 -0.883 -1.17 -0.693 -1.879 0.865 -3.218 2.905 -5.854 4.567 -8.821 0.393 -4.067 1.046 -9.866 -2.813 -12.211 -0.463 -0.281 -1.047 0.054 -1.59 0.653 -0.544 0.572 -1.033 1.266 -1.468 2.083 -0.272 0.408 -0.639 0.708 -1.101 0.898 -0.435 0.163 -0.816 0.037 -1.223 -0.286 -0.384 -0.305 -0.618 -0.748 -0.449 -1.389 0.658 -2.486 2.466 -3.883 4.811 -4.533 0.566 -0.157 1.182 -0.176 1.835 -0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78 z" style="fill:#000"/>
- </g>
- <g transform="scale(0.99823582,1.0017673)" style="fill:#a4d7dc;fill-opacity:1;">
-  <path d="m 25.19 20.89 c 0.027 -0.054 0.231 -0.368 0.612 -0.939 1.721 -2.159 2.781 -4.66 4.322 -6.82 0.326 -0.408 0.652 -0.762 0.979 -1.062 0.353 -0.327 0.707 -0.558 1.06 -0.694 0.381 -0.163 0.775 -0.218 1.182 -0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386 -0.53 3.185 -3.569 3.813 -6.9 7.816 -9.01 12.497 -1.18 2.464 -1.776 5.122 -3.02 7.433 -1 1.863 -2.509 2.483 -4.159 1.715 -0.81 -0.377 -0.883 -1.17 -0.693 -1.879 0.865 -3.218 2.905 -5.854 4.567 -8.821 0.393 -4.067 1.046 -9.866 -2.813 -12.211 -0.463 -0.281 -1.047 0.054 -1.59 0.653 -0.544 0.572 -1.033 1.266 -1.468 2.083 -0.272 0.408 -0.639 0.708 -1.101 0.898 -0.435 0.163 -0.816 0.037 -1.223 -0.286 -0.384 -0.305 -0.618 -0.748 -0.449 -1.389 0.658 -2.486 2.466 -3.883 4.811 -4.533 0.566 -0.157 1.182 -0.176 1.835 -0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78 z"/>
+ <g transform="matrix(1.0432 0 0 1.0468 -1.08 -1.08)" fill="#fff">
+  <path d="m25.19 20.89c0.027-0.054 0.231-0.368 0.612-0.939 1.721-2.159 2.781-4.66 4.322-6.82 0.326-0.408 0.652-0.762 0.979-1.062 0.353-0.327 0.707-0.558 1.06-0.694 0.381-0.163 0.775-0.218 1.182-0.163 0.408 0.054 0.815 0.245 1.223 0.572 1.048 0.96 0.218 2.386-0.53 3.185-3.569 3.813-6.9 7.816-9.01 12.497-1.18 2.464-1.776 5.122-3.02 7.433-1 1.863-2.509 2.483-4.159 1.715-0.81-0.377-0.883-1.17-0.693-1.879 0.865-3.218 2.905-5.854 4.567-8.821 0.393-4.067 1.046-9.866-2.813-12.211-0.463-0.281-1.047 0.054-1.59 0.653-0.544 0.572-1.033 1.266-1.468 2.083-0.272 0.408-0.639 0.708-1.101 0.898-0.435 0.163-0.816 0.037-1.223-0.286-0.384-0.305-0.618-0.748-0.449-1.389 0.658-2.486 2.466-3.883 4.811-4.533 0.566-0.157 1.182-0.176 1.835-0.123 1.01 0.083 1.881 0.43 2.569 1.103 2.309 2.258 2.938 5.893 2.895 8.78z" fill="#fff"/>
  </g>
 </svg>
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/gammaray.svg b/surfn-icons/Surfn/scalable/apps/scalable/gammaray.svg
new file mode 120000
index 000000000..5da820426
--- /dev/null
+++ b/surfn-icons/Surfn/scalable/apps/scalable/gammaray.svg
@@ -0,0 +1 @@
+GammaRay.svg
\ No newline at end of file
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/ktorrent.svg b/surfn-icons/Surfn/scalable/apps/scalable/ktorrent.svg
index 7c25e0b6c..d4a9a9d09 100644
--- a/surfn-icons/Surfn/scalable/apps/scalable/ktorrent.svg
+++ b/surfn-icons/Surfn/scalable/apps/scalable/ktorrent.svg
@@ -1,6 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="512" height="512">
- <rect style="fill:#2a7fff;fill-opacity:1;fill-rule:evenodd;" width="455.593" height="449.085" x="28.54" y="32.03" ry="50.005"/>
- <circle style="fill:#a5a5a5;fill-opacity:1;stroke:#ffffff;stroke-width:15.3307085;stroke-opacity:1" cx="256.675" cy="256.915" r="171.19"/>
- <polygon points="2 10 2 22 16 22 16 30 30 16 16 2 16 10" transform="matrix(0,6.4918953,-6.4918953,0,359.35876,155.47416)" style="fill:#ffffff"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="64pt" height="64pt" viewBox="0 0 64 64"><defs><radialGradient id="s" gradientUnits="userSpaceOnUse" cx="450.909" cy="189.579" fx="450.909" fy="189.579" r="21.167" gradientTransform="matrix(0 -.15626 -.28128 0 84.416 127.19)"><stop offset="0" stop-opacity=".314"/><stop offset=".222" stop-opacity=".275"/><stop offset="1" stop-opacity="0"/></radialGradient><radialGradient id="t" gradientUnits="userSpaceOnUse" cx="450.909" cy="189.579" fx="450.909" fy="189.579" r="21.167" gradientTransform="matrix(0 .15626 .28128 0 -20.91 -15.055)"><stop offset="0" stop-opacity=".314"/><stop offset=".222" stop-opacity=".275"/><stop offset="1" stop-opacity="0"/></radialGradient><radialGradient id="u" gradientUnits="userSpaceOnUse" cx="450.909" cy="189.579" fx="450.909" fy="189.579" r="21.167" gradientTransform="matrix(0 -.15626 .28128 0 -20.91 127.19)"><stop offset="0" stop-opacity=".314"/><stop offset=".222" stop-opacity=".275"/><stop offset="1" stop-opacity="0"/></radialGradient><radialGradient id="v" gradientUnits="userSpaceOnUse" cx="450.909" cy="189.579" fx="450.909" fy="189.579" r="21.167" gradientTransform="matrix(0 .15626 -.28128 0 84.416 -15.055)"><stop offset="0" stop-opacity=".314"/><stop offset=".222" stop-opacity=".275"/><stop offset="1" stop-opacity="0"/></radialGradient><filter id="a" filterUnits="objectBoundingBox" x="0%" y="0%" width="100%" height="100%"><feColorMatrix in="SourceGraphic" values="0 0 0 0 1 0 0 0 0 1 0 0 0 0 1 0 0 0 1 0"/></filter><mask id="x"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><linearGradient id="c" gradientUnits="userSpaceOnUse" x1="960" y1="1695.118" x2="960" y2="175.118" gradientTransform="scale(.03308)"><stop offset="0" stop-color="#42a5f5"/><stop offset="1" stop-color="#64b5f6"/></linearGradient><clipPath id="b"><path d="M0 0h64v64H0z"/></clipPath><g id="w" clip-path="url(#b)"><path d="M23.816 5.793a2.64 2.64 0 0 0-2.648 2.644v26.461H13.23c-2.457 0-3.585 3.059-1.722 4.657L30.03 55.43a2.643 2.643 0 0 0 3.446 0l18.52-15.875c1.866-1.598.733-4.657-1.72-4.657h-7.941V8.438a2.639 2.639 0 0 0-2.645-2.645zm0 0" fill="url(#c)"/></g><mask id="z"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="d"><path d="M0 0h64v64H0z"/></clipPath><g id="y" clip-path="url(#d)"><path d="M23.816 5.793a2.64 2.64 0 0 0-2.648 2.644v.993a2.64 2.64 0 0 1 2.648-2.645h15.875a2.639 2.639 0 0 1 2.645 2.645v-.992a2.639 2.639 0 0 0-2.645-2.645zM13.23 34.898c-1.804 0-2.894 1.653-2.605 3.164.219-1.16 1.195-2.171 2.605-2.171h7.938v-.993zm29.106 0v.993h7.941c1.41 0 2.383 1.011 2.602 2.172.293-1.512-.797-3.165-2.602-3.165zm0 0" fill="#fff" fill-opacity=".392"/></g><mask id="B"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="e"><path d="M0 0h64v64H0z"/></clipPath><g id="A" clip-path="url(#e)"><path d="M10.59 37.324a2.59 2.59 0 0 0 .918 2.23L30.03 55.43a2.643 2.643 0 0 0 3.446 0l18.52-15.875a2.57 2.57 0 0 0 .917-2.23 2.579 2.579 0 0 1-.918 1.741l-18.52 15.88a2.652 2.652 0 0 1-3.445 0l-18.523-15.88a2.579 2.579 0 0 1-.918-1.742zm0 0" fill-opacity=".235"/></g><mask id="D"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><linearGradient id="g" gradientUnits="userSpaceOnUse" x1="254" y1="-126.333" x2="254" y2="-105.167" gradientTransform="translate(0 26.878) scale(.12501)"><stop offset="0" stop-color="#1e88e5"/><stop offset="1" stop-color="#2196f3"/></linearGradient><clipPath id="f"><path d="M0 0h64v64H0z"/></clipPath><g id="C" clip-path="url(#f)"><path d="M21.168 11.086h21.168v2.644H21.168zm0 0" fill="url(#g)"/></g><mask id="F"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><linearGradient id="i" gradientUnits="userSpaceOnUse" x1="254" y1="-126.333" x2="254" y2="-105.167" gradientTransform="translate(0 32.17) scale(.12501)"><stop offset="0" stop-color="#1e88e5"/><stop offset="1" stop-color="#2196f3"/></linearGradient><clipPath id="h"><path d="M0 0h64v64H0z"/></clipPath><g id="E" clip-path="url(#h)"><path d="M21.168 16.375h21.168v2.648H21.168zm0 0" fill="url(#i)"/></g><mask id="H"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><linearGradient id="k" gradientUnits="userSpaceOnUse" x1="254" y1="-126.333" x2="254" y2="-105.167" gradientTransform="translate(0 37.462) scale(.12501)"><stop offset="0" stop-color="#1e88e5"/><stop offset="1" stop-color="#2196f3"/></linearGradient><clipPath id="j"><path d="M0 0h64v64H0z"/></clipPath><g id="G" clip-path="url(#j)"><path d="M21.168 21.668h21.168v2.648H21.168zm0 0" fill="url(#k)"/></g><mask id="J"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="l"><path d="M0 0h64v64H0z"/></clipPath><g id="I" clip-path="url(#l)"><path d="M21.168 24.316h21.168v.66H21.168zm0 0" fill="#fff" fill-opacity=".392"/></g><mask id="L"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="m"><path d="M0 0h64v64H0z"/></clipPath><g id="K" clip-path="url(#m)"><path d="M21.168 19.023h21.168v.66H21.168zm0 0" fill="#fff" fill-opacity=".392"/></g><mask id="N"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="n"><path d="M0 0h64v64H0z"/></clipPath><g id="M" clip-path="url(#n)"><path d="M21.168 13.73h21.168v.66H21.168zm0 0" fill="#fff" fill-opacity=".392"/></g><mask id="P"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="o"><path d="M0 0h64v64H0z"/></clipPath><g id="O" clip-path="url(#o)"><path d="M21.168 11.086h21.168v.66H21.168zm0 0" fill-opacity=".235"/></g><mask id="R"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="p"><path d="M0 0h64v64H0z"/></clipPath><g id="Q" clip-path="url(#p)"><path d="M21.168 16.375h21.168v.664H21.168zm0 0" fill-opacity=".235"/></g><mask id="T"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="q"><path d="M0 0h64v64H0z"/></clipPath><g id="S" clip-path="url(#q)"><path d="M21.168 21.668h21.168v.664H21.168zm0 0" fill-opacity=".235"/></g><mask id="V"><path fill-opacity=".988" d="M0 0h64v64H0z" filter="url(#a)"/></mask><clipPath id="r"><path d="M0 0h64v64H0z"/></clipPath><g id="U" clip-path="url(#r)"><path d="M23.816 5.605a2.832 2.832 0 0 0-2.836 2.832v26.274h-7.75c-1.304 0-2.277.82-2.656 1.852-.383 1.03-.18 2.285.813 3.132l18.523 15.88a2.84 2.84 0 0 0 3.688 0l18.523-15.88c.988-.847 1.191-2.101.813-3.133-.383-1.03-1.352-1.851-2.657-1.851h-7.754V8.438a2.83 2.83 0 0 0-2.832-2.833zm0 .375h15.875a2.449 2.449 0 0 1 2.457 2.457v26.461c0 .106.086.188.188.188h7.941c1.149 0 1.973.707 2.305 1.605.332.899.168 1.973-.707 2.72L33.352 55.288c-.922.79-2.278.79-3.2 0L11.63 39.41c-.871-.746-1.035-1.82-.703-2.719.332-.898 1.156-1.605 2.304-1.605h7.938a.185.185 0 0 0 .187-.188V8.438a2.45 2.45 0 0 1 2.461-2.458zm0 0" fill="#212121"/></g></defs><path d="M31.754 56.066h5.293v-2.644h-5.293zm0 0" fill="url(#s)"/><path d="M31.754 56.066H26.46v2.649h5.293zm0 0" fill="url(#t)"/><path d="M31.754 56.066H26.46v-2.644h5.293zm0 0" fill="url(#u)"/><path d="M31.754 56.066h5.293v2.649h-5.293zm0 0" fill="url(#v)"/><use xlink:href="#w" mask="url(#x)"/><use xlink:href="#y" mask="url(#z)"/><use xlink:href="#A" mask="url(#B)"/><use xlink:href="#C" mask="url(#D)"/><use xlink:href="#E" mask="url(#F)"/><use xlink:href="#G" mask="url(#H)"/><use xlink:href="#I" mask="url(#J)"/><use xlink:href="#K" mask="url(#L)"/><use xlink:href="#M" mask="url(#N)"/><use xlink:href="#O" mask="url(#P)"/><use xlink:href="#Q" mask="url(#R)"/><use xlink:href="#S" mask="url(#T)"/><use xlink:href="#U" mask="url(#V)"/></svg>
\ No newline at end of file
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/tor-browser-en.svg b/surfn-icons/Surfn/scalable/apps/scalable/tor-browser-en.svg
index 5c74c5edd..407773e53 120000
--- a/surfn-icons/Surfn/scalable/apps/scalable/tor-browser-en.svg
+++ b/surfn-icons/Surfn/scalable/apps/scalable/tor-browser-en.svg
@@ -1 +1 @@
-browser-tor.svg
\ No newline at end of file
+tor.svg
\ No newline at end of file
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/tor-browser.svg b/surfn-icons/Surfn/scalable/apps/scalable/tor-browser.svg
index f3e90cab4..407773e53 120000
--- a/surfn-icons/Surfn/scalable/apps/scalable/tor-browser.svg
+++ b/surfn-icons/Surfn/scalable/apps/scalable/tor-browser.svg
@@ -1 +1 @@
-tor-browser-en.svg
\ No newline at end of file
+tor.svg
\ No newline at end of file
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/tor.svg b/surfn-icons/Surfn/scalable/apps/scalable/tor.svg
deleted file mode 120000
index 0df8df721..000000000
--- a/surfn-icons/Surfn/scalable/apps/scalable/tor.svg
+++ /dev/null
@@ -1 +0,0 @@
-vidalia.svg
\ No newline at end of file
diff --git a/surfn-icons/Surfn/scalable/apps/scalable/tor.svg b/surfn-icons/Surfn/scalable/apps/scalable/tor.svg
new file mode 100644
index 000000000..71b32ea9c
--- /dev/null
+++ b/surfn-icons/Surfn/scalable/apps/scalable/tor.svg
@@ -0,0 +1,10 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" version="1">
+ <circle style="opacity:0.2" cx="11" cy="11.5" r="10"/>
+ <circle style="fill:#7a1ea9" cx="11" cy="11" r="10"/>
+ <path style="opacity:0.2" d="m 11,3.5 c -4.409917,0 -8,3.590083 -8,8 0,4.409917 3.590083,8 8,8 4.409917,0 8,-3.590083 8,-8 0,-4.409917 -3.590083,-8 -8,-8 z m 0,1.4121094 c 3.646943,0 6.587891,2.9409479 6.587891,6.5878906 0,3.646943 -2.940948,6.587891 -6.587891,6.587891 C 7.3530573,18.087891 4.4121094,15.146943 4.4121094,11.5 4.4121094,7.8530573 7.3530573,4.9121094 11,4.9121094 Z M 11,6.5 c -2.753348,0 -5,2.246652 -5,5 0,2.753348 2.246652,5 5,5 2.753348,0 5,-2.246652 5,-5 0,-2.753348 -2.246652,-5 -5,-5 z m 0,1.3632812 c 2.016384,0 3.636719,1.6203348 3.636719,3.6367188 0,2.016384 -1.620335,3.636719 -3.636719,3.636719 C 8.9836158,15.136719 7.3632814,13.516384 7.3632812,11.5 7.3632812,9.483616 8.9836158,7.8632812 11,7.8632812 Z M 11,9.5 a 2,2 0 0 0 -2,2 2,2 0 0 0 2,2 2,2 0 0 0 2,-2 2,2 0 0 0 -2,-2 z"/>
+ <circle style="fill:none;stroke:#ffffff;stroke-width:1.41176474;stroke-linecap:round;stroke-linejoin:round" cx="11" cy="11" r="7.294"/>
+ <circle style="fill:none;stroke:#ffffff;stroke-width:1.36363637;stroke-linecap:round;stroke-linejoin:round" cx="11" cy="11" r="4.318"/>
+ <circle style="fill:#ffffff" cx="11" cy="11" r="2"/>
+ <path style="fill:#7a1ea9" d="M 11,20.5 C 5.4771525,20.5 1.5,16.522847 1.5,11 1.5,5.4771525 5.4771525,1.5 11,1.5 Z"/>
+ <path style="opacity:0.1;fill:#ffffff" d="M 11,1 A 10,10 0 0 0 1,11 10,10 0 0 0 1.0107422,11.291016 10,10 0 0 1 11,1.5 10,10 0 0 1 20.989258,11.208985 10,10 0 0 0 21,11 10,10 0 0 0 11,1 Z"/>
+</svg>