Merge from trunk

(bzr r10347.1.18)

12 files changed, 63 insertions, 632 deletions

diff --git a/src/ui/CMakeLists.txt b/src/ui/CMakeLists.txt
index 1a662f3be..e697fba99 100644
--- a/src/ui/CMakeLists.txt
+++ b/src/ui/CMakeLists.txt
@@ -120,7 +120,7 @@ set(ui_SRC
 	previewfillable.h
 	previewholder.h
 	uxmanager.h
-	
+
 	cache/svg_preview_cache.h
 
 	dialog/aboutbox.h
diff --git a/src/ui/dialog/align-and-distribute.cpp b/src/ui/dialog/align-and-distribute.cpp
index f7cb06263..8728e2ef4 100644
--- a/src/ui/dialog/align-and-distribute.cpp
+++ b/src/ui/dialog/align-and-distribute.cpp
@@ -271,7 +271,7 @@ BBoxSort::BBoxSort(const BBoxSort &rhs) :
         //NOTE :  this copy ctor is called O(sort) when sorting the vector
         //this is bad. The vector should be a vector of pointers.
         //But I'll wait the bohem GC before doing that
-        item(rhs.item), anchor(rhs.anchor), bbox(rhs.bbox) 
+        item(rhs.item), anchor(rhs.anchor), bbox(rhs.bbox)
 {
 }
 
@@ -550,7 +550,7 @@ public:
 	None,
 	ZOrder,
 	Clockwise
-    };	    
+    };
 
     ActionExchangePositions(Glib::ustring const &id,
                          Glib::ustring const &tiptext,
@@ -806,7 +806,7 @@ private :
                 Inkscape::Text::Layout const *layout = te_get_layout(*it);
                 boost::optional<Geom::Point> pt = layout->baselineAnchorPoint();
                 if (pt) {
-                    Geom::Point base = *pt * (*it)->i2d_affine();
+                    Geom::Point base = *pt * (*it)->i2dt_affine();
                     if (base[Geom::X] < b_min[Geom::X]) b_min[Geom::X] = base[Geom::X];
                     if (base[Geom::Y] < b_min[Geom::Y]) b_min[Geom::Y] = base[Geom::Y];
                     if (base[Geom::X] > b_max[Geom::X]) b_max[Geom::X] = base[Geom::X];
@@ -849,7 +849,7 @@ private :
                     Inkscape::Text::Layout const *layout = te_get_layout(*it);
                     boost::optional<Geom::Point> pt = layout->baselineAnchorPoint();
                     if (pt) {
-                        Geom::Point base = *pt * (*it)->i2d_affine();
+                        Geom::Point base = *pt * (*it)->i2dt_affine();
                         Geom::Point t(0.0, 0.0);
                         t[_orientation] = b_min[_orientation] - base[_orientation];
                         sp_item_move_rel(*it, Geom::Translate(t));
@@ -904,107 +904,107 @@ AlignAndDistribute::AlignAndDistribute()
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
 
     //Instanciate the align buttons
-    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT_TO_ANCHOR,
+    addAlignButton(INKSCAPE_ICON("align-horizontal-right-to-anchor"),
                    _("Align right edges of objects to the left edge of the anchor"),
                    0, 0);
-    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT,
+    addAlignButton(INKSCAPE_ICON("align-horizontal-left"),
                    _("Align left edges"),
                    0, 1);
-    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_CENTER,
+    addAlignButton(INKSCAPE_ICON("align-horizontal-center"),
                    _("Center on vertical axis"),
                    0, 2);
-    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT,
+    addAlignButton(INKSCAPE_ICON("align-horizontal-right"),
                    _("Align right sides"),
                    0, 3);
-    addAlignButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT_TO_ANCHOR,
+    addAlignButton(INKSCAPE_ICON("align-horizontal-left-to-anchor"),
                    _("Align left edges of objects to the right edge of the anchor"),
                    0, 4);
-    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM_TO_ANCHOR,
+    addAlignButton(INKSCAPE_ICON("align-vertical-bottom-to-anchor"),
                    _("Align bottom edges of objects to the top edge of the anchor"),
                    1, 0);
-    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_TOP,
+    addAlignButton(INKSCAPE_ICON("align-vertical-top"),
                    _("Align top edges"),
                    1, 1);
-    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_CENTER,
+    addAlignButton(INKSCAPE_ICON("align-vertical-center"),
                    _("Center on horizontal axis"),
                    1, 2);
-    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM,
+    addAlignButton(INKSCAPE_ICON("align-vertical-bottom"),
                    _("Align bottom edges"),
                    1, 3);
-    addAlignButton(INKSCAPE_ICON_ALIGN_VERTICAL_TOP_TO_ANCHOR,
+    addAlignButton(INKSCAPE_ICON("align-vertical-top-to-anchor"),
                    _("Align top edges of objects to the bottom edge of the anchor"),
                    1, 4);
 
     //Baseline aligns
-    addBaselineButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_BASELINE,
+    addBaselineButton(INKSCAPE_ICON("align-horizontal-baseline"),
                    _("Align baseline anchors of texts horizontally"),
                       0, 5, this->align_table(), Geom::X, false);
-    addBaselineButton(INKSCAPE_ICON_ALIGN_VERTICAL_BASELINE,
+    addBaselineButton(INKSCAPE_ICON("align-vertical-baseline"),
                    _("Align baselines of texts"),
                      1, 5, this->align_table(), Geom::Y, false);
 
     //The distribute buttons
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_GAPS,
+    addDistributeButton(INKSCAPE_ICON("distribute-horizontal-gaps"),
                         _("Make horizontal gaps between objects equal"),
                         0, 4, true, Geom::X, .5, .5);
 
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_LEFT,
+    addDistributeButton(INKSCAPE_ICON("distribute-horizontal-left"),
                         _("Distribute left edges equidistantly"),
                         0, 1, false, Geom::X, 1., 0.);
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_CENTER,
+    addDistributeButton(INKSCAPE_ICON("distribute-horizontal-center"),
                         _("Distribute centers equidistantly horizontally"),
                         0, 2, false, Geom::X, .5, .5);
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_RIGHT,
+    addDistributeButton(INKSCAPE_ICON("distribute-horizontal-right"),
                         _("Distribute right edges equidistantly"),
                         0, 3, false, Geom::X, 0., 1.);
 
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_GAPS,
+    addDistributeButton(INKSCAPE_ICON("distribute-vertical-gaps"),
                         _("Make vertical gaps between objects equal"),
                         1, 4, true, Geom::Y, .5, .5);
 
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_TOP,
+    addDistributeButton(INKSCAPE_ICON("distribute-vertical-top"),
                         _("Distribute top edges equidistantly"),
                         1, 1, false, Geom::Y, 0, 1);
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_CENTER,
+    addDistributeButton(INKSCAPE_ICON("distribute-vertical-center"),
                         _("Distribute centers equidistantly vertically"),
                         1, 2, false, Geom::Y, .5, .5);
-    addDistributeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BOTTOM,
+    addDistributeButton(INKSCAPE_ICON("distribute-vertical-bottom"),
                         _("Distribute bottom edges equidistantly"),
                         1, 3, false, Geom::Y, 1., 0.);
 
     //Baseline distribs
-    addBaselineButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_BASELINE,
+    addBaselineButton(INKSCAPE_ICON("distribute-horizontal-baseline"),
                    _("Distribute baseline anchors of texts horizontally"),
                       0, 5, this->distribute_table(), Geom::X, true);
-    addBaselineButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BASELINE,
+    addBaselineButton(INKSCAPE_ICON("distribute-vertical-baseline"),
                    _("Distribute baselines of texts vertically"),
                      1, 5, this->distribute_table(), Geom::Y, true);
 
     // Rearrange
     //Graph Layout
-    addGraphLayoutButton(INKSCAPE_ICON_DISTRIBUTE_GRAPH,
+    addGraphLayoutButton(INKSCAPE_ICON("distribute-graph"),
                             _("Nicely arrange selected connector network"),
                             0, 0);
-    addExchangePositionsButton(INKSCAPE_ICON_EXCHANGE_POSITIONS,
+    addExchangePositionsButton(INKSCAPE_ICON("exchange-positions"),
                             _("Exchange positions of selected objects - selection order"),
                             0, 1);
-    addExchangePositionsByZOrderButton(INKSCAPE_ICON_EXCHANGE_POSITIONS_ZORDER,
+    addExchangePositionsByZOrderButton(INKSCAPE_ICON("exchange-positions-zorder"),
                             _("Exchange positions of selected objects - stacking order"),
                             0, 2);
-    addExchangePositionsClockwiseButton(INKSCAPE_ICON_EXCHANGE_POSITIONS_CLOCKWISE,
+    addExchangePositionsClockwiseButton(INKSCAPE_ICON("exchange-positions-clockwise"),
                             _("Exchange positions of selected objects - clockwise rotate"),
                             0, 3);
-			    
+
     //Randomize & Unclump
-    addRandomizeButton(INKSCAPE_ICON_DISTRIBUTE_RANDOMIZE,
+    addRandomizeButton(INKSCAPE_ICON("distribute-randomize"),
                         _("Randomize centers in both dimensions"),
                         0, 4);
-    addUnclumpButton(INKSCAPE_ICON_DISTRIBUTE_UNCLUMP,
+    addUnclumpButton(INKSCAPE_ICON("distribute-unclump"),
                         _("Unclump objects: try to equalize edge-to-edge distances"),
                         0, 5);
 
     //Remove overlaps
-    addRemoveOverlapsButton(INKSCAPE_ICON_DISTRIBUTE_REMOVE_OVERLAPS,
+    addRemoveOverlapsButton(INKSCAPE_ICON("distribute-remove-overlaps"),
                             _("Move objects as little as possible so that their bounding boxes do not overlap"),
                             0, 0);
 
@@ -1012,16 +1012,16 @@ AlignAndDistribute::AlignAndDistribute()
     // NOTE: "align nodes vertically" means "move nodes vertically until they align on a common
     // _horizontal_ line". This is analogous to what the "align-vertical-center" icon means.
     // There is no doubt some ambiguity. For this reason the descriptions are different.
-    addNodeButton(INKSCAPE_ICON_ALIGN_VERTICAL_NODES,
+    addNodeButton(INKSCAPE_ICON("align-vertical-node"),
                   _("Align selected nodes to a common horizontal line"),
                   0, Geom::X, false);
-    addNodeButton(INKSCAPE_ICON_ALIGN_HORIZONTAL_NODES,
+    addNodeButton(INKSCAPE_ICON("align-horizontal-node"),
                   _("Align selected nodes to a common vertical line"),
                   1, Geom::Y, false);
-    addNodeButton(INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_NODE,
+    addNodeButton(INKSCAPE_ICON("distribute-horizontal-node"),
                   _("Distribute selected nodes horizontally"),
                   2, Geom::X, true);
-    addNodeButton(INKSCAPE_ICON_DISTRIBUTE_VERTICAL_NODE,
+    addNodeButton(INKSCAPE_ICON("distribute-vertical-node"),
                   _("Distribute selected nodes vertically"),
                   3, Geom::Y, true);
 
diff --git a/src/ui/dialog/filedialogimpl-win32.cpp b/src/ui/dialog/filedialogimpl-win32.cpp
index e83aeccad..bb800f9ca 100644
--- a/src/ui/dialog/filedialogimpl-win32.cpp
+++ b/src/ui/dialog/filedialogimpl-win32.cpp
@@ -995,7 +995,7 @@ bool FileOpenDialogImplWin32::set_svg_preview()
     Geom::OptRect maybeArea(area);
     svgDoc->ensureUpToDate();
     svgDoc->getRoot()->invoke_bbox( maybeArea,
-                                    svgDoc->getRoot()->i2d_affine(), TRUE);
+                                    svgDoc->getRoot()->i2dt_affine(), TRUE);
 
     NRArena *const arena = NRArena::create();
 
diff --git a/src/ui/dialog/fill-and-stroke.cpp b/src/ui/dialog/fill-and-stroke.cpp
index 19bcadc00..5d85b2397 100644
--- a/src/ui/dialog/fill-and-stroke.cpp
+++ b/src/ui/dialog/fill-and-stroke.cpp
@@ -54,9 +54,9 @@ FillAndStroke::FillAndStroke()
 
     contents->pack_start(_notebook, true, true);
 
-    _notebook.append_page(_page_fill, _createPageTabLabel(_("_Fill"), INKSCAPE_ICON_OBJECT_FILL));
-    _notebook.append_page(_page_stroke_paint, _createPageTabLabel(_("Stroke _paint"), INKSCAPE_ICON_OBJECT_STROKE));
-    _notebook.append_page(_page_stroke_style, _createPageTabLabel(_("Stroke st_yle"), INKSCAPE_ICON_OBJECT_STROKE_STYLE));
+    _notebook.append_page(_page_fill, _createPageTabLabel(_("_Fill"), INKSCAPE_ICON("object-fill")));
+    _notebook.append_page(_page_stroke_paint, _createPageTabLabel(_("Stroke _paint"), INKSCAPE_ICON("object-stroke")));
+    _notebook.append_page(_page_stroke_style, _createPageTabLabel(_("Stroke st_yle"), INKSCAPE_ICON("object-stroke-style")));
 
     _layoutPageFill();
     _layoutPageStrokePaint();
diff --git a/src/ui/dialog/icon-preview.cpp b/src/ui/dialog/icon-preview.cpp
index 4d98793bb..38ec6d1be 100644
--- a/src/ui/dialog/icon-preview.cpp
+++ b/src/ui/dialog/icon-preview.cpp
@@ -356,11 +356,10 @@ void IconPreviewPanel::refreshPreview()
                     GSList const *items = sel->itemList();
                     while ( items && !target ) {
                         SPItem* item = SP_ITEM( items->data );
-                        SPObject * obj = item;
-                        gchar const *id = obj->getId();
+                        gchar const *id = item->getId();
                         if ( id ) {
                             targetId = id;
-                            target = obj;
+                            target = item;
                         }
 
                         items = g_slist_next(items);
@@ -447,7 +446,7 @@ void IconPreviewPanel::renderPreview( SPObject* obj )
     /* Create ArenaItem and set transform */
     unsigned int visionkey = SPItem::display_key_new(1);
 
-    root = SP_ITEM( doc->getRoot() )->invoke_show( arena, visionkey, SP_ITEM_SHOW_DISPLAY );
+    root = doc->getRoot()->invoke_show( arena, visionkey, SP_ITEM_SHOW_DISPLAY );
 
     for ( int i = 0; i < numEntries; i++ ) {
         unsigned unused;
@@ -465,7 +464,7 @@ void IconPreviewPanel::renderPreview( SPObject* obj )
     }
     updateMagnify();
 
-    SP_ITEM(doc->getRoot())->invoke_hide(visionkey);
+    doc->getRoot()->invoke_hide(visionkey);
     nr_object_unref((NRObject *) arena);
     renderTimer->stop();
     minDelay = std::max( 0.1, renderTimer->elapsed() * 3.0 );
diff --git a/src/ui/dialog/layers.cpp b/src/ui/dialog/layers.cpp
index 8d2d25162..340a1921c 100644
--- a/src/ui/dialog/layers.cpp
+++ b/src/ui/dialog/layers.cpp
@@ -582,7 +582,7 @@ LayersPanel::LayersPanel() :
     _tree.set_headers_visible(false);
 
     Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
-        INKSCAPE_ICON_OBJECT_VISIBLE, INKSCAPE_ICON_OBJECT_HIDDEN) );
+        INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-hidden")) );
     int visibleColNum = _tree.append_column("vis", *eyeRenderer) - 1;
     eyeRenderer->signal_pre_toggle().connect( sigc::mem_fun(*this, &LayersPanel::_preToggle) );
     eyeRenderer->signal_toggled().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_toggled), (int)COL_VISIBLE) );
@@ -593,7 +593,7 @@ LayersPanel::LayersPanel() :
     }
 
     Inkscape::UI::Widget::ImageToggler * renderer = manage( new Inkscape::UI::Widget::ImageToggler(
-        INKSCAPE_ICON_OBJECT_LOCKED, INKSCAPE_ICON_OBJECT_UNLOCKED) );
+        INKSCAPE_ICON("object-locked"), INKSCAPE_ICON("object-unlocked")) );
     int lockedColNum = _tree.append_column("lock", *renderer) - 1;
     renderer->signal_pre_toggle().connect( sigc::mem_fun(*this, &LayersPanel::_preToggle) );
     renderer->signal_toggled().connect( sigc::bind( sigc::mem_fun(*this, &LayersPanel::_toggled), (int)COL_LOCKED) );
diff --git a/src/ui/dialog/livepatheffect-editor.cpp b/src/ui/dialog/livepatheffect-editor.cpp
index bf60fe059..40b7f26ac 100644
--- a/src/ui/dialog/livepatheffect-editor.cpp
+++ b/src/ui/dialog/livepatheffect-editor.cpp
@@ -138,7 +138,7 @@ LivePathEffectEditor::LivePathEffectEditor()
 
     //Add the visibility icon column:
     Inkscape::UI::Widget::ImageToggler *eyeRenderer = manage( new Inkscape::UI::Widget::ImageToggler(
-        INKSCAPE_ICON_OBJECT_VISIBLE, INKSCAPE_ICON_OBJECT_HIDDEN) );
+        INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-visible")) );
     int visibleColNum = effectlist_view.append_column("is_visible", *eyeRenderer) - 1;
     eyeRenderer->signal_toggled().connect( sigc::mem_fun(*this, &LivePathEffectEditor::on_visibility_toggled) );
     eyeRenderer->property_activatable() = true;
@@ -245,7 +245,7 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
         // this was triggered by selecting a row in the list, so skip reloading
         lpe_list_locked = false;
         return;
-    } 
+    }
 
     effectlist_store->clear();
     current_lpeitem = NULL;
@@ -265,7 +265,7 @@ LivePathEffectEditor::onSelectionChanged(Inkscape::Selection *sel)
                     Inkscape::LivePathEffect::Effect *lpe = sp_lpe_item_get_current_lpe(lpeitem);
                     if (lpe) {
                         showParams(*lpe);
-                        lpe_list_locked = true; 
+                        lpe_list_locked = true;
                         selectInList(lpe);
                     } else {
                         showText(_("Unknown effect is applied"));
diff --git a/src/ui/dialog/tile.cpp b/src/ui/dialog/tile.cpp
index 7c7413ce5..68ad9393c 100644
--- a/src/ui/dialog/tile.cpp
+++ b/src/ui/dialog/tile.cpp
@@ -337,7 +337,7 @@ g_print("\n row = %f     col = %f selection x= %f selection y = %f", total_row_h
                  // signs are inverted between x and y due to y inversion
                  Geom::Point move = Geom::Point(new_x - min[Geom::X], min[Geom::Y] - new_y);
                  Geom::Affine const affine = Geom::Affine(Geom::Translate(move));
-                 item->set_i2d_affine(item->i2d_affine() * affine);
+                 item->set_i2d_affine(item->i2dt_affine() * affine);
                  item->doWriteTransform(repr, item->transform,  NULL);
                  SP_OBJECT (current_row->data)->updateRepr();
                  cnt +=1;
diff --git a/src/ui/icon-names.h b/src/ui/icon-names.h
index 8935b1def..f83d42174 100644
--- a/src/ui/icon-names.h
+++ b/src/ui/icon-names.h
@@ -1,10 +1,5 @@
 /** @file
  * @brief Macro for icon names used in Inkscape
- *
- * This file exists for several reasons: firstly, it contains all the icon names
- * in Inkscape, so it can serve as a reference to themers. Secondly, using
- * macros instead of strings avoids typos. Thirdly, we can change names
- * to conform to external icon sets / specifications without changing any code.
  */
 /* Authors:
  *   Krzysztof Kosiński <tweenk.pl@gmail.com>
@@ -16,574 +11,11 @@
 #ifndef SEEN_INKSCAPE_ICON_NAMES_H
 #define SEEN_INKSCAPE_ICON_NAMES_H
 
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_BASELINE \
-    "align-horizontal-baseline"
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_CENTER \
-    "align-horizontal-center"
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT \
-    "align-horizontal-left"
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_LEFT_TO_ANCHOR \
-    "align-horizontal-left-to-anchor"
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_NODES \
-    "align-horizontal-node"
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT \
-    "align-horizontal-right"
-#define INKSCAPE_ICON_ALIGN_HORIZONTAL_RIGHT_TO_ANCHOR \
-    "align-horizontal-right-to-anchor"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_BASELINE \
-    "align-vertical-baseline"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM \
-    "align-vertical-bottom"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_BOTTOM_TO_ANCHOR \
-    "align-vertical-bottom-to-anchor"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_CENTER \
-    "align-vertical-center"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_NODES \
-    "align-vertical-node"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_TOP \
-    "align-vertical-top"
-#define INKSCAPE_ICON_ALIGN_VERTICAL_TOP_TO_ANCHOR \
-    "align-vertical-top-to-anchor"
-#define INKSCAPE_ICON_BITMAP_TRACE \
-    "bitmap-trace"
-#define INKSCAPE_ICON_COLOR_FILL \
-    "color-fill"
-#define INKSCAPE_ICON_COLOR_GRADIENT \
-    "color-gradient"
-#define INKSCAPE_ICON_COLOR_MANAGEMENT \
-    "color-management"
-#define INKSCAPE_ICON_COLOR_PICKER \
-    "color-picker"
-#define INKSCAPE_ICON_COLOR_REMOVE \
-    "color-remove"
-#define INKSCAPE_ICON_CONNECTOR_EDIT \
-    "connector-edit"
-#define INKSCAPE_ICON_CONNECTOR_AVOID \
-    "connector-avoid"
-#define INKSCAPE_ICON_CONNECTOR_IGNORE \
-    "connector-ignore"
-#define INKSCAPE_ICON_CONNECTOR_ORTHOGONAL \
-    "connector-orthogonal"
-#define INKSCAPE_ICON_CONNECTOR_NEW_CONNPOINT \
-    "connector-new-connpoint"
-#define INKSCAPE_ICON_CONNECTOR_REMOVE_CONNPOINT \
-    "connector-remove-connpoint"
-#define INKSCAPE_ICON_DIALOG_ALIGN_AND_DISTRIBUTE \
-    "dialog-align-and-distribute"
-#define INKSCAPE_ICON_DIALOG_FILL_AND_STROKE \
-    "dialog-fill-and-stroke"
-#define INKSCAPE_ICON_DIALOG_ICON_PREVIEW \
-    "dialog-icon-preview"
-#define INKSCAPE_ICON_DIALOG_INPUT_DEVICES \
-    "dialog-input-devices"
-#define INKSCAPE_ICON_DIALOG_LAYERS \
-    "dialog-layers"
-#define INKSCAPE_ICON_DIALOG_MEMORY \
-    "dialog-memory"
-#define INKSCAPE_ICON_DIALOG_MESSAGES \
-    "dialog-messages"
-#define INKSCAPE_ICON_DIALOG_OBJECT_PROPERTIES \
-    "dialog-object-properties"
-#define INKSCAPE_ICON_DIALOG_ROWS_AND_COLUMNS \
-    "dialog-rows-and-columns"
-#define INKSCAPE_ICON_DIALOG_SCRIPTS \
-    "dialog-scripts"
-#define INKSCAPE_ICON_DIALOG_TEXT_AND_FONT \
-    "dialog-text-and-font"
-#define INKSCAPE_ICON_DIALOG_TILE_CLONES \
-    "dialog-tile-clones"
-#define INKSCAPE_ICON_DIALOG_TRANSFORM \
-    "dialog-transform"
-#define INKSCAPE_ICON_DIALOG_XML_EDITOR \
-    "dialog-xml-editor"
-#define INKSCAPE_ICON_DISTRIBUTE_GRAPH \
-    "distribute-graph"
-#define INKSCAPE_ICON_DISTRIBUTE_GRAPH_DIRECTED \
-    "distribute-graph-directed"
-#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_BASELINE \
-    "distribute-horizontal-baseline"
-#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_CENTER \
-    "distribute-horizontal-center"
-#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_GAPS \
-    "distribute-horizontal-gaps"
-#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_LEFT \
-    "distribute-horizontal-left"
-#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_NODE \
-    "distribute-horizontal-node"
-#define INKSCAPE_ICON_DISTRIBUTE_HORIZONTAL_RIGHT \
-    "distribute-horizontal-right"
-#define INKSCAPE_ICON_DISTRIBUTE_RANDOMIZE \
-    "distribute-randomize"
-#define INKSCAPE_ICON_DISTRIBUTE_REMOVE_OVERLAPS \
-    "distribute-remove-overlaps"
-#define INKSCAPE_ICON_DISTRIBUTE_UNCLUMP \
-    "distribute-unclump"
-#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BASELINE \
-    "distribute-vertical-baseline"
-#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_BOTTOM \
-    "distribute-vertical-bottom"
-#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_CENTER \
-    "distribute-vertical-center"
-#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_GAPS \
-    "distribute-vertical-gaps"
-#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_NODE \
-    "distribute-vertical-node"
-#define INKSCAPE_ICON_DISTRIBUTE_VERTICAL_TOP \
-    "distribute-vertical-top"
-#define INKSCAPE_ICON_DOCUMENT_CLEANUP \
-    "document-cleanup"
-#define INKSCAPE_ICON_DOCUMENT_EXPORT \
-    "document-export"
-#define INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL \
-    "document-export-ocal"
-#define INKSCAPE_ICON_DOCUMENT_IMPORT \
-    "document-import"
-#define INKSCAPE_ICON_DOCUMENT_IMPORT_OCAL \
-    "document-import-ocal"
-#define INKSCAPE_ICON_DOCUMENT_METADATA \
-    "document-metadata"
-#define INKSCAPE_ICON_DOCUMENT_OPEN_RECENT \
-    "document-open-recent"
-#define INKSCAPE_ICON_DRAW_CALLIGRAPHIC \
-    "draw-calligraphic"
-#define INKSCAPE_ICON_DRAW_CONNECTOR \
-    "draw-connector"
-#define INKSCAPE_ICON_DRAW_CUBOID \
-    "draw-cuboid"
-#define INKSCAPE_ICON_DRAW_ELLIPSE \
-    "draw-ellipse"
-#define INKSCAPE_ICON_DRAW_ELLIPSE_ARC \
-    "draw-ellipse-arc"
-#define INKSCAPE_ICON_DRAW_ELLIPSE_SEGMENT \
-    "draw-ellipse-segment"
-#define INKSCAPE_ICON_DRAW_ELLIPSE_WHOLE \
-    "draw-ellipse-whole"
-#define INKSCAPE_ICON_DRAW_ERASER \
-    "draw-eraser"
-#define INKSCAPE_ICON_DRAW_ERASER_DELETE_OBJECTS \
-    "draw-eraser-delete-objects"
-#define INKSCAPE_ICON_DRAW_FREEHAND \
-    "draw-freehand"
-#define INKSCAPE_ICON_DRAW_PATH \
-    "draw-path"
-#define INKSCAPE_ICON_DRAW_POLYGON \
-    "draw-polygon"
-#define INKSCAPE_ICON_DRAW_POLYGON_STAR \
-    "draw-polygon-star"
-#define INKSCAPE_ICON_DRAW_RECTANGLE \
-    "draw-rectangle"
-#define INKSCAPE_ICON_DRAW_SPIRAL \
-    "draw-spiral"
-#define INKSCAPE_ICON_DRAW_STAR \
-    "draw-star"
-#define INKSCAPE_ICON_DRAW_TEXT \
-    "draw-text"
-#define INKSCAPE_ICON_DRAW_TRACE_BACKGROUND \
-    "draw-trace-background"
-#define INKSCAPE_ICON_DRAW_USE_PRESSURE \
-    "draw-use-pressure"
-#define INKSCAPE_ICON_DRAW_USE_TILT \
-    "draw-use-tilt"
-#define INKSCAPE_ICON_EDIT_CLONE \
-    "edit-clone"
-#define INKSCAPE_ICON_EDIT_CLONE_UNLINK \
-    "edit-clone-unlink"
-#define INKSCAPE_ICON_EDIT_DUPLICATE \
-    "edit-duplicate"
-#define INKSCAPE_ICON_EDIT_PASTE_IN_PLACE \
-    "edit-paste-in-place"
-#define INKSCAPE_ICON_EDIT_PASTE_STYLE \
-    "edit-paste-style"
-#define INKSCAPE_ICON_EDIT_SELECT_ALL \
-    "edit-select-all"
-#define INKSCAPE_ICON_EDIT_SELECT_ALL_LAYERS \
-    "edit-select-all-layers"
-#define INKSCAPE_ICON_EDIT_SELECT_INVERT \
-    "edit-select-invert"
-#define INKSCAPE_ICON_EDIT_SELECT_NONE \
-    "edit-select-none"
-#define INKSCAPE_ICON_EDIT_SELECT_ORIGINAL \
-    "edit-select-original"
-#define INKSCAPE_ICON_EDIT_UNDO_HISTORY \
-    "edit-undo-history"
-#define INKSCAPE_ICON_EXCHANGE_POSITIONS \
-    "exchange-positions"
-#define INKSCAPE_ICON_EXCHANGE_POSITIONS_ZORDER \
-    "exchange-positions-zorder"
-#define INKSCAPE_ICON_EXCHANGE_POSITIONS_CLOCKWISE \
-    "exchange-positions-clockwise"
-#define INKSCAPE_ICON_FILL_RULE_EVEN_ODD \
-    "fill-rule-even-odd"
-#define INKSCAPE_ICON_FILL_RULE_NONZERO \
-    "fill-rule-nonzero"
-#define INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL \
-    "format-text-direction-horizontal"
-#define INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL \
-    "format-text-direction-vertical"
-#define INKSCAPE_ICON_GRID_AXONOMETRIC \
-    "grid-axonometric"
-#define INKSCAPE_ICON_GRID_RECTANGULAR \
-    "grid-rectangular"
-#define INKSCAPE_ICON_GUIDES \
-    "guides"
-#define INKSCAPE_ICON_HELP_CONTENTS \
-    "help-contents"
-#define INKSCAPE_ICON_HELP_KEYBOARD_SHORTCUTS \
-    "help-keyboard-shortcuts"
-#define INKSCAPE_ICON_IMAGE_FILTER_BLEND \
-    "image-filter-blend"
-#define INKSCAPE_ICON_IMAGE_FILTER_COLOR_MATRIX \
-    "image-filter-color-matrix"
-#define INKSCAPE_ICON_IMAGE_FILTER_DIFFUSE_LIGHTING \
-    "image-filter-diffuse-lighting"
-#define INKSCAPE_ICON_IMAGE_FILTER_DISPLACEMENT_MAP \
-    "image-filter-displacement-map"
-#define INKSCAPE_ICON_IMAGE_FILTER_FLOOD \
-    "image-filter-flood"
-#define INKSCAPE_ICON_IMAGE_FILTER_GAUSSIAN_BLUR \
-    "image-filter-gaussian-blur"
-#define INKSCAPE_ICON_IMAGE_FILTER_MORPHOLOGY \
-    "image-filter-morphology"
-#define INKSCAPE_ICON_IMAGE_FILTER_OFFSET \
-    "image-filter-offset"
-#define INKSCAPE_ICON_IMAGE_FILTER_TURBULENCE \
-    "image-filter-turbulence"
-#define INKSCAPE_ICON_INKSCAPE \
-    "inkscape-logo"
-#define INKSCAPE_ICON_LAYER_BOTTOM \
-    "layer-bottom"
-#define INKSCAPE_ICON_LAYER_DELETE \
-    "layer-delete"
-#define INKSCAPE_ICON_LAYER_LOWER \
-    "layer-lower"
-#define INKSCAPE_ICON_LAYER_NEW \
-    "layer-new"
-#define INKSCAPE_ICON_LAYER_NEXT \
-    "layer-next"
-#define INKSCAPE_ICON_LAYER_PREVIOUS \
-    "layer-previous"
-#define INKSCAPE_ICON_LAYER_RAISE \
-    "layer-raise"
-#define INKSCAPE_ICON_LAYER_RENAME \
-    "layer-rename"
-#define INKSCAPE_ICON_LAYER_TOP \
-    "layer-top"
-#define INKSCAPE_ICON_NODE_ADD \
-    "node-add"
-#define INKSCAPE_ICON_NODE_BREAK \
-    "node-break"
-#define INKSCAPE_ICON_NODE_DELETE \
-    "node-delete"
-#define INKSCAPE_ICON_NODE_DELETE_SEGMENT \
-    "node-delete-segment"
-#define INKSCAPE_ICON_NODE_DISTRIBUTE_HORIZONTAL \
-    "distribute-horizontal-node"
-#define INKSCAPE_ICON_NODE_DISTRIBUTE_VERTICAL \
-    "distribute-vertical-node"
-#define INKSCAPE_ICON_NODE_JOIN \
-    "node-join"
-#define INKSCAPE_ICON_NODE_JOIN_SEGMENT \
-    "node-join-segment"
-#define INKSCAPE_ICON_NODE_SEGMENT_CURVE \
-    "node-segment-curve"
-#define INKSCAPE_ICON_NODE_SEGMENT_LINE \
-    "node-segment-line"
-#define INKSCAPE_ICON_NODE_TYPE_AUTO_SMOOTH \
-    "node-type-auto-smooth"
-#define INKSCAPE_ICON_NODE_TYPE_CUSP \
-    "node-type-cusp"
-#define INKSCAPE_ICON_NODE_TYPE_SMOOTH \
-    "node-type-smooth"
-#define INKSCAPE_ICON_NODE_TYPE_SYMMETRIC \
-    "node-type-symmetric"
-#define INKSCAPE_ICON_OBJECT_COLUMNS \
-    "object-columns"
-#define INKSCAPE_ICON_OBJECT_FILL \
-    "object-fill"
-#define INKSCAPE_ICON_OBJECT_FLIP_HORIZONTAL \
-    "object-flip-horizontal"
-#define INKSCAPE_ICON_OBJECT_FLIP_VERTICAL \
-    "object-flip-vertical"
-#define INKSCAPE_ICON_OBJECT_GROUP \
-    "object-group"
-#define INKSCAPE_ICON_OBJECT_HIDDEN \
-    "object-hidden"
-#define INKSCAPE_ICON_OBJECT_LOCKED \
-    "object-locked"
-#define INKSCAPE_ICON_OBJECT_ROTATE_LEFT \
-    "object-rotate-left"
-#define INKSCAPE_ICON_OBJECT_ROTATE_RIGHT \
-    "object-rotate-right"
-#define INKSCAPE_ICON_OBJECT_ROWS \
-    "object-rows"
-#define INKSCAPE_ICON_OBJECT_STROKE \
-    "object-stroke"
-#define INKSCAPE_ICON_OBJECT_STROKE_STYLE \
-    "object-stroke-style"
-#define INKSCAPE_ICON_OBJECT_TO_PATH \
-    "object-to-path"
-#define INKSCAPE_ICON_OBJECT_TWEAK_ATTRACT \
-    "object-tweak-attract"
-#define INKSCAPE_ICON_OBJECT_TWEAK_BLUR \
-    "object-tweak-blur"
-#define INKSCAPE_ICON_OBJECT_TWEAK_DUPLICATE \
-    "object-tweak-duplicate"
-#define INKSCAPE_ICON_OBJECT_TWEAK_JITTER_COLOR \
-    "object-tweak-jitter-color"
-#define INKSCAPE_ICON_OBJECT_TWEAK_PAINT \
-    "object-tweak-paint"
-#define INKSCAPE_ICON_OBJECT_TWEAK_PUSH \
-    "object-tweak-push"
-#define INKSCAPE_ICON_OBJECT_TWEAK_RANDOMIZE \
-    "object-tweak-randomize"
-#define INKSCAPE_ICON_OBJECT_TWEAK_ROTATE \
-    "object-tweak-rotate"
-#define INKSCAPE_ICON_OBJECT_TWEAK_SHRINK \
-    "object-tweak-shrink"
-#define INKSCAPE_ICON_OBJECT_UNGROUP \
-    "object-ungroup"
-#define INKSCAPE_ICON_OBJECT_UNLOCKED \
-    "object-unlocked"
-#define INKSCAPE_ICON_OBJECT_VISIBLE \
-    "object-visible"
-#define INKSCAPE_ICON_PAINT_GRADIENT_LINEAR \
-    "paint-gradient-linear"
-#define INKSCAPE_ICON_PAINT_GRADIENT_RADIAL \
-    "paint-gradient-radial"
-#define INKSCAPE_ICON_PAINT_NONE \
-    "paint-none"
-#define INKSCAPE_ICON_PAINT_PATTERN \
-    "paint-pattern"
-#define INKSCAPE_ICON_PAINT_SOLID \
-    "paint-solid"
-#define INKSCAPE_ICON_PAINT_SWATCH \
-    "paint-swatch"
-#define INKSCAPE_ICON_PAINT_UNKNOWN \
-    "paint-unknown"
-#define INKSCAPE_ICON_PATH_BREAK_APART \
-    "path-break-apart"
-#define INKSCAPE_ICON_PATH_CLIP_EDIT \
-    "path-clip-edit"
-#define INKSCAPE_ICON_PATH_COMBINE \
-    "path-combine"
-#define INKSCAPE_ICON_PATH_CUT \
-    "path-cut"
-#define INKSCAPE_ICON_PATH_DIFFERENCE \
-    "path-difference"
-#define INKSCAPE_ICON_PATH_DIVISION \
-    "path-division"
-#define INKSCAPE_ICON_PATH_EFFECT_PARAMETER_NEXT \
-    "path-effect-parameter-next"
-#define INKSCAPE_ICON_PATH_EXCLUSION \
-    "path-exclusion"
-#define INKSCAPE_ICON_PATH_INSET \
-    "path-inset"
-#define INKSCAPE_ICON_PATH_INTERSECTION \
-    "path-intersection"
-#define INKSCAPE_ICON_PATH_MASK_EDIT \
-    "path-mask-edit"
-#define INKSCAPE_ICON_PATH_MODE_BEZIER \
-    "path-mode-bezier"
-#define INKSCAPE_ICON_PATH_MODE_POLYLINE \
-    "path-mode-polyline"
-#define INKSCAPE_ICON_PATH_MODE_POLYLINE_PARAXIAL \
-    "path-mode-polyline-paraxial"
-#define INKSCAPE_ICON_PATH_MODE_SPIRO \
-    "path-mode-spiro"
-#define INKSCAPE_ICON_PATH_OFFSET_DYNAMIC \
-    "path-offset-dynamic"
-#define INKSCAPE_ICON_PATH_OFFSET_LINKED \
-    "path-offset-linked"
-#define INKSCAPE_ICON_PATH_OUTSET \
-    "path-outset"
-#define INKSCAPE_ICON_PATH_REVERSE \
-    "path-reverse"
-#define INKSCAPE_ICON_PATH_SIMPLIFY \
-    "path-simplify"
-#define INKSCAPE_ICON_PATH_TWEAK_ATTRACT \
-    "path-tweak-attract"
-#define INKSCAPE_ICON_PATH_TWEAK_GROW \
-    "path-tweak-grow"
-#define INKSCAPE_ICON_PATH_TWEAK_PUSH \
-    "path-tweak-push"
-#define INKSCAPE_ICON_PATH_TWEAK_ROUGHEN \
-    "path-tweak-roughen"
-#define INKSCAPE_ICON_PATH_TWEAK_SHRINK \
-    "path-tweak-shrink"
-#define INKSCAPE_ICON_PATH_UNION \
-    "path-union"
-#define INKSCAPE_ICON_PERSPECTIVE_PARALLEL \
-    "perspective-parallel"
-#define INKSCAPE_ICON_RECTANGLE_MAKE_CORNERS_SHARP \
-    "rectangle-make-corners-sharp"
-#define INKSCAPE_ICON_SELECTION_BOTTOM \
-    "selection-bottom"
-#define INKSCAPE_ICON_SELECTION_LOWER \
-    "selection-lower"
-#define INKSCAPE_ICON_SELECTION_MAKE_BITMAP_COPY \
-    "selection-make-bitmap-copy"
-#define INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_ABOVE \
-    "selection-move-to-layer-above"
-#define INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_BELOW \
-    "selection-move-to-layer-below"
-#define INKSCAPE_ICON_SELECTION_RAISE \
-    "selection-raise"
-#define INKSCAPE_ICON_SELECTION_TOP \
-    "selection-top"
-#define INKSCAPE_ICON_SHOW_DIALOGS \
-    "show-dialogs"
-#define INKSCAPE_ICON_SHOW_GRID \
-    "show-grid"
-#define INKSCAPE_ICON_SHOW_GUIDES \
-    "show-guides"
-#define INKSCAPE_ICON_SHOW_NODE_HANDLES \
-    "show-node-handles"
-#define INKSCAPE_ICON_SHOW_PATH_OUTLINE \
-    "show-path-outline"
-#define INKSCAPE_ICON_SNAP \
-    "snap"
-#define INKSCAPE_ICON_SNAP_BOUNDING_BOX \
-    "snap-bounding-box"
-#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_CENTER \
-    "snap-bounding-box-center"
-#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_CORNERS \
-    "snap-bounding-box-corners"
-#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_EDGES \
-    "snap-bounding-box-edges"
-#define INKSCAPE_ICON_SNAP_BOUNDING_BOX_MIDPOINTS \
-    "snap-bounding-box-midpoints"
-#define INKSCAPE_ICON_SNAP_GRID_GUIDE_INTERSECTIONS \
-    "snap-grid-guide-intersections"
-#define INKSCAPE_ICON_SNAP_NODES \
-    "snap-nodes"
-#define INKSCAPE_ICON_SNAP_NODES_CENTER \
-    "snap-nodes-center"
-#define INKSCAPE_ICON_SNAP_OTHERS \
-    "snap-nodes-others"
-#define INKSCAPE_ICON_SNAP_NODES_CUSP \
-    "snap-nodes-cusp"
-#define INKSCAPE_ICON_SNAP_NODES_INTERSECTION \
-    "snap-nodes-intersection"
-#define INKSCAPE_ICON_SNAP_NODES_MIDPOINT \
-    "snap-nodes-midpoint"
-#define INKSCAPE_ICON_SNAP_NODES_PATH \
-    "snap-nodes-path"
-#define INKSCAPE_ICON_SNAP_NODES_ROTATION_CENTER \
-    "snap-nodes-rotation-center"
-#define INKSCAPE_ICON_SNAP_TEXT_BASELINE \
-    "snap-text-baseline"
-#define INKSCAPE_ICON_SNAP_NODES_SMOOTH \
-    "snap-nodes-smooth"
-#define INKSCAPE_ICON_SNAP_PAGE \
-    "snap-page"
-#define INKSCAPE_ICON_SPRAY_COPY_MODE \
-    "spray-copy-mode"
-#define INKSCAPE_ICON_SPRAY_CLONE_MODE \
-    "spray-clone-mode"
-#define INKSCAPE_ICON_SPRAY_UNION_MODE \
-    "spray-union-mode"
-#define INKSCAPE_ICON_DIALOG_SPRAY_OPTIONS \
-    "dialog-spray-options"
-#define INKSCAPE_ICON_STROKE_CAP_BUTT \
-    "stroke-cap-butt"
-#define INKSCAPE_ICON_STROKE_CAP_ROUND \
-    "stroke-cap-round"
-#define INKSCAPE_ICON_STROKE_CAP_SQUARE \
-    "stroke-cap-square"
-#define INKSCAPE_ICON_STROKE_JOIN_BEVEL \
-    "stroke-join-bevel"
-#define INKSCAPE_ICON_STROKE_JOIN_MITER \
-    "stroke-join-miter"
-#define INKSCAPE_ICON_STROKE_JOIN_ROUND \
-    "stroke-join-round"
-#define INKSCAPE_ICON_STROKE_TO_PATH \
-    "stroke-to-path"
-#define INKSCAPE_ICON_TEXT_CONVERT_TO_REGULAR \
-    "text-convert-to-regular"
-#define INKSCAPE_ICON_TEXT_FLOW_INTO_FRAME \
-    "text-flow-into-frame"
-#define INKSCAPE_ICON_TEXT_PUT_ON_PATH \
-    "text-put-on-path"
-#define INKSCAPE_ICON_TEXT_REMOVE_FROM_PATH \
-    "text-remove-from-path"
-#define INKSCAPE_ICON_TEXT_UNFLOW \
-    "text-unflow"
-#define INKSCAPE_ICON_TEXT_UNKERN \
-    "text-unkern"
-#define INKSCAPE_ICON_TOOL_NODE_EDITOR \
-    "tool-node-editor"
-#define INKSCAPE_ICON_TOOL_POINTER \
-    "tool-pointer"
-#define INKSCAPE_ICON_TOOL_TWEAK \
-    "tool-tweak"
-#define INKSCAPE_ICON_TOOL_SPRAY \
-    "tool-spray"
-#define INKSCAPE_ICON_TRANSFORM_AFFECT_GRADIENT \
-    "transform-affect-gradient"
-#define INKSCAPE_ICON_TRANSFORM_AFFECT_PATTERN \
-    "transform-affect-pattern"
-#define INKSCAPE_ICON_TRANSFORM_AFFECT_ROUNDED_CORNERS \
-    "transform-affect-rounded-corners"
-#define INKSCAPE_ICON_TRANSFORM_AFFECT_STROKE \
-    "transform-affect-stroke"
-#define INKSCAPE_ICON_TRANSFORM_MOVE_HORIZONTAL \
-    "transform-move-horizontal"
-#define INKSCAPE_ICON_TRANSFORM_MOVE_VERTICAL \
-    "transform-move-vertical"
-#define INKSCAPE_ICON_TRANSFORM_ROTATE \
-    "transform-rotate"
-#define INKSCAPE_ICON_TRANSFORM_SCALE_HORIZONTAL \
-    "transform-scale-horizontal"
-#define INKSCAPE_ICON_TRANSFORM_SCALE_VERTICAL \
-    "transform-scale-vertical"
-#define INKSCAPE_ICON_TRANSFORM_SKEW_HORIZONTAL \
-    "transform-skew-horizontal"
-#define INKSCAPE_ICON_TRANSFORM_SKEW_VERTICAL \
-    "transform-skew-vertical"
-#define INKSCAPE_ICON_VIEW_FULLSCREEN \
-    "view-fullscreen"
-#define INKSCAPE_ICON_WINDOW_NEW \
-    "window-new"
-#define INKSCAPE_ICON_WINDOW_NEXT \
-    "window-next"
-#define INKSCAPE_ICON_WINDOW_PREVIOUS \
-    "window-previous"
-#define INKSCAPE_ICON_XML_ATTRIBUTE_DELETE \
-    "xml-attribute-delete"
-#define INKSCAPE_ICON_XML_ELEMENT_NEW \
-    "xml-element-new"
-#define INKSCAPE_ICON_XML_NODE_DELETE \
-    "xml-node-delete"
-#define INKSCAPE_ICON_XML_NODE_DUPLICATE \
-    "xml-node-duplicate"
-#define INKSCAPE_ICON_XML_TEXT_NEW \
-    "xml-text-new"
-#define INKSCAPE_ICON_ZOOM \
-    "zoom"
-#define INKSCAPE_ICON_MEASURE \
-    "measure"
-#define INKSCAPE_ICON_ZOOM_DOUBLE_SIZE \
-    "zoom-double-size"
-#define INKSCAPE_ICON_ZOOM_FIT_DRAWING \
-    "zoom-fit-drawing"
-#define INKSCAPE_ICON_ZOOM_FIT_PAGE \
-    "zoom-fit-page"
-#define INKSCAPE_ICON_ZOOM_FIT_SELECTION \
-    "zoom-fit-selection"
-#define INKSCAPE_ICON_ZOOM_FIT_WIDTH \
-    "zoom-fit-width"
-#define INKSCAPE_ICON_ZOOM_HALF_SIZE \
-    "zoom-half-size"
-#define INKSCAPE_ICON_ZOOM_IN \
-    "zoom-in"
-#define INKSCAPE_ICON_ZOOM_NEXT \
-    "zoom-next"
-#define INKSCAPE_ICON_ZOOM_ORIGINAL \
-    "zoom-original"
-#define INKSCAPE_ICON_ZOOM_OUT \
-    "zoom-out"
-#define INKSCAPE_ICON_ZOOM_PREVIOUS \
-    "zoom-previous"
+/** @brief Icon name annotation.
+ * Use this macro to mark strings which are used as icon names.
+ * This greatly simplifies tasks such as obtaining a full list of icons
+ * used by Inkscape. */
+#define INKSCAPE_ICON(icon) icon
 
 #endif /* ifdef SEEN_INKSCAPE_ICON_NAMES_H */
 
diff --git a/src/ui/tool/node-tool.cpp b/src/ui/tool/node-tool.cpp
index f83f8c473..6385fce0a 100644
--- a/src/ui/tool/node-tool.cpp
+++ b/src/ui/tool/node-tool.cpp
@@ -485,7 +485,7 @@ gint ink_node_tool_root_handler(SPEventContext *event_context, GdkEvent *event)
             nt->flashed_item = over_item;
             SPCurve *c = SP_SHAPE(over_item)->getCurveBeforeLPE();
             if (!c) break; // break out when curve doesn't exist
-            c->transform(over_item->i2d_affine());
+            c->transform(over_item->i2dt_affine());
             SPCanvasItem *flash = sp_canvas_bpath_new(sp_desktop_tempgroup(desktop), c);
             sp_canvas_bpath_set_stroke(SP_CANVAS_BPATH(flash),
                 prefs->getInt("/tools/nodes/highlight_color", 0xff0000ff), 1.0,
diff --git a/src/ui/tool/path-manipulator.cpp b/src/ui/tool/path-manipulator.cpp
index 52286c6cc..1310219a1 100644
--- a/src/ui/tool/path-manipulator.cpp
+++ b/src/ui/tool/path-manipulator.cpp
@@ -120,7 +120,7 @@ PathManipulator::PathManipulator(MultiPathManipulator &mpm, SPPath *path,
     , _lpe_key(lpe_key)
 {
     if (_lpe_key.empty()) {
-        _i2d_transform = SP_ITEM(path)->i2d_affine();
+        _i2d_transform = path->i2dt_affine();
     } else {
         _i2d_transform = Geom::identity();
     }
@@ -976,7 +976,7 @@ void PathManipulator::_externalChange(unsigned type)
         } break;
     case PATH_CHANGE_TRANSFORM: {
         Geom::Affine i2d_change = _d2i_transform;
-        _i2d_transform = SP_ITEM(_path)->i2d_affine();
+        _i2d_transform = _path->i2dt_affine();
         _d2i_transform = _i2d_transform.inverse();
         i2d_change *= _i2d_transform;
         for (SubpathList::iterator i = _subpaths.begin(); i != _subpaths.end(); ++i) {
diff --git a/src/ui/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index ba4629c82..de482fb74 100644
--- a/src/ui/widget/layer-selector.cpp
+++ b/src/ui/widget/layer-selector.cpp
@@ -95,7 +95,7 @@ LayerSelector::LayerSelector(SPDesktop *desktop)
     AlternateIcons *label;
 
     label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION,
-        INKSCAPE_ICON_OBJECT_VISIBLE, INKSCAPE_ICON_OBJECT_HIDDEN));
+        INKSCAPE_ICON("object-visible"), INKSCAPE_ICON("object-hidden")));
     _visibility_toggle.add(*label);
     _visibility_toggle.signal_toggled().connect(
         sigc::compose(
@@ -116,7 +116,7 @@ LayerSelector::LayerSelector(SPDesktop *desktop)
     pack_start(_visibility_toggle, Gtk::PACK_EXPAND_PADDING);
 
     label = Gtk::manage(new AlternateIcons(Inkscape::ICON_SIZE_DECORATION,
-        INKSCAPE_ICON_OBJECT_UNLOCKED, INKSCAPE_ICON_OBJECT_LOCKED));
+        INKSCAPE_ICON("object-unlocked"), INKSCAPE_ICON("object-locked")));
     _lock_toggle.add(*label);
     _lock_toggle.signal_toggled().connect(
         sigc::compose(