diff --git a/README.md b/README.md
index a75440a..7aa6766 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Tootle
-
+![tootle_pres-16](https://user-images.githubusercontent.com/37731582/39933812-45d8149a-5544-11e8-9bf4-6d78b1fdb29c.png)
 Simple [Mastodon](https://github.com/tootsuite/mastodon) client designed for elementary OS.
 
 ![Tootle Screenshot](https://raw.githubusercontent.com/bleakgrey/tootle/master/data/screenshot.png)
diff --git a/data/icons/128/128x128.svg b/data/icons/128/128x128.svg
new file mode 100644
index 0000000..9162034
--- /dev/null
+++ b/data/icons/128/128x128.svg
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg4379" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" sodipodi:docname="128.svg" inkscape:version="0.91 r13725"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="128px" height="128px"
+	 viewBox="0 0 128 128" enable-background="new 0 0 128 128" xml:space="preserve">
+<radialGradient id="path3041_1_" cx="-292.7208" cy="1871.6008" r="35.3381" gradientTransform="matrix(1.5564 0 0 -0.1698 519.5884 435.7747)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#000000"/>
+	<stop  offset="1" style="stop-color:#000000;stop-opacity:0"/>
+</radialGradient>
+<path id="path3041" opacity="0.2" fill="url(#path3041_1_)" enable-background="new    " d="M119,118
+	c-0.006,3.314-24.635,5.999-55.01,5.999C33.622,123.998,9.006,121.313,9,118c-0.006-3.314,24.614-6.001,54.99-6.001
+	c30.376-0.001,55.005,2.685,55.01,5.999C119,117.999,119,117.999,119,118z"/>
+<g id="g2036" transform="matrix(2.6999989,0,0,0.55555607,-0.8000019,94.888882)">
+	<g id="g3712" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)" opacity="0.4">
+		
+			<radialGradient id="rect2801_1_" cx="-136.6434" cy="5007.957" r="2.4994" gradientTransform="matrix(5.695 0 0 -1 816.1725 5051.457)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect2801" x="38" y="40" fill="url(#rect2801_1_)" width="5" height="7"/>
+		
+			<radialGradient id="rect3696_1_" cx="-165.4541" cy="6006.0449" r="2.4994" gradientTransform="matrix(-5.695 0 0 1 -932.2481 -5962.5449)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect3696" x="5" y="40" fill="url(#rect3696_1_)" width="5" height="7"/>
+		
+			<linearGradient id="rect3700_1_" gradientUnits="userSpaceOnUse" x1="-115.496" y1="4803.4004" x2="-115.496" y2="4810.4287" gradientTransform="matrix(2.8421 0 0 -0.7143 352.2516 3478.0276)">
+			<stop  offset="0" style="stop-color:#181818;stop-opacity:0"/>
+			<stop  offset="0.5" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</linearGradient>
+		<rect id="rect3700" x="10" y="40" fill="url(#rect3700_1_)" width="28" height="7"/>
+	</g>
+</g>
+<radialGradient id="SVGID_1_" cx="-42.2709" cy="69.1949" r="322.7202" fx="-55.7745" fy="69.1949" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#9BAEC8"/>
+	<stop  offset="0.4576" style="stop-color:#8093AA"/>
+	<stop  offset="1" style="stop-color:#273445"/>
+</radialGradient>
+<path fill="url(#SVGID_1_)" d="M115.5,21.55v90.9c0,3.34-2.71,6.05-6.05,6.05h-90.9c-3.34,0-6.05-2.71-6.05-6.05v-90.9
+	c0-3.34,2.71-6.05,6.05-6.05h90.9C112.79,15.5,115.5,18.21,115.5,21.55z"/>
+<linearGradient id="rect6741-7_1_" gradientUnits="userSpaceOnUse" x1="-329.085" y1="3929.1445" x2="-329.085" y2="3891.1445" gradientTransform="matrix(2.7297 0 0 -2.7297 962.313 10740.0137)">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.0632" style="stop-color:#FFFFFF;stop-opacity:0.2353"/>
+	<stop  offset="0.9506" style="stop-color:#FFFFFF;stop-opacity:0.1569"/>
+	<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.3922"/>
+</linearGradient>
+<path id="rect6741-7" opacity="0.3" fill="none" stroke="url(#rect6741-7_1_)" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M18.5,15.875h91c2.761,0,5,2.239,5,5v91c0,2.761-2.239,5-5,5h-91c-2.761,0-5-2.239-5-5v-91C13.5,18.114,15.739,15.875,18.5,15.875z"
+	/>
+<path id="rect5505-21-6" opacity="0.5" fill="none" stroke="#0E141F" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M18.5,15.5h91c3.314,0,6,2.686,6,6v91c0,3.314-2.686,6-6,6h-91c-3.314,0-6-2.686-6-6v-91C12.5,18.186,15.186,15.5,18.5,15.5z"/>
+<path opacity="0.5" fill="#273445" d="M115.5,50.65v61.8c0,3.34-2.71,6.05-6.05,6.05H51.31L24.13,92.02l-0.08-0.08v-0.01
+	c-0.02-0.02-0.03-0.04-0.05-0.05l-5.5-10.54c-0.12-0.31,0.01-0.66,0.31-0.82c0.14-0.07,0.29-0.09,0.42-0.06c0.02,0,0.03,0,0.04,0.01
+	l5.02,1.09l1.18-0.62l0.89-0.46l12.63-6.6c0.08-0.04,0.17-0.09,0.25-0.13l6.18-3.22l-1-1.91c-0.41-0.79-0.29-1.72,0.23-2.38
+	l-3.46-3.34c-0.1-0.08-0.19-0.17-0.28-0.27c-0.17-0.19-0.31-0.39-0.43-0.62c-0.77-1.47-0.2-3.27,1.27-4.04l16.81-8.77
+	c1.11-0.58,2.42-0.39,3.32,0.38l0.26,0.25l8.04,7.77l4.36-2.27c0.08-0.05,0.17-0.09,0.25-0.14l12.83-6.7l6.47-15.51
+	c0.01-0.03,0.02-0.06,0.04-0.08c0.12-0.28,0.34-0.52,0.63-0.68c0.5-0.26,1.08-0.2,1.51,0.11L115.5,50.65z"/>
+<path fill="#FFFFFF" d="M108.571,55.606l-11.964-22.92c-0.018-0.027-0.034-0.051-0.055-0.075c-0.082-0.106-0.178-0.199-0.284-0.275
+	c-0.426-0.311-1.007-0.375-1.507-0.114c-0.293,0.155-0.511,0.396-0.636,0.678c-0.018,0.025-0.026,0.054-0.037,0.083l-6.467,15.511
+	l-12.831,6.699c-0.084,0.044-0.171,0.088-0.251,0.134l-4.363,2.278l-3.801,1.984l-0.994-1.905c-0.564-1.079-1.89-1.496-2.969-0.932
+	c-1.077,0.562-1.496,1.89-0.932,2.969l0.994,1.905l-3.672,1.917l-3.172-6.075l5.693-2.971c1.461-0.765,2.029-2.571,1.266-4.032
+	c-0.123-0.238-0.274-0.45-0.449-0.638l-0.259-0.251c-0.899-0.769-2.213-0.958-3.323-0.378l-16.812,8.775
+	c-1.463,0.765-2.031,2.571-1.268,4.034c0.12,0.229,0.265,0.437,0.433,0.62c0.087,0.099,0.182,0.192,0.282,0.273
+	c0.899,0.764,2.208,0.951,3.318,0.371l5.691-2.969l3.17,6.075l-4.054,2.116l-0.994-1.905c-0.564-1.077-1.894-1.494-2.969-0.932
+	c-0.284,0.148-0.521,0.349-0.709,0.585c-0.52,0.66-0.639,1.589-0.225,2.384l0.994,1.905l-6.172,3.223
+	c-0.084,0.042-0.169,0.086-0.253,0.13l-14.7,7.674l-5.016-1.089c-0.014-0.004-0.027-0.006-0.038-0.008
+	c-0.139-0.027-0.289-0.006-0.424,0.063c-0.3,0.157-0.428,0.511-0.309,0.818l5.501,10.535c0.014,0.02,0.028,0.04,0.043,0.058
+	l0.007,0.009l0.08,0.075c0.195,0.162,0.476,0.198,0.718,0.073c0.135-0.072,0.234-0.181,0.293-0.312
+	c0.007-0.011,0.011-0.023,0.015-0.036l2.014-4.828l5.884-3.073c0.023,1.672,0.427,3.363,1.253,4.946
+	c2.823,5.406,9.497,7.502,14.906,4.679c0.084-0.044,0.169-0.088,0.251-0.134l6.172-3.223l1.154,2.211
+	c0.562,1.077,1.894,1.494,2.969,0.932c1.077-0.562,1.496-1.892,0.934-2.969l-1.154-2.209l4.054-2.118l3.367,6.448
+	c0.784,1.501,2.632,2.082,4.133,1.298c0.42-0.217,0.768-0.521,1.029-0.875c0.688-0.914,0.831-2.177,0.267-3.258l-3.364-6.448
+	l3.672-1.917l1.154,2.209c0.562,1.077,1.892,1.496,2.969,0.934c1.079-0.564,1.494-1.894,0.932-2.969l-1.154-2.211l8.517-4.446
+	c0.588-0.314,1.135-0.675,1.642-1.075c4.085-3.225,5.435-8.995,2.94-13.776c-0.825-1.581-1.982-2.879-3.34-3.855l4.014-2.095
+	l16.518,3.58c0.031,0.008,0.059,0.017,0.088,0.019c0.305,0.058,0.627,0.019,0.92-0.136C108.55,57.044,108.829,56.275,108.571,55.606
+	z M46.51,88.011c-0.038,0.023-0.073,0.042-0.113,0.062c-2.431,1.269-5.427,0.329-6.697-2.102c-1.267-2.429-0.329-5.425,2.098-6.694
+	l6.432-3.357l4.592,8.797L46.51,88.011z M56.724,82.679l-4.592-8.797l0.269-0.139l3.786-1.977l4.592,8.797l-0.864,0.451
+	L56.724,82.679z M66.209,77.729l-4.592-8.797l3.672-1.917l4.592,8.797L66.209,77.729z M81.444,69.766
+	c-0.053,0.034-0.109,0.067-0.164,0.095l-7.498,3.915l-4.592-8.797l5.591-2.92l1.792-0.934c0.095-0.049,0.191-0.095,0.289-0.139
+	c2.374-1.056,5.189-0.094,6.408,2.241c1.075,2.056,0.567,4.516-1.086,5.995C81.958,69.421,81.712,69.605,81.444,69.766z"/>
+</svg>
diff --git a/data/icons/128/com.github.bleakgrey.tootle.svg b/data/icons/128/com.github.bleakgrey.tootle.svg
deleted file mode 100644
index 14e925c..0000000
--- a/data/icons/128/com.github.bleakgrey.tootle.svg
+++ /dev/null
@@ -1,296 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4379"
-   height="128"
-   width="128"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="128.svg">
-  <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="1017"
-     id="namedview51"
-     showgrid="true"
-     inkscape:zoom="4"
-     inkscape:cx="45.346028"
-     inkscape:cy="58.167351"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4379">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4190"
-       empspacing="4" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4192"
-       spacingx="0.5"
-       spacingy="0.5"
-       empspacing="2"
-       color="#ff3fff"
-       opacity="0.1254902"
-       empcolor="#3fffff"
-       empopacity="0.10196078" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4381">
-    <linearGradient
-       gradientTransform="matrix(0.89553576,0,0,-0.89663265,6.6836208,69.705837)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4113"
-       id="linearGradient3149"
-       y2="3.4508991"
-       x2="76.523361"
-       y1="-9.023138"
-       x1="76.523361" />
-    <linearGradient
-       id="linearGradient4113">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4115" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop4117" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(2.7297298,0,0,2.7297298,-1.5135124,1.486514)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3924-776"
-       id="linearGradient3159"
-       y2="43"
-       x2="23.99999"
-       y1="4.999989"
-       x1="23.99999" />
-    <linearGradient
-       id="linearGradient3924-776">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3124" />
-      <stop
-         offset="0.06316455"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop3126" />
-      <stop
-         offset="0.95056331"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop3128" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop3130" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0,25.083279,-30.794253,0,372.81658,-208.0918)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
-       id="radialGradient3395"
-       fy="9.9571075"
-       fx="6.2001843"
-       r="12.671875"
-       cy="9.9571075"
-       cx="6.7304144" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#95a3ab;stop-opacity:1"
-         id="stop3750-1-0-7-6-6-1-3-9-3" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#667885;stop-opacity:1"
-         id="stop3752-3-7-4-0-32-8-923-0-7" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#485a6c;stop-opacity:1"
-         id="stop3754-1-8-5-2-7-6-7-1-9" />
-      <stop
-         offset="1"
-         style="stop-color:#273445;stop-opacity:1"
-         id="stop3756-1-6-2-6-6-1-96-6-0" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-5"
-       id="radialGradient2455-1"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-166-749-5">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2883-0" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2885-5" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-8"
-       id="radialGradient2457-5"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-464-309-8">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2889-9" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2891-4" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-501-757-0"
-       id="linearGradient2459-7"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-501-757-0">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2895-0" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2897-2" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2899-6" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3811">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop3813" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop3815" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(1.5563924,0,0,0.16978827,70.270358,102.13029)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3811"
-       id="radialGradient4377"
-       fy="93.467628"
-       fx="-4.0287771"
-       r="35.338131"
-       cy="93.467628"
-       cx="-4.0287771" />
-  </defs>
-  <metadata
-     id="metadata4384">
-    <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>
-  <g
-     id="g4179">
-    <path
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient4377);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
-       id="path3041"
-       d="M 119,118 A 55,6 0 0 1 9.0000016,118 55,6 0 1 1 119,118 Z" />
-    <g
-       style="display:inline"
-       id="g2036"
-       transform="matrix(2.6999989,0,0,0.55555607,-0.8000019,94.888882)">
-      <g
-         style="opacity:0.4"
-         id="g3712"
-         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
-        <rect
-           style="fill:url(#radialGradient2455-1);fill-opacity:1;stroke:none"
-           id="rect2801"
-           y="40"
-           x="38"
-           height="7"
-           width="5" />
-        <rect
-           style="fill:url(#radialGradient2457-5);fill-opacity:1;stroke:none"
-           id="rect3696"
-           transform="scale(-1,-1)"
-           y="-47"
-           x="-10"
-           height="7"
-           width="5" />
-        <rect
-           style="fill:url(#linearGradient2459-7);fill-opacity:1;stroke:none"
-           id="rect3700"
-           y="40"
-           x="10"
-           height="7.0000005"
-           width="28" />
-      </g>
-    </g>
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3395);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-       id="rect5505-21-3"
-       y="15.5"
-       x="12.5"
-       ry="6.0545406"
-       rx="6.0545406"
-       height="103"
-       width="103" />
-    <rect
-       style="opacity:0.3;fill:none;stroke:url(#linearGradient3159);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect6741-7"
-       y="16.5"
-       x="13.5"
-       ry="5"
-       rx="5"
-       height="101"
-       width="101" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0e141f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect5505-21-6"
-       y="15.5"
-       x="12.5"
-       ry="6"
-       rx="6"
-       height="103"
-       width="103" />
-  </g>
-</svg>
diff --git a/data/icons/16/16x16.svg b/data/icons/16/16x16.svg
new file mode 100644
index 0000000..400733a
--- /dev/null
+++ b/data/icons/16/16x16.svg
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg4372" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" inkscape:version="0.91 r13725" sodipodi:docname="16.svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="16px" height="16px"
+	 viewBox="0 0 16 16" enable-background="new 0 0 16 16" xml:space="preserve">
+<sodipodi:namedview  inkscape:zoom="32" objecttolerance="10" bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" showgrid="true" pagecolor="#ffffff" inkscape:cx="6.2006547" inkscape:cy="5.2070694" id="namedview23" inkscape:current-layer="svg4372" inkscape:window-height="1017" inkscape:window-y="30" inkscape:window-x="0" inkscape:window-maximized="1" inkscape:pageopacity="0" inkscape:window-width="1920" inkscape:pageshadow="2">
+	<inkscape:grid  type="xygrid" empspacing="4" id="grid4151"></inkscape:grid>
+	
+		<inkscape:grid  type="xygrid" color="#ff00ff" opacity="0.2627451" spacingy="0.5" empopacity="0" empcolor="#ff3fff" empspacing="4" spacingx="0.5" id="grid4153">
+		</inkscape:grid>
+</sodipodi:namedview>
+<radialGradient id="SVGID_1_" cx="-5.4128" cy="8.277" r="40.7317" fx="-7.1172" fy="8.277" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#95A3AB"/>
+	<stop  offset="0.2624" style="stop-color:#9BAEC8"/>
+	<stop  offset="0.705" style="stop-color:#8093AA"/>
+	<stop  offset="1" style="stop-color:#273445"/>
+</radialGradient>
+<path fill="url(#SVGID_1_)" d="M14.5,2.5v11c0,0.52-0.4,0.94-0.9,0.99c-0.03,0.01-0.07,0.01-0.1,0.01h-11c-0.55,0-1-0.45-1-1v-11
+	c0-0.55,0.45-1,1-1h11C14.05,1.5,14.5,1.95,14.5,2.5z"/>
+<linearGradient id="rect6741-0-3-5_1_" gradientUnits="userSpaceOnUse" x1="502.1291" y1="2616.1348" x2="502.1291" y2="2578.1348" gradientTransform="matrix(0.2973 0 0 -0.2973 -141.2816 780.1212)">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.0632" style="stop-color:#FFFFFF;stop-opacity:0.2353"/>
+	<stop  offset="0.9506" style="stop-color:#FFFFFF;stop-opacity:0.1569"/>
+	<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.3922"/>
+</linearGradient>
+<rect id="rect6741-0-3-5" x="2.5" y="2.5" opacity="0.3" fill="none" stroke="url(#rect6741-0-3-5_1_)" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " width="11" height="11"/>
+<path id="rect5505-21-2-8" opacity="0.5" fill="none" stroke="#0E141F" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M2.5,1.5h11c0.552,0,1,0.448,1,1v11c0,0.552-0.448,1-1,1h-11c-0.552,0-1-0.448-1-1v-11C1.5,1.948,1.948,1.5,2.5,1.5z"/>
+<path opacity="0.5" fill="#273445" d="M14.5,6.56v6.94c0,0.52-0.4,0.94-0.9,0.99H6.77l-3.23-3.14v-0.01c-0.01,0-0.01,0-0.01,0
+	l-0.3-0.58l-0.35-0.68c-0.01-0.03,0-0.07,0.04-0.09c0.02-0.01,0.03-0.01,0.05-0.01l0.26,0.06l0.33,0.07l0.15-0.07l0.11-0.06
+	l1.49-0.77c0.01-0.02,0.02-0.02,0.03-0.02l0.73-0.38L5.95,8.58C5.9,8.48,5.92,8.37,5.98,8.29L5.57,7.9L5.54,7.87
+	C5.52,7.85,5.5,7.82,5.48,7.79C5.4,7.62,5.46,7.41,5.63,7.32l2-1.04c0.13-0.07,0.29-0.05,0.4,0.05l0.02,0.02l0.96,0.92l0.51-0.26
+	C9.53,7,9.54,7,9.55,6.99l1.52-0.8l0.77-1.84c0.01-0.04,0.05-0.06,0.07-0.09c0.06-0.03,0.14-0.02,0.19,0.02L14.5,6.56z"/>
+<path fill="#FFFFFF" d="M13.555,7.038l-1.418-2.716c-0.002-0.003-0.004-0.006-0.007-0.009c-0.01-0.013-0.021-0.024-0.034-0.033
+	c-0.05-0.037-0.119-0.044-0.179-0.014c-0.035,0.018-0.061,0.047-0.075,0.08c-0.002,0.003-0.003,0.006-0.004,0.01l-0.766,1.838
+	L9.551,6.989c-0.01,0.005-0.02,0.01-0.03,0.016l-0.517,0.27L8.554,7.51L8.436,7.284c-0.067-0.128-0.224-0.177-0.352-0.11
+	C7.957,7.24,7.907,7.397,7.974,7.525l0.118,0.226L7.656,7.978l-0.376-0.72l0.675-0.352c0.173-0.091,0.24-0.305,0.15-0.478
+	C8.091,6.4,8.073,6.375,8.052,6.353l-0.031-0.03C7.915,6.232,7.759,6.21,7.627,6.278l-1.992,1.04
+	c-0.173,0.091-0.241,0.305-0.15,0.478C5.499,7.823,5.516,7.848,5.536,7.87c0.01,0.012,0.022,0.023,0.033,0.032
+	c0.107,0.091,0.262,0.113,0.393,0.044l0.674-0.352l0.376,0.72l-0.48,0.251L6.415,8.339C6.348,8.212,6.19,8.162,6.063,8.229
+	C6.029,8.246,6.001,8.27,5.979,8.298C5.917,8.376,5.903,8.486,5.952,8.581L6.07,8.806L5.338,9.188c-0.01,0.005-0.02,0.01-0.03,0.015
+	l-1.742,0.909L2.972,9.984C2.97,9.984,2.968,9.983,2.967,9.983C2.951,9.98,2.933,9.982,2.917,9.991
+	c-0.036,0.019-0.051,0.061-0.037,0.097l0.652,1.249c0.002,0.002,0.003,0.005,0.005,0.007l0.001,0.001l0.009,0.009
+	c0.023,0.019,0.056,0.023,0.085,0.009c0.016-0.008,0.028-0.021,0.035-0.037c0.001-0.001,0.001-0.003,0.002-0.004l0.239-0.572
+	l0.697-0.364c0.003,0.198,0.051,0.399,0.148,0.586c0.335,0.641,1.126,0.889,1.767,0.555c0.01-0.005,0.02-0.01,0.03-0.016
+	l0.731-0.382l0.137,0.262c0.067,0.128,0.225,0.177,0.352,0.11c0.128-0.067,0.177-0.224,0.111-0.352l-0.137-0.262l0.48-0.251
+	l0.399,0.764c0.093,0.178,0.312,0.247,0.49,0.154c0.05-0.026,0.091-0.062,0.122-0.104c0.082-0.108,0.098-0.258,0.032-0.386
+	l-0.399-0.764l0.435-0.227l0.137,0.262c0.067,0.128,0.224,0.177,0.352,0.111c0.128-0.067,0.177-0.225,0.11-0.352L9.765,9.83
+	l1.009-0.527c0.07-0.037,0.135-0.08,0.195-0.127c0.484-0.382,0.644-1.066,0.348-1.633c-0.098-0.187-0.235-0.341-0.396-0.457
+	l0.476-0.248l1.958,0.424c0.004,0.001,0.007,0.002,0.01,0.002c0.036,0.007,0.074,0.002,0.109-0.016
+	C13.552,7.208,13.585,7.117,13.555,7.038z M6.2,10.878c-0.004,0.003-0.009,0.005-0.013,0.007c-0.288,0.15-0.643,0.039-0.794-0.249
+	c-0.15-0.288-0.039-0.643,0.249-0.793l0.762-0.398l0.544,1.043L6.2,10.878z M7.41,10.246L6.866,9.204l0.032-0.016l0.449-0.234
+	l0.544,1.043l-0.102,0.053L7.41,10.246z M8.534,9.66L7.99,8.617L8.425,8.39l0.544,1.043L8.534,9.66z M10.34,8.716
+	c-0.006,0.004-0.013,0.008-0.019,0.011L9.432,9.191L8.888,8.148L9.55,7.802l0.212-0.111C9.774,7.686,9.785,7.68,9.797,7.675
+	c0.281-0.125,0.615-0.011,0.759,0.266c0.127,0.244,0.067,0.535-0.129,0.71C10.401,8.675,10.372,8.697,10.34,8.716z"/>
+</svg>
diff --git a/data/icons/16/com.github.bleakgrey.tootle.svg b/data/icons/16/com.github.bleakgrey.tootle.svg
deleted file mode 100644
index ef5497a..0000000
--- a/data/icons/16/com.github.bleakgrey.tootle.svg
+++ /dev/null
@@ -1,153 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   width="16"
-   height="16"
-   id="svg4372"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="16.svg">
-  <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="1017"
-     id="namedview23"
-     showgrid="true"
-     inkscape:zoom="32"
-     inkscape:cx="6.2006547"
-     inkscape:cy="5.2070694"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4372">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4151"
-       empspacing="4" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4153"
-       spacingy="0.5"
-       spacingx="0.5"
-       empspacing="4"
-       color="#ff00ff"
-       opacity="0.2627451"
-       empcolor="#ff3fff"
-       empopacity="0" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4374">
-    <linearGradient
-       x1="23.99999"
-       y1="4.999989"
-       x2="23.99999"
-       y2="43"
-       id="linearGradient3304"
-       xlink:href="#linearGradient3924-4-8"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.2972973,0,0,0.2972973,0.86486906,0.8648672)" />
-    <linearGradient
-       id="linearGradient3924-4-8">
-      <stop
-         id="stop3926-0-4"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3928-6-8"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.06316455" />
-      <stop
-         id="stop3930-2-1"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.95056331" />
-      <stop
-         id="stop3932-9-0"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
-      <stop
-         id="stop3750-1-0-7-6-6-1-3-9-3"
-         style="stop-color:#95a3ab;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-7-4-0-32-8-923-0-7"
-         style="stop-color:#667885;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1-8-5-2-7-6-7-1-9"
-         style="stop-color:#485a6c;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-1-6-2-6-6-1-96-6-0"
-         style="stop-color:#273445;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="6.7304144"
-       cy="9.9571075"
-       r="12.671875"
-       fx="6.2001843"
-       fy="9.9571075"
-       id="radialGradient4370"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,3.1658508,-3.8866533,0,46.976839,-26.720326)" />
-  </defs>
-  <metadata
-     id="metadata4377">
-    <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>
-  <g
-     id="layer1"
-     transform="translate(-1.4305115e-6,1.5497208e-6)">
-    <rect
-       width="13.000003"
-       height="13.000003"
-       rx="1"
-       ry="1"
-       x="1.5"
-       y="1.499997"
-       id="rect5505-21-2"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4370);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
-    <rect
-       width="11"
-       height="11"
-       x="2.5"
-       y="2.4999969"
-       id="rect6741-0-3-5"
-       style="opacity:0.3;fill:none;stroke:url(#linearGradient3304);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <rect
-       width="13.000003"
-       height="13.000003"
-       rx="1"
-       ry="1"
-       x="1.5"
-       y="1.499997"
-       id="rect5505-21-2-8"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0e141f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/data/icons/24/24x24.svg b/data/icons/24/24x24.svg
new file mode 100644
index 0000000..c7fe901
--- /dev/null
+++ b/data/icons/24/24x24.svg
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg4157" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" inkscape:version="0.91 r13725" sodipodi:docname="24.svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="24px" height="24px"
+	 viewBox="0 0 24 24" enable-background="new 0 0 24 24" xml:space="preserve">
+<sodipodi:namedview  inkscape:zoom="16" objecttolerance="10" bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" showgrid="true" pagecolor="#ffffff" inkscape:cx="13.796158" inkscape:cy="9.3530973" id="namedview46" inkscape:current-layer="svg4157" inkscape:window-height="1017" inkscape:window-y="30" inkscape:window-x="0" inkscape:window-maximized="1" inkscape:pageopacity="0" inkscape:window-width="1920" inkscape:pageshadow="2">
+	<inkscape:grid  type="xygrid" empspacing="4" id="grid4179"></inkscape:grid>
+	
+		<inkscape:grid  type="xygrid" color="#ff3fff" opacity="0.1254902" spacingy="0.5" empopacity="0.11764706" empcolor="#3ff9ff" empspacing="2" spacingx="0.5" id="grid4181">
+		</inkscape:grid>
+</sodipodi:namedview>
+<g id="g2036-4" transform="matrix(0.55,0,0,0.3333336,-1.2000011,7.33333)">
+	<g id="g3712-8" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)" opacity="0.4">
+		
+			<radialGradient id="rect2801-6_1_" cx="-410.7503" cy="7665.8701" r="2.4994" gradientTransform="matrix(1.1601 0 0 -0.6 514.4986 4643.021)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect2801-6" x="38" y="40" fill="url(#rect2801-6_1_)" width="5" height="7"/>
+		
+			<radialGradient id="rect3696-20_1_" cx="-1259.9097" cy="10842.7783" r="2.4994" gradientTransform="matrix(-1.1601 0 0 0.6 -1451.5964 -6462.1655)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect3696-20" x="5" y="40" fill="url(#rect3696-20_1_)" width="5" height="7"/>
+		
+			<linearGradient id="rect3700-5_1_" gradientUnits="userSpaceOnUse" x1="48.2663" y1="7022.2568" x2="48.2663" y2="7029.2852" gradientTransform="matrix(0.5789 0 0 -0.4286 -3.9436 3056.5657)">
+			<stop  offset="0" style="stop-color:#181818;stop-opacity:0"/>
+			<stop  offset="0.5" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</linearGradient>
+		<rect id="rect3700-5" x="10" y="40" fill="url(#rect3700-5_1_)" width="28" height="7"/>
+	</g>
+</g>
+<radialGradient id="SVGID_1_" cx="-7.6034" cy="12.4049" r="59.5309" fx="-10.0943" fy="12.4049" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#95A3AB"/>
+	<stop  offset="0.2624" style="stop-color:#9BAEC8"/>
+	<stop  offset="0.705" style="stop-color:#8093AA"/>
+	<stop  offset="1" style="stop-color:#273445"/>
+</radialGradient>
+<path fill="url(#SVGID_1_)" d="M21.5,3.5v17c0,0.52-0.4,0.94-0.9,0.99c-0.03,0.01-0.07,0.01-0.1,0.01h-17c-0.55,0-1-0.45-1-1v-17
+	c0-0.55,0.45-1,1-1h17C21.05,2.5,21.5,2.95,21.5,3.5z"/>
+<path id="rect5505-21-8-1" opacity="0.5" fill="none" stroke="#0E141F" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M3.5,2.5h17c0.552,0,1,0.448,1,1v17c0,0.552-0.448,1-1,1h-17c-0.552,0-1-0.448-1-1v-17C2.5,2.948,2.948,2.5,3.5,2.5z"/>
+<linearGradient id="rect6741-9_1_" gradientUnits="userSpaceOnUse" x1="154.1423" y1="3116.9497" x2="154.1423" y2="3082.2695" gradientTransform="matrix(0.4595 0 0 -0.4595 -58.8209 1436.0929)">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.0165" style="stop-color:#FFFFFF;stop-opacity:0.2353"/>
+	<stop  offset="0.98" style="stop-color:#FFFFFF;stop-opacity:0.1569"/>
+	<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.3922"/>
+</linearGradient>
+<rect id="rect6741-9" x="3.501" y="3.499" opacity="0.3" fill="none" stroke="url(#rect6741-9_1_)" stroke-width="1" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " width="17" height="17"/>
+<path opacity="0.5" fill="#273445" d="M21.5,9.79V20.5c0,0.52-0.4,0.94-0.9,0.99H10.03l-4.77-4.64H5.25v-0.01
+	c-0.01-0.01-0.01-0.01-0.01-0.01l-0.45-0.85l-0.51-1c-0.02-0.05,0-0.11,0.05-0.14c0.03-0.02,0.05-0.02,0.08-0.02c0,0,0,0,0,0.01
+	l0.38,0.08l0.5,0.11l0.21-0.11l0.16-0.08l2.21-1.15c0.01-0.02,0.03-0.02,0.05-0.02L9,13.09l-0.18-0.34
+	c-0.07-0.14-0.05-0.3,0.04-0.42l-0.61-0.58c-0.01-0.01-0.03-0.03-0.04-0.05c-0.03-0.03-0.06-0.07-0.08-0.11
+	c-0.13-0.25-0.04-0.57,0.22-0.7l2.95-1.54c0.19-0.1,0.43-0.07,0.59,0.07l0.04,0.04l1.41,1.36l0.76-0.39
+	c0.02-0.02,0.03-0.02,0.05-0.03l2.24-1.18l1.14-2.72c0,0,0,0,0-0.01c0.02-0.05,0.07-0.09,0.11-0.12c0.09-0.05,0.2-0.04,0.27,0.02
+	L21.5,9.79z"/>
+<path fill="#FFFFFF" d="M20.068,10.472l-2.097-4.018c-0.003-0.005-0.006-0.009-0.01-0.013c-0.014-0.019-0.031-0.035-0.05-0.048
+	c-0.075-0.055-0.177-0.066-0.264-0.02c-0.051,0.027-0.09,0.069-0.112,0.119c-0.003,0.004-0.005,0.009-0.006,0.015l-1.134,2.719
+	l-2.25,1.174c-0.015,0.008-0.03,0.015-0.044,0.023l-0.765,0.399l-0.666,0.348l-0.174-0.334c-0.099-0.189-0.331-0.262-0.521-0.163
+	c-0.189,0.099-0.262,0.331-0.163,0.521l0.174,0.334l-0.644,0.336l-0.556-1.065l0.998-0.521c0.256-0.134,0.356-0.451,0.222-0.707
+	c-0.021-0.042-0.048-0.079-0.079-0.112l-0.045-0.044C11.725,9.28,11.495,9.247,11.3,9.349l-2.947,1.538
+	c-0.257,0.134-0.356,0.451-0.222,0.707c0.021,0.04,0.046,0.077,0.076,0.109c0.015,0.017,0.032,0.034,0.049,0.048
+	c0.158,0.134,0.387,0.167,0.582,0.065l0.998-0.521l0.556,1.065L9.68,12.731l-0.174-0.334c-0.099-0.189-0.332-0.262-0.521-0.163
+	c-0.05,0.026-0.091,0.061-0.124,0.103c-0.091,0.116-0.112,0.279-0.039,0.418l0.174,0.334l-1.082,0.565
+	c-0.015,0.007-0.03,0.015-0.044,0.023l-2.577,1.345l-0.879-0.191C4.41,14.83,4.408,14.83,4.406,14.829
+	c-0.024-0.005-0.051-0.001-0.074,0.011c-0.053,0.028-0.075,0.09-0.054,0.143l0.964,1.847c0.002,0.003,0.005,0.007,0.008,0.01
+	l0.001,0.002l0.014,0.013c0.034,0.028,0.083,0.035,0.126,0.013c0.024-0.013,0.041-0.032,0.051-0.055
+	c0.001-0.002,0.002-0.004,0.003-0.006l0.353-0.846l1.032-0.539c0.004,0.293,0.075,0.59,0.22,0.867
+	c0.495,0.948,1.665,1.315,2.613,0.82c0.015-0.008,0.03-0.015,0.044-0.023l1.082-0.565l0.202,0.388
+	c0.099,0.189,0.332,0.262,0.521,0.163c0.189-0.099,0.262-0.332,0.164-0.521l-0.202-0.387l0.711-0.371l0.59,1.13
+	c0.137,0.263,0.461,0.365,0.725,0.228c0.074-0.038,0.135-0.091,0.18-0.153c0.121-0.16,0.146-0.382,0.047-0.571l-0.59-1.13
+	l0.644-0.336l0.202,0.387c0.099,0.189,0.332,0.262,0.521,0.164c0.189-0.099,0.262-0.332,0.163-0.521l-0.202-0.388l1.493-0.78
+	c0.103-0.055,0.199-0.118,0.288-0.188c0.716-0.565,0.953-1.577,0.515-2.415c-0.145-0.277-0.348-0.505-0.586-0.676l0.704-0.367
+	l2.896,0.628c0.006,0.001,0.01,0.003,0.015,0.003c0.054,0.01,0.11,0.003,0.161-0.024C20.065,10.724,20.114,10.589,20.068,10.472z
+	 M9.188,16.153c-0.007,0.004-0.013,0.007-0.02,0.011c-0.426,0.223-0.952,0.058-1.174-0.369c-0.222-0.426-0.058-0.951,0.368-1.174
+	l1.128-0.589l0.805,1.542L9.188,16.153z M10.978,15.219l-0.805-1.542l0.047-0.024l0.664-0.347l0.805,1.542l-0.151,0.079
+	L10.978,15.219z M12.641,14.351l-0.805-1.542l0.644-0.336l0.805,1.542L12.641,14.351z M15.312,12.955
+	c-0.009,0.006-0.019,0.012-0.029,0.017l-1.315,0.686l-0.805-1.542l0.98-0.512l0.314-0.164c0.017-0.009,0.033-0.017,0.051-0.024
+	c0.416-0.185,0.91-0.017,1.123,0.393c0.188,0.36,0.099,0.792-0.19,1.051C15.402,12.894,15.359,12.926,15.312,12.955z"/>
+</svg>
diff --git a/data/icons/24/com.github.bleakgrey.tootle.svg b/data/icons/24/com.github.bleakgrey.tootle.svg
deleted file mode 100644
index 055b758..0000000
--- a/data/icons/24/com.github.bleakgrey.tootle.svg
+++ /dev/null
@@ -1,269 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4157"
-   height="24"
-   width="24"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="24.svg">
-  <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="1017"
-     id="namedview46"
-     showgrid="true"
-     inkscape:zoom="16"
-     inkscape:cx="13.796158"
-     inkscape:cy="9.3530973"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4157">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4179"
-       empspacing="4" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4181"
-       spacingx="0.5"
-       spacingy="0.5"
-       empspacing="2"
-       color="#ff3fff"
-       opacity="0.1254902"
-       empcolor="#3ff9ff"
-       empopacity="0.11764706" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4159">
-    <linearGradient
-       gradientTransform="matrix(1.0181566,0,0,-1.0195328,-0.21530444,32.481143)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4097"
-       id="linearGradient3223"
-       y2="20.187275"
-       x2="12.913282"
-       y1="17.533852"
-       x1="12.913282" />
-    <linearGradient
-       id="linearGradient4097">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4099" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop4101" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.45945947,0,0,0.45945947,0.9742203,0.9717328)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4095"
-       id="linearGradient3233"
-       y2="41.229313"
-       x2="23.99999"
-       y1="6.5493407"
-       x1="23.99999" />
-    <linearGradient
-       id="linearGradient4095">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4097" />
-      <stop
-         offset="0.01652508"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4100" />
-      <stop
-         offset="0.98001981"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4102" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4104" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0,4.6270127,-5.6804933,0,68.966159,-38.745063)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
-       id="radialGradient3215"
-       fy="9.9571075"
-       fx="6.2001843"
-       r="12.671875"
-       cy="9.9571075"
-       cx="6.7304144" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#95a3ab;stop-opacity:1"
-         id="stop3750-1-0-7-6-6-1-3-9-3" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#667885;stop-opacity:1"
-         id="stop3752-3-7-4-0-32-8-923-0-7" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#485a6c;stop-opacity:1"
-         id="stop3754-1-8-5-2-7-6-7-1-9" />
-      <stop
-         offset="1"
-         style="stop-color:#273445;stop-opacity:1"
-         id="stop3756-1-6-2-6-6-1-96-6-0" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-9"
-       id="radialGradient3082-6"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-166-749-9">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2883-2" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2885-2" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-7-6"
-       id="radialGradient3084-4"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-464-309-7-6">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2889-75" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2891-4-9" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-501-757-1"
-       id="linearGradient3086-8"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-501-757-1">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2895-2" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2897-89" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2899-36" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4162">
-    <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>
-  <g
-     id="g4169">
-    <g
-       style="display:inline"
-       id="g2036-4"
-       transform="matrix(0.55,0,0,0.3333336,-1.2000011,7.33333)">
-      <g
-         style="opacity:0.4"
-         id="g3712-8"
-         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
-        <rect
-           style="fill:url(#radialGradient3082-6);fill-opacity:1;stroke:none"
-           id="rect2801-6"
-           y="40"
-           x="38"
-           height="7"
-           width="5" />
-        <rect
-           style="fill:url(#radialGradient3084-4);fill-opacity:1;stroke:none"
-           id="rect3696-20"
-           transform="scale(-1,-1)"
-           y="-47"
-           x="-10"
-           height="7"
-           width="5" />
-        <rect
-           style="fill:url(#linearGradient3086-8);fill-opacity:1;stroke:none"
-           id="rect3700-5"
-           y="40"
-           x="10"
-           height="7.0000005"
-           width="28" />
-      </g>
-    </g>
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3215);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-       id="rect5505-21-8"
-       y="2.5000257"
-       x="2.4999981"
-       ry="1"
-       rx="1"
-       height="19.000002"
-       width="19.000002" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0e141f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect5505-21-8-1"
-       y="2.5000257"
-       x="2.4999981"
-       ry="1"
-       rx="1"
-       height="19.000002"
-       width="19.000002" />
-    <rect
-       style="opacity:0.3;fill:none;stroke:url(#linearGradient3233);stroke-width:0.99999988;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect6741-9"
-       y="3.4987564"
-       x="3.5012455"
-       height="17"
-       width="17" />
-  </g>
-</svg>
diff --git a/data/icons/32/32x32.svg b/data/icons/32/32x32.svg
new file mode 100644
index 0000000..226ebfe
--- /dev/null
+++ b/data/icons/32/32x32.svg
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg4588" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" inkscape:version="0.91 r13725" sodipodi:docname="32.svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="32px" height="32px"
+	 viewBox="0 0 32 32" enable-background="new 0 0 32 32" xml:space="preserve">
+<sodipodi:namedview  inkscape:zoom="16" objecttolerance="10" bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" showgrid="true" pagecolor="#ffffff" inkscape:cx="14.93666" inkscape:cy="15.588816" id="namedview46" inkscape:current-layer="svg4588" inkscape:window-height="1017" inkscape:window-y="30" inkscape:window-x="0" inkscape:window-maximized="1" inkscape:pageopacity="0" inkscape:window-width="1920" inkscape:pageshadow="2">
+	<inkscape:grid  type="xygrid" empspacing="4" id="grid4203"></inkscape:grid>
+	
+		<inkscape:grid  type="xygrid" color="#ff3fff" opacity="0.37254902" spacingy="0.5" empopacity="0.1254902" empcolor="#3fffff" empspacing="2" spacingx="0.5" id="grid4205">
+		</inkscape:grid>
+</sodipodi:namedview>
+<g id="g2036-2" transform="matrix(0.6999997,0,0,0.3333336,-0.8000002,15.33333)">
+	<g id="g3712-3" transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)" opacity="0.4">
+		
+			<radialGradient id="rect2801-0_1_" cx="-392.7515" cy="7672.0923" r="2.4994" gradientTransform="matrix(1.4765 0 0 -0.6 617.8796 4646.7544)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect2801-0" x="38" y="40" fill="url(#rect2801-0_1_)" width="5" height="7"/>
+		
+			<radialGradient id="rect3696-2_1_" cx="-909.6242" cy="10817.8896" r="2.4994" gradientTransform="matrix(-1.4765 0 0 0.6 -1333.028 -6447.2324)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect3696-2" x="5" y="40" fill="url(#rect3696-2_1_)" width="5" height="7"/>
+		
+			<linearGradient id="rect3700-1_1_" gradientUnits="userSpaceOnUse" x1="-107.542" y1="7034.7012" x2="-107.542" y2="7041.7295" gradientTransform="matrix(0.7368 0 0 -0.4286 103.2414 3061.8992)">
+			<stop  offset="0" style="stop-color:#181818;stop-opacity:0"/>
+			<stop  offset="0.5" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</linearGradient>
+		<rect id="rect3700-1" x="10" y="40" fill="url(#rect3700-1_1_)" width="28" height="7"/>
+	</g>
+</g>
+<radialGradient id="SVGID_1_" cx="-11.8574" cy="16.5754" r="84.5966" fx="-15.3972" fy="16.5754" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#95A3AB"/>
+	<stop  offset="0.2624" style="stop-color:#9BAEC8"/>
+	<stop  offset="0.705" style="stop-color:#8093AA"/>
+	<stop  offset="1" style="stop-color:#273445"/>
+</radialGradient>
+<path fill="url(#SVGID_1_)" d="M29.5,4.66v22.68c0,1.06-0.78,1.95-1.79,2.13c-0.12,0.02-0.24,0.03-0.37,0.03H4.66
+	c-1.19,0-2.16-0.97-2.16-2.16V4.66c0-1.19,0.97-2.16,2.16-2.16h22.68C28.53,2.5,29.5,3.47,29.5,4.66z"/>
+<linearGradient id="rect6741-7-4_1_" gradientUnits="userSpaceOnUse" x1="-46.3832" y1="3411.5254" x2="-46.3832" y2="3376.2197" gradientTransform="matrix(0.6757 0 0 -0.6757 47.34 2309.1753)">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.038" style="stop-color:#FFFFFF;stop-opacity:0.2353"/>
+	<stop  offset="0.962" style="stop-color:#FFFFFF;stop-opacity:0.1569"/>
+	<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.3922"/>
+</linearGradient>
+<path id="rect6741-7-4" opacity="0.3" fill="none" stroke="url(#rect6741-7-4_1_)" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M4.587,3.5h22.826c0.6,0,1.087,0.487,1.087,1.087v22.826c0,0.6-0.487,1.087-1.087,1.087H4.587c-0.6,0-1.087-0.487-1.087-1.087V4.587
+	C3.5,3.987,3.987,3.5,4.587,3.5z"/>
+<path id="rect5505-6" opacity="0.5" fill="none" stroke="#0E141F" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M4.66,2.5h22.68c1.193,0,2.16,0.967,2.16,2.16v22.68c0,1.193-0.967,2.16-2.16,2.16H4.66c-1.193,0-2.16-0.967-2.16-2.16V4.66
+	C2.5,3.467,3.467,2.5,4.66,2.5z"/>
+<path opacity="0.5" fill="#273445" d="M29.5,12.53v14.81c0,1.06-0.78,1.95-1.79,2.13H12.87l-6.9-6.72l-0.02-0.01v-0.01
+	c-0.01-0.01-0.01-0.01-0.01-0.01l-0.65-1.24l-0.75-1.44c-0.03-0.08,0.01-0.16,0.08-0.21c0.04-0.02,0.07-0.02,0.11-0.02
+	c0,0,0,0,0,0.01l0.56,0.12l0.72,0.16l0.3-0.16l0.23-0.12l3.2-1.67c0.02-0.02,0.05-0.03,0.07-0.03l1.57-0.82l-0.26-0.49
+	c-0.1-0.2-0.07-0.44,0.06-0.61l-0.88-0.84c-0.02-0.02-0.05-0.04-0.07-0.07c-0.04-0.05-0.08-0.1-0.11-0.16
+	c-0.19-0.37-0.05-0.83,0.32-1.02l4.27-2.23c0.28-0.15,0.62-0.1,0.85,0.1l0.06,0.06l2.04,1.97l1.11-0.57
+	c0.02-0.02,0.04-0.03,0.07-0.04l3.25-1.7l1.65-3.94c0-0.01,0-0.01,0-0.02c0.03-0.07,0.09-0.13,0.16-0.17
+	c0.13-0.07,0.28-0.06,0.39,0.02L29.5,12.53z"/>
+<path fill="#FFFFFF" d="M27.412,13.506l-3.038-5.82c-0.005-0.007-0.009-0.013-0.014-0.019c-0.021-0.027-0.045-0.05-0.072-0.07
+	c-0.108-0.079-0.256-0.095-0.383-0.029c-0.074,0.039-0.13,0.101-0.161,0.172c-0.004,0.006-0.007,0.014-0.009,0.021L22.092,11.7
+	l-3.258,1.701c-0.021,0.011-0.043,0.022-0.064,0.034l-1.108,0.578l-0.965,0.504l-0.252-0.484c-0.143-0.274-0.48-0.38-0.754-0.237
+	c-0.273,0.143-0.38,0.48-0.237,0.754l0.252,0.484l-0.932,0.487l-0.806-1.542l1.445-0.754c0.371-0.194,0.515-0.653,0.321-1.024
+	c-0.031-0.06-0.07-0.114-0.114-0.162l-0.066-0.064c-0.228-0.195-0.562-0.243-0.844-0.096l-4.269,2.228
+	c-0.372,0.194-0.516,0.653-0.322,1.024c0.031,0.058,0.067,0.111,0.11,0.157c0.022,0.025,0.046,0.049,0.072,0.069
+	c0.228,0.194,0.561,0.242,0.843,0.094l1.445-0.754l0.805,1.542l-1.029,0.537l-0.252-0.484c-0.143-0.273-0.481-0.379-0.754-0.237
+	c-0.072,0.038-0.132,0.089-0.18,0.149c-0.132,0.168-0.162,0.404-0.057,0.605l0.252,0.484l-1.567,0.818
+	c-0.021,0.011-0.043,0.022-0.064,0.033l-3.733,1.949l-1.274-0.276c-0.003-0.001-0.007-0.002-0.01-0.002
+	c-0.035-0.007-0.073-0.002-0.108,0.016c-0.076,0.04-0.109,0.13-0.078,0.208l1.397,2.675c0.003,0.005,0.007,0.01,0.011,0.015
+	l0.002,0.002l0.02,0.019c0.05,0.041,0.121,0.05,0.182,0.019c0.034-0.018,0.06-0.046,0.074-0.079
+	c0.002-0.003,0.003-0.006,0.004-0.009l0.511-1.226l1.494-0.78c0.006,0.425,0.108,0.854,0.318,1.256
+	c0.717,1.373,2.412,1.905,3.785,1.188c0.021-0.011,0.043-0.022,0.064-0.034l1.567-0.818l0.293,0.562
+	c0.143,0.273,0.481,0.379,0.754,0.237c0.273-0.143,0.38-0.48,0.237-0.754l-0.293-0.561l1.029-0.538l0.855,1.637
+	c0.199,0.381,0.668,0.529,1.049,0.33c0.107-0.055,0.195-0.132,0.261-0.222c0.175-0.232,0.211-0.553,0.068-0.827l-0.854-1.637
+	l0.932-0.487l0.293,0.561c0.143,0.273,0.48,0.38,0.754,0.237c0.274-0.143,0.379-0.481,0.237-0.754l-0.293-0.562l2.163-1.129
+	c0.149-0.08,0.288-0.171,0.417-0.273c1.037-0.819,1.38-2.284,0.746-3.498c-0.21-0.401-0.503-0.731-0.848-0.979l1.019-0.532
+	l4.194,0.909c0.008,0.002,0.015,0.004,0.022,0.005c0.078,0.015,0.159,0.005,0.234-0.035C27.406,13.871,27.477,13.676,27.412,13.506z
+	 M11.653,21.735c-0.01,0.006-0.019,0.011-0.029,0.016c-0.617,0.322-1.378,0.084-1.7-0.534c-0.322-0.617-0.084-1.378,0.533-1.7
+	l1.633-0.853l1.166,2.234L11.653,21.735z M14.246,20.381l-1.166-2.234l0.068-0.035l0.961-0.502l1.166,2.234l-0.219,0.114
+	L14.246,20.381z M16.655,19.124l-1.166-2.234l0.932-0.487l1.166,2.234L16.655,19.124z M20.523,17.102
+	c-0.014,0.009-0.028,0.017-0.042,0.024l-1.904,0.994l-1.166-2.234l1.42-0.742l0.455-0.237c0.024-0.012,0.048-0.024,0.073-0.035
+	c0.603-0.268,1.318-0.024,1.627,0.569c0.273,0.522,0.144,1.147-0.276,1.522C20.654,17.014,20.592,17.061,20.523,17.102z"/>
+</svg>
diff --git a/data/icons/32/com.github.bleakgrey.tootle.svg b/data/icons/32/com.github.bleakgrey.tootle.svg
deleted file mode 100644
index a7a8749..0000000
--- a/data/icons/32/com.github.bleakgrey.tootle.svg
+++ /dev/null
@@ -1,271 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4588"
-   height="32"
-   width="32"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="32.svg">
-  <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="1017"
-     id="namedview46"
-     showgrid="true"
-     inkscape:zoom="16"
-     inkscape:cx="14.93666"
-     inkscape:cy="15.588816"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4588">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4203"
-       empspacing="4" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4205"
-       empspacing="2"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#ff3fff"
-       opacity="0.37254902"
-       empcolor="#3fffff"
-       empopacity="0.1254902" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4590">
-    <linearGradient
-       id="linearGradient4687">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4689" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop4691" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(0.67567568,0,0,0.67567568,-0.21621855,-0.2162061)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3924-0"
-       id="linearGradient3483"
-       y2="41.679485"
-       x2="38.546436"
-       y1="6.3738203"
-       x1="38.546436" />
-    <linearGradient
-       id="linearGradient3924-0">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop3926-6" />
-      <stop
-         offset="0.03798588"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop3928-3" />
-      <stop
-         offset="0.96200818"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop3930-2" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop3932-62" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(0,6.5752286,-8.07228,0,96.951918,-56.111442)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
-       id="radialGradient4388"
-       fy="9.9571075"
-       fx="6.2001843"
-       r="12.671875"
-       cy="9.9571075"
-       cx="6.7304144" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#95a3ab;stop-opacity:1"
-         id="stop3750-1-0-7-6-6-1-3-9-3" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#667885;stop-opacity:1"
-         id="stop3752-3-7-4-0-32-8-923-0-7" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#485a6c;stop-opacity:1"
-         id="stop3754-1-8-5-2-7-6-7-1-9" />
-      <stop
-         offset="1"
-         style="stop-color:#273445;stop-opacity:1"
-         id="stop3756-1-6-2-6-6-1-96-6-0" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-6"
-       id="radialGradient3493"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-166-749-6">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2883-8" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2885-3" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-7"
-       id="radialGradient3495"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-464-309-7">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2889-0" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2891-66" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-501-757-3"
-       id="linearGradient3497"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-501-757-3">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2895-3" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop2897-28" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop2899-8" />
-    </linearGradient>
-    <linearGradient
-       x1="30.212982"
-       y1="21.416878"
-       x2="30.212982"
-       y2="25.361452"
-       id="linearGradient3143"
-       xlink:href="#linearGradient4687"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.74734572,0,0,-0.74821732,-1.9357971,34.712168)" />
-  </defs>
-  <metadata
-     id="metadata4593">
-    <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>
-  <g
-     id="g4174">
-    <g
-       style="display:inline"
-       id="g2036-2"
-       transform="matrix(0.6999997,0,0,0.3333336,-0.8000002,15.33333)">
-      <g
-         style="opacity:0.4"
-         id="g3712-3"
-         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)">
-        <rect
-           style="fill:url(#radialGradient3493);fill-opacity:1;stroke:none"
-           id="rect2801-0"
-           y="40"
-           x="38"
-           height="7"
-           width="5" />
-        <rect
-           style="fill:url(#radialGradient3495);fill-opacity:1;stroke:none"
-           id="rect3696-2"
-           transform="scale(-1,-1)"
-           y="-47"
-           x="-10"
-           height="7"
-           width="5" />
-        <rect
-           style="fill:url(#linearGradient3497);fill-opacity:1;stroke:none"
-           id="rect3700-1"
-           y="40"
-           x="10"
-           height="7.0000005"
-           width="28" />
-      </g>
-    </g>
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4388);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-       id="rect5505"
-       y="2.5000005"
-       x="2.4999998"
-       ry="2.1600001"
-       rx="2.1600001"
-       height="27"
-       width="27" />
-    <rect
-       style="opacity:0.3;fill:none;stroke:url(#linearGradient3483);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect6741-7-4"
-       y="3.5"
-       x="3.5"
-       ry="1.0869565"
-       rx="1.0869565"
-       height="25"
-       width="25" />
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0e141f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate"
-       id="rect5505-6"
-       y="2.5"
-       x="2.5"
-       ry="2.1600001"
-       rx="2.1600001"
-       height="27"
-       width="27" />
-  </g>
-</svg>
diff --git a/data/icons/48/48x48.svg b/data/icons/48/48x48.svg
new file mode 100644
index 0000000..b1fa649
--- /dev/null
+++ b/data/icons/48/48x48.svg
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg4405" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" inkscape:version="0.91 r13725" sodipodi:docname="48.svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="48px" height="48px"
+	 viewBox="0 0 48 48" enable-background="new 0 0 48 48" xml:space="preserve">
+<sodipodi:namedview  inkscape:zoom="8" objecttolerance="10" bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" showgrid="true" pagecolor="#ffffff" inkscape:cx="20.777913" inkscape:cy="19.492052" id="namedview45" inkscape:current-layer="svg4405" inkscape:window-height="1017" inkscape:window-y="30" inkscape:window-x="0" inkscape:window-maximized="1" inkscape:pageopacity="0" inkscape:window-width="1920" inkscape:pageshadow="2">
+	<inkscape:grid  type="xygrid" empspacing="4" id="grid4182"></inkscape:grid>
+	
+		<inkscape:grid  type="xygrid" color="#ff3fff" opacity="0.31372549" spacingy="0.5" empopacity="0.11764706" empcolor="#3fffff" empspacing="2" spacingx="0.5" id="grid4184">
+		</inkscape:grid>
+</sodipodi:namedview>
+<g>
+	<g id="g3712-0" transform="matrix(1.1578952,0,0,0.57142859,-3.789476,19.142856)" opacity="0.4">
+		
+			<radialGradient id="rect2801-4_1_" cx="-303.9869" cy="6065.9893" r="2.4994" gradientTransform="matrix(2.3202 0 0 -0.8 743.2948 4896.2915)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect2801-4" x="38" y="40" fill="url(#rect2801-4_1_)" width="5" height="7"/>
+		
+			<radialGradient id="rect3696-8_1_" cx="-507.3432" cy="7800.5005" r="2.4994" gradientTransform="matrix(-2.3202 0 0 0.8 -1167.1165 -6196.9004)" gradientUnits="userSpaceOnUse">
+			<stop  offset="0" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</radialGradient>
+		<rect id="rect3696-8" x="5" y="40" fill="url(#rect3696-8_1_)" width="5" height="7"/>
+		
+			<linearGradient id="rect3700-7_1_" gradientUnits="userSpaceOnUse" x1="-185.5088" y1="5712.9136" x2="-185.5088" y2="5719.9419" gradientTransform="matrix(1.1579 0 0 -0.5714 238.7997 3311.5498)">
+			<stop  offset="0" style="stop-color:#181818;stop-opacity:0"/>
+			<stop  offset="0.5" style="stop-color:#181818"/>
+			<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+		</linearGradient>
+		<rect id="rect3700-7" x="10" y="40" fill="url(#rect3700-7_1_)" width="28" height="7"/>
+	</g>
+	<radialGradient id="SVGID_1_" cx="-16.2385" cy="25.8311" r="122.195" fx="-21.3515" fy="25.8311" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#95A3AB"/>
+		<stop  offset="0.2624" style="stop-color:#9BAEC8"/>
+		<stop  offset="0.705" style="stop-color:#8093AA"/>
+		<stop  offset="1" style="stop-color:#273445"/>
+	</radialGradient>
+	<path fill="url(#SVGID_1_)" d="M43.5,7.5v35c0,0.96-0.69,1.77-1.6,1.96c-0.13,0.03-0.26,0.04-0.4,0.04h-35c-1.1,0-2-0.9-2-2v-35
+		c0-1.1,0.9-2,2-2h35C42.6,5.5,43.5,6.4,43.5,7.5z"/>
+	
+		<linearGradient id="rect6741-1_1_" gradientUnits="userSpaceOnUse" x1="-181.34" y1="3621.929" x2="-181.34" y2="3586.1492" gradientTransform="matrix(1 0 0 -1 205.34 3629.04)">
+		<stop  offset="0" style="stop-color:#FFFFFF"/>
+		<stop  offset="0.021" style="stop-color:#FFFFFF;stop-opacity:0.2353"/>
+		<stop  offset="0.977" style="stop-color:#FFFFFF;stop-opacity:0.1569"/>
+		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.3922"/>
+	</linearGradient>
+	
+		<path id="rect6741-1" opacity="0.3" fill="none" stroke="url(#rect6741-1_1_)" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+		M6.5,6.5h35c0.552,0,1,0.448,1,1v35c0,0.552-0.448,1-1,1h-35c-0.552,0-1-0.448-1-1v-35C5.5,6.948,5.948,6.5,6.5,6.5z"/>
+	
+		<path id="rect5505-21-6" opacity="0.5" fill="none" stroke="#0E141F" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+		M6.5,5.5h35c1.105,0,2,0.895,2,2v35c0,1.105-0.895,2-2,2h-35c-1.105,0-2-0.895-2-2v-35C4.5,6.395,5.395,5.5,6.5,5.5z"/>
+	<path opacity="0.5" fill="#273445" d="M43.5,19.234v23.477c0,0.857-0.616,1.579-1.428,1.749H19.773L9.689,34.644l-0.027-0.027
+		v-0.009c-0.009-0.009-0.009-0.018-0.018-0.018l-0.946-1.811l-1.098-2.097c-0.045-0.116,0.009-0.241,0.116-0.303
+		c0.054-0.027,0.107-0.036,0.161-0.027c0,0,0.009,0,0.009,0.009l0.812,0.178l1.053,0.223l0.437-0.232l0.33-0.17l4.685-2.445
+		c0.027-0.018,0.062-0.036,0.089-0.044l2.293-1.196l-0.375-0.714c-0.152-0.286-0.107-0.634,0.089-0.883l-1.285-1.232
+		c-0.036-0.036-0.071-0.062-0.098-0.107c-0.062-0.063-0.116-0.143-0.161-0.223c-0.285-0.544-0.08-1.214,0.464-1.499l6.237-3.257
+		c0.41-0.214,0.901-0.143,1.231,0.143l0.098,0.098l2.98,2.873l1.615-0.839c0.027-0.018,0.062-0.036,0.098-0.054l4.756-2.48
+		l2.4-5.756c0-0.009,0-0.018,0.009-0.027c0.045-0.107,0.125-0.197,0.232-0.25c0.187-0.098,0.402-0.08,0.562,0.036L43.5,19.234z"/>
+	<path fill="#FFFFFF" d="M41.005,21.139l-4.436-8.499c-0.007-0.01-0.013-0.019-0.02-0.028c-0.031-0.039-0.066-0.074-0.105-0.102
+		c-0.158-0.115-0.373-0.139-0.559-0.042c-0.109,0.057-0.189,0.147-0.236,0.251c-0.007,0.009-0.01,0.02-0.014,0.031l-2.398,5.752
+		l-4.758,2.484c-0.031,0.016-0.063,0.033-0.093,0.05l-1.618,0.845l-1.41,0.736l-0.369-0.706c-0.209-0.4-0.701-0.555-1.101-0.346
+		c-0.399,0.208-0.555,0.701-0.346,1.101l0.369,0.706l-1.362,0.711l-1.176-2.253l2.111-1.102c0.542-0.284,0.752-0.953,0.469-1.495
+		c-0.045-0.088-0.102-0.167-0.167-0.236l-0.096-0.093c-0.334-0.285-0.82-0.355-1.232-0.14l-6.234,3.254
+		c-0.543,0.284-0.753,0.953-0.47,1.496c0.045,0.085,0.098,0.162,0.161,0.23c0.032,0.037,0.068,0.071,0.105,0.101
+		c0.334,0.283,0.819,0.353,1.23,0.138l2.11-1.101l1.176,2.253l-1.503,0.785l-0.369-0.706c-0.209-0.399-0.703-0.554-1.101-0.346
+		c-0.105,0.055-0.193,0.129-0.263,0.217c-0.193,0.245-0.237,0.589-0.083,0.884l0.369,0.706l-2.289,1.195
+		c-0.031,0.015-0.063,0.032-0.094,0.048L9.75,30.763l-1.86-0.404c-0.005-0.002-0.01-0.002-0.014-0.003
+		c-0.052-0.01-0.107-0.002-0.157,0.023c-0.111,0.058-0.159,0.189-0.115,0.303l2.04,3.907c0.005,0.007,0.01,0.015,0.016,0.021
+		l0.003,0.003l0.03,0.028c0.072,0.06,0.176,0.073,0.266,0.027c0.05-0.027,0.087-0.067,0.109-0.116
+		c0.002-0.004,0.004-0.008,0.006-0.013l0.747-1.79l2.182-1.14c0.009,0.62,0.158,1.247,0.464,1.834
+		c1.047,2.005,3.522,2.782,5.528,1.735c0.031-0.016,0.063-0.033,0.093-0.05l2.289-1.195l0.428,0.82
+		c0.208,0.399,0.703,0.554,1.101,0.346c0.399-0.208,0.555-0.702,0.346-1.101l-0.428-0.819l1.503-0.785l1.248,2.391
+		c0.291,0.557,0.976,0.772,1.533,0.481c0.156-0.081,0.285-0.193,0.382-0.324c0.255-0.339,0.308-0.807,0.099-1.208l-1.248-2.391
+		l1.362-0.711l0.428,0.819c0.208,0.399,0.702,0.555,1.101,0.346c0.4-0.209,0.554-0.703,0.346-1.101l-0.428-0.82l3.158-1.649
+		c0.218-0.117,0.421-0.25,0.609-0.399c1.515-1.196,2.015-3.336,1.09-5.108c-0.306-0.586-0.735-1.067-1.238-1.43l1.489-0.777
+		l6.125,1.327c0.012,0.003,0.022,0.006,0.033,0.007c0.113,0.021,0.233,0.007,0.341-0.05C40.997,21.673,41.1,21.388,41.005,21.139z
+		 M17.991,33.156c-0.014,0.009-0.027,0.015-0.042,0.023c-0.902,0.471-2.013,0.122-2.483-0.78c-0.47-0.901-0.122-2.012,0.778-2.482
+		l2.385-1.245l1.703,3.262L17.991,33.156z M21.778,31.179l-1.703-3.262l0.1-0.051l1.404-0.733l1.703,3.262l-0.32,0.167
+		L21.778,31.179z M25.296,29.343l-1.703-3.262l1.362-0.711l1.703,3.262L25.296,29.343z M30.945,26.39
+		c-0.02,0.013-0.04,0.025-0.061,0.035l-2.78,1.452l-1.703-3.262l2.073-1.083l0.664-0.346c0.035-0.018,0.071-0.035,0.107-0.052
+		c0.88-0.392,1.924-0.035,2.376,0.831c0.399,0.762,0.21,1.675-0.403,2.223C31.136,26.263,31.045,26.331,30.945,26.39z"/>
+</g>
+</svg>
diff --git a/data/icons/48/com.github.bleakgrey.tootle.svg b/data/icons/48/com.github.bleakgrey.tootle.svg
deleted file mode 100644
index fd643b0..0000000
--- a/data/icons/48/com.github.bleakgrey.tootle.svg
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   id="svg4405"
-   height="48"
-   width="48"
-   version="1.1"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="48.svg">
-  <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="1017"
-     id="namedview45"
-     showgrid="true"
-     inkscape:zoom="8"
-     inkscape:cx="20.777913"
-     inkscape:cy="19.492052"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4405">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4182"
-       empspacing="4" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4184"
-       empspacing="2"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#ff3fff"
-       opacity="0.31372549"
-       empcolor="#3fffff"
-       empopacity="0.11764706" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4407">
-    <linearGradient
-       id="linearGradient4187">
-      <stop
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1"
-         id="stop4189" />
-      <stop
-         offset="0.02099473"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         id="stop4191" />
-      <stop
-         offset="0.97696"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         id="stop4193" />
-      <stop
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         id="stop4195" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4311">
-      <stop
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1"
-         id="stop4313" />
-      <stop
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0"
-         id="stop4315" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-2-324"
-       id="radialGradient3013-896"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-166-749-2-324">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop3216" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3218" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-8-331"
-       id="radialGradient3015-826"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-464-309-8-331">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop3222" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3224" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3702-501-757-6-946">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3228" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop3230" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3232" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-501-757-6-946"
-       id="linearGradient4395"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
-      <stop
-         offset="0"
-         style="stop-color:#95a3ab;stop-opacity:1"
-         id="stop3750-1-0-7-6-6-1-3-9-3" />
-      <stop
-         offset="0.26238"
-         style="stop-color:#667885;stop-opacity:1"
-         id="stop3752-3-7-4-0-32-8-923-0-7" />
-      <stop
-         offset="0.704952"
-         style="stop-color:#485a6c;stop-opacity:1"
-         id="stop3754-1-8-5-2-7-6-7-1-9" />
-      <stop
-         offset="1"
-         style="stop-color:#273445;stop-opacity:1"
-         id="stop3756-1-6-2-6-6-1-96-6-0" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="matrix(1.0521608,0,0,-1.0532519,-1.2521612,51.339874)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4311"
-       id="linearGradient3143"
-       y2="25.361452"
-       x2="30.212982"
-       y1="21.416878"
-       x1="30.212982" />
-    <linearGradient
-       gradientTransform="translate(1.17e-5,1.00001)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient4187"
-       id="linearGradient3153"
-       y2="41.890972"
-       x2="23.99999"
-       y1="6.1111298"
-       x1="23.99999" />
-    <radialGradient
-       gradientTransform="matrix(0,9.4975523,-11.65996,0,140.93055,-79.160972)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5"
-       id="radialGradient4144"
-       fy="9.9571075"
-       fx="6.2001843"
-       r="12.671875"
-       cy="9.9571075"
-       cx="6.7304144" />
-  </defs>
-  <metadata
-     id="metadata4410">
-    <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>
-  <g
-     id="g4173">
-    <g
-       transform="matrix(1.1578952,0,0,0.57142859,-3.789476,19.142856)"
-       id="g3712-0"
-       style="opacity:0.4">
-      <rect
-         width="5"
-         height="7"
-         x="38"
-         y="40"
-         id="rect2801-4"
-         style="fill:url(#radialGradient3013-896);fill-opacity:1;stroke:none" />
-      <rect
-         width="5"
-         height="7"
-         x="-10"
-         y="-47"
-         transform="scale(-1,-1)"
-         id="rect3696-8"
-         style="fill:url(#radialGradient3015-826);fill-opacity:1;stroke:none" />
-      <rect
-         width="28"
-         height="7.0000005"
-         x="10"
-         y="40"
-         id="rect3700-7"
-         style="fill:url(#linearGradient4395);fill-opacity:1;stroke:none" />
-    </g>
-    <rect
-       width="39"
-       height="39"
-       rx="2"
-       ry="2"
-       x="4.5000067"
-       y="5.5"
-       id="rect5505-21"
-       style="color:#000000;fill:url(#radialGradient4144);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-    <rect
-       width="37"
-       height="37"
-       rx="1"
-       ry="1"
-       x="5.5000081"
-       y="6.5"
-       id="rect6741-1"
-       style="opacity:0.3;fill:none;stroke:url(#linearGradient3153);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-    <rect
-       width="39"
-       height="39"
-       rx="2"
-       ry="2"
-       x="4.5000081"
-       y="5.5"
-       id="rect5505-21-6"
-       style="opacity:0.5;color:#000000;fill:none;stroke:#0e141f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/data/icons/64/64x64.svg b/data/icons/64/64x64.svg
new file mode 100644
index 0000000..6a4eabd
--- /dev/null
+++ b/data/icons/64/64x64.svg
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1"
+	 id="svg4332" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:svg="http://www.w3.org/2000/svg" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:cc="http://creativecommons.org/ns#" inkscape:version="0.91 r13725" sodipodi:docname="64.svg"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="64px" height="64px"
+	 viewBox="0 0 64 64" enable-background="new 0 0 64 64" xml:space="preserve">
+<sodipodi:namedview  inkscape:zoom="8" objecttolerance="10" bordercolor="#666666" borderopacity="1" gridtolerance="10" guidetolerance="10" showgrid="true" pagecolor="#ffffff" inkscape:cx="19.16215" inkscape:cy="32.785763" id="namedview46" inkscape:current-layer="svg4332" inkscape:window-height="1017" inkscape:window-y="30" inkscape:window-x="0" inkscape:window-maximized="1" inkscape:pageopacity="0" inkscape:window-width="1920" inkscape:pageshadow="2">
+	<inkscape:grid  type="xygrid" empspacing="4" id="grid4203"></inkscape:grid>
+	
+		<inkscape:grid  type="xygrid" color="#ff3fff" opacity="0.29803922" spacingy="0.5" empopacity="0.1372549" empcolor="#3fffff" empspacing="2" spacingx="0.5" id="grid4187">
+		</inkscape:grid>
+</sodipodi:namedview>
+<g id="g3712" transform="matrix(1.5789502,0,0,0.7142857,-5.8947511,28.428574)" opacity="0.4">
+	
+		<radialGradient id="rect2801_1_" cx="-238.0086" cy="5000.9541" r="2.4994" gradientTransform="matrix(3.1639 0 0 -1 791.0224 5044.4541)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#181818"/>
+		<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+	</radialGradient>
+	<rect id="rect2801" x="38" y="40" fill="url(#rect2801_1_)" width="5" height="7"/>
+	
+		<radialGradient id="rect3696_1_" cx="-344.166" cy="6088.6416" r="2.4994" gradientTransform="matrix(-3.1639 0 0 1 -1078.8911 -6045.1416)" gradientUnits="userSpaceOnUse">
+		<stop  offset="0" style="stop-color:#181818"/>
+		<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+	</radialGradient>
+	<rect id="rect3696" x="5" y="40" fill="url(#rect3696_1_)" width="5" height="7"/>
+	
+		<linearGradient id="rect3700_1_" gradientUnits="userSpaceOnUse" x1="-172.6913" y1="4778.4775" x2="-172.6913" y2="4785.5059" gradientTransform="matrix(1.579 0 0 -0.7143 296.6709 3460.2258)">
+		<stop  offset="0" style="stop-color:#181818;stop-opacity:0"/>
+		<stop  offset="0.5" style="stop-color:#181818"/>
+		<stop  offset="1" style="stop-color:#181818;stop-opacity:0"/>
+	</linearGradient>
+	<rect id="rect3700" x="10" y="40" fill="url(#rect3700_1_)" width="28" height="7"/>
+</g>
+<radialGradient id="rect5505-21-3-8-5-2-9_1_" cx="-434.767" cy="4038.6685" r="12.6719" fx="-435.2973" fy="4038.6685" gradientTransform="matrix(0 13.394 16.4435 0 -66376.8047 5798.5156)" gradientUnits="userSpaceOnUse">
+	<stop  offset="0" style="stop-color:#9BAEC8"/>
+	<stop  offset="0.2624" style="stop-color:#9BAEC8"/>
+	<stop  offset="0.705" style="stop-color:#8093AA"/>
+	<stop  offset="1" style="stop-color:#273445"/>
+</radialGradient>
+<path id="rect5505-21-3-8-5-2-9" fill="url(#rect5505-21-3-8-5-2-9_1_)" d="M7.5,4.5h49c1.657,0,3,1.343,3,3v49c0,1.657-1.343,3-3,3
+	h-49c-1.657,0-3-1.343-3-3v-49C4.5,5.843,5.843,4.5,7.5,4.5z"/>
+<linearGradient id="rect6741_1_" gradientUnits="userSpaceOnUse" x1="-261.3883" y1="3756.1287" x2="-261.3883" y2="3719.9463" gradientTransform="matrix(1.4324 0 0 -1.4363 406.4211 5400.8813)">
+	<stop  offset="0" style="stop-color:#FFFFFF"/>
+	<stop  offset="0.0349" style="stop-color:#FFFFFF;stop-opacity:0.2353"/>
+	<stop  offset="0.9622" style="stop-color:#FFFFFF;stop-opacity:0.1569"/>
+	<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0.3922"/>
+</linearGradient>
+<path id="rect6741" opacity="0.3" fill="none" stroke="url(#rect6741_1_)" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M7.5,5.429h49c1.105,0,2,0.895,2,2v49.142c0,1.105-0.895,2-2,2h-49c-1.105,0-2-0.895-2-2V7.429C5.5,6.324,6.395,5.429,7.5,5.429z"/>
+<path id="rect5505-21-9" opacity="0.5" fill="none" stroke="#0E141F" stroke-linecap="round" stroke-linejoin="round" enable-background="new    " d="
+	M7.5,4.5h49c1.657,0,3,1.343,3,3v49c0,1.657-1.343,3-3,3h-49c-1.657,0-3-1.343-3-3v-49C4.5,5.843,5.843,4.5,7.5,4.5z"/>
+<path opacity="0.5" fill="#273445" d="M59.5,23.606v32.74c0,1.77-1.436,3.205-3.205,3.205H25.493L11.094,45.523l-0.042-0.042v-0.005
+	c-0.011-0.011-0.016-0.021-0.026-0.027l-2.914-5.584c-0.064-0.164,0.005-0.35,0.164-0.434c0.074-0.037,0.154-0.048,0.222-0.032
+	c0.011,0,0.016,0,0.021,0.005l2.659,0.578l0.625-0.329l0.472-0.244l6.691-3.497c0.042-0.021,0.09-0.048,0.132-0.069l3.274-1.706
+	l-0.53-1.012c-0.217-0.419-0.154-0.911,0.122-1.261l-1.833-1.77c-0.053-0.042-0.101-0.09-0.148-0.143
+	c-0.09-0.101-0.164-0.207-0.228-0.328c-0.408-0.779-0.106-1.732,0.673-2.14l8.906-4.646c0.588-0.307,1.282-0.207,1.759,0.201
+	l0.138,0.132l4.259,4.116l2.31-1.203c0.042-0.027,0.09-0.048,0.132-0.074l6.797-3.55l3.428-8.217
+	c0.005-0.016,0.011-0.032,0.021-0.042c0.064-0.148,0.18-0.275,0.334-0.36c0.265-0.138,0.572-0.106,0.8,0.058L59.5,23.606z"/>
+<path fill="#FFFFFF" d="M55.829,26.231l-6.338-12.142c-0.01-0.014-0.018-0.027-0.029-0.04c-0.044-0.056-0.094-0.105-0.151-0.146
+	c-0.226-0.165-0.534-0.199-0.798-0.06c-0.155,0.082-0.271,0.21-0.337,0.359c-0.009,0.013-0.014,0.029-0.019,0.044l-3.426,8.217
+	l-6.798,3.549c-0.045,0.023-0.091,0.047-0.133,0.071l-2.311,1.207l-2.014,1.051l-0.527-1.009c-0.299-0.572-1.001-0.793-1.573-0.494
+	c-0.57,0.298-0.793,1.001-0.494,1.573l0.527,1.009l-1.946,1.016l-1.681-3.218l3.016-1.574c0.774-0.405,1.075-1.362,0.671-2.136
+	c-0.065-0.126-0.145-0.238-0.238-0.338l-0.137-0.133c-0.477-0.407-1.172-0.507-1.76-0.2l-8.907,4.649
+	c-0.775,0.405-1.076,1.362-0.672,2.137c0.064,0.121,0.14,0.231,0.23,0.328c0.046,0.053,0.097,0.102,0.149,0.145
+	c0.476,0.405,1.17,0.504,1.758,0.196l3.015-1.573l1.679,3.218l-2.148,1.121l-0.527-1.009c-0.299-0.57-1.004-0.791-1.573-0.494
+	c-0.151,0.078-0.276,0.185-0.376,0.31c-0.275,0.35-0.338,0.842-0.119,1.263l0.527,1.009l-3.27,1.708
+	c-0.045,0.022-0.089,0.045-0.134,0.069l-7.788,4.066L8.52,39.402C8.513,39.4,8.506,39.399,8.5,39.398
+	c-0.074-0.014-0.153-0.003-0.225,0.033c-0.159,0.083-0.227,0.271-0.164,0.433l2.914,5.581c0.007,0.011,0.015,0.021,0.023,0.03
+	l0.004,0.005l0.042,0.04c0.103,0.086,0.252,0.105,0.38,0.039c0.072-0.038,0.124-0.096,0.155-0.165
+	c0.003-0.006,0.006-0.012,0.008-0.019l1.067-2.558l3.117-1.628c0.012,0.886,0.226,1.782,0.664,2.62
+	c1.496,2.864,5.032,3.975,7.897,2.479c0.045-0.023,0.089-0.047,0.133-0.071l3.27-1.708l0.611,1.172
+	c0.298,0.57,1.004,0.791,1.573,0.494c0.57-0.298,0.793-1.002,0.495-1.573l-0.611-1.17l2.148-1.122l1.784,3.416
+	c0.415,0.795,1.394,1.103,2.189,0.688c0.222-0.115,0.407-0.276,0.545-0.463c0.365-0.484,0.44-1.153,0.141-1.726l-1.782-3.416
+	l1.946-1.016l0.611,1.17c0.298,0.57,1.002,0.793,1.573,0.495c0.572-0.299,0.791-1.004,0.494-1.573l-0.611-1.172l4.512-2.356
+	c0.312-0.166,0.602-0.358,0.87-0.57c2.164-1.708,2.879-4.766,1.557-7.298c-0.437-0.837-1.05-1.525-1.769-2.042l2.127-1.11
+	l8.751,1.897c0.017,0.004,0.031,0.009,0.046,0.01c0.162,0.031,0.332,0.01,0.488-0.072C55.818,26.993,55.966,26.586,55.829,26.231z
+	 M22.951,43.399c-0.02,0.012-0.039,0.022-0.06,0.033c-1.288,0.673-2.875,0.174-3.548-1.114c-0.671-1.287-0.174-2.874,1.111-3.547
+	l3.408-1.779l2.433,4.66L22.951,43.399z M28.361,40.574l-2.433-4.66l0.142-0.074l2.006-1.047l2.433,4.66l-0.458,0.239L28.361,40.574
+	z M33.386,37.952l-2.433-4.66l1.946-1.016l2.433,4.66L33.386,37.952z M41.458,33.733c-0.028,0.018-0.058,0.035-0.087,0.05
+	l-3.972,2.074l-2.433-4.66l2.962-1.547l0.949-0.495c0.051-0.026,0.101-0.05,0.153-0.074c1.258-0.559,2.749-0.05,3.395,1.187
+	c0.57,1.089,0.3,2.393-0.575,3.176C41.73,33.55,41.6,33.648,41.458,33.733z"/>
+</svg>
diff --git a/data/icons/64/com.github.bleakgrey.tootle.svg b/data/icons/64/com.github.bleakgrey.tootle.svg
deleted file mode 100644
index d545862..0000000
--- a/data/icons/64/com.github.bleakgrey.tootle.svg
+++ /dev/null
@@ -1,266 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://creativecommons.org/ns#"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   version="1.1"
-   id="svg4332"
-   height="64px"
-   width="64px"
-   inkscape:version="0.91 r13725"
-   sodipodi:docname="64.svg">
-  <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="1017"
-     id="namedview46"
-     showgrid="true"
-     inkscape:zoom="8"
-     inkscape:cx="19.16215"
-     inkscape:cy="32.785763"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg4332">
-    <inkscape:grid
-       type="xygrid"
-       id="grid4203"
-       empspacing="4" />
-    <inkscape:grid
-       type="xygrid"
-       id="grid4187"
-       empspacing="2"
-       spacingx="0.5"
-       spacingy="0.5"
-       color="#ff3fff"
-       opacity="0.29803922"
-       empcolor="#3fffff"
-       empopacity="0.1372549" />
-  </sodipodi:namedview>
-  <defs
-     id="defs4334">
-    <linearGradient
-       x1="38.856056"
-       y1="26.320496"
-       x2="38.856056"
-       y2="32.521935"
-       id="linearGradient4225-5"
-       xlink:href="#linearGradient4213-9"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.99215968,0,0,-0.9932415,0.25417006,63.794031)" />
-    <linearGradient
-       id="linearGradient4213-9">
-      <stop
-         id="stop4215-4"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4217-1"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       y2="42.091705"
-       x2="23.99999"
-       y1="5.9093657"
-       x1="23.99999"
-       gradientTransform="matrix(1.4324324,0,0,1.4362832,-2.3783747,-2.4707827)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3904"
-       xlink:href="#linearGradient4270" />
-    <linearGradient
-       id="linearGradient4270">
-      <stop
-         id="stop4272"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4274"
-         style="stop-color:#ffffff;stop-opacity:0.23529412"
-         offset="0.0348749" />
-      <stop
-         id="stop4276"
-         style="stop-color:#ffffff;stop-opacity:0.15686275"
-         offset="0.96216321" />
-      <stop
-         id="stop4278"
-         style="stop-color:#ffffff;stop-opacity:0.39215687"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       r="12.671875"
-       fy="9.9571075"
-       fx="6.2001843"
-       cy="9.9571075"
-       cx="6.7304144"
-       gradientTransform="matrix(0,13.393984,-16.443533,0,196.90205,-114.89368)"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient4147"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148-57-177-8-3-3-6-4-8-8-8-5">
-      <stop
-         id="stop3750-1-0-7-6-6-1-3-9-3"
-         style="stop-color:#95a3ab;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3752-3-7-4-0-32-8-923-0-7"
-         style="stop-color:#667885;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop3754-1-8-5-2-7-6-7-1-9"
-         style="stop-color:#485a6c;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop3756-1-6-2-6-6-1-96-6-0"
-         style="stop-color:#273445;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-166-749-654"
-       id="radialGradient2873-966-168-714"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-166-749-654">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop3088" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3090" />
-    </linearGradient>
-    <radialGradient
-       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)"
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3688-464-309-604"
-       id="radialGradient2875-742-326-419"
-       fy="43.5"
-       fx="4.9929786"
-       r="2.5"
-       cy="43.5"
-       cx="4.9929786" />
-    <linearGradient
-       id="linearGradient3688-464-309-604">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop3094" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3096" />
-    </linearGradient>
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       xlink:href="#linearGradient3702-501-757-795"
-       id="linearGradient2877-634-617-908"
-       y2="39.999443"
-       x2="25.058096"
-       y1="47.027729"
-       x1="25.058096" />
-    <linearGradient
-       id="linearGradient3702-501-757-795">
-      <stop
-         offset="0"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3100" />
-      <stop
-         offset="0.5"
-         style="stop-color:#181818;stop-opacity:1"
-         id="stop3102" />
-      <stop
-         offset="1"
-         style="stop-color:#181818;stop-opacity:0"
-         id="stop3104" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata4337">
-    <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>
-  <g
-     id="g4178">
-    <g
-       style="opacity:0.4"
-       id="g3712"
-       transform="matrix(1.5789502,0,0,0.7142857,-5.8947511,28.428574)">
-      <rect
-         style="fill:url(#radialGradient2873-966-168-714);fill-opacity:1;stroke:none"
-         id="rect2801"
-         y="40"
-         x="38"
-         height="7"
-         width="5" />
-      <rect
-         style="fill:url(#radialGradient2875-742-326-419);fill-opacity:1;stroke:none"
-         id="rect3696"
-         transform="scale(-1,-1)"
-         y="-47"
-         x="-10"
-         height="7"
-         width="5" />
-      <rect
-         style="fill:url(#linearGradient2877-634-617-908);fill-opacity:1;stroke:none"
-         id="rect3700"
-         y="40"
-         x="10"
-         height="7.0000005"
-         width="28" />
-    </g>
-    <rect
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient4147);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate"
-       id="rect5505-21-3-8-5-2-9"
-       y="4.5"
-       x="4.5"
-       ry="3"
-       rx="3"
-       height="55"
-       width="55" />
-    <rect
-       width="53"
-       height="53.142479"
-       rx="2"
-       ry="2"
-       x="5.5"
-       y="5.428761"
-       id="rect6741"
-       style="opacity:0.3;fill:none;stroke:url(#linearGradient3904);stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-    <rect
-       width="55"
-       height="55"
-       rx="3"
-       ry="3"
-       x="4.5"
-       y="4.5"
-       id="rect5505-21-9"
-       style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.5;fill:none;stroke:#0e141f;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/data/icons/LICENSE b/data/icons/LICENSE
new file mode 100644
index 0000000..1a07481
--- /dev/null
+++ b/data/icons/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2018 CallMeFib3r
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.