diff --git a/Paper/symbolic/devices/input-touchpad-symbolic.svg b/Paper/symbolic/devices/input-touchpad-symbolic.svg
index ead026b8..283b80a2 100644
--- a/Paper/symbolic/devices/input-touchpad-symbolic.svg
+++ b/Paper/symbolic/devices/input-touchpad-symbolic.svg
@@ -1,179 +1,38 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="input-touchpad-symbolic.svg"
-   inkscape:export-filename="/home/sam/source-symbolic.png"
-   inkscape:export-xdpi="270"
-   inkscape:export-ydpi="270"
-   height="16.000002"
-   id="svg7384"
-   style="enable-background:new"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="16.008265">
-  <sodipodi:namedview
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     bordercolor="#666666"
-     borderlayer="false"
-     borderopacity="1"
-     inkscape:current-layer="layer10"
-     inkscape:cx="8.0041346"
-     inkscape:cy="7.9999979"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     objecttolerance="10"
-     pagecolor="#f7f7f7"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="true"
-     showgrid="true"
-     showguides="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-others="true"
-     inkscape:snap-page="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="705"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1366"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="32.937496">
-    <inkscape:grid
-       color="#000000"
-       dotted="false"
-       empcolor="#0800ff"
-       empopacity="0.4627451"
-       empspacing="4"
-       enabled="true"
-       id="grid4866"
-       opacity="0.16470588"
-       originx="-223.99174"
-       originy="-376.00336"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.25px"
-       spacingy="0.25px"
-       type="xygrid"
-       visible="true" />
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='input-touchpad-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16.000002' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='31.99381' inkscape:cy='-1.9999997' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-184' originy='-376.00336' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
   </sodipodi:namedview>
-  <metadata
-     id="metadata90">
+  <metadata id='metadata90'>
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about=''>
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
         <dc:title>Paper Symbolic Icon Theme</dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <title
-     id="title8473">Paper Symbolic Icon Theme</title>
-  <defs
-     id="defs7386">
-    <linearGradient
-       id="linearGradient5606"
-       osb:paint="solid">
-      <stop
-         id="stop5608"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
+  <title id='title8473'>Paper Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter7554"
-       style="color-interpolation-filters:sRGB">
-      <feBlend
-         inkscape:collect="always"
-         id="feBlend7556"
-         in2="BackgroundImage"
-         mode="darken" />
+    <filter inkscape:collect='always' id='filter7554' style='color-interpolation-filters:sRGB'>
+      <feBlend inkscape:collect='always' id='feBlend7556' in2='BackgroundImage' mode='darken'/>
     </filter>
   </defs>
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-464.99194,159.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline;filter:url(#filter7554)"
-     transform="translate(-464.99194,159.00336)">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 481.0002,-156 c 0,-2 -2,-2 -2,-2 l -12,4e-5 c -2.25,10e-6 -2,2 -2,2 l 0,9.99996 c 0,0 0,2 2,2 l 12,0 c 0,0 2,0 2,-2 z m -2.0002,0 0,10 -12,0 0,-10 z"
-       id="path5073"
-       sodipodi:nodetypes="scsccscssccccc"
-       style="fill:#555555;fill-opacity:1;stroke:none" />
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-425.0002,159.00336)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-425.0002,159.00336)'>
+    
+    <path inkscape:connector-curvature='0' d='m 426.0002,-157 c -1,0 -1,1 -1,1 l 0,11 c 0,0 0,1 1,1 l 13,0 c 0,0 1,0 1,-1 l 0,-11 c 0,-1 -1,-1 -1,-1 z m 1,2 11,0 0,6 -11,0 z m 0,7 5,0 0,2 -5,0 z m 6,0 5,0 0,2 -5,0 z' id='path5073' sodipodi:nodetypes='sccscsscsccccccccccccccc' style='fill:#555555;fill-opacity:1;stroke:none'/>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-223.99174,-457.99664)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     style="display:inline"
-     transform="translate(-464.99194,159.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-464.99194,159.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-464.99194,159.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-223.99174,-307.99664)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g6058"
-     inkscape:label="apps"
-     style="display:inline"
-     transform="translate(-223.99174,-307.99664)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-464.99194,159.00336)" />
+  <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-184,-457.99664)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-425.0002,159.00336)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-425.0002,159.00336)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-425.0002,159.00336)'/>
+  <g inkscape:groupmode='layer' id='layer2' inkscape:label='categories' style='display:inline' transform='translate(-184,-307.99664)'/>
+  <g inkscape:groupmode='layer' id='g6058' inkscape:label='apps' style='display:inline' transform='translate(-184,-307.99664)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-425.0002,159.00336)'/>
 </svg>
diff --git a/Paper/symbolic/devices/laptop-symbolic.svg b/Paper/symbolic/devices/laptop-symbolic.svg
index 91f9e4c1..705e1c9e 100644
--- a/Paper/symbolic/devices/laptop-symbolic.svg
+++ b/Paper/symbolic/devices/laptop-symbolic.svg
@@ -2,7 +2,7 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='laptop-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16.000406' xmlns='http://www.w3.org/2000/svg'>
-  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='20.56968' inkscape:cy='-4.308419' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='91.99381' inkscape:cy='-1.999939' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
     <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-124' originy='-376.0033' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
   </sodipodi:namedview>
   <metadata id='metadata90'>
@@ -27,7 +27,7 @@
   <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-365.0002,159.0033)'>
     
     
-    <path inkscape:connector-curvature='0' d='m 368.0002,-157 c -1.99959,0 -2,2 -2,2 l 0,7 c 0,0 0,2 2,2 l 10,0 c 0,0 1.99953,0 2,-2 l 0,-7 c 0,0 4.1e-4,-2 -2,-2 z m 0,2 10,0 0,7 -10,-0.024 z m -3,9 2e-4,0.99664 16,0 -2e-4,-0.99664 c 0,-1 -1,-1 -1,-1 l -14.02177,0 c 0,0 -0.97823,0 -0.97823,1 z' id='path6536' sodipodi:nodetypes='sccscccsscccccccccccc' style='fill:#555555;fill-opacity:1;stroke:none'/>
+    <path inkscape:connector-curvature='0' d='m 367.0002,-157 c -1,0 -1,1 -1,1 l 0,9 c 0,0 0,1 1,1 l 12,0 c 0,0 1,0 1,-1 l 0,-9 c 0,0 0,-1 -1,-1 z m 1,2 10,0 0,7 -10,-0.024 z m -3,10 2e-4,0.99664 16,0 -2e-4,-0.99664 c 0,-1 -1,-1 -1,-1 l -14.02177,0 c 0,0 -0.97823,0 -0.97823,1 z' id='path6536' sodipodi:nodetypes='sccscccsscccccccccccc' style='fill:#555555;fill-opacity:1;stroke:none'/>
   </g>
   <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-124,-457.9967)'/>
   <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-365.0002,159.0033)'/>
diff --git a/Paper/symbolic/devices/media-sim-card-symbolic.svg b/Paper/symbolic/devices/media-sim-card-symbolic.svg
new file mode 100644
index 00000000..35ffc854
--- /dev/null
+++ b/Paper/symbolic/devices/media-sim-card-symbolic.svg
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='media-sim-card-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='51.993586' inkscape:cy='17.99998' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-164.00022' originy='-356.00338' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <metadata id='metadata90'>
+    <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>Paper Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title id='title8473'>Paper Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+    <filter inkscape:collect='always' id='filter7554' style='color-interpolation-filters:sRGB'>
+      <feBlend inkscape:collect='always' id='feBlend7556' in2='BackgroundImage' mode='darken'/>
+    </filter>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-405.00042,139.00338)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-405.00042,139.00338)'>
+    <path inkscape:connector-curvature='0' d='m 409.0002,-136 0,9 c 0,1 1,1 1,1 l 5,0 c 0,0 1,-4e-5 1,-1 l 0,-7 0,-0.0312 -0.0312,-0.0312 -1.90625,-1.90625 -0.0312,-0.0312 -0.0312,0 -5,0 z m 1,5 1,0 0,1 -1,0 z m 2,0 1,0 0,2 -1,0 z m 2,0 1,0 0,1 -1,0 z m -4,2 1,0 0,2 -1,0 z m 4,0 1,0 0,2 -1,0 z m -2,1 1,0 0,1 -1,0 z' id='path6698' sodipodi:nodetypes='csccscccccccccccccccccccccccccccccccccccccc' style='fill:#555555;fill-opacity:1;stroke:none'/>
+    
+  </g>
+  <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-164.00022,-477.99662)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-405.00042,139.00338)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-405.00042,139.00338)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-405.00042,139.00338)'/>
+  <g inkscape:groupmode='layer' id='layer2' inkscape:label='categories' style='display:inline' transform='translate(-164.00022,-327.99662)'/>
+  <g inkscape:groupmode='layer' id='g6058' inkscape:label='apps' style='display:inline' transform='translate(-164.00022,-327.99662)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-405.00042,139.00338)'/>
+</svg>
diff --git a/Paper/symbolic/devices/network-server-symbolic.svg b/Paper/symbolic/devices/network-server-symbolic.svg
new file mode 100644
index 00000000..937a8cb4
--- /dev/null
+++ b/Paper/symbolic/devices/network-server-symbolic.svg
@@ -0,0 +1,38 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='network-server-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='11.999997' inkscape:cy='-2' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-143.99998' originy='-376' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
+  </sodipodi:namedview>
+  <metadata id='metadata90'>
+    <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>Paper Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <title id='title8473'>Paper Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
+    </linearGradient>
+    <filter inkscape:collect='always' id='filter7554' style='color-interpolation-filters:sRGB'>
+      <feBlend inkscape:collect='always' id='feBlend7556' in2='BackgroundImage' mode='darken'/>
+    </filter>
+  </defs>
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-385.00018,159)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-385.00018,159)'>
+    
+    <path inkscape:connector-curvature='0' d='m 389.0002,-159 c 0,0 -2,0 -2,2 l 0,12 0,2 12,0 0,-2 0,-12 c 0,-2 -2,-2 -2,-2 l -8,0 z m 0,2 4,0 4,0 0,12 -7,0 -1,0 0,-1 0,-11 z m 1,1 0,2 2,0 0,-2 -2,0 z' id='path6735' style='fill:#555555;fill-opacity:1;stroke:none'/>
+  </g>
+  <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-143.99998,-458)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-385.00018,159)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-385.00018,159)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-385.00018,159)'/>
+  <g inkscape:groupmode='layer' id='layer2' inkscape:label='categories' style='display:inline' transform='translate(-143.99998,-308)'/>
+  <g inkscape:groupmode='layer' id='g6058' inkscape:label='apps' style='display:inline' transform='translate(-143.99998,-308)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-385.00018,159)'/>
+</svg>
diff --git a/Paper/symbolic/devices/scanner-symbolic.svg b/Paper/symbolic/devices/scanner-symbolic.svg
index d62b9a65..c1c827a0 100644
--- a/Paper/symbolic/devices/scanner-symbolic.svg
+++ b/Paper/symbolic/devices/scanner-symbolic.svg
@@ -1,193 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="scanner-symbolic.svg"
-   inkscape:export-filename="/home/sam/source-symbolic.png"
-   inkscape:export-xdpi="270"
-   inkscape:export-ydpi="270"
-   height="16.000553"
-   id="svg7384"
-   style="enable-background:new"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="16.000002">
-  <sodipodi:namedview
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     bordercolor="#666666"
-     borderlayer="false"
-     borderopacity="1"
-     inkscape:current-layer="layer10"
-     inkscape:cx="8.0000027"
-     inkscape:cy="8.0002766"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     objecttolerance="10"
-     pagecolor="#f7f7f7"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="true"
-     showgrid="false"
-     showguides="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-others="true"
-     inkscape:snap-page="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="705"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1366"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="1">
-    <inkscape:grid
-       color="#000000"
-       dotted="false"
-       empcolor="#0800ff"
-       empopacity="0.4627451"
-       empspacing="4"
-       enabled="true"
-       id="grid4866"
-       opacity="0.16470588"
-       originx="-244.00001"
-       originy="-376.00336"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.25px"
-       spacingy="0.25px"
-       type="xygrid"
-       visible="true" />
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='scanner-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16.000002' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='111.9938' inkscape:cy='-1.9999969' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-104.00001' originy='-376.00336' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
   </sodipodi:namedview>
-  <metadata
-     id="metadata90">
+  <metadata id='metadata90'>
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about=''>
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
         <dc:title>Paper Symbolic Icon Theme</dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <title
-     id="title8473">Paper Symbolic Icon Theme</title>
-  <defs
-     id="defs7386">
-    <linearGradient
-       id="linearGradient5606"
-       osb:paint="solid">
-      <stop
-         id="stop5608"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
+  <title id='title8473'>Paper Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter7554"
-       style="color-interpolation-filters:sRGB">
-      <feBlend
-         inkscape:collect="always"
-         id="feBlend7556"
-         in2="BackgroundImage"
-         mode="darken" />
+    <filter inkscape:collect='always' id='filter7554' style='color-interpolation-filters:sRGB'>
+      <feBlend inkscape:collect='always' id='feBlend7556' in2='BackgroundImage' mode='darken'/>
     </filter>
   </defs>
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-485.00021,159.00391)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline;filter:url(#filter7554)"
-     transform="translate(-485.00021,159.00391)">
-    <rect
-       height="10"
-       id="rect10975"
-       style="opacity:0.35;fill:#555555;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       width="6"
-       x="490.00021"
-       y="-156" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 488.0002,-159.00391 c 0,0 -1,0 -1,1 l 0,5.00391 1.99609,0 0,-4.00391 8,0 0,4.00391 2.00391,0 0,-5.00391 c 0,-1 -1,-1 -1,-1 z m -1,10.00391 0,4.99609 c 0,0 0,1 1,1 l 10,0 c 1,0 1,-1 1,-1 l 0,-4.99609 -2.00391,0 0,3.99609 -8,0 0,-3.99609 z"
-       id="path10961"
-       sodipodi:nodetypes="csccccccsccccssccccccc"
-       style="fill:#555555;fill-opacity:1;stroke:none" />
-    <rect
-       height="2"
-       id="rect10963"
-       style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       width="15.999987"
-       x="485.00021"
-       y="-152" />
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-345.00021,159.00336)'/>
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-345.00021,159.00336)'>
+    
+    <path inkscape:connector-curvature='0' d='m 348.00411,-157.99609 c 0,0 -0.99902,-0.003 -1,1 l -0.004,3.99609 1.99609,0 0.004,-3 8,0 -0.004,3 2.00391,0 0.004,-3.99609 c 9.8e-4,-1.00336 -1,-1 -1,-1 z m -1,7.99609 9e-5,5.00391 c 0,0 0,1 1,1 l 10,0 c 1,0 1,-1 1,-1 l -9e-5,-5.00391 -2.00391,0 9e-5,4 -8,0 -9e-5,-4 z' id='path10961' sodipodi:nodetypes='csccccccsccccssccccccc' style='fill:#555555;fill-opacity:1;stroke:none'/>
+    
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-244.00001,-457.99609)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     style="display:inline"
-     transform="translate(-485.00021,159.00391)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-485.00021,159.00391)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-485.00021,159.00391)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-244.00001,-307.99609)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g6058"
-     inkscape:label="apps"
-     style="display:inline"
-     transform="translate(-244.00001,-307.99609)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-485.00021,159.00391)" />
+  <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-104.00001,-457.99664)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-345.00021,159.00336)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-345.00021,159.00336)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-345.00021,159.00336)'/>
+  <g inkscape:groupmode='layer' id='layer2' inkscape:label='categories' style='display:inline' transform='translate(-104.00001,-307.99664)'/>
+  <g inkscape:groupmode='layer' id='g6058' inkscape:label='apps' style='display:inline' transform='translate(-104.00001,-307.99664)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-345.00021,159.00336)'/>
 </svg>
diff --git a/Paper/symbolic/devices/sim-card-symbolic.svg b/Paper/symbolic/devices/sim-card-symbolic.svg
deleted file mode 100644
index 9e36d4be..00000000
--- a/Paper/symbolic/devices/sim-card-symbolic.svg
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='sim-card-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.48.4 r9939' width='16' xmlns='http://www.w3.org/2000/svg'>
-  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='true' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer10' inkscape:cx='-30.74917' inkscape:cy='6.5522636' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='false' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='false' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='701' inkscape:window-maximized='0' inkscape:window-width='1362' inkscape:window-x='0' inkscape:window-y='28' inkscape:zoom='1'>
-    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-184.00011px' originy='-376.00326px' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
-  </sodipodi:namedview>
-  <metadata id='metadata90'>
-    <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>Paper Symbolic Icon Theme</dc:title>
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <title id='title8473'>Paper Symbolic Icon Theme</title>
-  <defs id='defs7386'>
-    <linearGradient id='linearGradient5606' osb:paint='solid'>
-      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
-    </linearGradient>
-    <filter inkscape:collect='always' color-interpolation-filters='sRGB' id='filter7554'>
-      <feBlend inkscape:collect='always' id='feBlend7556' in2='BackgroundImage' mode='darken'/>
-    </filter>
-  </defs>
-  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-425.00031,159.00326)'/>
-  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-425.00031,159.00326)'>
-    <path inkscape:connector-curvature='0' d='m 431.0002,-158 -4,4 0,9 c 0,1 1,1 1,1 l 10,0 c 0,0 1,-0.003 1,-1 l 0,-12 c 0,-1 -1,-1 -1,-1 z m -2,6 2,0 0,3 -2,0 z m 3,0 2,0 0,2 -2,0 z m 3,0 2,0 0,3 -2,0 z m -3,3 2,0 0,3 -2,0 z m -3,1 2,0 0,2 -2,0 z m 6,0 2,0 0,2 -2,0 z' id='path6222' sodipodi:nodetypes='ccsccsccccccccccccccccccccccccccccccccc' style='fill:#555555;fill-opacity:1;stroke:none'/>
-    
-  </g>
-  <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-184.00011,-457.99674)'/>
-  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-425.00031,159.00326)'/>
-  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-425.00031,159.00326)'/>
-  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-425.00031,159.00326)'/>
-  <g inkscape:groupmode='layer' id='layer2' inkscape:label='categories' style='display:inline' transform='translate(-184.00011,-307.99674)'/>
-  <g inkscape:groupmode='layer' id='g6058' inkscape:label='apps' style='display:inline' transform='translate(-184.00011,-307.99674)'/>
-  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-425.00031,159.00326)'/>
-</svg>
diff --git a/Paper/symbolic/status/touchpad-disabled-symbolic.svg b/Paper/symbolic/status/touchpad-disabled-symbolic.svg
index d2602f51..e73df73f 100644
--- a/Paper/symbolic/status/touchpad-disabled-symbolic.svg
+++ b/Paper/symbolic/status/touchpad-disabled-symbolic.svg
@@ -1,183 +1,39 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg
-   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb"
-   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"
-   sodipodi:docname="touchpad-disabled-symbolic.svg"
-   inkscape:export-filename="/home/sam/source-symbolic.png"
-   inkscape:export-xdpi="270"
-   inkscape:export-ydpi="270"
-   height="16.000002"
-   id="svg7384"
-   style="enable-background:new"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   width="16.008455">
-  <sodipodi:namedview
-     inkscape:bbox-nodes="true"
-     inkscape:bbox-paths="false"
-     bordercolor="#666666"
-     borderlayer="false"
-     borderopacity="1"
-     inkscape:current-layer="layer9"
-     inkscape:cx="8.0042228"
-     inkscape:cy="7.9999979"
-     gridtolerance="10"
-     inkscape:guide-bbox="true"
-     guidetolerance="10"
-     id="namedview88"
-     inkscape:object-nodes="true"
-     inkscape:object-paths="true"
-     objecttolerance="10"
-     pagecolor="#f7f7f7"
-     inkscape:pageopacity="1"
-     inkscape:pageshadow="2"
-     showborder="true"
-     showgrid="false"
-     showguides="true"
-     inkscape:showpageshadow="false"
-     inkscape:snap-bbox="true"
-     inkscape:snap-bbox-edge-midpoints="false"
-     inkscape:snap-bbox-midpoints="true"
-     inkscape:snap-center="false"
-     inkscape:snap-global="true"
-     inkscape:snap-grids="true"
-     inkscape:snap-intersection-paths="true"
-     inkscape:snap-midpoints="true"
-     inkscape:snap-nodes="true"
-     inkscape:snap-object-midpoints="true"
-     inkscape:snap-others="true"
-     inkscape:snap-page="false"
-     inkscape:snap-smooth-nodes="true"
-     inkscape:snap-to-guides="true"
-     inkscape:window-height="705"
-     inkscape:window-maximized="1"
-     inkscape:window-width="1366"
-     inkscape:window-x="0"
-     inkscape:window-y="27"
-     inkscape:zoom="1">
-    <inkscape:grid
-       color="#000000"
-       dotted="false"
-       empcolor="#0800ff"
-       empopacity="0.4627451"
-       empspacing="4"
-       enabled="true"
-       id="grid4866"
-       opacity="0.16470588"
-       originx="-103.99174"
-       originy="-512.00336"
-       snapvisiblegridlinesonly="true"
-       spacingx="0.25px"
-       spacingy="0.25px"
-       type="xygrid"
-       visible="true" />
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:dc='http://purl.org/dc/elements/1.1/' sodipodi:docname='touchpad-disabled-symbolic.svg' inkscape:export-filename='/home/sam/source-symbolic.png' inkscape:export-xdpi='270' inkscape:export-ydpi='270' height='16.000002' id='svg7384' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' xmlns:osb='http://www.openswatchbook.org/uri/2009/osb' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' style='enable-background:new' xmlns:svg='http://www.w3.org/2000/svg' version='1.1' inkscape:version='0.91 r13725' width='16.000191' xmlns='http://www.w3.org/2000/svg'>
+  <sodipodi:namedview inkscape:bbox-nodes='true' inkscape:bbox-paths='false' bordercolor='#666666' borderlayer='false' borderopacity='1' inkscape:current-layer='layer9' inkscape:cx='71.99381' inkscape:cy='-138' gridtolerance='10' inkscape:guide-bbox='true' guidetolerance='10' id='namedview88' inkscape:object-nodes='true' inkscape:object-paths='true' objecttolerance='10' pagecolor='#f7f7f7' inkscape:pageopacity='1' inkscape:pageshadow='2' showborder='true' showgrid='false' showguides='true' inkscape:showpageshadow='false' inkscape:snap-bbox='true' inkscape:snap-bbox-edge-midpoints='false' inkscape:snap-bbox-midpoints='true' inkscape:snap-center='false' inkscape:snap-global='true' inkscape:snap-grids='true' inkscape:snap-intersection-paths='true' inkscape:snap-midpoints='true' inkscape:snap-nodes='true' inkscape:snap-object-midpoints='true' inkscape:snap-others='true' inkscape:snap-page='false' inkscape:snap-smooth-nodes='true' inkscape:snap-to-guides='true' inkscape:window-height='711' inkscape:window-maximized='1' inkscape:window-width='1366' inkscape:window-x='0' inkscape:window-y='27' inkscape:zoom='1'>
+    <inkscape:grid color='#000000' dotted='false' empcolor='#0800ff' empopacity='0.4627451' empspacing='4' enabled='true' id='grid4866' opacity='0.16470588' originx='-144' originy='-512.00336' snapvisiblegridlinesonly='true' spacingx='0.25px' spacingy='0.25px' type='xygrid' visible='true'/>
   </sodipodi:namedview>
-  <metadata
-     id="metadata90">
+  <metadata id='metadata90'>
     <rdf:RDF>
-      <cc:Work
-         rdf:about="">
+      <cc:Work rdf:about=''>
         <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
         <dc:title>Paper Symbolic Icon Theme</dc:title>
       </cc:Work>
     </rdf:RDF>
   </metadata>
-  <title
-     id="title8473">Paper Symbolic Icon Theme</title>
-  <defs
-     id="defs7386">
-    <linearGradient
-       id="linearGradient5606"
-       osb:paint="solid">
-      <stop
-         id="stop5608"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
+  <title id='title8473'>Paper Symbolic Icon Theme</title>
+  <defs id='defs7386'>
+    <linearGradient id='linearGradient5606' osb:paint='solid'>
+      <stop id='stop5608' offset='0' style='stop-color:#000000;stop-opacity:1;'/>
     </linearGradient>
-    <filter
-       inkscape:collect="always"
-       id="filter7554"
-       style="color-interpolation-filters:sRGB">
-      <feBlend
-         inkscape:collect="always"
-         id="feBlend7556"
-         in2="BackgroundImage"
-         mode="darken" />
+    <filter inkscape:collect='always' id='filter7554' style='color-interpolation-filters:sRGB'>
+      <feBlend inkscape:collect='always' id='feBlend7556' in2='BackgroundImage' mode='darken'/>
     </filter>
   </defs>
-  <g
-     inkscape:groupmode="layer"
-     id="layer9"
-     inkscape:label="status"
-     style="display:inline"
-     transform="translate(-344.99194,295.00336)">
-    <path
-       inkscape:connector-curvature="0"
-       d="m 347.0002,-294 c -2.25,10e-6 -2,2 -2,2 l 0,10 c 0,0 0,2 2,2 l 8,0 0,-2 -8,0 0,-10 12,0 0,7 2,0 0,-7 c 0,-2 -2,-2 -2,-2 l -12,0 z"
-       id="path10471"
-       style="opacity:0.35;fill:#555555;fill-opacity:1;stroke:none" />
-    <path
-       inkscape:connector-curvature="0"
-       d="m 356.00039,-284.00336 0,1 c 0,0.27614 0.10029,0.53779 0.28125,0.71875 l 0.78125,0.78125 -0.78125,0.78125 c -0.18096,0.18096 -0.28125,0.44261 -0.28125,0.71875 l 0,1 1,0 c 0.27614,0 0.53779,-0.10029 0.71875,-0.28125 l 0.78125,-0.78125 0.78125,0.78125 c 0.18096,0.18096 0.44261,0.28125 0.71875,0.28125 l 1,0 0,-1 c 0,-0.27614 -0.10029,-0.53779 -0.28125,-0.71875 l -0.78125,-0.78125 0.78125,-0.78125 c 0.18096,-0.18096 0.28125,-0.44261 0.28125,-0.71875 l 0,-1 -1,0 c -0.27614,0 -0.53779,0.10029 -0.71875,0.28125 l -0.78125,0.78125 -0.78125,-0.78125 c -0.18096,-0.18096 -0.44261,-0.28125 -0.71875,-0.28125 l -1,0 z"
-       id="path2987-7-9-8-5-1-5"
-       style="display:inline;fill:#555555;fill-opacity:1;stroke:none;enable-background:new" />
+  <g inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline' transform='translate(-385.0002,295.00336)'>
+    
+    <path inkscape:connector-curvature='0' d='m 386.0002,-293 c -0.9998,0 -1,1 -1,1 l 0,11 c 0,0 0,1 1,1 l 9,0 0,-2 -2,0 0,-3 5,0 2,0 0,-7 c 0,-1 -1,-1 -1,-1 l -13,0 z m 1,2 11,0 0,5 -11,0 0,-5 z m 0,6 5,0 0,3 -5,0 0,-3 z' id='path10471' style='opacity:0.35;fill:#555555;fill-opacity:1;stroke:none'/>
+    <path inkscape:connector-curvature='0' d='m 396.00039,-284.00336 0,1 c 0,0.27614 0.10029,0.53779 0.28125,0.71875 l 0.78125,0.78125 -0.78125,0.78125 c -0.18096,0.18096 -0.28125,0.44261 -0.28125,0.71875 l 0,1 1,0 c 0.27614,0 0.53779,-0.10029 0.71875,-0.28125 l 0.78125,-0.78125 0.78125,0.78125 c 0.18096,0.18096 0.44261,0.28125 0.71875,0.28125 l 1,0 0,-1 c 0,-0.27614 -0.10029,-0.53779 -0.28125,-0.71875 l -0.78125,-0.78125 0.78125,-0.78125 c 0.18096,-0.18096 0.28125,-0.44261 0.28125,-0.71875 l 0,-1 -1,0 c -0.27614,0 -0.53779,0.10029 -0.71875,0.28125 l -0.78125,0.78125 -0.78125,-0.78125 c -0.18096,-0.18096 -0.44261,-0.28125 -0.71875,-0.28125 l -1,0 z' id='path2987-7-9-8-5-1-5' style='display:inline;fill:#555555;fill-opacity:1;stroke:none;enable-background:new'/>
   </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer10"
-     inkscape:label="devices"
-     style="display:inline;filter:url(#filter7554)"
-     transform="translate(-344.99194,295.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="places"
-     style="display:inline"
-     transform="translate(-103.99174,-321.99664)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer14"
-     inkscape:label="mimetypes"
-     style="display:inline"
-     transform="translate(-344.99194,295.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer15"
-     inkscape:label="emblems"
-     style="display:inline"
-     transform="translate(-344.99194,295.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g71291"
-     inkscape:label="emotes"
-     style="display:inline"
-     transform="translate(-344.99194,295.00336)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="categories"
-     style="display:inline"
-     transform="translate(-103.99174,-171.99664)" />
-  <g
-     inkscape:groupmode="layer"
-     id="g6058"
-     inkscape:label="apps"
-     style="display:inline"
-     transform="translate(-103.99174,-171.99664)" />
-  <g
-     inkscape:groupmode="layer"
-     id="layer12"
-     inkscape:label="actions"
-     style="display:inline"
-     transform="translate(-344.99194,295.00336)" />
+  <g inkscape:groupmode='layer' id='layer10' inkscape:label='devices' style='display:inline;filter:url(#filter7554)' transform='translate(-385.0002,295.00336)'/>
+  <g inkscape:groupmode='layer' id='layer1' inkscape:label='places' style='display:inline' transform='translate(-144,-321.99664)'/>
+  <g inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes' style='display:inline' transform='translate(-385.0002,295.00336)'/>
+  <g inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline' transform='translate(-385.0002,295.00336)'/>
+  <g inkscape:groupmode='layer' id='g71291' inkscape:label='emotes' style='display:inline' transform='translate(-385.0002,295.00336)'/>
+  <g inkscape:groupmode='layer' id='layer2' inkscape:label='categories' style='display:inline' transform='translate(-144,-171.99664)'/>
+  <g inkscape:groupmode='layer' id='g6058' inkscape:label='apps' style='display:inline' transform='translate(-144,-171.99664)'/>
+  <g inkscape:groupmode='layer' id='layer12' inkscape:label='actions' style='display:inline' transform='translate(-385.0002,295.00336)'/>
 </svg>
diff --git a/src/symbolic/source-symbolic.svg b/src/symbolic/source-symbolic.svg
index f96cf88c..05815876 100644
--- a/src/symbolic/source-symbolic.svg
+++ b/src/symbolic/source-symbolic.svg
@@ -35,12 +35,12 @@
      id="namedview88"
      showgrid="false"
      inkscape:zoom="1"
-     inkscape:cx="254.5771"
-     inkscape:cy="123.33162"
+     inkscape:cx="151.99998"
+     inkscape:cy="384"
      inkscape:window-x="0"
      inkscape:window-y="27"
      inkscape:window-maximized="1"
-     inkscape:current-layer="layer12"
+     inkscape:current-layer="layer10"
      showborder="true"
      inkscape:snap-nodes="true"
      inkscape:snap-bbox="true"
@@ -4245,11 +4245,10 @@
          id="rect10469"
          style="fill:none;stroke:none;" />
       <path
-         id="path10471"
-         transform="translate(241.0002,-497)"
-         d="m 106,203 c -2.25,1e-5 -2,2 -2,2 l 0,10 c 0,0 0,2 2,2 l 8,0 0,-2 -8,0 0,-10 12,0 0,7 2,0 0,-7 c 0,-2 -2,-2 -2,-2 l -12,0 z"
-         style="opacity:0.35;fill:#555555;fill-opacity:1;stroke:none;"
-         inkscape:connector-curvature="0" />
+         style="opacity:0.35;fill:#555555;fill-opacity:1;stroke:none"
+         d="M 145 204 C 144.0002 204 144 205 144 205 L 144 216 C 144 216 144 217 145 217 L 154 217 L 154 215 L 152 215 L 152 212 L 157 212 L 159 212 L 159 205 C 159 204 158 204 158 204 L 145 204 z M 146 206 L 157 206 L 157 211 L 146 211 L 146 206 z M 146 212 L 151 212 L 151 215 L 146 215 L 146 212 z "
+         transform="translate(201.0002,-497)"
+         id="path10471" />
       <path
          inkscape:connector-curvature="0"
          style="display:inline;fill:#555555;fill-opacity:1;stroke:none;enable-background:new;"
@@ -6156,7 +6155,7 @@
          style="fill:#555555;fill-opacity:1;stroke:none" />
     </g>
     <g
-       transform="matrix(0,1,-1,0,908.0002,-220.00356)"
+       transform="matrix(0,1,-1,0,948.0002,-220.00356)"
        id="g5069"
        inkscape:label="input-touchpad">
       <rect
@@ -6167,11 +6166,12 @@
          x="61.000198"
          y="467" />
       <path
-         sodipodi:nodetypes="scsccscssccccc"
-         inkscape:connector-curvature="0"
+         style="fill:#555555;fill-opacity:1;stroke:none"
+         d="m 185,340 c -1,0 -1,1 -1,1 l 0,11 c 0,0 0,1 1,1 l 13,0 c 0,0 1,0 1,-1 l 0,-11 c 0,-1 -1,-1 -1,-1 z m 1,2 11,0 0,6 -11,0 z m 0,7 5,0 0,2 -5,0 z m 6,0 5,0 0,2 -5,0 z"
+         transform="matrix(0,-1,1,0,-276.99644,667)"
          id="path5073"
-         d="m 63.00356,467 c -1,0 -1,1 -1,1 l 0,14 c 0,1 1,1 1,1 l 12,0 c 0,0 1,0 1,-1 l 0,-14 c 0,0 0,-1 -1,-1 z m 1,2.0002 10,0 0,12 -10,0 z"
-         style="fill:#555555;fill-opacity:1;stroke:none" />
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="sccscsscsccccccccccccccc" />
     </g>
     <text
        xml:space="preserve"
@@ -6223,7 +6223,7 @@
     <g
        id="g5843"
        inkscape:label="camera-web"
-       transform="translate(224.00021,143.99664)">
+       transform="translate(264.00021,143.99664)">
       <rect
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none"
          id="rect6828"
@@ -6302,7 +6302,7 @@
     <g
        id="g6496"
        inkscape:label="input-tablet"
-       transform="translate(-15.999787,-56.003357)">
+       transform="translate(24.000213,-56.003357)">
       <rect
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0;fill:#000000;stroke:none;stroke-width:1.78100002;marker:none;enable-background:new"
          id="rect8534"
@@ -6318,7 +6318,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       transform="translate(525.0004,-435.00336)"
+       transform="translate(565.0004,-435.00336)"
        id="g11537"
        inkscape:label="camera-photo"
        style="display:inline">
@@ -6500,28 +6500,10 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="sccscscssssscsssssss" />
     </g>
-    <g
-       transform="matrix(0,1,-1,0,290.00031,-500.00347)"
-       inkscape:label="sim-card"
-       id="g6220">
-      <path
-         style="fill:#555555;fill-opacity:1;stroke:none"
-         d="m 382.00347,-60.99989 4,4 9,0 c 1,0 1,-1 1,-1 l 0,-10 c 0,0 -0.003,-1 -1,-1 l -12,0 c -1,0 -1,1 -1,1 z m 6,2 0,-2 3,0 0,2 z m 0,-3 0,-2 2,0 0,2 z m 0,-3 0,-2 3,0 0,2 z m 3,3 0,-2 3,0 0,2 z m 1,3 0,-2 2,0 0,2 z m 0,-6 0,-2 2,0 0,2 z"
-         id="path6222"
-         inkscape:connector-curvature="0"
-         sodipodi:nodetypes="ccsccsccccccccccccccccccccccccccccccccc" />
-      <rect
-         y="-71"
-         x="381.00021"
-         height="16"
-         width="16"
-         id="rect6224"
-         style="color:#bebebe;display:inline;overflow:visible;visibility:visible;opacity:0;fill:none;stroke:none;stroke-width:3;marker:none;enable-background:accumulate" />
-    </g>
     <g
        id="g6328"
        inkscape:label="input-gaming"
-       transform="translate(-80,0)">
+       transform="translate(-40,0)">
       <rect
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1.78100002;marker:none;enable-background:new"
          id="rect8414-6"
@@ -6669,7 +6651,7 @@
          inkscape:connector-curvature="0" />
     </g>
     <g
-       transform="matrix(-1,0,0,1,1040.9974,-393)"
+       transform="matrix(-1,0,0,1,1080.9974,-393)"
        inkscape:label="camera-video"
        id="g6908"
        style="display:inline;enable-background:new">
@@ -6719,15 +6701,16 @@
     <g
        id="g10986"
        inkscape:label="input-dialpad"
-       transform="translate(-60,0)">
+       transform="translate(-20,0)">
       <g
          id="g6592"
          inkscape:label="input-dialpad">
         <path
            id="rect6548"
            transform="translate(301.0002,-497)"
-           d="M 147.5 339 C 147.223 339 147 339.223 147 339.5 L 147 341.5 C 147 341.777 147.223 342 147.5 342 L 149.5 342 C 149.777 342 150 341.777 150 341.5 L 150 339.5 C 150 339.223 149.777 339 149.5 339 L 147.5 339 z M 151.5 339 C 151.223 339 151 339.223 151 339.5 L 151 341.5 C 151 341.777 151.223 342 151.5 342 L 153.5 342 C 153.777 342 154 341.777 154 341.5 L 154 339.5 C 154 339.223 153.777 339 153.5 339 L 151.5 339 z M 155.5 339 C 155.223 339 155 339.223 155 339.5 L 155 341.5 C 155 341.777 155.223 342 155.5 342 L 157.5 342 C 157.777 342 158 341.777 158 341.5 L 158 339.5 C 158 339.223 157.777 339 157.5 339 L 155.5 339 z M 147.5 343 C 147.223 343 147 343.223 147 343.5 L 147 345.5 C 147 345.777 147.223 346 147.5 346 L 149.5 346 C 149.777 346 150 345.777 150 345.5 L 150 343.5 C 150 343.223 149.777 343 149.5 343 L 147.5 343 z M 151.5 343 C 151.223 343 151 343.223 151 343.5 L 151 345.5 C 151 345.777 151.223 346 151.5 346 L 153.5 346 C 153.777 346 154 345.777 154 345.5 L 154 343.5 C 154 343.223 153.777 343 153.5 343 L 151.5 343 z M 155.5 343 C 155.223 343 155 343.223 155 343.5 L 155 345.5 C 155 345.777 155.223 346 155.5 346 L 157.5 346 C 157.777 346 158 345.777 158 345.5 L 158 343.5 C 158 343.223 157.777 343 157.5 343 L 155.5 343 z M 147.5 347 C 147.223 347 147 347.223 147 347.5 L 147 349.5 C 147 349.777 147.223 350 147.5 350 L 149.5 350 C 149.777 350 150 349.777 150 349.5 L 150 347.5 C 150 347.223 149.777 347 149.5 347 L 147.5 347 z M 151.5 347 C 151.223 347 151 347.223 151 347.5 L 151 349.5 C 151 349.777 151.223 350 151.5 350 L 153.5 350 C 153.777 350 154 349.777 154 349.5 L 154 347.5 C 154 347.223 153.777 347 153.5 347 L 151.5 347 z M 155.5 347 C 155.223 347 155 347.223 155 347.5 L 155 349.5 C 155 349.777 155.223 350 155.5 350 L 157.5 350 C 157.777 350 158 349.777 158 349.5 L 158 347.5 C 158 347.223 157.777 347 157.5 347 L 155.5 347 z M 151.5 351 C 151.223 351 151 351.223 151 351.5 L 151 353.5 C 151 353.777 151.223 354 151.5 354 L 153.5 354 C 153.777 354 154 353.777 154 353.5 L 154 351.5 C 154 351.223 153.777 351 153.5 351 L 151.5 351 z "
-           style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+           d="m 147.5,339 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m -8,4 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m -8,4 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m 4,0 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z m -4,4 c -0.277,0 -0.5,0.223 -0.5,0.5 l 0,2 c 0,0.277 0.223,0.5 0.5,0.5 l 2,0 c 0.277,0 0.5,-0.223 0.5,-0.5 l 0,-2 c 0,-0.277 -0.223,-0.5 -0.5,-0.5 l -2,0 z"
+           style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+           inkscape:connector-curvature="0" />
         <rect
            y="-461.00354"
            x="-159.0002"
@@ -6811,13 +6794,6 @@
        id="g10980"
        inkscape:label="scanner"
        transform="translate(-140,20)">
-      <rect
-         y="-176"
-         x="490.00021"
-         height="10"
-         width="6"
-         id="rect10975"
-         style="opacity:0.35;fill:#555555;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
       <rect
          transform="scale(-1,-1)"
          y="163.00336"
@@ -6828,12 +6804,12 @@
          style="fill:none;stroke:none" />
       <path
          style="fill:#555555;fill-opacity:1;stroke:none"
-         d="m 489.0002,-179 c 0,0 -2,-0.003 -2,2 l 0,4 1.99609,0 0,-4.00391 8,0 0,4.00391 2.00391,0 0,-4 c 0,-2 -2,-2 -2,-2 z m -2,10 0,4 c 0,0 0,2 2,2 l 8,0 c 2,0 2,-2 2,-2 l 0,-4 -2.00391,0 0,3.99609 -8,0 0,-3.99609 z"
+         d="m 488.00411,-177.99609 c 0,0 -0.99902,-0.003 -1,1 l -0.004,3.99609 1.99609,0 0.004,-3 8,0 -0.004,3 2.00391,0 0.004,-3.99609 c 9.8e-4,-1.00336 -1,-1 -1,-1 z m -1,7.99609 9e-5,5.00391 c 0,0 0,1 1,1 l 10,0 c 1,0 1,-1 1,-1 l -9e-5,-5.00391 -2.00391,0 9e-5,4 -8,0 -9e-5,-4 z"
          id="path10961"
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="csccccccsccccssccccccc" />
       <rect
-         y="-172"
+         y="-173"
          x="485.00021"
          height="2"
          width="15.999987"
@@ -6841,15 +6817,16 @@
          style="opacity:1;fill:#555555;fill-opacity:1;stroke:none;stroke-width:4;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
     </g>
     <g
-       transform="translate(61,0)"
+       transform="translate(101,0)"
        style="display:inline;enable-background:new"
        id="g6100-3-5"
        inkscape:label="input-keyboard">
       <path
          style="fill:#555555;fill-opacity:1;stroke:none"
-         d="M 167 340 C 167 340 165 340 165 342 L 165 350 C 165 352 167 352 167 352 L 178 352 C 178 352 180 352 180 350 L 180 342 C 180 340 178 340 178 340 L 167 340 z M 167.25 342 L 168.75 342 C 168.8885 342 169 342.1115 169 342.25 L 169 343.75 C 169 343.8885 168.8885 344 168.75 344 L 167.25 344 C 167.1115 344 167 343.8885 167 343.75 L 167 342.25 C 167 342.1115 167.1115 342 167.25 342 z M 170.25 342 L 171.75 342 C 171.8885 342 172 342.1115 172 342.25 L 172 343.75 C 172 343.8885 171.8885 344 171.75 344 L 170.25 344 C 170.1115 344 170 343.8885 170 343.75 L 170 342.25 C 170 342.1115 170.1115 342 170.25 342 z M 173.25 342 L 174.75 342 C 174.8885 342 175 342.1115 175 342.25 L 175 343.75 C 175 343.8885 174.8885 344 174.75 344 L 173.25 344 C 173.1115 344 173 343.8885 173 343.75 L 173 342.25 C 173 342.1115 173.1115 342 173.25 342 z M 176.25 342 L 177.75 342 C 177.8885 342 178 342.1115 178 342.25 L 178 343.75 C 178 343.8885 177.8885 344 177.75 344 L 176.25 344 C 176.1115 344 176 343.8885 176 343.75 L 176 342.25 C 176 342.1115 176.1115 342 176.25 342 z M 167.25 345 L 168.75 345 C 168.8885 345 169 345.1115 169 345.25 L 169 346.75 C 169 346.8885 168.8885 347 168.75 347 L 167.25 347 C 167.1115 347 167 346.8885 167 346.75 L 167 345.25 C 167 345.1115 167.1115 345 167.25 345 z M 170.25 345 L 171.75 345 C 171.8885 345 172 345.1115 172 345.25 L 172 346.75 C 172 346.8885 171.8885 347 171.75 347 L 170.25 347 C 170.1115 347 170 346.8885 170 346.75 L 170 345.25 C 170 345.1115 170.1115 345 170.25 345 z M 173.25 345 L 174.75 345 C 174.8885 345 175 345.1115 175 345.25 L 175 346.75 C 175 346.8885 174.8885 347 174.75 347 L 173.25 347 C 173.1115 347 173 346.8885 173 346.75 L 173 345.25 C 173 345.1115 173.1115 345 173.25 345 z M 176.25 345 L 177.75 345 C 177.8885 345 178 345.1115 178 345.25 L 178 346.75 C 178 346.8885 177.8885 347 177.75 347 L 176.25 347 C 176.1115 347 176 346.8885 176 346.75 L 176 345.25 C 176 345.1115 176.1115 345 176.25 345 z M 169.25 348 L 175.75 348 C 175.8885 348 176 348.1115 176 348.25 L 176 349.75 C 176 349.8885 175.8885 350 175.75 350 L 169.25 350 C 169.1115 350 169 349.8885 169 349.75 L 169 348.25 C 169 348.1115 169.1115 348 169.25 348 z "
+         d="m 167,340 c 0,0 -2,0 -2,2 l 0,8 c 0,2 2,2 2,2 l 11,0 c 0,0 2,0 2,-2 l 0,-8 c 0,-2 -2,-2 -2,-2 l -11,0 z m 0.25,2 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m 3,0 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m 3,0 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m 3,0 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m -9,3 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m 3,0 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m 3,0 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m 3,0 1.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -1.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z m -7,3 6.5,0 c 0.1385,0 0.25,0.1115 0.25,0.25 l 0,1.5 c 0,0.1385 -0.1115,0.25 -0.25,0.25 l -6.5,0 c -0.1385,0 -0.25,-0.1115 -0.25,-0.25 l 0,-1.5 c 0,-0.1385 0.1115,-0.25 0.25,-0.25 z"
          transform="translate(180.0002,-497)"
-         id="rect6069-5-5" />
+         id="rect6069-5-5"
+         inkscape:connector-curvature="0" />
       <rect
          y="-159.00336"
          x="345.00021"
@@ -6937,7 +6914,8 @@
     </g>
     <g
        id="g6848"
-       inkscape:label="input-mouse">
+       inkscape:label="input-mouse"
+       transform="translate(40,0)">
       <rect
          style="fill:none;stroke:none"
          id="rect7307"
@@ -6979,7 +6957,7 @@
        style="display:inline"
        inkscape:label="camera-photo"
        id="g6754"
-       transform="translate(525.0004,-435.00336)">
+       transform="translate(565.0004,-435.00336)">
       <rect
          transform="scale(-1,1)"
          style="color:#bebebe;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none"
@@ -7022,6 +7000,46 @@
          inkscape:connector-curvature="0"
          sodipodi:nodetypes="sccscccsscccccccccccc" />
     </g>
+    <g
+       transform="translate(62.00021,103.99662)"
+       inkscape:label="media-sim-card"
+       id="g6696">
+      <path
+         style="fill:#555555;fill-opacity:1;stroke:none"
+         d="m 108,401 0,9 c 0,1 1,1 1,1 l 5,0 c 0,0 1,-4e-5 1,-1 l 0,-7 0,-0.0312 -0.0312,-0.0312 -1.90625,-1.90625 -0.0312,-0.0312 -0.0312,0 -5,0 z m 1,5 1,0 0,1 -1,0 z m 2,0 1,0 0,2 -1,0 z m 2,0 1,0 0,1 -1,0 z m -4,2 1,0 0,2 -1,0 z m 4,0 1,0 0,2 -1,0 z m -2,1 1,0 0,1 -1,0 z"
+         transform="translate(238.99999,-640.99662)"
+         id="path6698"
+         inkscape:connector-curvature="0"
+         sodipodi:nodetypes="csccscccccccccccccccccccccccccccccccccccccc" />
+      <rect
+         style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:2;marker:none;enable-background:new"
+         id="rect6701"
+         width="16"
+         height="16"
+         x="343.00021"
+         y="-243"
+         rx="0"
+         ry="0" />
+    </g>
+    <g
+       style="display:inline;enable-background:new"
+       inkscape:label="network-server"
+       id="g6731"
+       transform="translate(120,232)">
+      <rect
+         y="-281.00018"
+         x="-391"
+         height="16"
+         width="16"
+         id="rect6733"
+         style="color:#dddddd;display:inline;overflow:visible;visibility:visible;fill:none;stroke:none;stroke-width:1;marker:none"
+         transform="matrix(0,1,-1,0,0,0)" />
+      <path
+         style="fill:#555555;fill-opacity:1;stroke:none"
+         d="M 148 338 C 148 338 146 338 146 340 L 146 352 L 146 354 L 158 354 L 158 352 L 158 340 C 158 338 156 338 156 338 L 148 338 z M 148 340 L 152 340 L 156 340 L 156 352 L 149 352 L 148 352 L 148 351 L 148 340 z M 149 341 L 149 343 L 151 343 L 151 341 L 149 341 z "
+         transform="translate(121.0002,-729)"
+         id="path6735" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"