refactoring to new toolbar designs; sync with TA codev6

29 files changed, 1765 insertions, 814 deletions

diff --git a/NEWS b/NEWS
index 94851cb..ab5bf6f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+6
+
+ENHANCEMENT
+* Refactoring of toolbars to meet new reference design
+
+BUG FIX
+* Fixed race-condition that sometimes prevented turtle art from
+  launching (#3044)
+
+5
+
+ENHANCEMENT
+* Added offset to challenge to make it easier to align the turtle to the graphic
+* Added hints to the Help toolbar (with help from Ignacio Rodriguez)
+* Command-line version for running from GNOME shell
+
 4
 
 ENHANCEMENTS
diff --git a/TurtleArt/taconstants.py b/TurtleArt/taconstants.py
index 30920d6..2bb9049 100644
--- a/TurtleArt/taconstants.py
+++ b/TurtleArt/taconstants.py
@@ -72,6 +72,7 @@ SHOW_WHITE = "#F0F0F0"
 DEFAULT_SCALE = 33
 XO1 = 'xo1'
 XO15 = 'xo1.5'
+XO175 = 'xo1.75'
 UNKNOWN = 'unknown'
 
 CONSTANTS = {'leftpos': None, 'toppos': None, 'rightpos': None,
@@ -85,13 +86,12 @@ CONSTANTS = {'leftpos': None, 'toppos': None, 'rightpos': None,
 #
 EXPANDABLE_STYLE = ['boolean-style', 'compare-porch-style', 'compare-style',
                     'number-style-porch', 'number-style', 'basic-style-2arg',
-                    'number-style-block']
+                    'number-style-block', 'box-style-media']
 
 EXPANDABLE = ['vspace', 'hspace', 'identity2']
 
-EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg',
-                   'myfunc3arg', 'userdefined', 'userdefined2args',
-                   'userdefined3args']
+EXPANDABLE_ARGS = ['list', 'myfunc1arg', 'myfunc2arg', 'myfunc3arg',
+                   'userdefined', 'userdefined2args', 'userdefined3args']
 #
 # Blocks that are 'collapsible'
 #
@@ -103,15 +103,6 @@ COLLAPSIBLE = ['sandwichbottom', 'sandwichcollapsed']
 OLD_DOCK = ['and', 'or', 'plus', 'minus', 'division', 'product', 'remainder']
 
 #
-# These blocks get a special skin
-#
-BLOCKS_WITH_SKIN = ['journal', 'audio', 'description', 'nop', 'userdefined',
-                    'video', 'userdefined2args', 'userdefined3args', 'camera']
-
-PYTHON_SKIN = ['nop', 'userdefined', 'userdefined2args', 'userdefined3args']
-
-
-#
 # Blocks that can interchange strings and numbers for their arguments
 #
 STRING_OR_NUMBER_ARGS = ['plus2', 'equal2', 'less2', 'greater2', 'box',
@@ -125,21 +116,26 @@ STRING_OR_NUMBER_ARGS = ['plus2', 'equal2', 'less2', 'greater2', 'box',
 CONTENT_ARGS = ['show', 'showaligned', 'push', 'storein', 'storeinbox1',
                 'storeinbox2']
 
-PREFIX_DICTIONARY = {'journal': '#smedia_', 'description': '#sdescr_',
-                     'audio': '#saudio_', 'video': '#svideo_'}
+PREFIX_DICTIONARY = {}
 
 #
-# Status blocks
+# These blocks get a special skin
 #
+BLOCKS_WITH_SKIN = []
 
-MEDIA_SHAPES = ['audiooff', 'audioon', 'audiosmall',
-                'videooff', 'videoon', 'videosmall',
-                'cameraoff', 'camerasmall',
-                'journaloff', 'journalon', 'journalsmall',
-                'descriptionoff', 'descriptionon', 'descriptionsmall',
-                'pythonoff', 'pythonon', 'pythonsmall',
-                'list', '1x1', '1x1a', '2x1', '1x2', '2x2']
+PYTHON_SKIN = []
 
+SKIN_PATHS = ['images']
+
+MEDIA_SHAPES = []
+
+NO_IMPORT = []
+
+EXPAND_SKIN = {}
+
+#
+# Status blocks
+#
 OVERLAY_SHAPES = ['Cartesian', 'Cartesian_labeled', 'polar', 'metric']
 
 STATUS_SHAPES = ['status', 'info', 'nostack', 'dupstack', 'noinput',
diff --git a/TurtleArt/tawindow.py b/TurtleArt/tawindow.py
index 64a32fd..992e291 100644
--- a/TurtleArt/tawindow.py
+++ b/TurtleArt/tawindow.py
@@ -53,11 +53,12 @@ except ImportError:
 from taconstants import HORIZONTAL_PALETTE, VERTICAL_PALETTE, BLOCK_SCALE, \
     MEDIA_SHAPES, STATUS_SHAPES, OVERLAY_SHAPES, STRING_OR_NUMBER_ARGS, \
     TOOLBAR_SHAPES, TAB_LAYER, RETURN, OVERLAY_LAYER, CATEGORY_LAYER, \
-    BLOCKS_WITH_SKIN, ICON_SIZE, PALETTE_SCALE, PALETTE_WIDTH, \
+    BLOCKS_WITH_SKIN, ICON_SIZE, PALETTE_SCALE, PALETTE_WIDTH, SKIN_PATHS, \
     MACROS, TOP_LAYER, BLOCK_LAYER, OLD_NAMES, DEFAULT_TURTLE, TURTLE_LAYER, \
-    CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, \
+    CURSOR, EXPANDABLE, COLLAPSIBLE, DEAD_DICTS, DEAD_KEYS, NO_IMPORT, \
     TEMPLATES, PYTHON_SKIN, PALETTE_HEIGHT, STATUS_LAYER, OLD_DOCK, \
-    EXPANDABLE_ARGS, XO1, XO15, UNKNOWN, TITLEXY, CONTENT_ARGS, CONSTANTS
+    EXPANDABLE_ARGS, XO1, XO15, XO175, UNKNOWN, TITLEXY, CONTENT_ARGS, \
+    CONSTANTS, EXPAND_SKIN
 from tapalette import palette_names, palette_blocks, expandable_blocks, \
     block_names, content_blocks, default_values, special_names, block_styles, \
     help_strings
@@ -108,7 +109,8 @@ class TurtleArtWindow():
                 self.gc = self.area.new_gc()
             else:
                 # We lose...
-                debug_output('drawable area is None... punting')
+                debug_output('drawable area is None... punting',
+                             self.running_sugar)
                 exit()
             self._setup_events()
         elif type(win) == gtk.gdk.Pixmap:
@@ -154,7 +156,7 @@ class TurtleArtWindow():
         self.orientation = HORIZONTAL_PALETTE
 
         self.hw = get_hardware()
-        if self.hw in (XO1, XO15):
+        if self.hw in (XO1, XO15, XO175):
             self.lead = 1.0
             self.scale = 0.67
             if self.hw == XO1:
@@ -297,9 +299,16 @@ class TurtleArtWindow():
             try:
                 exec f in globals(), plugins
                 self._plugins.append(plugins.values()[0](self))
-                # debug_output('successfully importing %s' % (plugin_class))
+                debug_output('successfully importing %s' % (plugin_class),
+                             self.running_sugar)
             except ImportError:
-                debug_output('failed to import %s' % (plugin_class))
+                debug_output('failed to import %s' % (plugin_class),
+                             self.running_sugar)
+            '''
+            exec f in globals(), plugins
+            self._plugins.append(plugins.values()[0](self))
+            debug_output('successfully importing %s' % (plugin_class))
+            '''
 
         # Add the icon dir for each plugin to the icon_theme search path
         for plugin_dir in self._get_plugins_from_plugins_dir(
@@ -365,12 +374,17 @@ class TurtleArtWindow():
                 filename = 'file' + name[7:]
             else:
                 filename = name
-            self.media_shapes[name] = svg_str_to_pixbuf(svg_from_file(
-                    "%s/images/%s.svg" % (self.path, filename)))
+            # Try both images/ and plugins/*/images/
+            for path in SKIN_PATHS:
+                if os.path.exists(os.path.join(self.path, path,
+                                               filename + '.svg')):
+                    self.media_shapes[name] = svg_str_to_pixbuf(svg_from_file(
+                            os.path.join(self.path, path, filename + '.svg')))
+                    break
 
         for i, name in enumerate(STATUS_SHAPES):
             self.status_shapes[name] = svg_str_to_pixbuf(svg_from_file(
-                    "%s/images/%s.svg" % (self.path, name)))
+                    os.path.join(self.path, 'images', name + '.svg')))
         self.status_spr = Sprite(self.sprite_list, 0, self.height - 200,
                                  self.status_shapes['status'])
         self.status_spr.hide()
@@ -534,9 +548,6 @@ class TurtleArtWindow():
                 if blk.status != 'collapsed':
                     blk.spr.set_layer(BLOCK_LAYER)
             self.show_palette()
-            if self.activity is not None and self.activity.has_toolbarbox:
-                self.activity.palette_buttons[0].set_icon(
-                    palette_names[0] + 'on')
             self.hide = False
             if self.running_sugar:
                 self.activity.recenter()
@@ -766,9 +777,9 @@ class TurtleArtWindow():
                 # Some proto blocks get a skin.
                 if name in block_styles['box-style-media']:
                     self._proto_skin(name + 'small', n, i)
-                elif name[:8] == 'template':
+                elif name[:8] == 'template':  # Deprecated
                     self._proto_skin(name[8:], n, i)
-                elif name[:7] == 'picture':
+                elif name[:7] == 'picture':  # Deprecated
                     self._proto_skin(name[7:], n, i)
                 elif name in PYTHON_SKIN:
                     self._proto_skin('pythonsmall', n, i)
@@ -780,7 +791,8 @@ class TurtleArtWindow():
             # Hide the selectors
             for i in range(len(palette_blocks)):
                 self.selectors[i].hide()
-        elif self.selected_palette is not None:
+        elif self.selected_palette is not None and \
+             not self.activity.has_toolbarbox:
             self.activity.palette_buttons[self.selected_palette].set_icon(
                 palette_names[self.selected_palette] + 'off')
         self.selected_palette = None
@@ -1015,12 +1027,14 @@ class TurtleArtWindow():
                        not self.activity.has_toolbarbox:
                         self._select_category(self.selectors[i])
                     else:
-                        if self.selected_palette is not None:
+                        if self.selected_palette is not None and \
+                           not self.activity.has_toolbarbox:
                             self.activity.palette_buttons[
                                 self.selected_palette].set_icon(
                                 palette_names[self.selected_palette] + 'off')
-                        self.activity.palette_buttons[i].set_icon(
-                            palette_names[i] + 'on')
+                        if not self.activity.has_toolbarbox:
+                            self.activity.palette_buttons[i].set_icon(
+                                palette_names[i] + 'on')
                         self.show_palette(i)
                 else:
                     self.orientation = 1 - self.orientation
@@ -1203,6 +1217,11 @@ class TurtleArtWindow():
             else:
                 self._block_skin('pythonoff', newblk)
         elif name in block_styles['box-style-media']:
+            if name in EXPAND_SKIN:
+                if newblk.ex == 0:
+                    newblk.expand_in_x(EXPAND_SKIN[name][0])
+                if newblk.ey == 0:
+                    newblk.expand_in_y(EXPAND_SKIN[name][1])
             self._block_skin(name + 'off', newblk)
 
         newspr = newblk.spr
@@ -1666,8 +1685,7 @@ class TurtleArtWindow():
             blk.spr.labels[0] += CURSOR
 
         elif blk.name in block_styles['box-style-media'] and \
-             blk.name != 'camera':
-            # TODO: isolate reference to camera
+             blk.name not in NO_IMPORT:
             self._import_from_journal(self.selected_blk)
             if blk.name == 'journal' and self.running_sugar:
                 self._load_description_block(blk)
@@ -1784,7 +1802,12 @@ class TurtleArtWindow():
                           'sandwichtop_no_arm']:
             restore_stack(blk)
 
-        elif blk.name in COLLAPSIBLE:
+        elif blk.name in COLLAPSIBLE or blk.name == 'sandwichtop_no_label':
+            if blk.name == 'sandwichtop_no_label':
+                if hide_button_hit(blk.spr, x, y):
+                    collapse_stack(blk)
+                else:
+                    self._run_stack(blk)
             top = find_sandwich_top(blk)
             if collapsed(blk):
                 restore_stack(top)  # deprecated (bottom block is invisible)
@@ -2595,34 +2618,16 @@ class TurtleArtWindow():
         elif btype == 'start':  # block size is saved in start block
             if value is not None:
                 self.block_scale = value
-        elif btype in EXPANDABLE or btype in expandable_blocks or \
-             btype in EXPANDABLE_ARGS or btype == 'nop':
-            if btype == 'vspace' or btype in expandable_blocks:
-                if value is not None:
-                    blk.expand_in_y(value)
-            elif btype == 'hspace' or btype == 'identity2':
-                if value is not None:
-                    blk.expand_in_x(value)
-            elif btype == 'templatelist' or btype == 'list':
-                for i in range(len(b[4]) - 4):
-                    blk.add_arg()
-            elif btype == 'myfunc2arg' or btype == 'myfunc3arg' or\
-                 btype == 'userdefined2args' or btype == 'userdefined3args':
-                blk.add_arg()
-            if btype == 'myfunc3arg' or btype == 'userdefined3args':
-                blk.add_arg(False)
-            if btype in PYTHON_SKIN:
-                if self.nop == 'pythonloaded':
-                    self._block_skin('pythonon', blk)
-                else:
-                    self._block_skin('pythonoff', blk)
         elif btype in block_styles['box-style-media'] and blk.spr is not None:
-            # TODO: isolate reference to camera
+            if btype in EXPAND_SKIN:
+                if blk.ex == 0:
+                    blk.expand_in_x(EXPAND_SKIN[btype][0])
+                if blk.ey == 0:
+                    blk.expand_in_y(EXPAND_SKIN[btype][1])
             if len(blk.values) == 0 or blk.values[0] == 'None' or \
-               blk.values[0] is None or btype == 'camera':
+               blk.values[0] is None or btype in NO_IMPORT:
                 self._block_skin(btype + 'off', blk)
-            elif btype == 'video' or btype == 'audio' or \
-                 btype == 'description':
+            elif btype in ['video', 'audio', 'description']:
                 self._block_skin(btype + 'on', blk)
             elif self.running_sugar:
                 try:
@@ -2661,6 +2666,27 @@ class TurtleArtWindow():
                     self._block_skin('journalon', blk)
             blk.spr.set_label(' ')
             blk.resize()
+        elif btype in EXPANDABLE or btype in expandable_blocks or \
+             btype in EXPANDABLE_ARGS or btype == 'nop':
+            if btype == 'vspace' or btype in expandable_blocks:
+                if value is not None:
+                    blk.expand_in_y(value)
+            elif btype == 'hspace' or btype == 'identity2':
+                if value is not None:
+                    blk.expand_in_x(value)
+            elif btype == 'templatelist' or btype == 'list':
+                for i in range(len(b[4]) - 4):
+                    blk.add_arg()
+            elif btype == 'myfunc2arg' or btype == 'myfunc3arg' or\
+                 btype == 'userdefined2args' or btype == 'userdefined3args':
+                blk.add_arg()
+            if btype == 'myfunc3arg' or btype == 'userdefined3args':
+                blk.add_arg(False)
+            if btype in PYTHON_SKIN:
+                if self.nop == 'pythonloaded':
+                    self._block_skin('pythonon', blk)
+                else:
+                    self._block_skin('pythonoff', blk)
 
         if self.interactive_mode:
             blk.spr.set_layer(BLOCK_LAYER)
@@ -2950,8 +2976,10 @@ class TurtleArtWindow():
                 w, h = self._calc_w_h('journaloff', blk.spr)
                 x, y = self._calc_image_offset('journaloff', blk.spr, w, h)
         else:
-            w, h = self._calc_w_h('descriptionoff', blk.spr)
-            x, y = self._calc_image_offset('descriptionoff', blk.spr, w, h)
+            # w, h = self._calc_w_h('descriptionoff', blk.spr)
+            w, h = self._calc_w_h('', blk.spr)
+            # x, y = self._calc_image_offset('descriptionoff', blk.spr, w, h)
+            x, y = self._calc_image_offset('', blk.spr, w, h)
         blk.scale_image(x, y, w, h)
 
 
diff --git a/TurtleConfusionActivity.py b/TurtleConfusionActivity.py
index 3299111..3424b16 100644
--- a/TurtleConfusionActivity.py
+++ b/TurtleConfusionActivity.py
@@ -36,6 +36,7 @@ try:  # 0.86 toolbar widgets
 except ImportError:
     HAS_TOOLBARBOX = False
 from sugar.graphics.toolbutton import ToolButton
+from sugar.graphics.radiotoolbutton import RadioToolButton
 from sugar.datastore import datastore
 from sugar.graphics.combobox import ComboBox
 from sugar.graphics.toolcombobox import ToolComboBox
@@ -49,7 +50,7 @@ import tarfile
 from gettext import gettext as _
 
 from TurtleArt.tapalette import palette_names, help_strings
-from TurtleArt.taconstants import ICON_SIZE, BLOCK_SCALE, XO1, XO15
+from TurtleArt.taconstants import ICON_SIZE, BLOCK_SCALE, XO1, XO15, XO175
 from TurtleArt.taexporthtml import save_html
 from TurtleArt.taexportlogo import save_logo
 from TurtleArt.tautils import data_to_file, data_to_string, data_from_string, \
@@ -87,7 +88,7 @@ class TurtleConfusionActivity(activity.Activity):
     def do_save_as_html_cb(self, button):
         ''' Write html out to datastore. '''
         self.save_as_html.set_icon('htmlon')
-        _logger.debug('saving html code')
+        _logger.debug('saving HTML code')
         # Until we have URLs for datastore objects, always embed images.
         embed_flag = True
 
@@ -186,6 +187,18 @@ class TurtleConfusionActivity(activity.Activity):
                 self._custom_filepath = jobject.file_path
                 self._load_level(custom=True)
 
+    def do_load_ta_project_cb(self, button):
+        ''' Load a project from the Journal. '''
+        chooser(self, 'org.laptop.TurtleArtActivity', self._load_ta_project)
+
+    def _load_ta_project(self, dsobject):
+        ''' Load a TA project from the datastore. '''
+        try:
+            _logger.debug('opening %s ' % dsobject.file_path)
+            self.read_file(dsobject.file_path, False)
+        except:
+            _logger.debug("couldn't open %s" % dsobject.file_path)
+
     def do_load_python_cb(self, button):
         ''' Load Python code from the Journal. '''
         self.load_python.set_icon('pippy-openon')
@@ -236,15 +249,17 @@ class TurtleConfusionActivity(activity.Activity):
     def do_palette_buttons_cb(self, button, i):
         ''' Palette selector buttons '''
         if self.tw.selected_palette is not None:
-            self.palette_buttons[self.tw.selected_palette].set_icon(
-                palette_names[self.tw.selected_palette] + 'off')
+            if not self.has_toolbarbox:
+                self.palette_buttons[self.tw.selected_palette].set_icon(
+                    palette_names[self.tw.selected_palette] + 'off')
             if self.tw.selected_palette == i:
                 # Hide the palette if it is already selected.
                 self.tw.hideshow_palette(False)
                 self.do_hidepalette()
                 return
 
-        self.palette_buttons[i].set_icon(palette_names[i] + 'on')
+        if not self.has_toolbarbox:
+            self.palette_buttons[i].set_icon(palette_names[i] + 'on')
         self.tw.show_palette(i)
         self.do_showpalette()
 
@@ -508,34 +523,37 @@ class TurtleConfusionActivity(activity.Activity):
                                                 page=help_toolbar,
                                                 icon_name='help-toolbar')
 
-            journal_toolbar = gtk.Toolbar()
-            journal_toolbar_button = ToolbarButton(page=journal_toolbar,
-                icon_name='activity-journal')
+            self._make_load_save_buttons(activity_toolbar_button)
 
             activity_toolbar_button.show()
             self._toolbox.toolbar.insert(activity_toolbar_button, -1)
             edit_toolbar_button.show()
             self._toolbox.toolbar.insert(edit_toolbar_button, -1)
-            journal_toolbar_button.show()
-            self._toolbox.toolbar.insert(journal_toolbar_button, -1)
             view_toolbar_button.show()
             self._toolbox.toolbar.insert(view_toolbar_button, -1)
             self._palette_toolbar_button.show()
             self._toolbox.toolbar.insert(self._palette_toolbar_button, -1)
-            help_toolbar_button.show()
-            self._toolbox.toolbar.insert(help_toolbar_button, -1)
-
-            self._add_separator(self._toolbox.toolbar)
 
             self._make_project_buttons(self._toolbox.toolbar)
 
-            self._add_separator(self._toolbox.toolbar, True)
+            self._add_separator(self._toolbox.toolbar, expand=True,
+                                visible=False)
+
+            self.samples_button = self._add_button(
+                'ta-open', _('Load example'), self.do_samples_cb,
+                self._toolbox.toolbar)
+
+            help_toolbar_button.show()
+            self._toolbox.toolbar.insert(help_toolbar_button, -1)
 
             stop_button = StopButton(self)
             stop_button.props.accelerator = '<Ctrl>Q'
             self._toolbox.toolbar.insert(stop_button, -1)
             stop_button.show()
 
+            _logger.debug('set_toolbar_box')
+            self.set_toolbar_box(self._toolbox)
+            self._palette_toolbar_button.set_expanded(True)
         else:
             self._toolbox = activity.ActivityToolbox(self)
             self.set_toolbox(self._toolbox)
@@ -551,7 +569,6 @@ class TurtleConfusionActivity(activity.Activity):
             edit_toolbar_button = edit_toolbar
             journal_toolbar = gtk.Toolbar()
             self._toolbox.add_toolbar(_('Import/Export'), journal_toolbar)
-            journal_toolbar_button = journal_toolbar
             help_toolbar = gtk.Toolbar()
             self._toolbox.add_toolbar(_('Help'), help_toolbar)
             help_toolbar_button = help_toolbar
@@ -561,33 +578,8 @@ class TurtleConfusionActivity(activity.Activity):
             self._add_separator(project_toolbar)
 
             self._make_project_buttons(project_toolbar)
+            self._make_load_save_buttons(journal_toolbar)
 
-        self.keep_button = self._add_button(
-            'filesaveoff', _('Save snapshot'), self.do_keep_cb,
-            journal_toolbar_button)
-        """
-        self.save_as_html = self._add_button(
-            'htmloff', _('Save as HTML'), self.do_save_as_html_cb,
-            journal_toolbar_button)
-        """
-        self.save_as_logo = self._add_button(
-            'logo-saveoff', _('Save as Logo'), self.do_save_as_logo_cb,
-            journal_toolbar_button)
-        self.save_as_image = self._add_button(
-            'image-saveoff', _('Save as image'), self.do_save_as_image_cb,
-            journal_toolbar_button)
-        self.load_ta_project = self._add_button(
-            'load-from-journal', _('Import project from the Journal'),
-            self.do_load_image_cb, journal_toolbar_button)
-        """
-        self._add_separator(journal_toolbar)
-        self.load_python = self._add_button(
-            'pippy-openoff', _('Load Python block'), self.do_load_python_cb,
-            journal_toolbar_button)
-        self.samples_button = self._add_button(
-            'ta-open', _('Load example'), self.do_samples_cb,
-            journal_toolbar_button)
-        """
         self._add_button('edit-copy', _('Copy'), self._copy_cb,
                          edit_toolbar_button, '<Ctrl>c')
         self._add_button('edit-paste', _('Paste'), self._paste_cb,
@@ -599,13 +591,13 @@ class TurtleConfusionActivity(activity.Activity):
                          self.do_cartesian_cb, view_toolbar_button)
         self._add_button('view-polar', _('Polar coordinates'),
                          self.do_polar_cb, view_toolbar_button)
-        if get_hardware() in [XO1, XO15]:
+        if get_hardware() in [XO1, XO15, XO175]:
             self._add_button('view-metric', _('Metric coordinates'),
                              self.do_metric_cb, view_toolbar_button)
-        self._add_separator(view_toolbar)
+        self._add_separator(view_toolbar, visible=False)
         self.coordinates_label = self._add_label(_('xcor') + ' = 0 ' + \
             _('ycor') + ' = 0 ' + _('heading') + ' = 0', view_toolbar)
-        self._add_separator(view_toolbar, True)
+        self._add_separator(view_toolbar, expand=True, visible=False)
         """
         self.rescale_button = self._add_button(
             'expand-coordinates', _('Rescale coordinates up'),
@@ -632,44 +624,65 @@ class TurtleConfusionActivity(activity.Activity):
         view_toolbar.show()
         help_toolbar.show()
         self._toolbox.show()
-        # Setup palette toolbar only *after* initializing the plugins
-
-        if self.has_toolbarbox:
-            # Hack as a workaround for #2050
-            edit_toolbar_button.set_expanded(True)
-            edit_toolbar_button.set_expanded(False)
 
-            self._palette_toolbar_button.set_expanded(True)
-        else:
+        if not self.has_toolbarbox:
             self._toolbox.set_current_toolbar(1)
 
     def _setup_palette_toolbar(self):
         # The palette toolbar must be setup *after* plugins are loaded.
-
         if self.has_toolbarbox:
             self.palette_buttons = []
-            for i, name in enumerate(palette_names):
-                if i > 0:
-                    suffix = 'off'
+            for i, palette_name in enumerate(palette_names):
+                if i == 0:
+                    palette_group = None
                 else:
-                    suffix = 'on'
-                self.palette_buttons.append(self._add_button(name + suffix,
-                    help_strings[name], self.do_palette_buttons_cb,
-                    self._palette_toolbar_button, None, i))
-            self._add_separator(self._palette_toolbar, True)
-
+                    palette_group = self.palette_buttons[0]
+                _logger.debug('palette_buttons.append %s', palette_name)
+                self.palette_buttons.append(self._radio_button_factory(
+                        palette_name + 'off',
+                        self._palette_toolbar_button,
+                        self.do_palette_buttons_cb, i,
+                        help_strings[palette_name],
+                        palette_group))
+            self._add_separator(self._palette_toolbar, expand=True,
+                                visible=False)
             self._make_palette_buttons(self._palette_toolbar_button)
-
-            self.set_toolbar_box(self._toolbox)
             self._palette_toolbar.show()
 
+    def _make_load_save_buttons(self, toolbar):
+        self.save_as_image = self._add_button(
+            'image-saveoff', _('Save as image'), self.do_save_as_image_cb,
+            toolbar)
+        '''
+        self.save_as_html = self._add_button(
+            'htmloff', _('Save as HTML'), self.do_save_as_html_cb, toolbar)
+        '''
+        self.save_as_logo = self._add_button(
+            'logo-saveoff', _('Save as Logo'), self.do_save_as_logo_cb,
+            toolbar)
+        self.keep_button = self._add_button(
+            'filesaveoff', _('Save snapshot'), self.do_keep_cb, toolbar)
+        if not self.has_toolbarbox:
+            self._add_separator(toolbar)
+        self.load_ta_project = self._add_button(
+            'load-from-journal', _('Import project from the Journal'),
+            self.do_load_ta_project_cb, toolbar)
+        '''
+        self.load_python = self._add_button(
+            'pippy-openoff', _('Load Python block'), self.do_load_python_cb,
+            toolbar)
+        '''
+        if not self.has_toolbarbox:
+            self.samples_button = self._add_button(
+                'ta-open', _('Load example'), self.do_samples_cb, toolbar)
+
     def _make_palette_buttons(self, toolbar, palette_button=False):
         ''' Creates the palette and block buttons for both toolbar types'''
         self._levels = self._get_levels(activity.get_bundle_path())
         self._levels_combo = self._combo_factory(self._levels,
                                                  _('Select a challenge'),
                                                  toolbar, self._levels_cb)
-        self._add_separator(toolbar, True)
+        self._add_separator(toolbar, expand=True, visible=False)
         if palette_button:  # old-style toolbars need this button
             self.palette_button = self._add_button(
                 'paletteoff', _('Hide palette'), self.do_palette_cb,
@@ -859,10 +872,10 @@ class TurtleConfusionActivity(activity.Activity):
         toolitem.show()
         return label
 
-    def _add_separator(self, toolbar, expand=False):
+    def _add_separator(self, toolbar, expand=False, visible=True):
         ''' Add a separator to a toolbar. '''
         separator = gtk.SeparatorToolItem()
-        separator.props.draw = True
+        separator.props.draw = visible
         separator.set_expand(expand)
         if hasattr(toolbar, 'insert'):
             toolbar.insert(separator, -1)
@@ -976,3 +989,22 @@ class TurtleConfusionActivity(activity.Activity):
                     self._levels[self._level] + '.svg'), resize=False,
                                     offset=True)
         self.tw.canvas.setxy(0, 0, pendown=False)
+
+    def _radio_button_factory(self, button_name, toolbar, cb, arg, tooltip,
+                              group):
+        ''' Add a radio button to a toolbar '''
+        button = RadioToolButton(group=group)
+        button.set_named_icon(button_name)
+        if cb is not None:
+            if arg is None:
+                button.connect('clicked', cb)
+            else:
+                button.connect('clicked', cb, arg)
+        if hasattr(toolbar, 'insert'):  # Add button to the main toolbar...
+            toolbar.insert(button, -1)
+        else:  # ...or a secondary toolbar.
+            toolbar.props.page.insert(button, -1)
+        button.show()
+        if tooltip is not None:
+            button.set_tooltip(tooltip)
+        return button
diff --git a/activity/activity.info b/activity/activity.info
index efa39ab..cadf3bc 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Turtle Confusion
-activity_version = 4
+activity_version = 6
 license = MIT
 bundle_id = org.laptop.TurtleConfusionActivity
 exec = sugar-activity TurtleConfusionActivity.TurtleConfusionActivity
diff --git a/challenges/offsets b/challenges/offsets
index 0cacd33..c77c2c6 100644
--- a/challenges/offsets
+++ b/challenges/offsets
@@ -3,7 +3,7 @@
 10:0,-48
 11:0,-51
 12:0,-72
-13:0,-115
+13:0,-112
 14:0,-122
 15:-117,0
 16:-150,-150
@@ -27,7 +27,7 @@
 34:-100,-100
 35:-150,-150
 36:-121,-121
-37:-100,-100
+37:-150,-150
 38:-106,-106
 39:-100,-100
 40:-104,-104
diff --git a/icons/blocksoff.svg b/icons/blocksoff.svg
index e7db290..63efb3c 100644
--- a/icons/blocksoff.svg
+++ b/icons/blocksoff.svg
@@ -25,13 +25,6 @@
   </metadata>
   <defs
      id="defs8" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <g
      id="g3789">
     <path
diff --git a/icons/colorsoff.svg b/icons/colorsoff.svg
index c023cf3..3991df4 100644
--- a/icons/colorsoff.svg
+++ b/icons/colorsoff.svg
@@ -25,13 +25,6 @@
   </metadata>
   <defs
      id="defs5" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <g
      transform="translate(-4.9972534e-4,0)"
      id="toolbar_x5F_colors"
diff --git a/icons/filesaveoff.svg b/icons/filesaveoff.svg
index 7128a17..b9baa5c 100644
--- a/icons/filesaveoff.svg
+++ b/icons/filesaveoff.svg
@@ -7,16 +7,52 @@
    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    version="1.1"
    width="55"
    height="55"
    viewBox="0 0 55 55"
-   id="Layer_1"
-   xml:space="preserve"><metadata
-   id="metadata36"><rdf:RDF><cc:Work
-       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs34">
+   id="svg2"
+   xml:space="preserve"
+   inkscape:version="0.48.1 r9760"
+   sodipodi:docname="filesaveoff.svg"><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1280"
+     inkscape:window-height="725"
+     id="namedview37"
+     showgrid="false"
+     inkscape:zoom="4.7090909"
+     inkscape:cx="-11.254826"
+     inkscape:cy="27.5"
+     inkscape:window-x="0"
+     inkscape:window-y="25"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" /><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
 	
 
 		
@@ -28,46 +64,138 @@
 		
 		
 		
-	</defs>
-<g
-   transform="translate(-1.75,0.2095)"
-   id="g3080"><polygon
-     points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 "
-     id="polygon3082"
-     style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /></g><g
-   transform="matrix(0.75,0,0,0.75,12.66975,2.8112999)"
-   id="g3209"><g
-     id="g6">
+	</defs><path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#ffffff;stroke-width:2.08759975;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path11"
+     d="m 15.046106,34.391188 c -0.384814,0 -0.764757,-0.02436 -1.139133,-0.06959 l 0.965862,1.634591 0.951946,-1.60954 c -0.258167,0.02088 -0.515637,0.04454 -0.778675,0.04454 z" /><g
+     style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="g13"
+     transform="matrix(0.69586655,0,0,0.69586655,-4.0881364,0.79544654)">
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path15"
+   d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path17"
+   d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path19"
+   d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path21"
+   d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z" />
+   </g><path
+     inkscape:connector-curvature="0"
+     style="fill:none;stroke:#ffffff;stroke-width:2.08759975;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="path23"
+     d="m 15.046106,9.537618 c 1.327714,0 2.594191,0.2860012 3.770205,0.784937 0.515637,-0.7487519 0.819731,-1.6540743 0.819731,-2.6324627 0,-2.5656599 -2.079945,-4.6463009 -4.646301,-4.6463009 -2.56566,0 -4.645605,2.080641 -4.645605,4.6463009 0,0.9936975 0.314531,1.9129372 0.846174,2.6679527 1.199674,-0.5212044 2.496073,-0.820427 3.855796,-0.820427 z" /><g
+     style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+     id="g25"
+     transform="matrix(0.69586655,0,0,0.69586655,-4.0881364,0.79544654)">
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+   id="path2988"
+   d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z" />
+   </g><g
+     style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+     id="g28"
+     transform="matrix(0.69586655,0,0,0.69586655,-4.0881364,0.79544654)">
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+   id="path30"
+   d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+   id="path32"
+   d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+   id="path34"
+   d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+   id="path2998"
+   d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+   id="path37"
+   d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z" />
+    <path
+   inkscape:connector-curvature="0"
+   style="fill:#ffffff;stroke:none;stroke-width:1.50000000000000000;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;fill-opacity:1"
+   id="path3002"
+   d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z" />
+   </g><g
+     id="g3830"><g
+       id="g4382"
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"><g
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"
+         id="g4308"
+         transform="translate(-80.093659,12.220029)">
 			<g
-   id="g8">
+   style="fill:none;stroke:#ffffff;stroke-opacity:1"
+   id="g4310">
 				<path
-   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
-   id="path10"
-   style="fill:#ffffff;stroke:#010101;stroke-width:4.66666651;stroke-linecap:round;stroke-linejoin:round" />
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+   id="path4312"
+   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389" />
 			</g>
 		</g><g
-     id="g12">
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"
+         id="g4314"
+         transform="translate(-80.093659,12.220029)">
 			<g
-   id="g14">
+   style="fill:none;stroke:#ffffff;stroke-opacity:1"
+   id="g4316">
 				<path
-   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
-   id="path16"
-   style="fill:#ffffff;stroke:#010101;stroke-width:4.66666651;stroke-linecap:round;stroke-linejoin:round" />
+   inkscape:connector-curvature="0"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+   id="path4318"
+   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z" />
 			</g>
 		</g><path
-     d="m 9.424,42.607 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
-     id="path18"
-     style="fill:none;stroke:#010101;stroke-width:3;stroke-linecap:round;stroke-linejoin:round" /><path
-     d="m 9.424,32.006 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
-     id="path20"
-     style="fill:none;stroke:#010101;stroke-width:3;stroke-linecap:round;stroke-linejoin:round" /><path
-     d="m 9.424,21.678 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
-     id="path22"
-     style="fill:none;stroke:#010101;stroke-width:3;stroke-linecap:round;stroke-linejoin:round" /><line
-     style="fill:none;stroke:#010101;stroke-width:3;stroke-linecap:round;stroke-linejoin:round"
-     id="line24"
-     y2="11.505"
-     y1="46.533001"
-     x2="13.209"
-     x1="13.209" /></g>
-</svg>
\ No newline at end of file
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         id="path4320"
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543" /><path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         id="path4322"
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543" /><path
+         inkscape:connector-curvature="0"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+         id="path4324"
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       id="g4770"
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"><g
+         id="g4772"
+         transform="translate(34.0803,-1006.42)"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           inkscape:connector-curvature="0"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
+           id="path4776"
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/flowoff.svg b/icons/flowoff.svg
index eba738e..13b11c5 100644
--- a/icons/flowoff.svg
+++ b/icons/flowoff.svg
@@ -10,13 +10,6 @@
    id="svg2">
   <defs
      id="defs5" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <path
      d="M 14.85,27.1 l -0.45,13.15 4.35,-2.4 c 0,0 6.349418,4.294879 10.2,4.05 4.946317,-0.314563 11.65,-7.5 11.65,-7.5 l -2.25,-2.3 c 0,0 -5.615371,6.15399 -9.4,6.65 -2.286298,0.29964 -7.05,-2.5 -7.05,-2.5 L 26,34.1 14.85,27.1 z"
      id="path3590"
diff --git a/icons/help-toolbar.svg b/icons/help-toolbar.svg
index 40d6369..787b797 100644
--- a/icons/help-toolbar.svg
+++ b/icons/help-toolbar.svg
@@ -8,16 +8,11 @@
    width="55"
    height="55"
    viewBox="0 0 55 55"
-   id="svg2"
-   style="fill:#010101;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round">
-  <defs
-     id="defs11" />
+   id="svg2" >
   <path
      d="m 50,27.625 c 0,12.3431 -10.1569,22.5 -22.5,22.5 C 15.1569,50.125 5,39.9681 5,27.625 5,15.2819 15.1569,5.125 27.5,5.125 c 12.3431,0 22.5,10.1569 22.5,22.5 z"
-     id="path6"
-     style="fill:#404040;fill-opacity:1" />
+     style="fill:#FFFFFF" />
   <path
      d="m 23.956,27.167 c 0,-1.621 1.8,-1.89 3.645,-2.386 1.8,-0.495 3.6,-1.215 3.6,-3.825 0,-1.98 -1.845,-3.42 -3.734,-3.42 -3.78,0 -4.365,4.455 -7.246,4.455 -1.62,0 -2.745,-1.26 -2.745,-3.24 0,-4.726 5.94,-7.425 9.991,-7.425 5.806,0 10.756,3.6 10.756,9.631 0,4.995 -3.15,7.921 -7.785,9.091 l 0,1.619 c 0,1.801 -1.351,3.105 -3.241,3.105 -2.025,0 -3.24,-1.305 -3.24,-3.105 l 0,-4.5 -0.001,0 z m -0.27,13.77 c 0,-1.935 1.575,-3.51 3.51,-3.51 1.936,0 3.51,1.575 3.51,3.51 0,1.936 -1.574,3.512 -3.51,3.512 -1.935,-10e-4 -3.51,-1.577 -3.51,-3.512 z"
-     id="path8"
-     style="fill:#ffffff;stroke:#ffffff;stroke-width:0.25;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+     style="fill:#282828;stroke:#282828;stroke-width:0.25;stroke-miterlimit:4;" />
 </svg>
diff --git a/icons/htmloff.svg b/icons/htmloff.svg
index d6f83c6..92f1fd2 100644
--- a/icons/htmloff.svg
+++ b/icons/htmloff.svg
@@ -1,23 +1,128 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#666666">
-]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-url">
-	<g>
-		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
-	</g>
-	<g>
-		<g>
-			<polygon fill="#ffffff" points="18.435,10.583 32.046,10.583 39.811,18.343 39.811,38.42      18.435,38.42    " stroke="&fill_color;" stroke-width="2.275"/>
-			<polyline fill="none" points="39.811,18.343 32.046,18.343 32.046,10.583    " stroke="&fill_color;" stroke-width="2.275"/>
-		</g>
-	</g>
-	<g>
-		<circle cx="29.123" cy="28.4" fill="&fill_color;" r="6.469"/>
-		<g>
-			<path d="M29.124,21.932c0,0,3.596,2.971,3.596,6.492     c0,3.523-3.596,6.445-3.596,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
-			<path d="M29.124,21.932c0,0-3.642,2.728-3.642,6.492     c0,3.765,3.642,6.445,3.642,6.445" fill="none" stroke="#ffffff" stroke-width="0.975"/>
-			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="29.124" x2="29.124" y1="21.932" y2="34.869"/>
-			<line fill="none" stroke="#ffffff" stroke-width="0.975" x1="22.654" x2="35.591" y1="28.4" y2="28.4"/>
-		</g>
-	</g>
-</g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="translate(-24.072147,0)"
+     id="g3014"><g
+       transform="matrix(1.1623273,0,0,1.1623273,5.8946433,-8.9787622)"
+       id="g3116"
+       style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+         points="39.811,18.343 39.811,38.42 18.435,38.42 18.435,10.583 32.046,10.583 "
+         id="polygon3118"
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+         id="polyline3120"
+         points="39.811,18.343 32.046,18.343 32.046,10.583    "
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+       transform="matrix(1.1623273,0,0,1.1623273,5.8946433,-8.9787622)"
+       id="g3122"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1"><circle
+         cx="29.122999"
+         cy="28.4"
+         r="6.4689999"
+         id="circle3124"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1" /><g
+         id="g3126"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+           d="m 29.124,21.932 c 0,0 3.596,2.971 3.596,6.492 0,3.523 -3.596,6.445 -3.596,6.445"
+           id="path3128"
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1" /><path
+           d="m 29.124,21.932 c 0,0 -3.642,2.728 -3.642,6.492 0,3.765 3.642,6.445 3.642,6.445"
+           id="path3130"
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1" /><line
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1"
+           x1="29.124001"
+           x2="29.124001"
+           y1="21.931999"
+           y2="34.868999"
+           id="line3132" /><line
+           style="fill:none;stroke:#ffffff;stroke-width:0.97500002;stroke-opacity:1"
+           x1="22.653999"
+           x2="35.591"
+           y1="28.4"
+           y2="28.4"
+           id="line3134" /></g></g></g><g
+     id="g3830"><g
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+       id="g4382"><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4308"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4310"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+             id="path4312"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4314"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4316"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+             id="path4318"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+         id="path4320"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+         id="path4322"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+         id="path4324"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"
+       id="g4770"><g
+         transform="translate(34.0803,-1006.42)"
+         id="g4772"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+           id="path4776"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/htmlon.svg b/icons/htmlon.svg
index c4e50b8..fe8fa71 100644
--- a/icons/htmlon.svg
+++ b/icons/htmlon.svg
@@ -2,69 +2,127 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="58.5"
+   width="55"
    height="55"
-   viewBox="0 0 58.5 55"
+   viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><defs
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs33">
 	
 	
 	
-</defs><g
-     id="g5"
-     style="fill:#00ff00;fill-opacity:1">
-		<polygon
-   points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 "
-   id="polygon7"
-   style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
-	</g><g
-     id="g9">
-		<g
-   id="g11">
-			<polygon
-   points="39.811,38.42 18.435,38.42 18.435,10.583 32.046,10.583 39.811,18.343 "
-   id="polygon13"
-   style="fill:#ffffff;stroke:#666666;stroke-width:2.2750001" />
-			<polyline
-   style="fill:none;stroke:#666666;stroke-width:2.2750001"
-   id="polyline15"
-   points="39.811,18.343 32.046,18.343 32.046,10.583    " />
-		</g>
-	</g><g
-     id="g17">
-		<circle
-   cx="29.122999"
-   cy="28.4"
-   r="6.4689999"
-   id="circle19"
-   style="fill:#666666" />
-		<g
-   id="g21">
-			<path
-   d="m 29.124,21.932 c 0,0 3.596,2.971 3.596,6.492 0,3.523 -3.596,6.445 -3.596,6.445"
-   id="path23"
-   style="fill:none;stroke:#ffffff;stroke-width:0.97500002" />
-			<path
-   d="m 29.124,21.932 c 0,0 -3.642,2.728 -3.642,6.492 0,3.765 3.642,6.445 3.642,6.445"
-   id="path25"
-   style="fill:none;stroke:#ffffff;stroke-width:0.97500002" />
-			<line
-   style="fill:none;stroke:#ffffff;stroke-width:0.97500002"
-   id="line27"
-   y2="34.868999"
-   y1="21.931999"
-   x2="29.124001"
-   x1="29.124001" />
-			<line
-   style="fill:none;stroke:#ffffff;stroke-width:0.97500002"
-   id="line29"
-   y2="28.4"
-   y1="28.4"
-   x2="35.591"
-   x1="22.653999" />
-		</g>
-	</g></svg>
\ No newline at end of file
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="translate(-24.072147,0)"
+     id="g4121"><g
+       transform="matrix(1.1623273,0,0,1.1623273,5.8946433,-8.9787622)"
+       id="g3116"
+       style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+         points="39.811,38.42 18.435,38.42 18.435,10.583 32.046,10.583 39.811,18.343 "
+         id="polygon3118"
+         style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+         id="polyline3120"
+         points="39.811,18.343 32.046,18.343 32.046,10.583    "
+         style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+       transform="matrix(1.1623273,0,0,1.1623273,5.8946433,-8.9787622)"
+       id="g3122"
+       style="fill:none;stroke:#00ff00;stroke-opacity:1"><circle
+         cx="29.122999"
+         cy="28.4"
+         r="6.4689999"
+         id="circle3124"
+         style="fill:none;stroke:#00ff00;stroke-opacity:1" /><g
+         id="g3126"
+         style="fill:none;stroke:#00ff00;stroke-opacity:1"><path
+           d="m 29.124,21.932 c 0,0 3.596,2.971 3.596,6.492 0,3.523 -3.596,6.445 -3.596,6.445"
+           id="path3128"
+           style="fill:none;stroke:#00ff00;stroke-width:0.97500002;stroke-opacity:1" /><path
+           d="m 29.124,21.932 c 0,0 -3.642,2.728 -3.642,6.492 0,3.765 3.642,6.445 3.642,6.445"
+           id="path3130"
+           style="fill:none;stroke:#00ff00;stroke-width:0.97500002;stroke-opacity:1" /><line
+           style="fill:none;stroke:#00ff00;stroke-width:0.97500002;stroke-opacity:1"
+           x1="29.124001"
+           x2="29.124001"
+           y1="21.931999"
+           y2="34.868999"
+           id="line3132" /><line
+           style="fill:none;stroke:#00ff00;stroke-width:0.97500002;stroke-opacity:1"
+           x1="22.653999"
+           x2="35.591"
+           y1="28.4"
+           y2="28.4"
+           id="line3134" /></g></g></g><g
+     id="g3830"><g
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+       id="g4382"><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4308"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4310"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+             id="path4312"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4314"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4316"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+             id="path4318"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+         id="path4320"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+         id="path4322"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+         id="path4324"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"
+       id="g4770"><g
+         transform="translate(34.0803,-1006.42)"
+         id="g4772"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+           id="path4776"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/image-saveoff.svg b/icons/image-saveoff.svg
index b1b485f..365f578 100644
--- a/icons/image-saveoff.svg
+++ b/icons/image-saveoff.svg
@@ -1,16 +1,116 @@
-<?xml version="1.0" ?><!DOCTYPE svg  PUBLIC '-//W3C//DTD SVG 1.1//EN'  'http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd' [
-	<!ENTITY stroke_color "#010101">
-	<!ENTITY fill_color "#666666">
-]><svg enable-background="new 0 0 58.5 55" height="55px" version="1.1" viewBox="0 0 58.5 55" width="58.5px" x="0px" xml:space="preserve" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" y="0px"><g display="block" id="transfer-from-image">
-	<g display="inline">
-		<polygon fill="&fill_color;" points="50.056,32.715 50.056,2 8.433,2     8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543   " stroke="&stroke_color;" stroke-linejoin="round" stroke-width="3.5"/>
-	</g>
-	<g display="inline">
-		<g>
-			<polygon fill="#ffffff" points="43.041,35.189 43.041,21.577 35.281,13.812      15.204,13.812 15.204,35.189    " stroke="&fill_color;" stroke-width="2.275"/>
-			<polyline fill="none" points="35.281,13.812 35.281,21.577 43.041,21.577    " stroke="&fill_color;" stroke-width="2.275"/>
-		</g>
-	</g>
-	<path d="M29.206,21.798c-4.067,0-7.456,4.056-7.456,4.056s3.389,4.076,7.456,4.074   c4.069-0.004,7.458-4.078,7.458-4.078S33.275,21.795,29.206,21.798z M29.206,28.715c-1.575,0-2.852-1.277-2.852-2.853   c0-1.572,1.277-2.852,2.852-2.852c1.573,0,2.85,1.28,2.85,2.852C32.056,27.438,30.779,28.715,29.206,28.715z" display="inline" fill="&fill_color;"/>
-	<circle cx="29.207" cy="25.863" display="inline" fill="&fill_color;" r="1.294"/>
-</g></svg>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   version="1.1"
+   width="55"
+   height="55"
+   viewBox="0 0 55 55"
+   id="svg2"
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="matrix(0.55205508,0,0,0.55205508,77.118464,18.235971)"
+     id="g4382"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4310"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+   id="path4312"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4316"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+   id="path4318"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="-66.884659"
+       x2="-66.884659"
+       y1="58.753029"
+       y2="23.725029"
+       id="line4326" /></g><g
+     transform="matrix(1.1623273,0,0,1.1623273,-14.422024,-12.63995)"
+     id="g3882"
+     style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"><g
+       id="g3884"
+       style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+         points="43.041,21.577 35.281,13.812 15.204,13.812 15.204,35.189 43.041,35.189 "
+         id="polygon3886"
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+         id="polyline3888"
+         points="35.281,13.812 35.281,21.577 43.041,21.577    "
+         style="fill:none;stroke:#ffffff;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><path
+     d="m 19.426691,12.275117 c -4.727185,0 -8.666312,4.714399 -8.666312,4.714399 0,0 3.939127,4.737646 8.666312,4.735322 4.729509,-0.0046 8.668637,-4.739971 8.668637,-4.739971 0,0 -3.939128,-4.713237 -8.668637,-4.70975 z m 0,8.039818 c -1.830666,0 -3.314958,-1.484292 -3.314958,-3.31612 0,-1.827179 1.484292,-3.314958 3.314958,-3.314958 1.828341,0 3.312632,1.487779 3.312632,3.314958 0,1.831828 -1.484291,3.31612 -3.312632,3.31612 z"
+     id="path3890"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" /><circle
+     cx="29.207001"
+     cy="25.863001"
+     r="1.294"
+     transform="matrix(1.1623273,0,0,1.1623273,-14.520241,-13.061294)"
+     id="circle3892"
+     style="fill:#ffffff;fill-opacity:1;stroke:none;display:inline" /><g
+     transform="matrix(1,0,0,-1,-24.850339,47.707501)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         id="polyline4774" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/image-saveon.svg b/icons/image-saveon.svg
index b4e9270..71a91ff 100644
--- a/icons/image-saveon.svg
+++ b/icons/image-saveon.svg
@@ -2,46 +2,115 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="58.5"
+   width="55"
    height="55"
-   viewBox="0 0 58.5 55"
+   viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><defs
-     id="defs23">
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
 	
 	
 	
+
+  
+  
+
+  
+   
+   
+   
+   
+
 	
-</defs><g
-     id="g5"
-     style="fill:#00ff00;fill-opacity:1;display:inline">
-		<polygon
-   points="8.433,32.715 1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 "
-   id="polygon7"
-   style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
-	</g><g
-     id="g9"
-     style="display:inline">
-		<g
-   id="g11">
-			<polygon
-   points="15.204,13.812 15.204,35.189 43.041,35.189 43.041,21.577 35.281,13.812 "
-   id="polygon13"
-   style="fill:#ffffff;stroke:#666666;stroke-width:2.2750001" />
-			<polyline
-   style="fill:none;stroke:#666666;stroke-width:2.2750001"
-   id="polyline15"
-   points="35.281,13.812 35.281,21.577 43.041,21.577    " />
-		</g>
-	</g><path
-     d="m 29.206,21.798 c -4.067,0 -7.456,4.056 -7.456,4.056 0,0 3.389,4.076 7.456,4.074 4.069,-0.004 7.458,-4.078 7.458,-4.078 0,0 -3.389,-4.055 -7.458,-4.052 z m 0,6.917 c -1.575,0 -2.852,-1.277 -2.852,-2.853 0,-1.572 1.277,-2.852 2.852,-2.852 1.573,0 2.85,1.28 2.85,2.852 0,1.576 -1.277,2.853 -2.85,2.853 z"
-     id="path17"
-     style="fill:#666666;display:inline" /><circle
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	</defs><g
+     transform="matrix(0.55205508,0,0,0.55205508,77.118464,18.235971)"
+     id="g4382"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4310"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+   id="path4312"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4316"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+   id="path4318"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="-66.884659"
+       x2="-66.884659"
+       y1="58.753029"
+       y2="23.725029"
+       id="line4326" /></g><g
+     transform="matrix(1.1623273,0,0,1.1623273,-14.422024,-12.63995)"
+     id="g3882"
+     style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;display:inline"><g
+       id="g3884"
+       style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><polygon
+         points="43.041,21.577 35.281,13.812 15.204,13.812 15.204,35.189 43.041,35.189 "
+         id="polygon3886"
+         style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><polyline
+         id="polyline3888"
+         points="35.281,13.812 35.281,21.577 43.041,21.577    "
+         style="fill:none;stroke:#00ff00;stroke-width:2.15085721;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><path
+     d="m 19.426691,12.275117 c -4.727185,0 -8.666312,4.714399 -8.666312,4.714399 0,0 3.939127,4.737646 8.666312,4.735322 4.729509,-0.0046 8.668637,-4.739971 8.668637,-4.739971 0,0 -3.939128,-4.713237 -8.668637,-4.70975 z m 0,8.039818 c -1.830666,0 -3.314958,-1.484292 -3.314958,-3.31612 0,-1.827179 1.484292,-3.314958 3.314958,-3.314958 1.828341,0 3.312632,1.487779 3.312632,3.314958 0,1.831828 -1.484291,3.31612 -3.312632,3.31612 z"
+     id="path3890"
+     style="fill:#00ff00;fill-opacity:1;stroke:none;display:inline" /><circle
      cx="29.207001"
      cy="25.863001"
      r="1.294"
-     id="circle19"
-     style="fill:#666666;display:inline" /></svg>
\ No newline at end of file
+     transform="matrix(1.1623273,0,0,1.1623273,-14.520241,-13.061294)"
+     id="circle3892"
+     style="fill:#00ff00;fill-opacity:1;stroke:#00ff00;stroke-opacity:1;display:inline" /><g
+     transform="matrix(1,0,0,-1,-24.850339,47.707501)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         id="polyline4774" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/load-from-journal.svg b/icons/load-from-journal.svg
index f30a6f1..d0869da 100644
--- a/icons/load-from-journal.svg
+++ b/icons/load-from-journal.svg
@@ -2,83 +2,157 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.1"
-   width="58.5"
+   width="55"
    height="55"
-   viewBox="0 0 58.5 55"
+   viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><defs
-     id="defs25">
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs33">
 	
 	
 	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
 	
 	
-<linearGradient
-   x1="0.94254935"
-   y1="-31.669659"
-   x2="104.37702"
-   y2="20.434471"
-   id="linearGradient3172"
-   xlink:href="#linearGradient3166"
-   gradientUnits="userSpaceOnUse"
-   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient
-   id="linearGradient3166"><stop
-     id="stop3168"
-     style="stop-color:#ffffff;stop-opacity:1"
-     offset="0" /><stop
-     id="stop3170"
-     style="stop-color:#ffff00;stop-opacity:1"
-     offset="1" /></linearGradient></defs><g
-     id="g5"
-     style="display:inline">
-		<polygon
-   points="50.067,21.866 56.75,20.039 29.248,2 1.75,20.038 8.443,21.866 8.443,52.581 50.067,52.58 "
-   id="polygon7"
-   style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
-	</g><line
-     style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline"
-     id="line17"
-     y2="29.688"
-     y1="29.688"
-     x2="35.298"
-     x1="22.948"
-     display="inline" /><line
-     style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline"
-     id="line19"
-     y2="34.237999"
-     y1="34.237999"
-     x2="35.298"
-     x1="22.948"
-     display="inline" /><line
-     style="fill:none;stroke:#666666;stroke-width:2.2750001;display:inline"
-     id="line21"
-     y2="38.786999"
-     y1="38.786999"
-     x2="35.298"
-     x1="22.948"
-     display="inline" /><g
-     transform="matrix(0.67,0,0,0.67,11.410915,13.075)"
-     id="activity-journal"
-     style="stroke:#000000;stroke-opacity:1;display:block"><path
-       d="M 45.866,44.669 C 45.866,47.18 44.338,49 41.534,49 l -29.457,0 0,-43 29.458,0 c 2.15,0 4.332,2.154 4.332,4.33 l -10e-4,34.339 0,0 z"
-       id="path2458"
-       style="fill:#ffffff;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       x1="21.341"
-       x2="21.341"
-       y1="6.1209998"
-       y2="48.881001"
-       id="line2460" /><path
-       d="m 7.384,14.464 c 0,0 2.084,0.695 4.17,0.695 2.086,0 4.173,-0.695 4.173,-0.695"
-       id="path2462"
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
-       d="m 7.384,28.021 c 0,0 1.912,0.695 4.345,0.695 2.433,0 3.999,-0.695 3.999,-0.695"
-       id="path2464"
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
-       d="m 7.384,41.232 c 0,0 1.736,0.695 4.518,0.695 2.781,0 3.825,-0.695 3.825,-0.695"
-       id="path2466"
-       style="fill:none;stroke:#000000;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></svg>
\ No newline at end of file
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+</defs><g
+     transform="matrix(0.55205508,0,0,0.55205508,44.618464,18.235971)"
+     id="g4382"><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4308"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4310"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+   id="path4312"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><g
+       transform="translate(-80.093659,12.220029)"
+       id="g4314"
+       style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<g
+   id="g4316"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+				<path
+   d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+   id="path4318"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
+			</g>
+		</g><path
+       d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+       id="path4320"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+       id="path4322"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+       d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+       id="path4324"
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+       style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       x1="-66.884659"
+       x2="-66.884659"
+       y1="58.753029"
+       y2="23.725029"
+       id="line4326" /></g><g
+     id="g4084"><path
+       d="m 40.046106,34.391197 c -0.384814,0 -0.764757,-0.02436 -1.139134,-0.06959 l 0.965863,1.634591 0.951946,-1.60954 c -0.258167,0.02088 -0.515638,0.04454 -0.778675,0.04454 z"
+       id="path11"
+       style="fill:none;stroke:#ffffff;stroke-width:2.08759975;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.69586655,0,0,0.69586655,20.911863,0.79545554)"
+       id="g13"
+       style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+         d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
+         id="path15"
+         style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
+         id="path17"
+         style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
+         id="path19"
+         style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
+         id="path21"
+         style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><path
+       d="m 40.046106,9.537627 c 1.327713,0 2.59419,0.2860012 3.770205,0.784937 0.515637,-0.7487519 0.819731,-1.6540743 0.819731,-2.6324627 0,-2.5656599 -2.079945,-4.6463009 -4.646301,-4.6463009 -2.56566,0 -4.645605,2.080641 -4.645605,4.6463009 0,0.9936975 0.314531,1.9129372 0.846173,2.6679527 1.199674,-0.5212044 2.496074,-0.820427 3.855797,-0.820427 z"
+       id="path23"
+       style="fill:none;stroke:#ffffff;stroke-width:2.08759975;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0.69586655,0,0,0.69586655,20.911863,0.79545554)"
+       id="g25"
+       style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+         d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+         id="path2988"
+         style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+       transform="matrix(0.69586655,0,0,0.69586655,20.911863,0.79545554)"
+       id="g28"
+       style="fill:#ffffff;fill-opacity:1;stroke:none"><path
+         d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z"
+         id="path30"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+         d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+         id="path32"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+         d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+         id="path34"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+         d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+         id="path2998"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+         d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+         id="path37"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+         d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+         id="path3002"
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></g><g
+     transform="matrix(0,-1,-1,0,43.9376,89.386573)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         id="polyline4774" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/logo-saveoff.svg b/icons/logo-saveoff.svg
index 0c3dfe2..0954a62 100644
--- a/icons/logo-saveoff.svg
+++ b/icons/logo-saveoff.svg
@@ -2,14 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="58.5"
+   width="55"
    height="55"
-   viewBox="0 0 58.5 55"
+   viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><defs
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs33">
 	
 	
@@ -23,74 +29,118 @@
    
    
    
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
 </defs><g
-     id="g5">
-		<polygon
-   points="1.75,34.542 29.252,52.581 56.75,34.543 50.056,32.715 50.056,2 8.433,2 8.433,32.715 "
-   id="polygon7"
-   style="fill:#666666;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" />
-	</g><g
-     transform="translate(16.080508,-9.0889831)"
-     id="g3105"><path
-       d="m 12.896306,44.429676 c -0.2765,0 -0.5495,-0.0175 -0.8185,-0.05 l 0.694,1.1745 0.684,-1.1565 c -0.1855,0.015 -0.3705,0.032 -0.5595,0.032 z"
-       id="path11"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
-       id="g13"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-    <path
-   d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
-   id="path15"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
-   id="path17"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
-   id="path19"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
-   id="path21"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-   </g><path
-       d="m 12.896306,26.571676 c 0.954,0 1.864,0.2055 2.709,0.564 0.3705,-0.538 0.589,-1.1885 0.589,-1.8915 0,-1.8435 -1.4945,-3.3385 -3.3385,-3.3385 -1.8435,0 -3.3380001,1.495 -3.3380001,3.3385 0,0.714 0.226,1.3745 0.6080001,1.917 0.862,-0.3745 1.7935,-0.5895 2.7705,-0.5895 z"
-       id="path23"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
-       id="g25"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-    <path
-   d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
-   id="path2988"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-   </g><g
-       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
-       id="g28"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-    <path
-   d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z"
-   id="path30"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
-   id="path32"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
-   id="path34"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
-   id="path2998"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
-   id="path37"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
-   id="path3002"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-   </g></g></svg>
\ No newline at end of file
+     transform="matrix(0.75578519,0,0,0.75578519,-4.9396196,-1.2911009)"
+     id="clipping-text"
+     style="fill:none;stroke:#ffffff;stroke-opacity:1;display:block">
+	<g
+   id="g3152"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1;display:inline">
+		<g
+   id="g3154"
+   style="fill:none;stroke:#ffffff;stroke-opacity:1">
+			<polygon
+   points="31.874,6.088 43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 "
+   id="polygon3156"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" />
+			<polyline
+   id="polyline3158"
+   points="43.818,18.027 31.874,18.027 31.874,6.088    "
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1" />
+		</g>
+	</g>
+	<line
+   id="line3160"
+   y2="26.25"
+   y1="26.25"
+   x2="36.875"
+   x1="17.875"
+   display="inline"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1;display:inline" />
+	<line
+   id="line3162"
+   y2="33.25"
+   y1="33.25"
+   x2="36.875"
+   x1="17.875"
+   display="inline"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1;display:inline" />
+	<line
+   id="line3164"
+   y2="40.25"
+   y1="40.25"
+   x2="36.875"
+   x1="17.875"
+   display="inline"
+   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-opacity:1;display:inline" />
+</g><g
+     id="g3830"><g
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+       id="g4382"><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4308"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4310"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+             id="path4312"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4314"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4316"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+             id="path4318"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+         id="path4320"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+         id="path4322"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+         id="path4324"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"
+       id="g4770"><g
+         transform="translate(34.0803,-1006.42)"
+         id="g4772"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+           id="path4776"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/logo-saveon.svg b/icons/logo-saveon.svg
index 9c9ae52..f2bfc31 100644
--- a/icons/logo-saveon.svg
+++ b/icons/logo-saveon.svg
@@ -2,14 +2,20 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="58.5"
+   width="55"
    height="55"
-   viewBox="0 0 58.5 55"
+   viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><defs
+   xml:space="preserve"><metadata
+     id="metadata25"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs33">
 	
 	
@@ -24,74 +30,117 @@
    
    
 
-		
 	
+
+		
+		
+		
+		
 		
-	</defs><polygon
-     points="56.75,34.543 50.056,32.715 50.056,2 8.433,2 8.433,32.715 1.75,34.542 29.252,52.581 "
-     id="polygon7"
-     style="fill:#00ff00;fill-opacity:1;stroke:#010101;stroke-width:3.5;stroke-linejoin:round" /><g
-     transform="translate(16.080508,-9.0889831)"
-     id="g3105"><path
-       d="m 12.896306,44.429676 c -0.2765,0 -0.5495,-0.0175 -0.8185,-0.05 l 0.694,1.1745 0.684,-1.1565 c -0.1855,0.015 -0.3705,0.032 -0.5595,0.032 z"
-       id="path11"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
-       id="g13"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-    <path
-   d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
-   id="path15"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
-   id="path17"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
-   id="path19"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
-   id="path21"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-   </g><path
-       d="m 12.896306,26.571676 c 0.954,0 1.864,0.2055 2.709,0.564 0.3705,-0.538 0.589,-1.1885 0.589,-1.8915 0,-1.8435 -1.4945,-3.3385 -3.3385,-3.3385 -1.8435,0 -3.3380001,1.495 -3.3380001,3.3385 0,0.714 0.226,1.3745 0.6080001,1.917 0.862,-0.3745 1.7935,-0.5895 2.7705,-0.5895 z"
-       id="path23"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
-       id="g25"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-    <path
-   d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
-   id="path2988"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-   </g><g
-       transform="matrix(0.5,0,0,0.5,-0.8521941,20.290176)"
-       id="g28"
-       style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
-    <path
-   d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z"
-   id="path30"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
-   id="path32"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
-   id="path34"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
-   id="path2998"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
-   id="path37"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-   d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
-   id="path3002"
-   style="fill:#ffffff;fill-opacity:1;stroke:#000000;stroke-width:1.5;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-   </g></g></svg>
\ No newline at end of file
+		
+		
+		
+		
+	
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+</defs><g
+     transform="matrix(0.75578519,0,0,0.75578519,-4.9396196,-1.2911009)"
+     id="clipping-text"
+     style="fill:none;stroke:#00ff00;stroke-opacity:1;display:block">
+	<g
+   id="g3152"
+   style="fill:none;stroke:#00ff00;stroke-opacity:1;display:inline">
+		<g
+   id="g3154"
+   style="fill:none;stroke:#00ff00;stroke-opacity:1">
+			<polygon
+   points="43.818,18.027 43.818,48.914 10.932,48.914 10.932,6.088 31.874,6.088 "
+   id="polygon3156"
+   style="fill:none;stroke:#00ff00;stroke-width:3.5;stroke-opacity:1" />
+			<polyline
+   id="polyline3158"
+   points="43.818,18.027 31.874,18.027 31.874,6.088    "
+   style="fill:none;stroke:#00ff00;stroke-width:3.5;stroke-opacity:1" />
+		</g>
+	</g>
+	<line
+   id="line3160"
+   y2="26.25"
+   y1="26.25"
+   x2="36.875"
+   x1="17.875"
+   display="inline"
+   style="fill:none;stroke:#00ff00;stroke-width:3.5;stroke-opacity:1;display:inline" />
+	<line
+   id="line3162"
+   y2="33.25"
+   y1="33.25"
+   x2="36.875"
+   x1="17.875"
+   display="inline"
+   style="fill:none;stroke:#00ff00;stroke-width:3.5;stroke-opacity:1;display:inline" />
+	<line
+   id="line3164"
+   y2="40.25"
+   y1="40.25"
+   x2="36.875"
+   x1="17.875"
+   display="inline"
+   style="fill:none;stroke:#00ff00;stroke-width:3.5;stroke-opacity:1;display:inline" />
+</g><g
+     id="g3830"><g
+       transform="matrix(0.55205508,0,0,0.55205508,75.618464,18.235971)"
+       id="g4382"><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4308"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4310"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 6.736,49.002 h 24.52 c 2.225,0 3.439,-1.447 3.439,-3.441 v -27.28 c 0,-1.73 -1.732,-3.441 -3.439,-3.441 h -4.389"
+             id="path4312"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><g
+         transform="translate(-80.093659,12.220029)"
+         id="g4314"
+         style="fill:none;stroke:#ffffff;stroke-opacity:1"><g
+           id="g4316"
+           style="fill:none;stroke:#ffffff;stroke-opacity:1"><path
+             d="m 26.867,38.592 c 0,1.836 -1.345,3.201 -3.441,4.047 L 6.736,49.002 V 14.84 l 16.69,-8.599 c 2.228,-0.394 3.441,0.84 3.441,2.834 v 29.517 z"
+             id="path4318"
+             style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g></g><path
+         d="m -70.669659,54.827029 c 0,0 -1.351,-0.543 -2.702,-0.543 -1.351,0 -2.703,0.543 -2.703,0.543"
+         id="path4320"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,44.226029 c 0,0 -1.239,-0.543 -2.815,-0.543 -1.577,0 -2.59,0.543 -2.59,0.543"
+         id="path4322"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><path
+         d="m -70.669659,33.898029 c 0,0 -1.125,-0.544 -2.927,-0.544 -1.802,0 -2.478,0.544 -2.478,0.544"
+         id="path4324"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /><line
+         id="line4326"
+         y2="23.725029"
+         y1="58.753029"
+         x2="-66.884659"
+         x1="-66.884659"
+         style="fill:none;stroke:#ffffff;stroke-width:2.25;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" /></g><g
+       transform="matrix(1,0,0,-1,-30.386573,49.171266)"
+       id="g4770"><g
+         transform="translate(34.0803,-1006.42)"
+         id="g4772"><polyline
+           id="polyline4774"
+           points="51.562,15.306 41.17,16.188 42.053,5.794"
+           style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+           transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+           d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+           id="path4776"
+           style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/numbersoff.svg b/icons/numbersoff.svg
index 1ce67c7..cffabf7 100644
--- a/icons/numbersoff.svg
+++ b/icons/numbersoff.svg
@@ -10,13 +10,6 @@
    id="svg2">
   <defs
      id="defs5" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <g
      transform="translate(6.1026134,-1.6740561)"
      id="g2392"
diff --git a/icons/penoff.svg b/icons/penoff.svg
index 3e099d0..109c0d6 100644
--- a/icons/penoff.svg
+++ b/icons/penoff.svg
@@ -10,13 +10,6 @@
    id="svg2">
   <defs
      id="defs5" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <path
      d="M 11.152285,41.709935 c 1.43401,0.788706 5.23977,1.402428 7.528553,1.290609 1.626167,-0.07945 3.914929,-0.479849 5.234137,-1.43401 2.238123,-1.618798 3.032695,-5.829627 5.090736,-7.671954 1.225701,-1.097229 3.231844,-2.444635 4.875634,-2.509518 2.003851,-0.07909 4.468168,1.514349 6.166244,2.581219 1.290216,0.810619 3.800127,3.369923 3.800127,3.369923"
      id="path2471"
diff --git a/icons/pippy-openoff.svg b/icons/pippy-openoff.svg
index 55c9dae..605e62a 100644
--- a/icons/pippy-openoff.svg
+++ b/icons/pippy-openoff.svg
@@ -9,35 +9,62 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.1"
-   width="45"
-   height="45"
-   viewBox="0 0 45 45"
-   id="svg2"
-   xml:space="preserve"><metadata
-     id="metadata18"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs25">
+   width="55"
+   height="55"
+   viewBox="0 0 54.999998 55.000001"
+   id="Icon"
+   xml:space="preserve"
+   style="overflow:visible"><metadata
+   id="metadata26"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs24">
 	
 	
 	
+
+  
+  
+
+  
+   
+   
+   
+   
+
 	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
 	
-<linearGradient
-   x1="0.94254935"
-   y1="-31.669659"
-   x2="104.37702"
-   y2="20.434471"
-   id="linearGradient3172"
-   xlink:href="#linearGradient3166"
-   gradientUnits="userSpaceOnUse"
-   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient
-   id="linearGradient3166"><stop
-     id="stop3168"
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+		
+	<linearGradient
+   id="linearGradient3166-6"><stop
+     id="stop3168-5"
      style="stop-color:#ffffff;stop-opacity:1"
      offset="0" /><stop
-     id="stop3170"
-     style="stop-color:#ffff00;stop-opacity:1"
+     id="stop3170-6"
+     style="stop-color:#ff0000;stop-opacity:1"
      offset="1" /></linearGradient><linearGradient
    x1="0"
    y1="22"
@@ -46,37 +73,61 @@
    id="linearGradient3172-9"
    xlink:href="#linearGradient3166-6"
    gradientUnits="userSpaceOnUse" /><linearGradient
-   id="linearGradient3166-6"><stop
-     id="stop3168-5"
+   id="linearGradient3166"><stop
+     id="stop3168"
      style="stop-color:#ffffff;stop-opacity:1"
      offset="0" /><stop
-     id="stop3170-6"
-     style="stop-color:#ff0000;stop-opacity:1"
-     offset="1" /></linearGradient>
-		
-	</defs><g
-     transform="translate(-9.4073373,-4.5285014)"
-     id="g3042"><path
-       d="m 29.778093,43.02051 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z"
-       id="path2474"
-       style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 38.138561,27.185851 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335"
-       id="path2476"
-       style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle
-       cx="35.805"
-       cy="10.96"
-       r="1.676"
-       transform="matrix(0.59369893,0,0,0.5526353,12.859454,16.213829)"
-       id="circle2478"
-       style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /><g
-       transform="matrix(0.58918829,0,0,0.62673569,20.893007,10.023544)"
-       id="g17"><line
-         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-         id="line19"
-         y2="11.828"
-         x2="32.536999"
-         y1="1.75"
-         x1="42.615002" /><polyline
+     id="stop3170"
+     style="stop-color:#ffff00;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   x1="0.94254935"
+   y1="-31.669659"
+   x2="104.37702"
+   y2="20.434471"
+   id="linearGradient3172"
+   xlink:href="#linearGradient3166"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" />
+	
+	
+	
+	
+	
+</defs>
+
+
+
+
+<g
+   transform="matrix(1.1181651,0,0,1.1181651,61.470731,-23.367585)"
+   id="g3348"
+   style="fill:none"><path
+     d="m -19.754174,46.744351 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z"
+     id="path2474"
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -11.393706,30.909692 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335"
+     id="path2476"
+     style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle
+     cx="35.805"
+     cy="10.96"
+     r="1.676"
+     transform="matrix(0.59369893,0,0,0.5526353,-36.672813,19.93767)"
+     id="circle2478"
+     style="fill:none;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /></g><g
+   transform="translate(-2.2743816,2.513511)"
+   id="g3036"
+   style="overflow:visible"><path
+     d="M 9.5689397,38.952218 9.3902171,32.897964 M 25.663656,50.969805 3.6345541,51.23649 3.5243801,39.2454 l 5.851406,-6.358972 21.2578909,0 -0.110174,12.124478 z M 3.6345541,39.378743 l 21.4782339,0.266685 0.33052,10.924347 m -0.306426,-11.052011 5.531132,-6.638311"
+     id="path3806"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
+     transform="matrix(0,-1,-1,0,47.3087,85.9835)"
+     id="g4770-9"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772-6"><polyline
+         id="polyline4774-2"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
          style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-         id="polyline21"
-         points="33.322,2.539   42.615,1.75 41.826,11.043  " /></g></g></svg>
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776-5"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/pippy-openon.svg b/icons/pippy-openon.svg
index 888fe0c..a3bc335 100644
--- a/icons/pippy-openon.svg
+++ b/icons/pippy-openon.svg
@@ -9,35 +9,62 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:xlink="http://www.w3.org/1999/xlink"
    version="1.1"
-   width="45"
-   height="45"
-   viewBox="0 0 45 45"
-   id="svg2"
-   xml:space="preserve"><metadata
-     id="metadata18"><rdf:RDF><cc:Work
-         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-     id="defs25">
+   width="55"
+   height="55"
+   viewBox="0 0 54.999998 55.000001"
+   id="Icon"
+   xml:space="preserve"
+   style="overflow:visible"><metadata
+   id="metadata26"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+   id="defs24">
 	
 	
 	
+
+  
+  
+
+  
+   
+   
+   
+   
+
 	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
 	
-<linearGradient
-   x1="0.94254935"
-   y1="-31.669659"
-   x2="104.37702"
-   y2="20.434471"
-   id="linearGradient3172"
-   xlink:href="#linearGradient3166"
-   gradientUnits="userSpaceOnUse"
-   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" /><linearGradient
-   id="linearGradient3166"><stop
-     id="stop3168"
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+		
+	<linearGradient
+   id="linearGradient3166-6"><stop
+     id="stop3168-5"
      style="stop-color:#ffffff;stop-opacity:1"
      offset="0" /><stop
-     id="stop3170"
-     style="stop-color:#ffff00;stop-opacity:1"
+     id="stop3170-6"
+     style="stop-color:#ff0000;stop-opacity:1"
      offset="1" /></linearGradient><linearGradient
    x1="0"
    y1="22"
@@ -46,37 +73,75 @@
    id="linearGradient3172-9"
    xlink:href="#linearGradient3166-6"
    gradientUnits="userSpaceOnUse" /><linearGradient
-   id="linearGradient3166-6"><stop
-     id="stop3168-5"
+   id="linearGradient3166"><stop
+     id="stop3168"
      style="stop-color:#ffffff;stop-opacity:1"
      offset="0" /><stop
-     id="stop3170-6"
-     style="stop-color:#ff0000;stop-opacity:1"
-     offset="1" /></linearGradient>
-		
-	</defs><g
-     transform="translate(-9.4073373,-4.5285014)"
-     id="g3015"><path
-       d="m 29.778093,43.02051 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z"
-       id="path2474"
-       style="fill:#00ff00;fill-opacity:1;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 38.138561,27.185851 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335"
-       id="path2476"
-       style="fill:none;stroke:#000000;stroke-width:1.95917296;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle
-       cx="35.805"
-       cy="10.96"
-       r="1.676"
-       transform="matrix(0.59369893,0,0,0.5526353,12.859454,16.213829)"
-       id="circle2478"
-       style="fill:#000000;fill-opacity:1;stroke-width:3.42034841;stroke-miterlimit:4;stroke-dasharray:none" /><g
-       transform="matrix(0.58918829,0,0,0.62673569,20.893007,10.023544)"
-       id="g17"><line
-         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-         id="line19"
-         y2="11.828"
-         x2="32.536999"
-         y1="1.75"
-         x1="42.615002" /><polyline
+     id="stop3170"
+     style="stop-color:#ffff00;stop-opacity:1"
+     offset="1" /></linearGradient><linearGradient
+   x1="0.94254935"
+   y1="-31.669659"
+   x2="104.37702"
+   y2="20.434471"
+   id="linearGradient3172"
+   xlink:href="#linearGradient3166"
+   gradientUnits="userSpaceOnUse"
+   gradientTransform="matrix(0.7083638,0,0,1.0012565,0.1338084,32.632067)" />
+	
+	
+	
+	
+	
+
+	
+
+		
+		
+		
+		
+		
+		
+			
+		
+	
+			
+				
+			
+		</defs>
+
+
+
+
+<g
+   transform="matrix(1.1181651,0,0,1.1181651,61.470731,-23.367585)"
+   id="g3348"
+   style="fill:none;stroke:#00ff00;stroke-opacity:1"><path
+     d="m -19.754174,46.744351 c 3.555069,0 8.83424,-1.56838 8.83424,-6.181226 0,-5.131219 -4.597011,-5.60538 -6.503378,-6.124857 -2.107038,-0.441556 -3.510542,-1.057744 -3.594847,-1.909356 -0.144269,-1.460061 0.687503,-2.028723 2.342736,-2.028723 0,0 3.937412,2.024856 7.282311,0.40895 0.942794,-0.454819 2.631273,-2.579702 2.631273,-4.04529 0,-1.466142 -5.450749,-3.160522 -7.104794,-3.160522 -1.655233,0 -3.062894,2.125988 -3.062894,2.125988 -3.309277,0 -6.619149,2.932283 -6.619149,5.864566 0,2.93173 3.166197,5.225166 6.950433,5.864565 1.759131,0.259187 3.230316,1.226851 2.896064,3.005231 -0.27132,1.444036 -1.778128,2.932283 -4.963917,2.932283 -2.524407,0 -7.896195,-0.121026 -8.75409,-2.254199 -0.551547,-1.373851 0.09974,-2.876467 0.927358,-2.876467 l -0.01603,-0.08842 c -0.843052,-0.08732 -3.293841,0.08842 -3.293841,3.020151 -5.94e-4,3.759026 5.428782,5.447327 12.048526,5.447327 z"
+     id="path2474"
+     style="fill:none;stroke:#00ff00;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+     d="m -11.393706,30.909692 c -1.557272,-0.158607 -3.924943,-1.105272 -4.43315,-2.775335"
+     id="path2476"
+     style="fill:none;stroke:#00ff00;stroke-width:2;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><circle
+     cx="35.805"
+     cy="10.96"
+     r="1.676"
+     transform="matrix(0.59369893,0,0,0.5526353,-36.672813,19.93767)"
+     id="circle2478"
+     style="fill:none;stroke:#00ff00;stroke-width:3.42034841;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+   transform="translate(-2.2743816,2.513511)"
+   id="g3036"><path
+     d="M 9.5689397,38.952218 9.3902171,32.897964 M 25.663656,50.969805 3.6345541,51.23649 3.5243801,39.2454 l 5.851406,-6.358972 21.2578909,0 -0.110174,12.124478 z M 3.6345541,39.378743 l 21.4782339,0.266685 0.33052,10.924347 m -0.306426,-11.052011 5.531132,-6.638311"
+     id="path3806"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
+     transform="matrix(0,-1,-1,0,47.3087,85.9835)"
+     id="g4770"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772"><polyline
+         id="polyline4774"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
          style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
-         id="polyline21"
-         points="33.322,2.539   42.615,1.75 41.826,11.043  " /></g></g></svg>
\ No newline at end of file
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/run-slowoff.svg b/icons/run-slowoff.svg
index ac1fef5..72b9734 100644
--- a/icons/run-slowoff.svg
+++ b/icons/run-slowoff.svg
@@ -2,6 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
@@ -9,57 +12,58 @@
    height="45"
    viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve">
+   xml:space="preserve"><metadata
+   id="metadata23"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata>
 <defs
-   id="defs12"/>
-`<g
-   transform="matrix(0,1.2222222,-1.2222222,0,62.905112,-6.1111105)"
-   id="g2937"><path
-     d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
-     id="path3003"
-     style="fill:none;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-     d="m 38.317981,14.929279 c -1.837168,0 -3.360217,1.289964 -3.68707,2.992219 1.578232,1.115757 2.934884,2.584076 3.968928,4.320343 1.939893,-0.142684 3.475677,-1.709721 3.475677,-3.641764 0,-2.027442 -1.682656,-3.670798 -3.757535,-3.670798 z"
-     id="path3007"
-     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-     d="m 38.787461,38.290488 c -1.039138,1.851575 -2.42805,3.426908 -4.072502,4.609029 0.442312,1.546298 1.878767,2.686942 3.603022,2.686942 2.07403,0 3.757535,-1.642527 3.757535,-3.669969 0,-1.870656 -1.437304,-3.397874 -3.288055,-3.626002 z"
-     id="path3009"
-     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-     d="m 16.340734,38.277215 c -1.912727,0.170889 -3.41625,1.724653 -3.41625,3.639275 0,2.026612 1.680958,3.669969 3.755837,3.669969 1.752271,0 3.212497,-1.177974 3.626793,-2.764091 -1.598607,-1.174655 -2.950165,-2.728419 -3.96638,-4.545153 z"
-     id="path3011"
-     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-     d="m 20.375881,18.007772 c -0.291196,-1.744563 -1.828678,-3.078493 -3.69556,-3.078493 -2.074879,0 -3.755837,1.643356 -3.755837,3.669968 0,1.97601 1.601155,3.575399 3.603872,3.655037 1.006876,-1.694789 2.319381,-3.139051 3.847525,-4.246512 z"
-     id="path3013"
-     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-     d="m 27.567493,15.62362 c 1.619832,0 3.164955,0.340948 4.599711,0.935742 0.629086,-0.892605 1.000085,-1.971862 1.000085,-3.138221 0,-3.058584 -2.537567,-5.5389654 -5.668563,-5.5389654 -3.130146,0 -5.667713,2.4803814 -5.667713,5.5389654 0,1.18461 0.383734,2.280457 1.032345,3.180529 1.463622,-0.62134 3.04525,-0.97805 4.704135,-0.97805 z"
-     id="path3015"
-     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-     transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
-     id="g3017"
-     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
-       d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
-       id="path3019"
-       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
-     transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
-     id="g3021"
-     style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
-       d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
-       id="path3023"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
-       id="path3025"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
-       id="path3027"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
-       id="path3029"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
-       id="path3031"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
-       id="path3033"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g><path
+   id="defs12" />
+`<path
+   d="m 7.5969346,27.582491 c 0,-0.573808 0.035481,-1.140352 0.1013955,-1.698596 l -2.3816637,1.440227 2.345162,1.419476 c -0.030421,-0.384961 -0.064888,-0.768883 -0.064888,-1.161107 z"
+   id="path3003"
+   style="fill:none;stroke:#ffffff;stroke-width:1.4666667;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+   d="m 44.658216,40.721977 c 0,-2.245428 -1.576623,-4.106932 -3.657157,-4.506419 -1.363703,1.92895 -3.158315,3.58708 -5.280419,4.850912 0.174392,2.37098 2.089659,4.248049 4.451045,4.248049 2.477985,0 4.486531,-2.056579 4.486531,-4.592542 z"
+   id="path3007"
+   style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+   d="m 16.105628,41.295785 c -2.263037,-1.270057 -4.188444,-2.967616 -5.633258,-4.977502 -1.8899198,0.540604 -3.2840402,2.296271 -3.2840402,4.403694 0,2.534925 2.007533,4.592542 4.4855172,4.592542 2.286358,0 4.152957,-1.756705 4.431781,-4.018734 z"
+   id="path3009"
+   style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+   d="M 16.12185,13.860897 C 15.912986,11.52312 14.013941,9.6854808 11.673847,9.6854808 c -2.4769698,0 -4.4855172,2.0545042 -4.4855172,4.5904672 0,2.141665 1.439746,3.926385 3.3783332,4.432747 1.43569,-1.953853 3.334734,-3.605757 5.555187,-4.847798 z"
+   id="path3011"
+   style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+   d="m 40.895613,18.792744 c 2.132244,-0.355907 3.762603,-2.235051 3.762603,-4.516796 0,-2.535963 -2.008546,-4.5904672 -4.485517,-4.5904672 -2.415123,0 -4.369932,1.9569672 -4.467267,4.4047322 2.071409,1.230626 3.836618,2.834799 5.190181,4.702531 z"
+   id="path3013"
+   style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+   d="m 43.809577,27.582491 c 0,1.979795 -0.416714,3.868279 -1.143685,5.621869 1.090962,0.768883 2.410054,1.222326 3.835604,1.222326 3.738269,0 6.769846,-3.10147 6.769846,-6.928243 0,-3.825734 -3.031577,-6.927205 -6.769846,-6.927205 -1.447857,0 -2.787226,0.469008 -3.887314,1.261755 0.759416,1.788872 1.195395,3.721972 1.195395,5.749498 z"
+   id="path3015"
+   style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+   transform="matrix(0,1.0376281,-1.0139053,0,56.54727,-0.9491698)"
+   id="g3017"
+   style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+     d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+     id="path3019"
+     style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
+   transform="matrix(0,1.0376281,-1.0139053,0,56.54727,-0.9491698)"
+   id="g3021"
+   style="fill:#ffffff;fill-opacity:1;stroke:none"><path
+     d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
+     id="path3023"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+     d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+     id="path3025"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+     d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+     id="path3027"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+     d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+     id="path3029"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+     d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+     id="path3031"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
+     d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+     id="path3033"
+     style="fill:#ffffff;fill-opacity:1;stroke:none" /></g><path
    d=""
    id="path2385"
-   style="fill:#a0ffa0;fill-opacity:1;stroke:#00c000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></svg>
+   style="fill:#a0ffa0;fill-opacity:1;stroke:#00c000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></svg>
\ No newline at end of file
diff --git a/icons/run-slowon.svg b/icons/run-slowon.svg
index 1a0883b..5ea8990 100644
--- a/icons/run-slowon.svg
+++ b/icons/run-slowon.svg
@@ -2,6 +2,9 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
@@ -9,7 +12,10 @@
    height="45"
    viewBox="0 0 55 55"
    id="svg2"
-   xml:space="preserve"><defs
+   xml:space="preserve"><metadata
+     id="metadata3022"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
      id="defs12">
 	
 </defs><path
@@ -20,50 +26,49 @@
      d=""
      id="path2385"
      style="fill:#00d000;fill-opacity:1;stroke:#00d000;stroke-width:1.5;stroke-linecap:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-     transform="matrix(0,1.2222222,-1.2222222,0,62.905112,-6.1105186)"
-     id="g2937"><path
-       d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
+     id="g4941"><path
+       d="m 7.5969346,27.583083 c 0,-0.573809 0.035481,-1.140353 0.1013955,-1.698596 l -2.3816637,1.440227 2.345162,1.419476 c -0.030421,-0.384961 -0.064888,-0.768883 -0.064888,-1.161107 z"
        id="path3003"
-       style="fill:none;stroke:#ffffff;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 38.317981,14.929279 c -1.837168,0 -3.360217,1.289964 -3.68707,2.992219 1.578232,1.115757 2.934884,2.584076 3.968928,4.320343 1.939893,-0.142684 3.475677,-1.709721 3.475677,-3.641764 0,-2.027442 -1.682656,-3.670798 -3.757535,-3.670798 z"
+       style="fill:none;stroke:#ffffff;stroke-width:1.4666667;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 44.658216,40.722568 c 0,-2.245427 -1.576623,-4.106931 -3.657157,-4.506418 -1.363703,1.92895 -3.158315,3.58708 -5.280419,4.850912 0.174392,2.37098 2.089659,4.248049 4.451045,4.248049 2.477985,0 4.486531,-2.056579 4.486531,-4.592543 z"
        id="path3007"
-       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 38.787461,38.290488 c -1.039138,1.851575 -2.42805,3.426908 -4.072502,4.609029 0.442312,1.546298 1.878767,2.686942 3.603022,2.686942 2.07403,0 3.757535,-1.642527 3.757535,-3.669969 0,-1.870656 -1.437304,-3.397874 -3.288055,-3.626002 z"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 16.105628,41.296377 c -2.263037,-1.270057 -4.188444,-2.967616 -5.633258,-4.977502 -1.8899198,0.540604 -3.2840402,2.296271 -3.2840402,4.403693 0,2.534926 2.007533,4.592543 4.4855172,4.592543 2.286358,0 4.152957,-1.756705 4.431781,-4.018734 z"
        id="path3009"
-       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 16.340734,38.277215 c -1.912727,0.170889 -3.41625,1.724653 -3.41625,3.639275 0,2.026612 1.680958,3.669969 3.755837,3.669969 1.752271,0 3.212497,-1.177974 3.626793,-2.764091 -1.598607,-1.174655 -2.950165,-2.728419 -3.96638,-4.545153 z"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 16.12185,13.861489 c -0.208864,-2.337777 -2.107909,-4.1754163 -4.448003,-4.1754163 -2.4769698,0 -4.4855172,2.0545043 -4.4855172,4.5904673 0,2.141665 1.439746,3.926385 3.3783332,4.432747 1.43569,-1.953853 3.334734,-3.605757 5.555187,-4.847798 z"
        id="path3011"
-       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 20.375881,18.007772 c -0.291196,-1.744563 -1.828678,-3.078493 -3.69556,-3.078493 -2.074879,0 -3.755837,1.643356 -3.755837,3.669968 0,1.97601 1.601155,3.575399 3.603872,3.655037 1.006876,-1.694789 2.319381,-3.139051 3.847525,-4.246512 z"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 40.895613,18.793336 c 2.132244,-0.355907 3.762603,-2.235051 3.762603,-4.516796 0,-2.535963 -2.008546,-4.5904673 -4.485517,-4.5904673 -2.415123,0 -4.369932,1.9569673 -4.467267,4.4047323 2.071409,1.230626 3.836618,2.834799 5.190181,4.702531 z"
        id="path3013"
-       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-       d="m 27.567493,15.62362 c 1.619832,0 3.164955,0.340948 4.599711,0.935742 0.629086,-0.892605 1.000085,-1.971862 1.000085,-3.138221 0,-3.058584 -2.537567,-5.5389654 -5.668563,-5.5389654 -3.130146,0 -5.667713,2.4803814 -5.667713,5.5389654 0,1.18461 0.383734,2.280457 1.032345,3.180529 1.463622,-0.62134 3.04525,-0.97805 4.704135,-0.97805 z"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+       d="m 43.809577,27.583083 c 0,1.979795 -0.416714,3.868279 -1.143685,5.621869 1.090962,0.768883 2.410054,1.222326 3.835604,1.222326 3.738269,0 6.769846,-3.10147 6.769846,-6.928243 0,-3.825734 -3.031577,-6.927205 -6.769846,-6.927205 -1.447857,0 -2.787226,0.469008 -3.887314,1.261755 0.759416,1.788871 1.195395,3.721972 1.195395,5.749498 z"
        id="path3015"
-       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.29999995;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
-       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+       style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:2.81111097;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+       transform="matrix(0,1.0376281,-1.0139053,0,56.54727,-0.9485779)"
        id="g3017"
        style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
          d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
          id="path3019"
          style="fill:#686868;fill-opacity:1;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g><g
-       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
+       transform="matrix(0,1.0376281,-1.0139053,0,56.54727,-0.9485779)"
        id="g3021"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"><path
+       style="fill:#ffffff;fill-opacity:1;stroke:none"><path
          d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
          id="path3023"
-         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
          d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
          id="path3025"
-         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
          d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
          id="path3027"
-         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
          d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
          id="path3029"
-         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
          d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
          id="path3031"
-         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /><path
          d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
          id="path3033"
-         style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></svg>
\ No newline at end of file
+         style="fill:#ffffff;fill-opacity:1;stroke:none" /></g></g></svg>
\ No newline at end of file
diff --git a/icons/ta-open.svg b/icons/ta-open.svg
index af3fc35..d7677e0 100644
--- a/icons/ta-open.svg
+++ b/icons/ta-open.svg
@@ -8,39 +8,176 @@
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.1"
-   width="45"
-   height="45"
-   viewBox="0 0 44.999998 45.000001"
+   width="55"
+   height="55"
+   viewBox="0 0 54.999998 55.000001"
    id="Icon"
    xml:space="preserve"
    style="overflow:visible"><metadata
    id="metadata26"><rdf:RDF><cc:Work
        rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
          rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
-   id="defs24" />
+   id="defs24">
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+	
+	
+
+  
+  
+
+  
+   
+   
+   
+   
+
+	
+
+		
+		
+		
+		
+		
+		
+		
+		
+		
+	
+	
+
+		
+		
+		
+		
+		
+		
+			
+		
+	
+			
+				
+			
+		</defs>
+
 
 
 
 <g
-   transform="matrix(0.5891883,0,0,0.6267357,9.4473949,4.9460901)"
-   id="g17">
-
-	<line
-   x1="42.615002"
-   y1="1.75"
-   x2="32.536999"
-   y2="11.828"
-   id="line19"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
-	<polyline
-   points="33.322,2.539   42.615,1.75 41.826,11.043  "
-   id="polyline21"
-   style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round" />
-</g>
-<path
-   d="m 35.5,38.888628 c 0,1.68237 -1.12132,3.074271 -3,3.074271 l -23.000001,0 0,-27.000001 8.803922,0 1.696079,2 15.5,0 0,21.92573 0,0 z"
-   id="path2458-4"
-   style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><path
-   d="m 35.5,38.888628 c 0,1.68237 -1.12132,3.074271 -3,3.074271 l -23.000001,0 0,-17.000001 8.485295,0 L 20,20.962897 l 15.5,0 0,17.925731 0,0 z"
-   id="path2458"
-   style="fill:none;stroke:#ffffff;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></svg>
\ No newline at end of file
+   transform="translate(2,-2)"
+   id="g3829"><path
+     d="m 39.046105,34.391197 c -0.384814,0 -0.764757,-0.02436 -1.139134,-0.06959 l 0.965863,1.634591 0.951946,-1.60954 c -0.258167,0.02088 -0.515638,0.04454 -0.778675,0.04454 z"
+     id="path11-7"
+     style="fill:none;stroke:#ffffff;stroke-width:2.08759975;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+     transform="matrix(0.69586655,0,0,0.69586655,19.911862,0.79545554)"
+     id="g13-6"
+     style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+   d="m 40.16,11.726 c -2.164,0 -3.958,1.555 -4.343,3.607 1.859,1.345 3.457,3.115 4.675,5.208 2.285,-0.172 4.094,-2.061 4.094,-4.39 0,-2.444 -1.982,-4.425 -4.426,-4.425 z"
+   id="path15-3"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+   d="m 40.713,39.887 c -1.224,2.232 -2.86,4.131 -4.797,5.556 0.521,1.864 2.213,3.239 4.244,3.239 2.443,0 4.426,-1.98 4.426,-4.424 0,-2.255 -1.693,-4.096 -3.873,-4.371 z"
+   id="path17-1"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+   d="m 14.273,39.871 c -2.253,0.206 -4.024,2.079 -4.024,4.387 0,2.443 1.98,4.424 4.424,4.424 2.064,0 3.784,-1.42 4.272,-3.332 -1.883,-1.416 -3.475,-3.289 -4.672,-5.479 z"
+   id="path19-7"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+    <path
+   d="m 19.026,15.437 c -0.343,-2.103 -2.154,-3.711 -4.353,-3.711 -2.444,0 -4.424,1.981 -4.424,4.424 0,2.382 1.886,4.31 4.245,4.406 1.186,-2.043 2.732,-3.784 4.532,-5.119 z"
+   id="path21-5"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+   </g><path
+     d="m 39.046105,9.537627 c 1.327713,0 2.59419,0.2860012 3.770205,0.784937 0.515637,-0.7487519 0.819731,-1.6540743 0.819731,-2.6324627 0,-2.5656599 -2.079945,-4.6463009 -4.646301,-4.6463009 -2.56566,0 -4.645605,2.080641 -4.645605,4.6463009 0,0.9936975 0.314531,1.9129372 0.846173,2.6679527 1.199674,-0.5212044 2.496074,-0.820427 3.855797,-0.820427 z"
+     id="path23-9"
+     style="fill:none;stroke:#ffffff;stroke-width:2.08759975;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /><g
+     transform="matrix(0.69586655,0,0,0.69586655,19.911862,0.79545554)"
+     id="g25-6"
+     style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+    <path
+   d="m 43.102,30.421 c 0,4.7344 -1.6452,9.2798 -4.5706,12.6275 -2.9254,3.3478 -6.8973,5.2305 -11.0344,5.2305 -4.1371,0 -8.109,-1.8827 -11.0344,-5.2305 -2.9254,-3.3477 -4.5706,-7.8931 -4.5706,-12.6275 0,-9.7966 7.0444,-17.858 15.605,-17.858 8.5606,0 15.605,8.0614 15.605,17.858 z"
+   id="path2988-2"
+   style="fill:none;stroke:#ffffff;stroke-width:3;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+   </g><g
+     transform="matrix(0.69586655,0,0,0.69586655,19.911862,0.79545554)"
+     id="g28-1"
+     style="fill:#ffffff;fill-opacity:1;stroke:none">
+    <path
+   d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 -3.75,-0.083 z"
+   id="path30-7"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+   d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
+   id="path32-8"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+   d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
+   id="path34-5"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+   d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
+   id="path2998-7"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+   d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
+   id="path37-4"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+    <path
+   d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
+   id="path3002-1"
+   style="fill:#ffffff;fill-opacity:1;stroke:none" />
+   </g></g><g
+   transform="translate(-2.2743816,2.513511)"
+   id="g3036"><path
+     d="M 9.5689397,38.952218 9.3902171,32.897964 M 25.663656,50.969805 3.6345541,51.23649 3.5243801,39.2454 l 5.851406,-6.358972 21.2578909,0 -0.110174,12.124478 z M 3.6345541,39.378743 l 21.4782339,0.266685 0.33052,10.924347 m -0.306426,-11.052011 5.531132,-6.638311"
+     id="path3806"
+     style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" /><g
+     transform="matrix(0,-1,-1,0,47.3087,85.9835)"
+     id="g4770-9"><g
+       transform="translate(34.0803,-1006.42)"
+       id="g4772-6"><polyline
+         id="polyline4774-3"
+         points="51.562,15.306 41.17,16.188 42.053,5.794"
+         style="fill:none;stroke:#ffffff;stroke-width:3.5;stroke-linecap:round;stroke-linejoin:round"
+         transform="matrix(-0.469241,0.469241,-0.469241,-0.469241,66.2906,1019.03)" /><path
+         d="m 39.363241,1033.1291 -0.05636,9.9115 -8.750608,0.067"
+         id="path4776-8"
+         style="fill:none;stroke:#ffffff;stroke-width:2.5;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" /></g></g></g></svg>
\ No newline at end of file
diff --git a/icons/trashoff.svg b/icons/trashoff.svg
index c444807..8ebfb39 100644
--- a/icons/trashoff.svg
+++ b/icons/trashoff.svg
@@ -10,13 +10,6 @@
    id="svg2">
   <defs
      id="defs5" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <path
      d="m 38.999052,40.01547 a 11.011069,3.4902595 0 1 1 -22.022137,0 11.011069,3.4902595 0 1 1 22.022137,0 z"
      id="path2822"
diff --git a/icons/turtleoff.svg b/icons/turtleoff.svg
index 95cb54d..f3d721f 100644
--- a/icons/turtleoff.svg
+++ b/icons/turtleoff.svg
@@ -2,21 +2,29 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
    width="55"
    height="55"
    id="svg2">
+  <metadata
+     id="metadata3044">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
      id="defs5" />
-  <rect
-     width="55"
-     height="55"
-     x="0"
-     y="0"
-     id="rect3269"
-     style="fill:#282828;fill-opacity:1;fill-rule:nonzero;stroke:none" />
   <path
      d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
      id="path3003"
@@ -53,30 +61,30 @@
   <g
      transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
      id="g3021"
-     style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+     style="fill:#ffffff;fill-opacity:1;stroke:none">
     <path
        d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
        id="path3023"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
        id="path3025"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
        id="path3027"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
        id="path3029"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
        id="path3031"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
     <path
        d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
        id="path3033"
-       style="fill:none;stroke:#ffffff;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#ffffff;fill-opacity:1;stroke:none" />
   </g>
 </svg>
diff --git a/icons/turtleon.svg b/icons/turtleon.svg
index bd19cff..4d955de 100644
--- a/icons/turtleon.svg
+++ b/icons/turtleon.svg
@@ -2,12 +2,27 @@
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
 <svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
    xmlns:svg="http://www.w3.org/2000/svg"
    xmlns="http://www.w3.org/2000/svg"
    version="1.0"
    width="55"
    height="55"
    id="svg2">
+  <metadata
+     id="metadata3068">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
   <defs
      id="defs5" />
   <rect
@@ -19,15 +34,13 @@
      id="rect2839"
      style="fill:#ffd200;fill-opacity:1;fill-rule:evenodd;stroke:none" />
   <g
-     transform="matrix(0.8489685,0,0,0.82955893,4.1533662,4.6871294)"
-     id="g2831"
-     style="stroke-width:1.42992032;stroke-miterlimit:4;stroke-dasharray:none">
+     id="g3854">
     <path
-       d="m 27.5795,48.8995 c -0.553,0 -1.099,-0.035 -1.637,-0.1 l 1.388,2.349 1.368,-2.313 c -0.371,0.03 -0.741,0.064 -1.119,0.064 z"
+       d="m 27.567493,45.252146 c -0.46948,0 -0.933016,-0.02903 -1.389761,-0.08296 l 1.178368,1.948634 1.161389,-1.918769 c -0.314968,0.02489 -0.629086,0.05309 -0.949996,0.05309 z"
        id="path3003"
-       style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:none;stroke:#00ff00;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       transform="translate(0.0825,0.6205)"
+       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
        id="g3005"
        style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
       <path
@@ -48,11 +61,11 @@
          style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <path
-       d="m 27.5795,13.1835 c 1.908,0 3.728,0.411 5.418,1.128 0.741,-1.076 1.178,-2.377 1.178,-3.783 0,-3.687 -2.989,-6.677 -6.677,-6.677 -3.687,0 -6.676,2.99 -6.676,6.677 0,1.428 0.452,2.749 1.216,3.834 1.724,-0.749 3.587,-1.179 5.541,-1.179 z"
+       d="m 27.567493,15.62362 c 1.619832,0 3.164955,0.340948 4.599711,0.935742 0.629086,-0.892605 1.000085,-1.971862 1.000085,-3.138221 0,-3.058584 -2.537567,-5.5389654 -5.668563,-5.5389654 -3.130146,0 -5.667713,2.4803814 -5.667713,5.5389654 0,1.18461 0.383734,2.280457 1.032345,3.180529 1.463622,-0.62134 3.04525,-0.97805 4.704135,-0.97805 z"
        id="path3015"
-       style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+       style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.20000005;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     <g
-       transform="translate(0.0825,0.6205)"
+       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
        id="g3017"
        style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
       <path
@@ -61,33 +74,33 @@
          style="fill:#00d000;fill-opacity:1;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
     </g>
     <g
-       transform="translate(0.0825,0.6205)"
+       transform="matrix(0.8489685,0,0,0.82955893,4.2234061,5.2018707)"
        id="g3021"
-       style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none">
+       style="fill:#00ff00;fill-opacity:1;stroke:none">
       <path
          d="m 25.875,33.75 -1.542,-4.625 3.164,-2.587 3.615,2.626 -1.487,4.669 z"
          id="path3023"
-         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00ff00;fill-opacity:1;stroke:none" />
       <path
          d="m 27.501,41.551 c -3.968,-0.16 -5.543,-2.009 -5.543,-2.009 l 3.57,-4.163 4.465,0.168 3.132,4.12 c 0,0 -2.89,1.994 -5.624,1.884 z"
          id="path3025"
-         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00ff00;fill-opacity:1;stroke:none" />
       <path
          d="m 18.453,33.843 c -0.849,-2.968 0.172,-6.884 0.172,-6.884 l 4,2.167 1.493,4.629 -3.582,4.233 c 0,-10e-4 -1.465,-1.99 -2.083,-4.145 z"
          id="path3027"
-         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00ff00;fill-opacity:1;stroke:none" />
       <path
          d="m 19.458,25.125 c 0,0 0.5,-1.958 3.039,-3.822 2.237,-1.643 4.465,-1.72 4.465,-1.72 l -0.037,4.981 -3.521,2.75 -3.946,-2.189 z"
          id="path3029"
-         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00ff00;fill-opacity:1;stroke:none" />
       <path
          d="M 32.084,27.834 28.625,24.959 29,19.75 c 0,0 1.834,-0.042 3.959,1.667 2.228,1.791 3.362,4.983 3.362,4.983 l -4.237,1.434 z"
          id="path3031"
-         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00ff00;fill-opacity:1;stroke:none" />
       <path
          d="m 31.292,34.042 1.313,-4.464 4.187,-1.536 c 0,0 0.677,2.663 -0.042,5.667 -0.54,2.256 -2.084,4.361 -2.084,4.361 l -3.374,-4.028 z"
          id="path3033"
-         style="fill:none;stroke:#00ff00;stroke-width:1.42992032;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
+         style="fill:#00ff00;fill-opacity:1;stroke:none" />
     </g>
   </g>
 </svg>
diff --git a/turtleconfusion.py b/turtleconfusion.py
index 859fa51..d244872 100755
--- a/turtleconfusion.py
+++ b/turtleconfusion.py
@@ -350,7 +350,9 @@ class TurtleMain():
         turtle_menu = MenuBuilder.make_sub_menu(menu, _('Turtle'))
 
         menu = gtk.Menu()
+        self._level = 0
         self._levels = self._get_levels()
+        self._custom_filepath = None
         for i in range(40):
             MenuBuilder.make_menu_item(menu, _('Challenge') + ' ' + str(i + 1),
                                        self._do_level_cb, i)
@@ -522,6 +524,7 @@ class TurtleMain():
     def _do_eraser_cb(self, widget):
         ''' Callback for eraser button. '''
         self.tw.eraser_button()
+        self._load_level(self._level)
         return
 
     def _do_run_cb(self, widget):
@@ -614,6 +617,13 @@ class TurtleMain():
         else:
             return os.path.abspath(dirname)
 
+    def restore_challenge(self):
+        ''' Restore the current challange after a clear screen '''
+        if self._custom_filepath is None:
+            self._load_level()
+        else:
+            self._load_level(custom=True)
+
     def _load_level(self, custom=False):
         self.tw.canvas.clearscreen()
         if custom: