146 files changed, 388 insertions, 3498 deletions
diff --git a/.gitignore b/.gitignore
index 2408dab..b9140e1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,6 +5,7 @@
 /META.yml
 /blib/
 /pm_to_blib
+/local/
 /homepanel.conf
 /homepanel.pid
 /homepanel.out
diff --git a/cpanfile b/cpanfile
index f5e5350..97ed0e9 100644
--- a/cpanfile
+++ b/cpanfile
@@ -1,21 +1,22 @@
-requires perl => "5.014";
+requires perl => "5.036";
 requires "Class::Load";
 requires "Config::Any";
 requires "Config::General";
 requires "curry::weak";
-requires "Daemon::Control";
 requires "Data::Printer";
 requires "DateTime";
 requires "DateTime::Format::Duration";
 requires "DateTime::Format::ISO8601";
 requires "DateTime::TimeZone";
+requires "Future::AsyncAwait";
 requires "IO::Async::Loop";
+requires "IO::Async::SSL";
 requires "IO::Async::Timer::Periodic";
 requires "JSON";
 requires "LWP::UserAgent";
 requires "LWP::Protocol::https";
 requires "Moo";
-requires "namespace::autoclean";
+requires "namespace::clean";
 requires "Net::Async::HTTP";
 requires "Package::Variant";
 requires "Path::Class";
@@ -33,5 +34,3 @@ requires "Types::Standard";
 requires "Types::URI";
 requires "Type::Utils";
 requires "URI";
-requires "XML::LibXML";
-requires "XML::LibXML::XPathContext";
diff --git a/driver-async.pl b/driver-async.pl
index 0d8e86a..c158315 100755
--- a/driver-async.pl
+++ b/driver-async.pl
@@ -2,6 +2,7 @@
 use strict;
 use warnings;
 use 5.014;
+use lib 'local/lib/perl5';
 use lib 'lib';
 use HomePanel::Driver;
 use Path::Tiny;
@@ -18,6 +19,9 @@ my $hp = HomePanel::Driver->new({
     template_file => ($config{template} || path(__FILE__)->parent->child('forecast.html.tt')),
     output_file => ($config{output_file} || path(__FILE__)->parent->child('forecast.html')),
     forecast_key => $config{forecast_key},
+    forecast_latitude => $config{forecast_latitude},
+    forecast_longitude => $config{forecast_longitude},
+    bus_stop_ids => $config{bus_stop_id},
 });
 
 $hp->start;
diff --git a/driver.pl b/driver.pl
deleted file mode 100644
index df8e1fa..0000000
--- a/driver.pl
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.014;
-use WebService::ForecastIo::Response;
-use WebService::TFL::Bus;
-use WebService::TFL::Bus::Request;
-use WebService::TFL::TubeStatus;
-use HomePanel::Render;
-use Path::Class;
-
-my $forecast = WebService::ForecastIo::Response->new(
-    file($ARGV[0])->slurp(iomode=>'<:raw')
-);
-my $bus = WebService::TFL::Bus->new()->request(
-    WebService::TFL::Bus::Request->new({
-        StopPointName => 'Hotspur Road',
-        #Towards => 'Islip Manor',
-        ReturnList => [qw(StopID StopCode1 VisitNumber TripID VehicleID LineID LineName DirectionID DestinationText DestinationName EstimatedTime)],
-    }),
-);
-my $tube = WebService::TFL::TubeStatus->new()->request();
-my $template = file(__FILE__)->parent->file('forecast.html.tt');
-
-binmode STDOUT,':utf8';
-
-print
-    HomePanel::Render->new({
-        template_file => $template,
-        forecast => $forecast,
-        bus => $bus,
-        tube => $tube,
-    })->render;
diff --git a/forecast.html.tt b/forecast.html.tt
index 0decb3b..5012799 100644
--- a/forecast.html.tt
+++ b/forecast.html.tt
@@ -1,94 +1,120 @@
 [%
- USE Number.Format(DECIMAL_DIGITS=1);
- cur = f.currently; today = f.daily.data.0;
- today_start = f.hourly.data.0.time.clone
- today_stop = f.hourly.data.0.time.clone.add('days'=>1);
- hourly = f.hourly.slice('from', today_start, 'to', today_stop);
- MACRO hours_length(span) BLOCK;
-  d=span.stop_time.subtract_datetime(span.start_time);
-  format_duration(
-    'pattern','%k',
-    'base',span.start_time,
-    'normalize',1).format_duration(d);
- END;
- MACRO time(d) BLOCK;
-  d.clone.set_time_zone('Europe/London').strftime('%H:%M');
- END;
- MACRO minsec_until(d) BLOCK;
-  dur=d.subtract_datetime(now);
-  format_duration(
-    'pattern','%M:%S',
-    'base',now,
-    'normalize',1).format_duration(dur);
- END;
+   USE Number.Format(DECIMAL_DIGITS=1);
+   cur = f.currently; today = f.daily.data.0;
+   today_start = f.hourly.data.0.time.clone
+   today_stop = f.hourly.data.0.time.clone.add('days'=>1);
+   hourly = f.hourly.slice('from', today_start, 'to', today_stop);
+   MACRO hours_length(span) BLOCK;
+   d=span.stop_time.subtract_datetime(span.start_time);
+   format_duration(
+     'pattern','%k',
+     'base',span.start_time,
+     'normalize',1).format_duration(d);
+   END;
+   MACRO time(d) BLOCK;
+   d.clone.set_time_zone('Europe/London').strftime('%H:%M');
+   END;
+   MACRO minsec_until(d) BLOCK;
+   dur=d.subtract_datetime(now);
+   format_duration(
+     'pattern','%M:%S',
+     'base',now,
+     'normalize',1).format_duration(dur);
+   END;
 -%]
 <html>
   <head>
     <title>Forecast</title>
     <meta http-equiv="Content-type" content="text/html; charset=utf-8" />
     <meta http-equiv="refresh" content="5" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
     <style type="text/css">
-      body, table {
-        font-size: 30px;
-      }
-      
-      table { border-collapse: collapse; empty-cells: show }
-      table td { border: dotted thin black; padding: 3px }
-
-      div.forecast dt { display: none }
-      div.forecast dd { display: inline; margin: 0; border: 0 }
-
-      .icon img {
-        width: 2em; height: 2em;
-        float: left; margin: 0 5px 5px 0;
-      }
-
-      div.currently, div.next-hour, div.next-day, div.next-week {
-        width: 24%;
-        position: absolute; top: 5px;
-      }
-
-      div.currently { left: 5px }
-      div.next-hour { left: 25% }
-      div.next-day { left: 50% }
-      div.next-week { right: 5px }
-
-      div.today {
-        position: absolute; top: 8em; left: 5px;
-        float: left; clear: none;
-        width: 40%;
-        margin-right: 5px;
-      }
-
-      dl.today dt.temperature, dl.today dd.temperature { display: inherit }
-      dl.today dt.sunrise, dl.today dt.sunset { display: inline }
-
-      div.bus {
-        position: absolute; left: 38%; top: 10em;
-      }
-
-      div.bus td.destination { width: 5em }
-
-      div.tube {
-        position: absolute; left: 5px; top: 20em;
-        width: 75%;
-      }
-
-      div.tube table { font-size: 75% }
-
-      div.tube td.status { width: 8em }
-      div.tube td.details { width: 10em }
-
-      div.timeline { position: absolute; right: 5px; bottom: 5px; }
-      div.timeline table { font-size: 75% }
-
-      .stripes {
-        text-align: center;
-        border: solid thin black;
-      }
-      .stripes span {
-        vertical-align: middle;
-      }
+     body, table {
+       font-size: 3.2vw;
+     }
+
+     table { border-collapse: collapse; empty-cells: show }
+     table td { border: solid thin black; padding: 3px }
+
+     div.forecast dt { display: none }
+     div.forecast dd { display: inline; margin: 0; border: 0 }
+
+     .icon img {
+       height: 2em;
+       float: left; margin: 0 5px 5px 0;
+     }
+
+     div.currently, div.next-hour, div.next-day, div.next-week {
+       width: 24%;
+       position: absolute; top: 5px;
+     }
+
+     div.currently { left: 5px }
+     div.next-hour { left: 25% }
+     div.next-day { left: 50% }
+     div.next-week { right: 5px }
+
+     div.today {
+       position: absolute; top: 8em; left: 5px;
+       float: left; clear: none;
+       width: 40%;
+       margin-right: 5px;
+     }
+
+     dl.today dt.temperature, dl.today dd.temperature { display: inherit }
+     dl.today dt.sunrise, dl.today dt.sunset { display: inline }
+
+     td.line {
+       font-family: sans;
+       font-weight: bold;
+       text-transform: uppercase;
+       text-align: center;
+     }
+
+     div.bus {
+       position: absolute; right: 2em; top: 8em;
+     }
+
+     div.bus td.line { background-color: #DC241F; color: #fff }
+
+     div.bus td.destination { width: 5em }
+
+     div.tube {
+       position: absolute; left: 5px; top: 20em;
+       width: 75%; height: calc(100% - 20em);
+       overflow-y: scroll;
+     }
+
+     .bakerloo { background-color: #B26300; color: #fff; }
+     .central { background-color: #DC241F; color: #fff; }
+     .circle { background-color: #FFC80A; color: #fff; }
+     .district { background-color: #007D32; color: #fff; }
+     .dlr { background-color: #00AFAD; color: #fff; }
+     .elizabeth { background-color: #60399E; color: #fff; }
+     .hammersmith-city { background-color: #F589A6; color: #fff; }
+     .jubilee { background-color: #838D93; color: #fff; }
+     .london-overground { background-color: #FA7B05; color: #fff; }
+     .metropolitan { background-color: #9B0058; color: #fff; }
+     .northern { background-color: #000000; color: #fff; }
+     .piccadilly { background-color: #0019A8; color: #fff; }
+     .victoria { background-color: #039BE5; color: #fff; }
+     .waterloo-city { background-color: #76D0BD; color: #fff; }
+
+     div.tube table { font-size: 75% }
+
+     div.tube td.status { width: 8em }
+     div.tube td.details { width: 10em; font-size: 66% }
+
+     div.timeline { position: absolute; right: 5px; bottom: 5px; }
+     div.timeline table { font-size: 75% }
+
+     .stripes {
+       text-align: center;
+       border: solid thin black;
+     }
+     .stripes span {
+       vertical-align: middle;
+     }
     </style>
   </head>
   <body>
@@ -150,12 +176,12 @@
           <tr><th>Line</th><th>Destination</th><th>When</th></tr>
         </thead>
         <tbody>
-          [% FOREACH p IN b.Prediction %]
-          <tr>
-            <td class="line">[% p.LineName %]</td>
-            <td class="destination">[% p.DestinationText %]</td>
-            <td class="eta">[% minsec_until(p.EstimatedTime) %]</td>
-          </tr>
+          [% FOREACH p IN b.predictions %]
+            <tr>
+              <td class="line">[% p.lineName %]</td>
+              <td class="destination">[% p.destinationName %]</td>
+              <td class="eta">[% minsec_until(p.expectedArrival) %]</td>
+            </tr>
           [% END %]
         </tbody>
       </table>
@@ -178,11 +204,11 @@
         </thead>
         <tbody>
           [% FOREACH line IN t.lines %]
-          <tr>
-            <td class="line">[% line.name %]</td>
-            <td class="status">[% line.status.description %]</td>
-            <td class="details">[% line.status.details %]</td>
-          </tr>
+            <tr>
+              <td class="line [% line.id %]">[% line.name %]</td>
+              <td class="status">[% line.status.statusSeverityDescription %]</td>
+              <td class="details">[% line.status.reason %]</td>
+            </tr>
           [% END %]
         </tbody>
       </table>
diff --git a/forecast.pl b/forecast.pl
deleted file mode 100644
index 927e980..0000000
--- a/forecast.pl
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use 5.014;
-use WebService::ForecastIo;
-use JSON;
-use Data::Printer;
-
-my $key=$ARGV[0];
-
-my $fio = WebService::ForecastIo->new({
-    api_key => $key,
-});
-
-my $json = $fio->request({
-    latitude => 51.54,
-    longitude => -0.37,
-    exclude => ['flags','sources'],
-    raw => 1,
-});
-
-say $json;
diff --git a/homepanel-control b/homepanel-control
deleted file mode 100755
index f8a20ad..0000000
--- a/homepanel-control
+++ /dev/null
@@ -1,49 +0,0 @@
-#!/usr/bin/env perl
-use strict;
-use warnings;
-use Daemon::Control;
-use Path::Tiny;
-use Config::Any;
-
-my $basedir = path(__FILE__)->parent->realpath;
-
-my $config_file = $basedir->child('homepanel.conf');
-my $cfg_set = Config::Any->load_files({
-    files => [$config_file],
-    use_ext => 1,
-});
-my %config = map { %{(values %$_)[0]} } @$cfg_set;
-my $dest_dir = path($config{output_file})->parent->realpath;
-my $icons = $basedir->child('icons');
-
-exit Daemon::Control->new(
-    init_code => <<"INIT",
-if [ ! -d $dest_dir/icons ]; then
-  mkdir -p $dest_dir
-  mount -t tmpfs none $dest_dir
-  cp -a $icons $dest_dir/
-fi
-
-export PERL5LIB="/home/dakkar/.perlbrew/libs/perl-5.30.2\@HomePanel/lib/perl5"
-export PATH="/home/dakkar/.perlbrew/libs/perl-5.30.2\@HomePanel/bin:/home/dakkar/perl5/perlbrew/bin:/home/dakkar/perl5/perlbrew/perls/perl-5.30.2/bin:\$PATH"
-INIT
-
-    name        => "HomePanel",
-    lsb_sdesc   => 'Home info panel',
-    lsb_desc    => 'Show forecast, tube, bus status.',
-    path        => path(__FILE__)->realpath,
-
-    program     => $basedir->child('driver-async.pl'),
-    program_args => [ $config_file ],
-
-    user => 'dakkar',
-    group => 'users',
-    directory => $basedir,
-
-    pid_file    => $basedir->child('homepanel.pid'),
-    stderr_file => $basedir->child('homepanel.err'),
-    stdout_file => $basedir->child('homepanel.out'),
-
-    fork        => 2,
-
-)->run;
diff --git a/homepanel.initd b/homepanel.initd
deleted file mode 100755
index d04dbd1..0000000
--- a/homepanel.initd
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-# Generated at Sat Mar 21 17:12:32 2020 with Daemon::Control 0.00101
-
-### BEGIN INIT INFO
-# Provides:          HomePanel
-# Required-Start:    
-# Required-Stop:     
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Home info panel
-# Description:       Show forecast, tube, bus status.
-### END INIT INFO`
-
-
-
-if [ ! -d /var/www/localhost/htdocs/panel/icons ]; then
-  mkdir -p /var/www/localhost/htdocs/panel
-  mount -t tmpfs none /var/www/localhost/htdocs/panel
-  cp -a /home/dakkar/src/HomePanel/icons /var/www/localhost/htdocs/panel/
-fi
-
-export PERL5LIB="/home/dakkar/.perlbrew/libs/perl-5.30.2@HomePanel/lib/perl5"
-export PATH="/home/dakkar/.perlbrew/libs/perl-5.30.2@HomePanel/bin:/home/dakkar/perl5/perlbrew/bin:/home/dakkar/perl5/perlbrew/perls/perl-5.30.2/bin:$PATH"
-
-
-if [ -x /home/dakkar/src/HomePanel/homepanel-control ];
-then
-    /home/dakkar/src/HomePanel/homepanel-control $1
-else
-    echo "Required program /home/dakkar/src/HomePanel/homepanel-control not found!"
-    exit 1;
-fi
diff --git a/homepanel.openrc b/homepanel.openrc
new file mode 100755
index 0000000..72a34a6
--- /dev/null
+++ b/homepanel.openrc
@@ -0,0 +1,34 @@
+#!/sbin/openrc-run
+
+thisdir="$(dirname "$(readlink -f "$1")")"
+homepanel_config_file="${thisdir}/homepanel.conf"
+
+description="Home info panel"
+directory="$thisdir"
+command="/usr/bin/env PERL5LIB='${thisdir}/local/lib/perl5' PATH='/home/dakkar/perl5/perlbrew/perls/perl-5.36.0/bin:/bin:/usr/bin' ./driver-async.pl"
+command_args="$homepanel_config_file"
+pidfile="${thisdir}/homepanel.pid"
+command_background=true
+command_user=dakkar
+output_log="${thisdir}/homepanel.out"
+error_log="${thisdir}/homepanel.err"
+directory="$thisdir"
+name="HomePanel"
+procname="perl"
+
+depend() {
+    need localmount net
+    after bootmisc
+}
+
+start_pre() {
+    local forecast_key output_file
+    . $homepanel_config_file
+    local dest_dir="$(dirname "$output_file")"
+    local fstype="$(stat -f -c %T "$dest_dir")"
+    if [[ "$fstype" != tmpfs ]]; then
+        mkdir -p "$dest_dir"
+        mount -t tmpfs none "$dest_dir"
+        cp -a "$thisdir/icons" "$dest_dir/"
+    fi
+}
diff --git a/icons/1.png b/icons/1.png
deleted file mode 100644
index 7955877..0000000
--- a/icons/1.png
+++ /dev/null
diff --git a/icons/1.svg b/icons/1.svg
deleted file mode 100644
index 82ef012..0000000
--- a/icons/1.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M177.615,288c7.438-36.521,39.688-64,78.396-64
-			c38.709,0,70.958,27.479,78.376,64h32c-7.834-54.125-54.084-96-110.376-96c-56.271,0-102.541,41.875-110.375,96H177.615z
-			 M256.011,160c8.833,0,16-7.167,16-16v-32c0-8.833-7.167-16-16-16c-8.832,0-16,7.167-16,16v32
-			C240.011,152.833,247.179,160,256.011,160z M403.073,156.917c-6.249-6.25-16.374-6.25-22.625,0l-22.625,22.625
-			c-6.249,6.25-6.249,16.375,0,22.625c6.251,6.25,16.376,6.25,22.625,0l22.625-22.625
-			C409.323,173.292,409.323,163.167,403.073,156.917z M154.177,179.542l-22.625-22.625c-6.249-6.25-16.373-6.25-22.625,0
-			c-6.249,6.25-6.249,16.375,0,22.625l22.625,22.625c6.252,6.25,16.376,6.25,22.625,0
-			C160.429,195.917,160.429,185.792,154.177,179.542z M352.011,320h-192c-8.832,0-16,7.167-16,16s7.168,16,16,16h192
-			c8.833,0,16-7.167,16-16S360.844,320,352.011,320z M320.011,384h-128c-8.832,0-16,7.167-16,16s7.168,16,16,16h128
-			c8.833,0,16-7.167,16-16S328.844,384,320.011,384z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/10.png b/icons/10.png
deleted file mode 100644
index 4df9fb8..0000000
--- a/icons/10.png
+++ /dev/null
diff --git a/icons/10.svg b/icons/10.svg
deleted file mode 100644
index 5bd1551..0000000
--- a/icons/10.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M256,95c8.833,0,16-7.167,16-16V47c0-8.833-7.167-16-16-16s-16,7.167-16,16v32
-			C240,87.833,247.167,95,256,95z M380.438,137.167l22.625-22.625c6.249-6.25,6.249-16.375,0-22.625
-			c-6.25-6.25-16.375-6.25-22.625,0l-22.625,22.625c-6.25,6.25-6.25,16.375,0,22.625S374.188,143.417,380.438,137.167z M64,255h32
-			c8.833,0,16-7.167,16-16s-7.167-16-16-16H64c-8.833,0-16,7.167-16,16S55.167,255,64,255z M400,239c0,8.833,7.167,16,16,16h32
-			c8.833,0,16-7.167,16-16s-7.167-16-16-16h-32C407.167,223,400,230.167,400,239z M131.541,137.167c6.251,6.25,16.376,6.25,22.625,0
-			c6.251-6.25,6.251-16.375,0-22.625l-22.625-22.625c-6.25-6.25-16.374-6.25-22.625,0c-6.25,6.25-6.25,16.375,0,22.625
-			L131.541,137.167z M145.625,255h32c-1.062-5.167-1.625-10.521-1.625-16c0-44.188,35.812-80,80-80c44.188,0,80,35.812,80,80
-			c0,5.479-0.562,10.833-1.625,16h32c0.792-5.271,1.625-10.521,1.625-16c0-61.75-50.25-112-112-112s-112,50.25-112,112
-			C144,244.479,144.875,249.729,145.625,255z M448,287H64c-8.833,0-16,7.167-16,16s7.167,16,16,16h384c8.833,0,16-7.167,16-16
-			S456.833,287,448,287z M448,351H64c-8.833,0-16,7.167-16,16s7.167,16,16,16h384c8.833,0,16-7.167,16-16S456.833,351,448,351z
-			 M448,415H64c-8.833,0-16,7.167-16,16s7.167,16,16,16h384c8.833,0,16-7.167,16-16S456.833,415,448,415z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/11.png b/icons/11.png
deleted file mode 100644
index e4ad1a3..0000000
--- a/icons/11.png
+++ /dev/null
diff --git a/icons/11.svg b/icons/11.svg
deleted file mode 100644
index 4a260a3..0000000
--- a/icons/11.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M64,319.001h384c8.833,0,16-7.167,16-16s-7.167-16-16-16H64c-8.833,0-16,7.167-16,16
-			S55.167,319.001,64,319.001z M448,351.001H64c-8.833,0-16,7.167-16,16s7.167,16,16,16h384c8.833,0,16-7.167,16-16
-			S456.833,351.001,448,351.001z M448,415.001H64c-8.833,0-16,7.167-16,16s7.167,16,16,16h384c8.833,0,16-7.167,16-16
-			S456.833,415.001,448,415.001z M205.042,255c-0.333-0.333-0.751-0.542-1.083-0.875c-37.438-37.438-37.438-98.334,0-135.792
-			c2.562-2.542,5.27-4.958,8.146-7.208c-2.251,35.958,10.729,71.375,37.104,97.729c26.374,26.396,61.79,39.333,97.749,37.083
-			c-2.667,3.396-5.874,6.125-8.896,9.062h41.521c5.042-8.042,9.25-16.75,12.583-26.063c2.021-5.854,0.542-12.333-3.833-16.667
-			c-4.291-4.354-10.792-5.854-16.624-3.791c-35.376,12.499-73.646,3.979-99.875-22.25c-26.251-26.25-34.792-64.521-22.251-99.896
-			c2.083-5.812,0.583-12.271-3.791-16.646c-4.334-4.354-10.813-5.833-16.625-3.771c-18.521,6.542-34.625,16.604-47.833,29.792
-			C138.125,138.917,132.479,205.479,164.062,255H205.042z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/12.png b/icons/12.png
deleted file mode 100644
index f3a7665..0000000
--- a/icons/12.png
+++ /dev/null
diff --git a/icons/12.svg b/icons/12.svg
deleted file mode 100644
index a53981f..0000000
--- a/icons/12.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M33.604,256C32.562,250.833,32,245.479,32,240
-			c0-44.188,35.812-80,80-80c10.812,0,21.062,2.208,30.438,6.083C163.667,124.667,206.291,96,256,96s92.334,28.667,113.541,70.083
-			C378.938,162.208,389.209,160,400,160c44.188,0,80,35.812,80,80c0,5.479-0.562,10.833-1.625,16h32
-			c0.792-5.271,1.625-10.521,1.625-16c0-61.75-50.25-112-112-112c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,88.417,307.188,64,256,64s-98.312,24.417-128.208,65.125C122.562,128.375,117.312,128,112,128C50.25,128,0,178.25,0,240
-			c0,5.479,0.854,10.729,1.625,16H33.604z M496,288H16c-8.833,0-16,7.167-16,16s7.167,16,16,16h480c8.833,0,16-7.167,16-16
-			S504.833,288,496,288z M496,352H16c-8.833,0-16,7.167-16,16s7.167,16,16,16h480c8.833,0,16-7.167,16-16S504.833,352,496,352z
-			 M496,416H16c-8.833,0-16,7.167-16,16s7.167,16,16,16h480c8.833,0,16-7.167,16-16S504.833,416,496,416z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/13.png b/icons/13.png
deleted file mode 100644
index 3095b73..0000000
--- a/icons/13.png
+++ /dev/null
diff --git a/icons/13.svg b/icons/13.svg
deleted file mode 100644
index 105bb4e..0000000
--- a/icons/13.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M112,160h288c8.833,0,16-7.167,16-16s-7.167-16-16-16H112c-8.833,0-16,7.167-16,16S103.167,160,112,160z
-			 M400,192H112c-8.833,0-16,7.167-16,16s7.167,16,16,16h288c8.833,0,16-7.167,16-16S408.833,192,400,192z M400,256H112
-			c-8.833,0-16,7.167-16,16s7.167,16,16,16h288c8.833,0,16-7.167,16-16S408.833,256,400,256z M400,320H112c-8.833,0-16,7.167-16,16
-			s7.167,16,16,16h288c8.833,0,16-7.167,16-16S408.833,320,400,320z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/14.png b/icons/14.png
deleted file mode 100644
index c05b879..0000000
--- a/icons/14.png
+++ /dev/null
diff --git a/icons/14.svg b/icons/14.svg
deleted file mode 100644
index f104170..0000000
--- a/icons/14.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M400,160c-5.312,0-10.562,0.375-15.792,1.125
-	C354.334,120.417,307.188,96,256,96s-98.312,24.417-128.208,65.125C122.562,160.375,117.312,160,112,160C50.25,160,0,210.25,0,272
-	c0,61.75,50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,401.917,217.5,416,256,416
-	c38.542,0,75.333-14.083,104.291-39.333C372.916,381.5,386.312,384,400,384c61.75,0,112-50.25,112-112
-	C512,210.25,461.75,160,400,160z M400,352c-17.125,0-32.916-5.5-45.938-14.667C330.584,365.624,295.624,384,256,384
-	c-39.625,0-74.584-18.376-98.062-46.667C144.938,346.5,129.125,352,112,352c-44.188,0-80-35.812-80-80s35.812-80,80-80
-	c10.812,0,21.062,2.208,30.438,6.083C163.667,156.667,206.291,128,256,128s92.334,28.667,113.541,70.083
-	C378.938,194.208,389.209,192,400,192c44.188,0,80,35.812,80,80S444.188,352,400,352z"/>
-</svg>
diff --git a/icons/15.png b/icons/15.png
deleted file mode 100644
index 798906a..0000000
--- a/icons/15.png
+++ /dev/null
diff --git a/icons/15.svg b/icons/15.svg
deleted file mode 100644
index 6d87bc8..0000000
--- a/icons/15.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125C354.334,24.417,307.188,0,256,0
-	c-51.188,0-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176s50.25,112,112,112
-	c13.688,0,27.084-2.5,39.709-7.333c21.541,18.771,47.416,31.291,75.104,36.521L192,352l32,32l-32,96l96-96l-32-32l11-32.999
-	c34.458-2.438,67.125-15.543,93.291-38.334C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z
-	 M400,256c-17.125,0-32.916-5.5-45.938-14.667c-18.938,22.833-45.562,38.625-75.875,44.104L256,288
-	c-39.625,0-74.584-18.375-98.062-46.667C144.938,250.5,129.125,256,112,256c-44.188,0-80-35.812-80-80s35.812-80,80-80
-	c10.812,0,21.062,2.208,30.438,6.083C163.667,60.667,206.291,32,256,32s92.334,28.667,113.541,70.083
-	C378.938,98.208,389.209,96,400,96c44.188,0,80,35.812,80,80S444.188,256,400,256z"/>
-</svg>
diff --git a/icons/16.png b/icons/16.png
deleted file mode 100644
index 9e42891..0000000
--- a/icons/16.png
+++ /dev/null
diff --git a/icons/16.svg b/icons/16.svg
deleted file mode 100644
index 9ebb31b..0000000
--- a/icons/16.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125C354.334,24.417,307.188,0,256,0
-			c-51.188,0-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176s50.25,112,112,112
-			c13.688,0,27.084-2.5,39.709-7.333c12.291,10.708,26.25,18.958,40.916,25.416l24.916-24.874
-			c-23.458-7.626-44.166-21.271-59.604-39.876C144.938,250.5,129.125,256,112,256c-44.188,0-80-35.812-80-80s35.812-80,80-80
-			c10.812,0,21.062,2.208,30.438,6.083C163.667,60.667,206.291,32,256,32s92.334,28.667,113.541,70.083
-			C378.938,98.208,389.209,96,400,96c44.188,0,80,35.812,80,80s-35.812,80-80,80c-17.125,0-32.916-5.5-45.938-14.667
-			c-10.375,12.521-23.312,22.667-37.625,30.584L303,312.25c20.875-6.562,40.5-16.938,57.291-31.583
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z M192,352l32,32l-32,96l96-96l-32-32l32-96
-			L192,352z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/17.png b/icons/17.png
deleted file mode 100644
index db86c80..0000000
--- a/icons/17.png
+++ /dev/null
diff --git a/icons/17.svg b/icons/17.svg
deleted file mode 100644
index d9ca7bf..0000000
--- a/icons/17.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M400,96c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,56.417,307.188,32,256,32s-98.312,24.417-128.208,65.125C122.562,96.375,117.312,96,112,96C50.25,96,0,146.25,0,208
-			c0,61.75,50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,337.917,217.5,352,256,352
-			c38.542,0,75.333-14.083,104.291-39.333C372.916,317.5,386.312,320,400,320c61.75,0,112-50.25,112-112
-			C512,146.25,461.75,96,400,96z M400,288c-17.125,0-32.916-5.5-45.938-14.667C330.584,301.625,295.624,320,256,320
-			c-39.625,0-74.584-18.375-98.062-46.667C144.938,282.5,129.125,288,112,288c-44.188,0-80-35.812-80-80s35.812-80,80-80
-			c10.812,0,21.062,2.208,30.438,6.083C163.667,92.667,206.291,64,256,64s92.334,28.667,113.541,70.083
-			C378.938,130.208,389.209,128,400,128c44.188,0,80,35.812,80,80S444.188,288,400,288z M224,448c0,17.688,14.312,32,32,32
-			s32-14.312,32-32s-32-64-32-64S224,430.312,224,448z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/18.png b/icons/18.png
deleted file mode 100644
index 8a74cb2..0000000
--- a/icons/18.png
+++ /dev/null
diff --git a/icons/18.svg b/icons/18.svg
deleted file mode 100644
index a7cba82..0000000
--- a/icons/18.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,24.417,307.188,0,256,0s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176
-			s50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z M400,256c-17.125,0-32.916-5.5-45.938-14.667
-			C330.584,269.625,295.624,288,256,288c-39.625,0-74.584-18.375-98.062-46.667C144.938,250.5,129.125,256,112,256
-			c-44.188,0-80-35.812-80-80s35.812-80,80-80c10.812,0,21.062,2.208,30.438,6.083C163.667,60.667,206.291,32,256,32
-			s92.334,28.667,113.541,70.083C378.938,98.208,389.209,96,400,96c44.188,0,80,35.812,80,80S444.188,256,400,256z M225,480
-			c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64S225,462.312,225,480z M352,448c0,17.688,14.312,32,32,32s32-14.312,32-32
-			s-32-64-32-64S352,430.312,352,448z M96,384c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64S96,366.312,96,384z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/19.png b/icons/19.png
deleted file mode 100644
index 7a506f5..0000000
--- a/icons/19.png
+++ /dev/null
diff --git a/icons/19.svg b/icons/19.svg
deleted file mode 100644
index 0fde01f..0000000
--- a/icons/19.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M417.042,166.083c-23.979-24.542-57.125-38.771-91.73-38.771
-			c-34.562,0-67.688,14.229-91.665,38.771c-52.813,2.459-95.021,46.188-95.021,99.584c0,54.958,44.709,99.666,99.688,99.666
-			c5.834,0,11.604-0.5,17.271-1.499c20.729,13.541,44.917,20.854,69.729,20.854c24.854,0,49.063-7.313,69.772-20.854
-			c5.707,0.999,11.458,1.499,17.291,1.499c54.937,0,99.625-44.708,99.625-99.666C512,212.271,469.812,168.542,417.042,166.083z
-			 M412.375,333.333c-8.312,0-16.375-1.499-24-4.417c-17.5,15.25-39.75,23.772-63.063,23.772c-23.249,0-45.499-8.522-62.999-23.772
-			c-7.625,2.918-15.75,4.417-24,4.417c-37.312,0-67.688-30.375-67.688-67.666c0-37.313,30.375-67.688,67.688-67.688
-			c3.188,0,6.375,0.229,9.521,0.688c18.104-24.583,46.541-39.354,77.478-39.354c30.938,0,59.438,14.771,77.501,39.354
-			c3.125-0.458,6.312-0.688,9.562-0.688c37.312,0,67.625,30.375,67.625,67.688C480,302.958,449.688,333.333,412.375,333.333z
-			 M144,352H16c-8.833,0-16,7.167-16,16s7.167,16,16,16h128c8.833,0,16-7.167,16-16S152.833,352,144,352z M16,320h64
-			c8.833,0,16-7.167,16-16s-7.167-16-16-16H16c-8.833,0-16,7.167-16,16S7.167,320,16,320z M48,256h64c8.833,0,16-7.167,16-16
-			s-7.167-16-16-16H48c-8.833,0-16,7.167-16,16S39.167,256,48,256z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/2.png b/icons/2.png
deleted file mode 100644
index 6a97c89..0000000
--- a/icons/2.png
+++ /dev/null
diff --git a/icons/2.svg b/icons/2.svg
deleted file mode 100644
index 8e4e5d4..0000000
--- a/icons/2.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M256,144c-61.75,0-112,50.25-112,112c0,61.75,50.25,112,112,112
-			s112-50.25,112-112C368,194.25,317.75,144,256,144z M256,336c-44.188,0-80-35.812-80-80s35.812-80,80-80s80,35.812,80,80
-			S300.188,336,256,336z M256,112c8.833,0,16-7.167,16-16V64c0-8.833-7.167-16-16-16s-16,7.167-16,16v32
-			C240,104.833,247.167,112,256,112z M256,400c-8.833,0-16,7.167-16,16v32c0,8.833,7.167,16,16,16s16-7.167,16-16v-32
-			C272,407.167,264.833,400,256,400z M380.438,154.167l22.625-22.625c6.25-6.25,6.25-16.375,0-22.625
-			c-6.25-6.25-16.375-6.25-22.625,0l-22.625,22.625c-6.25,6.25-6.25,16.375,0,22.625
-			C364.062,160.417,374.188,160.417,380.438,154.167z M131.562,357.834l-22.625,22.625c-6.25,6.249-6.25,16.374,0,22.624
-			s16.375,6.25,22.625,0l22.625-22.624c6.25-6.271,6.25-16.376,0-22.625C147.938,351.583,137.812,351.562,131.562,357.834z M112,256
-			c0-8.833-7.167-16-16-16H64c-8.833,0-16,7.167-16,16s7.167,16,16,16h32C104.833,272,112,264.833,112,256z M448,240h-32
-			c-8.833,0-16,7.167-16,16s7.167,16,16,16h32c8.833,0,16-7.167,16-16S456.833,240,448,240z M131.541,154.167
-			c6.251,6.25,16.376,6.25,22.625,0c6.251-6.25,6.251-16.375,0-22.625l-22.625-22.625c-6.25-6.25-16.374-6.25-22.625,0
-			c-6.25,6.25-6.25,16.375,0,22.625L131.541,154.167z M380.459,357.812c-6.271-6.25-16.376-6.25-22.625,0
-			c-6.251,6.25-6.271,16.375,0,22.625l22.625,22.625c6.249,6.25,16.374,6.25,22.624,0s6.25-16.374,0-22.625L380.459,357.812z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/20.png b/icons/20.png
deleted file mode 100644
index fd3cee0..0000000
--- a/icons/20.png
+++ /dev/null
diff --git a/icons/20.svg b/icons/20.svg
deleted file mode 100644
index 3f63049..0000000
--- a/icons/20.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M417.042,70.792C393.062,46.229,359.917,32,325.312,32
-			c-34.562,0-67.688,14.229-91.665,38.792c-52.813,2.438-95.021,46.167-95.021,99.542c0,54.978,44.709,99.708,99.688,99.708
-			c5.834,0,11.604-0.501,17.271-1.5c20.729,13.521,44.917,20.833,69.729,20.833c24.854,0,49.063-7.312,69.772-20.833
-			c5.707,0.999,11.458,1.5,17.291,1.5c54.938,0,99.625-44.73,99.625-99.708C512,116.958,469.812,73.208,417.042,70.792z
-			 M412.375,238.042c-8.312,0-16.375-1.5-24-4.458c-17.5,15.25-39.75,23.792-63.063,23.792c-23.249,0-45.499-8.542-62.999-23.792
-			c-7.625,2.959-15.75,4.458-24,4.458c-37.312,0-67.688-30.375-67.688-67.708c0-37.292,30.375-67.667,67.688-67.667
-			c3.188,0,6.375,0.25,9.521,0.688C265.938,78.771,294.375,64,325.312,64c30.938,0,59.438,14.771,77.501,39.354
-			c3.125-0.438,6.312-0.688,9.562-0.688c37.312,0,67.625,30.375,67.625,67.667C480,207.667,449.688,238.042,412.375,238.042z
-			 M144,256.688H16c-8.833,0-16,7.146-16,16c0,8.853,7.167,16,16,16h128c8.833,0,16-7.147,16-16
-			C160,263.834,152.833,256.688,144,256.688z M16,224.688h64c8.833,0,16-7.146,16-16c0-8.854-7.167-16-16-16H16
-			c-8.833,0-16,7.146-16,16C0,217.542,7.167,224.688,16,224.688z M48,160.688h64c8.833,0,16-7.146,16-16c0-8.854-7.167-16-16-16H48
-			c-8.833,0-16,7.146-16,16C32,153.542,39.167,160.688,48,160.688z M224,384c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64
-			S224,366.312,224,384z M352,448c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64S352,430.312,352,448z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/21.png b/icons/21.png
deleted file mode 100644
index 3c30a00..0000000
--- a/icons/21.png
+++ /dev/null
diff --git a/icons/21.svg b/icons/21.svg
deleted file mode 100644
index 959e53d..0000000
--- a/icons/21.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M326.042,443.688l-18-10.376
-			c0.542-3.124,0.958-6.311,0.958-9.624c0-3.312-0.416-6.5-1-9.625l18.042-10.396c8.417-4.917,11.291-15.729,6.458-24.104
-			c-4.876-8.479-15.667-11.375-24.125-6.5l-18.188,10.5c-4.876-4.146-10.375-7.396-16.5-9.604v-20.896
-			c0-9.771-7.938-17.688-17.688-17.688s-17.666,7.917-17.666,17.688v20.875c-6.126,2.188-11.646,5.479-16.521,9.625l-18.146-10.5
-			c-8.479-4.875-19.292-2-24.167,6.479c-4.875,8.417-1.938,19.25,6.5,24.126l17.959,10.375c-0.584,3.146-0.959,6.334-0.959,9.646
-			c0,3.313,0.375,6.5,0.959,9.624L186,443.688c-8.459,4.875-11.375,15.75-6.5,24.188s15.688,11.312,24.125,6.438l18.167-10.438
-			c4.874,4.125,10.396,7.375,16.542,9.562v20.938c0,9.749,7.916,17.624,17.666,17.624s17.688-7.875,17.688-17.624v-20.938
-			c6.125-2.188,11.688-5.438,16.521-9.625l18.167,10.5c8.458,4.875,19.249,2,24.125-6.438
-			C337.375,459.438,334.5,448.625,326.042,443.688z M256,441.375c-9.75,0-17.688-7.938-17.688-17.688s7.938-17.646,17.688-17.646
-			s17.667,7.896,17.667,17.646S265.75,441.375,256,441.375z M400,64c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,24.417,307.188,0,256,0s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176
-			s50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z M400,256c-17.125,0-32.916-5.5-45.938-14.667
-			C330.584,269.625,295.624,288,256,288c-39.625,0-74.584-18.375-98.062-46.667C144.938,250.5,129.125,256,112,256
-			c-44.188,0-80-35.812-80-80s35.812-80,80-80c10.812,0,21.062,2.208,30.438,6.083C163.667,60.667,206.291,32,256,32
-			s92.334,28.667,113.541,70.083C378.938,98.208,389.209,96,400,96c44.188,0,80,35.812,80,80S444.188,256,400,256z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/22.png b/icons/22.png
deleted file mode 100644
index 56dcb0b..0000000
--- a/icons/22.png
+++ /dev/null
diff --git a/icons/22.svg b/icons/22.svg
deleted file mode 100644
index 5fc7e81..0000000
--- a/icons/22.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M326.042,347.688l-18-10.375c0.542-3.125,0.958-6.312,0.958-9.625c0-3.312-0.416-6.5-1-9.625
-			l18.042-10.396c8.417-4.917,11.291-15.729,6.458-24.104c-4.876-8.479-15.667-11.375-24.125-6.5l-18.188,10.5
-			c-4.877-4.146-10.375-7.396-16.5-9.604v-20.896c0-9.771-7.938-17.688-17.688-17.688s-17.666,7.917-17.666,17.688v20.875
-			c-6.126,2.188-11.646,5.479-16.521,9.625l-18.146-10.5c-8.479-4.875-19.292-2-24.167,6.479c-4.875,8.417-1.938,19.25,6.5,24.126
-			l17.959,10.375c-0.584,3.146-0.959,6.334-0.959,9.646s0.375,6.5,0.959,9.623L186,347.688c-8.459,4.875-11.375,15.75-6.5,24.188
-			s15.688,11.312,24.125,6.438l18.167-10.438c4.874,4.125,10.396,7.375,16.542,9.562v20.938c0,9.749,7.916,17.624,17.666,17.624
-			s17.688-7.875,17.688-17.624v-20.938c6.125-2.188,11.688-5.438,16.521-9.625l18.167,10.5c8.458,4.875,19.249,2,24.125-6.438
-			C337.375,363.438,334.5,352.625,326.042,347.688z M256,345.375c-9.75,0-17.688-7.938-17.688-17.688s7.938-17.646,17.688-17.646
-			s17.667,7.896,17.667,17.646S265.75,345.375,256,345.375z M400,64c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,24.417,307.188,0,256,0c-51.188,0-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64
-			C50.25,64,0,114.25,0,176s50.25,112,112,112c11.812,0,23.334-2.208,34.438-5.834c1.062-5.082,2.729-10.041,5.375-14.645
-			c3.938-6.854,9.562-12.312,16-16.502c-3.312-3.229-6.938-6.104-9.875-9.688C144.938,250.5,129.125,256,112,256
-			c-44.188,0-80-35.812-80-80c0-44.188,35.812-80,80-80c10.812,0,21.062,2.208,30.438,6.083C163.667,60.667,206.291,32,256,32
-			s92.334,28.667,113.541,70.083C378.938,98.208,389.209,96,400,96c44.188,0,80,35.812,80,80c0,44.188-35.812,80-80,80
-			c-17.125,0-32.916-5.5-45.938-14.667c-2.938,3.583-6.604,6.459-9.896,9.688c6.459,4.207,12.125,9.688,16.042,16.562
-			c2.708,4.646,4.354,9.584,5.416,14.583C376.688,285.792,388.188,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/23.png b/icons/23.png
deleted file mode 100644
index 9160d1b..0000000
--- a/icons/23.png
+++ /dev/null
diff --git a/icons/23.svg b/icons/23.svg
deleted file mode 100644
index b67227f..0000000
--- a/icons/23.svg
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M326.042,443.688l-18-10.376
-			c0.542-3.124,0.958-6.311,0.958-9.624c0-3.312-0.416-6.5-1-9.625l18.042-10.396c8.417-4.917,11.291-15.729,6.458-24.104
-			c-4.876-8.479-15.667-11.375-24.125-6.5l-18.188,10.5c-4.876-4.146-10.375-7.396-16.5-9.604v-20.896
-			c0-9.771-7.938-17.688-17.688-17.688s-17.666,7.917-17.666,17.688v20.875c-6.126,2.188-11.646,5.479-16.521,9.625l-18.146-10.5
-			c-8.479-4.875-19.292-2-24.167,6.479c-4.875,8.417-1.938,19.25,6.5,24.126l17.959,10.375c-0.584,3.146-0.959,6.334-0.959,9.646
-			c0,3.313,0.375,6.5,0.959,9.624L186,443.688c-8.459,4.875-11.375,15.75-6.5,24.188s15.688,11.312,24.125,6.438l18.167-10.438
-			c4.874,4.125,10.396,7.375,16.542,9.562v20.938c0,9.749,7.916,17.624,17.666,17.624s17.688-7.875,17.688-17.624v-20.938
-			c6.125-2.188,11.688-5.438,16.521-9.625l18.167,10.5c8.458,4.875,19.249,2,24.125-6.438
-			C337.375,459.438,334.5,448.625,326.042,443.688z M256,441.375c-9.75,0-17.688-7.938-17.688-17.688s7.938-17.646,17.688-17.646
-			s17.667,7.896,17.667,17.646S265.75,441.375,256,441.375z M474.166,396.25l-12.083-3.208c-0.291-3.833-1.208-7.479-2.896-10.979
-			l8.771-8.771c4.125-4.125,4.104-10.792,0-14.854c-4.083-4.104-10.708-4.125-14.833,0l-8.791,8.75
-			c-3.459-1.625-7.146-2.562-10.959-2.875l-3.209-12.062c-1.499-5.583-7.25-8.938-12.874-7.438
-			c-5.604,1.521-8.875,7.271-7.417,12.875l3.209,11.896c-1.584,1.084-3.084,2.292-4.5,3.667c-1.375,1.417-2.542,2.916-3.626,4.459
-			l-11.896-3.209c-5.604-1.499-11.396,1.876-12.896,7.438c-1.499,5.625,1.876,11.354,7.417,12.875l12,3.229
-			c0.334,3.771,1.292,7.458,2.979,10.959l-8.812,8.812c-4.083,4.104-4.062,10.729,0.042,14.812
-			c4.083,4.083,10.708,4.125,14.792,0.042l8.832-8.833c3.459,1.707,7.168,2.666,11.001,2.957l3.166,12.021
-			c1.542,5.604,7.25,8.938,12.876,7.438c5.583-1.5,8.957-7.249,7.458-12.917l-3.209-11.896c1.5-1.062,3.042-2.25,4.459-3.625
-			c1.375-1.396,2.542-2.938,3.624-4.479l11.917,3.209c5.604,1.5,11.375-1.854,12.854-7.417
-			C483.062,403.541,479.75,397.792,474.166,396.25z M438.312,402.938c-4.125,4.125-10.771,4.104-14.875,0
-			c-4.062-4.062-4.104-10.729,0-14.854c4.104-4.083,10.771-4.083,14.875,0C442.375,392.188,442.375,398.875,438.312,402.938z
-			 M118.938,342.5l-11.875,3.188c-1.104-1.5-2.25-3.021-3.646-4.438c-1.416-1.375-2.916-2.562-4.479-3.625l3.188-11.938
-			c1.5-5.604-1.834-11.375-7.375-12.854c-5.625-1.5-11.375,1.834-12.875,7.417l-3.25,12.062c-3.812,0.312-7.458,1.25-10.938,2.896
-			l-8.812-8.771c-4.125-4.125-10.75-4.104-14.834,0c-4.104,4.104-4.104,10.75,0,14.854l8.771,8.771
-			c-1.646,3.5-2.604,7.188-2.896,10.979l-12.042,3.208c-5.625,1.542-8.959,7.25-7.458,12.875c1.521,5.583,7.271,8.875,12.896,7.417
-			l11.875-3.23c1.062,1.604,2.25,3.105,3.688,4.501c1.375,1.375,2.875,2.604,4.438,3.625l-3.188,11.896
-			c-1.5,5.625,1.834,11.417,7.416,12.917c5.626,1.5,11.334-1.833,12.834-7.438l3.25-12c3.812-0.312,7.5-1.271,11-2.938l8.791,8.792
-			c4.084,4.124,10.709,4.041,14.834-0.042c4.062-4.062,4.125-10.708,0-14.812l-8.812-8.812c1.688-3.46,2.688-7.188,2.938-11.001
-			l12.062-3.188c5.562-1.521,8.896-7.25,7.396-12.875C130.334,344.376,124.584,341.042,118.938,342.5z M88.562,370.958
-			c-4.104,4.104-10.75,4.104-14.875,0c-4.062-4.083-4.062-10.771,0-14.833c4.125-4.083,10.771-4.083,14.875,0
-			S92.625,366.875,88.562,370.958z M512,176c0-61.75-50.25-112-112-112c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,24.417,307.188,0,256,0s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176
-			s50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288C461.75,288,512,237.75,512,176z M354.062,241.333C330.584,269.625,295.624,288,256,288
-			c-39.625,0-74.584-18.375-98.062-46.667C144.938,250.5,129.125,256,112,256c-44.188,0-80-35.812-80-80s35.812-80,80-80
-			c10.812,0,21.062,2.208,30.438,6.083C163.667,60.667,206.291,32,256,32s92.334,28.667,113.541,70.083
-			C378.938,98.208,389.209,96,400,96c44.188,0,80,35.812,80,80s-35.812,80-80,80C382.875,256,367.084,250.5,354.062,241.333z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/24.png b/icons/24.png
deleted file mode 100644
index 76665aa..0000000
--- a/icons/24.png
+++ /dev/null
diff --git a/icons/24.svg b/icons/24.svg
deleted file mode 100644
index a19e77f..0000000
--- a/icons/24.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125C354.334,24.417,307.188,0,256,0
-			s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176s50.25,112,112,112
-			c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z M400,256c-9.709,0-19.209-1.75-28.25-5.208
-			l-18-6.917l-14.5,12.667C316,276.833,286.438,288,256,288s-60-11.167-83.25-31.458l-14.5-12.667l-18,6.917
-			c-9,3.458-18.541,5.208-28.25,5.208c-44.125,0-80-35.896-80-80s35.875-80,80-80c3.792,0,7.5,0.271,11.25,0.792l18.958,2.75
-			l11.354-15.458C177.875,50.979,215.209,32,256,32c40.812,0,78.125,18.958,102.417,52.063l11.375,15.479l18.999-2.75
-			C392.5,96.271,396.208,96,400,96c44.125,0,80,35.896,80,80S444.125,256,400,256z M96,320c-17.688,0-32,14.312-32,32
-			s14.312,32,32,32s32-14.312,32-32S113.688,320,96,320z M256,352c-17.688,0-32,14.312-32,32s14.312,32,32,32s32-14.312,32-32
-			S273.688,352,256,352z M416,320c-17.688,0-32,14.312-32,32s14.312,32,32,32s32-14.312,32-32S433.688,320,416,320z M352,448
-			c-17.688,0-32,14.312-32,32s14.312,32,32,32s32-14.312,32-32S369.688,448,352,448z M160,448c-17.688,0-32,14.312-32,32
-			s14.312,32,32,32s32-14.312,32-32S177.688,448,160,448z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/25.png b/icons/25.png
deleted file mode 100644
index 38f7ab5..0000000
--- a/icons/25.png
+++ /dev/null
diff --git a/icons/25.svg b/icons/25.svg
deleted file mode 100644
index 4ed88a3..0000000
--- a/icons/25.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M512,240.001c0-49.167-40-89.146-89.167-89.146c-2.396,0-4.771,0.104-7.146,0.291
-	c-23.125-28.854-57.979-45.978-95.688-45.978c-37.688,0-72.562,17.124-95.688,45.979c-2.375-0.188-4.771-0.291-7.188-0.291
-	C168,150.855,128,190.834,128,240.001c0,5.146,0.688,10.104,1.5,15.042c-0.542,0.708-1.188,1.354-1.708,2.083
-	c-5.229-0.75-10.479-1.125-15.792-1.125C50.25,256.001,0,306.25,0,368c0,61.751,50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333
-	C180.666,497.917,217.5,512,256,512c38.542,0,75.333-14.083,104.291-39.333C372.916,477.5,386.312,480,400,480
-	c61.75,0,112-50.249,112-112c0-25.688-9.042-49.083-23.666-67.999C502.916,284.105,512,263.168,512,240.001z M400,448
-	c-17.125,0-32.916-5.499-45.938-14.666C330.583,461.625,295.624,480,256,480c-39.625,0-74.584-18.375-98.062-46.666
-	C144.938,442.501,129.126,448,112,448c-44.188,0-80-35.812-80-80s35.812-79.999,80-79.999c10.812,0,21.062,2.188,30.438,6.062
-	c0.562-1.062,1.25-2,1.812-3.021c5.625-10.271,12.562-19.688,20.666-28.042C188,239.084,220.083,224,256,224
-	c49.709,0,92.334,28.666,113.541,70.062c5.646-2.312,11.668-3.813,17.875-4.812L400,288c12.334,0,23.875,3.042,34.312,8
-	c11.312,5.416,21.021,13.374,28.646,23.188c10.5,13.521,17.042,30.354,17.042,48.812C480,412.188,444.188,448,400,448z
-	 M465.562,277.625c-18.479-13.458-41-21.624-65.562-21.624c-5.312,0-10.562,0.375-15.792,1.125
-	c-29.874-40.708-77.021-65.125-128.208-65.125c-34.125,0-66.312,11.042-92.938,30.334c7.479-22.854,28.729-39.479,54.062-39.479
-	c7.75,0,15.062,1.562,21.75,4.332c15.188-29.562,45.625-50.02,81.125-50.02s65.958,20.457,81.084,50.02
-	c6.729-2.77,14.083-4.332,21.749-4.332c31.584,0,57.167,25.583,57.167,57.146C480,254.48,474.438,267.542,465.562,277.625z"/>
-</svg>
diff --git a/icons/26.png b/icons/26.png
deleted file mode 100644
index 5dd980a..0000000
--- a/icons/26.png
+++ /dev/null
diff --git a/icons/26.svg b/icons/26.svg
deleted file mode 100644
index 243fc02..0000000
--- a/icons/26.svg
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M512,134.833c0-49.146-40-89.124-89.167-89.124c-2.396,0-4.771,0.083-7.146,0.27
-	C392.562,17.146,357.709,0,320,0c-37.688,0-72.562,17.146-95.688,45.979c-2.375-0.187-4.771-0.27-7.188-0.27
-	C168,45.709,128,85.688,128,134.833c0,5.146,0.688,10.125,1.5,15.042c-0.542,0.708-1.188,1.354-1.708,2.083
-	c-5.229-0.75-10.479-1.125-15.792-1.125c-61.75,0-112,50.25-112,112c0,61.751,50.25,112,112,112c13.688,0,27.084-2.499,39.709-7.333
-	c18.354,16,40.104,26.938,63.207,33.208L192,416l32,32l-32,64l96-64l-32-32l4.812-9.583c36.75-1.125,71.75-14.729,99.479-38.917
-	c12.625,4.834,26.021,7.333,39.709,7.333c61.75,0,112-50.249,112-112c0-25.666-9.042-49.083-23.666-68
-	C502.916,178.958,512,158.021,512,134.833z M400,342.833c-17.125,0-32.916-5.5-45.938-14.646c-19,22.896-45.75,38.729-76.229,44.125
-	l-23.771,2.312C215.25,374,181,356,157.938,328.188c-13,9.146-28.812,14.646-45.938,14.646c-44.188,0-80-35.791-80-80
-	c0-44.167,35.812-80,80-80c10.812,0,21.062,2.209,30.438,6.083c0.562-1.083,1.25-2,1.812-3.042
-	c5.625-10.271,12.562-19.667,20.666-28.042c23.084-23.896,55.167-39,91.084-39c49.709,0,92.334,28.667,113.541,70.083
-	c5.646-2.333,11.668-3.833,17.875-4.833l12.584-1.25c12.334,0,23.875,3.042,34.312,8c11.312,5.417,21.021,13.375,28.646,23.208
-	c10.5,13.521,17.042,30.334,17.042,48.792C480,307.042,444.188,342.833,400,342.833z M465.562,172.458
-	c-18.479-13.438-41-21.625-65.562-21.625c-5.312,0-10.562,0.375-15.792,1.125C354.334,111.271,307.188,86.833,256,86.833
-	c-34.125,0-66.312,11.062-92.938,30.354c7.479-22.853,28.729-39.478,54.062-39.478c7.75,0,15.062,1.562,21.75,4.333
-	C254.062,52.458,284.5,32,320,32s65.958,20.458,81.084,50.042c6.729-2.771,14.083-4.333,21.749-4.333
-	c31.584,0,57.167,25.583,57.167,57.124C480,149.333,474.438,162.396,465.562,172.458z"/>
-</svg>
diff --git a/icons/27.png b/icons/27.png
deleted file mode 100644
index 7fb6722..0000000
--- a/icons/27.png
+++ /dev/null
diff --git a/icons/27.svg b/icons/27.svg
deleted file mode 100644
index 7050b80..0000000
--- a/icons/27.svg
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M192,384l32,32l-32,96l96-96l-32-32l32-64L192,384z M512,134.833c0-49.146-40-89.124-89.167-89.124
-			c-2.396,0-4.771,0.083-7.146,0.27C392.562,17.146,357.709,0,320,0c-37.688,0-72.562,17.146-95.688,45.979
-			c-2.375-0.187-4.771-0.27-7.188-0.27C168,45.709,128,85.688,128,134.833c0,5.146,0.688,10.125,1.5,15.042
-			c-0.542,0.708-1.188,1.354-1.708,2.083c-5.229-0.75-10.479-1.125-15.792-1.125c-61.75,0-112,50.25-112,112
-			c0,61.751,50.25,112,112,112c13.688,0,27.084-2.499,39.709-7.333c1.104,0.959,2.416,1.625,3.541,2.562l28.312-18.875
-			c-9.438-6.688-18.25-14.125-25.625-23c-13,9.146-28.812,14.646-45.938,14.646c-44.188,0-80-35.791-80-80c0-44.167,35.812-80,80-80
-			c10.812,0,21.062,2.209,30.438,6.083c0.562-1.083,1.25-2,1.812-3.042c5.625-10.271,12.562-19.667,20.666-28.042
-			c23.084-23.896,55.167-39,91.084-39c49.709,0,92.334,28.667,113.541,70.083c5.646-2.333,11.668-3.833,17.875-4.833l12.584-1.25
-			c12.334,0,23.875,3.042,34.312,8c11.312,5.417,21.021,13.375,28.646,23.208c10.5,13.521,17.042,30.334,17.042,48.792
-			c0,44.209-35.812,80-80,80c-17.125,0-32.916-5.5-45.938-14.646c-14,16.875-32.438,29.562-53.146,37.562l-5.979,11.938l18.25,18.25
-			c17.062-6.646,33.021-16.188,47.104-28.438c12.625,4.834,26.021,7.333,39.709,7.333c61.75,0,112-50.249,112-112
-			c0-25.666-9.042-49.083-23.666-68C502.916,178.958,512,158.021,512,134.833z M465.562,172.458
-			c-18.479-13.438-41-21.625-65.562-21.625c-5.312,0-10.562,0.375-15.792,1.125C354.334,111.271,307.188,86.833,256,86.833
-			c-34.125,0-66.312,11.062-92.938,30.354c7.479-22.853,28.729-39.478,54.062-39.478c7.75,0,15.062,1.562,21.75,4.333
-			C254.062,52.458,284.5,32,320,32s65.958,20.458,81.084,50.042c6.729-2.771,14.083-4.333,21.749-4.333
-			c31.584,0,57.167,25.583,57.167,57.124C480,149.333,474.438,162.396,465.562,172.458z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/28.png b/icons/28.png
deleted file mode 100644
index 19c96f1..0000000
--- a/icons/28.png
+++ /dev/null
diff --git a/icons/28.svg b/icons/28.svg
deleted file mode 100644
index 2886ace..0000000
--- a/icons/28.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M256,144c-61.75,0-112,50.25-112,112c0,61.749,50.25,112,112,112
-			s112-50.251,112-112C368,194.25,317.75,144,256,144z M256,112c8.833,0,16-7.146,16-16V64c0-8.833-7.167-16-16-16
-			c-8.854,0-16,7.167-16,16v32C240,104.854,247.146,112,256,112z M256,400c-8.854,0-16,7.167-16,16v32c0,8.854,7.146,16,16,16
-			c8.833,0,16-7.146,16-16v-32C272,407.167,264.833,400,256,400z M380.417,154.167l22.625-22.625c6.25-6.25,6.25-16.375,0-22.625
-			c-6.251-6.25-16.375-6.25-22.625,0l-22.625,22.625c-6.251,6.25-6.251,16.375,0,22.625
-			C364.042,160.416,374.166,160.416,380.417,154.167z M131.541,357.854l-22.623,22.625c-6.252,6.25-6.252,16.376,0,22.625
-			c6.249,6.25,16.373,6.25,22.623,0l22.625-22.625c6.251-6.291,6.251-16.375,0-22.625
-			C147.917,351.604,137.792,351.562,131.541,357.854z M112,256c0-8.833-7.167-16-16-16H64c-8.854,0-16,7.167-16,16
-			c0,8.854,7.146,16,16,16h32C104.833,272,112,264.854,112,256z M448,240h-32c-8.854,0-16,7.167-16,16c0,8.854,7.146,16,16,16h32
-			c8.833,0,16-7.146,16-16C464,247.167,456.833,240,448,240z M131.521,154.167c6.249,6.25,16.375,6.25,22.625,0
-			c6.249-6.25,6.249-16.375,0-22.625l-22.625-22.625c-6.25-6.25-16.376-6.25-22.625,0c-6.25,6.25-6.25,16.375,0,22.625
-			L131.521,154.167z M380.459,357.812c-6.293-6.25-16.376-6.25-22.625,0c-6.25,6.249-6.293,16.375,0,22.625l22.625,22.625
-			c6.249,6.249,16.374,6.249,22.625,0c6.249-6.25,6.249-16.376,0-22.625L380.459,357.812z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/29.png b/icons/29.png
deleted file mode 100644
index 6d1eee8..0000000
--- a/icons/29.png
+++ /dev/null
diff --git a/icons/29.svg b/icons/29.svg
deleted file mode 100644
index a53d754..0000000
--- a/icons/29.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M248.082,263.932c-31.52-31.542-39.979-77.105-26.02-116.542
-	c-15.25,5.395-29.668,13.833-41.854,26.02c-43.751,43.75-43.751,114.667,0,158.395c43.729,43.73,114.625,43.752,158.374,0
-	c12.229-12.186,20.646-26.604,26.021-41.854C325.188,303.91,279.604,295.451,248.082,263.932z"/>
-</svg>
diff --git a/icons/3.png b/icons/3.png
deleted file mode 100644
index cc1ff51..0000000
--- a/icons/3.png
+++ /dev/null
diff --git a/icons/3.svg b/icons/3.svg
deleted file mode 100644
index c969499..0000000
--- a/icons/3.svg
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M349.852,343.15c-49.876,49.916-131.083,49.916-181,0c-49.916-49.917-49.916-131.125,0-181.021
-	c13.209-13.187,29.312-23.25,47.832-29.812c5.834-2.042,12.293-0.562,16.625,3.792c4.376,4.375,5.855,10.833,3.793,16.625
-	c-12.542,35.375-4,73.666,22.249,99.917c26.209,26.228,64.501,34.75,99.917,22.25c5.792-2.062,12.271-0.583,16.625,3.792
-	c4.376,4.333,5.834,10.812,3.771,16.625C373.143,313.838,363.06,329.941,349.852,343.15z M191.477,184.754
-	c-37.438,37.438-37.438,98.354,0,135.771c40,40.021,108.125,36.417,143-8.167c-35.959,2.25-71.375-10.729-97.75-37.084
-	c-26.375-26.354-39.333-61.771-37.084-97.729C196.769,179.796,194.039,182.192,191.477,184.754z"/>
-</svg>
diff --git a/icons/30.png b/icons/30.png
deleted file mode 100644
index 18271f5..0000000
--- a/icons/30.png
+++ /dev/null
diff --git a/icons/30.svg b/icons/30.svg
deleted file mode 100644
index be657fc..0000000
--- a/icons/30.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M208,64c8.833,0,16-7.167,16-16V16c0-8.833-7.167-16-16-16s-16,7.167-16,16v32
-			C192,56.833,199.167,64,208,64z M332.438,106.167l22.625-22.625c6.249-6.25,6.249-16.375,0-22.625
-			c-6.25-6.25-16.375-6.25-22.625,0l-22.625,22.625c-6.25,6.25-6.25,16.375,0,22.625
-			C316.062,112.417,326.188,112.417,332.438,106.167z M16,224h32c8.833,0,16-7.167,16-16s-7.167-16-16-16H16
-			c-8.833,0-16,7.167-16,16S7.167,224,16,224z M352,208c0,8.833,7.167,16,16,16h32c8.833,0,16-7.167,16-16s-7.167-16-16-16h-32
-			C359.167,192,352,199.167,352,208z M83.541,106.167c6.251,6.25,16.376,6.25,22.625,0c6.251-6.25,6.251-16.375,0-22.625
-			L83.541,60.917c-6.25-6.25-16.374-6.25-22.625,0c-6.25,6.25-6.25,16.375,0,22.625L83.541,106.167z M400,256
-			c-5.312,0-10.562,0.375-15.792,1.125c-16.771-22.875-39.124-40.333-64.458-51.5C318.459,145,268.938,96,208,96
-			c-61.75,0-112,50.25-112,112c0,17.438,4.334,33.75,11.5,48.438C47.875,258.875,0,307.812,0,368c0,61.75,50.25,112,112,112
-			c13.688,0,27.084-2.5,39.709-7.333C180.666,497.917,217.5,512,256,512c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,477.5,386.312,480,400,480c61.75,0,112-50.25,112-112S461.75,256,400,256z M256,192c-45.938,0-88.5,19.812-118.375,53.25
-			C131.688,234.083,128,221.542,128,208c0-44.188,35.812-80,80-80c39.812,0,72.562,29.167,78.708,67.25
-			C276.688,193.25,266.459,192,256,192z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/31.png b/icons/31.png
deleted file mode 100644
index 941a74d..0000000
--- a/icons/31.png
+++ /dev/null
diff --git a/icons/31.svg b/icons/31.svg
deleted file mode 100644
index ac0e866..0000000
--- a/icons/31.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M435.062,262.166c4.875-3.625,9.812-7.187,14.229-11.604c13.208-13.229,23.271-29.333,29.792-47.854
-	c2.083-5.792,0.604-12.292-3.772-16.625c-4.354-4.375-10.812-5.854-16.623-3.792c-35.396,12.5-73.688,4-99.896-22.25
-	c-26.249-26.25-34.791-64.521-22.249-99.896c2.042-5.812,0.583-12.271-3.792-16.646c-4.333-4.333-10.812-5.833-16.625-3.791
-	c-18.542,6.583-34.625,16.625-47.834,29.833c-33.541,33.5-43.979,81-32.479,123.792c-43.25,5.521-82.125,28.5-108.021,63.792
-	c-5.229-0.75-10.479-1.125-15.792-1.125c-61.75,0-112,50.249-112,112c0,61.75,50.25,112,112,112c13.688,0,27.084-2.501,39.709-7.334
-	C180.665,497.916,217.499,512,255.999,512c38.542,0,75.333-14.084,104.291-39.334c12.625,4.833,26.021,7.334,39.709,7.334
-	c61.75,0,112-50.25,112-112C512,318.562,479.583,276.979,435.062,262.166z M290.916,92.167c2.542-2.583,5.271-4.979,8.146-7.229
-	c-2.25,35.979,10.729,71.375,37.104,97.729c26.376,26.375,61.771,39.333,97.751,37.104c-13.792,17.584-32.792,28.521-53.126,33.188
-	c-27.375-34.75-67.604-56.624-111.958-60.187C256.562,158.813,263.75,119.333,290.916,92.167z"/>
-</svg>
diff --git a/icons/32.png b/icons/32.png
deleted file mode 100644
index 1b1f90f..0000000
--- a/icons/32.png
+++ /dev/null
diff --git a/icons/32.svg b/icons/32.svg
deleted file mode 100644
index 6457c57..0000000
--- a/icons/32.svg
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M400,160c-5.312,0-10.562,0.375-15.792,1.125
-	C354.334,120.417,307.188,96,256,96s-98.312,24.417-128.208,65.125C122.562,160.375,117.312,160,112,160C50.25,160,0,210.25,0,272
-	c0,61.75,50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,401.917,217.5,416,256,416
-	c38.542,0,75.333-14.083,104.291-39.333C372.916,381.5,386.312,384,400,384c61.75,0,112-50.25,112-112
-	C512,210.25,461.75,160,400,160z"/>
-</svg>
diff --git a/icons/33.png b/icons/33.png
deleted file mode 100644
index 7b43b58..0000000
--- a/icons/33.png
+++ /dev/null
diff --git a/icons/33.svg b/icons/33.svg
deleted file mode 100644
index 6e20fb0..0000000
--- a/icons/33.svg
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125C354.334,24.417,307.188,0,256,0
-	c-51.188,0-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176s50.25,112,112,112
-	c13.688,0,27.084-2.5,39.709-7.333c21.541,18.771,47.416,31.291,75.104,36.521L192,352l32,32l-32,96l96-96l-32-32l11-32.999
-	c34.458-2.438,67.125-15.543,93.291-38.334C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z"/>
-</svg>
diff --git a/icons/34.png b/icons/34.png
deleted file mode 100644
index 1e2b863..0000000
--- a/icons/34.png
+++ /dev/null
diff --git a/icons/34.svg b/icons/34.svg
deleted file mode 100644
index 588eddc..0000000
--- a/icons/34.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M400,96c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,56.417,307.188,32,256,32s-98.312,24.417-128.208,65.125C122.562,96.375,117.312,96,112,96C50.25,96,0,146.25,0,208
-			c0,61.75,50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,337.917,217.5,352,256,352
-			c38.542,0,75.333-14.083,104.291-39.333C372.916,317.5,386.312,320,400,320c61.75,0,112-50.25,112-112
-			C512,146.25,461.75,96,400,96z M224,448c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64S224,430.312,224,448z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/35.png b/icons/35.png
deleted file mode 100644
index 80b0cfc..0000000
--- a/icons/35.png
+++ /dev/null
diff --git a/icons/35.svg b/icons/35.svg
deleted file mode 100644
index 2af60b4..0000000
--- a/icons/35.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,24.417,307.188,0,256,0s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176
-			s50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z M225,480c0,17.688,14.312,32,32,32
-			s32-14.312,32-32s-32-64-32-64S225,462.312,225,480z M352,448c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64
-			S352,430.312,352,448z M96,384c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64S96,366.312,96,384z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/36.png b/icons/36.png
deleted file mode 100644
index 3826de1..0000000
--- a/icons/36.png
+++ /dev/null
diff --git a/icons/36.svg b/icons/36.svg
deleted file mode 100644
index 6950b1a..0000000
--- a/icons/36.svg
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M417.042,166.083c-23.979-24.542-57.125-38.771-91.73-38.771
-			c-34.562,0-67.688,14.229-91.687,38.771c-52.812,2.459-95,46.188-95,99.584c0,54.958,44.709,99.666,99.688,99.666
-			c5.812,0,11.604-0.5,17.25-1.499c20.75,13.541,44.938,20.854,69.749,20.854c24.854,0,49.063-7.313,69.772-20.854
-			c5.707,0.999,11.458,1.499,17.291,1.499c54.937,0,99.625-44.708,99.625-99.666C512,212.271,469.812,168.542,417.042,166.083z
-			 M144,352H16c-8.833,0-16,7.167-16,16s7.167,16,16,16h128c8.833,0,16-7.167,16-16S152.833,352,144,352z M16,320h64
-			c8.833,0,16-7.167,16-16s-7.167-16-16-16H16c-8.833,0-16,7.167-16,16S7.167,320,16,320z M48,256h64c8.833,0,16-7.167,16-16
-			s-7.167-16-16-16H48c-8.833,0-16,7.167-16,16S39.167,256,48,256z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/37.png b/icons/37.png
deleted file mode 100644
index 66f188e..0000000
--- a/icons/37.png
+++ /dev/null
diff --git a/icons/37.svg b/icons/37.svg
deleted file mode 100644
index b47907a..0000000
--- a/icons/37.svg
+++ /dev/null
@@ -1,58 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M417.042,70.792C393.062,46.229,359.917,32,325.312,32
-			c-34.562,0-67.688,14.229-91.665,38.792c-52.813,2.438-95.021,46.167-95.021,99.542c0,54.978,44.709,99.708,99.688,99.708
-			c5.834,0,11.604-0.501,17.271-1.5c20.729,13.521,44.917,20.833,69.729,20.833c24.854,0,49.063-7.312,69.772-20.833
-			c5.707,0.999,11.458,1.5,17.291,1.5c54.937,0,99.625-44.73,99.625-99.708C512,116.958,469.812,73.208,417.042,70.792z
-			 M144,256.688H16c-8.833,0-16,7.146-16,16c0,8.853,7.167,16,16,16h128c8.833,0,16-7.147,16-16
-			C160,263.834,152.833,256.688,144,256.688z M16,224.688h64c8.833,0,16-7.146,16-16c0-8.854-7.167-16-16-16H16
-			c-8.833,0-16,7.146-16,16C0,217.542,7.167,224.688,16,224.688z M48,160.688h64c8.833,0,16-7.146,16-16c0-8.854-7.167-16-16-16H48
-			c-8.833,0-16,7.146-16,16C32,153.542,39.167,160.688,48,160.688z M224,384c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64
-			S224,366.312,224,384z M352,448c0,17.688,14.312,32,32,32s32-14.312,32-32s-32-64-32-64S352,430.312,352,448z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/38.png b/icons/38.png
deleted file mode 100644
index 3d40b1a..0000000
--- a/icons/38.png
+++ /dev/null
diff --git a/icons/38.svg b/icons/38.svg
deleted file mode 100644
index 52e012c..0000000
--- a/icons/38.svg
+++ /dev/null
@@ -1,62 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M326.042,443.688l-18-10.376
-			c0.542-3.124,0.957-6.311,0.957-9.624c0-3.312-0.415-6.5-0.999-9.625l18.042-10.396c8.417-4.917,11.291-15.729,6.458-24.104
-			c-4.876-8.479-15.667-11.375-24.125-6.5l-18.188,10.5c-4.876-4.146-10.375-7.396-16.5-9.604v-20.896
-			c0-9.771-7.938-17.688-17.688-17.688s-17.667,7.917-17.667,17.688v20.875c-6.125,2.188-11.646,5.479-16.521,9.625l-18.146-10.5
-			c-8.479-4.875-19.291-2-24.166,6.479c-4.875,8.417-1.938,19.25,6.5,24.126l17.959,10.375c-0.584,3.146-0.959,6.334-0.959,9.646
-			c0,3.313,0.375,6.5,0.959,9.624L186,443.688c-8.459,4.875-11.375,15.75-6.5,24.188s15.688,11.312,24.125,6.438l18.167-10.438
-			c4.874,4.125,10.396,7.375,16.541,9.562v20.938c0,9.749,7.917,17.624,17.667,17.624s17.688-7.875,17.688-17.624v-20.938
-			c6.125-2.188,11.688-5.438,16.521-9.625l18.167,10.5c8.458,4.875,19.249,2,24.125-6.438
-			C337.375,459.438,334.5,448.625,326.042,443.688z M256,441.375c-9.75,0-17.688-7.938-17.688-17.688s7.938-17.646,17.688-17.646
-			s17.666,7.896,17.666,17.646S265.75,441.375,256,441.375z M400,64c-5.312,0-10.562,0.375-15.792,1.125
-			C354.333,24.417,307.188,0,256,0s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176
-			s50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/39.png b/icons/39.png
deleted file mode 100644
index 28621bf..0000000
--- a/icons/39.png
+++ /dev/null
diff --git a/icons/39.svg b/icons/39.svg
deleted file mode 100644
index 5e92ed2..0000000
--- a/icons/39.svg
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M326.042,443.688l-18-10.376
-			c0.542-3.124,0.958-6.311,0.958-9.624c0-3.312-0.416-6.5-1-9.625l18.042-10.396c8.417-4.917,11.291-15.729,6.458-24.104
-			c-4.876-8.479-15.667-11.375-24.125-6.5l-18.188,10.5c-4.876-4.146-10.375-7.396-16.5-9.604v-20.896
-			c0-9.771-7.938-17.688-17.688-17.688s-17.666,7.917-17.666,17.688v20.875c-6.126,2.188-11.646,5.479-16.521,9.625l-18.146-10.5
-			c-8.479-4.875-19.292-2-24.167,6.479c-4.875,8.417-1.938,19.25,6.5,24.126l17.959,10.375c-0.584,3.146-0.959,6.334-0.959,9.646
-			c0,3.313,0.375,6.5,0.959,9.624L186,443.688c-8.459,4.875-11.375,15.75-6.5,24.188s15.688,11.312,24.125,6.438l18.167-10.438
-			c4.874,4.125,10.396,7.375,16.542,9.562v20.938c0,9.749,7.916,17.624,17.666,17.624s17.688-7.875,17.688-17.624v-20.938
-			c6.125-2.188,11.688-5.438,16.521-9.625l18.167,10.5c8.458,4.875,19.249,2,24.125-6.438
-			C337.375,459.438,334.5,448.625,326.042,443.688z M256,441.375c-9.75,0-17.688-7.938-17.688-17.688s7.938-17.646,17.688-17.646
-			s17.667,7.896,17.667,17.646S265.75,441.375,256,441.375z M474.166,396.25l-12.083-3.208c-0.291-3.833-1.208-7.479-2.896-10.979
-			l8.771-8.771c4.125-4.125,4.104-10.792,0-14.854c-4.083-4.104-10.708-4.125-14.833,0l-8.791,8.75
-			c-3.459-1.625-7.146-2.562-10.959-2.875l-3.209-12.062c-1.499-5.583-7.25-8.938-12.874-7.438
-			c-5.604,1.521-8.875,7.271-7.417,12.875l3.209,11.896c-1.584,1.084-3.084,2.292-4.5,3.667c-1.375,1.417-2.542,2.916-3.626,4.459
-			l-11.896-3.209c-5.604-1.499-11.396,1.876-12.896,7.438c-1.499,5.625,1.876,11.354,7.417,12.875l12,3.229
-			c0.334,3.771,1.292,7.458,2.979,10.959l-8.812,8.812c-4.083,4.104-4.062,10.729,0.042,14.812
-			c4.083,4.083,10.708,4.125,14.792,0.042l8.832-8.833c3.459,1.707,7.168,2.666,11.001,2.957l3.166,12.021
-			c1.542,5.604,7.25,8.938,12.876,7.438c5.583-1.5,8.957-7.249,7.458-12.917l-3.209-11.896c1.5-1.062,3.042-2.25,4.459-3.625
-			c1.375-1.396,2.542-2.938,3.624-4.479l11.917,3.209c5.604,1.5,11.375-1.854,12.854-7.417
-			C483.062,403.541,479.75,397.792,474.166,396.25z M438.312,402.938c-4.125,4.125-10.771,4.104-14.875,0
-			c-4.062-4.062-4.104-10.729,0-14.854c4.104-4.083,10.771-4.083,14.875,0C442.375,392.188,442.375,398.875,438.312,402.938z
-			 M118.938,342.5l-11.875,3.188c-1.104-1.5-2.25-3.021-3.646-4.438c-1.416-1.375-2.916-2.562-4.479-3.625l3.188-11.938
-			c1.5-5.604-1.834-11.375-7.375-12.854c-5.625-1.5-11.375,1.834-12.875,7.417l-3.25,12.062c-3.812,0.312-7.458,1.25-10.938,2.896
-			l-8.812-8.771c-4.125-4.125-10.75-4.104-14.834,0c-4.104,4.104-4.104,10.75,0,14.854l8.771,8.771
-			c-1.646,3.5-2.604,7.188-2.896,10.979l-12.042,3.208c-5.625,1.542-8.959,7.25-7.458,12.875c1.521,5.583,7.271,8.875,12.896,7.417
-			l11.875-3.23c1.062,1.604,2.25,3.105,3.688,4.501c1.375,1.375,2.875,2.604,4.438,3.625l-3.188,11.896
-			c-1.5,5.625,1.834,11.417,7.416,12.917c5.626,1.5,11.334-1.833,12.834-7.438l3.25-12c3.812-0.312,7.5-1.271,11-2.938l8.791,8.792
-			c4.084,4.124,10.709,4.041,14.834-0.042c4.062-4.062,4.125-10.708,0-14.812l-8.812-8.812c1.688-3.46,2.688-7.188,2.938-11.001
-			l12.062-3.188c5.562-1.521,8.896-7.25,7.396-12.875C130.334,344.376,124.584,341.042,118.938,342.5z M88.562,370.958
-			c-4.104,4.104-10.75,4.104-14.875,0c-4.062-4.083-4.062-10.771,0-14.833c4.125-4.083,10.771-4.083,14.875,0
-			S92.625,366.875,88.562,370.958z M512,176c0-61.75-50.25-112-112-112c-5.312,0-10.562,0.375-15.792,1.125
-			C354.334,24.417,307.188,0,256,0s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176
-			s50.25,112,112,112c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288C461.75,288,512,237.75,512,176z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/4.png b/icons/4.png
deleted file mode 100644
index f7fd2d8..0000000
--- a/icons/4.png
+++ /dev/null
diff --git a/icons/4.svg b/icons/4.svg
deleted file mode 100644
index 8c15ee6..0000000
--- a/icons/4.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M271,127c8.833,0,16-7.167,16-16V79c0-8.833-7.167-16-16-16s-16,7.167-16,16v32
-			C255,119.833,262.167,127,271,127z M271,415c-8.833,0-16,7.167-16,16v32c0,8.833,7.167,16,16,16s16-7.167,16-16v-32
-			C287,422.167,279.833,415,271,415z M146.562,372.834l-22.625,22.625c-6.25,6.249-6.25,16.374,0,22.624s16.375,6.25,22.625,0
-			l22.625-22.624c6.25-6.271,6.25-16.376,0-22.625C162.938,366.583,152.812,366.562,146.562,372.834z M127,271
-			c0-8.833-7.167-16-16-16H79c-8.833,0-16,7.167-16,16s7.167,16,16,16h32C119.833,287,127,279.833,127,271z M146.541,169.167
-			c6.251,6.25,16.376,6.25,22.625,0c6.251-6.25,6.251-16.375,0-22.625l-22.625-22.625c-6.25-6.25-16.374-6.25-22.625,0
-			c-6.25,6.25-6.25,16.375,0,22.625L146.541,169.167z M335,159c-11.188,0-21.812,2.167-32,5.208
-			c-10.188-3.042-20.812-5.208-32-5.208c-61.75,0-112,50.25-112,112s50.25,112,112,112c11.188,0,21.812-2.166,32-5.209
-			c10.188,3.043,20.812,5.209,32,5.209c61.75,0,112-50.25,112-112S396.75,159,335,159z M255.229,349.417
-			C218.583,342.084,191,309.791,191,271c0-38.792,27.583-71.083,64.229-78.417C235.334,212.812,223,240.458,223,271
-			S235.334,329.188,255.229,349.417z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/40.png b/icons/40.png
deleted file mode 100644
index b78380f..0000000
--- a/icons/40.png
+++ /dev/null
diff --git a/icons/40.svg b/icons/40.svg
deleted file mode 100644
index b65d9c4..0000000
--- a/icons/40.svg
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M400,64c-5.312,0-10.562,0.375-15.792,1.125C354.334,24.417,307.188,0,256,0
-			s-98.312,24.417-128.208,65.125C122.562,64.375,117.312,64,112,64C50.25,64,0,114.25,0,176s50.25,112,112,112
-			c13.688,0,27.084-2.5,39.709-7.333C180.666,305.917,217.5,320,256,320c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,285.5,386.312,288,400,288c61.75,0,112-50.25,112-112S461.75,64,400,64z M96,320c-17.688,0-32,14.312-32,32
-			s14.312,32,32,32s32-14.312,32-32S113.688,320,96,320z M256,352c-17.688,0-32,14.312-32,32s14.312,32,32,32s32-14.312,32-32
-			S273.688,352,256,352z M416,320c-17.688,0-32,14.312-32,32s14.312,32,32,32s32-14.312,32-32S433.688,320,416,320z M352,448
-			c-17.688,0-32,14.312-32,32s14.312,32,32,32s32-14.312,32-32S369.688,448,352,448z M160,448c-17.688,0-32,14.312-32,32
-			s14.312,32,32,32s32-14.312,32-32S177.688,448,160,448z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/41.png b/icons/41.png
deleted file mode 100644
index 568028d..0000000
--- a/icons/41.png
+++ /dev/null
diff --git a/icons/41.svg b/icons/41.svg
deleted file mode 100644
index 308c3f8..0000000
--- a/icons/41.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M488.334,247.417c14.624,18.916,23.666,42.312,23.666,68c0,61.749-50.25,112-112,112
-	c-13.688,0-27.084-2.5-39.709-7.333c-28.958,25.249-65.749,39.333-104.291,39.333c-38.5,0-75.334-14.084-104.291-39.333
-	c-12.625,4.833-26.021,7.333-39.709,7.333c-61.75,0-112-50.251-112-112c0-61.75,50.25-112,112-112
-	c5.312,0,10.562,0.375,15.792,1.125c0.521-0.729,1.166-1.375,1.708-2.083c-0.812-4.938-1.5-9.896-1.5-15.041
-	c0-49.167,40-89.146,89.125-89.146c2.416,0,4.812,0.104,7.188,0.292c23.125-28.854,58-45.979,95.688-45.979
-	c37.709,0,72.562,17.125,95.688,45.979c2.375-0.188,4.75-0.292,7.146-0.292C472,98.271,512,138.25,512,187.417
-	C512,210.583,502.916,231.521,488.334,247.417z"/>
-</svg>
diff --git a/icons/42.png b/icons/42.png
deleted file mode 100644
index 5c22311..0000000
--- a/icons/42.png
+++ /dev/null
diff --git a/icons/42.svg b/icons/42.svg
deleted file mode 100644
index f3b06bc..0000000
--- a/icons/42.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M512,134.833c0-49.146-40-89.124-89.167-89.124c-2.396,0-4.771,0.083-7.146,0.27
-	C392.562,17.146,357.709,0,320,0c-37.688,0-72.562,17.146-95.688,45.979c-2.375-0.187-4.771-0.27-7.188-0.27
-	C168,45.709,128,85.688,128,134.833c0,5.146,0.688,10.125,1.5,15.042c-0.542,0.708-1.188,1.354-1.708,2.083
-	c-5.229-0.75-10.479-1.125-15.792-1.125c-61.75,0-112,50.25-112,112c0,61.751,50.25,112,112,112c13.688,0,27.084-2.499,39.709-7.333
-	c18.354,16,40.104,26.938,63.207,33.208L192,416l32,32l-32,64l96-64l-32-32l4.812-9.583c36.75-1.125,71.75-14.729,99.479-38.917
-	c12.625,4.834,26.021,7.333,39.709,7.333c61.75,0,112-50.249,112-112c0-25.666-9.042-49.083-23.666-68
-	C502.916,178.958,512,158.021,512,134.833z"/>
-</svg>
diff --git a/icons/43.png b/icons/43.png
deleted file mode 100644
index 454f3c0..0000000
--- a/icons/43.png
+++ /dev/null
diff --git a/icons/43.svg b/icons/43.svg
deleted file mode 100644
index ceb8dd3..0000000
--- a/icons/43.svg
+++ /dev/null
@@ -1,48 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill-rule="evenodd" clip-rule="evenodd" fill="#1D1D1B" d="M288,360.875V66.917C288,47.625,273.666,32,256,32
-	c-17.667,0-32,15.625-32,34.917v293.958c-19.042,11.083-32,31.501-32,55.125c0,35.333,28.666,64,64,64c35.333,0,64-28.667,64-64
-	C320,392.376,307.062,371.958,288,360.875z"/>
-</svg>
diff --git a/icons/44.png b/icons/44.png
deleted file mode 100644
index 52793ad..0000000
--- a/icons/44.png
+++ /dev/null
diff --git a/icons/44.svg b/icons/44.svg
deleted file mode 100644
index d37e62d..0000000
--- a/icons/44.svg
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M256,0C114.604,0,0,114.604,0,256c0,141.375,114.604,256,256,256c141.375,0,256-114.625,256-256
-			C512,114.604,397.375,0,256,0z M256,448c-105.875,0-192-86.125-192-192S150.125,64,256,64s192,86.125,192,192S361.875,448,256,448
-			z M160,352l128-64l64-128l-128,64L160,352z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/45.svg b/icons/45.svg
deleted file mode 100644
index 45bd521..0000000
--- a/icons/45.svg
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M159.094,278.646h-1.042l-33.521-51.188l-40.938-60.437h-31.75v176.395h35.062V232.312h1.521
-			l29.104,44.542l44.688,66.562h31.938V167.021h-35.062V278.646z M206.469,354.166h25.834l64.791-196.332h-26.125L206.469,354.166z
-			 M398.719,167.021h-35.833l-61.979,176.395h37.375l11.521-36.375h61.459l10.749,36.375h38.146L398.719,167.021z M359.281,277.625
-			l7.146-23.292l13.604-45.832h1l13.854,46.604l6.896,22.521H359.281z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/46.png b/icons/46.png
deleted file mode 100644
index f18c735..0000000
--- a/icons/46.png
+++ /dev/null
diff --git a/icons/46.svg b/icons/46.svg
deleted file mode 100644
index 0cea396..0000000
--- a/icons/46.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M209.167,176.375c-3.604-3.396-7.792-6.083-12.542-8.062c-4.812-1.938-9.938-2.938-15.375-2.938
-			c-5.458,0-10.584,1-15.375,2.938c-4.75,1.979-8.938,4.667-12.541,8.062c-3.584,3.417-6.396,7.417-8.459,12.042
-			c-2.042,4.605-3.062,9.479-3.062,14.583c0,5.125,1.021,10,3.062,14.605c2.062,4.604,4.875,8.625,8.459,12.02
-			c3.604,3.417,7.791,6.125,12.541,8.063c4.791,1.979,9.917,2.958,15.375,2.958c5.438,0,10.562-0.979,15.375-2.958
-			c4.75-1.938,8.938-4.646,12.542-8.063c3.583-3.395,6.396-7.417,8.416-12.02c2.042-4.605,3.104-9.479,3.104-14.605
-			c0-5.104-1.062-9.979-3.104-14.583C215.562,183.791,212.75,179.791,209.167,176.375z M193.812,215.041
-			c-3.438,3.417-7.625,5.125-12.562,5.125s-9.125-1.709-12.562-5.125c-3.396-3.417-5.125-7.417-5.125-12.042
-			c0-4.75,1.729-8.833,5.125-12.145c3.438-3.333,7.625-4.979,12.562-4.979s9.125,1.646,12.562,4.979
-			c3.375,3.312,5.104,7.395,5.104,12.145C198.916,207.625,197.188,211.625,193.812,215.041z M335.25,311.791
-			c-6.062,1.73-12.083,2.583-18.062,2.583c-3.938,0-7.812-0.604-11.646-1.79c-3.854-1.209-7.354-3.084-10.499-5.646
-			c-3.167-2.563-5.73-5.834-7.667-9.854c-1.959-4-2.958-8.917-2.958-14.709v-51.458c0-5.792,0.999-10.75,2.958-14.854
-			c1.937-4.083,4.459-7.417,7.541-9.979c3.084-2.562,6.542-4.396,10.5-5.5c3.917-1.105,7.834-1.667,11.771-1.667
-			c5.979,0,12.124,0.875,18.437,2.688c6.313,1.791,12.188,4.999,17.668,9.604l16.896-27.146
-			c-6.854-5.958-14.979-10.312-24.479-13.062c-9.459-2.708-19.292-4.083-29.543-4.083c-8.354,0-16.583,1.208-24.583,3.584
-			c-8.021,2.396-15.146,5.979-21.375,10.75c-6.208,4.792-11.271,10.708-15.083,17.791c-3.875,7.084-5.791,15.333-5.791,24.708
-			v66.042c0,9.562,1.979,17.875,5.916,24.959c3.917,7.084,9.041,12.979,15.334,17.666c6.332,4.708,13.479,8.229,21.499,10.625
-			c8.042,2.375,16.229,3.584,24.604,3.584c10.396,0,20.271-1.542,29.688-4.604c9.375-3.083,17.312-7.354,23.812-12.792
-			l-16.646-27.146C347.416,306.875,341.292,310.104,335.25,311.791z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/47.png b/icons/47.png
deleted file mode 100644
index a29da24..0000000
--- a/icons/47.png
+++ /dev/null
diff --git a/icons/47.svg b/icons/47.svg
deleted file mode 100644
index 8aade7e..0000000
--- a/icons/47.svg
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M208.531,177.271c-3.604-3.396-7.791-6.084-12.541-8.062c-4.812-1.938-9.938-2.938-15.375-2.938
-			c-5.459,0-10.584,1-15.375,2.938c-4.75,1.979-8.938,4.667-12.542,8.062c-3.583,3.416-6.396,7.416-8.459,12.041
-			c-2.042,4.605-3.062,9.479-3.062,14.584c0,5.125,1.02,10,3.062,14.604c2.063,4.604,4.876,8.625,8.459,12.021
-			c3.604,3.416,7.792,6.125,12.542,8.062c4.791,1.979,9.916,2.958,15.375,2.958c5.438,0,10.562-0.979,15.375-2.958
-			c4.75-1.938,8.938-4.646,12.541-8.062c3.584-3.396,6.396-7.417,8.416-12.021c2.042-4.604,3.105-9.479,3.105-14.604
-			c0-5.104-1.063-9.979-3.105-14.584C214.927,184.687,212.115,180.687,208.531,177.271z M193.177,215.937
-			c-3.438,3.417-7.625,5.126-12.562,5.126s-9.125-1.709-12.562-5.126c-3.396-3.416-5.125-7.416-5.125-12.041
-			c0-4.75,1.729-8.833,5.125-12.146c3.438-3.333,7.625-4.979,12.562-4.979s9.125,1.646,12.562,4.979
-			c3.374,3.312,5.104,7.396,5.104,12.146C198.281,208.521,196.551,212.521,193.177,215.937z M370.822,200.833v-31.5H249.24v176.396
-			h35.063v-71.938h73.979v-31.479h-73.979v-41.479H370.822z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/5.png b/icons/5.png
deleted file mode 100644
index fc04308..0000000
--- a/icons/5.png
+++ /dev/null
diff --git a/icons/5.svg b/icons/5.svg
deleted file mode 100644
index 18a5f37..0000000
--- a/icons/5.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M495,223h-81.625C405.312,151.208,344.938,95,271,95c-49.812,0-93.75,25.458-119.625,64H47
-	c-8.833,0-16,7.167-16,16s7.167,16,16,16h88.833c-3.624,10.208-5.979,20.896-7.208,32H79c-8.833,0-16,7.167-16,16s7.167,16,16,16
-	h49.625c1.229,11.084,3.584,21.812,7.208,32H49.916C39.459,287,31,294.167,31,303s8.459,16,18.916,16h101.459
-	c25.875,38.562,69.812,64,119.625,64c49.812,0,93.75-25.438,119.624-64h37.46c10.457,0,18.916-7.167,18.916-16s-8.459-16-18.916-16
-	h-21.917c3.624-10.188,5.958-20.916,7.208-32H495c8.833,0,16-7.167,16-16S503.833,223,495,223z M170.229,191H271
-	c8.833,0,16-7.167,16-16s-7.167-16-16-16h-78.146c20.209-19.729,47.729-32,78.146-32c56.291,0,102.542,41.875,110.375,96h-220.75
-	C162.25,211.688,165.459,200.958,170.229,191z M271,351c-30.417,0-57.938-12.291-78.146-32h156.271
-	C328.938,338.709,301.417,351,271,351z M371.75,287H170.229c-4.77-9.958-7.979-20.688-9.604-32h220.75
-	C379.75,266.312,376.541,277.042,371.75,287z"/>
-</svg>
diff --git a/icons/6.png b/icons/6.png
deleted file mode 100644
index 84b789e..0000000
--- a/icons/6.png
+++ /dev/null
diff --git a/icons/6.svg b/icons/6.svg
deleted file mode 100644
index 633016f..0000000
--- a/icons/6.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M431,192c-26.5,0-48,21.5-48,48c0,5.646,1.167,10.958,2.938,16H79c-8.833,0-16,7.167-16,16s7.167,16,16,16
-			h352c26.5,0,48-21.5,48-48S457.5,192,431,192z M79,224h192c26.5,0,48-21.5,48-48s-21.5-48-48-48s-48,21.5-48,48
-			c0,5.646,1.167,10.958,2.938,16H79c-8.833,0-16,7.167-16,16S70.167,224,79,224z M335,320c-0.938,0-1.834,0.208-2.791,0.291
-			c-0.625-0.041-1.146-0.291-1.771-0.291H83.584C72.209,320,63,327.167,63,336s9.209,16,20.584,16h206.354
-			c-1.771,5.042-2.938,10.376-2.938,16c0,26.5,21.5,48,48,48s48-21.5,48-48S361.5,320,335,320z"/>
-	</g>
-</g>
-</svg>
diff --git a/icons/7.png b/icons/7.png
deleted file mode 100644
index 53da68d..0000000
--- a/icons/7.png
+++ /dev/null
diff --git a/icons/7.svg b/icons/7.svg
deleted file mode 100644
index 7bfa351..0000000
--- a/icons/7.svg
+++ /dev/null
@@ -1,55 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M382.872,292.25l-32.625-18.834c1.042-5.666,1.75-11.458,1.75-17.416c0-5.979-0.708-11.792-1.792-17.458
-	l32.625-18.854c15.333-8.875,20.542-28.438,11.729-43.688c-8.854-15.312-28.375-20.562-43.688-11.75l-32.938,19.021
-	c-8.812-7.5-18.854-13.417-29.938-17.354V128c0-17.667-14.312-32-32-32c-17.666,0-32,14.333-32,32v37.896
-	c-11.083,3.938-21.125,9.855-29.937,17.354l-32.876-18.979c-15.312-8.833-34.896-3.604-43.749,11.708
-	c-8.813,15.292-3.562,34.854,11.749,43.688l32.563,18.813c-1.062,5.688-1.751,11.521-1.751,17.521
-	c0,5.958,0.688,11.771,1.751,17.438l-32.584,18.812c-15.334,8.834-20.584,28.438-11.729,43.75
-	c8.811,15.25,28.395,20.5,43.729,11.688l32.833-18.979c8.813,7.5,18.875,13.458,30,17.417V384c0,17.688,14.334,32,32,32
-	c17.688,0,32-14.312,32-32v-37.917c11.125-3.958,21.188-9.875,29.958-17.395l32.917,18.999c15.312,8.812,34.876,3.562,43.688-11.688
-	C403.414,320.688,398.185,301.125,382.872,292.25z M223.997,256c0-17.667,14.312-32,32-32c17.667,0,32,14.333,32,32
-	c0,17.666-14.333,32-32,32C238.31,288,223.997,273.666,223.997,256z"/>
-</svg>
diff --git a/icons/8.png b/icons/8.png
deleted file mode 100644
index 6f565b7..0000000
--- a/icons/8.png
+++ /dev/null
diff --git a/icons/8.svg b/icons/8.svg
deleted file mode 100644
index 4c1cdc7..0000000
--- a/icons/8.svg
+++ /dev/null
@@ -1,67 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<g>
-	<g>
-		<path fill="#1D1D1B" d="M208,64c8.833,0,16-7.167,16-16V16c0-8.833-7.167-16-16-16s-16,7.167-16,16v32
-			C192,56.833,199.167,64,208,64z M332.438,106.167l22.625-22.625c6.249-6.25,6.249-16.375,0-22.625
-			c-6.25-6.25-16.375-6.25-22.625,0l-22.625,22.625c-6.25,6.25-6.25,16.375,0,22.625
-			C316.062,112.417,326.188,112.417,332.438,106.167z M16,224h32c8.833,0,16-7.167,16-16s-7.167-16-16-16H16
-			c-8.833,0-16,7.167-16,16S7.167,224,16,224z M352,208c0,8.833,7.167,16,16,16h32c8.833,0,16-7.167,16-16s-7.167-16-16-16h-32
-			C359.167,192,352,199.167,352,208z M83.541,106.167c6.251,6.25,16.376,6.25,22.625,0c6.251-6.25,6.251-16.375,0-22.625
-			L83.541,60.917c-6.25-6.25-16.374-6.25-22.625,0c-6.25,6.25-6.25,16.375,0,22.625L83.541,106.167z M400,256
-			c-5.312,0-10.562,0.375-15.792,1.125c-16.771-22.875-39.124-40.333-64.458-51.5C318.459,145,268.938,96,208,96
-			c-61.75,0-112,50.25-112,112c0,17.438,4.334,33.75,11.5,48.438C47.875,258.875,0,307.812,0,368c0,61.75,50.25,112,112,112
-			c13.688,0,27.084-2.5,39.709-7.333C180.666,497.917,217.5,512,256,512c38.542,0,75.333-14.083,104.291-39.333
-			C372.916,477.5,386.312,480,400,480c61.75,0,112-50.25,112-112S461.75,256,400,256z M208,128c39.812,0,72.562,29.167,78.708,67.25
-			c-10.021-2-20.249-3.25-30.708-3.25c-45.938,0-88.5,19.812-118.375,53.25C131.688,234.083,128,221.542,128,208
-			C128,163.812,163.812,128,208,128z M400,448c-17.125,0-32.916-5.5-45.938-14.667C330.584,461.625,295.624,480,256,480
-			c-39.625,0-74.584-18.375-98.062-46.667C144.938,442.5,129.125,448,112,448c-44.188,0-80-35.812-80-80s35.812-80,80-80
-			c7.75,0,15.062,1.458,22.125,3.541c2.812,0.792,5.667,1.417,8.312,2.521c4.375-8.562,9.875-16.396,15.979-23.75
-			C181.792,242.188,216.562,224,256,224c10.125,0,19.834,1.458,29.25,3.709c10.562,2.499,20.542,6.291,29.834,11.291
-			c23.291,12.375,42.416,31.542,54.457,55.063C378.938,290.188,389.209,288,400,288c44.188,0,80,35.812,80,80S444.188,448,400,448z"
-			/>
-	</g>
-</g>
-</svg>
diff --git a/icons/9.png b/icons/9.png
deleted file mode 100644
index b4d97bf..0000000
--- a/icons/9.png
+++ /dev/null
diff --git a/icons/9.svg b/icons/9.svg
deleted file mode 100644
index bdf09a3..0000000
--- a/icons/9.svg
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 15.1.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="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
-	 width="512px" height="512px" viewBox="0 0 512 512" enable-background="new 0 0 512 512" xml:space="preserve">
-<g id="Grid_1_">
-	<g id="Layer_1_1_">
-		<g id="Grid">
-			<g>
-				<rect fill="none" stroke="#A9CCDB" stroke-miterlimit="10" width="512" height="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="480" x2="512" y2="480"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="448" x2="512" y2="448"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="416" x2="512" y2="416"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="384" x2="512" y2="384"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="352" x2="512" y2="352"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="320" x2="512" y2="320"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="288" x2="512" y2="288"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="256" x2="512" y2="256"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="224" x2="512" y2="224"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="192" x2="512" y2="192"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="160" x2="512" y2="160"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="128" x2="512" y2="128"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="96" x2="512" y2="96"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="64" x2="512" y2="64"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="0" y1="32" x2="512" y2="32"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="480" y1="0" x2="480" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="448" y1="0" x2="448" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="416" y1="0" x2="416" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="384" y1="0" x2="384" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="352" y1="0" x2="352" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="320" y1="0" x2="320" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="288" y1="0" x2="288" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="256" y1="0" x2="256" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="224" y1="0" x2="224" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="192" y1="0" x2="192" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="160" y1="0" x2="160" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="128" y1="0" x2="128" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="96" y1="0" x2="96" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="64" y1="0" x2="64" y2="512"/>
-				<line fill="none" stroke="#A9CCDB" stroke-miterlimit="10" x1="32" y1="0" x2="32" y2="512"/>
-			</g>
-		</g>
-	</g>
-</g>
-<path fill="#1D1D1B" d="M435.062,262.166c4.875-3.625,9.812-7.188,14.229-11.604c13.208-13.229,23.271-29.333,29.792-47.854
-	c2.083-5.792,0.604-12.292-3.772-16.625c-4.354-4.375-10.812-5.854-16.623-3.792c-35.396,12.5-73.688,4-99.896-22.25
-	C332.542,133.79,324,95.52,336.542,60.145c2.042-5.813,0.583-12.271-3.792-16.646c-4.333-4.333-10.812-5.834-16.625-3.791
-	C297.583,46.29,281.5,56.331,268.291,69.54c-33.541,33.5-43.979,81-32.479,123.792c-43.25,5.521-82.125,28.5-108.021,63.793
-	c-5.229-0.75-10.479-1.125-15.792-1.125c-61.75,0-112,50.25-112,112.001c0,61.749,50.25,111.999,112,111.999
-	c13.688,0,27.084-2.5,39.709-7.334C180.665,497.916,217.499,512,255.999,512c38.542,0,75.333-14.084,104.291-39.334
-	C372.915,477.5,386.311,480,399.999,480c61.75,0,112-50.25,112-111.999C512,318.562,479.583,276.979,435.062,262.166z
-	 M290.916,92.166c2.542-2.583,5.271-4.979,8.146-7.229c-2.25,35.979,10.729,71.375,37.104,97.729
-	c26.376,26.375,61.771,39.333,97.751,37.104c-13.792,17.584-32.792,28.521-53.126,33.188
-	c-27.375-34.75-67.604-56.625-111.958-60.187C256.562,158.812,263.75,119.333,290.916,92.166z M400,448
-	c-17.125,0-32.916-5.5-45.938-14.667C330.583,461.625,295.624,480,256,480c-39.625,0-74.584-18.375-98.062-46.667
-	C144.938,442.5,129.126,448,112,448c-44.188,0-80-35.812-80-79.999c0-44.188,35.812-80,80-80c10.812,0,21.062,2.188,30.438,6.062
-	c20.188-39.355,59.75-66.896,106.312-69.543c2.438-0.145,4.812-0.521,7.25-0.521c12.916,0,25.312,2.021,37,5.583
-	c15.791,4.834,30.188,12.708,42.688,22.854c11.938,9.688,21.938,21.562,29.812,34.896c1.333,2.25,2.834,4.375,4.041,6.729
-	c9.396-3.875,19.668-6.062,30.459-6.062c44.188,0,80,35.812,80,80S444.188,448,400,448z"/>
-</svg>
diff --git a/icons/cloud_day.png b/icons/cloud_day.png
new file mode 100644
index 0000000..79c44d3
--- /dev/null
+++ b/icons/cloud_day.png
diff --git a/icons/cloud_night.png b/icons/cloud_night.png
new file mode 100644
index 0000000..70bb222
--- /dev/null
+++ b/icons/cloud_night.png
diff --git a/icons/cloudy.png b/icons/cloudy.png
new file mode 100644
index 0000000..5b01984
--- /dev/null
+++ b/icons/cloudy.png
diff --git a/icons/fog.png b/icons/fog.png
new file mode 100644
index 0000000..9096b20
--- /dev/null
+++ b/icons/fog.png
diff --git a/icons/hail.png b/icons/hail.png
new file mode 100644
index 0000000..b2eadb7
--- /dev/null
+++ b/icons/hail.png
diff --git a/icons/haze.png b/icons/haze.png
new file mode 100644
index 0000000..fee74c9
--- /dev/null
+++ b/icons/haze.png
diff --git a/icons/rain.png b/icons/rain.png
new file mode 100644
index 0000000..963b397
--- /dev/null
+++ b/icons/rain.png
diff --git a/icons/sleet.png b/icons/sleet.png
new file mode 100644
index 0000000..a1da1bd
--- /dev/null
+++ b/icons/sleet.png
diff --git a/icons/snow.png b/icons/snow.png
new file mode 100644
index 0000000..84d2e78
--- /dev/null
+++ b/icons/snow.png
diff --git a/icons/sun_day.png b/icons/sun_day.png
new file mode 100644
index 0000000..c8d67be
--- /dev/null
+++ b/icons/sun_day.png
diff --git a/icons/sun_night.png b/icons/sun_night.png
new file mode 100644
index 0000000..ee99005
--- /dev/null
+++ b/icons/sun_night.png
diff --git a/icons/thunder.png b/icons/thunder.png
new file mode 100644
index 0000000..a01939e
--- /dev/null
+++ b/icons/thunder.png
diff --git a/icons/thunderstorm.png b/icons/thunderstorm.png
new file mode 100644
index 0000000..3fb5f13
--- /dev/null
+++ b/icons/thunderstorm.png
diff --git a/icons/wind.png b/icons/wind.png
new file mode 100644
index 0000000..d1e52de
--- /dev/null
+++ b/icons/wind.png
diff --git a/lib/HomePanel/AsyncUA.pm b/lib/HomePanel/AsyncUA.pm
deleted file mode 100644
index d74e4aa..0000000
--- a/lib/HomePanel/AsyncUA.pm
+++ /dev/null
@@ -1,32 +0,0 @@
-package HomePanel::AsyncUA;
-use Moo;
-use namespace::autoclean;
-use Net::Async::HTTP;
-
-has loop => (
-    is => 'ro',
-    required => 1,
-    weak => 1,
-);
-
-has agent => (
-    is => 'lazy',
-);
-sub _build_agent {
-    my ($self) = @_;
-
-    my $agent = Net::Async::HTTP->new(
-        max_connections_per_host => 1,
-        stall_timeout => 10,
-    );
-    $self->loop->add($agent);
-    return $agent;
-}
-
-sub get {
-    my ($self,$uri) = @_;
-
-    return $self->agent->GET($uri)->get
-}
-
-1;
diff --git a/lib/HomePanel/Driver.pm b/lib/HomePanel/Driver.pm
index f5a253d..e9ea31f 100644
--- a/lib/HomePanel/Driver.pm
+++ b/lib/HomePanel/Driver.pm
@@ -1,40 +1,44 @@
 package HomePanel::Driver;
 use Moo;
-use 5.10.0;
+use v5.36;
 use IO::Async::Loop;
 use IO::Async::Timer::Periodic;
-use HomePanel::AsyncUA;
+use Net::Async::HTTP;
+use Future::AsyncAwait;
 use WebService::ForecastIo;
 use WebService::TFL::Bus;
-use WebService::TFL::Bus::Request;
+use WebService::TFL::Bus::Response;
 use WebService::TFL::TubeStatus;
 use HomePanel::Render;
 use Types::Path::Tiny qw(AbsFile AbsPath);
+use Types::Standard qw(ArrayRef Str StrictNum);
 use Try::Tiny;
-#use Devel::Cycle;
 use curry::weak;
-use namespace::autoclean;
+use namespace::clean;
+use Data::Dumper;
 
 has loop => ( is => 'lazy' );
 sub _build_loop { IO::Async::Loop->new() }
 
 has user_agent => ( is => 'lazy' );
 sub _build_user_agent {
-    #HomePanel::AsyncUA->new({loop=>$_[0]->loop});
-    require LWP::UserAgent;
-    return LWP::UserAgent->new(timeout=>20);
+    my ($self) = @_;
+    my $ua = Net::Async::HTTP->new(
+        max_connections_per_host => 1,
+        stall_timeout => 10,
+        decode_content => 1,
+    );
+    $self->loop->add($ua);
+    return $ua;
 }
 
-has forecast_request => (
+has [qw(forecast_latitude forecast_longitude)] => (
+    isa => StrictNum,
     is => 'ro',
-    default => sub { +{
-        latitude => 51.54,
-        longitude => -0.37,
-        exclude => ['flags','sources'],
-    }; },
+    required => 1,
 );
-has forecast_response => ( is => 'rw' );
 has forecast_key => (
+    isa => Str,
     is => 'ro',
     required => 1,
 );
@@ -46,6 +50,7 @@ sub _build_forecast {
         user_agent => $self->user_agent,
     });
 }
+has forecast_response => ( is => 'rw' );
 has forecast_timer => ( is => 'lazy' );
 sub _build_forecast_timer {
     my ($self) = @_;
@@ -56,24 +61,20 @@ sub _build_forecast_timer {
 }
 sub forecast_timer_cb {
     my ($self) = @_;
-    $self->forecast_response(
-        $self->forecast->request(
-            $self->forecast_request
-        )
-    );
+
+    $self->forecast->request({
+        latitude => $self->forecast_latitude,
+        longitude => $self->forecast_longitude,
+        exclude => ['flags','sources'],
+    })->then(sub { $self->forecast_response(shift) })->retain;
 }
 
-has bus_request => (
+has bus_stop_ids => (
     is => 'ro',
-    default => sub {
-        WebService::TFL::Bus::Request->new({
-            StopPointName => 'Hotspur Road',
-            #Towards => 'Islip Manor',
-            ReturnList => [qw(StopID StopCode1 VisitNumber TripID VehicleID LineID LineName DirectionID DestinationText DestinationName EstimatedTime)],
-});
-    },
+    required => 1,
+    isa => ArrayRef->of(Str)->plus_coercions(Str, sub { [ $_ ] }),
+    coerce => 1,
 );
-has bus_response => ( is => 'rw' );
 has bus => (
     is => 'lazy',
 );
@@ -82,6 +83,7 @@ sub _build_bus {
         user_agent => $_[0]->user_agent,
     });
 }
+has bus_response => ( is => 'rw' );
 has bus_timer => ( is => 'lazy' );
 sub _build_bus_timer {
     my ($self) = @_;
@@ -92,11 +94,17 @@ sub _build_bus_timer {
 }
 sub bus_timer_cb {
     my ($self) = @_;
-    $self->bus_response(
-        $self->bus->request(
-            $self->bus_request
-        )
-    );
+
+    Future->wait_all(
+        map { $self->bus->request($_) } $self->bus_stop_ids->@*
+    )->then(
+        sub {
+            my @done_results = map { $_->result } grep { $_->is_done } @_;
+            $self->bus_response(
+                WebService::TFL::Bus::Response->new_merged(@done_results)
+            );
+        }
+    )->retain;
 };
 
 has tube => (
@@ -118,9 +126,9 @@ sub _build_tube_timer {
 }
 sub tube_timer_cb {
     my ($self) = @_;
-    $self->tube_response(
-        $self->tube->request()
-    );
+
+    $self->tube->request(
+    )->then(sub { $self->tube_response(shift) })->retain;
 }
 
 has writer_timer => ( is => 'lazy' );
@@ -170,6 +178,8 @@ sub _build_render {
 sub write_page {
     my ($self) = @_;
 
+    return unless $self->forecast_response;
+
     my $output = $self->render->render({
         forecast => $self->forecast_response,
         bus => $self->bus_response,
@@ -177,8 +187,6 @@ sub write_page {
     });
 
     $self->output_file->spew_utf8($output);
-
-    #find_cycle($self);
 }
 
 sub start {
diff --git a/lib/HomePanel/Render.pm b/lib/HomePanel/Render.pm
index fe165e3..c16e9c8 100644
--- a/lib/HomePanel/Render.pm
+++ b/lib/HomePanel/Render.pm
@@ -6,6 +6,7 @@ use Template::Stash::ForceUTF8;
 use Template;
 use DateTime;
 use DateTime::Format::Duration;
+use namespace::clean;
 
 has [qw(provider stash template)] => (
     is => 'lazy',
@@ -36,16 +37,17 @@ has template_file => (
 
 {
 my %icon_for=(
-    'clear-day' => '2',
-    'clear-night' => '3',
-    rain => '18',
-    snow => '23',
-    sleet => '24',
-    wind => '6',
-    fog => '13',
-    cloudy => '14',
-    'partly-cloudy-day' => '8',
-    'partly-cloudy-night' => '9',
+    'clear-day' => 'sun_day',
+    'clear' => 'sun_day',
+    'clear-night' => 'sun_night',
+    rain => 'rain',
+    snow => 'snow',
+    sleet => 'sleet',
+    wind => 'wind',
+    fog => 'fog',
+    cloudy => 'cloudy',
+    'partly-cloudy-day' => 'cloud_day',
+    'partly-cloudy-night' => 'cloud_night',
 );
 sub icon_for {
     my ($status) = @_;
diff --git a/lib/Types/DateTime.pm b/lib/Types/DateTime.pm
deleted file mode 100644
index d13f0d5..0000000
--- a/lib/Types/DateTime.pm
+++ /dev/null
@@ -1,20 +0,0 @@
-package Types::DateTime;
-use strict;
-use warnings;
-use namespace::autoclean;
-use Type::Library -base, -declare => 'DateTimeT';
-use Type::Utils -all;
-use Types::Standard -types;
-
-class_type DateTimeT, { class => 'DateTime' };
-coerce DateTimeT, from Num, via {
-    require DateTime;
-    DateTime->from_epoch(epoch => $_ );
-};
-coerce DateTimeT, from Str, via {
-    require DateTime::Format::ISO8601;
-    s{([+-])(\d\d)(\d\d)\z}{$1$2:$3};
-    DateTime::Format::ISO8601->new->parse_datetime($_)
-};
-
-1;
diff --git a/lib/Types/URI.pm b/lib/Types/URI.pm
deleted file mode 100644
index 0bb4ae5..0000000
--- a/lib/Types/URI.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package Types::URI;
-use strict;
-use warnings;
-use namespace::autoclean;
-use Type::Library -base, -declare => 'Uri';
-use Type::Utils -all;
-use Types::Standard -types;
-
-class_type Uri, { class => 'URI' };
-coerce Uri, from Str, via {
-    require URI;
-    URI->new($_);
-};
-
-1;
diff --git a/lib/WebService/ForecastIo.pm b/lib/WebService/ForecastIo.pm
index c329ad0..f3bf109 100644
--- a/lib/WebService/ForecastIo.pm
+++ b/lib/WebService/ForecastIo.pm
@@ -2,18 +2,18 @@ package WebService::ForecastIo;
 use Moo;
 use 5.10.0;
 use Types::Standard -types,'slurpy';
-use Type::Utils qw(duck_type enum);
 use Types::URI 'Uri';
-use Types::DateTime 'DateTimeT';
+use Types::DateTime -all;
 use Type::Params;
+use Future::AsyncAwait;
 use WebService::ForecastIo::Response;
 use DateTime::TimeZone;
-use namespace::autoclean;
+use namespace::clean;
 
 has base_uri => (
     is => 'ro',
     isa => Uri,
-    default => 'https://api.forecast.io/forecast',
+    default => 'https://api.pirateweather.net/forecast',
     coerce => Uri->coercion,
 );
 
@@ -24,19 +24,10 @@ has api_key => (
 );
 
 has user_agent => (
-    is => 'lazy',
-    isa => duck_type(['get']),
+    is => 'ro',
+    isa => HasMethods['do_request'],
+    required => 1,
 );
-sub _build_user_agent {
-    require LWP::UserAgent;
-    my $agent = LWP::UserAgent->new(
-        agent => __PACKAGE__ . ' version ' . ($WebService::ForecastIo::VERSION // 'devel' ),
-        env_proxy => 1,
-        keep_alive => 1,
-    );
-    $agent->default_header( 'Accept-Encoding' => 'gzip' );
-    return $agent;
-}
 
 sub _make_request_uri {
     my ($self,$opts) = @_;
@@ -74,36 +65,33 @@ sub _make_request_uri {
     return $req_uri;
 }
 
-my $units_type = enum [qw(us si ca uk auto)];
-my $block_type = enum [qw(currently minutely hourly daily alerts flags sources)];
+my $units_type = Enum [qw(us si ca uk auto)];
+my $block_type = Enum [qw(currently minutely hourly daily alerts flags sources)];
 
-sub request {
+async sub request {
     state $argcheck = compile(
         Object, Dict[
             latitude => Num,
             longitude => Num,
-            time => Optional[DateTimeT],
+            time => Optional[DateTimeUTC],
             units => Optional[$units_type],
             exclude => Optional[ArrayRef[$block_type]],
-            raw => Optional[Bool],
         ],
     );
     my ($self,$opts) = $argcheck->(@_);
     $opts->{units} //= 'si';
     $opts->{exclude} //= [];
-    $opts->{raw} //= 0;
 
     my $uri = $self->_make_request_uri({%$opts});
 
-    my $response = $self->user_agent->get($uri);
+    my $response = await $self->user_agent->do_request(uri => $uri);
+
     if ($response->is_success) {
         my $json = $response->decoded_content;
-        return $json if $opts->{raw};
-        my $res = WebService::ForecastIo::Response->new($json);
-        return wantarray ? ($res,$json) : $res
+        return WebService::ForecastIo::Response->new($json);
     }
     else {
-        die $response->status_line
+        die $response->status_line;
     }
 }
 
diff --git a/lib/WebService/ForecastIo/Alert.pm b/lib/WebService/ForecastIo/Alert.pm
index af826d8..73f7200 100644
--- a/lib/WebService/ForecastIo/Alert.pm
+++ b/lib/WebService/ForecastIo/Alert.pm
@@ -1,9 +1,9 @@
 package WebService::ForecastIo::Alert;
 use Moo;
-use namespace::autoclean;
 use Types::Standard -all;
 use Types::URI 'Uri';
-use Types::DateTime 'DateTimeT';
+use Types::DateTime -all;
+use namespace::clean;
 
 has title => (
     is => 'ro',
@@ -12,8 +12,8 @@ has title => (
 
 has expires => (
     is => 'ro',
-    isa => DateTimeT,
-    coerce => DateTimeT->coercion,
+    isa => DateTimeUTC,
+    coerce => 1,
 );
 
 has uri => (
diff --git a/lib/WebService/ForecastIo/DataBlock.pm b/lib/WebService/ForecastIo/DataBlock.pm
index 1994fa8..0f57ab2 100644
--- a/lib/WebService/ForecastIo/DataBlock.pm
+++ b/lib/WebService/ForecastIo/DataBlock.pm
@@ -1,9 +1,9 @@
 package WebService::ForecastIo::DataBlock;
 use Moo;
-use namespace::autoclean;
 use Types::Standard -all;
 use WebService::ForecastIo::Types -all;
 use WebService::ForecastIo::DataSpan;
+use namespace::clean;
 
 has [qw(summary icon)] => (
     is => 'ro',
diff --git a/lib/WebService/ForecastIo/DataPoint.pm b/lib/WebService/ForecastIo/DataPoint.pm
index 47ef659..13c60dd 100644
--- a/lib/WebService/ForecastIo/DataPoint.pm
+++ b/lib/WebService/ForecastIo/DataPoint.pm
@@ -1,16 +1,16 @@
 package WebService::ForecastIo::DataPoint;
 use Moo;
-use namespace::autoclean;
-use Types::DateTime 'DateTimeT';
+use Types::DateTime -all;
 use Types::Standard -all;
+use namespace::clean;
 
 has [qw( time
          sunriseTime sunsetTime
          precipIntensityMaxTime
          temperatureMinTime temperatureMaxTime )] => (
     is => 'ro',
-    isa => DateTimeT,
-    coerce => DateTimeT->coercion,
+    isa => DateTimeUTC,
+    coerce => 1,
 );
 
 has [qw(summary icon precipType)] => (
diff --git a/lib/WebService/ForecastIo/DataSpan.pm b/lib/WebService/ForecastIo/DataSpan.pm
index 4911442..f2e6c0d 100644
--- a/lib/WebService/ForecastIo/DataSpan.pm
+++ b/lib/WebService/ForecastIo/DataSpan.pm
@@ -1,20 +1,20 @@
 package WebService::ForecastIo::DataSpan;
 use Moo;
-use namespace::autoclean;
-use Types::DateTime 'DateTimeT';
+use Types::DateTime -all;
+use namespace::clean;
 
 has start_time => (
     is => 'ro',
-    isa => DateTimeT,
-    coerce => DateTimeT->coercion,
+    isa => DateTimeUTC,
+    coerce => 1,
     required => 1,
 );
 
 has stop_time => (
     is => 'ro',
     writer => '_set_stop_time',
-    isa => DateTimeT,
-    coerce => DateTimeT->coercion,
+    isa => DateTimeUTC,
+    coerce => 1,
     required => 1,
 );
 
diff --git a/lib/WebService/ForecastIo/Response.pm b/lib/WebService/ForecastIo/Response.pm
index 24c5324..c723771 100644
--- a/lib/WebService/ForecastIo/Response.pm
+++ b/lib/WebService/ForecastIo/Response.pm
@@ -1,9 +1,9 @@
 package WebService::ForecastIo::Response;
 use Moo;
-use namespace::autoclean;
 use Types::Standard -all;
 use WebService::ForecastIo::Types -all;
 use JSON;
+use namespace::clean;
 
 has 'currently' => (
     is => 'ro',
diff --git a/lib/WebService/ForecastIo/Types.pm b/lib/WebService/ForecastIo/Types.pm
index cc8dac2..4936188 100644
--- a/lib/WebService/ForecastIo/Types.pm
+++ b/lib/WebService/ForecastIo/Types.pm
@@ -1,7 +1,6 @@
 package WebService::ForecastIo::Types;
 use strict;
 use warnings;
-use namespace::autoclean;
 use Type::Library -base, -declare =>
     qw(
           Alert AlertArray
@@ -10,6 +9,7 @@ use Type::Library -base, -declare =>
   );
 use Type::Utils -all;
 use Types::Standard -types;
+use namespace::clean;
 
 class_type Alert, { class => 'WebService::ForecastIo::Alert' };
 
diff --git a/lib/WebService/TFL/Bus.pm b/lib/WebService/TFL/Bus.pm
index 3559755..8f43c0f 100644
--- a/lib/WebService/TFL/Bus.pm
+++ b/lib/WebService/TFL/Bus.pm
@@ -1,41 +1,44 @@
 package WebService::TFL::Bus;
 use Moo;
-use namespace::autoclean;
 use Types::URI 'Uri';
-use Type::Utils 'duck_type';
+use Types::Standard -types;
+use Future::AsyncAwait;
 use WebService::TFL::Bus::Response;
+use namespace::clean;
 
 has user_agent => (
-    isa => duck_type(['get']),
-    is => 'lazy',
-
+    isa => HasMethods['do_request'],
+    is => 'ro',
+    required => 1,
 );
-sub _build_user_agent {
-    require LWP::UserAgent;
-    my $ua = LWP::UserAgent->new();
-    $ua->env_proxy;
-    return $ua;
-}
 
 has uri => (
     isa => Uri,
     is => 'ro',
     coerce => Uri->coercion,
-    default => 'http://countdown.api.tfl.gov.uk/interfaces/ura/instant_V1',
+    default => 'https://api.tfl.gov.uk/StopPoint/__/Arrivals',
 );
 
-sub request {
-    my ($self,$request) = @_;
+has parser => (
+    is => 'lazy',
+    builder => sub { JSON->new->utf8 },
+);
+
+async sub request {
+    my ($self,$stop_id) = @_;
 
-    my $http_response = $self->user_agent->get(
-        $request->request_uri($self->uri)
+    my $uri = $self->uri->clone;
+    $uri->path_segments(
+        map { $_ eq '__' ? $stop_id : $_ } $uri->path_segments
     );
+
+    my $http_response = await $self->user_agent->do_request(uri => $uri);
+
     if ($http_response->is_success) {
         my $json = $http_response->content;
 
-        return WebService::TFL::Bus::Response->new_from_json(
-            $request->ReturnList,
-            $json
+        return WebService::TFL::Bus::Response->new_from_response(
+            $self->parser->decode($json)
         );
     }
     else {
diff --git a/lib/WebService/TFL/Bus/Fields.pm b/lib/WebService/TFL/Bus/Fields.pm
deleted file mode 100644
index b3d555f..0000000
--- a/lib/WebService/TFL/Bus/Fields.pm
+++ /dev/null
@@ -1,77 +0,0 @@
-package WebService::TFL::Bus::Fields;
-use strict;
-use warnings;
-
-sub stop_return_fields {
-    qw(
-          StopPointName
-          StopID
-          StopCode1
-          StopCode2
-          StopPointType
-          Towards
-          Bearing
-          StopPointIndicator
-          StopPointState
-          Latitude
-          Longitude
-  );
-}
-
-sub prediction_return_fields {
-    stop_return_fields(),
-    qw(
-          VisitNumber
-          LineID
-          LineName
-          DirectionID
-          DestinationText
-          DestinationName
-          VehicleID
-          TripID
-          RegistrationNumber
-          EstimatedTime
-          ExpireTime
-  ),
-}
-
-sub flexible_return_fields {
-    stop_return_fields,
-    qw(
-          MessageUUID
-          MessageType
-          MessagePriority
-          MessageText
-          StartTime
-          ExpireTime
-  ),
-}
-
-sub query_fields {
-    qw(
-          StopAlso
-          Circle
-          StopPointName
-          StopID
-          StopCode1
-          StopCode2
-          StopPointType
-          Towards
-          Bearing
-          StopPointIndicator
-          StopPointState
-          VisitNumber
-          LineID
-          LineName
-          DirectionID
-          DestinationText
-          DestinationName
-          VehicleID
-          TripID
-          RegistrationNumber
-          MessageType
-          MessagePriority
-  );
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Prediction.pm b/lib/WebService/TFL/Bus/Prediction.pm
new file mode 100644
index 0000000..8873b02
--- /dev/null
+++ b/lib/WebService/TFL/Bus/Prediction.pm
@@ -0,0 +1,26 @@
+package WebService::TFL::Bus::Prediction;
+use Moo;
+use Types::Standard -all;
+use Types::DateTime -all;
+use namespace::clean;
+
+has [qw(stationName destinationName lineName towards)] => (
+    is => 'ro',
+    isa => Str,
+    required => 1,
+);
+
+has 'expectedArrival' => (
+    is => 'ro',
+    isa => DateTimeUTC->plus_coercions( Format['ISO8601'] ),
+    required => 1,
+    coerce => 1,
+);
+
+sub new_from_response {
+    my ($class,$response_data) = @_;
+
+    return $class->new($response_data);
+}
+
+1;
diff --git a/lib/WebService/TFL/Bus/Request.pm b/lib/WebService/TFL/Bus/Request.pm
deleted file mode 100644
index dda6586..0000000
--- a/lib/WebService/TFL/Bus/Request.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package WebService::TFL::Bus::Request;
-use Moo;
-use Types::Standard -all;
-use WebService::TFL::Bus::Fields;
-use namespace::autoclean;
-
-for my $field (WebService::TFL::Bus::Fields->query_fields) {
-    has $field => (
-        is => 'rw',
-        predicate => "has_$field",
-    );
-}
-
-has ReturnList => (
-    is => 'rw',
-    isa => ArrayRef,
-    predicate => 'has_ReturnList',
-);
-
-sub request_uri {
-    my ($self,$base_uri) = @_;
-
-    my $uri = $base_uri->clone;
-    my %form;
-    for my $field (WebService::TFL::Bus::Fields->query_fields) {
-        my $pred = "has_$field";
-        if ($self->$pred) {
-            $form{$field} = $self->$field;
-        }
-    }
-    if ($self->has_ReturnList) {
-        $form{ReturnList}=join ',',@{$self->ReturnList}
-    }
-    $uri->query_form(\%form);
-    return $uri;
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response.pm b/lib/WebService/TFL/Bus/Response.pm
index e05d49d..59582be 100644
--- a/lib/WebService/TFL/Bus/Response.pm
+++ b/lib/WebService/TFL/Bus/Response.pm
@@ -1,55 +1,43 @@
 package WebService::TFL::Bus::Response;
 use Moo;
-use Class::Load 'load_class';
-use Type::Utils 'class_type';
 use Types::Standard -all;
-use JSON;
-use namespace::autoclean;
+use WebService::TFL::Bus::Prediction;
+use namespace::clean;
 
-sub line_class {
-    "WebService::TFL::Bus::Response::$_[0]";
-}
-
-my %line_map = (
-    0 => 'Stop',
-    1 => 'Prediction',
-    2 => 'FlexibleMessage',
-    3 => 'BaseVersion',
-    4 => 'URAVersion',
+has predictions => (
+    is => 'ro',
+    isa => ArrayRef[InstanceOf['WebService::TFL::Bus::Prediction']],
 );
 
-for my $field (values %line_map) {
-    my $class = line_class($field);
-    load_class($class);
-    has $field => (
-        is => 'ro',
-        isa => ArrayRef[class_type { class => $class }],
-    );
+sub _sort {
+    return sort {
+        $a->destinationName cmp $b->destinationName
+            ||
+            $a->expectedArrival <=> $b->expectedArrival
+            } @_;
 }
 
-sub new_from_json {
-    my ($class,$return_list,$json) = @_;
-
-    my $parser = JSON->new->utf8;
-
-    my %return_set;@return_set{@$return_list}=();
-    unless (%return_set) {
-        @return_set{qw(StopPointName LineName EstimatedTime)}=();
-    }
-    my %args;
-
-    while ($json) {
-        my ($array,$consumed) = $parser->decode_prefix($json);
-
-        my $array_type = $line_map{$array->[0]};
-        my $line_class = line_class($array_type);
-        push @{$args{$array_type}},
-            $line_class->new_from_array(\%return_set,$array);
+sub new_from_response {
+    my ($class,$response_data) = @_;
+
+    return $class->new({
+        predictions => [
+            _sort
+            map { WebService::TFL::Bus::Prediction->new_from_response($_) }
+            grep { $_->{'$type'} =~ /\bPrediction\b/ }
+            $response_data->@*
+        ],
+    });
+}
 
-        substr($json,0,$consumed)='';
-    }
+sub new_merged {
+    my ($class, @responses) = @_;
 
-    return $class->new(\%args);
+    return $class->new({
+        predictions => [
+            _sort map { $_->predictions->@* } @responses
+        ],
+    });
 }
 
 1;
diff --git a/lib/WebService/TFL/Bus/Response/BaseVersion.pm b/lib/WebService/TFL/Bus/Response/BaseVersion.pm
deleted file mode 100644
index 07edbcb..0000000
--- a/lib/WebService/TFL/Bus/Response/BaseVersion.pm
+++ /dev/null
@@ -1,15 +0,0 @@
-package WebService::TFL::Bus::Response::BaseVersion;
-use Moo;
-use namespace::autoclean;
-
-has Version => (
-    is => 'ro',
-);
-
-sub new_from_array {
-    my ($class,$return_set,$array) = @_;
-
-    return $class->new({Version => $array->[1]});
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm b/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
deleted file mode 100644
index 603ef6b..0000000
--- a/lib/WebService/TFL/Bus/Response/FlexibleMessage.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package WebService::TFL::Bus::Response::FlexibleMessage;
-use Moo;
-use namespace::autoclean;
-use WebService::TFL::Bus::ResponseTypeRole;
-with ResponseTypeRole('flexible');
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/Prediction.pm b/lib/WebService/TFL/Bus/Response/Prediction.pm
deleted file mode 100644
index 49a4b76..0000000
--- a/lib/WebService/TFL/Bus/Response/Prediction.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package WebService::TFL::Bus::Response::Prediction;
-use Moo;
-use namespace::autoclean;
-use WebService::TFL::Bus::ResponseTypeRole;
-with ResponseTypeRole('prediction');
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/Stop.pm b/lib/WebService/TFL/Bus/Response/Stop.pm
deleted file mode 100644
index 30f2f91..0000000
--- a/lib/WebService/TFL/Bus/Response/Stop.pm
+++ /dev/null
@@ -1,7 +0,0 @@
-package WebService::TFL::Bus::Response::Stop;
-use Moo;
-use namespace::autoclean;
-use WebService::TFL::Bus::ResponseTypeRole;
-with ResponseTypeRole('stop');
-
-1;
diff --git a/lib/WebService/TFL/Bus/Response/URAVersion.pm b/lib/WebService/TFL/Bus/Response/URAVersion.pm
deleted file mode 100644
index fc0b41f..0000000
--- a/lib/WebService/TFL/Bus/Response/URAVersion.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package WebService::TFL::Bus::Response::URAVersion;
-use Moo;
-use namespace::autoclean;
-
-for my $field (qw(Version TimeStamp)) {
-    has $field => (
-        is => 'ro',
-    );
-}
-
-sub new_from_array {
-    my ($class,$return_set,$array) = @_;
-
-    return $class->new({Version => $array->[1],TimeStamp => $array->[2]});
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/ResponseTypeRole.pm b/lib/WebService/TFL/Bus/ResponseTypeRole.pm
deleted file mode 100644
index 7f48419..0000000
--- a/lib/WebService/TFL/Bus/ResponseTypeRole.pm
+++ /dev/null
@@ -1,38 +0,0 @@
-package WebService::TFL::Bus::ResponseTypeRole;
-use Package::Variant
-    importing => [ 'Moo::Role'],
-    subs => [ 'has' ];
-use WebService::TFL::Bus::Fields;
-use WebService::TFL::Bus::Types 'DateTimeMillis';
-
-sub make_variant {
-    my ($class,$target_package,$type) = @_;
-
-    my $method = $type . '_return_fields';
-    my @fields = WebService::TFL::Bus::Fields->$method;
-
-    for my $field (@fields) {
-        has $field => (
-            is => 'ro',
-            ( $field =~ /Time$/ ? (
-                isa => DateTimeMillis,
-                coerce => DateTimeMillis->coercion,
-            ) : () ),
-        );
-    }
-
-    install new_from_array => sub {
-        my ($class,$return_set,$array) = @_;
-
-        my %args;
-        my $i=1;
-        for my $field (@fields) {
-            next unless exists $return_set->{$field};
-            $args{$field}=$array->[$i];
-            ++$i;
-        }
-        return $class->new(\%args);
-    }
-}
-
-1;
diff --git a/lib/WebService/TFL/Bus/Types.pm b/lib/WebService/TFL/Bus/Types.pm
deleted file mode 100644
index e67fe32..0000000
--- a/lib/WebService/TFL/Bus/Types.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package WebService::TFL::Bus::Types;
-use Type::Library -base, -declare => 'DateTimeMillis';
-use Types::Standard -all;
-use Type::Utils -all;
-use Types::DateTime 'DateTimeT';
-use namespace::autoclean;
-
-declare DateTimeMillis, as DateTimeT;
-coerce DateTimeMillis, from Num, via {
-    require DateTime;
-    DateTime->from_epoch( epoch => $_ / 1000 )
-};
-
-1;
diff --git a/lib/WebService/TFL/TubeStatus.pm b/lib/WebService/TFL/TubeStatus.pm
index b0ba260..e4ec7b5 100644
--- a/lib/WebService/TFL/TubeStatus.pm
+++ b/lib/WebService/TFL/TubeStatus.pm
@@ -1,39 +1,44 @@
 package WebService::TFL::TubeStatus;
 use Moo;
-use Type::Utils 'duck_type';
 use Types::URI 'Uri';
-use XML::LibXML;
-use XML::LibXML::XPathContext;
+use Types::Standard -types;
+use Future::AsyncAwait;
 use WebService::TFL::TubeStatus::Response;
-use namespace::autoclean;
+use namespace::clean;
 
 has user_agent => (
-    isa => duck_type(['get']),
-    is => 'lazy',
+    isa => HasMethods['do_request'],
+    is => 'ro',
+    required => 1,
 );
-sub _build_user_agent {
-    require LWP::UserAgent;
-    my $ua = LWP::UserAgent->new();
-    $ua->env_proxy;
-    return $ua;
-}
 
 has uri => (
     isa => Uri,
     is => 'ro',
     coerce => Uri->coercion,
-    default => 'http://cloud.tfl.gov.uk/TrackerNet/LineStatus',
+    default => 'https://api.tfl.gov.uk/Line/Mode/tube,dlr,elizabeth-line,overground/Status',
 );
 
-sub request {
+has parser => (
+    is => 'lazy',
+    builder => sub { JSON->new->utf8 },
+);
+
+async sub request {
     my ($self) = @_;
 
-    my $doc = XML::LibXML->load_xml(location => $self->uri)
-        or die "Couldn't fetch tube status";
-    my $xpath=XML::LibXML::XPathContext->new($doc);
-    $xpath->registerNs('ws','http://webservices.lul.co.uk/');
+    my $http_response = await $self->user_agent->do_request(uri => $self->uri);
+
+    if ($http_response->is_success) {
+        my $json = $http_response->content;
 
-    return WebService::TFL::TubeStatus::Response->new_from_xml($doc,$xpath);
+        return WebService::TFL::TubeStatus::Response->new_from_response(
+            $self->parser->decode($json)
+        );
+    }
+    else {
+        die $http_response->status_line;
+    }
 }
 
 1;
diff --git a/lib/WebService/TFL/TubeStatus/Response.pm b/lib/WebService/TFL/TubeStatus/Response.pm
index 191abe7..b6b104b 100644
--- a/lib/WebService/TFL/TubeStatus/Response.pm
+++ b/lib/WebService/TFL/TubeStatus/Response.pm
@@ -1,30 +1,25 @@
 package WebService::TFL::TubeStatus::Response;
 use Moo;
-use WebService::TFL::TubeStatus::Types -all;
 use WebService::TFL::TubeStatus::Response::Line;
 use Types::Standard -all;
-use namespace::autoclean;
+use namespace::clean;
 
 has lines => (
     is => 'ro',
-    isa => ArrayRef[LineT],
+    isa => ArrayRef[InstanceOf['WebService::TFL::TubeStatus::Response::Line']],
     required => 1,
 );
 
-sub new_from_xml {
-    my ($class,$doc,$xpath) = @_;
+sub new_from_response {
+    my ($class,$response_data) = @_;
 
-    my @lines;
-
-    for my $ls ($xpath->findnodes(q{/ws:ArrayOfLineStatus/ws:LineStatus},$doc)) {
-        my ($line)=$xpath->findnodes(q{ws:Line},$ls);
-
-        my $line_object = WebService::TFL::TubeStatus::Response::Line->new_from_xml($line,$ls,$xpath);
-
-        push @lines,$line_object;
-    }
-
-    return $class->new({lines=>\@lines});
+    return $class->new({
+        lines=> [
+            map { WebService::TFL::TubeStatus::Response::Line->new_from_response($_) }
+            grep { $_->{'$type'} =~ /\bLine\b/ }
+            $response_data->@*
+        ],
+    });
 }
 
 1;
diff --git a/lib/WebService/TFL/TubeStatus/Response/Line.pm b/lib/WebService/TFL/TubeStatus/Response/Line.pm
index 9779443..f962418 100644
--- a/lib/WebService/TFL/TubeStatus/Response/Line.pm
+++ b/lib/WebService/TFL/TubeStatus/Response/Line.pm
@@ -1,13 +1,12 @@
 package WebService::TFL::TubeStatus::Response::Line;
 use Moo;
 use Types::Standard -all;
-use WebService::TFL::TubeStatus::Types -all;
 use WebService::TFL::TubeStatus::Response::LineStatus;
-use namespace::autoclean;
+use namespace::clean;
 
 has id => (
     is => 'ro',
-    isa => Num,
+    isa => Str,
     required => 1,
 );
 
@@ -19,20 +18,20 @@ has name => (
 
 has status => (
     is => 'ro',
-    isa => LineStatusT,
+    isa => InstanceOf['WebService::TFL::TubeStatus::Response::LineStatus'],
     required => 1,
 );
 
-sub new_from_xml {
-    my ($class,$line,$status,$xpath) = @_;
-
-    my %init_arg;
-
-    $init_arg{id} = $line->findvalue(q{@ID});
-    $init_arg{name} = $line->findvalue(q{@Name});
-    $init_arg{status} = WebService::TFL::TubeStatus::Response::LineStatus->new_from_xml($status,$xpath);
+sub new_from_response {
+    my ($class,$response_data) = @_;
 
-    return $class->new(\%init_arg);
+    return $class->new({
+        id => $response_data->{id},
+        name => $response_data->{name},
+        status => WebService::TFL::TubeStatus::Response::LineStatus->new_from_response(
+            $response_data->{lineStatuses}[0],
+        ),
+    });
 }
 
 1;
diff --git a/lib/WebService/TFL/TubeStatus/Response/LineStatus.pm b/lib/WebService/TFL/TubeStatus/Response/LineStatus.pm
index 6caa7d6..69ddf20 100644
--- a/lib/WebService/TFL/TubeStatus/Response/LineStatus.pm
+++ b/lib/WebService/TFL/TubeStatus/Response/LineStatus.pm
@@ -1,33 +1,26 @@
 package WebService::TFL::TubeStatus::Response::LineStatus;
 use Moo;
 use Types::Standard -all;
-use namespace::autoclean;
+use namespace::clean;
 
-has is_active => (
+has [qw(statusSeverity statusSeverityDescription)] => (
     is => 'ro',
-    isa => Bool,
+    isa => Str,
     required => 1,
 );
 
-has [qw(code class description details)] => (
+has reason => (
     is => 'ro',
     isa => Str,
-    required => 1,
 );
 
-sub new_from_xml {
-    my ($class,$ls,$xpath) = @_;
-
-    my %init_arg;
+sub new_from_response {
+    my ($class,$response_data) = @_;
 
-    my ($status) = $xpath->findnodes(q{ws:Status},$ls);
-    $init_arg{code} = $status->findvalue(q{@ID});
-    $init_arg{is_active} = $status->findvalue(q{@IsActive}) eq 'true';
-    $init_arg{class} = $status->findvalue(q{@CssClass});
-    $init_arg{description} = $status->findvalue(q{@Description});
-    $init_arg{details} = $ls->findvalue(q{@StatusDetails});
+    $response_data->{reason} =~ s{\A .+? : \s*}{}x
+        if $response_data->{reason};
 
-    return $class->new(\%init_arg);
+    return $class->new($response_data);
 }
 
 1;
diff --git a/lib/WebService/TFL/TubeStatus/Types.pm b/lib/WebService/TFL/TubeStatus/Types.pm
deleted file mode 100644
index d1cb141..0000000
--- a/lib/WebService/TFL/TubeStatus/Types.pm
+++ /dev/null
@@ -1,11 +0,0 @@
-package WebService::TFL::TubeStatus::Types;
-use strict;
-use warnings;
-use Type::Library -base, -declare => qw(LineT LineStatusT);
-use Type::Utils -all;
-use namespace::autoclean;
-
-class_type LineT, { class => 'WebService::TFL::TubeStatus::Response::Line' };
-class_type LineStatusT, { class => 'WebService::TFL::TubeStatus::Response::LineStatus' };
-
-1;
diff --git a/tfl-live-bus-and-river-bus-arrivals-api-documentation.pdf b/tfl-live-bus-and-river-bus-arrivals-api-documentation.pdf
deleted file mode 100644
index 7dfd882..0000000
--- a/tfl-live-bus-and-river-bus-arrivals-api-documentation.pdf
+++ /dev/null