Remove the icon-names.h thing, which was a mistake.

The file now contains a no-op macro which is used to mark icon names.
This way we can still generate a list of icon names we use
using a simple grep, but don't trigger unnecessary rebuilds when
a new icon names is added.

(bzr r10452)

17 files changed, 337 insertions, 905 deletions

diff --git a/src/dialogs/clonetiler.cpp b/src/dialogs/clonetiler.cpp
index f8553f2aa..d84038db8 100644
--- a/src/dialogs/clonetiler.cpp
+++ b/src/dialogs/clonetiler.cpp
@@ -1183,7 +1183,7 @@ static void clonetiler_apply(GtkWidget */*widget*/, void *)
         y0 = sp_repr_get_double_attribute (obj_repr, "inkscape:tile-y0", 0);
     } else {
         bool prefs_bbox = prefs->getBool("/tools/bounding_box", false);
-        SPItem::BBoxType bbox_type = ( prefs_bbox ? 
+        SPItem::BBoxType bbox_type = ( prefs_bbox ?
             SPItem::APPROXIMATE_BBOX : SPItem::GEOMETRIC_BBOX );
         Geom::OptRect r = SP_ITEM(obj)->getBounds(SP_ITEM(obj)->i2doc_affine(),
                                                         bbox_type);
@@ -1641,7 +1641,7 @@ static GtkWidget * clonetiler_table_x_y_rand(int values)
     {
         GtkWidget *hb = gtk_hbox_new (FALSE, 0);
 
-        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_OBJECT_ROWS);
+        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("object-rows"));
         gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2);
 
         GtkWidget *l = gtk_label_new ("");
@@ -1654,7 +1654,7 @@ static GtkWidget * clonetiler_table_x_y_rand(int values)
     {
         GtkWidget *hb = gtk_hbox_new (FALSE, 0);
 
-        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_OBJECT_COLUMNS);
+        GtkWidget *i = sp_icon_new (Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("object-columns"));
         gtk_box_pack_start (GTK_BOX (hb), i, FALSE, FALSE, 2);
 
         GtkWidget *l = gtk_label_new ("");
@@ -1812,7 +1812,7 @@ void clonetiler_dialog(void)
 // Symmetry
         {
             GtkWidget *vb = clonetiler_new_tab (nb, _("_Symmetry"));
-            
+
 	    /* TRANSLATORS: For the following 17 symmetry groups, see
              * http://www.bib.ulb.ac.be/coursmath/doc/17.htm (visual examples);
              * http://www.clarku.edu/~djoyce/wallpaper/seventeen.html (English vocabulary); or
@@ -1850,14 +1850,14 @@ void clonetiler_dialog(void)
 	    // the symmetry group combo box.
 	    GtkListStore *store = gtk_list_store_new (1, G_TYPE_STRING);
 	    GtkTreeIter iter;
-            
+
 	    for (unsigned j = 0; j < G_N_ELEMENTS(sym_groups); ++j) {
                 SymGroups const &sg = sym_groups[j];
 
 		// Add the description of the symgroup to a new row
 		gtk_list_store_append (store, &iter);
-		gtk_list_store_set (store, &iter, 
-				    0, sg.label, 
+		gtk_list_store_set (store, &iter,
+				    0, sg.label,
 				    -1);
             }
 
diff --git a/src/dialogs/text-edit.cpp b/src/dialogs/text-edit.cpp
index 16166d97e..ce3165632 100644
--- a/src/dialogs/text-edit.cpp
+++ b/src/dialogs/text-edit.cpp
@@ -299,7 +299,7 @@ sp_text_edit_dialog (void)
                     // horizontal
                     {
                         GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                                                      INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
+                                                      INKSCAPE_ICON("format-text-direction-horizontal") );
                         GtkWidget *b = group = gtk_radio_button_new (NULL);
                         gtk_widget_set_tooltip_text (b, _("Horizontal text"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
@@ -307,13 +307,13 @@ sp_text_edit_dialog (void)
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
                         gtk_container_add (GTK_CONTAINER (b), px);
                         gtk_box_pack_start (GTK_BOX (row), b, FALSE, FALSE, 0);
-                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL, b);
+                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-horizontal"), b);
                     }
 
                     // vertical
                     {
                         GtkWidget *px = sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                                                      INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL );
+                                                      INKSCAPE_ICON("format-text-direction-vertical") );
                         GtkWidget *b = gtk_radio_button_new (gtk_radio_button_get_group (GTK_RADIO_BUTTON (group)));
                         gtk_widget_set_tooltip_text (b, _("Vertical text"));
                         gtk_button_set_relief (GTK_BUTTON (b), GTK_RELIEF_NONE);
@@ -321,12 +321,12 @@ sp_text_edit_dialog (void)
                         gtk_toggle_button_set_mode (GTK_TOGGLE_BUTTON (b), FALSE);
                         gtk_container_add (GTK_CONTAINER (b), px);
                         gtk_box_pack_start (GTK_BOX (row), b, FALSE, FALSE, 0);
-                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL, b);
+                        g_object_set_data (G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-vertical"), b);
                     }
 
                     gtk_box_pack_start (GTK_BOX (l_vb), row, FALSE, FALSE, 0);
                 }
-				
+
                 {
                     GtkWidget *row = gtk_hbox_new (FALSE, VB_MARGIN);
 
@@ -604,7 +604,7 @@ sp_get_text_dialog_style ()
             }
         }
 
-        b = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
+        b = (GtkWidget*)g_object_get_data (G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-horizontal") );
 
         if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (b))) {
             sp_repr_css_set_property (css, "writing-mode", "lr");
@@ -818,9 +818,9 @@ sp_text_edit_dialog_read_selection ( GtkWidget *dlg,
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b), TRUE);
 
         if (query->writing_mode.computed == SP_CSS_WRITING_MODE_LR_TB) {
-            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL );
+            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-horizontal") );
         } else {
-            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL );
+            b = (GtkWidget*)g_object_get_data ( G_OBJECT (dlg), INKSCAPE_ICON("format-text-direction-vertical") );
         }
         gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (b), TRUE);
 
diff --git a/src/dialogs/xml-tree.cpp b/src/dialogs/xml-tree.cpp
index 1a003c9c7..2f489c4b5 100644
--- a/src/dialogs/xml-tree.cpp
+++ b/src/dialogs/xml-tree.cpp
@@ -284,7 +284,7 @@ void sp_xml_tree_dialog()
                 _("New element node"),
                 NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                                    INKSCAPE_ICON_XML_ELEMENT_NEW ),
+                                    INKSCAPE_ICON("xml-element-new") ),
                 G_CALLBACK(cmd_new_element_node),
                 NULL);
 
@@ -305,7 +305,7 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, _("New text node"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_TEXT_NEW ),
+                             INKSCAPE_ICON("xml-text-new") ),
                 G_CALLBACK(cmd_new_text_node),
                 NULL);
 
@@ -326,7 +326,7 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, _("Duplicate node"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_NODE_DUPLICATE ),
+                             INKSCAPE_ICON("xml-node-duplicate") ),
                 G_CALLBACK(cmd_duplicate_node),
                 NULL);
 
@@ -338,7 +338,7 @@ void sp_xml_tree_dialog()
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
 
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
@@ -348,16 +348,16 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, Q_("nodeAsInXMLdialogTooltip|Delete node"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_NODE_DELETE ),
+                             INKSCAPE_ICON("xml-node-delete") ),
                                            G_CALLBACK(cmd_delete_node), NULL );
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                         G_CALLBACK(on_tree_select_row_enable_if_mutable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -370,12 +370,12 @@ void sp_xml_tree_dialog()
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                     G_CALLBACK(on_tree_select_row_enable_if_has_grandparent),
-                    button, 
+                    button,
 		    (GConnectFlags)0);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
 
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
@@ -386,11 +386,11 @@ void sp_xml_tree_dialog()
                         G_CALLBACK(cmd_indent_node), NULL);
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                         G_CALLBACK(on_tree_select_row_enable_if_indentable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                        (GCallback) on_tree_unselect_row_disable,
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -400,11 +400,11 @@ void sp_xml_tree_dialog()
                         G_CALLBACK(cmd_raise_node), NULL);
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                     G_CALLBACK(on_tree_select_row_enable_if_not_first_child),
-                    button, 
+                    button,
 		    (GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -414,11 +414,11 @@ void sp_xml_tree_dialog()
                         G_CALLBACK(cmd_lower_node), NULL);
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                         G_CALLBACK(on_tree_select_row_enable_if_not_last_child),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                         G_CALLBACK(on_tree_unselect_row_disable),
-                        button, 
+                        button,
 			(GConnectFlags)0);
         gtk_widget_set_sensitive(GTK_WIDGET(button), FALSE);
 
@@ -458,7 +458,7 @@ void sp_xml_tree_dialog()
         button = gtk_toolbar_append_item(GTK_TOOLBAR(toolbar),
                 NULL, _("Delete attribute"), NULL,
                 sp_icon_new( Inkscape::ICON_SIZE_LARGE_TOOLBAR,
-                             INKSCAPE_ICON_XML_ATTRIBUTE_DELETE ),
+                             INKSCAPE_ICON("xml-attribute-delete") ),
                (GCallback) cmd_delete_attr, NULL);
 
         g_signal_connect_object(G_OBJECT(attributes), "select_row",
@@ -583,24 +583,24 @@ void sp_xml_tree_dialog()
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                        (GCallback) on_tree_select_row_show_if_element,
-                        attr_container, 
+                        attr_container,
 			(GConnectFlags)0);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                        (GCallback) on_tree_unselect_row_hide,
-                        attr_container, 
+                        attr_container,
 			(GConnectFlags)0);
 
         gtk_widget_hide(attr_container);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_select_row",
                        (GCallback) on_tree_select_row_show_if_text,
-                        text_container, 
+                        text_container,
 			(GConnectFlags)0);
 
         g_signal_connect_object(G_OBJECT(tree), "tree_unselect_row",
                        (GCallback) on_tree_unselect_row_hide,
-                        text_container, 
+                        text_container,
 			(GConnectFlags)0);
 
         gtk_widget_hide(text_container);
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..904432d65 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,
@@ -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/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/layers.cpp b/src/ui/dialog/layers.cpp
index 8d2d25162..3863dafc5 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-visible")) );
     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-locked")) );
     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/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/widget/layer-selector.cpp b/src/ui/widget/layer-selector.cpp
index ba4629c82..e254b8599 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-visible")));
     _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-unlocked")));
     _lock_toggle.add(*label);
     _lock_toggle.signal_toggled().connect(
         sigc::compose(
diff --git a/src/verbs.cpp b/src/verbs.cpp
index bb22711e8..e443e9917 100644
--- a/src/verbs.cpp
+++ b/src/verbs.cpp
@@ -2257,17 +2257,17 @@ Verb *Verb::_base_verbs[] = {
                  GTK_STOCK_PRINT ),
     // TRANSLATORS: "Vacuum Defs" means "Clean up defs" (so as to remove unused definitions)
     new FileVerb(SP_VERB_FILE_VACUUM, "FileVacuum", N_("Vac_uum Defs"), N_("Remove unused definitions (such as gradients or clipping paths) from the &lt;defs&gt; of the document"),
-                 INKSCAPE_ICON_DOCUMENT_CLEANUP ),
+                 INKSCAPE_ICON("document-cleanup") ),
     new FileVerb(SP_VERB_FILE_IMPORT, "FileImport", N_("_Import..."),
-                 N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON_DOCUMENT_IMPORT),
+                 N_("Import a bitmap or SVG image into this document"), INKSCAPE_ICON("document-import")),
     new FileVerb(SP_VERB_FILE_EXPORT, "FileExport", N_("_Export Bitmap..."),
-                 N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON_DOCUMENT_EXPORT),
-    new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import From Open Clip Art Library"), N_("Import a document from Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_IMPORT_OCAL),
-//    new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON_DOCUMENT_EXPORT_OCAL),
+                 N_("Export this document or a selection as a bitmap image"), INKSCAPE_ICON("document-export")),
+    new FileVerb(SP_VERB_FILE_IMPORT_FROM_OCAL, "FileImportFromOCAL", N_("Import From Open Clip Art Library"), N_("Import a document from Open Clip Art Library"), INKSCAPE_ICON("document-import-ocal")),
+//    new FileVerb(SP_VERB_FILE_EXPORT_TO_OCAL, "FileExportToOCAL", N_("Export To Open Clip Art Library"), N_("Export this document to Open Clip Art Library"), INKSCAPE_ICON("document-export-ocal")),
     new FileVerb(SP_VERB_FILE_NEXT_DESKTOP, "NextWindow", N_("N_ext Window"),
-                 N_("Switch to the next document window"), INKSCAPE_ICON_WINDOW_NEXT),
+                 N_("Switch to the next document window"), INKSCAPE_ICON("window-next")),
     new FileVerb(SP_VERB_FILE_PREV_DESKTOP, "PrevWindow", N_("P_revious Window"),
-                 N_("Switch to the previous document window"), INKSCAPE_ICON_WINDOW_PREVIOUS),
+                 N_("Switch to the previous document window"), INKSCAPE_ICON("window-previous")),
     new FileVerb(SP_VERB_FILE_CLOSE_VIEW, "FileClose", N_("_Close"),
                  N_("Close this document window"), GTK_STOCK_CLOSE),
     new FileVerb(SP_VERB_FILE_QUIT, "FileQuit", N_("_Quit"), N_("Quit Inkscape"), GTK_STOCK_QUIT),
@@ -2284,7 +2284,7 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_PASTE, "EditPaste", N_("_Paste"),
                  N_("Paste objects from clipboard to mouse point, or paste text"), GTK_STOCK_PASTE),
     new EditVerb(SP_VERB_EDIT_PASTE_STYLE, "EditPasteStyle", N_("Paste _Style"),
-                 N_("Apply the style of the copied object to selection"), INKSCAPE_ICON_EDIT_PASTE_STYLE),
+                 N_("Apply the style of the copied object to selection"), INKSCAPE_ICON("edit-paste-style")),
     new EditVerb(SP_VERB_EDIT_PASTE_SIZE, "EditPasteSize", N_("Paste Si_ze"),
                  N_("Scale selection to match the size of the copied object"), NULL),
     new EditVerb(SP_VERB_EDIT_PASTE_SIZE_X, "EditPasteWidth", N_("Paste _Width"),
@@ -2298,7 +2298,7 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_PASTE_SIZE_SEPARATELY_Y, "EditPasteHeightSeparately", N_("Paste Height Separately"),
                  N_("Scale each selected object vertically to match the height of the copied object"), NULL),
     new EditVerb(SP_VERB_EDIT_PASTE_IN_PLACE, "EditPasteInPlace", N_("Paste _In Place"),
-                 N_("Paste objects from clipboard to the original location"), INKSCAPE_ICON_EDIT_PASTE_IN_PLACE),
+                 N_("Paste objects from clipboard to the original location"), INKSCAPE_ICON("edit-paste-in-place")),
     new EditVerb(SP_VERB_EDIT_PASTE_LIVEPATHEFFECT, "PasteLivePathEffect", N_("Paste Path _Effect"),
                  N_("Apply the path effect of the copied object to selection"), NULL),
     new EditVerb(SP_VERB_EDIT_REMOVE_LIVEPATHEFFECT, "RemoveLivePathEffect", N_("Remove Path _Effect"),
@@ -2308,15 +2308,15 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_DELETE, "EditDelete", N_("_Delete"),
                  N_("Delete selection"), GTK_STOCK_DELETE),
     new EditVerb(SP_VERB_EDIT_DUPLICATE, "EditDuplicate", N_("Duplic_ate"),
-                 N_("Duplicate selected objects"), INKSCAPE_ICON_EDIT_DUPLICATE),
+                 N_("Duplicate selected objects"), INKSCAPE_ICON("edit-duplicate")),
     new EditVerb(SP_VERB_EDIT_CLONE, "EditClone", N_("Create Clo_ne"),
-                 N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON_EDIT_CLONE),
+                 N_("Create a clone (a copy linked to the original) of selected object"), INKSCAPE_ICON("edit-clone")),
     new EditVerb(SP_VERB_EDIT_UNLINK_CLONE, "EditUnlinkClone", N_("Unlin_k Clone"),
-                 N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON_EDIT_CLONE_UNLINK),
+                 N_("Cut the selected clones' links to the originals, turning them into standalone objects"), INKSCAPE_ICON("edit-clone-unlink")),
     new EditVerb(SP_VERB_EDIT_RELINK_CLONE, "EditRelinkClone", N_("Relink to Copied"),
                  N_("Relink the selected clones to the object currently on the clipboard"), NULL),
     new EditVerb(SP_VERB_EDIT_CLONE_SELECT_ORIGINAL, "EditCloneSelectOriginal", N_("Select _Original"),
-                 N_("Select the object to which the selected clone is linked"), INKSCAPE_ICON_EDIT_SELECT_ORIGINAL),
+                 N_("Select the object to which the selected clone is linked"), INKSCAPE_ICON("edit-select-original")),
     new EditVerb(SP_VERB_EDIT_SELECTION_2_MARKER, "ObjectsToMarker", N_("Objects to _Marker"),
                  N_("Convert selection to a line marker"), NULL),
     new EditVerb(SP_VERB_EDIT_SELECTION_2_GUIDES, "ObjectsToGuides", N_("Objects to Gu_ides"),
@@ -2330,9 +2330,9 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_SELECT_ALL, "EditSelectAll", N_("Select Al_l"),
                  N_("Select all objects or all nodes"), GTK_STOCK_SELECT_ALL),
     new EditVerb(SP_VERB_EDIT_SELECT_ALL_IN_ALL_LAYERS, "EditSelectAllInAllLayers", N_("Select All in All La_yers"),
-                 N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON_EDIT_SELECT_ALL_LAYERS),
+                 N_("Select all objects in all visible and unlocked layers"), INKSCAPE_ICON("edit-select-all-layers")),
     new EditVerb(SP_VERB_EDIT_INVERT, "EditInvert", N_("In_vert Selection"),
-                 N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON_EDIT_SELECT_INVERT),
+                 N_("Invert selection (unselect what is selected and select everything else)"), INKSCAPE_ICON("edit-select-invert")),
     new EditVerb(SP_VERB_EDIT_INVERT_IN_ALL_LAYERS, "EditInvertInAllLayers", N_("Invert in All Layers"),
                  N_("Invert selection in all visible and unlocked layers"), NULL),
     new EditVerb(SP_VERB_EDIT_SELECT_NEXT, "EditSelectNext", N_("Select Next"),
@@ -2340,56 +2340,56 @@ Verb *Verb::_base_verbs[] = {
     new EditVerb(SP_VERB_EDIT_SELECT_PREV, "EditSelectPrev", N_("Select Previous"),
                  N_("Select previous object or node"), NULL),
     new EditVerb(SP_VERB_EDIT_DESELECT, "EditDeselect", N_("D_eselect"),
-                 N_("Deselect any selected objects or nodes"), INKSCAPE_ICON_EDIT_SELECT_NONE),
+                 N_("Deselect any selected objects or nodes"), INKSCAPE_ICON("edit-select-none")),
     new EditVerb(SP_VERB_EDIT_GUIDES_AROUND_PAGE, "EditGuidesAroundPage", N_("Create _Guides Around the Page"),
                  N_("Create four guides aligned with the page borders"), NULL),
     new EditVerb(SP_VERB_EDIT_DELETE_ALL_GUIDES, "EditRemoveAllGuides", N_("Delete All Guides"),
                  N_("Create four guides aligned with the page borders"), NULL),
     new EditVerb(SP_VERB_EDIT_NEXT_PATHEFFECT_PARAMETER, "EditNextPathEffectParameter", N_("Next path effect parameter"),
-                 N_("Show next editable path effect parameter"), INKSCAPE_ICON_PATH_EFFECT_PARAMETER_NEXT),
+                 N_("Show next editable path effect parameter"), INKSCAPE_ICON("path-effect-parameter-next")),
 
     /* Selection */
     new SelectionVerb(SP_VERB_SELECTION_TO_FRONT, "SelectionToFront", N_("Raise to _Top"),
-                      N_("Raise selection to top"), INKSCAPE_ICON_SELECTION_TOP),
+                      N_("Raise selection to top"), INKSCAPE_ICON("selection-top")),
     new SelectionVerb(SP_VERB_SELECTION_TO_BACK, "SelectionToBack", N_("Lower to _Bottom"),
-                      N_("Lower selection to bottom"), INKSCAPE_ICON_SELECTION_BOTTOM),
+                      N_("Lower selection to bottom"), INKSCAPE_ICON("selection-bottom")),
     new SelectionVerb(SP_VERB_SELECTION_RAISE, "SelectionRaise", N_("_Raise"),
-                      N_("Raise selection one step"), INKSCAPE_ICON_SELECTION_RAISE),
+                      N_("Raise selection one step"), INKSCAPE_ICON("selection-raise")),
     new SelectionVerb(SP_VERB_SELECTION_LOWER, "SelectionLower", N_("_Lower"),
-                      N_("Lower selection one step"), INKSCAPE_ICON_SELECTION_LOWER),
+                      N_("Lower selection one step"), INKSCAPE_ICON("selection-lower")),
     new SelectionVerb(SP_VERB_SELECTION_GROUP, "SelectionGroup", N_("_Group"),
-                      N_("Group selected objects"), INKSCAPE_ICON_OBJECT_GROUP),
+                      N_("Group selected objects"), INKSCAPE_ICON("object-group")),
     new SelectionVerb(SP_VERB_SELECTION_UNGROUP, "SelectionUnGroup", N_("_Ungroup"),
-                      N_("Ungroup selected groups"), INKSCAPE_ICON_OBJECT_UNGROUP),
+                      N_("Ungroup selected groups"), INKSCAPE_ICON("object-ungroup")),
 
     new SelectionVerb(SP_VERB_SELECTION_TEXTTOPATH, "SelectionTextToPath", N_("_Put on Path"),
-                      N_("Put text on path"), INKSCAPE_ICON_TEXT_PUT_ON_PATH),
+                      N_("Put text on path"), INKSCAPE_ICON("text-put-on-path")),
     new SelectionVerb(SP_VERB_SELECTION_TEXTFROMPATH, "SelectionTextFromPath", N_("_Remove from Path"),
-                      N_("Remove text from path"), INKSCAPE_ICON_TEXT_REMOVE_FROM_PATH),
+                      N_("Remove text from path"), INKSCAPE_ICON("text-remove-from-path")),
     new SelectionVerb(SP_VERB_SELECTION_REMOVE_KERNS, "SelectionTextRemoveKerns", N_("Remove Manual _Kerns"),
                       // TRANSLATORS: "glyph": An image used in the visual representation of characters;
                       //  roughly speaking, how a character looks. A font is a set of glyphs.
-                      N_("Remove all manual kerns and glyph rotations from a text object"), INKSCAPE_ICON_TEXT_UNKERN),
+                      N_("Remove all manual kerns and glyph rotations from a text object"), INKSCAPE_ICON("text-unkern")),
 
     new SelectionVerb(SP_VERB_SELECTION_UNION, "SelectionUnion", N_("_Union"),
-                      N_("Create union of selected paths"), INKSCAPE_ICON_PATH_UNION),
+                      N_("Create union of selected paths"), INKSCAPE_ICON("path-union")),
     new SelectionVerb(SP_VERB_SELECTION_INTERSECT, "SelectionIntersect", N_("_Intersection"),
-                      N_("Create intersection of selected paths"), INKSCAPE_ICON_PATH_INTERSECTION),
+                      N_("Create intersection of selected paths"), INKSCAPE_ICON("path-intersection")),
     new SelectionVerb(SP_VERB_SELECTION_DIFF, "SelectionDiff", N_("_Difference"),
-                      N_("Create difference of selected paths (bottom minus top)"), INKSCAPE_ICON_PATH_DIFFERENCE),
+                      N_("Create difference of selected paths (bottom minus top)"), INKSCAPE_ICON("path-difference")),
     new SelectionVerb(SP_VERB_SELECTION_SYMDIFF, "SelectionSymDiff", N_("E_xclusion"),
-                      N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), INKSCAPE_ICON_PATH_EXCLUSION),
+                      N_("Create exclusive OR of selected paths (those parts that belong to only one path)"), INKSCAPE_ICON("path-exclusion")),
     new SelectionVerb(SP_VERB_SELECTION_CUT, "SelectionDivide", N_("Di_vision"),
-                      N_("Cut the bottom path into pieces"), INKSCAPE_ICON_PATH_DIVISION),
+                      N_("Cut the bottom path into pieces"), INKSCAPE_ICON("path-division")),
     // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_SLICE, "SelectionCutPath", N_("Cut _Path"),
-                      N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON_PATH_CUT),
+                      N_("Cut the bottom path's stroke into pieces, removing fill"), INKSCAPE_ICON("path-cut")),
     // TRANSLATORS: "outset": expand a shape by offsetting the object's path,
     // i.e. by displacing it perpendicular to the path in each point.
     // See also the Advanced Tutorial for explanation.
     new SelectionVerb(SP_VERB_SELECTION_OFFSET, "SelectionOffset", N_("Outs_et"),
-                      N_("Outset selected paths"), INKSCAPE_ICON_PATH_OUTSET),
+                      N_("Outset selected paths"), INKSCAPE_ICON("path-outset")),
     new SelectionVerb(SP_VERB_SELECTION_OFFSET_SCREEN, "SelectionOffsetScreen",
                       N_("O_utset Path by 1 px"),
                       N_("Outset selected paths by 1 px"), NULL),
@@ -2400,7 +2400,7 @@ Verb *Verb::_base_verbs[] = {
     // i.e. by displacing it perpendicular to the path in each point.
     // See also the Advanced Tutorial for explanation.
     new SelectionVerb(SP_VERB_SELECTION_INSET, "SelectionInset", N_("I_nset"),
-                      N_("Inset selected paths"), INKSCAPE_ICON_PATH_INSET),
+                      N_("Inset selected paths"), INKSCAPE_ICON("path-inset")),
     new SelectionVerb(SP_VERB_SELECTION_INSET_SCREEN, "SelectionInsetScreen",
                       N_("I_nset Path by 1 px"),
                       N_("Inset selected paths by 1 px"), NULL),
@@ -2408,55 +2408,55 @@ Verb *Verb::_base_verbs[] = {
                       N_("I_nset Path by 10 px"),
                       N_("Inset selected paths by 10 px"), NULL),
     new SelectionVerb(SP_VERB_SELECTION_DYNAMIC_OFFSET, "SelectionDynOffset",
-                      N_("D_ynamic Offset"), N_("Create a dynamic offset object"), INKSCAPE_ICON_PATH_OFFSET_DYNAMIC),
+                      N_("D_ynamic Offset"), N_("Create a dynamic offset object"), INKSCAPE_ICON("path-offset-dynamic")),
     new SelectionVerb(SP_VERB_SELECTION_LINKED_OFFSET, "SelectionLinkedOffset",
                       N_("_Linked Offset"),
                       N_("Create a dynamic offset object linked to the original path"),
-                      INKSCAPE_ICON_PATH_OFFSET_LINKED),
+                      INKSCAPE_ICON("path-offset-linked")),
     new SelectionVerb(SP_VERB_SELECTION_OUTLINE, "StrokeToPath", N_("_Stroke to Path"),
-                      N_("Convert selected object's stroke to paths"), INKSCAPE_ICON_STROKE_TO_PATH),
+                      N_("Convert selected object's stroke to paths"), INKSCAPE_ICON("stroke-to-path")),
     new SelectionVerb(SP_VERB_SELECTION_SIMPLIFY, "SelectionSimplify", N_("Si_mplify"),
-                      N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON_PATH_SIMPLIFY),
+                      N_("Simplify selected paths (remove extra nodes)"), INKSCAPE_ICON("path-simplify")),
     new SelectionVerb(SP_VERB_SELECTION_REVERSE, "SelectionReverse", N_("_Reverse"),
-                      N_("Reverse the direction of selected paths (useful for flipping markers)"), INKSCAPE_ICON_PATH_REVERSE),
+                      N_("Reverse the direction of selected paths (useful for flipping markers)"), INKSCAPE_ICON("path-reverse")),
     // TRANSLATORS: "to trace" means "to convert a bitmap to vector graphics" (to vectorize)
     new SelectionVerb(SP_VERB_SELECTION_TRACE, "SelectionTrace", N_("_Trace Bitmap..."),
-                      N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON_BITMAP_TRACE),
+                      N_("Create one or more paths from a bitmap by tracing it"), INKSCAPE_ICON("bitmap-trace")),
     new SelectionVerb(SP_VERB_SELECTION_CREATE_BITMAP, "SelectionCreateBitmap", N_("_Make a Bitmap Copy"),
-                      N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON_SELECTION_MAKE_BITMAP_COPY ),
+                      N_("Export selection to a bitmap and insert it into document"), INKSCAPE_ICON("selection-make-bitmap-copy") ),
     new SelectionVerb(SP_VERB_SELECTION_COMBINE, "SelectionCombine", N_("_Combine"),
-                      N_("Combine several paths into one"), INKSCAPE_ICON_PATH_COMBINE),
+                      N_("Combine several paths into one"), INKSCAPE_ICON("path-combine")),
     // TRANSLATORS: "to cut a path" is not the same as "to break a path apart" - see the
     // Advanced tutorial for more info
     new SelectionVerb(SP_VERB_SELECTION_BREAK_APART, "SelectionBreakApart", N_("Break _Apart"),
-                      N_("Break selected paths into subpaths"), INKSCAPE_ICON_PATH_BREAK_APART),
+                      N_("Break selected paths into subpaths"), INKSCAPE_ICON("path-break-apart")),
     new SelectionVerb(SP_VERB_SELECTION_GRIDTILE, "DialogGridArrange", N_("Ro_ws and Columns..."),
-                      N_("Arrange selected objects in a table"), INKSCAPE_ICON_DIALOG_ROWS_AND_COLUMNS),
+                      N_("Arrange selected objects in a table"), INKSCAPE_ICON("dialog-rows-and-columns")),
     /* Layer */
     new LayerVerb(SP_VERB_LAYER_NEW, "LayerNew", N_("_Add Layer..."),
-                  N_("Create a new layer"), INKSCAPE_ICON_LAYER_NEW),
+                  N_("Create a new layer"), INKSCAPE_ICON("layer-new")),
     new LayerVerb(SP_VERB_LAYER_RENAME, "LayerRename", N_("Re_name Layer..."),
-                  N_("Rename the current layer"), INKSCAPE_ICON_LAYER_RENAME),
+                  N_("Rename the current layer"), INKSCAPE_ICON("layer-rename")),
     new LayerVerb(SP_VERB_LAYER_NEXT, "LayerNext", N_("Switch to Layer Abov_e"),
-                  N_("Switch to the layer above the current"), INKSCAPE_ICON_LAYER_PREVIOUS),
+                  N_("Switch to the layer above the current"), INKSCAPE_ICON("layer-previous")),
     new LayerVerb(SP_VERB_LAYER_PREV, "LayerPrev", N_("Switch to Layer Belo_w"),
-                  N_("Switch to the layer below the current"), INKSCAPE_ICON_LAYER_NEXT),
+                  N_("Switch to the layer below the current"), INKSCAPE_ICON("layer-next")),
     new LayerVerb(SP_VERB_LAYER_MOVE_TO_NEXT, "LayerMoveToNext", N_("Move Selection to Layer Abo_ve"),
-                  N_("Move selection to the layer above the current"), INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_ABOVE),
+                  N_("Move selection to the layer above the current"), INKSCAPE_ICON("selection-move-to-layer-above")),
     new LayerVerb(SP_VERB_LAYER_MOVE_TO_PREV, "LayerMoveToPrev", N_("Move Selection to Layer Bel_ow"),
-                  N_("Move selection to the layer below the current"), INKSCAPE_ICON_SELECTION_MOVE_TO_LAYER_BELOW),
+                  N_("Move selection to the layer below the current"), INKSCAPE_ICON("selection-move-to-layer-below")),
     new LayerVerb(SP_VERB_LAYER_TO_TOP, "LayerToTop", N_("Layer to _Top"),
-                  N_("Raise the current layer to the top"), INKSCAPE_ICON_LAYER_TOP),
+                  N_("Raise the current layer to the top"), INKSCAPE_ICON("layer-top")),
     new LayerVerb(SP_VERB_LAYER_TO_BOTTOM, "LayerToBottom", N_("Layer to _Bottom"),
-                  N_("Lower the current layer to the bottom"), INKSCAPE_ICON_LAYER_BOTTOM),
+                  N_("Lower the current layer to the bottom"), INKSCAPE_ICON("layer-bottom")),
     new LayerVerb(SP_VERB_LAYER_RAISE, "LayerRaise", N_("_Raise Layer"),
-                  N_("Raise the current layer"), INKSCAPE_ICON_LAYER_RAISE),
+                  N_("Raise the current layer"), INKSCAPE_ICON("layer-raise")),
     new LayerVerb(SP_VERB_LAYER_LOWER, "LayerLower", N_("_Lower Layer"),
-                  N_("Lower the current layer"), INKSCAPE_ICON_LAYER_LOWER),
+                  N_("Lower the current layer"), INKSCAPE_ICON("layer-lower")),
     new LayerVerb(SP_VERB_LAYER_DUPLICATE, "LayerDuplicate", N_("D_uplicate Current Layer"),
                   N_("Duplicate an existing layer"), NULL),
     new LayerVerb(SP_VERB_LAYER_DELETE, "LayerDelete", N_("_Delete Current Layer"),
-                  N_("Delete the current layer"), INKSCAPE_ICON_LAYER_DELETE),
+                  N_("Delete the current layer"), INKSCAPE_ICON("layer-delete")),
     new LayerVerb(SP_VERB_LAYER_SOLO, "LayerSolo", N_("_Show/hide other layers"),
                   N_("Solo the current layer"), NULL),
 
@@ -2464,83 +2464,83 @@ Verb *Verb::_base_verbs[] = {
     new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CW, "ObjectRotate90", N_("Rotate _90&#176; CW"),
                    // This is shared between tooltips and statusbar, so they
                    // must use UTF-8, not HTML entities for special characters.
-                   N_("Rotate selection 90\xc2\xb0 clockwise"), INKSCAPE_ICON_OBJECT_ROTATE_RIGHT),
+                   N_("Rotate selection 90\xc2\xb0 clockwise"), INKSCAPE_ICON("object-rotate-right")),
     new ObjectVerb(SP_VERB_OBJECT_ROTATE_90_CCW, "ObjectRotate90CCW", N_("Rotate 9_0&#176; CCW"),
                    // This is shared between tooltips and statusbar, so they
                    // must use UTF-8, not HTML entities for special characters.
-                   N_("Rotate selection 90\xc2\xb0 counter-clockwise"), INKSCAPE_ICON_OBJECT_ROTATE_LEFT),
+                   N_("Rotate selection 90\xc2\xb0 counter-clockwise"), INKSCAPE_ICON("object-rotate-left")),
     new ObjectVerb(SP_VERB_OBJECT_FLATTEN, "ObjectRemoveTransform", N_("Remove _Transformations"),
                    N_("Remove transformations from object"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_TO_CURVE, "ObjectToPath", N_("_Object to Path"),
-                   N_("Convert selected object to path"), INKSCAPE_ICON_OBJECT_TO_PATH),
+                   N_("Convert selected object to path"), INKSCAPE_ICON("object-to-path")),
     new ObjectVerb(SP_VERB_OBJECT_FLOW_TEXT, "ObjectFlowText", N_("_Flow into Frame"),
                    N_("Put text into a frame (path or shape), creating a flowed text linked to the frame object"), "text-flow-into-frame"),
     new ObjectVerb(SP_VERB_OBJECT_UNFLOW_TEXT, "ObjectUnFlowText", N_("_Unflow"),
-                   N_("Remove text from frame (creates a single-line text object)"), INKSCAPE_ICON_TEXT_UNFLOW),
+                   N_("Remove text from frame (creates a single-line text object)"), INKSCAPE_ICON("text-unflow")),
     new ObjectVerb(SP_VERB_OBJECT_FLOWTEXT_TO_TEXT, "ObjectFlowtextToText", N_("_Convert to Text"),
-                   N_("Convert flowed text to regular text object (preserves appearance)"), INKSCAPE_ICON_TEXT_CONVERT_TO_REGULAR),
+                   N_("Convert flowed text to regular text object (preserves appearance)"), INKSCAPE_ICON("text-convert-to-regular")),
     new ObjectVerb(SP_VERB_OBJECT_FLIP_HORIZONTAL, "ObjectFlipHorizontally",
                    N_("Flip _Horizontal"), N_("Flip selected objects horizontally"),
-                   INKSCAPE_ICON_OBJECT_FLIP_HORIZONTAL),
+                   INKSCAPE_ICON("object-flip-horizontal")),
     new ObjectVerb(SP_VERB_OBJECT_FLIP_VERTICAL, "ObjectFlipVertically",
                    N_("Flip _Vertical"), N_("Flip selected objects vertically"),
-                   INKSCAPE_ICON_OBJECT_FLIP_VERTICAL),
+                   INKSCAPE_ICON("object-flip-vertical")),
     new ObjectVerb(SP_VERB_OBJECT_SET_MASK, "ObjectSetMask", N_("_Set"),
                  N_("Apply mask to selection (using the topmost object as mask)"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_EDIT_MASK, "ObjectEditMask", N_("_Edit"),
-                 N_("Edit mask"), INKSCAPE_ICON_PATH_MASK_EDIT),
+                 N_("Edit mask"), INKSCAPE_ICON("path-mask-edit")),
     new ObjectVerb(SP_VERB_OBJECT_UNSET_MASK, "ObjectUnSetMask", N_("_Release"),
                  N_("Remove mask from selection"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_SET_CLIPPATH, "ObjectSetClipPath", N_("_Set"),
                  N_("Apply clipping path to selection (using the topmost object as clipping path)"), NULL),
     new ObjectVerb(SP_VERB_OBJECT_EDIT_CLIPPATH, "ObjectEditClipPath", N_("_Edit"),
-                 N_("Edit clipping path"), INKSCAPE_ICON_PATH_CLIP_EDIT),
+                 N_("Edit clipping path"), INKSCAPE_ICON("path-clip-edit")),
     new ObjectVerb(SP_VERB_OBJECT_UNSET_CLIPPATH, "ObjectUnSetClipPath", N_("_Release"),
                  N_("Remove clipping path from selection"), NULL),
 
     /* Tools */
     new ContextVerb(SP_VERB_CONTEXT_SELECT, "ToolSelector", N_("Select"),
-                    N_("Select and transform objects"), INKSCAPE_ICON_TOOL_POINTER),
+                    N_("Select and transform objects"), INKSCAPE_ICON("tool-pointer")),
     new ContextVerb(SP_VERB_CONTEXT_NODE, "ToolNode", N_("Node Edit"),
-                    N_("Edit paths by nodes"), INKSCAPE_ICON_TOOL_NODE_EDITOR),
+                    N_("Edit paths by nodes"), INKSCAPE_ICON("tool-node-editor")),
     new ContextVerb(SP_VERB_CONTEXT_TWEAK, "ToolTweak", N_("Tweak"),
-                    N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON_TOOL_TWEAK),
+                    N_("Tweak objects by sculpting or painting"), INKSCAPE_ICON("tool-tweak")),
     new ContextVerb(SP_VERB_CONTEXT_SPRAY, "ToolSpray", N_("Spray"),
-                    N_("Spray objects by sculpting or painting"), INKSCAPE_ICON_TOOL_SPRAY), 
+                    N_("Spray objects by sculpting or painting"), INKSCAPE_ICON("tool-spray")),
     new ContextVerb(SP_VERB_CONTEXT_RECT, "ToolRect", N_("Rectangle"),
-                    N_("Create rectangles and squares"), INKSCAPE_ICON_DRAW_RECTANGLE),
+                    N_("Create rectangles and squares"), INKSCAPE_ICON("draw-rectangle")),
     new ContextVerb(SP_VERB_CONTEXT_3DBOX, "Tool3DBox", N_("3D Box"),
-                    N_("Create 3D boxes"), INKSCAPE_ICON_DRAW_CUBOID),
+                    N_("Create 3D boxes"), INKSCAPE_ICON("draw-cuboid")),
     new ContextVerb(SP_VERB_CONTEXT_ARC, "ToolArc", N_("Ellipse"),
-                    N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON_DRAW_ELLIPSE),
+                    N_("Create circles, ellipses, and arcs"), INKSCAPE_ICON("draw-ellipse")),
     new ContextVerb(SP_VERB_CONTEXT_STAR, "ToolStar", N_("Star"),
-                    N_("Create stars and polygons"), INKSCAPE_ICON_DRAW_POLYGON_STAR),
+                    N_("Create stars and polygons"), INKSCAPE_ICON("draw-polygon-star")),
     new ContextVerb(SP_VERB_CONTEXT_SPIRAL, "ToolSpiral", N_("Spiral"),
-                    N_("Create spirals"), INKSCAPE_ICON_DRAW_SPIRAL),
+                    N_("Create spirals"), INKSCAPE_ICON("draw-spiral")),
     new ContextVerb(SP_VERB_CONTEXT_PENCIL, "ToolPencil", N_("Pencil"),
-                    N_("Draw freehand lines"), INKSCAPE_ICON_DRAW_FREEHAND),
+                    N_("Draw freehand lines"), INKSCAPE_ICON("draw-freehand")),
     new ContextVerb(SP_VERB_CONTEXT_PEN, "ToolPen", N_("Pen"),
-                    N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON_DRAW_PATH),
+                    N_("Draw Bezier curves and straight lines"), INKSCAPE_ICON("draw-path")),
     new ContextVerb(SP_VERB_CONTEXT_CALLIGRAPHIC, "ToolCalligraphic", N_("Calligraphy"),
-                    N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON_DRAW_CALLIGRAPHIC),
+                    N_("Draw calligraphic or brush strokes"), INKSCAPE_ICON("draw-calligraphic")),
     new ContextVerb(SP_VERB_CONTEXT_TEXT, "ToolText", N_("Text"),
-                    N_("Create and edit text objects"), INKSCAPE_ICON_DRAW_TEXT),
+                    N_("Create and edit text objects"), INKSCAPE_ICON("draw-text")),
     new ContextVerb(SP_VERB_CONTEXT_GRADIENT, "ToolGradient", N_("Gradient"),
-                    N_("Create and edit gradients"), INKSCAPE_ICON_COLOR_GRADIENT),
+                    N_("Create and edit gradients"), INKSCAPE_ICON("color-gradient")),
     new ContextVerb(SP_VERB_CONTEXT_ZOOM, "ToolZoom", N_("Zoom"),
-                    N_("Zoom in or out"), INKSCAPE_ICON_ZOOM),
+                    N_("Zoom in or out"), INKSCAPE_ICON("zoom")),
     new ContextVerb(SP_VERB_CONTEXT_MEASURE, "ToolMeasure", N_("Measure"),
-                    N_("Measurement tool"), INKSCAPE_ICON_MEASURE),
+                    N_("Measurement tool"), INKSCAPE_ICON("tool-measure")),
     new ContextVerb(SP_VERB_CONTEXT_DROPPER, "ToolDropper", N_("Dropper"),
-                    N_("Pick colors from image"), INKSCAPE_ICON_COLOR_PICKER),
+                    N_("Pick colors from image"), INKSCAPE_ICON("color-picker")),
     new ContextVerb(SP_VERB_CONTEXT_CONNECTOR, "ToolConnector", N_("Connector"),
-                    N_("Create diagram connectors"), INKSCAPE_ICON_DRAW_CONNECTOR),
+                    N_("Create diagram connectors"), INKSCAPE_ICON("draw-connector")),
     new ContextVerb(SP_VERB_CONTEXT_PAINTBUCKET, "ToolPaintBucket", N_("Paint Bucket"),
-                    N_("Fill bounded areas"), INKSCAPE_ICON_COLOR_FILL),
+                    N_("Fill bounded areas"), INKSCAPE_ICON("color-fill")),
     new ContextVerb(SP_VERB_CONTEXT_LPE, "ToolLPE", N_("LPE Edit"),
                     N_("Edit Path Effect parameters"), NULL),
     new ContextVerb(SP_VERB_CONTEXT_ERASER, "ToolEraser", N_("Eraser"),
-                    N_("Erase existing paths"), INKSCAPE_ICON_DRAW_ERASER),
+                    N_("Erase existing paths"), INKSCAPE_ICON("draw-eraser")),
     new ContextVerb(SP_VERB_CONTEXT_LPETOOL, "ToolLPETool", N_("LPE Tool"),
                     N_("Do geometric constructions"), "draw-geometry"),
     /* Tool prefs */
@@ -2588,31 +2588,31 @@ Verb *Verb::_base_verbs[] = {
                     N_("Open Preferences for the LPETool tool"), NULL),
 
     /* Zoom/View */
-    new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), INKSCAPE_ICON_ZOOM_IN),
-    new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON_ZOOM_OUT),
+    new ZoomVerb(SP_VERB_ZOOM_IN, "ZoomIn", N_("Zoom In"), N_("Zoom in"), INKSCAPE_ICON("zoom-in")),
+    new ZoomVerb(SP_VERB_ZOOM_OUT, "ZoomOut", N_("Zoom Out"), N_("Zoom out"), INKSCAPE_ICON("zoom-out")),
     new ZoomVerb(SP_VERB_TOGGLE_RULERS, "ToggleRulers", N_("_Rulers"), N_("Show or hide the canvas rulers"), NULL),
     new ZoomVerb(SP_VERB_TOGGLE_SCROLLBARS, "ToggleScrollbars", N_("Scroll_bars"), N_("Show or hide the canvas scrollbars"), NULL),
-    new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), INKSCAPE_ICON_SHOW_GRID),
-    new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON_SHOW_GUIDES),
-    new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON_SNAP),
+    new ZoomVerb(SP_VERB_TOGGLE_GRID, "ToggleGrid", N_("_Grid"), N_("Show or hide the grid"), INKSCAPE_ICON("show-grid")),
+    new ZoomVerb(SP_VERB_TOGGLE_GUIDES, "ToggleGuides", N_("G_uides"), N_("Show or hide guides (drag from a ruler to create a guide)"), INKSCAPE_ICON("show-guides")),
+    new ZoomVerb(SP_VERB_TOGGLE_SNAPPING, "ToggleSnapGlobal", N_("Snap"), N_("Enable snapping"), INKSCAPE_ICON("snap")),
     new ZoomVerb(SP_VERB_ZOOM_NEXT, "ZoomNext", N_("Nex_t Zoom"), N_("Next zoom (from the history of zooms)"),
-                 INKSCAPE_ICON_ZOOM_NEXT),
+                 INKSCAPE_ICON("zoom-next")),
     new ZoomVerb(SP_VERB_ZOOM_PREV, "ZoomPrev", N_("Pre_vious Zoom"), N_("Previous zoom (from the history of zooms)"),
-                 INKSCAPE_ICON_ZOOM_PREVIOUS),
+                 INKSCAPE_ICON("zoom-previous")),
     new ZoomVerb(SP_VERB_ZOOM_1_1, "Zoom1:0", N_("Zoom 1:_1"), N_("Zoom to 1:1"),
-                 INKSCAPE_ICON_ZOOM_ORIGINAL),
+                 INKSCAPE_ICON("zoom-original")),
     new ZoomVerb(SP_VERB_ZOOM_1_2, "Zoom1:2", N_("Zoom 1:_2"), N_("Zoom to 1:2"),
-                 INKSCAPE_ICON_ZOOM_HALF_SIZE),
+                 INKSCAPE_ICON("zoom-half-size")),
     new ZoomVerb(SP_VERB_ZOOM_2_1, "Zoom2:1", N_("_Zoom 2:1"), N_("Zoom to 2:1"),
-                 INKSCAPE_ICON_ZOOM_DOUBLE_SIZE),
+                 INKSCAPE_ICON("zoom-double-size")),
 #ifdef HAVE_GTK_WINDOW_FULLSCREEN
     new ZoomVerb(SP_VERB_FULLSCREEN, "FullScreen", N_("_Fullscreen"), N_("Stretch this document window to full screen"),
-                 INKSCAPE_ICON_VIEW_FULLSCREEN),
+                 INKSCAPE_ICON("view-fullscreen")),
 #endif /* HAVE_GTK_WINDOW_FULLSCREEN */
     new ZoomVerb(SP_VERB_FOCUSTOGGLE, "FocusToggle", N_("Toggle _Focus Mode"), N_("Remove excess toolbars to focus on drawing"),
                  NULL),
     new ZoomVerb(SP_VERB_VIEW_NEW, "ViewNew", N_("Duplic_ate Window"), N_("Open a new window with the same document"),
-                 INKSCAPE_ICON_WINDOW_NEW),
+                 INKSCAPE_ICON("window-new")),
     new ZoomVerb(SP_VERB_VIEW_NEW_PREVIEW, "ViewNewPreview", N_("_New View Preview"),
                  N_("New View Preview"), NULL/*"view_new_preview"*/),
 
@@ -2634,18 +2634,18 @@ Verb *Verb::_base_verbs[] = {
                  N_("Toggle between normal and grayscale color display modes"), NULL),
 
     new ZoomVerb(SP_VERB_VIEW_CMS_TOGGLE, "ViewCmsToggle", N_("Color-managed view"),
-                 N_("Toggle color-managed display for this document window"), INKSCAPE_ICON_COLOR_MANAGEMENT),
+                 N_("Toggle color-managed display for this document window"), INKSCAPE_ICON("color-management")),
 
     new ZoomVerb(SP_VERB_VIEW_ICON_PREVIEW, "ViewIconPreview", N_("Ico_n Preview..."),
-                 N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON_DIALOG_ICON_PREVIEW),
+                 N_("Open a window to preview objects at different icon resolutions"), INKSCAPE_ICON("dialog-icon-preview")),
     new ZoomVerb(SP_VERB_ZOOM_PAGE, "ZoomPage", N_("_Page"),
-                 N_("Zoom to fit page in window"), INKSCAPE_ICON_ZOOM_FIT_PAGE),
+                 N_("Zoom to fit page in window"), INKSCAPE_ICON("zoom-fit-page")),
     new ZoomVerb(SP_VERB_ZOOM_PAGE_WIDTH, "ZoomPageWidth", N_("Page _Width"),
-                 N_("Zoom to fit page width in window"), INKSCAPE_ICON_ZOOM_FIT_WIDTH),
+                 N_("Zoom to fit page width in window"), INKSCAPE_ICON("zoom-fit-width")),
     new ZoomVerb(SP_VERB_ZOOM_DRAWING, "ZoomDrawing", N_("_Drawing"),
-                 N_("Zoom to fit drawing in window"), INKSCAPE_ICON_ZOOM_FIT_DRAWING),
+                 N_("Zoom to fit drawing in window"), INKSCAPE_ICON("zoom-fit-drawing")),
     new ZoomVerb(SP_VERB_ZOOM_SELECTION, "ZoomSelection", N_("_Selection"),
-                 N_("Zoom to fit selection in window"), INKSCAPE_ICON_ZOOM_FIT_SELECTION),
+                 N_("Zoom to fit selection in window"), INKSCAPE_ICON("zoom-fit-selection")),
 
     /* Dialogs */
     new DialogVerb(SP_VERB_DIALOG_DISPLAY, "DialogPreferences", N_("In_kscape Preferences..."),
@@ -2653,26 +2653,26 @@ Verb *Verb::_base_verbs[] = {
     new DialogVerb(SP_VERB_DIALOG_NAMEDVIEW, "DialogDocumentProperties", N_("_Document Properties..."),
                    N_("Edit properties of this document (to be saved with the document)"), GTK_STOCK_PROPERTIES ),
     new DialogVerb(SP_VERB_DIALOG_METADATA, "DialogMetadata", N_("Document _Metadata..."),
-                   N_("Edit document metadata (to be saved with the document)"), INKSCAPE_ICON_DOCUMENT_METADATA ),
+                   N_("Edit document metadata (to be saved with the document)"), INKSCAPE_ICON("document-metadata") ),
     new DialogVerb(SP_VERB_DIALOG_FILL_STROKE, "DialogFillStroke", N_("_Fill and Stroke..."),
-                   N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON_DIALOG_FILL_AND_STROKE),
+                   N_("Edit objects' colors, gradients, arrowheads, and other fill and stroke properties..."), INKSCAPE_ICON("dialog-fill-and-stroke")),
     new DialogVerb(SP_VERB_DIALOG_GLYPHS, "DialogGlyphs", N_("Gl_yphs..."),
                    N_("Select characters from a glyphs palette"), GTK_STOCK_SELECT_FONT),
     // TRANSLATORS: "Swatches" means: color samples
     new DialogVerb(SP_VERB_DIALOG_SWATCHES, "DialogSwatches", N_("S_watches..."),
                    N_("Select colors from a swatches palette"), GTK_STOCK_SELECT_COLOR),
     new DialogVerb(SP_VERB_DIALOG_TRANSFORM, "DialogTransform", N_("Transfor_m..."),
-                   N_("Precisely control objects' transformations"), INKSCAPE_ICON_DIALOG_TRANSFORM),
+                   N_("Precisely control objects' transformations"), INKSCAPE_ICON("dialog-transform")),
     new DialogVerb(SP_VERB_DIALOG_ALIGN_DISTRIBUTE, "DialogAlignDistribute", N_("_Align and Distribute..."),
-                   N_("Align and distribute objects"), INKSCAPE_ICON_DIALOG_ALIGN_AND_DISTRIBUTE),
+                   N_("Align and distribute objects"), INKSCAPE_ICON("dialog-align-and-distribute")),
     new DialogVerb(SP_VERB_DIALOG_SPRAY_OPTION, "DialogSprayOption", N_("_Spray options..."),
-                   N_("Some options for the spray"), INKSCAPE_ICON_DIALOG_SPRAY_OPTIONS),
+                   N_("Some options for the spray"), INKSCAPE_ICON("dialog-spray-options")),
     new DialogVerb(SP_VERB_DIALOG_UNDO_HISTORY, "DialogUndoHistory", N_("Undo _History..."),
-                   N_("Undo History"), INKSCAPE_ICON_EDIT_UNDO_HISTORY),
+                   N_("Undo History"), INKSCAPE_ICON("edit-undo-history")),
     new DialogVerb(SP_VERB_DIALOG_TEXT, "DialogText", N_("_Text and Font..."),
-                   N_("View and select font family, font size and other text properties"), INKSCAPE_ICON_DIALOG_TEXT_AND_FONT),
+                   N_("View and select font family, font size and other text properties"), INKSCAPE_ICON("dialog-text-and-font")),
     new DialogVerb(SP_VERB_DIALOG_XML_EDITOR, "DialogXMLEditor", N_("_XML Editor..."),
-                   N_("View and edit the XML tree of the document"), INKSCAPE_ICON_DIALOG_XML_EDITOR),
+                   N_("View and edit the XML tree of the document"), INKSCAPE_ICON("dialog-xml-editor")),
     new DialogVerb(SP_VERB_DIALOG_FIND, "DialogFind", N_("_Find..."),
                    N_("Find objects in document"), GTK_STOCK_FIND ),
     new DialogVerb(SP_VERB_DIALOG_FINDREPLACE, "DialogFindReplace", N_("Find and _Replace Text..."),
@@ -2680,25 +2680,25 @@ Verb *Verb::_base_verbs[] = {
     new DialogVerb(SP_VERB_DIALOG_SPELLCHECK, "DialogSpellcheck", N_("Check Spellin_g..."),
                    N_("Check spelling of text in document"), GTK_STOCK_SPELL_CHECK ),
     new DialogVerb(SP_VERB_DIALOG_DEBUG, "DialogDebug", N_("_Messages..."),
-                   N_("View debug messages"), INKSCAPE_ICON_DIALOG_MESSAGES),
+                   N_("View debug messages"), INKSCAPE_ICON("dialog-messages")),
     new DialogVerb(SP_VERB_DIALOG_SCRIPT, "DialogScript", N_("S_cripts..."),
-                   N_("Run scripts"), INKSCAPE_ICON_DIALOG_SCRIPTS),
+                   N_("Run scripts"), INKSCAPE_ICON("dialog-scripts")),
     new DialogVerb(SP_VERB_DIALOG_TOGGLE, "DialogsToggle", N_("Show/Hide D_ialogs"),
-                   N_("Show or hide all open dialogs"), INKSCAPE_ICON_SHOW_DIALOGS),
+                   N_("Show or hide all open dialogs"), INKSCAPE_ICON("show-dialogs")),
     new DialogVerb(SP_VERB_DIALOG_CLONETILER, "DialogClonetiler", N_("Create Tiled Clones..."),
-                   N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), INKSCAPE_ICON_DIALOG_TILE_CLONES),
+                   N_("Create multiple clones of selected object, arranging them into a pattern or scattering"), INKSCAPE_ICON("dialog-tile-clones")),
     new DialogVerb(SP_VERB_DIALOG_ITEM, "DialogObjectProperties", N_("_Object Properties..."),
-                   N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON_DIALOG_OBJECT_PROPERTIES),
+                   N_("Edit the ID, locked and visible status, and other object properties"), INKSCAPE_ICON("dialog-object-properties")),
 /*#ifdef WITH_INKBOARD
     new DialogVerb(SP_VERB_XMPP_CLIENT, "DialogXmppClient",
                    N_("_Instant Messaging..."), N_("Jabber Instant Messaging Client"), NULL),
 #endif*/
     new DialogVerb(SP_VERB_DIALOG_INPUT, "DialogInput", N_("_Input Devices..."),
-                   N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON_DIALOG_INPUT_DEVICES),
+                   N_("Configure extended input devices, such as a graphics tablet"), INKSCAPE_ICON("dialog-input-devices")),
     new DialogVerb(SP_VERB_DIALOG_EXTENSIONEDITOR, "org.inkscape.dialogs.extensioneditor", N_("_Extensions..."),
                    N_("Query information about extensions"), NULL),
     new DialogVerb(SP_VERB_DIALOG_LAYERS, "DialogLayers", N_("Layer_s..."),
-                   N_("View Layers"), INKSCAPE_ICON_DIALOG_LAYERS),
+                   N_("View Layers"), INKSCAPE_ICON("dialog-layers")),
     new DialogVerb(SP_VERB_DIALOG_LIVE_PATH_EFFECT, "DialogLivePathEffect", N_("Path E_ffect Editor..."),
                    N_("Manage, edit, and apply path effects"), NULL),
     new DialogVerb(SP_VERB_DIALOG_FILTER_EFFECTS, "DialogFilterEffects", N_("Filter _Editor..."),
@@ -2712,9 +2712,9 @@ Verb *Verb::_base_verbs[] = {
     new HelpVerb(SP_VERB_HELP_ABOUT_EXTENSIONS, "HelpAboutExtensions", N_("About E_xtensions"),
                  N_("Information on Inkscape extensions"), NULL),
     new HelpVerb(SP_VERB_HELP_MEMORY, "HelpAboutMemory", N_("About _Memory"),
-                 N_("Memory usage information"), INKSCAPE_ICON_DIALOG_MEMORY),
+                 N_("Memory usage information"), INKSCAPE_ICON("dialog-memory")),
     new HelpVerb(SP_VERB_HELP_ABOUT, "HelpAbout", N_("_About Inkscape"),
-                 N_("Inkscape version, authors, license"), INKSCAPE_ICON_INKSCAPE),
+                 N_("Inkscape version, authors, license"), INKSCAPE_ICON("inkscape")),
     //new HelpVerb(SP_VERB_SHOW_LICENSE, "ShowLicense", N_("_License"),
     //           N_("Distribution terms"), /*"show_license"*/"inkscape_options"),
 
diff --git a/src/widgets/desktop-widget.cpp b/src/widgets/desktop-widget.cpp
index 970a094a9..c51b88251 100644
--- a/src/widgets/desktop-widget.cpp
+++ b/src/widgets/desktop-widget.cpp
@@ -334,7 +334,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     dtw->hbox = gtk_hbox_new(FALSE, 0);
     gtk_box_pack_end( GTK_BOX (dtw->vbox), dtw->hbox, TRUE, TRUE, 0 );
     gtk_widget_show(dtw->hbox);
- 
+
     dtw->aux_toolbox = ToolboxFactory::createAuxToolbox();
     gtk_box_pack_end (GTK_BOX (dtw->vbox), dtw->aux_toolbox, FALSE, TRUE, 0);
 
@@ -388,7 +388,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     dtw->sticky_zoom = sp_button_new_from_data ( Inkscape::ICON_SIZE_DECORATION,
                                                  SP_BUTTON_TYPE_TOGGLE,
                                                  NULL,
-                                                 INKSCAPE_ICON_ZOOM_ORIGINAL,
+                                                 INKSCAPE_ICON("zoom-original"),
                                                  _("Zoom drawing if window size changes"));
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (dtw->sticky_zoom), prefs->getBool("/options/stickyzoom/value"));
     gtk_box_pack_start (GTK_BOX (dtw->vscrollbar_box), dtw->sticky_zoom, FALSE, FALSE, 0);
@@ -410,7 +410,7 @@ void SPDesktopWidget::init( SPDesktopWidget *dtw )
     dtw->cms_adjust = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
                                                SP_BUTTON_TYPE_TOGGLE,
                                                NULL,
-                                               INKSCAPE_ICON_COLOR_MANAGEMENT,
+                                               INKSCAPE_ICON("color-management"),
                                                tip );
 #if ENABLE_LCMS
     {
@@ -1558,12 +1558,12 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
         /* This loops through all the grandchildren of aux toolbox,
          * and for each that it finds, it performs an sp_search_by_data_recursive(),
          * looking for widgets that hold some "tracker" data (this is used by
-         * all toolboxes to refer to the unit selector). The default document units 
+         * all toolboxes to refer to the unit selector). The default document units
          * is then selected within these unit selectors.
          *
          * Of course it would be nice to be able to refer to the toolbox and the
          * unit selector directly by name, but I don't yet see a way to do that.
-         * 
+         *
          * This should solve: https://bugs.launchpad.net/inkscape/+bug/362995
          */
         if (GTK_IS_CONTAINER(aux_toolbox)) {
@@ -1571,7 +1571,7 @@ void SPDesktopWidget::namedviewModified(SPObject *obj, guint flags)
             for (GList *i = ch; i != NULL; i = i->next) {
                 if (GTK_IS_CONTAINER(i->data)) {
                     GList *grch = gtk_container_get_children (GTK_CONTAINER(i->data));
-                    for (GList *j = grch; j != NULL; j = j->next) {                        
+                    for (GList *j = grch; j != NULL; j = j->next) {
                         if (!GTK_IS_WIDGET(j->data)) // wasn't a widget
                             continue;
 
diff --git a/src/widgets/gradient-toolbar.cpp b/src/widgets/gradient-toolbar.cpp
index 6d4f6fae0..9fe875d28 100644
--- a/src/widgets/gradient-toolbar.cpp
+++ b/src/widgets/gradient-toolbar.cpp
@@ -552,7 +552,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop)
     GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
                                               SP_BUTTON_TYPE_TOGGLE,
                                               NULL,
-                                              INKSCAPE_ICON_PAINT_GRADIENT_LINEAR,
+                                              INKSCAPE_ICON("paint-gradient-linear"),
                                               _("Create linear gradient") );
     g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_type), tbl);
     g_object_set_data(G_OBJECT(tbl), "linear", button);
@@ -565,7 +565,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop)
     GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
                                               SP_BUTTON_TYPE_TOGGLE,
                                               NULL,
-                                              INKSCAPE_ICON_PAINT_GRADIENT_RADIAL,
+                                              INKSCAPE_ICON("paint-gradient-radial"),
                                               _("Create radial (elliptic or circular) gradient"));
     g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_type), tbl);
     g_object_set_data(G_OBJECT(tbl), "radial", button);
@@ -592,7 +592,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop)
     GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
                                               SP_BUTTON_TYPE_TOGGLE,
                                               NULL,
-                                              INKSCAPE_ICON_OBJECT_FILL,
+                                              INKSCAPE_ICON("object-fill"),
                                               _("Create gradient in the fill"));
     g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_fillstroke), tbl);
     g_object_set_data(G_OBJECT(tbl), "fill", button);
@@ -605,7 +605,7 @@ sp_gradient_toolbox_new(SPDesktop *desktop)
     GtkWidget *button = sp_button_new_from_data( Inkscape::ICON_SIZE_DECORATION,
                                               SP_BUTTON_TYPE_TOGGLE,
                                               NULL,
-                                              INKSCAPE_ICON_OBJECT_STROKE,
+                                              INKSCAPE_ICON("object-stroke"),
                                               _("Create gradient in the stroke"));
     g_signal_connect_after (G_OBJECT (button), "clicked", G_CALLBACK (gr_toggle_fillstroke), tbl);
     g_object_set_data(G_OBJECT(tbl), "stroke", button);
diff --git a/src/widgets/paint-selector.cpp b/src/widgets/paint-selector.cpp
index 9f2a30e32..259aa5f25 100644
--- a/src/widgets/paint-selector.cpp
+++ b/src/widgets/paint-selector.cpp
@@ -221,19 +221,19 @@ sp_paint_selector_init(SPPaintSelector *psel)
     gtk_box_pack_start(GTK_BOX(psel), psel->style, FALSE, FALSE, 0);
 
     /* Buttons */
-    psel->none = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_NONE,
+    psel->none = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-none"),
                                                     SPPaintSelector::MODE_NONE, _("No paint"));
-    psel->solid = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_SOLID,
+    psel->solid = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-solid"),
                                                      SPPaintSelector::MODE_COLOR_RGB, _("Flat color"));
-    psel->gradient = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_GRADIENT_LINEAR,
+    psel->gradient = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-gradient-linear"),
                                                         SPPaintSelector::MODE_GRADIENT_LINEAR, _("Linear gradient"));
-    psel->radial = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_GRADIENT_RADIAL,
+    psel->radial = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-gradient-radial"),
                                                       SPPaintSelector::MODE_GRADIENT_RADIAL, _("Radial gradient"));
-    psel->pattern = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_PATTERN,
+    psel->pattern = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-pattern"),
                                                        SPPaintSelector::MODE_PATTERN, _("Pattern"));
-    psel->swatch = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_SWATCH,
+    psel->swatch = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-swatch"),
                                                        SPPaintSelector::MODE_SWATCH, _("Swatch"));
-    psel->unset = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON_PAINT_UNKNOWN,
+    psel->unset = sp_paint_selector_style_button_add(psel, INKSCAPE_ICON("paint-unknown"),
                                                      SPPaintSelector::MODE_UNSET, _("Unset paint (make it undefined so it can be inherited)"));
 
     /* Fillrule */
@@ -248,7 +248,7 @@ sp_paint_selector_init(SPPaintSelector *psel)
         // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty
         gtk_widget_set_tooltip_text(psel->evenodd, _("Any path self-intersections or subpaths create holes in the fill (fill-rule: evenodd)"));
         g_object_set_data(G_OBJECT(psel->evenodd), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_EVENODD));
-        w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_FILL_RULE_EVEN_ODD);
+        w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("fill-rule-even-odd"));
         gtk_container_add(GTK_CONTAINER(psel->evenodd), w);
         gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->evenodd, FALSE, FALSE, 0);
         g_signal_connect(G_OBJECT(psel->evenodd), "toggled", G_CALLBACK(sp_paint_selector_fillrule_toggled), psel);
@@ -259,7 +259,7 @@ sp_paint_selector_init(SPPaintSelector *psel)
         // TRANSLATORS: for info, see http://www.w3.org/TR/2000/CR-SVG-20000802/painting.html#FillRuleProperty
         gtk_widget_set_tooltip_text(psel->nonzero, _("Fill is solid unless a subpath is counterdirectional (fill-rule: nonzero)"));
         g_object_set_data(G_OBJECT(psel->nonzero), "mode", GUINT_TO_POINTER(SPPaintSelector::FILLRULE_NONZERO));
-        w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON_FILL_RULE_NONZERO);
+        w = sp_icon_new(Inkscape::ICON_SIZE_DECORATION, INKSCAPE_ICON("fill-rule-nonzero"));
         gtk_container_add(GTK_CONTAINER(psel->nonzero), w);
         gtk_box_pack_start(GTK_BOX(psel->fillrulebox), psel->nonzero, FALSE, FALSE, 0);
         g_signal_connect(G_OBJECT(psel->nonzero), "toggled", G_CALLBACK(sp_paint_selector_fillrule_toggled), psel);
diff --git a/src/widgets/select-toolbar.cpp b/src/widgets/select-toolbar.cpp
index ba32dc321..260c09c69 100644
--- a/src/widgets/select-toolbar.cpp
+++ b/src/widgets/select-toolbar.cpp
@@ -378,9 +378,9 @@ static void toggle_pattern( GtkToggleAction* act, gpointer data )
 static void toggle_lock( GtkToggleAction *act, gpointer /*data*/ ) {
     gboolean active = gtk_toggle_action_get_active( act );
     if ( active ) {
-        g_object_set( G_OBJECT(act), "iconId", INKSCAPE_ICON_OBJECT_LOCKED, NULL );
+        g_object_set( G_OBJECT(act), "iconId", INKSCAPE_ICON("object-locked"), NULL );
     } else {
-        g_object_set( G_OBJECT(act), "iconId", INKSCAPE_ICON_OBJECT_UNLOCKED, NULL );
+        g_object_set( G_OBJECT(act), "iconId", INKSCAPE_ICON("object-unlocked"), NULL );
     }
 }
 
@@ -507,7 +507,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "LockAction",
                                                     _("Lock width and height"),
                                                     _("When locked, change both width and height by the same proportion"),
-                                                    INKSCAPE_ICON_OBJECT_UNLOCKED,
+                                                    INKSCAPE_ICON("object-unlocked"),
                                                     Inkscape::ICON_SIZE_DECORATION );
     g_object_set( itact, "short_label", "Lock", NULL );
     g_object_set_data( G_OBJECT(spw), "lock", itact );
@@ -554,7 +554,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     // "Transform with object" buttons
 
     {
-        EgeOutputAction* act = ege_output_action_new( "transform_affect_label", _("Affect:"), _("Control whether or not to scale stroke widths, scale rectangle corners, transform gradient fills, and transform pattern fills with the object"), 0 ); 
+        EgeOutputAction* act = ege_output_action_new( "transform_affect_label", _("Affect:"), _("Control whether or not to scale stroke widths, scale rectangle corners, transform gradient fills, and transform pattern fills with the object"), 0 );
         ege_output_action_set_use_markup( act, TRUE );
         g_object_set( act, "visible-overflown", FALSE, NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
@@ -564,7 +564,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_stroke",
                                                     _("Scale stroke width"),
                                                     _("When scaling objects, scale the stroke width by the same proportion"),
-                                                    INKSCAPE_ICON_TRANSFORM_AFFECT_STROKE,
+                                                    INKSCAPE_ICON("transform-affect-stroke"),
                                                     Inkscape::ICON_SIZE_DECORATION );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/stroke", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_stroke), desktop) ;
@@ -575,7 +575,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_corners",
                                                     _("Scale rounded corners"),
                                                     _("When scaling rectangles, scale the radii of rounded corners"),
-                                                    INKSCAPE_ICON_TRANSFORM_AFFECT_ROUNDED_CORNERS,
+                                                    INKSCAPE_ICON("transform-affect-rounded-corners"),
                                                   Inkscape::ICON_SIZE_DECORATION );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/rectcorners", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_corners), desktop) ;
@@ -586,7 +586,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_gradient",
                                                     _("Move gradients"),
                                                     _("Move gradients (in fill or stroke) along with the objects"),
-                                                    INKSCAPE_ICON_TRANSFORM_AFFECT_GRADIENT,
+                                                    INKSCAPE_ICON("transform-affect-gradient"),
                                                   Inkscape::ICON_SIZE_DECORATION );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/gradient", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_gradient), desktop) ;
@@ -597,7 +597,7 @@ void sp_select_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions, GOb
     InkToggleAction* itact = ink_toggle_action_new( "transform_pattern",
                                                     _("Move patterns"),
                                                     _("Move patterns (in fill or stroke) along with the objects"),
-                                                    INKSCAPE_ICON_TRANSFORM_AFFECT_PATTERN,
+                                                    INKSCAPE_ICON("transform-affect-pattern"),
                                                   Inkscape::ICON_SIZE_DECORATION );
     gtk_toggle_action_set_active( GTK_TOGGLE_ACTION(itact), prefs->getBool("/options/transform/pattern", true) );
     g_signal_connect_after( G_OBJECT(itact), "toggled", G_CALLBACK(toggle_pattern), desktop) ;
diff --git a/src/widgets/stroke-style.cpp b/src/widgets/stroke-style.cpp
index 9da39bac4..8544c8cad 100644
--- a/src/widgets/stroke-style.cpp
+++ b/src/widgets/stroke-style.cpp
@@ -721,7 +721,7 @@ sp_stroke_style_line_widget_new(void)
 
     tb = NULL;
 
-    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON_STROKE_JOIN_MITER,
+    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON("stroke-join-miter"),
                                 hb, spw, "join", "miter");
 
     // TRANSLATORS: Miter join: joining lines with a sharp (pointed) corner.
@@ -730,7 +730,7 @@ sp_stroke_style_line_widget_new(void)
     tt->set_tip(*tb, _("Miter join"));
     spw->set_data("miter join", tb);
 
-    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON_STROKE_JOIN_ROUND,
+    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON("stroke-join-round"),
                                 hb, spw, "join", "round");
 
 
@@ -740,7 +740,7 @@ sp_stroke_style_line_widget_new(void)
     tt->set_tip(*tb, _("Round join"));
     spw->set_data("round join", tb);
 
-    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON_STROKE_JOIN_BEVEL,
+    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON("stroke-join-bevel"),
                                 hb, spw, "join", "bevel");
 
 
@@ -787,7 +787,7 @@ sp_stroke_style_line_widget_new(void)
 
     tb = NULL;
 
-    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON_STROKE_CAP_BUTT,
+    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON("stroke-cap-butt"),
                                 hb, spw, "cap", "butt");
     spw->set_data("cap butt", tb);
 
@@ -795,7 +795,7 @@ sp_stroke_style_line_widget_new(void)
     //  of the line; the ends of the line are square
     tt->set_tip(*tb, _("Butt cap"));
 
-    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON_STROKE_CAP_ROUND,
+    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON("stroke-cap-round"),
                                 hb, spw, "cap", "round");
     spw->set_data("cap round", tb);
 
@@ -803,7 +803,7 @@ sp_stroke_style_line_widget_new(void)
     //  line; the ends of the line are rounded
     tt->set_tip(*tb, _("Round cap"));
 
-    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON_STROKE_CAP_SQUARE,
+    tb = sp_stroke_radio_button(tb, INKSCAPE_ICON("stroke-cap-square"),
                                 hb, spw, "cap", "square");
     spw->set_data("cap square", tb);
 
@@ -949,13 +949,13 @@ sp_jointype_set (Gtk::Container *spw, unsigned const jointype)
     Gtk::RadioButton *tb = NULL;
     switch (jointype) {
         case SP_STROKE_LINEJOIN_MITER:
-            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_JOIN_MITER));
+            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-join-miter")));
             break;
         case SP_STROKE_LINEJOIN_ROUND:
-            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_JOIN_ROUND));
+            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-join-round")));
             break;
         case SP_STROKE_LINEJOIN_BEVEL:
-            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_JOIN_BEVEL));
+            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-join-bevel")));
             break;
         default:
             break;
@@ -972,13 +972,13 @@ sp_captype_set (Gtk::Container *spw, unsigned const captype)
     Gtk::RadioButton *tb = NULL;
     switch (captype) {
         case SP_STROKE_LINECAP_BUTT:
-            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_CAP_BUTT));
+            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-cap-butt")));
             break;
         case SP_STROKE_LINECAP_ROUND:
-            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_CAP_ROUND));
+            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-cap-round")));
             break;
         case SP_STROKE_LINECAP_SQUARE:
-            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_CAP_SQUARE));
+            tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-cap-square")));
             break;
         default:
             break;
@@ -1325,16 +1325,16 @@ sp_stroke_style_set_join_buttons(Gtk::Container *spw, Gtk::ToggleButton *active)
 {
     Gtk::RadioButton *tb;
 
-    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_JOIN_MITER));
+    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-join-miter")));
     tb->set_active(active == tb);
 
     Gtk::SpinButton *ml = static_cast<Gtk::SpinButton *>(spw->get_data("miterlimit_sb"));
     ml->set_sensitive(active == tb);
 
-    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_JOIN_ROUND));
+    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-join-round")));
     tb->set_active(active == tb);
 
-    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_JOIN_BEVEL));
+    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-join-bevel")));
     tb->set_active(active == tb);
 }
 
@@ -1346,11 +1346,11 @@ sp_stroke_style_set_cap_buttons(Gtk::Container *spw, Gtk::ToggleButton *active)
 {
     Gtk::RadioButton *tb;
 
-    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_CAP_BUTT));
+    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-cap-butt")));
     tb->set_active(active == tb);
-    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_CAP_ROUND));
+    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-cap-round")));
     tb->set_active(active == tb);
-    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON_STROKE_CAP_SQUARE));
+    tb = static_cast<Gtk::RadioButton *>(spw->get_data(INKSCAPE_ICON("stroke-cap-square")));
     tb->set_active(active == tb);
 }
 
diff --git a/src/widgets/toolbox.cpp b/src/widgets/toolbox.cpp
index 3c1196e96..9e28e4bee 100644
--- a/src/widgets/toolbox.cpp
+++ b/src/widgets/toolbox.cpp
@@ -1369,7 +1369,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeInsertAction",
                                           _("Insert node"),
                                           _("Insert new nodes into selected segments"),
-                                          INKSCAPE_ICON_NODE_ADD,
+                                          INKSCAPE_ICON("node-add"),
                                           secondarySize );
         g_object_set( inky, "short_label", _("Insert"), NULL );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_add), 0 );
@@ -1380,7 +1380,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeDeleteAction",
                                           _("Delete node"),
                                           _("Delete selected nodes"),
-                                          INKSCAPE_ICON_NODE_DELETE,
+                                          INKSCAPE_ICON("node-delete"),
                                           secondarySize );
         g_object_set( inky, "short_label", _("Delete"), NULL );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_delete), 0 );
@@ -1391,7 +1391,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeJoinAction",
                                           _("Join nodes"),
                                           _("Join selected nodes"),
-                                          INKSCAPE_ICON_NODE_JOIN,
+                                          INKSCAPE_ICON("node-join"),
                                           secondarySize );
         g_object_set( inky, "short_label", _("Join"), NULL );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_join), 0 );
@@ -1402,7 +1402,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeBreakAction",
                                           _("Break nodes"),
                                           _("Break path at selected nodes"),
-                                          INKSCAPE_ICON_NODE_BREAK,
+                                          INKSCAPE_ICON("node-break"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_break), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1413,7 +1413,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeJoinSegmentAction",
                                           _("Join with segment"),
                                           _("Join selected endnodes with a new segment"),
-                                          INKSCAPE_ICON_NODE_JOIN_SEGMENT,
+                                          INKSCAPE_ICON("node-join-segment"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_join_segment), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1423,7 +1423,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeDeleteSegmentAction",
                                           _("Delete segment"),
                                           _("Delete segment between two non-endpoint nodes"),
-                                          INKSCAPE_ICON_NODE_DELETE_SEGMENT,
+                                          INKSCAPE_ICON("node-delete-segment"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_delete_segment), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1433,7 +1433,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeCuspAction",
                                           _("Node Cusp"),
                                           _("Make selected nodes corner"),
-                                          INKSCAPE_ICON_NODE_TYPE_CUSP,
+                                          INKSCAPE_ICON("node-type-cusp"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_cusp), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1443,7 +1443,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeSmoothAction",
                                           _("Node Smooth"),
                                           _("Make selected nodes smooth"),
-                                          INKSCAPE_ICON_NODE_TYPE_SMOOTH,
+                                          INKSCAPE_ICON("node-type-smooth"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_smooth), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1453,7 +1453,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeSymmetricAction",
                                           _("Node Symmetric"),
                                           _("Make selected nodes symmetric"),
-                                          INKSCAPE_ICON_NODE_TYPE_SYMMETRIC,
+                                          INKSCAPE_ICON("node-type-symmetric"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_symmetrical), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1463,7 +1463,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeAutoAction",
                                           _("Node Auto"),
                                           _("Make selected nodes auto-smooth"),
-                                          INKSCAPE_ICON_NODE_TYPE_AUTO_SMOOTH,
+                                          INKSCAPE_ICON("node-type-auto-smooth"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_auto), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1473,7 +1473,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeLineAction",
                                           _("Node Line"),
                                           _("Make selected segments lines"),
-                                          INKSCAPE_ICON_NODE_SEGMENT_LINE,
+                                          INKSCAPE_ICON("node-segment-line"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_toline), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1483,7 +1483,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "NodeCurveAction",
                                           _("Node Curve"),
                                           _("Make selected segments curves"),
-                                          INKSCAPE_ICON_NODE_SEGMENT_CURVE,
+                                          INKSCAPE_ICON("node-segment-curve"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_tocurve), 0 );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1504,7 +1504,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkToggleAction* act = ink_toggle_action_new( "NodesShowHandlesAction",
                                                       _("Show Handles"),
                                                       _("Show Bezier handles of selected nodes"),
-                                                      INKSCAPE_ICON_SHOW_NODE_HANDLES,
+                                                      INKSCAPE_ICON("show-node-handles"),
                                                       secondarySize );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/nodes/show_handles");
@@ -1515,7 +1515,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkToggleAction* act = ink_toggle_action_new( "NodesShowHelperpath",
                                                       _("Show Outline"),
                                                       _("Show path outline (without path effects)"),
-                                                      INKSCAPE_ICON_SHOW_PATH_OUTLINE,
+                                                      INKSCAPE_ICON("show-path-outline"),
                                                       secondarySize );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/nodes/show_outline");
@@ -1527,7 +1527,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( verb->get_id(),
                                           verb->get_name(),
                                           verb->get_tip(),
-                                          INKSCAPE_ICON_PATH_EFFECT_PARAMETER_NEXT,
+                                          INKSCAPE_ICON("path-effect-parameter-next"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_node_path_edit_nextLPEparam), desktop );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -1538,7 +1538,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkToggleAction* inky = ink_toggle_action_new( "ObjectEditClipPathAction",
                                           _("Edit clipping paths"),
                                           _("Show clipping path(s) of selected object(s)"),
-                                          INKSCAPE_ICON_PATH_CLIP_EDIT,
+                                          INKSCAPE_ICON("path-clip-edit"),
                                           secondarySize );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(inky), "/tools/nodes/edit_clipping_paths");
@@ -1549,7 +1549,7 @@ static void sp_node_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkToggleAction* inky = ink_toggle_action_new( "ObjectEditMaskPathAction",
                                           _("Edit masks"),
                                           _("Show mask(s) of selected object(s)"),
-                                          INKSCAPE_ICON_PATH_MASK_EDIT,
+                                          INKSCAPE_ICON("path-mask-edit"),
                                           secondarySize );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(inky), "/tools/nodes/edit_masks");
@@ -1677,7 +1677,7 @@ static void sp_measure_toolbox_prep(SPDesktop * desktop, GtkActionGroup* mainAct
 
     // units label
     {
-        EgeOutputAction* act = ege_output_action_new( "measure_units_label", _("Units:"), _("The units to be used for the measurements"), 0 ); 
+        EgeOutputAction* act = ege_output_action_new( "measure_units_label", _("Units:"), _("The units to be used for the measurements"), 0 );
         ege_output_action_set_use_markup( act, TRUE );
         g_object_set( act, "visible-overflown", FALSE, NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
@@ -2274,7 +2274,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
         //       For example, this action could be based on the verb(+action) + PrefsPusher.
         Inkscape::Verb* verb = Inkscape::Verb::get(SP_VERB_TOGGLE_SNAPPING);
         InkToggleAction* act = ink_toggle_action_new(verb->get_id(),
-                                                     verb->get_name(), verb->get_tip(), INKSCAPE_ICON_SNAP, secondarySize,
+                                                     verb->get_name(), verb->get_tip(), INKSCAPE_ICON("snap"), secondarySize,
                                                      SP_ATTR_INKSCAPE_SNAP_GLOBAL);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2283,7 +2283,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapFromBBoxCorner",
-                                                     _("Bounding box"), _("Snap bounding box corners"), INKSCAPE_ICON_SNAP_BOUNDING_BOX,
+                                                     _("Bounding box"), _("Snap bounding box corners"), INKSCAPE_ICON("snap-bounding-box"),
                                                      secondarySize, SP_ATTR_INKSCAPE_SNAP_BBOX);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2293,7 +2293,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToBBoxPath",
                                                      _("Bounding box edges"), _("Snap to edges of a bounding box"),
-                                                     INKSCAPE_ICON_SNAP_BOUNDING_BOX_EDGES, secondarySize, SP_ATTR_INKSCAPE_BBOX_PATHS);
+                                                     INKSCAPE_ICON("snap-bounding-box-edges"), secondarySize, SP_ATTR_INKSCAPE_BBOX_PATHS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2302,7 +2302,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToBBoxNode",
                                                      _("Bounding box corners"), _("Snap to bounding box corners"),
-                                                     INKSCAPE_ICON_SNAP_BOUNDING_BOX_CORNERS, secondarySize, SP_ATTR_INKSCAPE_BBOX_NODES);
+                                                     INKSCAPE_ICON("snap-bounding-box-corners"), secondarySize, SP_ATTR_INKSCAPE_BBOX_NODES);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2311,7 +2311,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromBBoxEdgeMidpoints",
                                                      _("BBox Edge Midpoints"), _("Snap from and to midpoints of bounding box edges"),
-                                                     INKSCAPE_ICON_SNAP_BOUNDING_BOX_MIDPOINTS, secondarySize,
+                                                     INKSCAPE_ICON("snap-bounding-box-midpoints"), secondarySize,
                                                      SP_ATTR_INKSCAPE_SNAP_BBOX_EDGE_MIDPOINTS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2321,7 +2321,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromBBoxCenters",
                                                      _("BBox Centers"), _("Snapping from and to centers of bounding boxes"),
-                                                     INKSCAPE_ICON_SNAP_BOUNDING_BOX_CENTER, secondarySize, SP_ATTR_INKSCAPE_SNAP_BBOX_MIDPOINTS);
+                                                     INKSCAPE_ICON("snap-bounding-box-center"), secondarySize, SP_ATTR_INKSCAPE_SNAP_BBOX_MIDPOINTS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2329,7 +2329,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapFromNode",
-                                                     _("Nodes"), _("Snap nodes or handles"), INKSCAPE_ICON_SNAP_NODES, secondarySize, SP_ATTR_INKSCAPE_SNAP_NODES);
+                                                     _("Nodes"), _("Snap nodes or handles"), INKSCAPE_ICON("snap-nodes"), secondarySize, SP_ATTR_INKSCAPE_SNAP_NODES);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2337,7 +2337,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToItemPath",
-                                                     _("Paths"), _("Snap to paths"), INKSCAPE_ICON_SNAP_NODES_PATH, secondarySize,
+                                                     _("Paths"), _("Snap to paths"), INKSCAPE_ICON("snap-nodes-path"), secondarySize,
                                                      SP_ATTR_INKSCAPE_OBJECT_PATHS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2347,7 +2347,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToPathIntersections",
                                                      _("Path intersections"), _("Snap to path intersections"),
-                                                     INKSCAPE_ICON_SNAP_NODES_INTERSECTION, secondarySize, SP_ATTR_INKSCAPE_SNAP_INTERS_PATHS);
+                                                     INKSCAPE_ICON("snap-nodes-intersection"), secondarySize, SP_ATTR_INKSCAPE_SNAP_INTERS_PATHS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2355,7 +2355,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToItemNode",
-                                                     _("To nodes"), _("Snap to cusp nodes"), INKSCAPE_ICON_SNAP_NODES_CUSP, secondarySize,
+                                                     _("To nodes"), _("Snap to cusp nodes"), INKSCAPE_ICON("snap-nodes-cusp"), secondarySize,
                                                      SP_ATTR_INKSCAPE_OBJECT_NODES);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2364,7 +2364,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToSmoothNodes",
-                                                     _("Smooth nodes"), _("Snap to smooth nodes"), INKSCAPE_ICON_SNAP_NODES_SMOOTH,
+                                                     _("Smooth nodes"), _("Snap to smooth nodes"), INKSCAPE_ICON("snap-nodes-smooth"),
                                                      secondarySize, SP_ATTR_INKSCAPE_SNAP_SMOOTH_NODES);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2374,7 +2374,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromLineMidpoints",
                                                      _("Line Midpoints"), _("Snap from and to midpoints of line segments"),
-                                                     INKSCAPE_ICON_SNAP_NODES_MIDPOINT, secondarySize, SP_ATTR_INKSCAPE_SNAP_LINE_MIDPOINTS);
+                                                     INKSCAPE_ICON("snap-nodes-midpoint"), secondarySize, SP_ATTR_INKSCAPE_SNAP_LINE_MIDPOINTS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2382,7 +2382,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapFromOthers",
-                                                     _("Others"), _("Snap other points (centers, guide origins, gradient handles, etc.)"), INKSCAPE_ICON_SNAP_OTHERS, secondarySize, SP_ATTR_INKSCAPE_SNAP_OTHERS);
+                                                     _("Others"), _("Snap other points (centers, guide origins, gradient handles, etc.)"), INKSCAPE_ICON("snap-others"), secondarySize, SP_ATTR_INKSCAPE_SNAP_OTHERS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2391,7 +2391,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromObjectCenters",
                                                      _("Object Centers"), _("Snap from and to centers of objects"),
-                                                     INKSCAPE_ICON_SNAP_NODES_CENTER, secondarySize, SP_ATTR_INKSCAPE_SNAP_OBJECT_MIDPOINTS);
+                                                     INKSCAPE_ICON("snap-nodes-center"), secondarySize, SP_ATTR_INKSCAPE_SNAP_OBJECT_MIDPOINTS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2400,7 +2400,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromRotationCenter",
                                                      _("Rotation Centers"), _("Snap from and to an item's rotation center"),
-                                                     INKSCAPE_ICON_SNAP_NODES_ROTATION_CENTER, secondarySize, SP_ATTR_INKSCAPE_SNAP_CENTER);
+                                                     INKSCAPE_ICON("snap-nodes-rotation-center"), secondarySize, SP_ATTR_INKSCAPE_SNAP_CENTER);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2409,7 +2409,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToFromTextBaseline",
                                                      _("Text baseline"), _("Snap from and to text anchors and baselines"),
-                                                     INKSCAPE_ICON_SNAP_TEXT_BASELINE, secondarySize, SP_ATTR_INKSCAPE_SNAP_TEXT_BASELINE);
+                                                     INKSCAPE_ICON("snap-text-baseline"), secondarySize, SP_ATTR_INKSCAPE_SNAP_TEXT_BASELINE);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(toggle_snap_callback), toolbox );
@@ -2418,7 +2418,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToPageBorder",
-                                                     _("Page border"), _("Snap to the page border"), INKSCAPE_ICON_SNAP_PAGE,
+                                                     _("Page border"), _("Snap to the page border"), INKSCAPE_ICON("snap-page"),
                                                      secondarySize, SP_ATTR_INKSCAPE_SNAP_PAGE);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2427,7 +2427,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToGrids",
-                                                     _("Grids"), _("Snap to grids"), INKSCAPE_ICON_GRID_RECTANGULAR, secondarySize,
+                                                     _("Grids"), _("Snap to grids"), INKSCAPE_ICON("grid-rectangular"), secondarySize,
                                                      SP_ATTR_INKSCAPE_SNAP_GRIDS);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2436,7 +2436,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
 
     {
         InkToggleAction* act = ink_toggle_action_new("ToggleSnapToGuides",
-                                                     _("Guides"), _("Snap to guides"), INKSCAPE_ICON_GUIDES, secondarySize,
+                                                     _("Guides"), _("Snap to guides"), INKSCAPE_ICON("guides"), secondarySize,
                                                      SP_ATTR_INKSCAPE_SNAP_TO_GUIDES);
 
         gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -2446,7 +2446,7 @@ void setup_snap_toolbox(GtkWidget *toolbox, SPDesktop *desktop)
     /*{
       InkToggleAction* act = ink_toggle_action_new("ToggleSnapToGridGuideIntersections",
       _("Grid/guide intersections"), _("Snap to intersections of a grid with a guide"),
-      INKSCAPE_ICON_SNAP_GRID_GUIDE_INTERSECTIONS, secondarySize,
+      INKSCAPE_ICON("snap-grid-guide-intersections"), secondarySize,
       SP_ATTR_INKSCAPE_SNAP_INTERS_GRIDGUIDE);
 
       gtk_action_group_add_action( mainActions->gobj(), GTK_ACTION( act ) );
@@ -3014,14 +3014,14 @@ static void sp_star_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
             gtk_list_store_set( model, &iter,
                                 0, _("Polygon"),
                                 1, _("Regular polygon (with one handle) instead of a star"),
-                                2, INKSCAPE_ICON_DRAW_POLYGON,
+                                2, INKSCAPE_ICON("draw-polygon"),
                                 -1 );
 
             gtk_list_store_append( model, &iter );
             gtk_list_store_set( model, &iter,
                                 0, _("Star"),
                                 1, _("Star instead of a regular polygon (with one handle)"),
-                                2, INKSCAPE_ICON_DRAW_STAR,
+                                2, INKSCAPE_ICON("draw-star"),
                                 -1 );
 
             EgeSelectOneAction* act = ege_select_one_action_new( "FlatAction", (""), (""), NULL, GTK_TREE_MODEL(model) );
@@ -3444,7 +3444,7 @@ static void sp_rect_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         InkAction* inky = ink_action_new( "RectResetAction",
                                           _("Not rounded"),
                                           _("Make corners sharp"),
-                                          INKSCAPE_ICON_RECTANGLE_MAKE_CORNERS_SHARP,
+                                          INKSCAPE_ICON("rectangle-make-corners-sharp"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_rtb_defaults), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -3731,7 +3731,7 @@ static void box3d_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions,
                                                       // Translators: VP is short for 'vanishing point'
                                                       _("State of VP in X direction"),
                                                       _("Toggle VP in X direction between 'finite' and 'infinite' (=parallel)"),
-                                                      INKSCAPE_ICON_PERSPECTIVE_PARALLEL,
+                                                      INKSCAPE_ICON("perspective-parallel"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_object_set_data( holder, "box3d_vp_x_state_action", act );
@@ -3770,7 +3770,7 @@ static void box3d_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions,
                                                       // Translators: VP is short for 'vanishing point'
                                                       _("State of VP in Y direction"),
                                                       _("Toggle VP in Y direction between 'finite' and 'infinite' (=parallel)"),
-                                                      INKSCAPE_ICON_PERSPECTIVE_PARALLEL,
+                                                      INKSCAPE_ICON("perspective-parallel"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_object_set_data( holder, "box3d_vp_y_state_action", act );
@@ -3809,7 +3809,7 @@ static void box3d_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions,
                                                       // Translators: VP is short for 'vanishing point'
                                                       _("State of VP in Z direction"),
                                                       _("Toggle VP in Z direction between 'finite' and 'infinite' (=parallel)"),
-                                                      INKSCAPE_ICON_PERSPECTIVE_PARALLEL,
+                                                      INKSCAPE_ICON("perspective-parallel"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_object_set_data( holder, "box3d_vp_z_state_action", act );
@@ -4111,14 +4111,14 @@ static void sp_add_freehand_mode_toggle(GtkActionGroup* mainActions, GObject* ho
             gtk_list_store_set( model, &iter,
                                 0, _("Bezier"),
                                 1, _("Create regular Bezier path"),
-                                2, INKSCAPE_ICON_PATH_MODE_BEZIER,
+                                2, INKSCAPE_ICON("path-mode-bezier"),
                                 -1 );
 
             gtk_list_store_append( model, &iter );
             gtk_list_store_set( model, &iter,
                                 0, _("Spiro"),
                                 1, _("Create Spiro path"),
-                                2, INKSCAPE_ICON_PATH_MODE_SPIRO,
+                                2, INKSCAPE_ICON("path-mode-spiro"),
                                 -1 );
 
             if (!tool_is_pencil) {
@@ -4126,14 +4126,14 @@ static void sp_add_freehand_mode_toggle(GtkActionGroup* mainActions, GObject* ho
                 gtk_list_store_set( model, &iter,
                                     0, _("Zigzag"),
                                     1, _("Create a sequence of straight line segments"),
-                                    2, INKSCAPE_ICON_PATH_MODE_POLYLINE,
+                                    2, INKSCAPE_ICON("path-mode-polyline"),
                                     -1 );
 
                 gtk_list_store_append( model, &iter );
                 gtk_list_store_set( model, &iter,
                                     0, _("Paraxial"),
                                     1, _("Create a sequence of paraxial line segments"),
-                                    2, INKSCAPE_ICON_PATH_MODE_POLYLINE_PARAXIAL,
+                                    2, INKSCAPE_ICON("path-mode-polyline-paraxial"),
                                     -1 );
             }
 
@@ -4429,91 +4429,91 @@ static void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainAction
         gtk_list_store_set( model, &iter,
                             0, _("Move mode"),
                             1, _("Move objects in any direction"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_PUSH,
+                            2, INKSCAPE_ICON("object-tweak-push"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Move in/out mode"),
                             1, _("Move objects towards cursor; with Shift from cursor"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_ATTRACT,
+                            2, INKSCAPE_ICON("object-tweak-attract"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Move jitter mode"),
                             1, _("Move objects in random directions"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_RANDOMIZE,
+                            2, INKSCAPE_ICON("object-tweak-randomize"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Scale mode"),
                             1, _("Shrink objects, with Shift enlarge"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_SHRINK,
+                            2, INKSCAPE_ICON("object-tweak-shrink"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Rotate mode"),
                             1, _("Rotate objects, with Shift counterclockwise"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_ROTATE,
+                            2, INKSCAPE_ICON("object-tweak-rotate"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Duplicate/delete mode"),
                             1, _("Duplicate objects, with Shift delete"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_DUPLICATE,
+                            2, INKSCAPE_ICON("object-tweak-duplicate"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Push mode"),
                             1, _("Push parts of paths in any direction"),
-                            2, INKSCAPE_ICON_PATH_TWEAK_PUSH,
+                            2, INKSCAPE_ICON("path-tweak-push"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Shrink/grow mode"),
                             1, _("Shrink (inset) parts of paths; with Shift grow (outset)"),
-                            2, INKSCAPE_ICON_PATH_TWEAK_SHRINK,
+                            2, INKSCAPE_ICON("path-tweak-shrink"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Attract/repel mode"),
                             1, _("Attract parts of paths towards cursor; with Shift from cursor"),
-                            2, INKSCAPE_ICON_PATH_TWEAK_ATTRACT,
+                            2, INKSCAPE_ICON("path-tweak-attract"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Roughen mode"),
                             1, _("Roughen parts of paths"),
-                            2, INKSCAPE_ICON_PATH_TWEAK_ROUGHEN,
+                            2, INKSCAPE_ICON("path-tweak-roughen"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Color paint mode"),
                             1, _("Paint the tool's color upon selected objects"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_PAINT,
+                            2, INKSCAPE_ICON("object-tweak-paint"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Color jitter mode"),
                             1, _("Jitter the colors of selected objects"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_JITTER_COLOR,
+                            2, INKSCAPE_ICON("object-tweak-jitter-color"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Blur mode"),
                             1, _("Blur selected objects more; with Shift, blur less"),
-                            2, INKSCAPE_ICON_OBJECT_TWEAK_BLUR,
+                            2, INKSCAPE_ICON("object-tweak-blur"),
                             -1 );
 
 
@@ -4638,7 +4638,7 @@ static void sp_tweak_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainAction
         InkToggleAction* act = ink_toggle_action_new( "TweakPressureAction",
                                                       _("Pressure"),
                                                       _("Use the pressure of the input device to alter the force of tweak action"),
-                                                      INKSCAPE_ICON_DRAW_USE_PRESSURE,
+                                                      INKSCAPE_ICON("draw-use-pressure"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
         g_signal_connect_after( G_OBJECT(act), "toggled", G_CALLBACK(sp_tweak_pressure_state_changed), NULL);
@@ -4758,21 +4758,21 @@ static void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainAction
         gtk_list_store_set( model, &iter,
                             0, _("Spray with copies"),
                             1, _("Spray copies of the initial selection"),
-                            2, INKSCAPE_ICON_SPRAY_COPY_MODE,
+                            2, INKSCAPE_ICON("spray-mode-copy"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Spray with clones"),
                             1, _("Spray clones of the initial selection"),
-                            2, INKSCAPE_ICON_SPRAY_CLONE_MODE,
+                            2, INKSCAPE_ICON("spray-mode-clone"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Spray single path"),
                             1, _("Spray objects in a single path"),
-                            2, INKSCAPE_ICON_SPRAY_UNION_MODE,
+                            2, INKSCAPE_ICON("spray-mode-union"),
                             -1 );
 
         EgeSelectOneAction* act = ege_select_one_action_new( "SprayModeAction", _("Mode"), (""), NULL, GTK_TREE_MODEL(model) );
@@ -4821,7 +4821,7 @@ static void sp_spray_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainAction
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
         PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/spray/usepressure");
         g_signal_connect(holder, "destroy", G_CALLBACK(delete_prefspusher), pusher);
-        
+
     }
 
     {   /* Rotation */
@@ -5338,7 +5338,7 @@ static void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* main
             InkToggleAction* act = ink_toggle_action_new( "TraceAction",
                                                           _("Trace Background"),
                                                           _("Trace the lightness of the background by the width of the pen (white - minimum width, black - maximum width)"),
-                                                          INKSCAPE_ICON_DRAW_TRACE_BACKGROUND,
+                                                          INKSCAPE_ICON("draw-trace-background"),
                                                           Inkscape::ICON_SIZE_DECORATION );
             gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
             PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/calligraphic/tracebackground", update_presets_list, holder);
@@ -5351,7 +5351,7 @@ static void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* main
             InkToggleAction* act = ink_toggle_action_new( "PressureAction",
                                                           _("Pressure"),
                                                           _("Use the pressure of the input device to alter the width of the pen"),
-                                                          INKSCAPE_ICON_DRAW_USE_PRESSURE,
+                                                          INKSCAPE_ICON("draw-use-pressure"),
                                                           Inkscape::ICON_SIZE_DECORATION );
             gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
             PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/calligraphic/usepressure", update_presets_list, holder);
@@ -5364,7 +5364,7 @@ static void sp_calligraphy_toolbox_prep(SPDesktop *desktop, GtkActionGroup* main
             InkToggleAction* act = ink_toggle_action_new( "TiltAction",
                                                           _("Tilt"),
                                                           _("Use the tilt of the input device to alter the angle of the pen's nib"),
-                                                          INKSCAPE_ICON_DRAW_USE_TILT,
+                                                          INKSCAPE_ICON("draw-use-tilt"),
                                                           Inkscape::ICON_SIZE_DECORATION );
             gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
             PrefPusher *pusher = new PrefPusher(GTK_TOGGLE_ACTION(act), "/tools/calligraphic/usetilt", update_presets_list, holder);
@@ -5692,14 +5692,14 @@ static void sp_arc_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions,
         gtk_list_store_set( model, &iter,
                             0, _("Closed arc"),
                             1, _("Switch to segment (closed shape with two radii)"),
-                            2, INKSCAPE_ICON_DRAW_ELLIPSE_SEGMENT,
+                            2, INKSCAPE_ICON("draw-ellipse-segment"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Open Arc"),
                             1, _("Switch to arc (unclosed shape)"),
-                            2, INKSCAPE_ICON_DRAW_ELLIPSE_ARC,
+                            2, INKSCAPE_ICON("draw-ellipse-arc"),
                             -1 );
 
         EgeSelectOneAction* act = ege_select_one_action_new( "ArcOpenAction", (""), (""), NULL, GTK_TREE_MODEL(model) );
@@ -5723,7 +5723,7 @@ static void sp_arc_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions,
         InkAction* inky = ink_action_new( "ArcResetAction",
                                           _("Make whole"),
                                           _("Make the shape a whole ellipse, not arc or segment"),
-                                          INKSCAPE_ICON_DRAW_ELLIPSE_WHOLE,
+                                          INKSCAPE_ICON("draw-ellipse-whole"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_arctb_defaults), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -6230,21 +6230,21 @@ static void sp_eraser_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActio
         gtk_list_store_set( model, &iter,
                             0, _("Delete"),
                             1, _("Delete objects touched by the eraser"),
-                            2, INKSCAPE_ICON_DRAW_ERASER_DELETE_OBJECTS,
+                            2, INKSCAPE_ICON("draw-eraser-delete-objects"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Cut"),
                             1, _("Cut out from objects"),
-                            2, INKSCAPE_ICON_PATH_DIFFERENCE,
+                            2, INKSCAPE_ICON("path-difference"),
                             -1 );
 
         EgeSelectOneAction* act = ege_select_one_action_new( "EraserModeAction", (""), (""), NULL, GTK_TREE_MODEL(model) );
         g_object_set( act, "short_label", _("Mode:"), NULL );
         gtk_action_group_add_action( mainActions, GTK_ACTION(act) );
         g_object_set_data( holder, "eraser_mode_action", act );
-        
+
         ege_select_one_action_set_appearance( act, "full" );
         ege_select_one_action_set_radio_action_type( act, INK_RADIO_ACTION_TYPE );
         g_object_set( G_OBJECT(act), "icon-property", "iconId", NULL );
@@ -7753,14 +7753,14 @@ static void sp_text_toolbox_prep(SPDesktop *desktop, GtkActionGroup* mainActions
         gtk_list_store_set( model, &iter,
                             0, _("Horizontal"),
                             1, _("Horizontal text"),
-                            2, INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_HORIZONTAL,
+                            2, INKSCAPE_ICON("format-text-direction-horizontal"),
                             -1 );
 
         gtk_list_store_append( model, &iter );
         gtk_list_store_set( model, &iter,
                             0, _("Vertical"),
                             1, _("Vertical text"),
-                            2, INKSCAPE_ICON_FORMAT_TEXT_DIRECTION_VERTICAL,
+                            2, INKSCAPE_ICON("format-text-direction-vertical"),
                             -1 );
 
         EgeSelectOneAction* act = ege_select_one_action_new( "TextOrientationAction", // Name
@@ -8281,7 +8281,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkToggleAction* act = ink_toggle_action_new( "ConnectorEditModeAction",
                                                       _("EditMode"),
                                                       _("Switch between connection point editing and connector drawing mode"),
-                                                      INKSCAPE_ICON_CONNECTOR_EDIT,
+                                                      INKSCAPE_ICON("connector-edit"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
 
@@ -8296,7 +8296,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkAction* inky = ink_action_new( "ConnectorAvoidAction",
                                           _("Avoid"),
                                           _("Make connectors avoid selected objects"),
-                                          INKSCAPE_ICON_CONNECTOR_AVOID,
+                                          INKSCAPE_ICON("connector-avoid"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_path_set_avoid), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -8306,7 +8306,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkAction* inky = ink_action_new( "ConnectorIgnoreAction",
                                           _("Ignore"),
                                           _("Make connectors ignore selected objects"),
-                                          INKSCAPE_ICON_CONNECTOR_IGNORE,
+                                          INKSCAPE_ICON("connector-ignore"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_path_set_ignore), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -8317,7 +8317,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkToggleAction* act = ink_toggle_action_new( "ConnectorOrthogonalAction",
                                                       _("Orthogonal"),
                                                       _("Make connector orthogonal or polyline"),
-                                                      INKSCAPE_ICON_CONNECTOR_ORTHOGONAL,
+                                                      INKSCAPE_ICON("connector-orthogonal"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
 
@@ -8355,7 +8355,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkAction* inky = ink_action_new( "ConnectorGraphAction",
                                           _("Graph"),
                                           _("Nicely arrange selected connector network"),
-                                          INKSCAPE_ICON_DISTRIBUTE_GRAPH,
+                                          INKSCAPE_ICON("distribute-graph"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_graph_layout), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -8378,7 +8378,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkToggleAction* act = ink_toggle_action_new( "ConnectorDirectedAction",
                                                       _("Downwards"),
                                                       _("Make connectors with end-markers (arrows) point downwards"),
-                                                      INKSCAPE_ICON_DISTRIBUTE_GRAPH_DIRECTED,
+                                                      INKSCAPE_ICON("distribute-graph-directed"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
 
@@ -8394,7 +8394,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkToggleAction* act = ink_toggle_action_new( "ConnectorOverlapAction",
                                                       _("Remove overlaps"),
                                                       _("Do not allow overlapping shapes"),
-                                                      INKSCAPE_ICON_DISTRIBUTE_REMOVE_OVERLAPS,
+                                                      INKSCAPE_ICON("distribute-remove-overlaps"),
                                                       Inkscape::ICON_SIZE_DECORATION );
         gtk_action_group_add_action( mainActions, GTK_ACTION( act ) );
 
@@ -8410,7 +8410,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkAction* inky = ink_action_new( "ConnectorNewConnPointAction",
                                           _("New connection point"),
                                           _("Add a new connection point to the currently selected item"),
-                                          INKSCAPE_ICON_CONNECTOR_NEW_CONNPOINT,
+                                          INKSCAPE_ICON("connector-new-connpoint"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_new_connection_point), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );
@@ -8422,7 +8422,7 @@ static void sp_connector_toolbox_prep( SPDesktop *desktop, GtkActionGroup* mainA
         InkAction* inky = ink_action_new( "ConnectorRemoveConnPointAction",
                                           _("Remove connection point"),
                                           _("Remove the currently selected connection point"),
-                                          INKSCAPE_ICON_CONNECTOR_REMOVE_CONNPOINT,
+                                          INKSCAPE_ICON("connector-remove-connpoint"),
                                           secondarySize );
         g_signal_connect_after( G_OBJECT(inky), "activate", G_CALLBACK(sp_connector_remove_connection_point), holder );
         gtk_action_group_add_action( mainActions, GTK_ACTION(inky) );