From 79117f424d5cf0b5fc35c66d82b95b31a247dccf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20G=C3=B3mez=20Cano?= <davidgomezcano@outlook.com>
Date: Tue, 28 Nov 2017 16:57:13 +0100
Subject: [PATCH] Set the correct size and stroke thickness to icons.

---
 design/Assets/CameraPage.svg                  | 79 +++++++++++++---
 design/Assets/CameraPage.xaml                 | 28 ++++++
 design/Assets/DragAndDrop.svg                 | 94 ++++++++++++++++++-
 design/Assets/DragAndDrop.xaml                | 39 ++++++++
 design/Assets/ImageGalleryPage.svg            | 88 +++++++++++++----
 design/Assets/ImageGalleryPage.xaml           | 29 ++++++
 design/Assets/MultiView.svg                   | 74 ++++++++++++++-
 design/Assets/MultiView.xaml                  | 11 +--
 design/Assets/ShareSource.svg                 | 68 +++++++++++++-
 design/Assets/ShareSource.xaml                | 22 +++++
 design/Assets/ShareTarget.svg                 | 68 +++++++++++++-
 design/Assets/ShareTarget.xaml                | 23 +++++
 design/Assets/StoreNotification.svg           | 69 +++++++++++++-
 design/Assets/StoreNotification.xaml          | 10 +-
 design/Assets/WebToAppLink.svg                | 74 ++++++++++++++-
 design/Assets/WebToAppLink.xaml               | 27 ++++++
 .../MultiView/.template.config/icon.xaml      | 16 ++--
 .../ShareSource/.template.config/icon.xaml    | 15 +--
 .../.template.config/icon.xaml                | 22 +++--
 .../ShareTarget/.template.config/icon.xaml    | 20 ++--
 .../.template.config/icon.xaml                | 13 +--
 .../.template.config/icon.xaml                | 13 +--
 .../WebToAppLink/.template.config/icon.xaml   | 17 ++--
 .../.template.config/icon.xaml                | 20 ++--
 .../.template.config/icon.xaml                | 20 ++--
 .../.template.config/icon.xaml                | 20 ++--
 .../Pages/Camera/.template.config/icon.xaml   | 20 ++--
 .../.template.config/icon.xaml                | 25 +++--
 .../.template.config/icon.xaml                | 25 +++--
 .../.template.config/icon.xaml                | 25 +++--
 .../ImageGallery/.template.config/icon.xaml   | 25 +++--
 31 files changed, 895 insertions(+), 204 deletions(-)
 create mode 100644 design/Assets/CameraPage.xaml
 create mode 100644 design/Assets/DragAndDrop.xaml
 create mode 100644 design/Assets/ImageGalleryPage.xaml
 create mode 100644 design/Assets/ShareSource.xaml
 create mode 100644 design/Assets/ShareTarget.xaml
 create mode 100644 design/Assets/WebToAppLink.xaml

diff --git a/design/Assets/CameraPage.svg b/design/Assets/CameraPage.svg
index 328b5ba60..13b587214 100644
--- a/design/Assets/CameraPage.svg
+++ b/design/Assets/CameraPage.svg
@@ -1,8 +1,55 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   sodipodi:docname="CameraPage.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata61"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs59" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview57"
+     showgrid="false"
+     height="50px"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     scale-x="3.4"
+     inkscape:zoom="8.9001173"
+     inkscape:cx="98.426501"
+     inkscape:cy="10.430512"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><style
+     type="text/css"
+     id="style46">
 	.st0{fill:none;stroke:#F20808;stroke-width:2;stroke-miterlimit:10;}
 	.st1{fill:#F20808;}
 	.st2{fill:#DD1F1F;}
@@ -16,14 +63,16 @@
 	.st10{stroke:#FFFFFF;stroke-width:0.25;stroke-miterlimit:10;}
 	.st11{fill:#FFFFFF;}
 	.st12{fill:none;stroke:#000000;stroke-width:5;stroke-miterlimit:10;}
-</style>
-<g>
-	<path d="M119.3335,106.84619H30.6665V49.27246h27.41211l3.53223-6.11865h26.77832l3.53223,6.11865h27.41211V106.84619z
-		 M35.6665,101.84619h78.66699V54.27246H89.03467l-3.53223-6.11865H64.49756l-3.53223,6.11865H35.6665V101.84619z"/>
-	<path d="M75.00049,93.9043c-8.64551,0-15.67871-7.0332-15.67871-15.67773c0-8.64502,7.0332-15.67822,15.67871-15.67822
-		c8.64453,0,15.67773,7.0332,15.67773,15.67822C90.67822,86.87109,83.64502,93.9043,75.00049,93.9043z M75.00049,67.54834
-		c-5.88867,0-10.67871,4.79004-10.67871,10.67822c0,5.8877,4.79004,10.67773,10.67871,10.67773
-		c5.8877,0,10.67773-4.79004,10.67773-10.67773C85.67822,72.33838,80.88818,67.54834,75.00049,67.54834z"/>
-	<circle cx="98.00016" cy="61.94067" r="1.88185"/>
-</g>
-</svg>
+</style><g
+     id="g54"
+     transform="matrix(0.54135135,0,0,0.54134628,-16.601351,-16.090787)"><path
+       d="M 119.3335,106.84619 H 30.6665 V 49.27246 h 27.41211 l 3.53223,-6.11865 h 26.77832 l 3.53223,6.11865 h 27.41211 z m -83.667,-5 h 78.66699 V 54.27246 H 89.03467 L 85.50244,48.15381 H 64.49756 l -3.53223,6.11865 H 35.6665 Z"
+       id="path48"
+       inkscape:connector-curvature="0" /><path
+       d="m 75.00049,93.9043 c -8.64551,0 -15.67871,-7.0332 -15.67871,-15.67773 0,-8.64502 7.0332,-15.67822 15.67871,-15.67822 8.64453,0 15.67773,7.0332 15.67773,15.67822 0,8.64452 -7.0332,15.67773 -15.67773,15.67773 z m 0,-26.35596 c -5.88867,0 -10.67871,4.79004 -10.67871,10.67822 0,5.8877 4.79004,10.67773 10.67871,10.67773 5.8877,0 10.67773,-4.79004 10.67773,-10.67773 0,-5.88818 -4.79004,-10.67822 -10.67773,-10.67822 z"
+       id="path50"
+       inkscape:connector-curvature="0" /><circle
+       cx="98.00016"
+       cy="61.94067"
+       r="1.88185"
+       id="circle52" /></g></svg>
\ No newline at end of file
diff --git a/design/Assets/CameraPage.xaml b/design/Assets/CameraPage.xaml
new file mode 100644
index 000000000..5819b9d7d
--- /dev/null
+++ b/design/Assets/CameraPage.xaml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Canvas Name="g54">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.54135135 0 0 0.54134628 -16.601351 -16.090787"/>
+      </Canvas.RenderTransform>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path48" Fill="#000000" StrokeThickness="0">
+        <Path.Data>
+          <PathGeometry Figures="M 119.3335 106.84619 H 30.6665 V 49.27246 h 27.41211 l 3.53223 -6.11865 h 26.77832 l 3.53223 6.11865 h 27.41211 z m -83.667 -5 h 78.66699 V 54.27246 H 89.03467 L 85.50244 48.15381 H 64.49756 l -3.53223 6.11865 H 35.6665 Z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path50" Fill="#000000" StrokeThickness="0">
+        <Path.Data>
+          <PathGeometry Figures="m 75.00049 93.9043 c -8.64551 0 -15.67871 -7.0332 -15.67871 -15.67773 0 -8.64502 7.0332 -15.67822 15.67871 -15.67822 8.64453 0 15.67773 7.0332 15.67773 15.67822 0 8.64452 -7.0332 15.67773 -15.67773 15.67773 z m 0 -26.35596 c -5.88867 0 -10.67871 4.79004 -10.67871 10.67822 0 5.8877 4.79004 10.67773 10.67871 10.67773 5.8877 0 10.67773 -4.79004 10.67773 -10.67773 0 -5.88818 -4.79004 -10.67822 -10.67773 -10.67822 z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle52" Fill="#000000" StrokeThickness="0"/>
+    </Canvas>
+  </Canvas>
+</Viewbox>
diff --git a/design/Assets/DragAndDrop.svg b/design/Assets/DragAndDrop.svg
index 50325fdda..4e085b76c 100644
--- a/design/Assets/DragAndDrop.svg
+++ b/design/Assets/DragAndDrop.svg
@@ -1 +1,93 @@
-<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><title>icon</title><path d="M89.08985,60.238H67.06939V51.65176H60.91015V60.238H25.76223v63.32761H89.08985V89.762h9.93357V83.60278H89.08985Zm-6.15923,57.16838H31.92146V66.39722H82.93061Z"/><polygon points="118.079 83.603 111.919 83.603 111.919 89.762 124.238 89.762 124.238 77.444 118.079 77.444 118.079 83.603"/><polygon points="73.229 83.603 67.069 83.603 67.069 77.444 60.91 77.444 60.91 89.762 73.229 89.762 73.229 83.603"/><polygon points="67.069 32.594 73.229 32.594 73.229 26.434 60.91 26.434 60.91 38.753 67.069 38.753 67.069 32.594"/><rect x="86.12451" y="26.43439" width="12.89589" height="6.15923"/><polygon points="111.919 26.434 111.919 32.594 118.079 32.594 118.079 38.753 124.238 38.753 124.238 26.434 111.919 26.434"/><rect x="118.07854" y="51.64875" width="6.15923" height="12.89589"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Capa_1"
+   data-name="Capa 1"
+   viewBox="0 0 48 48"
+   version="1.1"
+   sodipodi:docname="DragAndDrop.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata23">
+    <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>icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs21" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview19"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="6.2933333"
+     inkscape:cx="2.1433558"
+     inkscape:cy="25.502423"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" />
+  <title
+     id="title2">icon</title>
+  <path
+     d="M 30.867753,16.80466 H 20.13433 V 12.619473 H 17.132135 V 16.80466 H -2.1645e-7 V 47.672408 H 30.867753 v -16.47688 h 4.841916 v -3.00218 H 30.867753 Z M 27.865562,44.670218 H 3.0021908 V 19.806846 H 27.865558 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.48742956" />
+  <polygon
+     points="124.238,89.762 124.238,77.444 118.079,77.444 118.079,83.603 111.919,83.603 111.919,89.762 "
+     id="polygon6"
+     transform="matrix(0.48742955,0,0,0.48742955,-12.557272,-12.557121)" />
+  <polygon
+     points="60.91,77.444 60.91,89.762 73.229,89.762 73.229,83.603 67.069,83.603 67.069,77.444 "
+     id="polygon8"
+     transform="matrix(0.48742955,0,0,0.48742955,-12.557272,-12.557121)" />
+  <polygon
+     points="60.91,26.434 60.91,38.753 67.069,38.753 67.069,32.594 73.229,32.594 73.229,26.434 "
+     id="polygon10"
+     transform="matrix(0.48742955,0,0,0.48742955,-12.557272,-12.557121)" />
+  <rect
+     x="29.422359"
+     y="0.3277837"
+     width="6.2858381"
+     height="3.0021908"
+     id="rect12"
+     style="stroke-width:0.48742956" />
+  <polygon
+     points="118.079,38.753 124.238,38.753 124.238,26.434 111.919,26.434 111.919,32.594 118.079,32.594 "
+     id="polygon14"
+     transform="matrix(0.48742955,0,0,0.48742955,-12.557272,-12.557121)" />
+  <rect
+     x="44.997696"
+     y="12.618006"
+     width="3.0021908"
+     height="6.2858381"
+     id="rect16"
+     style="stroke-width:0.48742956" />
+</svg>
diff --git a/design/Assets/DragAndDrop.xaml b/design/Assets/DragAndDrop.xaml
new file mode 100644
index 000000000..3e07ca2fe
--- /dev/null
+++ b/design/Assets/DragAndDrop.xaml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+  <Canvas Name="Capa_1" Width="48" Height="48">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000" StrokeThickness="0.48742956">
+      <Path.Data>
+        <PathGeometry Figures="M 30.867753 16.80466 H 20.13433 V 12.619473 H 17.132135 V 16.80466 H -2.1645e-7 V 47.672408 H 30.867753 v -16.47688 h 4.841916 v -3.00218 H 30.867753 Z M 27.865562 44.670218 H 3.0021908 V 19.806846 H 27.865558 Z" FillRule="NonZero"/>
+      </Path.Data>
+    </Path>
+    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="124.238,89.762 124.238,77.444 118.079,77.444 118.079,83.603 111.919,83.603 111.919,89.762 " Name="polygon6" FillRule="NonZero" Fill="#000000">
+      <Polygon.RenderTransform>
+        <MatrixTransform Matrix="0.48742955 0 0 0.48742955 -12.557272 -12.557121"/>
+      </Polygon.RenderTransform>
+    </Polygon>
+    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="60.91,77.444 60.91,89.762 73.229,89.762 73.229,83.603 67.069,83.603 67.069,77.444 " Name="polygon8" FillRule="NonZero" Fill="#000000">
+      <Polygon.RenderTransform>
+        <MatrixTransform Matrix="0.48742955 0 0 0.48742955 -12.557272 -12.557121"/>
+      </Polygon.RenderTransform>
+    </Polygon>
+    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="60.91,26.434 60.91,38.753 67.069,38.753 67.069,32.594 73.229,32.594 73.229,26.434 " Name="polygon10" FillRule="NonZero" Fill="#000000">
+      <Polygon.RenderTransform>
+        <MatrixTransform Matrix="0.48742955 0 0 0.48742955 -12.557272 -12.557121"/>
+      </Polygon.RenderTransform>
+    </Polygon>
+    <Rectangle xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="29.422359" Canvas.Top="0.3277837" Width="6.2858381" Height="3.0021908" Name="rect12" Fill="#000000" StrokeThickness="0.48742956"/>
+    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="118.079,38.753 124.238,38.753 124.238,26.434 111.919,26.434 111.919,32.594 118.079,32.594 " Name="polygon14" FillRule="NonZero" Fill="#000000">
+      <Polygon.RenderTransform>
+        <MatrixTransform Matrix="0.48742955 0 0 0.48742955 -12.557272 -12.557121"/>
+      </Polygon.RenderTransform>
+    </Polygon>
+    <Rectangle xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="44.997696" Canvas.Top="12.618006" Width="3.0021908" Height="6.2858381" Name="rect16" Fill="#000000" StrokeThickness="0.48742956"/>
+  </Canvas>
+</Viewbox>
diff --git a/design/Assets/ImageGalleryPage.svg b/design/Assets/ImageGalleryPage.svg
index 550dabec6..3890f0429 100644
--- a/design/Assets/ImageGalleryPage.svg
+++ b/design/Assets/ImageGalleryPage.svg
@@ -1,8 +1,53 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<svg version="1.1" id="Capa_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 viewBox="0 0 150 150" style="enable-background:new 0 0 150 150;" xml:space="preserve">
-<style type="text/css">
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Capa_1"
+   x="0px"
+   y="0px"
+   viewBox="0 0 48 48"
+   xml:space="preserve"
+   sodipodi:docname="ImageGalleryPage.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)"><metadata
+     id="metadata23"><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></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs21" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview19"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="12.586667"
+     inkscape:cx="23.065473"
+     inkscape:cy="29.863594"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" /><style
+     type="text/css"
+     id="style2">
 	.st0{fill:none;stroke:#F20808;stroke-width:2;stroke-miterlimit:10;}
 	.st1{fill:#F20808;}
 	.st2{fill:#DD1F1F;}
@@ -15,19 +60,22 @@
 	.st9{stroke:#000000;stroke-width:0.25;stroke-miterlimit:10;}
 	.st10{stroke:#FFFFFF;stroke-width:0.25;stroke-miterlimit:10;}
 	.st11{fill:#FFFFFF;}
-</style>
-<g>
-	<g>
-		<polygon points="114.66228,56.04822 114.26072,61.70997 117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 
-			124.72725,60.47329 		"/>
-		<polygon points="72.712,111.00494 97.68292,121.98395 101.60921,113.0542 		"/>
-	</g>
-	<polygon points="93.79712,41.29987 95.42753,46.77404 105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 
-		53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 	"/>
-	<path d="M83.87614,22.22247L19.47917,41.40116l19.17608,64.39959l64.39959-19.17869L83.87614,22.22247z M80.27998,28.87199
-		l10.83547,36.38837L70.7337,50.65516l-4.31591,10.65846l8.66095,6.49261l-1.16904,1.43523L46.94888,49.28507L35.17326,75.37718
-		l-9.04457-30.37985L80.27998,28.87199z"/>
-	
-		<ellipse transform="matrix(0.9584 -0.28542 0.28542 0.9584 -8.50527 23.50941)" cx="76.40167" cy="40.93394" rx="3.67448" ry="3.67443"/>
-</g>
-</svg>
+</style><g
+     id="g16"
+     transform="matrix(0.45606533,0,0,0.45606533,-8.8837741,-8.8826504)"><g
+       id="g8"><polygon
+         points="117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 124.72725,60.47329 114.66228,56.04822 114.26072,61.70997 "
+         id="polygon4" /><polygon
+         points="101.60921,113.0542 72.712,111.00494 97.68292,121.98395 "
+         id="polygon6" /></g><polygon
+       points="105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 93.79712,41.29987 95.42753,46.77404 "
+       id="polygon10" /><path
+       d="M 83.87614,22.22247 19.47917,41.40116 38.65525,105.80075 103.05484,86.62206 Z M 80.27998,28.87199 91.11545,65.26036 70.7337,50.65516 66.41779,61.31362 75.07874,67.80623 73.9097,69.24146 46.94888,49.28507 35.17326,75.37718 26.12869,44.99733 Z"
+       id="path12"
+       inkscape:connector-curvature="0" /><ellipse
+       transform="matrix(0.9584,-0.28542,0.28542,0.9584,-8.50527,23.50941)"
+       cx="76.401672"
+       cy="40.933941"
+       rx="3.67448"
+       ry="3.6744299"
+       id="ellipse14" /></g></svg>
\ No newline at end of file
diff --git a/design/Assets/ImageGalleryPage.xaml b/design/Assets/ImageGalleryPage.xaml
new file mode 100644
index 000000000..e8fd1a6ed
--- /dev/null
+++ b/design/Assets/ImageGalleryPage.xaml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Canvas Name="g16">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.45606533 0 0 0.45606533 -8.8837741 -8.8826504"/>
+      </Canvas.RenderTransform>
+      <Canvas Name="g8">
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 124.72725,60.47329 114.66228,56.04822 114.26072,61.70997 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="101.60921,113.0542 72.712,111.00494 97.68292,121.98395 " Name="polygon6" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      </Canvas>
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 93.79712,41.29987 95.42753,46.77404 " Name="polygon10" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
+        <Path.Data>
+          <PathGeometry Figures="M 83.87614 22.22247 19.47917 41.40116 38.65525 105.80075 103.05484 86.62206 Z M 80.27998 28.87199 91.11545 65.26036 70.7337 50.65516 66.41779 61.31362 75.07874 67.80623 73.9097 69.24146 46.94888 49.28507 35.17326 75.37718 26.12869 44.99733 Z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse14" Fill="#000000" StrokeThickness="0">
+      </Ellipse>
+    </Canvas>
+  </Canvas>
+</Viewbox>
diff --git a/design/Assets/MultiView.svg b/design/Assets/MultiView.svg
index 93d65030c..04fda1ba4 100644
--- a/design/Assets/MultiView.svg
+++ b/design/Assets/MultiView.svg
@@ -1 +1,73 @@
-<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><defs><style>.cls-1{fill:none;}</style></defs><title>icon</title><path d="M24.15325,30.67939v77.4325h32.348v-6.15923H30.31248V54.9043h77.65805v4.57431h6.15923V30.67939Zm6.15923,18.06568V36.83862h77.65805V48.74507Z"/><polygon class="cls-1" points="107.971 76.417 107.971 71.37 68.39 71.37 68.39 101.953 73.95 101.953 73.95 76.417 107.971 76.417"/><path d="M114.12977,76.4165V65.21079H62.23042v42.9011h11.72v11.20872h51.89634V76.4165ZM68.38965,101.95266V71.37h39.58089V76.4165H73.9504v25.53615Zm51.29786,11.20872H80.10964V82.57574h39.57788Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Capa_1"
+   data-name="Capa 1"
+   viewBox="0 0 48 48"
+   version="1.1"
+   sodipodi:docname="MultiView.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata17">
+    <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>icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview15"
+     showgrid="false"
+     inkscape:zoom="8.9001173"
+     inkscape:cx="19.578382"
+     inkscape:cy="25.194359"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" />
+  <defs
+     id="defs4">
+    <style
+       id="style2">.cls-1{fill:none;}</style>
+  </defs>
+  <title
+     id="title6">icon</title>
+  <path
+     inkscape:connector-curvature="0"
+     d="M 4.7919e-7,3.0803831 V 39.629028 H 15.268467 V 36.721831 H 2.9071972 V 14.514699 H 39.562303 v 2.159104 H 42.4695 V 3.0803831 Z M 2.9071972,11.607502 V 5.9875798 H 39.562303 v 5.6199222 z"
+     id="path8"
+     style="stroke-width:0.47200653" />
+  <polygon
+     style="fill:none"
+     class="cls-1"
+     points="68.39,101.953 73.95,101.953 73.95,76.417 107.971,76.417 107.971,71.37 68.39,71.37 "
+     id="polygon10"
+     transform="matrix(0.47200652,0,0,0.47200652,-11.400491,-11.400489)" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 42.469505,24.668597 V 19.379429 H 17.972673 v 20.249599 h 5.531916 v 5.290589 H 48 V 24.668597 Z M 20.87987,36.721831 V 22.286616 h 18.682438 v 2.381981 H 23.50458 v 12.05323 z M 45.092794,42.01242 H 26.411781 V 27.575799 h 18.681018 z"
+     id="path12"
+     style="stroke-width:0.47200653" />
+</svg>
diff --git a/design/Assets/MultiView.xaml b/design/Assets/MultiView.xaml
index 2b6c4e150..772b7d4aa 100644
--- a/design/Assets/MultiView.xaml
+++ b/design/Assets/MultiView.xaml
@@ -1,22 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
     <!--Unknown tag: metadata-->
     <!--Unknown tag: sodipodi:namedview-->
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3925" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path8" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M24.15325 30.67939v77.4325h32.348v-6.15923H30.31248V54.9043h77.65805v4.57431h6.15923V30.67939Zm6.15923 18.06568V36.83862h77.65805V48.74507Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 4.7919e-7 3.0803831 V 39.629028 H 15.268467 V 36.721831 H 2.9071972 V 14.514699 H 39.562303 v 2.159104 H 42.4695 V 3.0803831 Z M 2.9071972 11.607502 V 5.9875798 H 39.562303 v 5.6199222 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="107.971 76.417 107.971 71.37 68.39 71.37 68.39 101.953 73.95 101.953 73.95 76.417 107.971 76.417" Name="polygon3927" FillRule="NonZero" Fill="#000000"/>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3929" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M114.12977 76.4165V65.21079H62.23042v42.9011h11.72v11.20872h51.89634V76.4165ZM68.38965 101.95266V71.37h39.58089V76.4165H73.9504v25.53615Zm51.29786 11.20872H80.10964V82.57574h39.57788Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 42.469505 24.668597 V 19.379429 H 17.972673 v 20.249599 h 5.531916 v 5.290589 H 48 V 24.668597 Z M 20.87987 36.721831 V 22.286616 h 18.682438 v 2.381981 H 23.50458 v 12.05323 z M 45.092794 42.01242 H 26.411781 V 27.575799 h 18.681018 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
diff --git a/design/Assets/ShareSource.svg b/design/Assets/ShareSource.svg
index 6985fe205..290498e7c 100644
--- a/design/Assets/ShareSource.svg
+++ b/design/Assets/ShareSource.svg
@@ -1 +1,67 @@
-<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><title>icon</title><polygon points="96.956 107.008 96.983 117.952 29.634 118.103 29.505 59.283 23.346 59.295 23.487 124.274 103.154 124.099 103.115 106.996 96.956 107.008"/><path d="M126.6362,25.72614l-5.39234,6.24645C106.77809,48.721,87.69289,50.09842,80.74571,49.97812l-.04812-23.66553L42.58133,66.98819,80.872,107.49837,80.81789,82.687c45.38825-6.50509,45.83636-48.2784,45.83636-48.70846ZM77.40445,76.90972l-2.75782.29473L74.67971,91.98,51.03824,66.97014,74.56843,41.861l.03007,13.735,2.67963.34886a58.09181,58.09181,0,0,0,42.08307-13.44325C116.68459,54.07726,107.67431,73.65568,77.40445,76.90972Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Capa_1"
+   data-name="Capa 1"
+   viewBox="0 0 48 48"
+   version="1.1"
+   sodipodi:docname="ShareSource.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata13">
+    <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>icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview9"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="6.2933333"
+     inkscape:cx="-59.357237"
+     inkscape:cy="33.572321"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" />
+  <title
+     id="title2">icon</title>
+  <polygon
+     points="92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 98.447,108.465 92.288,108.465 "
+     id="polygon4"
+     transform="matrix(0.42691891,0,0,0.42691891,-8.0188179,-8.0190122)" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 26.386654,14.722485 V 4.6192225 L 10.078151,21.948454 26.386654,39.278967 V 28.686529 C 45.771462,25.951754 46,8.1179165 46,7.9343415 v -3.52311 l -2.308508,2.661588 c -6.189838,7.1373755 -14.3351,7.6843315 -17.304838,7.6496655 z m -1.452126,11.493758 -1.177366,0.123255 v 6.309243 L 13.688566,21.948446 23.757162,11.249431 v 5.865012 l 1.1427,0.150212 a 16.200151,16.200151 0 0 0 1.99138,0.103997 24.927731,24.927731 0 0 0 15.98752,-5.803365 c -1.154256,4.940579 -5.017608,13.289986 -17.944234,14.650956 z"
+     id="path6"
+     style="stroke-width:0.42691892" />
+</svg>
diff --git a/design/Assets/ShareSource.xaml b/design/Assets/ShareSource.xaml
new file mode 100644
index 000000000..67429911a
--- /dev/null
+++ b/design/Assets/ShareSource.xaml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+  <Canvas Name="Capa_1" Width="48" Height="48">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 98.447,108.465 92.288,108.465 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0">
+      <Polygon.RenderTransform>
+        <MatrixTransform Matrix="0.42691891 0 0 0.42691891 -8.0188179 -8.0190122"/>
+      </Polygon.RenderTransform>
+    </Polygon>
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
+      <Path.Data>
+        <PathGeometry Figures="M 26.386654 14.722485 V 4.6192225 L 10.078151 21.948454 26.386654 39.278967 V 28.686529 C 45.771462 25.951754 46 8.1179165 46 7.9343415 v -3.52311 l -2.308508 2.661588 c -6.189838 7.1373755 -14.3351 7.6843315 -17.304838 7.6496655 z m -1.452126 11.493758 -1.177366 0.123255 v 6.309243 L 13.688566 21.948446 23.757162 11.249431 v 5.865012 l 1.1427 0.150212 a 16.200151 16.200151 0 0 0 1.99138 0.103997 24.927731 24.927731 0 0 0 15.98752 -5.803365 c -1.154256 4.940579 -5.017608 13.289986 -17.944234 14.650956 z" FillRule="NonZero"/>
+      </Path.Data>
+    </Path>
+  </Canvas>
+</Viewbox>
diff --git a/design/Assets/ShareTarget.svg b/design/Assets/ShareTarget.svg
index 58b34541c..ef7d49aaf 100644
--- a/design/Assets/ShareTarget.svg
+++ b/design/Assets/ShareTarget.svg
@@ -1 +1,67 @@
-<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><title>icon</title><polygon points="92.288 119.409 24.943 119.409 24.943 60.587 18.783 60.587 18.783 125.569 98.447 125.569 98.447 108.465 92.288 108.465 92.288 119.409"/><path d="M93.01606,81.95169v23.66553l38.20047-40.59139L93.01606,24.43144V49.2428C47.60976,55.64864,47.07444,97.422,47.07444,97.852v8.25241L52.48181,99.87C66.98067,83.15166,86.05985,81.87049,93.01606,81.95169Zm3.40141-26.92258,2.75782-.28871V39.96185l23.58433,25.064-23.58433,25.061v-13.738L96.49867,75.997a37.94667,37.94667,0,0,0-4.66454-.2436A58.38985,58.38985,0,0,0,54.38552,89.347C57.08921,77.77436,66.13859,58.217,96.41747,55.02911Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Capa_1"
+   data-name="Capa 1"
+   viewBox="0 0 48 48"
+   version="1.1"
+   sodipodi:docname="ShareTarget.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata13">
+    <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>icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview9"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="6.2933333"
+     inkscape:cx="-29.643254"
+     inkscape:cy="33.572321"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" />
+  <title
+     id="title2">icon</title>
+  <polygon
+     points="92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 98.447,108.465 92.288,108.465 "
+     id="polygon4"
+     transform="matrix(0.42691891,0,0,0.42691891,-8.0188179,-8.0190122)" />
+  <path
+     inkscape:connector-curvature="0"
+     d="M 31.691497,26.967714 V 37.070976 L 48,19.741744 31.691497,2.4112315 V 13.00367 C 12.306689,15.738445 12.078151,33.572282 12.078151,33.755857 v 3.52311 l 2.308508,-2.661588 c 6.189838,-7.137375 14.3351,-7.684331 17.304838,-7.649665 z M 33.143623,15.473955 34.320989,15.3507 V 9.0414572 L 44.389585,19.741753 34.320989,30.440768 v -5.865012 l -1.1427,-0.150212 a 16.200151,16.200151 0 0 0 -1.99138,-0.103997 24.927731,24.927731 0 0 0 -15.98752,5.803365 c 1.154256,-4.940579 5.017608,-13.289986 17.944234,-14.650957 z"
+     id="path6"
+     style="stroke-width:0.42691892" />
+</svg>
diff --git a/design/Assets/ShareTarget.xaml b/design/Assets/ShareTarget.xaml
new file mode 100644
index 000000000..7a1e0db7f
--- /dev/null
+++ b/design/Assets/ShareTarget.xaml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+  <Canvas Name="Capa_1" Width="48" Height="48">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Canvas Name="g17">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.42691891 0 0 0.42691891 -8.0188179 -8.0190122"/>
+      </Canvas.RenderTransform>
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="98.447,108.465 92.288,108.465 92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 " Name="polygon4" FillRule="NonZero" Fill="#000000"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000">
+        <Path.Data>
+          <PathGeometry Figures="m 93.01606 81.95169 v 23.66553 L 131.21653 65.02583 93.01606 24.43144 V 49.2428 C 47.60976 55.64864 47.07444 97.422 47.07444 97.852 v 8.25241 L 52.48181 99.87 C 66.98067 83.15166 86.05985 81.87049 93.01606 81.95169 Z M 96.41747 55.02911 99.17529 54.7404 V 39.96185 l 23.58433 25.064 -23.58433 25.061 v -13.738 L 96.49867 75.997 A 37.94667 37.94667 0 0 0 91.83413 75.7534 58.38985 58.38985 0 0 0 54.38552 89.347 C 57.08921 77.77436 66.13859 58.217 96.41747 55.02911 Z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+    </Canvas>
+  </Canvas>
+</Viewbox>
diff --git a/design/Assets/StoreNotification.svg b/design/Assets/StoreNotification.svg
index 194a24c0c..75d340c80 100644
--- a/design/Assets/StoreNotification.svg
+++ b/design/Assets/StoreNotification.svg
@@ -1 +1,68 @@
-<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><title>icon</title><path d="M75,128.72637,58.09519,102.40828H24.30062V21.27363H125.69938v81.13465H91.90481ZM30.45985,96.24905H61.45751L75,117.32818,88.54249,96.24905h30.99766V27.43286H30.45985Z"/><path d="M86.4948,50.09127v-.6169a8.24135,8.24135,0,0,0-3.43449-6.68666,9.38294,9.38294,0,0,1,.85938,2.53189,7.00122,7.00122,0,0,1,1.36763,4.15478v.6169H82.878V47.047A8.255,8.255,0,0,0,66.6085,45.07036v.00038a8.30347,8.30347,0,0,0-.238,1.97626v3.04428H53.2551V77.277a2.70354,2.70354,0,0,0,2.70331,2.70331H94.48105a2.2633,2.2633,0,0,0,2.26347-2.2631V50.09127ZM67.57764,47.047a7.04661,7.04661,0,0,1,14.09323,0v3.04428H71.19446v-.6169A7.035,7.035,0,0,1,78.186,42.4302a5.82381,5.82381,0,0,0-1.88867-.97554,8.22574,8.22574,0,0,0-6.072,6.04269h.00038a8.28182,8.28182,0,0,0-.23872,1.977v.6169H67.57764Zm6.39419,26.76582h-8.0652v-8.0652h8.0652Zm0-9.33058h-8.0652V56.417h8.0652Zm9.33058,9.33058h-8.0652v-8.0652h8.0652Zm0-9.33058h-8.0652V56.417h8.0652Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Capa_1"
+   data-name="Capa 1"
+   viewBox="0 0 48 48"
+   version="1.1"
+   sodipodi:docname="StoreNotification.svg"
+   width="48"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata13">
+    <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>icon</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs11" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview9"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="8.9001173"
+     inkscape:cx="3.6256469"
+     inkscape:cy="18.898698"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" />
+  <title
+     id="title2">icon</title>
+  <path
+     d="M 23.999999,48 16.448485,36.2435 H 1.3521805 V 0 H 46.647819 V 36.2435 H 31.551513 Z M 4.1035575,33.49212 H 17.950461 l 6.049538,9.41622 6.049539,-9.41622 H 43.896441 V 2.751377 H 4.1035575 Z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.44670802" />
+  <path
+     d="m 29.134904,12.873071 v -0.275574 a 3.6814771,3.6814771 0 0 0 -1.534215,-2.986985 4.1914345,4.1914345 0 0 1 0.383892,1.131015 3.1275011,3.1275011 0 0 1 0.610932,1.855974 v 0.275574 H 27.51925 V 11.513171 A 3.6875746,3.6875746 0 0 0 20.251534,10.63019 v 1.7e-4 a 3.7092266,3.7092266 0 0 0 -0.106316,0.882811 v 1.359904 H 14.286463 V 25.01715 a 1.207693,1.207693 0 0 0 1.20759,1.20759 H 32.702425 A 1.0110342,1.0110342 0 0 0 33.713537,25.2138 V 12.873071 Z m -8.450447,-1.3599 a 3.1477794,3.1477794 0 0 1 6.295558,0 v 1.359904 h -4.679896 v -0.275574 a 3.1425909,3.1425909 0 0 1 3.123177,-3.146692 2.6015426,2.6015426 0 0 0 -0.843684,-0.435781 3.674504,3.674504 0 0 0 -2.712411,2.699318 h 1.7e-4 a 3.6995554,3.6995554 0 0 0 -0.106638,0.883142 v 0.275574 h -1.076276 z m 2.856336,11.956509 h -3.60279 v -3.60279 h 3.60279 z m 0,-4.16805 h -3.60279 v -3.602805 h 3.60279 z m 4.168044,4.16805 h -3.602789 v -3.60279 h 3.602789 z m 0,-4.16805 h -3.602789 v -3.602805 h 3.602789 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.44670802" />
+</svg>
diff --git a/design/Assets/StoreNotification.xaml b/design/Assets/StoreNotification.xaml
index 7fd57b614..65bb81b1f 100644
--- a/design/Assets/StoreNotification.xaml
+++ b/design/Assets/StoreNotification.xaml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="svg3700" Width="48" Height="48">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
     <!--Unknown tag: metadata-->
     <!--Unknown tag: sodipodi:namedview-->
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3696" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000" StrokeThickness="0.44670802">
       <Path.Data>
-        <PathGeometry Figures="M24 46.472 18.764 36H2V2H46V36H29.236ZM4 34H20l4 8 4-8H44V4H4Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 23.999999 48 16.448485 36.2435 H 1.3521805 V 0 H 46.647819 V 36.2435 H 31.551513 Z M 4.1035575 33.49212 H 17.950461 l 6.049538 9.41622 6.049539 -9.41622 H 43.896441 V 2.751377 H 4.1035575 Z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3698" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0.44670802">
       <Path.Data>
-        <PathGeometry Figures="M29.545 14.117 28.3 13.286l-1.574.315a3.016 3.016 0 0 0-1.935-2.026 3.4 3.4 0 0 1 .581.766 2.609 2.609 0 0 1 .944 1.342l-.933.187a3.01 3.01 0 0 0-3-2.869c-1.629 0-2.952 1.709-3.008 3.325l0 .747L17 15.5v9.25L28.3 27 31 25.961V14.325ZM27 16.75V20H23V17.376Zm-7.221-2.321c0-1.432 1.165-3.013 2.6-3.013a2.6 2.6 0 0 1 2.594 2.536L21.24 14.7a3.2 3.2 0 0 1 1.882-2.732 2.162 2.162 0 0 0-.656-.129 3.74 3.74 0 0 0-1.643 2.9v.041l-1.044.209ZM22 17.533V20H19V18ZM19 21h3v2.476l-3-.465Zm4 2.63V21h4v3.25Z" FillRule="NonZero"/>
+        <PathGeometry Figures="m 29.134904 12.873071 v -0.275574 a 3.6814771 3.6814771 0 0 0 -1.534215 -2.986985 4.1914345 4.1914345 0 0 1 0.383892 1.131015 3.1275011 3.1275011 0 0 1 0.610932 1.855974 v 0.275574 H 27.51925 V 11.513171 A 3.6875746 3.6875746 0 0 0 20.251534 10.63019 v 1.7e-4 a 3.7092266 3.7092266 0 0 0 -0.106316 0.882811 v 1.359904 H 14.286463 V 25.01715 a 1.207693 1.207693 0 0 0 1.20759 1.20759 H 32.702425 A 1.0110342 1.0110342 0 0 0 33.713537 25.2138 V 12.873071 Z m -8.450447 -1.3599 a 3.1477794 3.1477794 0 0 1 6.295558 0 v 1.359904 h -4.679896 v -0.275574 a 3.1425909 3.1425909 0 0 1 3.123177 -3.146692 2.6015426 2.6015426 0 0 0 -0.843684 -0.435781 3.674504 3.674504 0 0 0 -2.712411 2.699318 h 1.7e-4 a 3.6995554 3.6995554 0 0 0 -0.106638 0.883142 v 0.275574 h -1.076276 z m 2.856336 11.956509 h -3.60279 v -3.60279 h 3.60279 z m 0 -4.16805 h -3.60279 v -3.602805 h 3.60279 z m 4.168044 4.16805 h -3.602789 v -3.60279 h 3.602789 z m 0 -4.16805 h -3.602789 v -3.602805 h 3.602789 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
diff --git a/design/Assets/WebToAppLink.svg b/design/Assets/WebToAppLink.svg
index 6a9e4af6a..2ebd26239 100644
--- a/design/Assets/WebToAppLink.svg
+++ b/design/Assets/WebToAppLink.svg
@@ -1 +1,73 @@
-<svg id="Capa_1" data-name="Capa 1" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 150 150"><title>icon 4</title><path d="M63.20485,30.30345V61.89311A34.81869,34.81869,0,0,1,69.364,65.8054V47.45487h52.16705V77.15934H78.711a34.50525,34.50525,0,0,1,2.462,6.15924h46.51733V30.30345Zm58.32623,10.99219H69.364V36.46269h52.16705Z"/><path d="M99.363,88.07776,89.55879,97.882l4.35477,4.35477,2.424-2.424v4.06a6.67167,6.67167,0,0,1-6.66448,6.66448H86.822v6.15923h2.85105a12.83892,12.83892,0,0,0,12.82371-12.82371V99.92293l2.31272,2.31385,4.35477-4.35477Z"/><path d="M76.5654,93.03223A28.75206,28.75206,0,0,0,49.18317,64.3605c-.25564-.02224-.50673-.0689-.76639-.0689-.07237,0-.1416.01747-.21376.01921-.1276-.00163-.2512-.01921-.37913-.01921a28.74107,28.74107,0,0,0,0,57.48214c.12793,0,.25152-.01758.37913-.01921.07216.00174.14139.01921.21376.01921.25966,0,.51075-.04666.76639-.0689A28.75226,28.75226,0,0,0,76.5654,93.03223Zm-5.83652,4.81513H63.31716c.12782-1.56284.21083-3.1617.21083-4.81513a58.18279,58.18279,0,0,0-.342-6.296h7.16129a23.03492,23.03492,0,0,1,.38162,11.11118Zm-21.94665,18.5445c-.17687.00716-.35135.02355-.52908.0268-3.29831-.167-6.82947-5.3772-8.548-13.23793H57.12843C55.44482,110.88163,52.02239,116.02826,48.78224,116.39186ZM38.867,97.84737c-.1479-1.54471-.22808-3.15356-.22808-4.81513a49.685,49.685,0,0,1,.40538-6.296H57.78924a49.685,49.685,0,0,1,.40538,6.296c0,1.66158-.08019,3.27042-.22808,4.81513Zm9.38613-28.2007c.17774.00326.35222.01964.52908.0268,3.02867.33985,6.22085,4.85018,8.00038,11.72935H40.051C41.87,74.371,45.16568,69.803,48.25316,69.64667Zm19.8569,11.75615H62.32269a35.79131,35.79131,0,0,0-3.06849-8.77729A23.5537,23.5537,0,0,1,68.11005,81.40282ZM38.05387,71.78926A34.50557,34.50557,0,0,0,34.511,81.40282H27.5384A23.5299,23.5299,0,0,1,38.05387,71.78926ZM25.3013,86.73619h8.3463a58.18278,58.18278,0,0,0-.342,6.296c0,1.65344.083,3.2523.21083,4.81513H24.91967a23.03855,23.03855,0,0,1,.38162-11.11118Zm1.46214,16.44455h7.45968a35.90843,35.90843,0,0,0,3.83075,11.09512A23.51975,23.51975,0,0,1,26.76344,103.18073Zm32.49087,10.25875a37.20591,37.20591,0,0,0,3.35625-10.25875H68.885A23.53843,23.53843,0,0,1,59.25431,113.43948Z"/></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   id="Capa_1"
+   data-name="Capa 1"
+   viewBox="0 0 47.999995 47.999999"
+   version="1.1"
+   sodipodi:docname="WebToAppLink.svg"
+   width="47.999996"
+   height="48"
+   inkscape:version="0.92.2 (5c3e80d, 2017-08-06)">
+  <metadata
+     id="metadata15">
+    <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>icon 4</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <defs
+     id="defs13" />
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1920"
+     inkscape:window-height="986"
+     id="namedview11"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="8.9001173"
+     inkscape:cx="11.073587"
+     inkscape:cy="30.793981"
+     inkscape:window-x="-11"
+     inkscape:window-y="-11"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="Capa_1" />
+  <title
+     id="title2">icon 4</title>
+  <path
+     d="M 19.500098,3.7869689 V 17.748284 a 15.388412,15.388412 0 0 1 2.722088,1.729069 v -8.11017 H 45.277852 V 24.495322 H 26.353171 a 15.249885,15.249885 0 0 1 1.088102,2.722128 H 47.999997 V 3.7869689 Z M 45.277865,8.6450602 H 22.222186 v -2.135963 h 23.055666 z"
+     id="path4"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.4419584" />
+  <path
+     d="m 35.480496,29.320809 -4.333053,4.333066 1.924627,1.924627 1.071307,-1.071307 v 1.794351 a 2.9486005,2.9486005 0 0 1 -2.945423,2.945423 h -1.260059 v 2.722123 h 1.260046 a 5.6742683,5.6742683 0 0 0 5.667546,-5.667546 v -1.745665 l 1.022126,1.022626 1.924627,-1.924627 z"
+     id="path6"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.4419584" />
+  <path
+     d="M 25.404905,31.510479 A 12.707214,12.707214 0 0 0 13.303099,18.838767 c -0.112982,-0.0098 -0.223954,-0.03045 -0.338712,-0.03045 -0.03199,0 -0.06258,0.0077 -0.09447,0.0085 -0.05639,-7.07e-4 -0.11102,-0.0085 -0.16756,-0.0085 a 12.702357,12.702357 0 0 0 0,25.404714 c 0.05654,0 0.111161,-0.0078 0.16756,-0.0085 0.03189,8.84e-4 0.06249,0.0085 0.09447,0.0085 0.114758,0 0.22573,-0.02064 0.338712,-0.03045 a 12.707302,12.707302 0 0 0 12.101806,-12.6721 z m -2.579499,2.128087 h -3.275672 c 0.05649,-0.69071 0.09318,-1.39734 0.09318,-2.128087 a 25.714372,25.714372 0 0 0 -0.151149,-2.78257 h 3.164992 a 10.180476,10.180476 0 0 1 0.16866,4.910679 z M 13.1259,41.834463 c -0.07817,0.0031 -0.155282,0.01043 -0.233831,0.01184 -1.457716,-0.07381 -3.0183421,-2.376498 -3.7778609,-5.850614 h 7.7003649 c -0.744085,3.403478 -2.256657,5.678074 -3.688668,5.83877 z M 8.7437807,33.63857 C 8.6784151,32.955873 8.6429788,32.244828 8.6429788,31.510483 a 21.958702,21.958702 0 0 1 0.1791611,-2.78257 h 8.2844841 a 21.958702,21.958702 0 0 1 0.179161,2.78257 c 0,0.734349 -0.03544,1.44539 -0.100802,2.128087 z M 12.89206,21.175034 c 0.07855,0.0015 0.155667,0.0087 0.233831,0.01185 1.338546,0.150199 2.749357,2.143578 3.535835,5.183884 H 9.2670594 c 0.8039226,-3.107771 2.2604766,-5.126637 3.6250136,-5.195729 z m 8.775923,5.195729 H 19.11022 a 15.81827,15.81827 0 0 0 -1.356145,-3.879196 10.409755,10.409755 0 0 1 3.913917,3.879196 z M 8.3844111,22.12197 A 15.250026,15.250026 0 0 0 6.81861,26.370763 H 3.7370111 a 10.399237,10.399237 0 0 1 4.6474,-4.248793 z M 2.748306,28.727891 h 3.6887171 a 25.714367,25.714367 0 0 0 -0.1511497,2.78257 c 0,0.730752 0.036683,1.437381 0.093178,2.128087 h -3.79941 a 10.18208,10.18208 0 0 1 0.1686601,-4.910679 z m 0.646205,7.267807 H 6.691379 A 15.870032,15.870032 0 0 0 8.3844111,40.899279 10.394751,10.394751 0 0 1 3.394511,35.995693 Z m 14.359613,4.53394 a 16.443464,16.443464 0 0 0 1.483323,-4.53394 h 2.773041 a 10.403006,10.403006 0 0 1 -4.256364,4.533936 z"
+     id="path8"
+     inkscape:connector-curvature="0"
+     style="stroke-width:0.4419584" />
+</svg>
diff --git a/design/Assets/WebToAppLink.xaml b/design/Assets/WebToAppLink.xaml
new file mode 100644
index 000000000..92884427c
--- /dev/null
+++ b/design/Assets/WebToAppLink.xaml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--This file is NOT compatible with Silverlight-->
+<Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
+  <Canvas Name="Capa_1" Width="47.999995" Height="47.999999">
+    <Canvas.RenderTransform>
+      <TranslateTransform X="0" Y="0"/>
+    </Canvas.RenderTransform>
+    <Canvas.Resources/>
+    <!--Unknown tag: metadata-->
+    <!--Unknown tag: sodipodi:namedview-->
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000" StrokeThickness="0">
+      <Path.Data>
+        <PathGeometry Figures="M 19.500098 3.7869689 V 17.748284 a 15.388412 15.388412 0 0 1 2.722088 1.729069 v -8.11017 H 45.277852 V 24.495322 H 26.353171 a 15.249885 15.249885 0 0 1 1.088102 2.722128 H 47.999997 V 3.7869689 Z M 45.277865 8.6450602 H 22.222186 v -2.135963 h 23.055666 z" FillRule="NonZero"/>
+      </Path.Data>
+    </Path>
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
+      <Path.Data>
+        <PathGeometry Figures="m 35.480496 29.320809 -4.333053 4.333066 1.924627 1.924627 1.071307 -1.071307 v 1.794351 a 2.9486005 2.9486005 0 0 1 -2.945423 2.945423 h -1.260059 v 2.722123 h 1.260046 a 5.6742683 5.6742683 0 0 0 5.667546 -5.667546 v -1.745665 l 1.022126 1.022626 1.924627 -1.924627 z" FillRule="NonZero"/>
+      </Path.Data>
+    </Path>
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path8" Fill="#000000" StrokeThickness="0">
+      <Path.Data>
+        <PathGeometry Figures="M 25.404905 31.510479 A 12.707214 12.707214 0 0 0 13.303099 18.838767 c -0.112982 -0.0098 -0.223954 -0.03045 -0.338712 -0.03045 -0.03199 0 -0.06258 0.0077 -0.09447 0.0085 -0.05639 -7.07e-4 -0.11102 -0.0085 -0.16756 -0.0085 a 12.702357 12.702357 0 0 0 0 25.404714 c 0.05654 0 0.111161 -0.0078 0.16756 -0.0085 0.03189 8.84e-4 0.06249 0.0085 0.09447 0.0085 0.114758 0 0.22573 -0.02064 0.338712 -0.03045 a 12.707302 12.707302 0 0 0 12.101806 -12.6721 z m -2.579499 2.128087 h -3.275672 c 0.05649 -0.69071 0.09318 -1.39734 0.09318 -2.128087 a 25.714372 25.714372 0 0 0 -0.151149 -2.78257 h 3.164992 a 10.180476 10.180476 0 0 1 0.16866 4.910679 z M 13.1259 41.834463 c -0.07817 0.0031 -0.155282 0.01043 -0.233831 0.01184 -1.457716 -0.07381 -3.0183421 -2.376498 -3.7778609 -5.850614 h 7.7003649 c -0.744085 3.403478 -2.256657 5.678074 -3.688668 5.83877 z M 8.7437807 33.63857 C 8.6784151 32.955873 8.6429788 32.244828 8.6429788 31.510483 a 21.958702 21.958702 0 0 1 0.1791611 -2.78257 h 8.2844841 a 21.958702 21.958702 0 0 1 0.179161 2.78257 c 0 0.734349 -0.03544 1.44539 -0.100802 2.128087 z M 12.89206 21.175034 c 0.07855 0.0015 0.155667 0.0087 0.233831 0.01185 1.338546 0.150199 2.749357 2.143578 3.535835 5.183884 H 9.2670594 c 0.8039226 -3.107771 2.2604766 -5.126637 3.6250136 -5.195729 z m 8.775923 5.195729 H 19.11022 a 15.81827 15.81827 0 0 0 -1.356145 -3.879196 10.409755 10.409755 0 0 1 3.913917 3.879196 z M 8.3844111 22.12197 A 15.250026 15.250026 0 0 0 6.81861 26.370763 H 3.7370111 a 10.399237 10.399237 0 0 1 4.6474 -4.248793 z M 2.748306 28.727891 h 3.6887171 a 25.714367 25.714367 0 0 0 -0.1511497 2.78257 c 0 0.730752 0.036683 1.437381 0.093178 2.128087 h -3.79941 a 10.18208 10.18208 0 0 1 0.1686601 -4.910679 z m 0.646205 7.267807 H 6.691379 A 15.870032 15.870032 0 0 0 8.3844111 40.899279 10.394751 10.394751 0 0 1 3.394511 35.995693 Z m 14.359613 4.53394 a 16.443464 16.443464 0 0 0 1.483323 -4.53394 h 2.773041 a 10.403006 10.403006 0 0 1 -4.256364 4.533936 z" FillRule="NonZero"/>
+      </Path.Data>
+    </Path>
+  </Canvas>
+</Viewbox>
diff --git a/templates/Features/MultiView/.template.config/icon.xaml b/templates/Features/MultiView/.template.config/icon.xaml
index e98679d80..f8177cda2 100644
--- a/templates/Features/MultiView/.template.config/icon.xaml
+++ b/templates/Features/MultiView/.template.config/icon.xaml
@@ -1,23 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3925" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path8" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M24.15325 30.67939v77.4325h32.348v-6.15923H30.31248V54.9043h77.65805v4.57431h6.15923V30.67939Zm6.15923 18.06568V36.83862h77.65805V48.74507Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 4.7919e-7 3.0803831 V 39.629028 H 15.268467 V 36.721831 H 2.9071972 V 14.514699 H 39.562303 v 2.159104 H 42.4695 V 3.0803831 Z M 2.9071972 11.607502 V 5.9875798 H 39.562303 v 5.6199222 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="107.971 76.417 107.971 71.37 68.39 71.37 68.39 101.953 73.95 101.953 73.95 76.417 107.971 76.417" Name="polygon3927" FillRule="NonZero" Fill="#000000"/>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3929" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M114.12977 76.4165V65.21079H62.23042v42.9011h11.72v11.20872h51.89634V76.4165ZM68.38965 101.95266V71.37h39.58089V76.4165H73.9504v25.53615Zm51.29786 11.20872H80.10964V82.57574h39.57788Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 42.469505 24.668597 V 19.379429 H 17.972673 v 20.249599 h 5.531916 v 5.290589 H 48 V 24.668597 Z M 20.87987 36.721831 V 22.286616 h 18.682438 v 2.381981 H 23.50458 v 12.05323 z M 45.092794 42.01242 H 26.411781 V 27.575799 h 18.681018 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
-</Viewbox>
+</Viewbox>
\ No newline at end of file
diff --git a/templates/Features/ShareSource/.template.config/icon.xaml b/templates/Features/ShareSource/.template.config/icon.xaml
index 73cd99017..891b3740f 100644
--- a/templates/Features/ShareSource/.template.config/icon.xaml
+++ b/templates/Features/ShareSource/.template.config/icon.xaml
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="96.956 107.008 96.983 117.952 29.634 118.103 29.505 59.283 23.346 59.295 23.487 124.274 103.154 124.099 103.115 106.996 96.956 107.008" Name="polygon3908" FillRule="NonZero" Fill="#000000"/>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3910" Fill="#000000">
+    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 98.447,108.465 92.288,108.465 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0">
+      <Polygon.RenderTransform>
+        <MatrixTransform Matrix="0.42691891 0 0 0.42691891 -8.0188179 -8.0190122"/>
+      </Polygon.RenderTransform>
+    </Polygon>
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M126.6362 25.72614l-5.39234 6.24645C106.77809 48.721 87.69289 50.09842 80.74571 49.97812l-.04812-23.66553L42.58133 66.98819 80.872 107.49837 80.81789 82.687c45.38825-6.50509 45.83636-48.2784 45.83636-48.70846ZM77.40445 76.90972l-2.75782.29473L74.67971 91.98 51.03824 66.97014 74.56843 41.861l.03007 13.735 2.67963.34886a58.09181 58.09181 0 0 0 42.08307-13.44325C116.68459 54.07726 107.67431 73.65568 77.40445 76.90972Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 26.386654 14.722485 V 4.6192225 L 10.078151 21.948454 26.386654 39.278967 V 28.686529 C 45.771462 25.951754 46 8.1179165 46 7.9343415 v -3.52311 l -2.308508 2.661588 c -6.189838 7.1373755 -14.3351 7.6843315 -17.304838 7.6496655 z m -1.452126 11.493758 -1.177366 0.123255 v 6.309243 L 13.688566 21.948446 23.757162 11.249431 v 5.865012 l 1.1427 0.150212 a 16.200151 16.200151 0 0 0 1.99138 0.103997 24.927731 24.927731 0 0 0 15.98752 -5.803365 c -1.154256 4.940579 -5.017608 13.289986 -17.944234 14.650956 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
diff --git a/templates/Features/ShareTarget.CodeBehind/.template.config/icon.xaml b/templates/Features/ShareTarget.CodeBehind/.template.config/icon.xaml
index 92b19e223..329a98492 100644
--- a/templates/Features/ShareTarget.CodeBehind/.template.config/icon.xaml
+++ b/templates/Features/ShareTarget.CodeBehind/.template.config/icon.xaml
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="92.288 119.409 24.943 119.409 24.943 60.587 18.783 60.587 18.783 125.569 98.447 125.569 98.447 108.465 92.288 108.465 92.288 119.409" Name="polygon3895" FillRule="NonZero" Fill="#000000"/>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3897" Fill="#000000">
-      <Path.Data>
-        <PathGeometry Figures="M93.01606 81.95169v23.66553l38.20047-40.59139L93.01606 24.43144V49.2428C47.60976 55.64864 47.07444 97.422 47.07444 97.852v8.25241L52.48181 99.87C66.98067 83.15166 86.05985 81.87049 93.01606 81.95169Zm3.40141-26.92258 2.75782-.28871V39.96185l23.58433 25.064-23.58433 25.061v-13.738L96.49867 75.997a37.94667 37.94667 0 0 0-4.66454-.2436A58.38985 58.38985 0 0 0 54.38552 89.347C57.08921 77.77436 66.13859 58.217 96.41747 55.02911Z" FillRule="NonZero"/>
-      </Path.Data>
-    </Path>
+    <Canvas Name="g17">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.42691891 0 0 0.42691891 -8.0188179 -8.0190122"/>
+      </Canvas.RenderTransform>
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="98.447,108.465 92.288,108.465 92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
+        <Path.Data>
+          <PathGeometry Figures="m 93.01606 81.95169 v 23.66553 L 131.21653 65.02583 93.01606 24.43144 V 49.2428 C 47.60976 55.64864 47.07444 97.422 47.07444 97.852 v 8.25241 L 52.48181 99.87 C 66.98067 83.15166 86.05985 81.87049 93.01606 81.95169 Z M 96.41747 55.02911 99.17529 54.7404 V 39.96185 l 23.58433 25.064 -23.58433 25.061 v -13.738 L 96.49867 75.997 A 37.94667 37.94667 0 0 0 91.83413 75.7534 58.38985 58.38985 0 0 0 54.38552 89.347 C 57.08921 77.77436 66.13859 58.217 96.41747 55.02911 Z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+    </Canvas>
   </Canvas>
 </Viewbox>
diff --git a/templates/Features/ShareTarget/.template.config/icon.xaml b/templates/Features/ShareTarget/.template.config/icon.xaml
index 6b9ebece9..329a98492 100644
--- a/templates/Features/ShareTarget/.template.config/icon.xaml
+++ b/templates/Features/ShareTarget/.template.config/icon.xaml
@@ -1,14 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
-    <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="92.288 119.409 24.943 119.409 24.943 60.587 18.783 60.587 18.783 125.569 98.447 125.569 98.447 108.465 92.288 108.465 92.288 119.409" Name="polygon3895" FillRule="NonZero" Fill="#000000"/>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3897">
-      <Path.Data>
-        <PathGeometry Figures="M93.01606 81.95169v23.66553l38.20047-40.59139L93.01606 24.43144V49.2428C47.60976 55.64864 47.07444 97.422 47.07444 97.852v8.25241L52.48181 99.87C66.98067 83.15166 86.05985 81.87049 93.01606 81.95169Zm3.40141-26.92258 2.75782-.28871V39.96185l23.58433 25.064-23.58433 25.061v-13.738L96.49867 75.997a37.94667 37.94667 0 0 0-4.66454-.2436A58.38985 58.38985 0 0 0 54.38552 89.347C57.08921 77.77436 66.13859 58.217 96.41747 55.02911Z" FillRule="NonZero"/>
-      </Path.Data>
-    </Path>
+    <Canvas.Resources/>
+    <Canvas Name="g17">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.42691891 0 0 0.42691891 -8.0188179 -8.0190122"/>
+      </Canvas.RenderTransform>
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="98.447,108.465 92.288,108.465 92.288,119.409 24.943,119.409 24.943,60.587 18.783,60.587 18.783,125.569 98.447,125.569 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
+        <Path.Data>
+          <PathGeometry Figures="m 93.01606 81.95169 v 23.66553 L 131.21653 65.02583 93.01606 24.43144 V 49.2428 C 47.60976 55.64864 47.07444 97.422 47.07444 97.852 v 8.25241 L 52.48181 99.87 C 66.98067 83.15166 86.05985 81.87049 93.01606 81.95169 Z M 96.41747 55.02911 99.17529 54.7404 V 39.96185 l 23.58433 25.064 -23.58433 25.061 v -13.738 L 96.49867 75.997 A 37.94667 37.94667 0 0 0 91.83413 75.7534 58.38985 58.38985 0 0 0 54.38552 89.347 C 57.08921 77.77436 66.13859 58.217 96.41747 55.02911 Z" FillRule="NonZero"/>
+        </Path.Data>
+      </Path>
+    </Canvas>
   </Canvas>
 </Viewbox>
diff --git a/templates/Features/StoreNotifications/.template.config/icon.xaml b/templates/Features/StoreNotifications/.template.config/icon.xaml
index fdcd0d2f6..87611cea8 100644
--- a/templates/Features/StoreNotifications/.template.config/icon.xaml
+++ b/templates/Features/StoreNotifications/.template.config/icon.xaml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3882" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M75 128.72637 58.09519 102.40828H24.30062V21.27363H125.69938v81.13465H91.90481ZM30.45985 96.24905H61.45751L75 117.32818 88.54249 96.24905h30.99766V27.43286H30.45985Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 23.999999 48 16.448485 36.2435 H 1.3521805 V 0 H 46.647819 V 36.2435 H 31.551513 Z M 4.1035575 33.49212 H 17.950461 l 6.049538 9.41622 6.049539 -9.41622 H 43.896441 V 2.751377 H 4.1035575 Z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3884" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M86.4948 50.09127v-.6169a8.24135 8.24135 0 0 0-3.43449-6.68666 9.38294 9.38294 0 0 1 .85938 2.53189 7.00122 7.00122 0 0 1 1.36763 4.15478v.6169H82.878V47.047A8.255 8.255 0 0 0 66.6085 45.07036v.00038a8.30347 8.30347 0 0 0-.238 1.97626v3.04428H53.2551V77.277a2.70354 2.70354 0 0 0 2.70331 2.70331H94.48105a2.2633 2.2633 0 0 0 2.26347-2.2631V50.09127ZM67.57764 47.047a7.04661 7.04661 0 0 1 14.09323 0v3.04428H71.19446v-.6169A7.035 7.035 0 0 1 78.186 42.4302a5.82381 5.82381 0 0 0-1.88867-.97554 8.22574 8.22574 0 0 0-6.072 6.04269h.00038a8.28182 8.28182 0 0 0-.23872 1.977v.6169H67.57764Zm6.39419 26.76582h-8.0652v-8.0652h8.0652Zm0-9.33058h-8.0652V56.417h8.0652Zm9.33058 9.33058h-8.0652v-8.0652h8.0652Zm0-9.33058h-8.0652V56.417h8.0652Z" FillRule="NonZero"/>
+        <PathGeometry Figures="m 29.134904 12.873071 v -0.275574 a 3.6814771 3.6814771 0 0 0 -1.534215 -2.986985 4.1914345 4.1914345 0 0 1 0.383892 1.131015 3.1275011 3.1275011 0 0 1 0.610932 1.855974 v 0.275574 H 27.51925 V 11.513171 A 3.6875746 3.6875746 0 0 0 20.251534 10.63019 v 1.7e-4 a 3.7092266 3.7092266 0 0 0 -0.106316 0.882811 v 1.359904 H 14.286463 V 25.01715 a 1.207693 1.207693 0 0 0 1.20759 1.20759 H 32.702425 A 1.0110342 1.0110342 0 0 0 33.713537 25.2138 V 12.873071 Z m -8.450447 -1.3599 a 3.1477794 3.1477794 0 0 1 6.295558 0 v 1.359904 h -4.679896 v -0.275574 a 3.1425909 3.1425909 0 0 1 3.123177 -3.146692 2.6015426 2.6015426 0 0 0 -0.843684 -0.435781 3.674504 3.674504 0 0 0 -2.712411 2.699318 h 1.7e-4 a 3.6995554 3.6995554 0 0 0 -0.106638 0.883142 v 0.275574 h -1.076276 z m 2.856336 11.956509 h -3.60279 v -3.60279 h 3.60279 z m 0 -4.16805 h -3.60279 v -3.602805 h 3.60279 z m 4.168044 4.16805 h -3.602789 v -3.60279 h 3.602789 z m 0 -4.16805 h -3.602789 v -3.602805 h 3.602789 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
diff --git a/templates/Features/StoreNotificationsVB/.template.config/icon.xaml b/templates/Features/StoreNotificationsVB/.template.config/icon.xaml
index fdcd0d2f6..87611cea8 100644
--- a/templates/Features/StoreNotificationsVB/.template.config/icon.xaml
+++ b/templates/Features/StoreNotificationsVB/.template.config/icon.xaml
@@ -1,21 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3882" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M75 128.72637 58.09519 102.40828H24.30062V21.27363H125.69938v81.13465H91.90481ZM30.45985 96.24905H61.45751L75 117.32818 88.54249 96.24905h30.99766V27.43286H30.45985Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 23.999999 48 16.448485 36.2435 H 1.3521805 V 0 H 46.647819 V 36.2435 H 31.551513 Z M 4.1035575 33.49212 H 17.950461 l 6.049538 9.41622 6.049539 -9.41622 H 43.896441 V 2.751377 H 4.1035575 Z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3884" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M86.4948 50.09127v-.6169a8.24135 8.24135 0 0 0-3.43449-6.68666 9.38294 9.38294 0 0 1 .85938 2.53189 7.00122 7.00122 0 0 1 1.36763 4.15478v.6169H82.878V47.047A8.255 8.255 0 0 0 66.6085 45.07036v.00038a8.30347 8.30347 0 0 0-.238 1.97626v3.04428H53.2551V77.277a2.70354 2.70354 0 0 0 2.70331 2.70331H94.48105a2.2633 2.2633 0 0 0 2.26347-2.2631V50.09127ZM67.57764 47.047a7.04661 7.04661 0 0 1 14.09323 0v3.04428H71.19446v-.6169A7.035 7.035 0 0 1 78.186 42.4302a5.82381 5.82381 0 0 0-1.88867-.97554 8.22574 8.22574 0 0 0-6.072 6.04269h.00038a8.28182 8.28182 0 0 0-.23872 1.977v.6169H67.57764Zm6.39419 26.76582h-8.0652v-8.0652h8.0652Zm0-9.33058h-8.0652V56.417h8.0652Zm9.33058 9.33058h-8.0652v-8.0652h8.0652Zm0-9.33058h-8.0652V56.417h8.0652Z" FillRule="NonZero"/>
+        <PathGeometry Figures="m 29.134904 12.873071 v -0.275574 a 3.6814771 3.6814771 0 0 0 -1.534215 -2.986985 4.1914345 4.1914345 0 0 1 0.383892 1.131015 3.1275011 3.1275011 0 0 1 0.610932 1.855974 v 0.275574 H 27.51925 V 11.513171 A 3.6875746 3.6875746 0 0 0 20.251534 10.63019 v 1.7e-4 a 3.7092266 3.7092266 0 0 0 -0.106316 0.882811 v 1.359904 H 14.286463 V 25.01715 a 1.207693 1.207693 0 0 0 1.20759 1.20759 H 32.702425 A 1.0110342 1.0110342 0 0 0 33.713537 25.2138 V 12.873071 Z m -8.450447 -1.3599 a 3.1477794 3.1477794 0 0 1 6.295558 0 v 1.359904 h -4.679896 v -0.275574 a 3.1425909 3.1425909 0 0 1 3.123177 -3.146692 2.6015426 2.6015426 0 0 0 -0.843684 -0.435781 3.674504 3.674504 0 0 0 -2.712411 2.699318 h 1.7e-4 a 3.6995554 3.6995554 0 0 0 -0.106638 0.883142 v 0.275574 h -1.076276 z m 2.856336 11.956509 h -3.60279 v -3.60279 h 3.60279 z m 0 -4.16805 h -3.60279 v -3.602805 h 3.60279 z m 4.168044 4.16805 h -3.602789 v -3.60279 h 3.602789 z m 0 -4.16805 h -3.602789 v -3.602805 h 3.602789 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
diff --git a/templates/Features/WebToAppLink/.template.config/icon.xaml b/templates/Features/WebToAppLink/.template.config/icon.xaml
index 21802aa56..10a280071 100644
--- a/templates/Features/WebToAppLink/.template.config/icon.xaml
+++ b/templates/Features/WebToAppLink/.template.config/icon.xaml
@@ -1,26 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="47.999995" Height="47.999999">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path32" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path4" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M63.20485 30.30345V61.89311A34.81869 34.81869 0 0 1 69.364 65.8054V47.45487h52.16705V77.15934H78.711a34.50525 34.50525 0 0 1 2.462 6.15924h46.51733V30.30345Zm58.32623 10.99219H69.364V36.46269h52.16705Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 19.500098 3.7869689 V 17.748284 a 15.388412 15.388412 0 0 1 2.722088 1.729069 v -8.11017 H 45.277852 V 24.495322 H 26.353171 a 15.249885 15.249885 0 0 1 1.088102 2.722128 H 47.999997 V 3.7869689 Z M 45.277865 8.6450602 H 22.222186 v -2.135963 h 23.055666 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path34" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path6" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M99.363 88.07776 89.55879 97.882l4.35477 4.35477 2.424-2.424v4.06a6.67167 6.67167 0 0 1-6.66448 6.66448H86.822v6.15923h2.85105a12.83892 12.83892 0 0 0 12.82371-12.82371V99.92293l2.31272 2.31385 4.35477-4.35477Z" FillRule="NonZero"/>
+        <PathGeometry Figures="m 35.480496 29.320809 -4.333053 4.333066 1.924627 1.924627 1.071307 -1.071307 v 1.794351 a 2.9486005 2.9486005 0 0 1 -2.945423 2.945423 h -1.260059 v 2.722123 h 1.260046 a 5.6742683 5.6742683 0 0 0 5.667546 -5.667546 v -1.745665 l 1.022126 1.022626 1.924627 -1.924627 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
-    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path36" Fill="#000000">
+    <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path8" Fill="#000000" StrokeThickness="0">
       <Path.Data>
-        <PathGeometry Figures="M76.5654 93.03223A28.75206 28.75206 0 0 0 49.18317 64.3605c-.25564-.02224-.50673-.0689-.76639-.0689-.07237 0-.1416.01747-.21376.01921-.1276-.00163-.2512-.01921-.37913-.01921a28.74107 28.74107 0 0 0 0 57.48214c.12793 0 .25152-.01758.37913-.01921.07216.00174.14139.01921.21376.01921.25966 0 .51075-.04666.76639-.0689A28.75226 28.75226 0 0 0 76.5654 93.03223Zm-5.83652 4.81513H63.31716c.12782-1.56284.21083-3.1617.21083-4.81513a58.18279 58.18279 0 0 0-.342-6.296h7.16129a23.03492 23.03492 0 0 1 .38162 11.11118Zm-21.94665 18.5445c-.17687.00716-.35135.02355-.52908.0268-3.29831-.167-6.82947-5.3772-8.548-13.23793H57.12843C55.44482 110.88163 52.02239 116.02826 48.78224 116.39186ZM38.867 97.84737c-.1479-1.54471-.22808-3.15356-.22808-4.81513a49.685 49.685 0 0 1 .40538-6.296H57.78924a49.685 49.685 0 0 1 .40538 6.296c0 1.66158-.08019 3.27042-.22808 4.81513Zm9.38613-28.2007c.17774.00326.35222.01964.52908.0268 3.02867.33985 6.22085 4.85018 8.00038 11.72935H40.051C41.87 74.371 45.16568 69.803 48.25316 69.64667Zm19.8569 11.75615H62.32269a35.79131 35.79131 0 0 0-3.06849-8.77729A23.5537 23.5537 0 0 1 68.11005 81.40282ZM38.05387 71.78926A34.50557 34.50557 0 0 0 34.511 81.40282H27.5384A23.5299 23.5299 0 0 1 38.05387 71.78926ZM25.3013 86.73619h8.3463a58.18278 58.18278 0 0 0-.342 6.296c0 1.65344.083 3.2523.21083 4.81513H24.91967a23.03855 23.03855 0 0 1 .38162-11.11118Zm1.46214 16.44455h7.45968a35.90843 35.90843 0 0 0 3.83075 11.09512A23.51975 23.51975 0 0 1 26.76344 103.18073Zm32.49087 10.25875a37.20591 37.20591 0 0 0 3.35625-10.25875H68.885A23.53843 23.53843 0 0 1 59.25431 113.43948Z" FillRule="NonZero"/>
+        <PathGeometry Figures="M 25.404905 31.510479 A 12.707214 12.707214 0 0 0 13.303099 18.838767 c -0.112982 -0.0098 -0.223954 -0.03045 -0.338712 -0.03045 -0.03199 0 -0.06258 0.0077 -0.09447 0.0085 -0.05639 -7.07e-4 -0.11102 -0.0085 -0.16756 -0.0085 a 12.702357 12.702357 0 0 0 0 25.404714 c 0.05654 0 0.111161 -0.0078 0.16756 -0.0085 0.03189 8.84e-4 0.06249 0.0085 0.09447 0.0085 0.114758 0 0.22573 -0.02064 0.338712 -0.03045 a 12.707302 12.707302 0 0 0 12.101806 -12.6721 z m -2.579499 2.128087 h -3.275672 c 0.05649 -0.69071 0.09318 -1.39734 0.09318 -2.128087 a 25.714372 25.714372 0 0 0 -0.151149 -2.78257 h 3.164992 a 10.180476 10.180476 0 0 1 0.16866 4.910679 z M 13.1259 41.834463 c -0.07817 0.0031 -0.155282 0.01043 -0.233831 0.01184 -1.457716 -0.07381 -3.0183421 -2.376498 -3.7778609 -5.850614 h 7.7003649 c -0.744085 3.403478 -2.256657 5.678074 -3.688668 5.83877 z M 8.7437807 33.63857 C 8.6784151 32.955873 8.6429788 32.244828 8.6429788 31.510483 a 21.958702 21.958702 0 0 1 0.1791611 -2.78257 h 8.2844841 a 21.958702 21.958702 0 0 1 0.179161 2.78257 c 0 0.734349 -0.03544 1.44539 -0.100802 2.128087 z M 12.89206 21.175034 c 0.07855 0.0015 0.155667 0.0087 0.233831 0.01185 1.338546 0.150199 2.749357 2.143578 3.535835 5.183884 H 9.2670594 c 0.8039226 -3.107771 2.2604766 -5.126637 3.6250136 -5.195729 z m 8.775923 5.195729 H 19.11022 a 15.81827 15.81827 0 0 0 -1.356145 -3.879196 10.409755 10.409755 0 0 1 3.913917 3.879196 z M 8.3844111 22.12197 A 15.250026 15.250026 0 0 0 6.81861 26.370763 H 3.7370111 a 10.399237 10.399237 0 0 1 4.6474 -4.248793 z M 2.748306 28.727891 h 3.6887171 a 25.714367 25.714367 0 0 0 -0.1511497 2.78257 c 0 0.730752 0.036683 1.437381 0.093178 2.128087 h -3.79941 a 10.18208 10.18208 0 0 1 0.1686601 -4.910679 z m 0.646205 7.267807 H 6.691379 A 15.870032 15.870032 0 0 0 8.3844111 40.899279 10.394751 10.394751 0 0 1 3.394511 35.995693 Z m 14.359613 4.53394 a 16.443464 16.443464 0 0 0 1.483323 -4.53394 h 2.773041 a 10.403006 10.403006 0 0 1 -4.256364 4.533936 z" FillRule="NonZero"/>
       </Path.Data>
     </Path>
   </Canvas>
diff --git a/templates/Pages/Camera.CaliburnMicro/.template.config/icon.xaml b/templates/Pages/Camera.CaliburnMicro/.template.config/icon.xaml
index 712f2e9dd..71f3ac052 100644
--- a/templates/Pages/Camera.CaliburnMicro/.template.config/icon.xaml
+++ b/templates/Pages/Camera.CaliburnMicro/.template.config/icon.xaml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g18">
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000">
+    <Canvas Name="g54">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.54135135 0 0 0.54134628 -16.601351 -16.090787"/>
+      </Canvas.RenderTransform>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path48" Fill="#000000"  StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M119.3335 106.84619H30.6665V49.27246h27.41211l3.53223-6.11865h26.77832l3.53223 6.11865h27.41211V106.84619z    M35.6665 101.84619h78.66699V54.27246H89.03467l-3.53223-6.11865H64.49756l-3.53223 6.11865H35.6665V101.84619z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 119.3335 106.84619 H 30.6665 V 49.27246 h 27.41211 l 3.53223 -6.11865 h 26.77832 l 3.53223 6.11865 h 27.41211 z m -83.667 -5 h 78.66699 V 54.27246 H 89.03467 L 85.50244 48.15381 H 64.49756 l -3.53223 6.11865 H 35.6665 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path14" Fill="#000000">
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path50" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M75.00049 93.9043c-8.64551 0-15.67871-7.0332-15.67871-15.67773c0-8.64502 7.0332-15.67822 15.67871-15.67822   c8.64453 0 15.67773 7.0332 15.67773 15.67822C90.67822 86.87109 83.64502 93.9043 75.00049 93.9043z M75.00049 67.54834   c-5.88867 0-10.67871 4.79004-10.67871 10.67822c0 5.8877 4.79004 10.67773 10.67871 10.67773   c5.8877 0 10.67773-4.79004 10.67773-10.67773C85.67822 72.33838 80.88818 67.54834 75.00049 67.54834z" FillRule="NonZero"/>
+          <PathGeometry Figures="m 75.00049 93.9043 c -8.64551 0 -15.67871 -7.0332 -15.67871 -15.67773 0 -8.64502 7.0332 -15.67822 15.67871 -15.67822 8.64453 0 15.67773 7.0332 15.67773 15.67822 0 8.64452 -7.0332 15.67773 -15.67773 15.67773 z m 0 -26.35596 c -5.88867 0 -10.67871 4.79004 -10.67871 10.67822 0 5.8877 4.79004 10.67773 10.67871 10.67773 5.8877 0 10.67773 -4.79004 10.67773 -10.67773 0 -5.88818 -4.79004 -10.67822 -10.67773 -10.67822 z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle16" Fill="#000000"/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle52" Fill="#000000" StrokeThickness="0"/>
     </Canvas>
   </Canvas>
 </Viewbox>
diff --git a/templates/Pages/Camera.CodeBehind/.template.config/icon.xaml b/templates/Pages/Camera.CodeBehind/.template.config/icon.xaml
index 712f2e9dd..71f3ac052 100644
--- a/templates/Pages/Camera.CodeBehind/.template.config/icon.xaml
+++ b/templates/Pages/Camera.CodeBehind/.template.config/icon.xaml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g18">
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000">
+    <Canvas Name="g54">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.54135135 0 0 0.54134628 -16.601351 -16.090787"/>
+      </Canvas.RenderTransform>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path48" Fill="#000000"  StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M119.3335 106.84619H30.6665V49.27246h27.41211l3.53223-6.11865h26.77832l3.53223 6.11865h27.41211V106.84619z    M35.6665 101.84619h78.66699V54.27246H89.03467l-3.53223-6.11865H64.49756l-3.53223 6.11865H35.6665V101.84619z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 119.3335 106.84619 H 30.6665 V 49.27246 h 27.41211 l 3.53223 -6.11865 h 26.77832 l 3.53223 6.11865 h 27.41211 z m -83.667 -5 h 78.66699 V 54.27246 H 89.03467 L 85.50244 48.15381 H 64.49756 l -3.53223 6.11865 H 35.6665 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path14" Fill="#000000">
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path50" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M75.00049 93.9043c-8.64551 0-15.67871-7.0332-15.67871-15.67773c0-8.64502 7.0332-15.67822 15.67871-15.67822   c8.64453 0 15.67773 7.0332 15.67773 15.67822C90.67822 86.87109 83.64502 93.9043 75.00049 93.9043z M75.00049 67.54834   c-5.88867 0-10.67871 4.79004-10.67871 10.67822c0 5.8877 4.79004 10.67773 10.67871 10.67773   c5.8877 0 10.67773-4.79004 10.67773-10.67773C85.67822 72.33838 80.88818 67.54834 75.00049 67.54834z" FillRule="NonZero"/>
+          <PathGeometry Figures="m 75.00049 93.9043 c -8.64551 0 -15.67871 -7.0332 -15.67871 -15.67773 0 -8.64502 7.0332 -15.67822 15.67871 -15.67822 8.64453 0 15.67773 7.0332 15.67773 15.67822 0 8.64452 -7.0332 15.67773 -15.67773 15.67773 z m 0 -26.35596 c -5.88867 0 -10.67871 4.79004 -10.67871 10.67822 0 5.8877 4.79004 10.67773 10.67871 10.67773 5.8877 0 10.67773 -4.79004 10.67773 -10.67773 0 -5.88818 -4.79004 -10.67822 -10.67773 -10.67822 z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle16" Fill="#000000"/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle52" Fill="#000000" StrokeThickness="0"/>
     </Canvas>
   </Canvas>
 </Viewbox>
diff --git a/templates/Pages/Camera.CodeBehindVB/.template.config/icon.xaml b/templates/Pages/Camera.CodeBehindVB/.template.config/icon.xaml
index 712f2e9dd..870b97fe3 100644
--- a/templates/Pages/Camera.CodeBehindVB/.template.config/icon.xaml
+++ b/templates/Pages/Camera.CodeBehindVB/.template.config/icon.xaml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g18">
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000">
+    <Canvas Name="g54">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.54135135 0 0 0.54134628 -16.601351 -16.090787"/>
+      </Canvas.RenderTransform>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path48" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M119.3335 106.84619H30.6665V49.27246h27.41211l3.53223-6.11865h26.77832l3.53223 6.11865h27.41211V106.84619z    M35.6665 101.84619h78.66699V54.27246H89.03467l-3.53223-6.11865H64.49756l-3.53223 6.11865H35.6665V101.84619z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 119.3335 106.84619 H 30.6665 V 49.27246 h 27.41211 l 3.53223 -6.11865 h 26.77832 l 3.53223 6.11865 h 27.41211 z m -83.667 -5 h 78.66699 V 54.27246 H 89.03467 L 85.50244 48.15381 H 64.49756 l -3.53223 6.11865 H 35.6665 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path14" Fill="#000000">
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path50" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M75.00049 93.9043c-8.64551 0-15.67871-7.0332-15.67871-15.67773c0-8.64502 7.0332-15.67822 15.67871-15.67822   c8.64453 0 15.67773 7.0332 15.67773 15.67822C90.67822 86.87109 83.64502 93.9043 75.00049 93.9043z M75.00049 67.54834   c-5.88867 0-10.67871 4.79004-10.67871 10.67822c0 5.8877 4.79004 10.67773 10.67871 10.67773   c5.8877 0 10.67773-4.79004 10.67773-10.67773C85.67822 72.33838 80.88818 67.54834 75.00049 67.54834z" FillRule="NonZero"/>
+          <PathGeometry Figures="m 75.00049 93.9043 c -8.64551 0 -15.67871 -7.0332 -15.67871 -15.67773 0 -8.64502 7.0332 -15.67822 15.67871 -15.67822 8.64453 0 15.67773 7.0332 15.67773 15.67822 0 8.64452 -7.0332 15.67773 -15.67773 15.67773 z m 0 -26.35596 c -5.88867 0 -10.67871 4.79004 -10.67871 10.67822 0 5.8877 4.79004 10.67773 10.67871 10.67773 5.8877 0 10.67773 -4.79004 10.67773 -10.67773 0 -5.88818 -4.79004 -10.67822 -10.67773 -10.67822 z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle16" Fill="#000000"/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle52" Fill="#000000" StrokeThickness="0"/>
     </Canvas>
   </Canvas>
 </Viewbox>
diff --git a/templates/Pages/Camera/.template.config/icon.xaml b/templates/Pages/Camera/.template.config/icon.xaml
index 712f2e9dd..71f3ac052 100644
--- a/templates/Pages/Camera/.template.config/icon.xaml
+++ b/templates/Pages/Camera/.template.config/icon.xaml
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g18">
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000">
+    <Canvas Name="g54">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.54135135 0 0 0.54134628 -16.601351 -16.090787"/>
+      </Canvas.RenderTransform>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path48" Fill="#000000"  StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M119.3335 106.84619H30.6665V49.27246h27.41211l3.53223-6.11865h26.77832l3.53223 6.11865h27.41211V106.84619z    M35.6665 101.84619h78.66699V54.27246H89.03467l-3.53223-6.11865H64.49756l-3.53223 6.11865H35.6665V101.84619z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 119.3335 106.84619 H 30.6665 V 49.27246 h 27.41211 l 3.53223 -6.11865 h 26.77832 l 3.53223 6.11865 h 27.41211 z m -83.667 -5 h 78.66699 V 54.27246 H 89.03467 L 85.50244 48.15381 H 64.49756 l -3.53223 6.11865 H 35.6665 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path14" Fill="#000000">
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path50" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M75.00049 93.9043c-8.64551 0-15.67871-7.0332-15.67871-15.67773c0-8.64502 7.0332-15.67822 15.67871-15.67822   c8.64453 0 15.67773 7.0332 15.67773 15.67822C90.67822 86.87109 83.64502 93.9043 75.00049 93.9043z M75.00049 67.54834   c-5.88867 0-10.67871 4.79004-10.67871 10.67822c0 5.8877 4.79004 10.67773 10.67871 10.67773   c5.8877 0 10.67773-4.79004 10.67773-10.67773C85.67822 72.33838 80.88818 67.54834 75.00049 67.54834z" FillRule="NonZero"/>
+          <PathGeometry Figures="m 75.00049 93.9043 c -8.64551 0 -15.67871 -7.0332 -15.67871 -15.67773 0 -8.64502 7.0332 -15.67822 15.67871 -15.67822 8.64453 0 15.67773 7.0332 15.67773 15.67822 0 8.64452 -7.0332 15.67773 -15.67773 15.67773 z m 0 -26.35596 c -5.88867 0 -10.67871 4.79004 -10.67871 10.67822 0 5.8877 4.79004 10.67773 10.67871 10.67773 5.8877 0 10.67773 -4.79004 10.67773 -10.67773 0 -5.88818 -4.79004 -10.67822 -10.67773 -10.67822 z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle16" Fill="#000000"/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="96.1" Canvas.Top="60.1" Width="3.8" Height="3.8" Name="circle52" Fill="#000000" StrokeThickness="0"/>
     </Canvas>
   </Canvas>
 </Viewbox>
diff --git a/templates/Pages/ImageGallery.CaliburnMicro/.template.config/icon.xaml b/templates/Pages/ImageGallery.CaliburnMicro/.template.config/icon.xaml
index 13ffd74ee..c9714c98a 100644
--- a/templates/Pages/ImageGallery.CaliburnMicro/.template.config/icon.xaml
+++ b/templates/Pages/ImageGallery.CaliburnMicro/.template.config/icon.xaml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g3950">
-      <Canvas Name="g3942">
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="114.66228,56.04822 114.26072,61.70997 117.68106,63.21348 113.4752,72.78065 112.35139,88.62153     124.72725,60.47329   " Name="polygon3938" FillRule="NonZero" Fill="#000000"/>
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="72.712,111.00494 97.68292,121.98395 101.60921,113.0542   " Name="polygon3940" FillRule="NonZero" Fill="#000000"/>
+    <Canvas Name="g16">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.45606533 0 0 0.45606533 -8.8837741 -8.8826504"/>
+      </Canvas.RenderTransform>
+      <Canvas Name="g8">
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 124.72725,60.47329 114.66228,56.04822 114.26072,61.70997 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="101.60921,113.0542 72.712,111.00494 97.68292,121.98395 " Name="polygon6" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
       </Canvas>
-      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="93.79712,41.29987 95.42753,46.77404 105.89047,47.51618 103.92015,75.2909 108.12764,89.41949    53.18658,105.78069 106.84563,109.5853 111.6005,42.56297  " Name="polygon3944" FillRule="NonZero" Fill="#000000"/>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3946" Fill="#000000">
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 93.79712,41.29987 95.42753,46.77404 " Name="polygon10" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M83.87614 22.22247L19.47917 41.40116l19.17608 64.39959l64.39959-19.17869L83.87614 22.22247z M80.27998 28.87199   l10.83547 36.38837L70.7337 50.65516l-4.31591 10.65846l8.66095 6.49261l-1.16904 1.43523L46.94888 49.28507L35.17326 75.37718   l-9.04457-30.37985L80.27998 28.87199z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 83.87614 22.22247 19.47917 41.40116 38.65525 105.80075 103.05484 86.62206 Z M 80.27998 28.87199 91.11545 65.26036 70.7337 50.65516 66.41779 61.31362 75.07874 67.80623 73.9097 69.24146 46.94888 49.28507 35.17326 75.37718 26.12869 44.99733 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse3948" Fill="#000000">
-        <Ellipse.RenderTransform/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse14" Fill="#000000" StrokeThickness="0">
       </Ellipse>
     </Canvas>
   </Canvas>
diff --git a/templates/Pages/ImageGallery.CodeBehind/.template.config/icon.xaml b/templates/Pages/ImageGallery.CodeBehind/.template.config/icon.xaml
index 13ffd74ee..c9714c98a 100644
--- a/templates/Pages/ImageGallery.CodeBehind/.template.config/icon.xaml
+++ b/templates/Pages/ImageGallery.CodeBehind/.template.config/icon.xaml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g3950">
-      <Canvas Name="g3942">
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="114.66228,56.04822 114.26072,61.70997 117.68106,63.21348 113.4752,72.78065 112.35139,88.62153     124.72725,60.47329   " Name="polygon3938" FillRule="NonZero" Fill="#000000"/>
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="72.712,111.00494 97.68292,121.98395 101.60921,113.0542   " Name="polygon3940" FillRule="NonZero" Fill="#000000"/>
+    <Canvas Name="g16">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.45606533 0 0 0.45606533 -8.8837741 -8.8826504"/>
+      </Canvas.RenderTransform>
+      <Canvas Name="g8">
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 124.72725,60.47329 114.66228,56.04822 114.26072,61.70997 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="101.60921,113.0542 72.712,111.00494 97.68292,121.98395 " Name="polygon6" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
       </Canvas>
-      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="93.79712,41.29987 95.42753,46.77404 105.89047,47.51618 103.92015,75.2909 108.12764,89.41949    53.18658,105.78069 106.84563,109.5853 111.6005,42.56297  " Name="polygon3944" FillRule="NonZero" Fill="#000000"/>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3946" Fill="#000000">
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 93.79712,41.29987 95.42753,46.77404 " Name="polygon10" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M83.87614 22.22247L19.47917 41.40116l19.17608 64.39959l64.39959-19.17869L83.87614 22.22247z M80.27998 28.87199   l10.83547 36.38837L70.7337 50.65516l-4.31591 10.65846l8.66095 6.49261l-1.16904 1.43523L46.94888 49.28507L35.17326 75.37718   l-9.04457-30.37985L80.27998 28.87199z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 83.87614 22.22247 19.47917 41.40116 38.65525 105.80075 103.05484 86.62206 Z M 80.27998 28.87199 91.11545 65.26036 70.7337 50.65516 66.41779 61.31362 75.07874 67.80623 73.9097 69.24146 46.94888 49.28507 35.17326 75.37718 26.12869 44.99733 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse3948" Fill="#000000">
-        <Ellipse.RenderTransform/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse14" Fill="#000000" StrokeThickness="0">
       </Ellipse>
     </Canvas>
   </Canvas>
diff --git a/templates/Pages/ImageGallery.CodeBehindVB/.template.config/icon.xaml b/templates/Pages/ImageGallery.CodeBehindVB/.template.config/icon.xaml
index 13ffd74ee..c9714c98a 100644
--- a/templates/Pages/ImageGallery.CodeBehindVB/.template.config/icon.xaml
+++ b/templates/Pages/ImageGallery.CodeBehindVB/.template.config/icon.xaml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g3950">
-      <Canvas Name="g3942">
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="114.66228,56.04822 114.26072,61.70997 117.68106,63.21348 113.4752,72.78065 112.35139,88.62153     124.72725,60.47329   " Name="polygon3938" FillRule="NonZero" Fill="#000000"/>
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="72.712,111.00494 97.68292,121.98395 101.60921,113.0542   " Name="polygon3940" FillRule="NonZero" Fill="#000000"/>
+    <Canvas Name="g16">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.45606533 0 0 0.45606533 -8.8837741 -8.8826504"/>
+      </Canvas.RenderTransform>
+      <Canvas Name="g8">
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 124.72725,60.47329 114.66228,56.04822 114.26072,61.70997 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="101.60921,113.0542 72.712,111.00494 97.68292,121.98395 " Name="polygon6" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
       </Canvas>
-      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="93.79712,41.29987 95.42753,46.77404 105.89047,47.51618 103.92015,75.2909 108.12764,89.41949    53.18658,105.78069 106.84563,109.5853 111.6005,42.56297  " Name="polygon3944" FillRule="NonZero" Fill="#000000"/>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3946" Fill="#000000">
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 93.79712,41.29987 95.42753,46.77404 " Name="polygon10" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M83.87614 22.22247L19.47917 41.40116l19.17608 64.39959l64.39959-19.17869L83.87614 22.22247z M80.27998 28.87199   l10.83547 36.38837L70.7337 50.65516l-4.31591 10.65846l8.66095 6.49261l-1.16904 1.43523L46.94888 49.28507L35.17326 75.37718   l-9.04457-30.37985L80.27998 28.87199z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 83.87614 22.22247 19.47917 41.40116 38.65525 105.80075 103.05484 86.62206 Z M 80.27998 28.87199 91.11545 65.26036 70.7337 50.65516 66.41779 61.31362 75.07874 67.80623 73.9097 69.24146 46.94888 49.28507 35.17326 75.37718 26.12869 44.99733 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse3948" Fill="#000000">
-        <Ellipse.RenderTransform/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse14" Fill="#000000" StrokeThickness="0">
       </Ellipse>
     </Canvas>
   </Canvas>
diff --git a/templates/Pages/ImageGallery/.template.config/icon.xaml b/templates/Pages/ImageGallery/.template.config/icon.xaml
index 13ffd74ee..c9714c98a 100644
--- a/templates/Pages/ImageGallery/.template.config/icon.xaml
+++ b/templates/Pages/ImageGallery/.template.config/icon.xaml
@@ -1,26 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--This file is NOT compatible with Silverlight-->
 <Viewbox xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" Stretch="Uniform">
-  <Canvas Name="Capa_1" Canvas.Left="0" Canvas.Top="0" Width="150" Height="150">
+  <Canvas Name="Capa_1" Width="48" Height="48" Canvas.Left="0" Canvas.Top="0">
     <Canvas.RenderTransform>
       <TranslateTransform X="0" Y="0"/>
     </Canvas.RenderTransform>
     <Canvas.Resources/>
-    <!--Unknown tag: metadata-->
-    <!--Unknown tag: sodipodi:namedview-->
-    <Canvas Name="g3950">
-      <Canvas Name="g3942">
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="114.66228,56.04822 114.26072,61.70997 117.68106,63.21348 113.4752,72.78065 112.35139,88.62153     124.72725,60.47329   " Name="polygon3938" FillRule="NonZero" Fill="#000000"/>
-        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="72.712,111.00494 97.68292,121.98395 101.60921,113.0542   " Name="polygon3940" FillRule="NonZero" Fill="#000000"/>
+    <Canvas Name="g16">
+      <Canvas.RenderTransform>
+        <MatrixTransform Matrix="0.45606533 0 0 0.45606533 -8.8837741 -8.8826504"/>
+      </Canvas.RenderTransform>
+      <Canvas Name="g8">
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="117.68106,63.21348 113.4752,72.78065 112.35139,88.62153 124.72725,60.47329 114.66228,56.04822 114.26072,61.70997 " Name="polygon4" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+        <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="101.60921,113.0542 72.712,111.00494 97.68292,121.98395 " Name="polygon6" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
       </Canvas>
-      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="93.79712,41.29987 95.42753,46.77404 105.89047,47.51618 103.92015,75.2909 108.12764,89.41949    53.18658,105.78069 106.84563,109.5853 111.6005,42.56297  " Name="polygon3944" FillRule="NonZero" Fill="#000000"/>
-      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path3946" Fill="#000000">
+      <Polygon xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Points="105.89047,47.51618 103.92015,75.2909 108.12764,89.41949 53.18658,105.78069 106.84563,109.5853 111.6005,42.56297 93.79712,41.29987 95.42753,46.77404 " Name="polygon10" FillRule="NonZero" Fill="#000000" StrokeThickness="0"/>
+      <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Name="path12" Fill="#000000" StrokeThickness="0">
         <Path.Data>
-          <PathGeometry Figures="M83.87614 22.22247L19.47917 41.40116l19.17608 64.39959l64.39959-19.17869L83.87614 22.22247z M80.27998 28.87199   l10.83547 36.38837L70.7337 50.65516l-4.31591 10.65846l8.66095 6.49261l-1.16904 1.43523L46.94888 49.28507L35.17326 75.37718   l-9.04457-30.37985L80.27998 28.87199z" FillRule="NonZero"/>
+          <PathGeometry Figures="M 83.87614 22.22247 19.47917 41.40116 38.65525 105.80075 103.05484 86.62206 Z M 80.27998 28.87199 91.11545 65.26036 70.7337 50.65516 66.41779 61.31362 75.07874 67.80623 73.9097 69.24146 46.94888 49.28507 35.17326 75.37718 26.12869 44.99733 Z" FillRule="NonZero"/>
         </Path.Data>
       </Path>
-      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse3948" Fill="#000000">
-        <Ellipse.RenderTransform/>
+      <Ellipse xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" Canvas.Left="72.7" Width="7.3" Canvas.Top="37.3" Height="7.3" Name="ellipse14" Fill="#000000" StrokeThickness="0">
       </Ellipse>
     </Canvas>
   </Canvas>