update to trunk

(bzr r13879.1.19)

15 files changed, 500 insertions, 238 deletions

diff --git a/po/nl.po b/po/nl.po
index c6f1c9e8e..1233eee32 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -59,7 +59,7 @@ msgstr ""
 "Project-Id-Version: inkscape 0.49\n"
 "Report-Msgid-Bugs-To: inkscape-devel@lists.sourceforge.net\n"
 "POT-Creation-Date: 2015-05-18 12:45+0200\n"
-"PO-Revision-Date: 2015-06-02 22:42+0100\n"
+"PO-Revision-Date: 2015-06-02 23:12+0100\n"
 "Last-Translator: Kris De Gussem <Kris.DeGussem@gmail.com>\n"
 "Language-Team: Dutch\n"
 "Language: nl\n"
@@ -9644,15 +9644,13 @@ msgstr "Aantal stappen veranderen bij indrukken van CTRL"
 
 #: ../src/live_effects/lpe-bspline.cpp:26
 #: ../src/live_effects/lpe-simplify.cpp:33
-#, fuzzy
 msgid "Helper size:"
-msgstr "H_andvatgrootte:"
+msgstr "Handvatgrootte:"
 
 #: ../src/live_effects/lpe-bspline.cpp:26
 #: ../src/live_effects/lpe-simplify.cpp:33
-#, fuzzy
 msgid "Helper size"
-msgstr "H_andvatgrootte:"
+msgstr "Handvatgrootte"
 
 #: ../src/live_effects/lpe-bspline.cpp:27
 msgid "Ignore cusp nodes"
@@ -9677,7 +9675,7 @@ msgstr "Grootte verandering van effect"
 
 #: ../src/live_effects/lpe-bspline.cpp:260
 msgid "Default weight"
-msgstr "Stadnaardwaarde"
+msgstr "Standaardwaarde"
 
 #: ../src/live_effects/lpe-bspline.cpp:265
 msgid "Make cusp"
@@ -9860,9 +9858,8 @@ msgid "Reverse Second"
 msgstr "Tweede omdraaien"
 
 #: ../src/live_effects/lpe-fill-between-strokes.cpp:25
-#, fuzzy
 msgid "Reverses the second path order"
-msgstr "Richting kleurverloop omdraaien"
+msgstr "Volgorde tweede pad omdraaien"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:41
 #: ../share/extensions/render_barcode_qrcode.inx.h:5
@@ -9870,27 +9867,24 @@ msgid "Auto"
 msgstr "Automatisch"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:42
-#, fuzzy
 msgid "Force arc"
-msgstr "Kracht"
+msgstr "Boog forceren"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:43
 msgid "Force bezier"
-msgstr ""
+msgstr "Bezier forceren"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:53
-#, fuzzy
 msgid "Fillet point"
-msgstr "Vulkleur"
+msgstr "Afschuiningspunt"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:54
 msgid "Hide knots"
 msgstr "Knooppunten verbergen"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:55
-#, fuzzy
 msgid "Ignore 0 radius knots"
-msgstr "De eerste en laatste punten negeren"
+msgstr "0 straalpunten negeren"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:57
 msgid "Flexible radius size (%)"
@@ -9898,68 +9892,63 @@ msgstr "Flexibele straal (%)"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:58
 msgid "Use knots distance instead radius"
-msgstr ""
+msgstr "Knooppuntafstand in plaats van straal gebruiken"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:59
 msgid "Method:"
 msgstr "Methode:"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:59
-#, fuzzy
 msgid "Fillets methods"
-msgstr "Vulmethode:"
+msgstr "Afschuiningsmethode"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:60
-#, fuzzy
 msgid "Radius (unit or %):"
-msgstr "Straal (eenheid of %)"
+msgstr "Straal (eenheid of %):"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:60
 msgid "Radius, in unit or %"
 msgstr "straal, in eenheid of in %"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:61
-#, fuzzy
 msgid "Chamfer steps:"
-msgstr "Aantal stappen:"
+msgstr "Afschuiningsstappen:"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:61
-#, fuzzy
 msgid "Chamfer steps"
-msgstr "Aantal stappen:"
+msgstr "Afschuiningsstappen"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:63
-#, fuzzy
 msgid "Helper size with direction:"
-msgstr "Hoek in X-richting"
+msgstr "Handvatgrootte met richting:"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:63
 msgid "Helper size with direction"
-msgstr ""
+msgstr "Handvatgrootte met richting"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:154
 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:71
 #, fuzzy
 msgid "Fillet"
-msgstr "Vulling"
+msgstr "Band"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:158
 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:73
 #, fuzzy
 msgid "Inverse fillet"
-msgstr "Vulling inverteren"
+msgstr "Omgekeerde band"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:163
 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:75
 #, fuzzy
 msgid "Chamfer"
-msgstr "Cham"
+msgstr "Afschuining"
 
 #: ../src/live_effects/lpe-fillet-chamfer.cpp:167
 #: ../src/ui/dialog/lpe-fillet-chamfer-properties.cpp:77
 #, fuzzy
 msgid "Inverse chamfer"
-msgstr "Vulling inverteren"
+msgstr "Omgekeerde afschuining"
 
 #: ../src/live_effects/lpe-gears.cpp:214
 msgid "_Teeth:"
@@ -10208,9 +10197,8 @@ msgstr "Knooppunten horizontaal verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:48
 #: ../src/live_effects/lpe-perspective-envelope.cpp:44
-#, fuzzy
 msgid "Mirror movements in vertical"
-msgstr "Knooppunten verticaal verplaatsen"
+msgstr "Verticale bewegingen spiegelen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:49
 msgid "Control 0:"
@@ -10219,6 +10207,8 @@ msgstr "Handvat 0:"
 #: ../src/live_effects/lpe-lattice2.cpp:49
 msgid "Control 0 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 0 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:50
 msgid "Control 1:"
@@ -10227,6 +10217,8 @@ msgstr "Handvat 1:"
 #: ../src/live_effects/lpe-lattice2.cpp:50
 msgid "Control 1 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 1 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:51
 msgid "Control 2:"
@@ -10235,6 +10227,8 @@ msgstr "Handvat 2:"
 #: ../src/live_effects/lpe-lattice2.cpp:51
 msgid "Control 2 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 2 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:52
 msgid "Control 3:"
@@ -10243,6 +10237,8 @@ msgstr "Handvat 3:"
 #: ../src/live_effects/lpe-lattice2.cpp:52
 msgid "Control 3 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 3 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:53
 msgid "Control 4:"
@@ -10251,6 +10247,8 @@ msgstr "Handvat 4:"
 #: ../src/live_effects/lpe-lattice2.cpp:53
 msgid "Control 4 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 4 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:54
 msgid "Control 5:"
@@ -10259,6 +10257,8 @@ msgstr "Handvat 5:"
 #: ../src/live_effects/lpe-lattice2.cpp:54
 msgid "Control 5 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 5 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:55
 msgid "Control 6:"
@@ -10267,6 +10267,8 @@ msgstr "Handvat 6:"
 #: ../src/live_effects/lpe-lattice2.cpp:55
 msgid "Control 6 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 6 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:56
 msgid "Control 7:"
@@ -10275,6 +10277,8 @@ msgstr "Handvat 7:"
 #: ../src/live_effects/lpe-lattice2.cpp:56
 msgid "Control 7 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 7 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:57
 msgid "Control 8x9:"
@@ -10284,6 +10288,8 @@ msgstr "Handvat 8x9:"
 msgid ""
 "Control 8x9 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 8x9 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:58
 msgid "Control 10x11:"
@@ -10293,7 +10299,7 @@ msgstr "Handvat 10x11:"
 msgid ""
 "Control 10x11 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
-"Handvat 10x11 - Ctrl+Alt+Klikken om te resetten, <b>Ctrl</b>: langs assen "
+"Handvat 10x11 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
 "verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:59
@@ -10303,6 +10309,8 @@ msgstr "Handvat 12:"
 #: ../src/live_effects/lpe-lattice2.cpp:59
 msgid "Control 12 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 12 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:60
 msgid "Control 13:"
@@ -10311,6 +10319,8 @@ msgstr "Handvat 13:"
 #: ../src/live_effects/lpe-lattice2.cpp:60
 msgid "Control 13 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 13 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:61
 msgid "Control 14:"
@@ -10319,6 +10329,8 @@ msgstr "Handvat 14:"
 #: ../src/live_effects/lpe-lattice2.cpp:61
 msgid "Control 14 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 14 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:62
 msgid "Control 15:"
@@ -10327,6 +10339,8 @@ msgstr "Handvat 15:"
 #: ../src/live_effects/lpe-lattice2.cpp:62
 msgid "Control 15 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 15 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:63
 msgid "Control 16:"
@@ -10335,6 +10349,8 @@ msgstr "Handvat 16:"
 #: ../src/live_effects/lpe-lattice2.cpp:63
 msgid "Control 16 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 16 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:64
 msgid "Control 17:"
@@ -10343,6 +10359,8 @@ msgstr "Handvat 17:"
 #: ../src/live_effects/lpe-lattice2.cpp:64
 msgid "Control 17 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 17 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:65
 msgid "Control 18:"
@@ -10351,6 +10369,8 @@ msgstr "Handvat 18:"
 #: ../src/live_effects/lpe-lattice2.cpp:65
 msgid "Control 18 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 18 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:66
 msgid "Control 19:"
@@ -10359,77 +10379,86 @@ msgstr "Handvat 19:"
 #: ../src/live_effects/lpe-lattice2.cpp:66
 msgid "Control 19 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
 msgstr ""
+"Handvat 19 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:67
 msgid "Control 20x21:"
 msgstr "Handvat 20x21:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:67
-#, fuzzy
 msgid ""
 "Control 20x21 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
-msgstr "Handvat 20x21 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 20x21 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:68
 msgid "Control 22x23:"
 msgstr "Handvat 22x23:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:68
-#, fuzzy
 msgid ""
 "Control 22x23 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
-msgstr "Handvat 22x23 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 22x23 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:69
 msgid "Control 24x26:"
 msgstr "Handvat 24x26:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:69
-#, fuzzy
 msgid ""
 "Control 24x26 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
-msgstr "Handvat 24x26 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 24x26 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:70
 msgid "Control 25x27:"
 msgstr "Handvat 25x27:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:70
-#, fuzzy
 msgid ""
 "Control 25x27 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
-msgstr "Handvat 25x27 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 25x27 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:71
 msgid "Control 28x30:"
 msgstr "Handvat 28x30:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:71
-#, fuzzy
 msgid ""
 "Control 28x30 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
-msgstr "Handvat 28x30 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 28x30 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:72
 msgid "Control 29x31:"
 msgstr "Handvat 29x31:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:72
-#, fuzzy
 msgid ""
 "Control 29x31 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along axes"
-msgstr "Handvat 29x31 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 29x31 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs assen "
+"verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:73
 msgid "Control 32x33x34x35:"
 msgstr "Handvat 32x33x34x35:"
 
 #: ../src/live_effects/lpe-lattice2.cpp:73
-#, fuzzy
 msgid ""
 "Control 32x33x34x35 - <b>Ctrl+Alt+Click</b>: reset, <b>Ctrl</b>: move along "
 "axes"
-msgstr "Handvat 32x33x34x35 - Ctrl+Alt+Klikken om te resetten"
+msgstr ""
+"Handvat 32x33x34x35 - <b>Ctrl+Alt+Klikken</b>: resetten, <b>Ctrl</b>: langs "
+"assen verplaatsen"
 
 #: ../src/live_effects/lpe-lattice2.cpp:236
 msgid "Reset grid"
@@ -18126,7 +18155,7 @@ msgstr "Indonesisch (id)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:532
 msgid "Icelandic (is)"
-msgstr ""
+msgstr "Ijslands (is)"
 
 #: ../src/ui/dialog/inkscape-preferences.cpp:532
 msgid "Italian (it)"
@@ -24473,7 +24502,7 @@ msgstr "Zeilen"
 
 #: ../src/ui/widget/font-variants.cpp:58
 msgid "Numeric"
-msgstr ""
+msgstr "Numeriek"
 
 #: ../src/ui/widget/font-variants.cpp:59
 #, fuzzy
@@ -24494,7 +24523,7 @@ msgstr "Proportioneel"
 
 #: ../src/ui/widget/font-variants.cpp:63
 msgid "Tabular"
-msgstr ""
+msgstr "Tabulair"
 
 #: ../src/ui/widget/font-variants.cpp:64
 msgid "Default Width"
@@ -28816,7 +28845,7 @@ msgstr ""
 
 #: ../src/widgets/mesh-toolbar.cpp:478
 msgid "Bicubic"
-msgstr ""
+msgstr "Bicubisch"
 
 #: ../src/widgets/mesh-toolbar.cpp:480
 msgid "Coons"
@@ -32335,12 +32364,11 @@ msgstr "DXF-invoer"
 
 #: ../share/extensions/dxf_input.inx.h:3
 msgid "Method of Scaling:"
-msgstr ""
+msgstr "Schalingsmethode:"
 
 #: ../share/extensions/dxf_input.inx.h:4
-#, fuzzy
 msgid "Manual scale factor:"
-msgstr "Of manuele schalingsfactor gebruiken:"
+msgstr "Manuele schalingsfactor:"
 
 #: ../share/extensions/dxf_input.inx.h:5
 msgid "Manual x-axis origin (mm):"
@@ -32364,7 +32392,6 @@ msgid "Text Font:"
 msgstr "Lettertype tekst:"
 
 #: ../share/extensions/dxf_input.inx.h:11
-#, fuzzy
 msgid ""
 "- AutoCAD Release 13 and newer.\n"
 "- for manual scaling, assume dxf drawing is in mm.\n"
@@ -32376,8 +32403,12 @@ msgid ""
 "- limited support for BLOCKS, use AutoCAD Explode Blocks instead, if needed."
 msgstr ""
 "- AutoCAD versie 13 en nieuwer.\n"
-"- dxf tekening moet in mm zijn.\n"
-"- svg tekening moet in punten zijn, op 90 ppi.\n"
+"- voor manuale schaling, veronderstel dat dxf in mm is.\n"
+"- veronderstel dat svg in pixels is met 96 ppi.\n"
+"- schalingsfactor en oorsprong worden alleen bij manuele schaling "
+"toegepast.\n"
+"- 'Automatic scaling' geeft de breedte van een A4 pagina.\n"
+"- 'Read from file' gebruikt de variabele $MEASUREMENT.\n"
 "- lagen worden enkel behouden bij Bestand->Openen, niet bij Importeren.\n"
 "- beperkte ondersteuning voor BLOCKS, gebruik AutoCAD Explode Blocks indien "
 "nodig."
@@ -32411,14 +32442,12 @@ msgid "Character Encoding:"
 msgstr "Karakterencodering:"
 
 #: ../share/extensions/dxf_outlines.inx.h:7
-#, fuzzy
 msgid "Layer export selection:"
-msgstr "Te exporteren lagen"
+msgstr "Te exporteren lagen:"
 
 #: ../share/extensions/dxf_outlines.inx.h:8
-#, fuzzy
 msgid "Layer match name:"
-msgstr "Naamovereenkomst laag"
+msgstr "Naamovereenkomst laag:"
 
 #: ../share/extensions/dxf_outlines.inx.h:9
 msgid "pt"
@@ -35913,7 +35942,7 @@ msgstr "De te gebruiken commandotaal (Standaard: HPGL)"
 
 #: ../share/extensions/plotter.inx.h:21
 msgid "Initialization commands:"
-msgstr ""
+msgstr "Initialisatiecommando's:"
 
 #: ../share/extensions/plotter.inx.h:22
 msgid ""
diff --git a/share/icons/icons.svg b/share/icons/icons.svg
index 35ef6ab8c..c20164f44 100644
--- a/share/icons/icons.svg
+++ b/share/icons/icons.svg
@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" inkscape:version="0.91 r13725" sodipodi:docname="icons.svg" height="540" width="1250" sodipodi:version="0.32" id="svg1" inkscape:output_extension="org.inkscape.output.svg.inkscape" version="1.0" viewBox="0 0 1250 540">
 <defs id="defs3">
+<marker inkscape:stockid="Arrow1Lstart" orient="auto" refY="0.0" refX="0.0" id="Arrow1Lstart" style="overflow:visible" inkscape:isstock="true">
+<path id="path14867" d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z " style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1" transform="scale(0.8) translate(12.5,0)" />
+</marker>
 <linearGradient id="linearGradient10331">
 <stop style="stop-color:#000000;stop-opacity:1" offset="0" id="stop10333" />
 <stop style="stop-color:#ffffff;stop-opacity:1" offset="1" id="stop10335" />
@@ -867,7 +870,7 @@
 <linearGradient y2="218.5416" x2="173.724" y1="209.14059" x1="163.85941" gradientTransform="matrix(1.102855,0,0,1.148517,-174.5451,-237.7814)" gradientUnits="userSpaceOnUse" id="linearGradient20197" xlink:href="#linearGradient1887" inkscape:collect="always" />
 <linearGradient y2="217.2552" x2="173.0313" y1="207.7552" x1="161.2865" gradientTransform="matrix(1.102855,0,0,1.148517,-175.0966,-238.3557)" gradientUnits="userSpaceOnUse" id="linearGradient20199" xlink:href="#linearGradient3480" inkscape:collect="always" />
 </defs>
-<sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="svg1" inkscape:grid-bbox="true" inkscape:pageopacity="1.0000000" pagecolor="#e8e8e4" snaptoguides="true" showguides="true" inkscape:window-y="27" inkscape:window-x="0" inkscape:window-height="958" inkscape:window-width="1280" inkscape:cy="328.8988" inkscape:cx="391.7387" inkscape:zoom="2.736" gridtolerance="6" snaptogrid="false" showgrid="false" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="8" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="false" objecttolerance="11" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:bbox-nodes="false" inkscape:bbox-paths="false" inkscape:snap-global="false" inkscape:snap-center="false" inkscape:snap-midpoints="false" inkscape:snap-intersection-paths="true" inkscape:object-paths="false" inkscape:snap-object-midpoints="true" inkscape:window-maximized="1" inkscape:snap-grids="true" inkscape:snap-smooth-nodes="false" inkscape:snap-text-baseline="false" inkscape:snap-page="true" inkscape:snap-bbox-midpoints="false" inkscape:snap-bbox-edge-midpoints="false">
+<sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="svg1" inkscape:grid-bbox="true" inkscape:pageopacity="1.0000000" pagecolor="#e8e8e4" snaptoguides="true" showguides="true" inkscape:window-y="27" inkscape:window-x="0" inkscape:window-height="960" inkscape:window-width="1280" inkscape:cy="336.2393" inkscape:cx="537.9384" inkscape:zoom="6.033032" gridtolerance="6" snaptogrid="false" showgrid="false" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="8" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="false" objecttolerance="11" inkscape:snap-bbox="false" inkscape:snap-nodes="true" inkscape:bbox-nodes="false" inkscape:bbox-paths="false" inkscape:snap-global="false" inkscape:snap-center="false" inkscape:snap-midpoints="false" inkscape:snap-intersection-paths="true" inkscape:object-paths="false" inkscape:snap-object-midpoints="true" inkscape:window-maximized="1" inkscape:snap-grids="true" inkscape:snap-smooth-nodes="false" inkscape:snap-text-baseline="false" inkscape:snap-page="true" inkscape:snap-bbox-midpoints="false" inkscape:snap-bbox-edge-midpoints="false">
 <inkscape:grid type="xygrid" id="grid9252" originx="0px" originy="0px" spacingx="0.5px" spacingy="0.5px" empspacing="2" visible="true" enabled="true" snapvisiblegridlinesonly="true" />
 <sodipodi:guide orientation="0,1" position="630.08101,968.02815" id="guide4946" />
 <sodipodi:guide orientation="0,1" position="618.47896,943.93157" id="guide4948" />
@@ -890,7 +893,7 @@ http://www.inkscape.org/</dc:description>
 <dc:title>Inkscape Developers</dc:title>
 </cc:Agent>
 </dc:rights>
-<dc:title></dc:title>
+<dc:title />
 </cc:Work>
 <cc:License rdf:about="http://creativecommons.org/licenses/GPL/2.0/">
 <cc:permits rdf:resource="http://web.resource.org/cc/Reproduction" />
@@ -2812,11 +2815,11 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g style="fill:none" id="draw-ellipse-segment" transform="translate(20)" inkscape:label="#circle_closed_arc">
 <rect id="rect4316" width="16" height="16" x="500" y="150" />
-<path d="M 514,158 A 6,6 0 0 1 509.0419,163.9088 6,6 0 0 1 502.3618,160.0521 6,6 0 0 1 505,152.8038 L 508,158 Z" sodipodi:ry="6" sodipodi:rx="6" sodipodi:cy="158" sodipodi:cx="508" id="path4318" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="4.18879" />
+<path d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 A 6,6 0 0 1 505,152.8038 L 508,158 Z" sodipodi:ry="6" sodipodi:rx="6" sodipodi:cy="158" sodipodi:cx="508" id="path4318" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="4.18879" />
 </g>
 <g transform="translate(40)" id="draw-ellipse-arc" style="fill:none" inkscape:label="#circle_open_arc">
 <rect y="150" x="500" height="16" width="16" id="rect4326" />
-<path sodipodi:end="4.18879" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5" id="path4328" sodipodi:cx="508" sodipodi:cy="158" sodipodi:rx="6" sodipodi:ry="6" d="M 514,158 A 6,6 0 0 1 509.0419,163.9088 6,6 0 0 1 502.3618,160.0521 6,6 0 0 1 505,152.8038" sodipodi:open="true" />
+<path sodipodi:end="4.18879" sodipodi:start="0" sodipodi:type="arc" style="fill:#b0c5da;stroke:#0000ff;stroke-miterlimit:1.5" id="path4328" sodipodi:cx="508" sodipodi:cy="158" sodipodi:rx="6" sodipodi:ry="6" d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 6,6 0 0 1 2.6382,-7.2483" sodipodi:open="true" />
 </g>
 <g id="draw-cuboid" inkscape:label="#draw_3dbox">
 <path style="fill:#ffffff;fill-rule:evenodd;stroke:#000000;stroke-width:1.0492821px;stroke-linejoin:round" d="M 604.0245,114.9402 592.1873,119.5308 591.9578,132.5813 600.8438,138.7786 612.1565,135.1716 612.3859,122.613 604.0245,114.9402 Z" id="path5192" inkscape:connector-curvature="0" />
@@ -2928,7 +2931,7 @@ http://www.inkscape.org/</dc:description>
 <rect y="180.9545" x="-43.13489" height="4.069275" width="4.069275" id="rect4581" style="fill:#b3b3b3" />
 </g>
 <g id="path-effect-parameter-next" inkscape:label="#g10193" transform="translate(15.99998)">
-<path style="fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linejoin:round" d="M 761.9292,60.21135 C 760.6058,64.7918 762.5042,66.77982 762.7922,66.84248 763.4166,66.97833 766.4861,66.03134 767.048,65.34354 766.3456,64.57674 765.5236,64.09613 764.4271,63.34699 763.4713,62.69399 762.2584,61.8005 761.9292,60.21135 Z M 764.4579,59.01822 C 764.2074,59.81446 764.3042,60.66302 764.6999,61.36215 765.0351,61.9564 765.5544,62.39131 766.1623,62.67942 766.6943,62.92592 767.2889,63.04646 767.9134,63.0393 766.4463,62.15387 765.578,61.466 765.0109,60.58979 764.4906,59.78593 764.4536,59.11525 764.4579,59.01822 Z M 767.2562,57.98462 C 766.2903,60.03083 767.6727,60.75869 768.9902,61.0957 767.6785,60.07557 767.0798,58.11396 767.2562,57.98462 Z M 770.782,55.78203 C 770.198,56.11815 770.2734,57.16764 770.004,57.54492 769.4825,58.27512 768.9439,58.39669 769.2239,58.98036 769.5972,59.75861 769.7335,59.35699 770.7399,59.45409 771.0337,59.48243 772.0034,60.42201 772.2901,60.37037 771.3067,58.82615 770.7452,57.40036 770.782,55.78203 Z" id="path9858" inkscape:path-effect="#path-effect9860" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" />
+<path style="fill:#ffffff;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linejoin:round" d="m 761.9292,60.21135 c -1.3234,4.58045 0.575,6.56847 0.863,6.63113 0.6244,0.13585 3.6939,-0.81114 4.2558,-1.49894 -0.7024,-0.7668 -1.5244,-1.24741 -2.6209,-1.99655 -0.9558,-0.653 -2.1687,-1.54649 -2.4979,-3.13564 z m 2.5287,-1.19313 c -0.2505,0.79624 -0.1537,1.6448 0.242,2.34393 0.3352,0.59425 0.8545,1.02916 1.4624,1.31727 0.532,0.2465 1.1266,0.36704 1.7511,0.35988 -1.4671,-0.88543 -2.3354,-1.5733 -2.9025,-2.44951 -0.5203,-0.80386 -0.5573,-1.47454 -0.553,-1.57157 z m 2.7983,-1.0336 c -0.9659,2.04621 0.4165,2.77407 1.734,3.11108 -1.3117,-1.02013 -1.9104,-2.98174 -1.734,-3.11108 z m 3.5258,-2.20259 c -0.584,0.33612 -0.5086,1.38561 -0.778,1.76289 -0.5215,0.7302 -1.0601,0.85177 -0.7801,1.43544 0.3733,0.77825 0.5096,0.37663 1.516,0.47373 0.2938,0.0283 1.2635,0.96792 1.5502,0.91628 -0.9834,-1.54422 -1.5449,-2.97001 -1.5081,-4.58834 z" id="path9858" inkscape:path-effect="#path-effect9860" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" />
 <path sodipodi:nodetypes="cc" id="path9256" d="M 762.5,68.5 C 763.3058,62.01571 768.0747,58.5078 773.5,57.5" style="fill:none;stroke:#008000;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" inkscape:connector-curvature="0" />
 <rect style="fill:none" id="rect9258" width="16" height="16" x="759.9762" y="55.0535" />
 <use xlink:href="#g6043" height="1250" width="1250" id="use9872" y="0" x="0" transform="translate(760,-189)" />
@@ -3422,8 +3425,8 @@ http://www.inkscape.org/</dc:description>
 </g>
 <rect y="174" x="450" height="24" width="24" id="rect3610" style="color:#000000;fill:none;stroke-width:1.0000001" />
 <g id="g6786">
-<path sodipodi:type="star" style="color:#000000;fill:#fffbc5;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" id="path2669" sodipodi:sides="5" sodipodi:cx="103" sodipodi:cy="195" sodipodi:r1="6.158659" sodipodi:r2="3" sodipodi:arg1="-0.122765" sodipodi:arg2="0.5055535" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="M 109.1123,194.2458 105.6247,196.4529 105.6061,200.5801 102.4293,197.9452 98.49833,199.2029 100.0226,195.3674 97.61175,192.0174 101.7305,192.2818 104.1715,188.9538 105.1928,192.9527 Z" transform="matrix(1.492696,-0.0409829,0.0399483,1.455015,302.9314,-91.01218)" />
-<path transform="matrix(1.492696,-0.0409829,0.0399483,1.455015,302.9314,-91.01218)" d="M 107.5277,194.4445 104.9587,196.0598 104.9275,199.1345 102.5973,197.1903 99.66351,198.1107 100.7924,195.2939 99.01048,192.7881 102.0383,192.9913 103.8708,190.5222 104.6132,193.4647 Z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.4959725" sodipodi:arg1="-0.1220787" sodipodi:r2="2.227037" sodipodi:r1="4.561672" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path5971" style="color:#000000;fill:url(#linearGradient6636-2);fill-rule:evenodd;stroke:url(#linearGradient6625-4);stroke-width:0.6782926;stroke-linecap:round;stroke-miterlimit:80" sodipodi:type="star" />
+<path sodipodi:type="star" style="color:#000000;fill:#fffbc5;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0" id="path2669" sodipodi:sides="5" sodipodi:cx="103" sodipodi:cy="195" sodipodi:r1="6.158659" sodipodi:r2="3" sodipodi:arg1="-0.122765" sodipodi:arg2="0.5055535" inkscape:flatsided="false" inkscape:rounded="0" inkscape:randomized="0" d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 z" transform="matrix(1.492696,-0.0409829,0.0399483,1.455015,302.9314,-91.01218)" />
+<path transform="matrix(1.492696,-0.0409829,0.0399483,1.455015,302.9314,-91.01218)" d="m 107.5277,194.4445 -2.569,1.6153 -0.031,3.0747 -2.3302,-1.9442 -2.93379,0.9204 1.12889,-2.8168 -1.78192,-2.5058 3.02782,0.2032 1.8325,-2.4691 0.7424,2.9425 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.4959725" sodipodi:arg1="-0.1220787" sodipodi:r2="2.227037" sodipodi:r1="4.561672" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path5971" style="color:#000000;fill:url(#linearGradient6636-2);fill-rule:evenodd;stroke:url(#linearGradient6625-4);stroke-width:0.6782926;stroke-linecap:round;stroke-miterlimit:80" sodipodi:type="star" />
 </g>
 </g>
 <use xlink:href="#object-columns" inkscape:label="#use5494" height="1250" width="1250" transform="rotate(90,751.5041,292.5041)" id="object-rows" y="0" x="0" />
@@ -3541,7 +3544,7 @@ http://www.inkscape.org/</dc:description>
 <path sodipodi:nodetypes="cccc" id="path5221" d="M -104.982,185.0571 -94.78307,203.1802 -87.9838,196.3841 -104.982,185.0571 Z" style="fill:#000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.9983935;stroke-linecap:round;stroke-linejoin:round" inkscape:connector-curvature="0" />
 </g>
 <g transform="translate(-11.08304,0.9782842)" id="connector-new-connpoint" inkscape:label="#g6061">
-<path sodipodi:end="4.717045" sodipodi:start="3.145564" d="M 578.0001,371.9603 A 10,10 0 0 1 580.9595,364.8985 10,10 0 0 1 588.0466,362.0001 L 588,372 Z" sodipodi:ry="10" sodipodi:rx="10" sodipodi:cy="372" sodipodi:cx="588" id="path6018" style="fill:#b0c5da;fill-rule:evenodd;stroke:#0000ff;stroke-miterlimit:1.5" sodipodi:type="arc" />
+<path sodipodi:end="4.717045" sodipodi:start="3.145564" d="m 578.0001,371.9603 a 10,10 0 0 1 2.9594,-7.0618 10,10 0 0 1 7.0871,-2.8984 L 588,372 Z" sodipodi:ry="10" sodipodi:rx="10" sodipodi:cy="372" sodipodi:cx="588" id="path6018" style="fill:#b0c5da;fill-rule:evenodd;stroke:#0000ff;stroke-miterlimit:1.5" sodipodi:type="arc" />
 <rect y="360.9807" x="577" height="12.01931" width="12.01931" id="rect5199" style="fill:none" />
 <rect style="fill:#ff7777;fill-rule:evenodd;stroke:#ff0000;stroke-width:0.9999995;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-opacity:0.9411765" id="rect5202" width="3" height="3" x="580" y="363" />
 </g>
@@ -3815,8 +3818,8 @@ http://www.inkscape.org/</dc:description>
 <rect style="fill:none" id="rect4326-5" width="16" height="16" x="272" y="304" />
 </g>
 <g id="symbols_old" inkscape:label="#symbols" transform="translate(0.6024061,-0.8334349)">
-<path transform="matrix(1.19879,-0.3146184,0.3093107,1.219499,-108.76,51.0626)" d="M 339.0043,147.223 C 338.4457,147.5641 335.3375,144.7402 334.7054,144.5708 334.0526,144.3959 329.8432,145.2506 329.491,144.6739 329.1499,144.1153 331.9738,141.0071 332.1432,140.375 332.3181,139.7223 331.4634,135.5128 332.0401,135.1606 332.5987,134.8196 335.7069,137.6434 336.339,137.8128 336.9917,137.9877 341.2012,137.133 341.5534,137.7097 341.8944,138.2683 339.0705,141.3765 338.9012,142.0086 338.7263,142.6613 339.581,146.8708 339.0043,147.223 Z" inkscape:randomized="0" inkscape:rounded="0.1295655" inkscape:flatsided="false" sodipodi:arg2="1.807987" sodipodi:arg1="1.047198" sodipodi:r2="3.476299" sodipodi:r1="6.964194" sodipodi:cy="141.1918" sodipodi:cx="335.5222" sodipodi:sides="4" id="path6040-9" style="color:#000000;fill:none;stroke:#c80000;stroke-width:0.7902741;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:0.790274, 0.790274" sodipodi:type="star" />
-<path transform="matrix(1.19879,-0.3146184,0.3093107,1.219499,-106.2295,53.36064)" d="M 339.0043,147.223 C 338.4457,147.5641 335.3375,144.7402 334.7054,144.5708 334.0526,144.3959 329.8432,145.2506 329.491,144.6739 329.1499,144.1153 331.9738,141.0071 332.1432,140.375 332.3181,139.7223 331.4634,135.5128 332.0401,135.1606 332.5987,134.8196 335.7069,137.6434 336.339,137.8128 336.9917,137.9877 341.2012,137.133 341.5534,137.7097 341.8944,138.2683 339.0705,141.3765 338.9012,142.0086 338.7263,142.6613 339.581,146.8708 339.0043,147.223 Z" inkscape:randomized="0" inkscape:rounded="0.1295655" inkscape:flatsided="false" sodipodi:arg2="1.807987" sodipodi:arg1="1.047198" sodipodi:r2="3.476299" sodipodi:r1="6.964194" sodipodi:cy="141.1918" sodipodi:cx="335.5222" sodipodi:sides="4" id="path6040" style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#000000;stroke-width:0.7902742;stroke-linejoin:round;stroke-miterlimit:0" sodipodi:type="star" />
+<path transform="matrix(1.19879,-0.3146184,0.3093107,1.219499,-108.76,51.0626)" d="m 339.0043,147.223 c -0.5586,0.3411 -3.6668,-2.4828 -4.2989,-2.6522 -0.6528,-0.1749 -4.8622,0.6798 -5.2144,0.1031 -0.3411,-0.5586 2.4828,-3.6668 2.6522,-4.2989 0.1749,-0.6527 -0.6798,-4.8622 -0.1031,-5.2144 0.5586,-0.341 3.6668,2.4828 4.2989,2.6522 0.6527,0.1749 4.8622,-0.6798 5.2144,-0.1031 0.341,0.5586 -2.4829,3.6668 -2.6522,4.2989 -0.1749,0.6527 0.6798,4.8622 0.1031,5.2144 z" inkscape:randomized="0" inkscape:rounded="0.1295655" inkscape:flatsided="false" sodipodi:arg2="1.807987" sodipodi:arg1="1.047198" sodipodi:r2="3.476299" sodipodi:r1="6.964194" sodipodi:cy="141.1918" sodipodi:cx="335.5222" sodipodi:sides="4" id="path6040-9" style="color:#000000;fill:none;stroke:#c80000;stroke-width:0.7902741;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:0.790274, 0.790274" sodipodi:type="star" />
+<path transform="matrix(1.19879,-0.3146184,0.3093107,1.219499,-106.2295,53.36064)" d="m 339.0043,147.223 c -0.5586,0.3411 -3.6668,-2.4828 -4.2989,-2.6522 -0.6528,-0.1749 -4.8622,0.6798 -5.2144,0.1031 -0.3411,-0.5586 2.4828,-3.6668 2.6522,-4.2989 0.1749,-0.6527 -0.6798,-4.8622 -0.1031,-5.2144 0.5586,-0.341 3.6668,2.4828 4.2989,2.6522 0.6527,0.1749 4.8622,-0.6798 5.2144,-0.1031 0.341,0.5586 -2.4829,3.6668 -2.6522,4.2989 -0.1749,0.6527 0.6798,4.8622 0.1031,5.2144 z" inkscape:randomized="0" inkscape:rounded="0.1295655" inkscape:flatsided="false" sodipodi:arg2="1.807987" sodipodi:arg1="1.047198" sodipodi:r2="3.476299" sodipodi:r1="6.964194" sodipodi:cy="141.1918" sodipodi:cx="335.5222" sodipodi:sides="4" id="path6040" style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#000000;stroke-width:0.7902742;stroke-linejoin:round;stroke-miterlimit:0" sodipodi:type="star" />
 </g>
 <g transform="translate(10.12068,24.83988)" inkscape:label="#symbols" id="symbols">
 <rect style="color:#000000;fill:#ff07f5;fill-opacity:0;fill-rule:evenodd;stroke-width:0.9868108" id="rect14677" width="16" height="16" x="319.423" y="108.194" />
@@ -3856,7 +3859,7 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g transform="translate(30.12068,84.83988)" inkscape:label="#symbols" id="symbol-fit">
 <rect style="color:#000000;fill:url(#linearGradient15175-8);fill-rule:evenodd;stroke:#3465a4;stroke-width:1.0000001;stroke-linecap:square;stroke-dasharray:1.0000001, 2.0000002" id="rect11107" width="16" height="16" x="319.6498" y="108.194" />
-<path transform="matrix(2.894146,0,0,2.833322,-656.743,-353.6308)" d="M 341.3078,163.0209 A 3.963478,4.113043 0 0 1 337.3443,167.1339 L 337.3443,163.0209 Z" sodipodi:ry="4.113043" sodipodi:rx="3.963478" sodipodi:cy="163.0209" sodipodi:cx="337.3443" id="path11111" style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#000000;stroke-width:0.3492142;stroke-linejoin:round;stroke-miterlimit:0" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="1.570796" />
+<path transform="matrix(2.894146,0,0,2.833322,-656.743,-353.6308)" d="m 341.3078,163.0209 a 3.963478,4.113043 0 0 1 -3.9635,4.113 l 0,-4.113 z" sodipodi:ry="4.113043" sodipodi:rx="3.963478" sodipodi:cy="163.0209" sodipodi:cx="337.3443" id="path11111" style="color:#000000;fill:#99b7d6;fill-opacity:0.7019608;fill-rule:evenodd;stroke:#000000;stroke-width:0.3492142;stroke-linejoin:round;stroke-miterlimit:0" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="1.570796" />
 <ellipse style="color:#000000;fill:none;stroke:#c80000;stroke-width:0.9166215;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:0.9166215, 0.9166215" id="path11051-8" transform="matrix(1.101789,0,0,1.080243,-44.03243,-59.90819)" cx="337.3443" cy="163.0209" rx="3.963478" ry="4.113043" />
 </g>
 <g id="pack-more">
@@ -3954,4 +3957,12 @@ http://www.inkscape.org/</dc:description>
 <path style="fill:none;stroke:#c8c8c8;stroke-width:1px;stroke-linecap:square" d="m 12.5,14.5 0,-9" id="path5602-7" />
 <path style="fill:#ffffff;fill-rule:evenodd;stroke:url(#linearGradient5799-9);stroke-width:1px;stroke-linecap:round;stroke-linejoin:round" d="m 9.5,0.5 4,4 -4,0 0,-4 z" id="path4681-4" />
 </g>
+<g transform="translate(236.3605,-335.8446)" id="flatten_simplify" inkscape:label="#flatten_simplify">
+<rect y="536.7323" x="282.5811" height="15.721" width="15.721" id="rect13989" style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" />
+<path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="M 530.5332 205.6113 A 1.9925 2.080405 0 0 0 528.6133 207.1426 C 527.6704 207.4134 526.7115 207.8353 525.7988 208.5332 C 525.5735 208.7058 525.3617 208.8398 525.1465 208.9844 A 1.9925 2.080405 0 0 0 523.8516 208.4824 A 1.9925 2.080405 0 0 0 521.8672 210.3984 C 520.9451 210.5699 520.1488 210.5515 519.4629 210.5469 L 519.4512 212.0469 C 520.1403 212.0516 521.1103 212.0612 522.2676 211.8223 A 1.9925 2.080405 0 0 0 523.8516 212.6445 A 1.9925 2.080405 0 0 0 525.8438 210.5645 A 1.9925 2.080405 0 0 0 525.8281 210.3281 C 526.1184 210.1416 526.4096 209.954 526.709 209.7246 C 527.3764 209.2142 528.069 208.8737 528.7617 208.6484 A 1.9925 2.080405 0 0 0 530.5332 209.7734 A 1.9925 2.080405 0 0 0 532.4453 208.2656 C 533.1733 208.2979 533.843 208.3555 534.3984 208.3555 L 534.3984 206.8555 C 533.9353 206.8555 533.1903 206.7721 532.3047 206.7402 A 1.9925 2.080405 0 0 0 530.5332 205.6113 z M 530.5332 206.7246 A 0.9260918 0.9669491 0 0 1 531.459 207.6914 A 0.9260918 0.9669491 0 0 1 530.5332 208.6582 A 0.9260918 0.9669491 0 0 1 529.6055 207.6914 A 0.9260918 0.9669491 0 0 1 530.5332 206.7246 z M 523.8516 209.5957 A 0.9260918 0.9669491 0 0 1 524.7773 210.5645 A 0.9260918 0.9669491 0 0 1 523.8516 211.5312 A 0.9260918 0.9669491 0 0 1 522.9258 210.5645 A 0.9260918 0.9669491 0 0 1 523.8516 209.5957 z " transform="translate(-236.3605,335.8446)" id="path14280" />
+</g>
+<g inkscape:label="#interactive_simplify" id="interactive_simplify" transform="translate(215.9205,-334.4098)">
+<rect style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect17937-7" width="15.721" height="15.721" x="284.9688" y="535.6099" />
+<path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 290.1793,536.2979 c -0.7351,-0.02 -1.3963,0.2336 -1.8416,0.7418 -0.4453,0.5079 -0.6453,1.1819 -0.7277,1.8733 -0.165,1.3827 0.089,2.9888 0.3519,4.5721 0.2625,1.5832 0.5439,3.1441 0.5465,4.1601 0,0.5079 -0.082,0.854 -0.1453,0.9691 -0.064,0.115 -0.041,0.1361 -0.3174,0.1282 -0.6247,-0.018 -0.8383,-0.2559 -1.06,-0.7845 -0.2217,-0.5286 -0.3197,-1.3858 -0.2995,-2.2749 0.041,-1.7782 0.1181,-2.1383 0.1181,-2.1383 l -1.3819,-0.012 c 0,0 -0.034,0.44 -0.081,2.4977 -0.023,1.0288 -0.041,1.7085 0.3488,2.6369 0.3896,0.9284 1.2262,1.6826 2.3192,1.7143 0.6352,0.018 1.2607,-0.3347 1.5691,-0.8922 0.3084,-0.5575 0.3684,-1.1856 0.3668,-1.8493 0,-1.3269 -0.3139,-2.9046 -0.5719,-4.461 -0.258,-1.5566 -0.4523,-3.0895 -0.3384,-4.044 0.057,-0.4774 0.1784,-0.773 0.3189,-0.9332 0.1403,-0.1602 0.3293,-0.2738 0.7905,-0.2615 0.4549,0.012 0.691,0.1248 0.822,0.2393 0.131,0.1144 0.2075,0.2532 0.262,0.5316 0.109,0.5566 -0.012,1.5867 -0.2126,2.6612 -0.2001,1.0747 -0.4614,2.1843 -0.4372,3.2167 0.012,0.5163 0.098,1.0527 0.4133,1.5075 0.3153,0.4549 0.8398,0.7126 1.3954,0.7452 0.4606,0.027 0.881,-0.051 1.2367,-0.2735 0.3557,-0.2231 0.6121,-0.5902 0.7531,-0.9588 0.282,-0.7375 0.2377,-1.4817 0.2126,-2.157 -0.025,-0.6754 -0.041,-1.301 0.021,-1.5725 0.031,-0.1358 0.056,-0.155 0.057,-0.1555 6e-4,-6e-4 0.022,-0.034 0.2006,-0.029 0.218,0 0.2382,0.043 0.271,0.074 0.033,0.031 0.092,0.1224 0.1947,0.323 0.1022,0.2006 0.2482,0.5079 0.5375,0.7743 0.2893,0.2664 0.7035,0.4386 1.1723,0.4614 1.6094,-0.2758 2.284,-1.0042 3.4062,-0.084 l 0,-1.6613 c -1.4875,-0.7361 -2.2939,-0.161 -3.3448,0.1059 -0.2401,-0.012 -0.2878,-0.059 -0.3309,-0.099 -0.043,-0.04 -0.1003,-0.1294 -0.1991,-0.3231 -0.099,-0.1938 -0.2357,-0.493 -0.5181,-0.7606 -0.2825,-0.2676 -0.6959,-0.4362 -1.1528,-0.4495 -0.4137,-0.012 -0.8221,0.1078 -1.1305,0.388 -0.3084,0.2805 -0.4715,0.6683 -0.5524,1.0255 -0.162,0.7142 -0.091,1.4129 -0.067,2.0545 0.024,0.6418 -0.01,1.2067 -0.093,1.4289 -0.043,0.1112 -0.066,0.1378 -0.1273,0.176 -0.061,0.038 -0.1963,0.09 -0.4716,0.074 -0.2756,-0.016 -0.3064,-0.07 -0.3429,-0.1231 -0.037,-0.053 -0.098,-0.2166 -0.1048,-0.535 -0.015,-0.6367 0.2002,-1.72 0.4073,-2.8321 0.2071,-1.1119 0.4237,-2.265 0.2096,-3.3586 -0.1071,-0.5468 -0.3582,-1.0977 -0.792,-1.4767 -0.434,-0.379 -1.0001,-0.5617 -1.6605,-0.5794 z" id="path14318-5-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccccccccccsccccccccccccccccccccc" />
+</g>
 </svg>
diff --git a/share/icons/symbolic_icons.svg b/share/icons/symbolic_icons.svg
index bc385f460..1f301f85c 100644
--- a/share/icons/symbolic_icons.svg
+++ b/share/icons/symbolic_icons.svg
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
 
-<svg xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1320" height="660" id="svg15638" version="1.1" inkscape:version="0.91+devel r14057" sodipodi:docname="symbolic_icons.svg" viewBox="0 0 1320 660">
+<svg xmlns:osb="http://www.openswatchbook.org/uri/2009/osb" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://creativecommons.org/ns#" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="1320" height="660" id="svg15638" version="1.1" inkscape:version="0.91 r13725" sodipodi:docname="symbolic_icons.svg" viewBox="0 0 1320 660">
 <title id="title9623">Inkscape Icon Theme</title>
 <defs id="defs15640">
 <inkscape:path-effect effect="spiro" id="path-effect36695" is_visible="true" />
@@ -9,7 +9,7 @@
 <stop style="stop-color:#666666;stop-opacity:1;" offset="0" id="stop19284" />
 </linearGradient>
 </defs>
-<sodipodi:namedview id="base" pagecolor="#f2f2f2" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="3.041115" inkscape:cx="355.7796" inkscape:cy="392.3716" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1280" inkscape:window-height="958" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="false" inkscape:bbox-nodes="true" inkscape:snap-global="false" showguides="false" inkscape:guide-bbox="true" inkscape:snap-nodes="false" inkscape:snap-object-midpoints="false" inkscape:snap-grids="true" inkscape:snap-to-guides="true" borderlayer="true" inkscape:showpageshadow="false" showborder="true" inkscape:snap-bbox-edge-midpoints="false" inkscape:object-nodes="true" inkscape:snap-intersection-paths="false" inkscape:snap-center="true">
+<sodipodi:namedview id="base" pagecolor="#f2f2f2" bordercolor="#666666" borderopacity="1.0" inkscape:pageopacity="1" inkscape:pageshadow="2" inkscape:zoom="0.7602788" inkscape:cx="508.2177" inkscape:cy="342.3573" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="false" inkscape:window-width="1280" inkscape:window-height="960" inkscape:window-x="0" inkscape:window-y="27" inkscape:window-maximized="1" inkscape:snap-bbox="true" inkscape:bbox-paths="false" inkscape:bbox-nodes="true" inkscape:snap-global="false" showguides="false" inkscape:guide-bbox="true" inkscape:snap-nodes="false" inkscape:snap-object-midpoints="false" inkscape:snap-grids="true" inkscape:snap-to-guides="true" borderlayer="true" inkscape:showpageshadow="false" showborder="true" inkscape:snap-bbox-edge-midpoints="false" inkscape:object-nodes="true" inkscape:snap-intersection-paths="false" inkscape:snap-center="true">
 <inkscape:grid type="xygrid" id="grid15646" empspacing="5" visible="true" enabled="true" snapvisiblegridlinesonly="true" />
 </sodipodi:namedview>
 <metadata id="metadata15643">
@@ -3613,5 +3613,13 @@
 <path inkscape:connector-curvature="0" style="fill:url(#linearGradient19282)" d="m 14,3 0,1 c 0,0.25689 -0.12983,0.52846 -0.3125,0.71875 L 12.40645,6 13.6877,7.28125 C 13.87037,7.47154 14.0002,7.74311 14.0002,8 l 0,1 -1,0 C 12.69075,9 12.44788,8.9097 12.2502,8.71875 L 9.593948,6 12.2502,3.28125 C 12.44788,3.0903 12.69075,3 13,3 l 1,0 z" id="path43166" />
 </g>
 </g>
+<g inkscape:label="#interactive_simplify" id="interactive_simplify" transform="translate(65.81134,177.1615)">
+<rect style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect17937-7" width="15.721" height="15.721" x="284.9688" y="535.6099" />
+<path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#666666;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 290.1793,536.2979 c -0.7351,-0.02 -1.3963,0.2336 -1.8416,0.7418 -0.4453,0.5079 -0.6453,1.1819 -0.7277,1.8733 -0.165,1.3827 0.089,2.9888 0.3519,4.5721 0.2625,1.5832 0.5439,3.1441 0.5465,4.1601 0,0.5079 -0.082,0.854 -0.1453,0.9691 -0.064,0.115 -0.041,0.1361 -0.3174,0.1282 -0.6247,-0.018 -0.8383,-0.2559 -1.06,-0.7845 -0.2217,-0.5286 -0.3197,-1.3858 -0.2995,-2.2749 0.041,-1.7782 0.1181,-2.1383 0.1181,-2.1383 l -1.3819,-0.012 c 0,0 -0.034,0.44 -0.081,2.4977 -0.023,1.0288 -0.041,1.7085 0.3488,2.6369 0.3896,0.9284 1.2262,1.6826 2.3192,1.7143 0.6352,0.018 1.2607,-0.3347 1.5691,-0.8922 0.3084,-0.5575 0.3684,-1.1856 0.3668,-1.8493 0,-1.3269 -0.3139,-2.9046 -0.5719,-4.461 -0.258,-1.5566 -0.4523,-3.0895 -0.3384,-4.044 0.057,-0.4774 0.1784,-0.773 0.3189,-0.9332 0.1403,-0.1602 0.3293,-0.2738 0.7905,-0.2615 0.4549,0.012 0.691,0.1248 0.822,0.2393 0.131,0.1144 0.2075,0.2532 0.262,0.5316 0.109,0.5566 -0.012,1.5867 -0.2126,2.6612 -0.2001,1.0747 -0.4614,2.1843 -0.4372,3.2167 0.012,0.5163 0.098,1.0527 0.4133,1.5075 0.3153,0.4549 0.8398,0.7126 1.3954,0.7452 0.4606,0.027 0.881,-0.051 1.2367,-0.2735 0.3557,-0.2231 0.6121,-0.5902 0.7531,-0.9588 0.282,-0.7375 0.2377,-1.4817 0.2126,-2.157 -0.025,-0.6754 -0.041,-1.301 0.021,-1.5725 0.031,-0.1358 0.056,-0.155 0.057,-0.1555 6e-4,-6e-4 0.022,-0.034 0.2006,-0.029 0.218,0 0.2382,0.043 0.271,0.074 0.033,0.031 0.092,0.1224 0.1947,0.323 0.1022,0.2006 0.2482,0.5079 0.5375,0.7743 0.2893,0.2664 0.7035,0.4386 1.1723,0.4614 1.6094,-0.2758 2.284,-1.0042 3.4062,-0.084 l 0,-1.6613 c -1.4875,-0.7361 -2.2939,-0.161 -3.3448,0.1059 -0.2401,-0.012 -0.2878,-0.059 -0.3309,-0.099 -0.043,-0.04 -0.1003,-0.1294 -0.1991,-0.3231 -0.099,-0.1938 -0.2357,-0.493 -0.5181,-0.7606 -0.2825,-0.2676 -0.6959,-0.4362 -1.1528,-0.4495 -0.4137,-0.012 -0.8221,0.1078 -1.1305,0.388 -0.3084,0.2805 -0.4715,0.6683 -0.5524,1.0255 -0.162,0.7142 -0.091,1.4129 -0.067,2.0545 0.024,0.6418 -0.01,1.2067 -0.093,1.4289 -0.043,0.1112 -0.066,0.1378 -0.1273,0.176 -0.061,0.038 -0.1963,0.09 -0.4716,0.074 -0.2756,-0.016 -0.3064,-0.07 -0.3429,-0.1231 -0.037,-0.053 -0.098,-0.2166 -0.1048,-0.535 -0.015,-0.6367 0.2002,-1.72 0.4073,-2.8321 0.2071,-1.1119 0.4237,-2.265 0.2096,-3.3586 -0.1071,-0.5468 -0.3582,-1.0977 -0.792,-1.4767 -0.434,-0.379 -1.0001,-0.5617 -1.6605,-0.5794 z" id="path14318-5-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccccccccccsccccccccccccccccccccc" />
+</g>
+<g transform="translate(95.92986,175.9614)" id="flatten_simplify" inkscape:label="#flatten_simplify">
+<rect y="536.7323" x="282.5811" height="15.721" width="15.721" id="rect13989" style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" />
+<path inkscape:connector-curvature="0" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#666666;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 530.5332,205.6113 a 1.9925,2.080405 0 0 0 -1.9199,1.5313 c -0.9429,0.2708 -1.9018,0.6927 -2.8145,1.3906 -0.2253,0.1726 -0.4371,0.3066 -0.6523,0.4512 a 1.9925,2.080405 0 0 0 -1.2949,-0.502 1.9925,2.080405 0 0 0 -1.9844,1.916 c -0.9221,0.1715 -1.7184,0.1531 -2.4043,0.1485 l -0.012,1.5 c 0.6891,0 1.6591,0.014 2.8164,-0.2246 a 1.9925,2.080405 0 0 0 1.584,0.8222 1.9925,2.080405 0 0 0 1.9922,-2.08 1.9925,2.080405 0 0 0 -0.016,-0.2364 c 0.2903,-0.1865 0.5815,-0.3741 0.8809,-0.6035 0.6674,-0.5104 1.36,-0.8509 2.0527,-1.0762 a 1.9925,2.080405 0 0 0 1.7715,1.125 1.9925,2.080405 0 0 0 1.9121,-1.5078 c 0.728,0.032 1.3977,0.09 1.9531,0.09 l 0,-1.5 c -0.4631,0 -1.2081,-0.083 -2.0937,-0.1153 a 1.9925,2.080405 0 0 0 -1.7715,-1.1289 z m 0,1.1133 a 0.9260918,0.9669491 0 0 1 0.9258,0.9668 0.9260918,0.9669491 0 0 1 -0.9258,0.9668 0.9260918,0.9669491 0 0 1 -0.9277,-0.9668 0.9260918,0.9669491 0 0 1 0.9277,-0.9668 z m -6.6816,2.8711 a 0.9260918,0.9669491 0 0 1 0.9257,0.9688 0.9260918,0.9669491 0 0 1 -0.9257,0.9667 0.9260918,0.9669491 0 0 1 -0.9258,-0.9667 0.9260918,0.9669491 0 0 1 0.9258,-0.9688 z" transform="translate(-236.3605,335.8446)" id="path14280" />
+</g>
 </g>
 </svg>
diff --git a/share/icons/tango_icons.svg b/share/icons/tango_icons.svg
index c1da77e79..9a96e1f8f 100644
--- a/share/icons/tango_icons.svg
+++ b/share/icons/tango_icons.svg
@@ -2306,7 +2306,7 @@
 <stop id="stop1015-3" offset="1.0000000" style="stop-color:#3a7801;stop-opacity:1.0000000;" />
 </linearGradient>
 </defs>
-<sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="layer3" inkscape:grid-bbox="true" inkscape:pageopacity="1" pagecolor="#f8f5f2" snaptoguides="true" showguides="true" inkscape:window-y="27" inkscape:window-x="0" inkscape:window-height="958" inkscape:window-width="1280" inkscape:cy="1390.131" inkscape:cx="1284.967" inkscape:zoom="3.54647" gridtolerance="10000" snaptogrid="false" showgrid="true" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="19" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="true" objecttolerance="10" inkscape:snap-bbox="true" inkscape:snap-nodes="false" showborder="false" inkscape:showpageshadow="false" inkscape:snap-center="false" inkscape:snap-intersection-grid-guide="false" inkscape:snap-guide="false" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-global="true" inkscape:object-paths="true" inkscape:window-maximized="1" width="0px" height="0px" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:snap-intersection-paths="true">
+<sodipodi:namedview inkscape:guide-bbox="true" inkscape:current-layer="layer3" inkscape:grid-bbox="true" inkscape:pageopacity="1" pagecolor="#f8f5f2" snaptoguides="true" showguides="true" inkscape:window-y="27" inkscape:window-x="0" inkscape:window-height="960" inkscape:window-width="1280" inkscape:cy="1181.158" inkscape:cx="1078.706" inkscape:zoom="0.3134666" gridtolerance="10000" snaptogrid="false" showgrid="true" id="base" inkscape:document-units="px" inkscape:grid-points="true" guidetolerance="19" fill="#8ab3de" stroke="#646464" inkscape:object-nodes="true" objecttolerance="10" inkscape:snap-bbox="true" inkscape:snap-nodes="false" showborder="false" inkscape:showpageshadow="false" inkscape:snap-center="false" inkscape:snap-intersection-grid-guide="false" inkscape:snap-guide="false" inkscape:bbox-paths="true" inkscape:bbox-nodes="true" inkscape:snap-global="true" inkscape:object-paths="true" inkscape:window-maximized="1" width="0px" height="0px" fit-margin-top="0" fit-margin-left="0" fit-margin-right="0" fit-margin-bottom="0" inkscape:snap-intersection-paths="true">
 <inkscape:grid type="xygrid" id="grid12302" empspacing="24" dotted="false" color="#009bcc" opacity="0.1254902" empcolor="#0019cc" empopacity="0.25098039" spacingx="0px" spacingy="0px" originx="0px" originy="0px" visible="true" enabled="true" snapvisiblegridlinesonly="true" />
 <inkscape:grid id="GridFromPre046Settings" type="xygrid" originx="0px" originy="0.0000000px" spacingx="0.5px" spacingy="0.5px" color="#0000ff" empcolor="#0000ff" opacity="0.2" empopacity="0.4" empspacing="2" visible="false" enabled="true" snapvisiblegridlinesonly="true" />
 </sodipodi:namedview>
@@ -3755,11 +3755,11 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g style="fill:none" id="ink_circle_closed_arc" transform="translate(772,314)">
 <rect style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect4316" width="16" height="16" x="500" y="150" />
-<path d="M 514,158 A 6,6 0 0 1 509.0419,163.9088 6,6 0 0 1 502.3618,160.0521 6,6 0 0 1 505,152.8038 L 508,158 Z" sodipodi:ry="6" sodipodi:rx="6" sodipodi:cy="158" sodipodi:cx="508" id="path4318" style="opacity:1;fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="4.18879" />
+<path d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 A 6,6 0 0 1 505,152.8038 L 508,158 Z" sodipodi:ry="6" sodipodi:rx="6" sodipodi:cy="158" sodipodi:cx="508" id="path4318" style="opacity:1;fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" sodipodi:type="arc" sodipodi:start="0" sodipodi:end="4.18879" />
 </g>
 <g transform="translate(796,314)" id="ink_circle_open_arc" style="fill:none">
 <rect y="150" x="500" height="16" width="16" id="rect4326" style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
-<path sodipodi:end="4.18879" sodipodi:start="0" sodipodi:type="arc" style="opacity:1;fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4328" sodipodi:cx="508" sodipodi:cy="158" sodipodi:rx="6" sodipodi:ry="6" d="M 514,158 A 6,6 0 0 1 509.0419,163.9088 6,6 0 0 1 502.3618,160.0521 6,6 0 0 1 505,152.8038" sodipodi:open="true" />
+<path sodipodi:end="4.18879" sodipodi:start="0" sodipodi:type="arc" style="opacity:1;fill:#b0c5da;fill-opacity:1;fill-rule:nonzero;stroke:#0000ff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="path4328" sodipodi:cx="508" sodipodi:cy="158" sodipodi:rx="6" sodipodi:ry="6" d="m 514,158 a 6,6 0 0 1 -4.9581,5.9088 6,6 0 0 1 -6.6801,-3.8567 6,6 0 0 1 2.6382,-7.2483" sodipodi:open="true" />
 </g>
 <g id="ink_reset_circle" style="fill:none" transform="translate(820,314)">
 <rect y="150" x="500" height="16" width="16" id="rect4298" style="opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
@@ -3770,8 +3770,8 @@ http://www.inkscape.org/</dc:description>
 <g id="ink_draw_star" transform="matrix(1.004126,0,0,0.991974,993.4835,362.9361)">
 <path sodipodi:nodetypes="cccccc" id="path6584" d="M 122.024,189.9035 114.2846,189.9035 112.0734,182.2929 118.1543,177.4004 124.2353,182.2929 122.024,189.9035 Z" style="display:inline;fill:url(#linearGradient6605);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6607);stroke-width:1.0019727;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" inkscape:connector-curvature="0" />
 <path sodipodi:nodetypes="cccccc" id="star" d="M 122.8187,190.9423 113.4891,190.9423 110.8234,182.0013 118.1539,176.2535 125.4844,182.0013 122.8187,190.9423 Z" style="display:inline;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6582);stroke-width:1.0019715;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" inkscape:connector-curvature="0" />
-<path transform="matrix(1.486562,-0.0413145,0.0397842,1.466787,-36.46434,-92.69225)" d="M 109.1123,194.2458 105.6247,196.4529 105.6061,200.5801 102.4293,197.9452 98.49833,199.2029 100.0226,195.3674 97.61175,192.0174 101.7305,192.2818 104.1715,188.9538 105.1928,192.9527 Z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path2669" style="display:inline;opacity:1;fill:#fffbc5;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" sodipodi:type="star" />
-<path transform="matrix(1.106952,-0.0266213,0.028269,1.152858,4.878699,-33.10438)" d="M 108.9792,194.2505 105.5454,196.2514 105.5605,200.4549 102.5964,197.8076 98.60329,199.1208 100.2051,195.4837 97.72221,192.0919 101.6763,192.4914 104.1349,189.0819 104.9768,192.9659 Z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path6609" style="display:inline;opacity:1;fill:url(#linearGradient6636);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6625);stroke-width:0.8866972;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" sodipodi:type="star" />
+<path transform="matrix(1.486562,-0.0413145,0.0397842,1.466787,-36.46434,-92.69225)" d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path2669" style="display:inline;opacity:1;fill:#fffbc5;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6644);stroke-width:0.6782926;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" sodipodi:type="star" />
+<path transform="matrix(1.106952,-0.0266213,0.028269,1.152858,4.878699,-33.10438)" d="m 108.9792,194.2505 -3.4338,2.0009 0.015,4.2035 -2.9641,-2.6473 -3.99311,1.3132 1.60181,-3.6371 -2.48289,-3.3918 3.95409,0.3995 2.4586,-3.4095 0.8419,3.884 z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path6609" style="display:inline;opacity:1;fill:url(#linearGradient6636);fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient6625);stroke-width:0.8866972;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" sodipodi:type="star" />
 <rect y="174.4641" x="109.9999" height="24.19418" width="23.90138" id="rect3610" style="display:inline;opacity:1;fill:none;fill-opacity:0.0169492;fill-rule:evenodd;stroke:none;stroke-width:1.0000001;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" />
 </g>
 <g id="ink_draw_spiral" inkscape:label="#draw_arc" transform="translate(1019,458)">
@@ -5284,6 +5284,14 @@ http://www.inkscape.org/</dc:description>
 <ellipse transform="matrix(0.8723531,0,0,0.8723531,2.360048,9.005643)" ry="6.515604" rx="6.611154" cy="207.5353" cx="18.48884" id="ellipse47674" style="color:#000000;text-decoration:none;text-decoration-line:none;display:inline;overflow:visible;visibility:visible;fill:none;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;enable-background:accumulate" />
 <rect y="182.0497" x="10.48885" height="15.99999" width="15.99999" id="rect47676" style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:0.531496;marker:none" />
 </g>
+<g inkscape:label="#interactive_simplify" id="interactive_simplify" transform="translate(-164.9688,0.669076)">
+<rect style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect17937-7" width="15.721" height="15.721" x="284.9688" y="535.6099" />
+<path style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;paint-order:normal;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 290.1793,536.2979 c -0.7351,-0.02 -1.3963,0.2336 -1.8416,0.7418 -0.4453,0.5079 -0.6453,1.1819 -0.7277,1.8733 -0.165,1.3827 0.089,2.9888 0.3519,4.5721 0.2625,1.5832 0.5439,3.1441 0.5465,4.1601 0,0.5079 -0.082,0.854 -0.1453,0.9691 -0.064,0.115 -0.041,0.1361 -0.3174,0.1282 -0.6247,-0.018 -0.8383,-0.2559 -1.06,-0.7845 -0.2217,-0.5286 -0.3197,-1.3858 -0.2995,-2.2749 0.041,-1.7782 0.1181,-2.1383 0.1181,-2.1383 l -1.3819,-0.012 c 0,0 -0.034,0.44 -0.081,2.4977 -0.023,1.0288 -0.041,1.7085 0.3488,2.6369 0.3896,0.9284 1.2262,1.6826 2.3192,1.7143 0.6352,0.018 1.2607,-0.3347 1.5691,-0.8922 0.3084,-0.5575 0.3684,-1.1856 0.3668,-1.8493 0,-1.3269 -0.3139,-2.9046 -0.5719,-4.461 -0.258,-1.5566 -0.4523,-3.0895 -0.3384,-4.044 0.057,-0.4774 0.1784,-0.773 0.3189,-0.9332 0.1403,-0.1602 0.3293,-0.2738 0.7905,-0.2615 0.4549,0.012 0.691,0.1248 0.822,0.2393 0.131,0.1144 0.2075,0.2532 0.262,0.5316 0.109,0.5566 -0.012,1.5867 -0.2126,2.6612 -0.2001,1.0747 -0.4614,2.1843 -0.4372,3.2167 0.012,0.5163 0.098,1.0527 0.4133,1.5075 0.3153,0.4549 0.8398,0.7126 1.3954,0.7452 0.4606,0.027 0.881,-0.051 1.2367,-0.2735 0.3557,-0.2231 0.6121,-0.5902 0.7531,-0.9588 0.282,-0.7375 0.2377,-1.4817 0.2126,-2.157 -0.025,-0.6754 -0.041,-1.301 0.021,-1.5725 0.031,-0.1358 0.056,-0.155 0.057,-0.1555 6e-4,-6e-4 0.022,-0.034 0.2006,-0.029 0.218,0 0.2382,0.043 0.271,0.074 0.033,0.031 0.092,0.1224 0.1947,0.323 0.1022,0.2006 0.2482,0.5079 0.5375,0.7743 0.2893,0.2664 0.7035,0.4386 1.1723,0.4614 1.6094,-0.2758 2.284,-1.0042 3.4062,-0.084 l 0,-1.6613 c -1.4875,-0.7361 -2.2939,-0.161 -3.3448,0.1059 -0.2401,-0.012 -0.2878,-0.059 -0.3309,-0.099 -0.043,-0.04 -0.1003,-0.1294 -0.1991,-0.3231 -0.099,-0.1938 -0.2357,-0.493 -0.5181,-0.7606 -0.2825,-0.2676 -0.6959,-0.4362 -1.1528,-0.4495 -0.4137,-0.012 -0.8221,0.1078 -1.1305,0.388 -0.3084,0.2805 -0.4715,0.6683 -0.5524,1.0255 -0.162,0.7142 -0.091,1.4129 -0.067,2.0545 0.024,0.6418 -0.01,1.2067 -0.093,1.4289 -0.043,0.1112 -0.066,0.1378 -0.1273,0.176 -0.061,0.038 -0.1963,0.09 -0.4716,0.074 -0.2756,-0.016 -0.3064,-0.07 -0.3429,-0.1231 -0.037,-0.053 -0.098,-0.2166 -0.1048,-0.535 -0.015,-0.6367 0.2002,-1.72 0.4073,-2.8321 0.2071,-1.1119 0.4237,-2.265 0.2096,-3.3586 -0.1071,-0.5468 -0.3582,-1.0977 -0.792,-1.4767 -0.434,-0.379 -1.0001,-0.5617 -1.6605,-0.5794 z" id="path14318-5-3" inkscape:connector-curvature="0" sodipodi:nodetypes="cccccccccccccccccccccsccccccccccccsccccccccccccccccccccc" />
+</g>
+<g transform="translate(-138.3021,-0.7322998)" id="flatten_simplify" inkscape:label="#flatten_simplify">
+<rect y="536.7323" x="282.5811" height="15.721" width="15.721" id="rect13989" style="color:#000000;display:inline;fill:none;stroke:none;stroke-width:1;marker:none" />
+<path inkscape:connector-curvature="0" style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;white-space:normal;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate" d="m 530.5332,205.6113 a 1.9925,2.080405 0 0 0 -1.9199,1.5313 c -0.9429,0.2708 -1.9018,0.6927 -2.8145,1.3906 -0.2253,0.1726 -0.4371,0.3066 -0.6523,0.4512 a 1.9925,2.080405 0 0 0 -1.2949,-0.502 1.9925,2.080405 0 0 0 -1.9844,1.916 c -0.9221,0.1715 -1.7184,0.1531 -2.4043,0.1485 l -0.012,1.5 c 0.6891,0 1.6591,0.014 2.8164,-0.2246 a 1.9925,2.080405 0 0 0 1.584,0.8222 1.9925,2.080405 0 0 0 1.9922,-2.08 1.9925,2.080405 0 0 0 -0.016,-0.2364 c 0.2903,-0.1865 0.5815,-0.3741 0.8809,-0.6035 0.6674,-0.5104 1.36,-0.8509 2.0527,-1.0762 a 1.9925,2.080405 0 0 0 1.7715,1.125 1.9925,2.080405 0 0 0 1.9121,-1.5078 c 0.728,0.032 1.3977,0.09 1.9531,0.09 l 0,-1.5 c -0.4631,0 -1.2081,-0.083 -2.0937,-0.1153 a 1.9925,2.080405 0 0 0 -1.7715,-1.1289 z m 0,1.1133 a 0.9260918,0.9669491 0 0 1 0.9258,0.9668 0.9260918,0.9669491 0 0 1 -0.9258,0.9668 0.9260918,0.9669491 0 0 1 -0.9277,-0.9668 0.9260918,0.9669491 0 0 1 0.9277,-0.9668 z m -6.6816,2.8711 a 0.9260918,0.9669491 0 0 1 0.9257,0.9688 0.9260918,0.9669491 0 0 1 -0.9257,0.9667 0.9260918,0.9669491 0 0 1 -0.9258,-0.9667 0.9260918,0.9669491 0 0 1 0.9258,-0.9688 z" transform="translate(-236.3605,335.8446)" id="path14280" />
+</g>
 </g>
 <g inkscape:groupmode="layer" id="layer2" inkscape:label="tango" style="display:inline">
 <g id="g1885" transform="translate(1994.005,528.8767)" style="fill:#767676;fill-opacity:1;stroke:#000000" />
@@ -6633,8 +6641,8 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g style="display:inline;opacity:1" id="star_angled" transform="translate(0,-4)">
 <rect style="display:inline;opacity:1;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:1.5;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" id="rect11798" width="16" height="16" x="1296" y="562" />
-<path transform="matrix(1.281336,-0.0360118,0.0342919,1.278526,1164.898,324.7687)" d="M 109.1123,194.2458 105.6247,196.4529 105.6061,200.5801 102.4293,197.9452 98.49833,199.2029 100.0226,195.3674 97.61175,192.0174 101.7305,192.2818 104.1715,188.9538 105.1928,192.9527 Z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8412" style="display:inline;overflow:visible;visibility:visible;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.7809988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="star" />
-<path transform="matrix(0.9659898,-0.0226454,0.0246692,0.9806753,1199.236,381.5034)" d="M 108.9792,194.2505 105.5454,196.2514 105.5605,200.4549 102.5964,197.8076 98.60329,199.1208 100.2051,195.4837 97.72221,192.0919 101.6763,192.4914 104.1349,189.0819 104.9768,192.9659 Z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8414" style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1.0271252;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="star" />
+<path transform="matrix(1.281336,-0.0360118,0.0342919,1.278526,1164.898,324.7687)" d="m 109.1123,194.2458 -3.4876,2.2071 -0.019,4.1272 -3.1768,-2.6349 -3.93097,1.2577 1.52427,-3.8355 -2.41085,-3.35 4.11875,0.2644 2.441,-3.328 1.0213,3.9989 z" inkscape:randomized="0" inkscape:rounded="0" inkscape:flatsided="false" sodipodi:arg2="0.5055535" sodipodi:arg1="-0.122765" sodipodi:r2="3" sodipodi:r1="6.158659" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8412" style="display:inline;overflow:visible;visibility:visible;fill:#babdb6;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.7809988;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="star" />
+<path transform="matrix(0.9659898,-0.0226454,0.0246692,0.9806753,1199.236,381.5034)" d="m 108.9792,194.2505 -3.4338,2.0009 0.015,4.2035 -2.9641,-2.6473 -3.99311,1.3132 1.60181,-3.6371 -2.48289,-3.3918 3.95409,0.3995 2.4586,-3.4095 0.8419,3.884 z" inkscape:randomized="0" inkscape:rounded="3.469447e-18" inkscape:flatsided="false" sodipodi:arg2="0.4569409" sodipodi:arg1="-0.1246996" sodipodi:r2="2.836428" sodipodi:r1="6.025959" sodipodi:cy="195" sodipodi:cx="103" sodipodi:sides="5" id="path8414" style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#eeeeec;stroke-width:1.0271252;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="star" />
 </g>
 <g id="node_delete">
 <rect y="192" x="1296" height="16" width="16" id="rect20349" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient14191);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.8678862;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
@@ -6949,9 +6957,9 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g id="outset_path" transform="translate(-48)">
 <rect y="392" x="672" height="16" width="16" id="rect12819" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0.2;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
-<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient12951);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4619088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12764" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="M 663,394 A 8,4.5 0 0 1 671,398.5 L 663,398.5 Z" transform="matrix(1.625,0,0,2.888889,-405.375,-743.2222)" sodipodi:start="4.712389" sodipodi:end="6.283185" />
-<path sodipodi:open="true" sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.500003,0,0,2.666662,-322.0019,-655.1647)" d="M 663,394 A 8,4.5 0 0 1 671,398.5" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12762" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
-<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.5454546;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12766" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="M 663,394 A 8,4.5 0 0 1 671,398.5" transform="matrix(1.375001,0,0,2.444443,-239.1254,-566.6103)" sodipodi:start="4.712389" sodipodi:end="6.283185" sodipodi:open="true" />
+<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient12951);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4619088;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12764" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="m 663,394 a 8,4.5 0 0 1 8,4.5 l -8,0 z" transform="matrix(1.625,0,0,2.888889,-405.375,-743.2222)" sodipodi:start="4.712389" sodipodi:end="6.283185" />
+<path sodipodi:open="true" sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.500003,0,0,2.666662,-322.0019,-655.1647)" d="m 663,394 a 8,4.5 0 0 1 8,4.5" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12762" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.5;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
+<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.5454546;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12766" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="m 663,394 a 8,4.5 0 0 1 8,4.5" transform="matrix(1.375001,0,0,2.444443,-239.1254,-566.6103)" sodipodi:start="4.712389" sodipodi:end="6.283185" sodipodi:open="true" />
 <g transform="rotate(45,671.215,394.2407)" id="g12809">
 <path sodipodi:nodetypes="cccccccc" id="path12778" d="M 679.4997,388.5 679.4997,386.4988 677.4989,386.4988 681.4993,381.4946 685.4998,386.4988 683.5067,386.4988 683.5067,388.5 679.4997,388.5 Z" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient12953);fill-opacity:1;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000865;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" inkscape:connector-curvature="0" />
 <path style="display:inline;overflow:visible;visibility:visible;opacity:0.5080214;fill:url(#radialGradient12955);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" d="M 678.606,385.994 680.0008,385.994 680.0008,388.0007 682.2062,388.0007 C 683.0911,384.6964 681.995,384.883 680.7342,383.6215 L 678.606,385.994 Z" id="path12780" sodipodi:nodetypes="cccccc" inkscape:connector-curvature="0" />
@@ -6960,9 +6968,9 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g id="inset_path" transform="translate(-48)">
 <rect style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0.2;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="rect12822" width="16" height="16" x="672" y="416" />
-<path sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.875,0,0,3.333333,-571.125,-896.3333)" d="M 663,394 A 8,4.5 0 0 1 671,398.5 L 663,398.5 Z" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12824" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient12945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4003209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
-<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.3999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12826" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="M 663,394 A 8,4.5 0 0 1 671,398.5" transform="matrix(1.875002,0,0,3.333333,-570.6267,-896.833)" sodipodi:start="4.712389" sodipodi:end="6.283185" sodipodi:open="true" />
-<path sodipodi:open="true" sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.750001,0,0,3.111109,-487.7504,-808.277)" d="M 663,394 A 8,4.5 0 0 1 671,398.5" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12828" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.4285715;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
+<path sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.875,0,0,3.333333,-571.125,-896.3333)" d="m 663,394 a 8,4.5 0 0 1 8,4.5 l -8,0 z" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12824" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:url(#radialGradient12945);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4003209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
+<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.3999998;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12826" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="m 663,394 a 8,4.5 0 0 1 8,4.5" transform="matrix(1.875002,0,0,3.333333,-570.6267,-896.833)" sodipodi:start="4.712389" sodipodi:end="6.283185" sodipodi:open="true" />
+<path sodipodi:open="true" sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.750001,0,0,3.111109,-487.7504,-808.277)" d="m 663,394 a 8,4.5 0 0 1 8,4.5" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12828" style="display:inline;overflow:visible;visibility:visible;opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.4285715;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
 <g id="g12830" transform="rotate(-135,688.4212,405.7953)">
 <path style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient12947);fill-opacity:1;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000865;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" d="M 679.4997,388.5 679.4997,386.4988 677.4989,386.4988 681.4993,381.4946 685.4998,386.4988 683.5067,386.4988 683.5067,388.5 679.4997,388.5 Z" id="path12832" sodipodi:nodetypes="cccccccc" inkscape:connector-curvature="0" />
 <path sodipodi:nodetypes="cccccc" id="path12834" d="M 678.606,385.994 680.0008,385.994 680.0008,388.0007 682.2062,388.0007 C 683.0911,384.6964 681.995,384.883 680.7342,383.6215 L 678.606,385.994 Z" style="display:inline;overflow:visible;visibility:visible;opacity:0.5080214;fill:url(#radialGradient12949);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" inkscape:connector-curvature="0" />
@@ -6971,9 +6979,9 @@ http://www.inkscape.org/</dc:description>
 </g>
 <g id="dynamic_offset" transform="translate(-48)">
 <rect y="440" x="672" height="16" width="16" id="rect12875" style="display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:0;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:2, 1;stroke-dashoffset:0.2;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" />
-<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient12943);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4003209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12877" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="M 663,394 A 8,4.5 0 0 1 671,398.5 L 663,398.5 Z" transform="matrix(1.75,0,0,3.111109,-488.25,-783.7769)" sodipodi:start="4.712389" sodipodi:end="6.283185" />
-<path sodipodi:open="true" sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.750003,0,0,3.111111,-487.7519,-784.2779)" d="M 663,394 A 8,4.5 0 0 1 671,398.5" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12879" style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.428571;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
-<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.4615388;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12881" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="M 663,394 A 8,4.5 0 0 1 671,398.5" transform="matrix(1.624997,0,0,2.88889,-404.873,-695.7228)" sodipodi:start="4.712389" sodipodi:end="6.283185" sodipodi:open="true" />
+<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient12943);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.4003209;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12877" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="m 663,394 a 8,4.5 0 0 1 8,4.5 l -8,0 z" transform="matrix(1.75,0,0,3.111109,-488.25,-783.7769)" sodipodi:start="4.712389" sodipodi:end="6.283185" />
+<path sodipodi:open="true" sodipodi:end="6.283185" sodipodi:start="4.712389" transform="matrix(1.750003,0,0,3.111111,-487.7519,-784.2779)" d="m 663,394 a 8,4.5 0 0 1 8,4.5" sodipodi:ry="4.5" sodipodi:rx="8" sodipodi:cy="398.5" sodipodi:cx="663" id="path12879" style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.428571;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" sodipodi:type="arc" />
+<path sodipodi:type="arc" style="display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.4615388;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" id="path12881" sodipodi:cx="663" sodipodi:cy="398.5" sodipodi:rx="8" sodipodi:ry="4.5" d="m 663,394 a 8,4.5 0 0 1 8,4.5" transform="matrix(1.624997,0,0,2.88889,-404.873,-695.7228)" sodipodi:start="4.712389" sodipodi:end="6.283185" sodipodi:open="true" />
 <use style="display:inline" height="2000" width="2000" transform="translate(-597,240)" id="use12905" xlink:href="#node" y="0" x="0" />
 </g>
 <g id="linked_offset">
@@ -7852,7 +7860,7 @@ http://www.inkscape.org/</dc:description>
 </g>
 </g>
 <g id="ink_edit_next_parameter" inkscape:label="#g10193" transform="translate(967.978,108.9465)">
-<path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="M 761.9292,60.21135 C 760.6058,64.7918 762.5042,66.77982 762.7922,66.84248 763.4166,66.97833 766.4861,66.03134 767.048,65.34354 766.3456,64.57674 765.5236,64.09613 764.4271,63.34699 763.4713,62.69399 762.2584,61.8005 761.9292,60.21135 Z M 764.4579,59.01822 C 764.2074,59.81446 764.3042,60.66302 764.6999,61.36215 765.0351,61.9564 765.5544,62.39131 766.1623,62.67942 766.6943,62.92592 767.2889,63.04646 767.9134,63.0393 766.4463,62.15387 765.578,61.466 765.0109,60.58979 764.4906,59.78593 764.4536,59.11525 764.4579,59.01822 Z M 767.2562,57.98462 C 766.2903,60.03083 767.6727,60.75869 768.9902,61.0957 767.6785,60.07557 767.0798,58.11396 767.2562,57.98462 Z M 770.782,55.78203 C 770.198,56.11815 770.2734,57.16764 770.004,57.54492 769.4825,58.27512 768.9439,58.39669 769.2239,58.98036 769.5972,59.75861 769.7335,59.35699 770.7399,59.45409 771.0337,59.48243 772.0034,60.42201 772.2901,60.37037 771.3067,58.82615 770.7452,57.40036 770.782,55.78203 Z" id="path9858" inkscape:path-effect="#path-effect9860" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" />
+<path style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:#4d4d4d;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1" d="m 761.9292,60.21135 c -1.3234,4.58045 0.575,6.56847 0.863,6.63113 0.6244,0.13585 3.6939,-0.81114 4.2558,-1.49894 -0.7024,-0.7668 -1.5244,-1.24741 -2.6209,-1.99655 -0.9558,-0.653 -2.1687,-1.54649 -2.4979,-3.13564 z m 2.5287,-1.19313 c -0.2505,0.79624 -0.1537,1.6448 0.242,2.34393 0.3352,0.59425 0.8545,1.02916 1.4624,1.31727 0.532,0.2465 1.1266,0.36704 1.7511,0.35988 -1.4671,-0.88543 -2.3354,-1.5733 -2.9025,-2.44951 -0.5203,-0.80386 -0.5573,-1.47454 -0.553,-1.57157 z m 2.7983,-1.0336 c -0.9659,2.04621 0.4165,2.77407 1.734,3.11108 -1.3117,-1.02013 -1.9104,-2.98174 -1.734,-3.11108 z m 3.5258,-2.20259 c -0.584,0.33612 -0.5086,1.38561 -0.778,1.76289 -0.5215,0.7302 -1.0601,0.85177 -0.7801,1.43544 0.3733,0.77825 0.5096,0.37663 1.516,0.47373 0.2938,0.0283 1.2635,0.96792 1.5502,0.91628 -0.9834,-1.54422 -1.5449,-2.97001 -1.5081,-4.58834 z" id="path9858" inkscape:path-effect="#path-effect9860" inkscape:original-d="M 762.7922,66.84248 C 763.6022,63.11924 765.4886,60.07306 771.5388,58.08446" sodipodi:nodetypes="cc" inkscape:connector-curvature="0" />
 <path sodipodi:nodetypes="cc" id="path9256" d="M 762.5,68.5 C 763.3058,62.01571 768.0747,58.5078 773.5,57.5" style="fill:none;stroke:#008000;stroke-width:1.0000002;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0;stroke-dasharray:none;stroke-opacity:1" inkscape:connector-curvature="0" />
 <rect style="display:inline;fill:none;stroke:none;stroke-width:1;marker:none" id="rect9258" width="16" height="16" x="759.9762" y="55.0535" />
 <use transform="translate(760,-189)" x="0" y="0" xlink:href="#g6043" id="use9872" width="1250" height="1250" />
diff --git a/src/knot.cpp b/src/knot.cpp
index b3813ab53..bfc0c4f0b 100644
--- a/src/knot.cpp
+++ b/src/knot.cpp
@@ -206,6 +206,8 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
         return true;
     }
 
+    bool key_press_event_unconsumed = FALSE;
+
     knot_ref(knot);
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
@@ -213,158 +215,163 @@ static int sp_knot_handler(SPCanvasItem */*item*/, GdkEvent *event, SPKnot *knot
 
     switch (event->type) {
     case GDK_2BUTTON_PRESS:
-            if (event->button.button == 1) {
-                knot->doubleclicked_signal.emit(knot, event->button.state);
+        if (event->button.button == 1) {
+            knot->doubleclicked_signal.emit(knot, event->button.state);
 
-                grabbed = FALSE;
-                moved = FALSE;
-                consumed = TRUE;
-            }
-            break;
+            grabbed = FALSE;
+            moved = FALSE;
+            consumed = TRUE;
+        }
+        break;
     case GDK_BUTTON_PRESS:
-            if ((event->button.button == 1) && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
-                Geom::Point const p = knot->desktop->w2d(Geom::Point(event->button.x, event->button.y));
-                knot->startDragging(p, (gint) event->button.x, (gint) event->button.y, event->button.time);
+        if ((event->button.button == 1) && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
+            Geom::Point const p = knot->desktop->w2d(Geom::Point(event->button.x, event->button.y));
+            knot->startDragging(p, (gint) event->button.x, (gint) event->button.y, event->button.time);
 
-                consumed = TRUE;
-            }
-            break;
+            consumed = TRUE;
+        }
+        break;
     case GDK_BUTTON_RELEASE:
-            if (event->button.button == 1 && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
-                // If we have any pending snap event, then invoke it now
-                if (knot->desktop->event_context->_delayed_snap_event) {
-                    sp_event_context_snap_watchdog_callback(knot->desktop->event_context->_delayed_snap_event);
-                }
-
-                sp_event_context_discard_delayed_snap_event(knot->desktop->event_context);
-
-                knot->pressure = 0;
-
-                if (transform_escaped) {
-                    transform_escaped = false;
-                    consumed = TRUE;
-                } else {
-                    knot->setFlag(SP_KNOT_GRABBED, FALSE);
-
-                    if (!nograb) {
-                        sp_canvas_item_ungrab(knot->item, event->button.time);
-                    }
+        if (event->button.button == 1 && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
+            // If we have any pending snap event, then invoke it now
+            if (knot->desktop->event_context->_delayed_snap_event) {
+                sp_event_context_snap_watchdog_callback(knot->desktop->event_context->_delayed_snap_event);
+            }
 
-                    if (moved) {
-                        knot->setFlag(SP_KNOT_DRAGGING, FALSE);
+            sp_event_context_discard_delayed_snap_event(knot->desktop->event_context);
 
-                        knot->ungrabbed_signal.emit(knot, event->button.state);
-                    } else {
-                        knot->click_signal.emit(knot, event->button.state);
-                    }
+            knot->pressure = 0;
 
-                    grabbed = FALSE;
-                    moved = FALSE;
-                    consumed = TRUE;
-                }
-            }
-            if (tools_isactive(knot->desktop, TOOLS_NODES)) {
-                Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(knot->desktop->event_context);
-                nt->update_helperpath();
-            }
-            break;
-    case GDK_MOTION_NOTIFY:
-            if (grabbed && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
+            if (transform_escaped) {
+                transform_escaped = false;
                 consumed = TRUE;
+            } else {
+                knot->setFlag(SP_KNOT_GRABBED, FALSE);
 
-                if ( within_tolerance
-                     && ( abs( (gint) event->motion.x - xp ) < tolerance )
-                     && ( abs( (gint) event->motion.y - yp ) < tolerance ) ) {
-                    break; // do not drag if we're within tolerance from origin
+                if (!nograb) {
+                    sp_canvas_item_ungrab(knot->item, event->button.time);
                 }
 
-                // Once the user has moved farther than tolerance from the original location
-                // (indicating they intend to move the object, not click), then always process the
-                // motion notify coordinates as given (no snapping back to origin)
-                within_tolerance = false;
+                if (moved) {
+                    knot->setFlag(SP_KNOT_DRAGGING, FALSE);
 
-                if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &knot->pressure)) {
-                    knot->pressure = CLAMP (knot->pressure, 0, 1);
+                    knot->ungrabbed_signal.emit(knot, event->button.state);
                 } else {
-                    knot->pressure = 0.5;
+                    knot->click_signal.emit(knot, event->button.state);
                 }
 
-                if (!moved) {
-                    knot->grabbed_signal.emit(knot, event->motion.state);
+                grabbed = FALSE;
+                moved = FALSE;
+                consumed = TRUE;
+            }
+        }
+        if (tools_isactive(knot->desktop, TOOLS_NODES)) {
+            Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(knot->desktop->event_context);
+            nt->update_helperpath();
+        }
+        break;
+    case GDK_MOTION_NOTIFY:
+        if (grabbed && knot->desktop && knot->desktop->event_context && !knot->desktop->event_context->space_panning) {
+            consumed = TRUE;
 
-                    knot->setFlag(SP_KNOT_DRAGGING, TRUE);
-                }
+            if ( within_tolerance
+                 && ( abs( (gint) event->motion.x - xp ) < tolerance )
+                 && ( abs( (gint) event->motion.y - yp ) < tolerance ) ) {
+                break; // do not drag if we're within tolerance from origin
+            }
+
+            // Once the user has moved farther than tolerance from the original location
+            // (indicating they intend to move the object, not click), then always process the
+            // motion notify coordinates as given (no snapping back to origin)
+            within_tolerance = false;
 
-                sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, knot, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::KNOT_HANDLER);
-                sp_knot_handler_request_position(event, knot);
-                moved = TRUE;
+            if (gdk_event_get_axis (event, GDK_AXIS_PRESSURE, &knot->pressure)) {
+                knot->pressure = CLAMP (knot->pressure, 0, 1);
+            } else {
+                knot->pressure = 0.5;
             }
-            if (tools_isactive(knot->desktop, TOOLS_NODES)) {
-                Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(knot->desktop->event_context);
-                nt->update_helperpath();
+
+            if (!moved) {
+                knot->grabbed_signal.emit(knot, event->motion.state);
+
+                knot->setFlag(SP_KNOT_DRAGGING, TRUE);
             }
-            break;
+
+            sp_event_context_snap_delay_handler(knot->desktop->event_context, NULL, knot, (GdkEventMotion *)event, Inkscape::UI::Tools::DelayedSnapEvent::KNOT_HANDLER);
+            sp_knot_handler_request_position(event, knot);
+            moved = TRUE;
+        }
+        if (tools_isactive(knot->desktop, TOOLS_NODES)) {
+            Inkscape::UI::Tools::NodeTool *nt = static_cast<Inkscape::UI::Tools::NodeTool*>(knot->desktop->event_context);
+            nt->update_helperpath();
+        }
+        break;
     case GDK_ENTER_NOTIFY:
-            knot->setFlag(SP_KNOT_MOUSEOVER, TRUE);
-            knot->setFlag(SP_KNOT_GRABBED, FALSE);
+        knot->setFlag(SP_KNOT_MOUSEOVER, TRUE);
+        knot->setFlag(SP_KNOT_GRABBED, FALSE);
 
-            if (knot->tip && knot->desktop && knot->desktop->event_context) {
-                knot->desktop->event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, knot->tip);
-            }
+        if (knot->tip && knot->desktop && knot->desktop->event_context) {
+            knot->desktop->event_context->defaultMessageContext()->set(Inkscape::NORMAL_MESSAGE, knot->tip);
+        }
 
-            grabbed = FALSE;
-            moved = FALSE;
-            consumed = TRUE;
-            break;
+        grabbed = FALSE;
+        moved = FALSE;
+        consumed = TRUE;
+        break;
     case GDK_LEAVE_NOTIFY:
-            knot->setFlag(SP_KNOT_MOUSEOVER, FALSE);
-            knot->setFlag(SP_KNOT_GRABBED, FALSE);
+        knot->setFlag(SP_KNOT_MOUSEOVER, FALSE);
+        knot->setFlag(SP_KNOT_GRABBED, FALSE);
 
-            if (knot->tip && knot->desktop && knot->desktop->event_context) {
-                knot->desktop->event_context->defaultMessageContext()->clear();
-            }
+        if (knot->tip && knot->desktop && knot->desktop->event_context) {
+            knot->desktop->event_context->defaultMessageContext()->clear();
+        }
 
-            grabbed = FALSE;
-            moved = FALSE;
-            consumed = TRUE;
-            break;
+        grabbed = FALSE;
+        moved = FALSE;
+        consumed = TRUE;
+        break;
     case GDK_KEY_PRESS: // keybindings for knot
-            switch (Inkscape::UI::Tools::get_group0_keyval(&event->key)) {
-                case GDK_KEY_Escape:
-                            knot->setFlag(SP_KNOT_GRABBED, FALSE);
-
-                            if (!nograb) {
-                                sp_canvas_item_ungrab(knot->item, event->button.time);
-                            }
-
-                            if (moved) {
-                                knot->setFlag(SP_KNOT_DRAGGING, FALSE);
-
-                                knot->ungrabbed_signal.emit(knot, event->button.state);
-
-                                DocumentUndo::undo(knot->desktop->getDocument());
-                                knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
-                                transform_escaped = true;
-                                consumed = TRUE;
-                            }
-
-                            grabbed = FALSE;
-                            moved = FALSE;
-
-                            sp_event_context_discard_delayed_snap_event(knot->desktop->event_context);
-                            break;
-                default:
-                            consumed = FALSE;
-                            break;
-                    }
-                    break;
+        switch (Inkscape::UI::Tools::get_group0_keyval(&event->key)) {
+            case GDK_KEY_Escape:
+                knot->setFlag(SP_KNOT_GRABBED, FALSE);
+
+                if (!nograb) {
+                    sp_canvas_item_ungrab(knot->item, event->button.time);
+                }
+
+                if (moved) {
+                    knot->setFlag(SP_KNOT_DRAGGING, FALSE);
+
+                    knot->ungrabbed_signal.emit(knot, event->button.state);
+
+                    DocumentUndo::undo(knot->desktop->getDocument());
+                    knot->desktop->messageStack()->flash(Inkscape::NORMAL_MESSAGE, _("Node or handle drag canceled."));
+                    transform_escaped = true;
+                    consumed = TRUE;
+                }
+
+                grabbed = FALSE;
+                moved = FALSE;
+
+                sp_event_context_discard_delayed_snap_event(knot->desktop->event_context);
+                break;
+            default:
+                consumed = FALSE;
+                key_press_event_unconsumed = TRUE;
+                break;
+        }
+        break;
     default:
-            break;
+        break;
     }
 
     knot_unref(knot);
 
-    return consumed || grabbed;
+    if (key_press_event_unconsumed) {
+        return false; // e.g. in case "%" was pressed to toggle snapping, or Q for quick zoom (while dragging a handle)
+    } else {
+        return  consumed || grabbed;
+    }
 }
 
 void sp_knot_handler_request_position(GdkEvent *event, SPKnot *knot) {
diff --git a/src/live_effects/lpe-simplify.cpp b/src/live_effects/lpe-simplify.cpp
index 265192a17..f6842a030 100644
--- a/src/live_effects/lpe-simplify.cpp
+++ b/src/live_effects/lpe-simplify.cpp
@@ -82,6 +82,7 @@ LPESimplify::newWidget()
 {
     // use manage here, because after deletion of Effect object, others might still be pointing to this widget.
     Gtk::VBox * vbox = Gtk::manage( new Gtk::VBox(Effect::newWidget()) );
+    
     vbox->set_border_width(5);
     vbox->set_homogeneous(false);
     vbox->set_spacing(2);
diff --git a/src/sp-factory.cpp b/src/sp-factory.cpp
index 55e673c4a..84329eaaf 100644
--- a/src/sp-factory.cpp
+++ b/src/sp-factory.cpp
@@ -297,7 +297,7 @@ SPObject *SPFactory::createObject(std::string const& id)
     else if (id.empty()) // comments
         {}
     else {
-        fprintf(stderr, "WARNING: unknown type: %s", id.c_str());
+        fprintf(stderr, "WARNING: unknown type: %s\n", id.c_str());
     }
 
     return ret;
diff --git a/src/sp-filter-primitive.cpp b/src/sp-filter-primitive.cpp
index 1f85c8193..b18850914 100644
--- a/src/sp-filter-primitive.cpp
+++ b/src/sp-filter-primitive.cpp
@@ -194,7 +194,9 @@ Inkscape::XML::Node* SPFilterPrimitive::write(Inkscape::XML::Document *doc, Inks
 
 int sp_filter_primitive_read_in(SPFilterPrimitive *prim, gchar const *name)
 {
-    if (!name) return Inkscape::Filters::NR_FILTER_SLOT_NOT_SET;
+    if (!name || !prim){
+        return Inkscape::Filters::NR_FILTER_SLOT_NOT_SET;
+    }
     // TODO: are these case sensitive or not? (assumed yes)
     switch (name[0]) {
         case 'S':
diff --git a/src/sp-item.cpp b/src/sp-item.cpp
index 410fd9b37..4937e6c76 100644
--- a/src/sp-item.cpp
+++ b/src/sp-item.cpp
@@ -351,8 +351,8 @@ void SPItem::lowerToBottom() {
 
     SPObject * bottom=parent->firstChild();
     while(dynamic_cast<SPObject*>(bottom) && dynamic_cast<SPObject*>(bottom->next) && bottom!=this && !is_item(*(bottom->next))) bottom=bottom->next;
-    if (bottom) {
-        Inkscape::XML::Node *ref = ( bottom ? bottom->getRepr() : NULL );
+    if (bottom && bottom != this) {
+        Inkscape::XML::Node *ref = bottom->getRepr() ;
         parent->getRepr()->changeOrder(getRepr(), ref);
     }
 }
diff --git a/src/text-editing.cpp b/src/text-editing.cpp
index 050e223eb..d9cebc625 100644
--- a/src/text-editing.cpp
+++ b/src/text-editing.cpp
@@ -1805,6 +1805,14 @@ static bool tidy_operator_redundant_semi_nesting(SPObject **item, bool /*has_tex
     return false;
 }
 
+
+/* tidy_operator_styled_whitespace commented out: not only did it have bugs, 
+ * but it did *not* preserve the rendering: spaces in different font sizes, 
+ * for instance, have different width, so moving them out of tspans changes 
+ * the document. cf https://bugs.launchpad.net/inkscape/+bug/1477723
+*/
+
+#if 0
 /** helper for tidy_operator_styled_whitespace(), finds the last string object
 in a paragraph which is not \a not_obj. */
 static SPString* find_last_string_child_not_equal_to(SPObject *root, SPObject *not_obj)
@@ -1883,6 +1891,7 @@ static bool tidy_operator_styled_whitespace(SPObject **item, bool has_text_decor
     delete_obj->deleteObject();
     return true;
 }
+#endif
 
 /* possible tidy operators that are not yet implemented, either because
 they are difficult, occur infrequently, or because I'm not sure that the
@@ -1917,8 +1926,7 @@ static bool tidy_xml_tree_recursively(SPObject *root, bool has_text_decoration)
         tidy_operator_repeated_spans,
         tidy_operator_excessive_nesting,
         tidy_operator_redundant_double_nesting,
-        tidy_operator_redundant_semi_nesting,
-        tidy_operator_styled_whitespace
+        tidy_operator_redundant_semi_nesting
     };
     bool changes = false;
 
diff --git a/src/ui/tools/freehand-base.cpp b/src/ui/tools/freehand-base.cpp
index e8cbfcdbf..fa45d8dbb 100644
--- a/src/ui/tools/freehand-base.cpp
+++ b/src/ui/tools/freehand-base.cpp
@@ -20,7 +20,9 @@
 # include "config.h"
 #endif
 
+#include "live_effects/lpe-bendpath.h"
 #include "live_effects/lpe-patternalongpath.h"
+#include "live_effects/lpe-simplify.h"
 #include "display/canvas-bpath.h"
 #include "xml/repr.h"
 #include "svg/svg.h"
@@ -266,12 +268,53 @@ static void spdc_apply_powerstroke_shape(const std::vector<Geom::Point> & points
     lpe->getRepr()->setAttribute("offset_points", s.str().c_str());
 }
 
+static void spdc_apply_bend_shape(gchar const *svgd, FreehandBase *dc, SPItem *item)
+{
+    using namespace Inkscape::LivePathEffect;
+    if(!SP_LPE_ITEM(item)->hasPathEffectOfType(BEND_PATH)){
+        Effect::createAndApply(BEND_PATH, dc->desktop->doc(), item);
+    }
+    Effect* lpe = SP_LPE_ITEM(item)->getCurrentLPE();
+
+    // write bend parameters:
+    lpe->getRepr()->setAttribute("bendpath", svgd);
+    lpe->getRepr()->setAttribute("prop_scale", "1");
+    lpe->getRepr()->setAttribute("scale_y_rel", "false");
+    lpe->getRepr()->setAttribute("vertical", "false");
+}
+
+static void spdc_apply_simplify(std::string threshold, FreehandBase *dc, SPItem *item)
+{
+    using namespace Inkscape::LivePathEffect;
+
+    Effect::createAndApply(SIMPLIFY, dc->desktop->doc(), item);
+    Effect* lpe = SP_LPE_ITEM(item)->getCurrentLPE();
+    // write powerstroke parameters:
+    lpe->getRepr()->setAttribute("steps", "1");
+    lpe->getRepr()->setAttribute("threshold", threshold);
+    lpe->getRepr()->setAttribute("smooth_angles", "360");
+    lpe->getRepr()->setAttribute("helper_size", "0");
+    lpe->getRepr()->setAttribute("simplifyindividualpaths", "false");
+    lpe->getRepr()->setAttribute("simplifyJustCoalesce", "false");
+}
+
+enum shapeType { NONE, TRIANGLE_IN, TRIANGLE_OUT, ELLIPSE, CLIPBOARD, BEND_CLIPBOARD, LAST_APPLIED };
+static shapeType previous_shape_type = NONE;
+
 static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item, SPCurve *curve)
 {
     using namespace Inkscape::LivePathEffect;
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     if (item && SP_IS_LPE_ITEM(item)) {
+        bool simplify = prefs->getInt(tool_name(dc) + "/simplify", 0);
+        if(simplify){
+            double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0);
+            tol = tol/(100.0*(102.0-tol));
+            std::ostringstream ss;
+            ss << tol;
+            spdc_apply_simplify(ss.str(), dc, item);
+        }
         if (prefs->getInt(tool_name(dc) + "/freehand-mode", 0) == 1) {
             Effect::createAndApply(SPIRO, dc->desktop->doc(), item);
         }
@@ -281,22 +324,25 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
         }
 
         //Store the clipboard path to apply in the future without the use of clipboard
+
         static Geom::PathVector previous_shape_pathv;
-        enum shapeType { NONE, TRIANGLE_IN, TRIANGLE_OUT, ELLIPSE, CLIPBOARD, LAST_APPLIED };
-        static shapeType previous_shape_type = NONE;
+        
 
 
         shapeType shape = (shapeType)prefs->getInt(tool_name(dc) + "/shape", 0);
         bool shape_applied = false;
         SPCSSAttr *css_item = sp_css_attr_from_object(item, SP_STYLE_FLAG_ALWAYS);
         const char *cstroke = sp_repr_css_property(css_item, "stroke", "none");
+        static SPItem *bend_item;
 
 #define SHAPE_LENGTH 10
 #define SHAPE_HEIGHT 10
 
+
         if(shape == LAST_APPLIED){
+
             shape = previous_shape_type;
-            if(shape == CLIPBOARD){
+            if(shape == CLIPBOARD || shape == BEND_CLIPBOARD){
                 shape = LAST_APPLIED;
             }
         }
@@ -356,15 +402,52 @@ static void spdc_check_for_and_apply_waiting_LPE(FreehandBase *dc, SPItem *item,
                 shape_applied = true;
                 break;
             }
+            case BEND_CLIPBOARD:
+            {
+                Inkscape::UI::ClipboardManager *cm = Inkscape::UI::ClipboardManager::get();
+                if(cm->paste(SP_ACTIVE_DESKTOP,true) == true){
+                    gchar const *svgd = item->getRepr()->attribute("d");
+                    Geom::PathVector path =  sp_svg_read_pathv(svgd);
+                    path *= item->i2doc_affine().inverse();
+                    svgd = sp_svg_write_path( path );
+                    bend_item = dc->selection->singleItem();
+                    bend_item->moveTo(item,false);
+                    spdc_apply_bend_shape(svgd, dc, bend_item);
+                    bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+                    dc->selection->add(SP_OBJECT(bend_item));
+                } else {
+                    shape = NONE;
+                }
+                break;
+            }
             case LAST_APPLIED:
             {
-                if(previous_shape_pathv.size() != 0){
-                    SPCurve * c = new SPCurve();
-                    c->set_pathvector(previous_shape_pathv);
-                    spdc_paste_curve_as_freehand_shape(c, dc, item);
-                    c->unref();
-
-                    shape_applied = true;
+                if(previous_shape_type == CLIPBOARD){
+                    if(previous_shape_pathv.size() != 0){
+                        SPCurve * c = new SPCurve();
+                        c->set_pathvector(previous_shape_pathv);
+                        spdc_paste_curve_as_freehand_shape(c, dc, item);
+                        c->unref();
+
+                        shape_applied = true;
+                    }
+                    shape = CLIPBOARD;
+                } else {
+                    if(bend_item != NULL && bend_item->getRepr() != NULL){
+                        gchar const *svgd = item->getRepr()->attribute("d");
+                        Geom::PathVector path =  sp_svg_read_pathv(svgd);
+                        path *= item->i2doc_affine().inverse();
+                        svgd = sp_svg_write_path( path );
+                        dc->selection->add(SP_OBJECT(bend_item));
+                        sp_selection_duplicate(dc->desktop);
+                        dc->selection->remove(SP_OBJECT(bend_item));
+                        bend_item = dc->selection->singleItem();
+                        bend_item->moveTo(item,false);
+                        spdc_apply_bend_shape(svgd, dc, bend_item);
+                        bend_item->transform = Geom::Affine(1,0,0,1,0,0);
+                        dc->selection->add(SP_OBJECT(bend_item));
+                    }
+                    shape = BEND_CLIPBOARD;
                 }
                 break;
             }
@@ -643,7 +726,6 @@ void spdc_concat_colors_and_flush(FreehandBase *dc, gboolean forceclosed)
 static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
 {
     SPCurve *c;
-
     if (dc->white_curves) {
         g_assert(dc->white_item);
         c = SPCurve::concat(dc->white_curves);
@@ -695,14 +777,17 @@ static void spdc_flush_white(FreehandBase *dc, SPCurve *gc)
             // Attach repr
             SPItem *item = SP_ITEM(desktop->currentLayer()->appendChildRepr(repr));
 
-            // we finished the path; now apply any waiting LPEs or freehand shapes
             spdc_check_for_and_apply_waiting_LPE(dc, item, c);
-
-            dc->selection->set(repr);
+            if(previous_shape_type != BEND_CLIPBOARD){
+                dc->selection->set(repr);
+            }
             Inkscape::GC::release(repr);
             item->transform = SP_ITEM(desktop->currentLayer())->i2doc_affine().inverse();
             item->updateRepr();
             item->doWriteTransform(item->getRepr(), item->transform, NULL, true);
+            if(previous_shape_type == BEND_CLIPBOARD){
+                repr->parent()->removeChild(repr);
+            }
         }
 
         DocumentUndo::done(doc, SP_IS_PEN_CONTEXT(dc)? SP_VERB_CONTEXT_PEN : SP_VERB_CONTEXT_PENCIL,
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index 827dbf5c3..d924d8773 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -268,6 +268,9 @@ void PenTool::_endpointSnap(Geom::Point &p, guint const state) const {
     if ((state & GDK_CONTROL_MASK) && !this->polylines_paraxial) { //CTRL enables angular snapping
         if (this->npoints > 0) {
             spdc_endpoint_snap_rotation(this, p, this->p[0], state);
+        } else {
+            boost::optional<Geom::Point> origin = boost::optional<Geom::Point>();
+            spdc_endpoint_snap_free(this, p, origin, state);
         }
     } else {
         // We cannot use shift here to disable snapping because the shift-key is already used
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index 16c26546f..bfb1c67f0 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -635,8 +635,11 @@ void PencilTool::_interpolate() {
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
-    double const tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
-
+    double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
+    bool simplify = prefs->getInt("/tools/freehand/pencil/simplify", 0);
+    if(simplify){
+        tolerance_sq = 0;
+    }
     g_assert(is_zero(this->req_tangent) || is_unit_vector(this->req_tangent));
 
     this->green_curve->reset();
@@ -703,8 +706,11 @@ void PencilTool::_sketchInterpolate() {
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     double const tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0) * 0.4;
-    double const tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
-
+    double tolerance_sq = 0.02 * square(this->desktop->w2d().descrim() * tol) * exp(0.2 * tol - 2);
+    bool simplify = prefs->getInt("/tools/freehand/pencil/simplify", 0);
+    if(simplify){
+        tolerance_sq = 0;
+    }
     bool average_all_sketches = prefs->getBool("/tools/freehand/pencil/average_all_sketches", true);
 
     g_assert(is_zero(this->req_tangent) || is_unit_vector(this->req_tangent));
diff --git a/src/widgets/pencil-toolbar.cpp b/src/widgets/pencil-toolbar.cpp
index 1214a378a..aef9b4560 100644
--- a/src/widgets/pencil-toolbar.cpp
+++ b/src/widgets/pencil-toolbar.cpp
@@ -28,7 +28,9 @@
 # include "config.h"
 #endif
 
+#include <gtkmm.h>
 #include <glibmm/i18n.h>
+#include <list>
 
 #include "pencil-toolbar.h"
 #include "desktop.h"
@@ -43,6 +45,14 @@
 #include "ui/tools/pen-tool.h"
 #include "ui/uxmanager.h"
 #include "widgets/spinbutton-events.h"
+#include <selection.h>
+#include "live_effects/effect.h"
+#include "live_effects/lpe-simplify.h"
+#include "live_effects/effect-enum.h"
+#include "live_effects/lpeobject.h"
+#include "live_effects/lpeobject-reference.h"
+#include "sp-lpe-item.h"
+#include "util/glib-list-iterators.h"
 
 using Inkscape::UI::UXManager;
 using Inkscape::DocumentUndo;
@@ -151,6 +161,12 @@ static void freehand_change_shape(EgeSelectOneAction* act, GObject *dataKludge)
     prefs->setInt(freehand_tool_name(dataKludge) + "/shape", shape);
 }
 
+static void freehand_simplify_lpe(InkToggleAction* itact, GObject *dataKludge) {
+    gint simplify = gtk_toggle_action_get_active( GTK_TOGGLE_ACTION(itact) );
+    Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setInt(freehand_tool_name(dataKludge) + "/simplify", simplify);
+}
+
 /**
  * Generate the list of freehand advanced shape option entries.
  */
@@ -162,6 +178,7 @@ static GList * freehand_shape_dropdown_items_list() {
     glist = g_list_append (glist, _("Triangle out"));
     glist = g_list_append (glist, _("Ellipse"));
     glist = g_list_append (glist, _("From clipboard"));
+    glist = g_list_append (glist, _("Bend from clipboard"));
     glist = g_list_append (glist, _("Last applied"));
 
     return glist;
@@ -220,6 +237,41 @@ static void sp_pencil_tb_defaults(GtkWidget * /*widget*/, GObject *obj)
     spinbutton_defocus(tbl);
 }
 
+static void sp_simplify_flatten(GtkWidget * /*widget*/, GObject *obj)
+{
+    SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data(obj, "desktop"));
+    std::vector<SPItem *> selected = desktop->getSelection()->itemList();
+    for (std::vector<SPItem *>::iterator it(selected.begin()); it != selected.end(); ++it){
+        SPLPEItem* lpeitem = dynamic_cast<SPLPEItem*>(*it);
+        if (lpeitem && lpeitem->hasPathEffect()){
+            PathEffectList lpelist = lpeitem->getEffectList();
+            std::list<Inkscape::LivePathEffect::LPEObjectReference *>::iterator i;
+            for (i = lpelist.begin(); i != lpelist.end(); ++i) {
+                LivePathEffectObject *lpeobj = (*i)->lpeobject;
+                if (lpeobj) {
+                    Inkscape::LivePathEffect::Effect *lpe = lpeobj->get_lpe();
+                    if (dynamic_cast<Inkscape::LivePathEffect::LPESimplify *>(lpe)) {
+                        SPShape * shape = dynamic_cast<SPShape *>(lpeitem);
+                        if(shape){
+                            SPCurve * c = shape->getCurveBeforeLPE();
+                            lpe->doEffect(c);
+                            lpeitem->setCurrentPathEffect(*i);
+                            if (lpelist.size() > 1){
+                                lpeitem->removeCurrentPathEffect(true);
+                                shape->setCurveBeforeLPE(c);
+                            } else {
+                                lpeitem->removeCurrentPathEffect(false);
+                                shape->setCurve(c,0);
+                            }
+                            break;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
 static void sp_pencil_tb_tolerance_value_changed(GtkAdjustment *adj, GObject *tbl)
 {
     // quit if run by the attr_changed listener
@@ -232,6 +284,24 @@ static void sp_pencil_tb_tolerance_value_changed(GtkAdjustment *adj, GObject *tb
     prefs->setDouble("/tools/freehand/pencil/tolerance",
             gtk_adjustment_get_value(adj));
     g_object_set_data( tbl, "freeze", GINT_TO_POINTER(FALSE) );
+    SPDesktop *desktop = static_cast<SPDesktop *>(g_object_get_data(tbl, "desktop"));
+    std::vector<SPItem *> selected = desktop->getSelection()->itemList();
+    for (std::vector<SPItem *>::iterator it(selected.begin()); it != selected.end(); ++it){
+        SPLPEItem* lpeitem = dynamic_cast<SPLPEItem*>(*it);
+        if (lpeitem && lpeitem->hasPathEffect()){
+            Inkscape::LivePathEffect::Effect* thisEffect = lpeitem->getPathEffectOfType(Inkscape::LivePathEffect::SIMPLIFY);
+            if(thisEffect){
+                Inkscape::LivePathEffect::LPESimplify *lpe = dynamic_cast<Inkscape::LivePathEffect::LPESimplify*>(thisEffect->getLPEObj()->get_lpe());
+                if (lpe) {
+                    double tol = prefs->getDoubleLimited("/tools/freehand/pencil/tolerance", 10.0, 1.0, 100.0);
+                    tol = tol/(100.0*(102.0-tol));
+                    std::ostringstream ss;
+                    ss << tol;
+                    lpe->getRepr()->setAttribute("threshold", ss.str());
+                }
+            }
+        }
+    }
 }
 
 /*
@@ -303,6 +373,28 @@ void sp_pencil_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_pencil_tb_defaults), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
     }
+    /* LPE simplify based tolerance */
+    {
+        Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+        InkToggleAction* itact = ink_toggle_action_new( "PencilLpeSimplify",
+                                                        _("LPE based interactive simplify"),
+                                                        _("LPE based interactive simplify"),
+                                                        INKSCAPE_ICON("interactive_simplify"),
+                                                        Inkscape::ICON_SIZE_SMALL_TOOLBAR );
+        gtk_toggle_action_set_active(GTK_TOGGLE_ACTION(itact), prefs->getInt("/tools/freehand/pencil/simplify", 0) );
+        g_signal_connect_after(  G_OBJECT(itact), "toggled", G_CALLBACK(freehand_simplify_lpe), holder) ;
+        gtk_action_group_add_action( mainActions, GTK_ACTION(itact) );
+    }
+    /* LPE simplify flatten */
+    {
+        InkAction* inky = ink_action_new( "PencilLpeSimplifyFlatten",
+                                          _("LPE simplify flatten"),
+                                          _("LPE simplify flatten"),
+                                          INKSCAPE_ICON("flatten_simplify"),
+                                          Inkscape::ICON_SIZE_SMALL_TOOLBAR );
+        g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_simplify_flatten), holder );
+        gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
+    }
 
     g_signal_connect( holder, "destroy", G_CALLBACK(purge_repr_listener), holder );
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index d56b91f5e..cdf39e9ef 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -398,6 +398,8 @@ static gchar const * ui_descr =
         "    <toolitem action='FreehandModeActionPencil' />"
         "    <separator />"
         "    <toolitem action='PencilToleranceAction' />"
+        "    <toolitem action='PencilLpeSimplify' />"
+        "    <toolitem action='PencilLpeSimplifyFlatten' />"
         "    <separator />"
         "    <toolitem action='PencilResetAction' />"
         "    <separator />"