Merge branch 'master' into powerpencilII

402 files changed, 207 insertions, 125 deletions

diff --git a/doc/LOGGING.txt b/doc/LOGGING.txt
index a6b9314df..0fa90e1da 100644
--- a/doc/LOGGING.txt
+++ b/doc/LOGGING.txt
@@ -1,7 +1,7 @@
 
 Logging Inkscape events can be done by switching on DEBUG logs:
 
-Set the enviroment variables:
+Set the environment variables:
 
 INKSCAPE_DEBUG_LOG=filename.xml
 INKSCAPE_DEBUG_FILTER=Comma,List,Options
diff --git a/doc/extension_system.txt b/doc/extension_system.txt
index 12c3ebb97..0fad8f336 100644
--- a/doc/extension_system.txt
+++ b/doc/extension_system.txt
@@ -234,7 +234,7 @@ An input extension provides a way to get data into Inkscape.  This type
 of extension creates a document given a filename.  This is done by using
 the 'open' method within the class.  Also, there is a 'prefs' function
 which will generate a GtkDialog.  This dialog is then used to get any
-settings that the incomming file and extension my use.  This function is
+settings that the incoming file and extension may use.  This function is
 executed, and the dialog returns, before the open method is called.
 
 There are also several other settings stored in an Input extension.
diff --git a/doc/extension_system.xml b/doc/extension_system.xml
index e4271362a..dc6d25ecc 100644
--- a/doc/extension_system.xml
+++ b/doc/extension_system.xml
@@ -6,7 +6,7 @@
 		<title>Introduction</title>
 		<para>The extensions system in Inkscape is a way for adding functionality to Inkscape, without affecting the core of the program itself.  We want Inkscape to follow a core-plus-modules approach similar to that adopted by many successful open source projects such as the Linux kernel, Perl, Apache, Gimp, and so on.  There are many different types of extension mechanisms, including file format conversion tools, filter scripts that process SVG, user interface elements that can be added at runtime, and so forth.</para>
 		<para>This proposal defines a design for handling this wide variety of extensions in a flexible manner.  This document provides a way to understand the extensions system, and how extensions fit into this overall system.</para>
-		<para>Much of the documentation that will be useful for users of the extension system is not included in this document, it is autogenerated from the source code and placed on the Inkscape webpage.  While this is less convienient, it is more correct, and maintained as the source code is modified.  Please look aton the Inkscape webpage also.</para>
+		<para>Much of the documentation that will be useful for users of the extension system is not included in this document, it is autogenerated from the source code and placed on the Inkscape webpage.  While this is less convenient, it is more correct, and maintained as the source code is modified.  Please look aton the Inkscape webpage also.</para>
 	</chapter>
 	<chapter>
 		<title>Terminology</title>
@@ -118,7 +118,7 @@
 			<variablelist>
 				<varlistentry>
 					<term>ID</term>
-					<para>A unique identifier for this extension that is used for refering to the extension and naming its parameters in the configuration files.</para>
+					<para>A unique identifier for this extension that is used for referring to the extension and naming its parameters in the configuration files.</para>
 				</varlistentry>
 				<varlistentry>
 					<term>Name</term>
@@ -153,8 +153,8 @@
 		<para>Each Extension is identified by it's 'Type'.  This determines the type of programmatic interface that it adheres to, enabling Inkscape to know what functionality it can expect from the extension.</para>
 		<section>
 			<title>Input</title>
-			<para>An input extension provides a way to get data into Inkscape.  This type of extension creates a document given a filename.  This is done by using the 'open' method within the class.  Also, there is a 'prefs' function which will generate a GtkDialog.  This dialog is then used to get any settings that the incomming file and extension my use.  This function is executed, and the dialog returns, before the open method is called.</para>
-			<para>There are also several other settings stored in an Input extension.  This includes information on the type of file the input module can take in including its filename extension and mime type.  Also, there is a space to store a tooltip for additional information on the file type in the file dialog.  Lastly, there is the key of which Output extension is recommended for saving this filetype.  This is useful, as there is no other direct links between the Input and Ouput functions, and a user expects to be able to open and save without using the 'Save As...' dialog.</para>
+			<para>An input extension provides a way to get data into Inkscape.  This type of extension creates a document given a filename.  This is done by using the 'open' method within the class.  Also, there is a 'prefs' function which will generate a GtkDialog.  This dialog is then used to get any settings that the incoming file and extension may use.  This function is executed, and the dialog returns, before the open method is called.</para>
+			<para>There are also several other settings stored in an Input extension.  This includes information on the type of file the input module can take in including its filename extension and mime type.  Also, there is a space to store a tooltip for additional information on the file type in the file dialog.  Lastly, there is the key of which Output extension is recommended for saving this filetype.  This is useful, as there is no other direct links between the Input and Output functions, and a user expects to be able to open and save without using the 'Save As...' dialog.</para>
 		</section>
 		<section>
 			<title>Output</title>
diff --git a/doc/nr-filter-interface.txt b/doc/nr-filter-interface.txt
index 6065333fe..6950317fc 100644
--- a/doc/nr-filter-interface.txt
+++ b/doc/nr-filter-interface.txt
@@ -19,7 +19,7 @@ Creates a new filter primitive under this filter object.
 New primitive is placed so that it will be executed after all filter
 primitives defined beforehand for this filter object.
 Should this filter not have enough space for a new primitive, the filter
-is enlarged to accomodate the new filter element. It may be enlarged by more
+is enlarged to accommodate the new filter element. It may be enlarged by more
 that one element.
 Returns a pointer to the filter primitive created.
 Returns NULL, if type is not valid filter primitive type or filter primitive
@@ -225,5 +225,5 @@ Passing either of these functions a negative value, NaN or infinity is
 considered an error and no changes to filter state are made. If not set, 
 default value of zero is used, which means the filter results in 
 transparent black image.
-(NB: as for now, the default value can be overriden with configuration 
+(NB: as for now, the default value can be overridden with configuration 
 file parameter options.filtertest)
diff --git a/share/icons/CMakeLists.txt b/share/icons/CMakeLists.txt
index 61bb2933e..8d7db9b95 100644
--- a/share/icons/CMakeLists.txt
+++ b/share/icons/CMakeLists.txt
@@ -1,4 +1,5 @@
 add_subdirectory(application)
+add_subdirectory(hicolor)
 
 file(GLOB _FILES "*.svg" "*.jpg" "*.png" "README")
 install(FILES ${_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons)
diff --git a/share/icons/README b/share/icons/README
index 530dc3bef..e07dc4f46 100644
--- a/share/icons/README
+++ b/share/icons/README
@@ -1,10 +1,13 @@
-Jan 18, 2008
-ticotico.jpg is (C)2008 Dario Sanches licensed under Creative Commons by-sa 3.0
 
-Wed Jan 19, 2005
+Icons follow the freedesktop.org icon scheme. Icons must be placed in
+either the "root" level icon directory (share/icons, not recommended)
+or a subdirectory which matches one the system installed theme,
+i.e. share/icons/hicolor/scalable/actions. Note that 'hicolor' is the
+default/backup theme. For the moment, putting all Inkscape icons in
+'actions' subdirectory.
+
+Providing an 'index.theme' file or generating an icon cache via
+gtk-update-icon-cache does not appear useful.
 
-All XPM and PNG icons have been replaced by SVG icons in icons.svg
+ticotico.jpg is (C)2008 Dario Sanches licensed under Creative Commons by-sa 3.0
 
-The only graphics that will be kept as XPMs will be the cursor
-icons. (REJON: I"m actually in favor of trying to convert these to SVGs
-as well.)  These files are located in src/pixmaps.
diff --git a/share/icons/hicolor/CMakeLists.txt b/share/icons/hicolor/CMakeLists.txt
new file mode 100644
index 000000000..655e62ddb
--- /dev/null
+++ b/share/icons/hicolor/CMakeLists.txt
@@ -0,0 +1,13 @@
+set(THEME hicolor)
+
+set(PIXMAP_SIZES "scalable")
+set(CONTENT "actions")
+
+foreach(pixmap_size ${PIXMAP_SIZES})
+  foreach(content ${CONTENT})
+    FILE(GLOB PIXMAP_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.png ${CMAKE_CURRENT_SOURCE_DIR}/${pixmap_size}/${content}/*.svg)
+    MESSAGE( STATUS "CMAKE_CURRENT_SOURCE_DIR: " ${CMAKE_CURRENT_SOURCE_DIR} )
+    MESSAGE( STATUS "PIXMAP_FILES: " ${PIXMAP_FILES} )
+    install(FILES ${PIXMAP_FILES} DESTINATION ${INKSCAPE_SHARE_INSTALL}/icons/${THEME}/${pixmap_size}/${content})
+  endforeach(content)
+endforeach(pixmap_size)
diff --git a/share/icons/hicolor/index.theme b/share/icons/hicolor/index.theme
deleted file mode 100644
index e69de29bb..000000000
--- a/share/icons/hicolor/index.theme
+++ /dev/null
diff --git a/share/icons/3dbox_four_handles.svg b/share/icons/hicolor/scalable/actions/3dbox_four_handles.svg
index e8d5a6f1f..e8d5a6f1f 100644
--- a/share/icons/3dbox_four_handles.svg
+++ b/share/icons/hicolor/scalable/actions/3dbox_four_handles.svg
diff --git a/share/icons/3dbox_three_handles.svg b/share/icons/hicolor/scalable/actions/3dbox_three_handles.svg
index bb03464be..bb03464be 100644
--- a/share/icons/3dbox_three_handles.svg
+++ b/share/icons/hicolor/scalable/actions/3dbox_three_handles.svg
diff --git a/share/icons/align-horizontal-baseline.svg b/share/icons/hicolor/scalable/actions/align-horizontal-baseline.svg
index a704eb27b..a704eb27b 100644
--- a/share/icons/align-horizontal-baseline.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-baseline.svg
diff --git a/share/icons/align-horizontal-center.svg b/share/icons/hicolor/scalable/actions/align-horizontal-center.svg
index 9cac83e06..9cac83e06 100644
--- a/share/icons/align-horizontal-center.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-center.svg
diff --git a/share/icons/align-horizontal-left-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-horizontal-left-to-anchor.svg
index 2585464da..2585464da 100644
--- a/share/icons/align-horizontal-left-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-left-to-anchor.svg
diff --git a/share/icons/align-horizontal-left.svg b/share/icons/hicolor/scalable/actions/align-horizontal-left.svg
index eaaa947b7..eaaa947b7 100644
--- a/share/icons/align-horizontal-left.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-left.svg
diff --git a/share/icons/align-horizontal-node.svg b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
index 7660c84e8..7660c84e8 100644
--- a/share/icons/align-horizontal-node.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-node.svg
diff --git a/share/icons/align-horizontal-right-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-horizontal-right-to-anchor.svg
index 8e931ccac..8e931ccac 100644
--- a/share/icons/align-horizontal-right-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-right-to-anchor.svg
diff --git a/share/icons/align-horizontal-right.svg b/share/icons/hicolor/scalable/actions/align-horizontal-right.svg
index fd873a131..fd873a131 100644
--- a/share/icons/align-horizontal-right.svg
+++ b/share/icons/hicolor/scalable/actions/align-horizontal-right.svg
diff --git a/share/icons/align-vertical-baseline.svg b/share/icons/hicolor/scalable/actions/align-vertical-baseline.svg
index 8c9db2954..8c9db2954 100644
--- a/share/icons/align-vertical-baseline.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-baseline.svg
diff --git a/share/icons/align-vertical-bottom-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-vertical-bottom-to-anchor.svg
index e8da3e3a1..e8da3e3a1 100644
--- a/share/icons/align-vertical-bottom-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-bottom-to-anchor.svg
diff --git a/share/icons/align-vertical-bottom.svg b/share/icons/hicolor/scalable/actions/align-vertical-bottom.svg
index f74df6407..f74df6407 100644
--- a/share/icons/align-vertical-bottom.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-bottom.svg
diff --git a/share/icons/align-vertical-center.svg b/share/icons/hicolor/scalable/actions/align-vertical-center.svg
index 2f326dca6..2f326dca6 100644
--- a/share/icons/align-vertical-center.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-center.svg
diff --git a/share/icons/align-vertical-node.svg b/share/icons/hicolor/scalable/actions/align-vertical-node.svg
index 7afae3f23..7afae3f23 100644
--- a/share/icons/align-vertical-node.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-node.svg
diff --git a/share/icons/align-vertical-top-to-anchor.svg b/share/icons/hicolor/scalable/actions/align-vertical-top-to-anchor.svg
index 18868264d..18868264d 100644
--- a/share/icons/align-vertical-top-to-anchor.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-top-to-anchor.svg
diff --git a/share/icons/align-vertical-top.svg b/share/icons/hicolor/scalable/actions/align-vertical-top.svg
index 37a3e4bca..37a3e4bca 100644
--- a/share/icons/align-vertical-top.svg
+++ b/share/icons/hicolor/scalable/actions/align-vertical-top.svg
diff --git a/share/icons/bitmap-trace.svg b/share/icons/hicolor/scalable/actions/bitmap-trace.svg
index 64d5fe194..64d5fe194 100644
--- a/share/icons/bitmap-trace.svg
+++ b/share/icons/hicolor/scalable/actions/bitmap-trace.svg
diff --git a/share/icons/boundingbox_bottom.svg b/share/icons/hicolor/scalable/actions/boundingbox_bottom.svg
index fc81944f6..fc81944f6 100644
--- a/share/icons/boundingbox_bottom.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_bottom.svg
diff --git a/share/icons/boundingbox_bottom_left.svg b/share/icons/hicolor/scalable/actions/boundingbox_bottom_left.svg
index adf99c0a3..adf99c0a3 100644
--- a/share/icons/boundingbox_bottom_left.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_bottom_left.svg
diff --git a/share/icons/boundingbox_bottom_right.svg b/share/icons/hicolor/scalable/actions/boundingbox_bottom_right.svg
index b95c49a61..b95c49a61 100644
--- a/share/icons/boundingbox_bottom_right.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_bottom_right.svg
diff --git a/share/icons/boundingbox_center.svg b/share/icons/hicolor/scalable/actions/boundingbox_center.svg
index 426a22962..426a22962 100644
--- a/share/icons/boundingbox_center.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_center.svg
diff --git a/share/icons/boundingbox_left.svg b/share/icons/hicolor/scalable/actions/boundingbox_left.svg
index 7283ca6c9..7283ca6c9 100644
--- a/share/icons/boundingbox_left.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_left.svg
diff --git a/share/icons/boundingbox_right.svg b/share/icons/hicolor/scalable/actions/boundingbox_right.svg
index 1a3e8ea6b..1a3e8ea6b 100644
--- a/share/icons/boundingbox_right.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_right.svg
diff --git a/share/icons/boundingbox_top.svg b/share/icons/hicolor/scalable/actions/boundingbox_top.svg
index 8cb936edd..8cb936edd 100644
--- a/share/icons/boundingbox_top.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_top.svg
diff --git a/share/icons/boundingbox_top_left.svg b/share/icons/hicolor/scalable/actions/boundingbox_top_left.svg
index c1ca4410d..c1ca4410d 100644
--- a/share/icons/boundingbox_top_left.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_top_left.svg
diff --git a/share/icons/boundingbox_top_right.svg b/share/icons/hicolor/scalable/actions/boundingbox_top_right.svg
index d8e1ea3ec..d8e1ea3ec 100644
--- a/share/icons/boundingbox_top_right.svg
+++ b/share/icons/hicolor/scalable/actions/boundingbox_top_right.svg
diff --git a/share/icons/clonetiler_per_column_color.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_column_color.svg
index 225a88e60..225a88e60 100644
--- a/share/icons/clonetiler_per_column_color.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_column_color.svg
diff --git a/share/icons/clonetiler_per_column_opacity.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_column_opacity.svg
index ba667d987..ba667d987 100644
--- a/share/icons/clonetiler_per_column_opacity.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_column_opacity.svg
diff --git a/share/icons/clonetiler_per_column_rotation.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_column_rotation.svg
index cd8c4efe3..cd8c4efe3 100644
--- a/share/icons/clonetiler_per_column_rotation.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_column_rotation.svg
diff --git a/share/icons/clonetiler_per_column_scale.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_column_scale.svg
index 1d8dbb8ca..1d8dbb8ca 100644
--- a/share/icons/clonetiler_per_column_scale.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_column_scale.svg
diff --git a/share/icons/clonetiler_per_column_shift.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_column_shift.svg
index c0eb22ca2..c0eb22ca2 100644
--- a/share/icons/clonetiler_per_column_shift.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_column_shift.svg
diff --git a/share/icons/clonetiler_per_row_color.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_row_color.svg
index 4fb9e58a4..4fb9e58a4 100644
--- a/share/icons/clonetiler_per_row_color.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_row_color.svg
diff --git a/share/icons/clonetiler_per_row_opacity.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_row_opacity.svg
index a958463dd..a958463dd 100644
--- a/share/icons/clonetiler_per_row_opacity.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_row_opacity.svg
diff --git a/share/icons/clonetiler_per_row_rotation.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_row_rotation.svg
index 375dc8c59..375dc8c59 100644
--- a/share/icons/clonetiler_per_row_rotation.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_row_rotation.svg
diff --git a/share/icons/clonetiler_per_row_scale.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_row_scale.svg
index 62e8bceea..62e8bceea 100644
--- a/share/icons/clonetiler_per_row_scale.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_row_scale.svg
diff --git a/share/icons/clonetiler_per_row_shift.svg b/share/icons/hicolor/scalable/actions/clonetiler_per_row_shift.svg
index 313c0632e..313c0632e 100644
--- a/share/icons/clonetiler_per_row_shift.svg
+++ b/share/icons/hicolor/scalable/actions/clonetiler_per_row_shift.svg
diff --git a/share/icons/color-fill.svg b/share/icons/hicolor/scalable/actions/color-fill.svg
index 8b60b3706..8b60b3706 100644
--- a/share/icons/color-fill.svg
+++ b/share/icons/hicolor/scalable/actions/color-fill.svg
diff --git a/share/icons/color-gradient.svg b/share/icons/hicolor/scalable/actions/color-gradient.svg
index 76a655031..76a655031 100644
--- a/share/icons/color-gradient.svg
+++ b/share/icons/hicolor/scalable/actions/color-gradient.svg
diff --git a/share/icons/color-management.svg b/share/icons/hicolor/scalable/actions/color-management.svg
index 7d5e91970..7d5e91970 100644
--- a/share/icons/color-management.svg
+++ b/share/icons/hicolor/scalable/actions/color-management.svg
diff --git a/share/icons/color-picker.svg b/share/icons/hicolor/scalable/actions/color-picker.svg
index 116f27f62..116f27f62 100644
--- a/share/icons/color-picker.svg
+++ b/share/icons/hicolor/scalable/actions/color-picker.svg
diff --git a/share/icons/connector-avoid.svg b/share/icons/hicolor/scalable/actions/connector-avoid.svg
index 79f2ad9a5..79f2ad9a5 100644
--- a/share/icons/connector-avoid.svg
+++ b/share/icons/hicolor/scalable/actions/connector-avoid.svg
diff --git a/share/icons/connector-edit.svg b/share/icons/hicolor/scalable/actions/connector-edit.svg
index f6ea9c2ef..f6ea9c2ef 100644
--- a/share/icons/connector-edit.svg
+++ b/share/icons/hicolor/scalable/actions/connector-edit.svg
diff --git a/share/icons/connector-ignore.svg b/share/icons/hicolor/scalable/actions/connector-ignore.svg
index fd9ec0081..fd9ec0081 100644
--- a/share/icons/connector-ignore.svg
+++ b/share/icons/hicolor/scalable/actions/connector-ignore.svg
diff --git a/share/icons/connector-new-connpoint.svg b/share/icons/hicolor/scalable/actions/connector-new-connpoint.svg
index b9e6dda18..b9e6dda18 100644
--- a/share/icons/connector-new-connpoint.svg
+++ b/share/icons/hicolor/scalable/actions/connector-new-connpoint.svg
diff --git a/share/icons/connector-orthogonal.svg b/share/icons/hicolor/scalable/actions/connector-orthogonal.svg
index a445fb1a2..a445fb1a2 100644
--- a/share/icons/connector-orthogonal.svg
+++ b/share/icons/hicolor/scalable/actions/connector-orthogonal.svg
diff --git a/share/icons/connector-remove-connpoint.svg b/share/icons/hicolor/scalable/actions/connector-remove-connpoint.svg
index 634deaa4a..634deaa4a 100644
--- a/share/icons/connector-remove-connpoint.svg
+++ b/share/icons/hicolor/scalable/actions/connector-remove-connpoint.svg
diff --git a/share/icons/controls_fill.svg b/share/icons/hicolor/scalable/actions/controls_fill.svg
index ce7802314..ce7802314 100644
--- a/share/icons/controls_fill.svg
+++ b/share/icons/hicolor/scalable/actions/controls_fill.svg
diff --git a/share/icons/controls_stroke.svg b/share/icons/hicolor/scalable/actions/controls_stroke.svg
index f6ce6f0c5..f6ce6f0c5 100644
--- a/share/icons/controls_stroke.svg
+++ b/share/icons/hicolor/scalable/actions/controls_stroke.svg
diff --git a/share/icons/dialog-align-and-distribute.svg b/share/icons/hicolor/scalable/actions/dialog-align-and-distribute.svg
index af53fc450..af53fc450 100644
--- a/share/icons/dialog-align-and-distribute.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-align-and-distribute.svg
diff --git a/share/icons/dialog-fill-and-stroke.svg b/share/icons/hicolor/scalable/actions/dialog-fill-and-stroke.svg
index ae65d4b36..ae65d4b36 100644
--- a/share/icons/dialog-fill-and-stroke.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-fill-and-stroke.svg
diff --git a/share/icons/dialog-filters.svg b/share/icons/hicolor/scalable/actions/dialog-filters.svg
index ce006bf39..ce006bf39 100644
--- a/share/icons/dialog-filters.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-filters.svg
diff --git a/share/icons/dialog-geometry.svg b/share/icons/hicolor/scalable/actions/dialog-geometry.svg
index e81a856e1..e81a856e1 100644
--- a/share/icons/dialog-geometry.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-geometry.svg
diff --git a/share/icons/dialog-icon-preview.svg b/share/icons/hicolor/scalable/actions/dialog-icon-preview.svg
index 3cfcbe2d4..3cfcbe2d4 100644
--- a/share/icons/dialog-icon-preview.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-icon-preview.svg
diff --git a/share/icons/dialog-input-devices.svg b/share/icons/hicolor/scalable/actions/dialog-input-devices.svg
index 4d218d96e..4d218d96e 100644
--- a/share/icons/dialog-input-devices.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-input-devices.svg
diff --git a/share/icons/dialog-layers.svg b/share/icons/hicolor/scalable/actions/dialog-layers.svg
index b413dd2c0..b413dd2c0 100644
--- a/share/icons/dialog-layers.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-layers.svg
diff --git a/share/icons/dialog-memory.svg b/share/icons/hicolor/scalable/actions/dialog-memory.svg
index 7e25e90ac..7e25e90ac 100644
--- a/share/icons/dialog-memory.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-memory.svg
diff --git a/share/icons/dialog-messages.svg b/share/icons/hicolor/scalable/actions/dialog-messages.svg
index b129c2e16..b129c2e16 100644
--- a/share/icons/dialog-messages.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-messages.svg
diff --git a/share/icons/dialog-object-properties.svg b/share/icons/hicolor/scalable/actions/dialog-object-properties.svg
index 1ce323d3d..1ce323d3d 100644
--- a/share/icons/dialog-object-properties.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-object-properties.svg
diff --git a/share/icons/dialog-path-effects.svg b/share/icons/hicolor/scalable/actions/dialog-path-effects.svg
index db92e82cb..db92e82cb 100644
--- a/share/icons/dialog-path-effects.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-path-effects.svg
diff --git a/share/icons/dialog-rows-and-columns.svg b/share/icons/hicolor/scalable/actions/dialog-rows-and-columns.svg
index 3d0e90b64..3d0e90b64 100644
--- a/share/icons/dialog-rows-and-columns.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-rows-and-columns.svg
diff --git a/share/icons/dialog-scripts.svg b/share/icons/hicolor/scalable/actions/dialog-scripts.svg
index 1463147a7..1463147a7 100644
--- a/share/icons/dialog-scripts.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-scripts.svg
diff --git a/share/icons/dialog-templates.svg b/share/icons/hicolor/scalable/actions/dialog-templates.svg
index 49566d7ac..49566d7ac 100644
--- a/share/icons/dialog-templates.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-templates.svg
diff --git a/share/icons/dialog-text-and-font.svg b/share/icons/hicolor/scalable/actions/dialog-text-and-font.svg
index 2ff31a88e..2ff31a88e 100644
--- a/share/icons/dialog-text-and-font.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-text-and-font.svg
diff --git a/share/icons/dialog-tile-clones.svg b/share/icons/hicolor/scalable/actions/dialog-tile-clones.svg
index 89ec9f42c..89ec9f42c 100644
--- a/share/icons/dialog-tile-clones.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-tile-clones.svg
diff --git a/share/icons/dialog-transform.svg b/share/icons/hicolor/scalable/actions/dialog-transform.svg
index a12411544..a12411544 100644
--- a/share/icons/dialog-transform.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-transform.svg
diff --git a/share/icons/dialog-xml-editor.svg b/share/icons/hicolor/scalable/actions/dialog-xml-editor.svg
index 092e75ae1..092e75ae1 100644
--- a/share/icons/dialog-xml-editor.svg
+++ b/share/icons/hicolor/scalable/actions/dialog-xml-editor.svg
diff --git a/share/icons/distribute-graph-directed.svg b/share/icons/hicolor/scalable/actions/distribute-graph-directed.svg
index ded4a7906..ded4a7906 100644
--- a/share/icons/distribute-graph-directed.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-graph-directed.svg
diff --git a/share/icons/distribute-graph.svg b/share/icons/hicolor/scalable/actions/distribute-graph.svg
index f240299fe..f240299fe 100644
--- a/share/icons/distribute-graph.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-graph.svg
diff --git a/share/icons/distribute-horizontal-baseline.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-baseline.svg
index 47ed3714e..47ed3714e 100644
--- a/share/icons/distribute-horizontal-baseline.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-baseline.svg
diff --git a/share/icons/distribute-horizontal-center.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-center.svg
index 177555408..177555408 100644
--- a/share/icons/distribute-horizontal-center.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-center.svg
diff --git a/share/icons/distribute-horizontal-gaps.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-gaps.svg
index 9ff4dc48b..9ff4dc48b 100644
--- a/share/icons/distribute-horizontal-gaps.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-gaps.svg
diff --git a/share/icons/distribute-horizontal-left.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-left.svg
index db7a6b64e..db7a6b64e 100644
--- a/share/icons/distribute-horizontal-left.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-left.svg
diff --git a/share/icons/distribute-horizontal-node.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-node.svg
index a30c87a9d..a30c87a9d 100644
--- a/share/icons/distribute-horizontal-node.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-node.svg
diff --git a/share/icons/distribute-horizontal-right.svg b/share/icons/hicolor/scalable/actions/distribute-horizontal-right.svg
index 95f0bd1a3..95f0bd1a3 100644
--- a/share/icons/distribute-horizontal-right.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-horizontal-right.svg
diff --git a/share/icons/distribute-randomize.svg b/share/icons/hicolor/scalable/actions/distribute-randomize.svg
index a636b23b2..a636b23b2 100644
--- a/share/icons/distribute-randomize.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-randomize.svg
diff --git a/share/icons/distribute-remove-overlaps.svg b/share/icons/hicolor/scalable/actions/distribute-remove-overlaps.svg
index 8ece17069..8ece17069 100644
--- a/share/icons/distribute-remove-overlaps.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-remove-overlaps.svg
diff --git a/share/icons/distribute-unclump.svg b/share/icons/hicolor/scalable/actions/distribute-unclump.svg
index fa28073a9..fa28073a9 100644
--- a/share/icons/distribute-unclump.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-unclump.svg
diff --git a/share/icons/distribute-vertical-baseline.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-baseline.svg
index 7ca191c46..7ca191c46 100644
--- a/share/icons/distribute-vertical-baseline.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-baseline.svg
diff --git a/share/icons/distribute-vertical-bottom.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-bottom.svg
index 3704ee542..3704ee542 100644
--- a/share/icons/distribute-vertical-bottom.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-bottom.svg
diff --git a/share/icons/distribute-vertical-center.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-center.svg
index 414bc8984..414bc8984 100644
--- a/share/icons/distribute-vertical-center.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-center.svg
diff --git a/share/icons/distribute-vertical-gaps.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-gaps.svg
index c3b198b8e..c3b198b8e 100644
--- a/share/icons/distribute-vertical-gaps.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-gaps.svg
diff --git a/share/icons/distribute-vertical-node.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-node.svg
index 2980c9000..2980c9000 100644
--- a/share/icons/distribute-vertical-node.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-node.svg
diff --git a/share/icons/distribute-vertical-top.svg b/share/icons/hicolor/scalable/actions/distribute-vertical-top.svg
index e4516a9fa..e4516a9fa 100644
--- a/share/icons/distribute-vertical-top.svg
+++ b/share/icons/hicolor/scalable/actions/distribute-vertical-top.svg
diff --git a/share/icons/document-cleanup.svg b/share/icons/hicolor/scalable/actions/document-cleanup.svg
index 4d9782855..4d9782855 100644
--- a/share/icons/document-cleanup.svg
+++ b/share/icons/hicolor/scalable/actions/document-cleanup.svg
diff --git a/share/icons/document-export-ocal.svg b/share/icons/hicolor/scalable/actions/document-export-ocal.svg
index 8ca2878ab..8ca2878ab 100644
--- a/share/icons/document-export-ocal.svg
+++ b/share/icons/hicolor/scalable/actions/document-export-ocal.svg
diff --git a/share/icons/document-export.svg b/share/icons/hicolor/scalable/actions/document-export.svg
index c48f57edd..c48f57edd 100644
--- a/share/icons/document-export.svg
+++ b/share/icons/hicolor/scalable/actions/document-export.svg
diff --git a/share/icons/document-import-ocal.svg b/share/icons/hicolor/scalable/actions/document-import-ocal.svg
index cf78255fa..cf78255fa 100644
--- a/share/icons/document-import-ocal.svg
+++ b/share/icons/hicolor/scalable/actions/document-import-ocal.svg
diff --git a/share/icons/document-import.svg b/share/icons/hicolor/scalable/actions/document-import.svg
index 510933619..510933619 100644
--- a/share/icons/document-import.svg
+++ b/share/icons/hicolor/scalable/actions/document-import.svg
diff --git a/share/icons/document-metadata.svg b/share/icons/hicolor/scalable/actions/document-metadata.svg
index be49b0e28..be49b0e28 100644
--- a/share/icons/document-metadata.svg
+++ b/share/icons/hicolor/scalable/actions/document-metadata.svg
diff --git a/share/icons/document-open-recent.svg b/share/icons/hicolor/scalable/actions/document-open-recent.svg
index 3d3a36cea..3d3a36cea 100644
--- a/share/icons/document-open-recent.svg
+++ b/share/icons/hicolor/scalable/actions/document-open-recent.svg
diff --git a/share/icons/draw-calligraphic.svg b/share/icons/hicolor/scalable/actions/draw-calligraphic.svg
index ce187f37f..ce187f37f 100644
--- a/share/icons/draw-calligraphic.svg
+++ b/share/icons/hicolor/scalable/actions/draw-calligraphic.svg
diff --git a/share/icons/draw-connector.svg b/share/icons/hicolor/scalable/actions/draw-connector.svg
index f3ba3eaa1..f3ba3eaa1 100644
--- a/share/icons/draw-connector.svg
+++ b/share/icons/hicolor/scalable/actions/draw-connector.svg
diff --git a/share/icons/draw-cuboid.svg b/share/icons/hicolor/scalable/actions/draw-cuboid.svg
index 01252829f..01252829f 100644
--- a/share/icons/draw-cuboid.svg
+++ b/share/icons/hicolor/scalable/actions/draw-cuboid.svg
diff --git a/share/icons/draw-ellipse-arc.svg b/share/icons/hicolor/scalable/actions/draw-ellipse-arc.svg
index bc4a99ff2..bc4a99ff2 100644
--- a/share/icons/draw-ellipse-arc.svg
+++ b/share/icons/hicolor/scalable/actions/draw-ellipse-arc.svg
diff --git a/share/icons/draw-ellipse-chord.svg b/share/icons/hicolor/scalable/actions/draw-ellipse-chord.svg
index 6c06da965..6c06da965 100644
--- a/share/icons/draw-ellipse-chord.svg
+++ b/share/icons/hicolor/scalable/actions/draw-ellipse-chord.svg
diff --git a/share/icons/draw-ellipse-segment.svg b/share/icons/hicolor/scalable/actions/draw-ellipse-segment.svg
index fc98cfec7..fc98cfec7 100644
--- a/share/icons/draw-ellipse-segment.svg
+++ b/share/icons/hicolor/scalable/actions/draw-ellipse-segment.svg
diff --git a/share/icons/draw-ellipse-whole.svg b/share/icons/hicolor/scalable/actions/draw-ellipse-whole.svg
index 90d96ab2d..90d96ab2d 100644
--- a/share/icons/draw-ellipse-whole.svg
+++ b/share/icons/hicolor/scalable/actions/draw-ellipse-whole.svg
diff --git a/share/icons/draw-ellipse.svg b/share/icons/hicolor/scalable/actions/draw-ellipse.svg
index eeab261b7..eeab261b7 100644
--- a/share/icons/draw-ellipse.svg
+++ b/share/icons/hicolor/scalable/actions/draw-ellipse.svg
diff --git a/share/icons/draw-eraser-delete-objects.svg b/share/icons/hicolor/scalable/actions/draw-eraser-delete-objects.svg
index 2a9d37564..2a9d37564 100644
--- a/share/icons/draw-eraser-delete-objects.svg
+++ b/share/icons/hicolor/scalable/actions/draw-eraser-delete-objects.svg
diff --git a/share/icons/draw-eraser.svg b/share/icons/hicolor/scalable/actions/draw-eraser.svg
index 481e2ac75..481e2ac75 100644
--- a/share/icons/draw-eraser.svg
+++ b/share/icons/hicolor/scalable/actions/draw-eraser.svg
diff --git a/share/icons/draw-freehand.svg b/share/icons/hicolor/scalable/actions/draw-freehand.svg
index f65cf7451..f65cf7451 100644
--- a/share/icons/draw-freehand.svg
+++ b/share/icons/hicolor/scalable/actions/draw-freehand.svg
diff --git a/share/icons/draw-geometry-angle-bisector.svg b/share/icons/hicolor/scalable/actions/draw-geometry-angle-bisector.svg
index 653fea952..653fea952 100644
--- a/share/icons/draw-geometry-angle-bisector.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-angle-bisector.svg
diff --git a/share/icons/draw-geometry-circle-from-radius.svg b/share/icons/hicolor/scalable/actions/draw-geometry-circle-from-radius.svg
index 69b19b161..69b19b161 100644
--- a/share/icons/draw-geometry-circle-from-radius.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-circle-from-radius.svg
diff --git a/share/icons/draw-geometry-circle-from-three-points.svg b/share/icons/hicolor/scalable/actions/draw-geometry-circle-from-three-points.svg
index 0222f214d..0222f214d 100644
--- a/share/icons/draw-geometry-circle-from-three-points.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-circle-from-three-points.svg
diff --git a/share/icons/draw-geometry-inactive.svg b/share/icons/hicolor/scalable/actions/draw-geometry-inactive.svg
index 1d948c6d7..1d948c6d7 100644
--- a/share/icons/draw-geometry-inactive.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-inactive.svg
diff --git a/share/icons/draw-geometry-line-parallel.svg b/share/icons/hicolor/scalable/actions/draw-geometry-line-parallel.svg
index c23445a84..c23445a84 100644
--- a/share/icons/draw-geometry-line-parallel.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-line-parallel.svg
diff --git a/share/icons/draw-geometry-line-perpendicular.svg b/share/icons/hicolor/scalable/actions/draw-geometry-line-perpendicular.svg
index 61de07de3..61de07de3 100644
--- a/share/icons/draw-geometry-line-perpendicular.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-line-perpendicular.svg
diff --git a/share/icons/draw-geometry-line-segment.svg b/share/icons/hicolor/scalable/actions/draw-geometry-line-segment.svg
index 3cec1a36e..3cec1a36e 100644
--- a/share/icons/draw-geometry-line-segment.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-line-segment.svg
diff --git a/share/icons/draw-geometry-mirror.svg b/share/icons/hicolor/scalable/actions/draw-geometry-mirror.svg
index 2a991d5c9..2a991d5c9 100644
--- a/share/icons/draw-geometry-mirror.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-mirror.svg
diff --git a/share/icons/draw-geometry-set-bounding-box.svg b/share/icons/hicolor/scalable/actions/draw-geometry-set-bounding-box.svg
index ab3515de6..ab3515de6 100644
--- a/share/icons/draw-geometry-set-bounding-box.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-set-bounding-box.svg
diff --git a/share/icons/draw-geometry-show-measuring-info.svg b/share/icons/hicolor/scalable/actions/draw-geometry-show-measuring-info.svg
index a67a2e4a3..a67a2e4a3 100644
--- a/share/icons/draw-geometry-show-measuring-info.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry-show-measuring-info.svg
diff --git a/share/icons/draw-geometry.svg b/share/icons/hicolor/scalable/actions/draw-geometry.svg
index 4aa05b092..4aa05b092 100644
--- a/share/icons/draw-geometry.svg
+++ b/share/icons/hicolor/scalable/actions/draw-geometry.svg
diff --git a/share/icons/draw-path.svg b/share/icons/hicolor/scalable/actions/draw-path.svg
index c4c017b26..c4c017b26 100644
--- a/share/icons/draw-path.svg
+++ b/share/icons/hicolor/scalable/actions/draw-path.svg
diff --git a/share/icons/draw-polygon-star.svg b/share/icons/hicolor/scalable/actions/draw-polygon-star.svg
index a7fa54ce6..a7fa54ce6 100644
--- a/share/icons/draw-polygon-star.svg
+++ b/share/icons/hicolor/scalable/actions/draw-polygon-star.svg
diff --git a/share/icons/draw-polygon.svg b/share/icons/hicolor/scalable/actions/draw-polygon.svg
index 7155ff054..7155ff054 100644
--- a/share/icons/draw-polygon.svg
+++ b/share/icons/hicolor/scalable/actions/draw-polygon.svg
diff --git a/share/icons/draw-rectangle.svg b/share/icons/hicolor/scalable/actions/draw-rectangle.svg
index 2e8d2a667..2e8d2a667 100644
--- a/share/icons/draw-rectangle.svg
+++ b/share/icons/hicolor/scalable/actions/draw-rectangle.svg
diff --git a/share/icons/draw-spiral.svg b/share/icons/hicolor/scalable/actions/draw-spiral.svg
index 57c51f9c2..57c51f9c2 100644
--- a/share/icons/draw-spiral.svg
+++ b/share/icons/hicolor/scalable/actions/draw-spiral.svg
diff --git a/share/icons/draw-star.svg b/share/icons/hicolor/scalable/actions/draw-star.svg
index ab38d29d2..ab38d29d2 100644
--- a/share/icons/draw-star.svg
+++ b/share/icons/hicolor/scalable/actions/draw-star.svg
diff --git a/share/icons/draw-text.svg b/share/icons/hicolor/scalable/actions/draw-text.svg
index e1a08f60a..e1a08f60a 100644
--- a/share/icons/draw-text.svg
+++ b/share/icons/hicolor/scalable/actions/draw-text.svg
diff --git a/share/icons/draw-trace-background.svg b/share/icons/hicolor/scalable/actions/draw-trace-background.svg
index 281350c14..281350c14 100644
--- a/share/icons/draw-trace-background.svg
+++ b/share/icons/hicolor/scalable/actions/draw-trace-background.svg
diff --git a/share/icons/draw-use-pressure.svg b/share/icons/hicolor/scalable/actions/draw-use-pressure.svg
index 2297fe9a1..2297fe9a1 100644
--- a/share/icons/draw-use-pressure.svg
+++ b/share/icons/hicolor/scalable/actions/draw-use-pressure.svg
diff --git a/share/icons/draw-use-tilt.svg b/share/icons/hicolor/scalable/actions/draw-use-tilt.svg
index 369ddd18a..369ddd18a 100644
--- a/share/icons/draw-use-tilt.svg
+++ b/share/icons/hicolor/scalable/actions/draw-use-tilt.svg
diff --git a/share/icons/edit-clone-unlink.svg b/share/icons/hicolor/scalable/actions/edit-clone-unlink.svg
index 412f33a92..412f33a92 100644
--- a/share/icons/edit-clone-unlink.svg
+++ b/share/icons/hicolor/scalable/actions/edit-clone-unlink.svg
diff --git a/share/icons/edit-clone.svg b/share/icons/hicolor/scalable/actions/edit-clone.svg
index c0e40c234..c0e40c234 100644
--- a/share/icons/edit-clone.svg
+++ b/share/icons/hicolor/scalable/actions/edit-clone.svg
diff --git a/share/icons/edit-duplicate.svg b/share/icons/hicolor/scalable/actions/edit-duplicate.svg
index 692ed310b..692ed310b 100644
--- a/share/icons/edit-duplicate.svg
+++ b/share/icons/hicolor/scalable/actions/edit-duplicate.svg
diff --git a/share/icons/edit-paste-in-place.svg b/share/icons/hicolor/scalable/actions/edit-paste-in-place.svg
index 225f7933b..225f7933b 100644
--- a/share/icons/edit-paste-in-place.svg
+++ b/share/icons/hicolor/scalable/actions/edit-paste-in-place.svg
diff --git a/share/icons/edit-paste-style.svg b/share/icons/hicolor/scalable/actions/edit-paste-style.svg
index 724d4c15d..724d4c15d 100644
--- a/share/icons/edit-paste-style.svg
+++ b/share/icons/hicolor/scalable/actions/edit-paste-style.svg
diff --git a/share/icons/edit-select-all-layers.svg b/share/icons/hicolor/scalable/actions/edit-select-all-layers.svg
index 8c8bc4881..8c8bc4881 100644
--- a/share/icons/edit-select-all-layers.svg
+++ b/share/icons/hicolor/scalable/actions/edit-select-all-layers.svg
diff --git a/share/icons/edit-select-all.svg b/share/icons/hicolor/scalable/actions/edit-select-all.svg
index 050806139..050806139 100644
--- a/share/icons/edit-select-all.svg
+++ b/share/icons/hicolor/scalable/actions/edit-select-all.svg
diff --git a/share/icons/edit-select-invert.svg b/share/icons/hicolor/scalable/actions/edit-select-invert.svg
index 8828c1e5d..8828c1e5d 100644
--- a/share/icons/edit-select-invert.svg
+++ b/share/icons/hicolor/scalable/actions/edit-select-invert.svg
diff --git a/share/icons/edit-select-none.svg b/share/icons/hicolor/scalable/actions/edit-select-none.svg
index ed9c8a713..ed9c8a713 100644
--- a/share/icons/edit-select-none.svg
+++ b/share/icons/hicolor/scalable/actions/edit-select-none.svg
diff --git a/share/icons/edit-select-original.svg b/share/icons/hicolor/scalable/actions/edit-select-original.svg
index 7b7ddf92b..7b7ddf92b 100644
--- a/share/icons/edit-select-original.svg
+++ b/share/icons/hicolor/scalable/actions/edit-select-original.svg
diff --git a/share/icons/edit-undo-history.svg b/share/icons/hicolor/scalable/actions/edit-undo-history.svg
index 8f8589837..8f8589837 100644
--- a/share/icons/edit-undo-history.svg
+++ b/share/icons/hicolor/scalable/actions/edit-undo-history.svg
diff --git a/share/icons/exchange-positions-clockwise.svg b/share/icons/hicolor/scalable/actions/exchange-positions-clockwise.svg
index 3c50d9f1b..3c50d9f1b 100644
--- a/share/icons/exchange-positions-clockwise.svg
+++ b/share/icons/hicolor/scalable/actions/exchange-positions-clockwise.svg
diff --git a/share/icons/exchange-positions-zorder.svg b/share/icons/hicolor/scalable/actions/exchange-positions-zorder.svg
index 498c07f28..498c07f28 100644
--- a/share/icons/exchange-positions-zorder.svg
+++ b/share/icons/hicolor/scalable/actions/exchange-positions-zorder.svg
diff --git a/share/icons/exchange-positions.svg b/share/icons/hicolor/scalable/actions/exchange-positions.svg
index 765a88534..765a88534 100644
--- a/share/icons/exchange-positions.svg
+++ b/share/icons/hicolor/scalable/actions/exchange-positions.svg
diff --git a/share/icons/feBlend-icon.svg b/share/icons/hicolor/scalable/actions/feBlend-icon.svg
index dca97f107..dca97f107 100644
--- a/share/icons/feBlend-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feBlend-icon.svg
diff --git a/share/icons/feColorMatrix-icon.svg b/share/icons/hicolor/scalable/actions/feColorMatrix-icon.svg
index ed33b0158..ed33b0158 100644
--- a/share/icons/feColorMatrix-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feColorMatrix-icon.svg
diff --git a/share/icons/feComposite-icon.svg b/share/icons/hicolor/scalable/actions/feComposite-icon.svg
index d3bd7511e..d3bd7511e 100644
--- a/share/icons/feComposite-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feComposite-icon.svg
diff --git a/share/icons/feConvolveMatrix-icon.svg b/share/icons/hicolor/scalable/actions/feConvolveMatrix-icon.svg
index 5fa369e0c..5fa369e0c 100644
--- a/share/icons/feConvolveMatrix-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feConvolveMatrix-icon.svg
diff --git a/share/icons/feDiffuseLighting-icon.svg b/share/icons/hicolor/scalable/actions/feDiffuseLighting-icon.svg
index bbf221a1b..bbf221a1b 100644
--- a/share/icons/feDiffuseLighting-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feDiffuseLighting-icon.svg
diff --git a/share/icons/feDisplacementMap-icon.svg b/share/icons/hicolor/scalable/actions/feDisplacementMap-icon.svg
index aba251e47..aba251e47 100644
--- a/share/icons/feDisplacementMap-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feDisplacementMap-icon.svg
diff --git a/share/icons/feFlood-icon.svg b/share/icons/hicolor/scalable/actions/feFlood-icon.svg
index c7cafac7b..c7cafac7b 100644
--- a/share/icons/feFlood-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feFlood-icon.svg
diff --git a/share/icons/feGaussianBlur-icon.svg b/share/icons/hicolor/scalable/actions/feGaussianBlur-icon.svg
index 92f87e75c..92f87e75c 100644
--- a/share/icons/feGaussianBlur-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feGaussianBlur-icon.svg
diff --git a/share/icons/feImage-icon.svg b/share/icons/hicolor/scalable/actions/feImage-icon.svg
index 2203c16b8..2203c16b8 100644
--- a/share/icons/feImage-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feImage-icon.svg
diff --git a/share/icons/feMerge-icon.svg b/share/icons/hicolor/scalable/actions/feMerge-icon.svg
index 14070373e..14070373e 100644
--- a/share/icons/feMerge-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feMerge-icon.svg
diff --git a/share/icons/feMorphology-icon.svg b/share/icons/hicolor/scalable/actions/feMorphology-icon.svg
index 15f215508..15f215508 100644
--- a/share/icons/feMorphology-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feMorphology-icon.svg
diff --git a/share/icons/feOffset-icon.svg b/share/icons/hicolor/scalable/actions/feOffset-icon.svg
index 6b2d87681..6b2d87681 100644
--- a/share/icons/feOffset-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feOffset-icon.svg
diff --git a/share/icons/feSpecularLighting-icon.svg b/share/icons/hicolor/scalable/actions/feSpecularLighting-icon.svg
index 5721a6ae8..5721a6ae8 100644
--- a/share/icons/feSpecularLighting-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feSpecularLighting-icon.svg
diff --git a/share/icons/feTurbulence-icon.svg b/share/icons/hicolor/scalable/actions/feTurbulence-icon.svg
index 37d986d36..37d986d36 100644
--- a/share/icons/feTurbulence-icon.svg
+++ b/share/icons/hicolor/scalable/actions/feTurbulence-icon.svg
diff --git a/share/icons/fill-rule-even-odd.svg b/share/icons/hicolor/scalable/actions/fill-rule-even-odd.svg
index 15ac4fdcd..15ac4fdcd 100644
--- a/share/icons/fill-rule-even-odd.svg
+++ b/share/icons/hicolor/scalable/actions/fill-rule-even-odd.svg
diff --git a/share/icons/fill-rule-nonzero.svg b/share/icons/hicolor/scalable/actions/fill-rule-nonzero.svg
index 228e2a511..228e2a511 100644
--- a/share/icons/fill-rule-nonzero.svg
+++ b/share/icons/hicolor/scalable/actions/fill-rule-nonzero.svg
diff --git a/share/icons/flatten.svg b/share/icons/hicolor/scalable/actions/flatten.svg
index 94627ed3f..94627ed3f 100644
--- a/share/icons/flatten.svg
+++ b/share/icons/hicolor/scalable/actions/flatten.svg
diff --git a/share/icons/format-text-direction-horizontal.svg b/share/icons/hicolor/scalable/actions/format-text-direction-horizontal.svg
index 351ea6036..351ea6036 100644
--- a/share/icons/format-text-direction-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/format-text-direction-horizontal.svg
diff --git a/share/icons/format-text-direction-r2l.svg b/share/icons/hicolor/scalable/actions/format-text-direction-r2l.svg
index fd2cd7ea1..fd2cd7ea1 100644
--- a/share/icons/format-text-direction-r2l.svg
+++ b/share/icons/hicolor/scalable/actions/format-text-direction-r2l.svg
diff --git a/share/icons/format-text-direction-vertical-lr.svg b/share/icons/hicolor/scalable/actions/format-text-direction-vertical-lr.svg
index 2ce3630f0..2ce3630f0 100644
--- a/share/icons/format-text-direction-vertical-lr.svg
+++ b/share/icons/hicolor/scalable/actions/format-text-direction-vertical-lr.svg
diff --git a/share/icons/format-text-direction-vertical.svg b/share/icons/hicolor/scalable/actions/format-text-direction-vertical.svg
index 3d61497e7..3d61497e7 100644
--- a/share/icons/format-text-direction-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/format-text-direction-vertical.svg
diff --git a/share/icons/g3735.svg b/share/icons/hicolor/scalable/actions/g3735.svg
index 1d93c72d6..1d93c72d6 100644
--- a/share/icons/g3735.svg
+++ b/share/icons/hicolor/scalable/actions/g3735.svg
diff --git a/share/icons/g7621-2.svg b/share/icons/hicolor/scalable/actions/g7621-2.svg
index be0b609d8..be0b609d8 100644
--- a/share/icons/g7621-2.svg
+++ b/share/icons/hicolor/scalable/actions/g7621-2.svg
diff --git a/share/icons/grid-axonometric.svg b/share/icons/hicolor/scalable/actions/grid-axonometric.svg
index d6edc30d3..d6edc30d3 100644
--- a/share/icons/grid-axonometric.svg
+++ b/share/icons/hicolor/scalable/actions/grid-axonometric.svg
diff --git a/share/icons/grid-rectangular.svg b/share/icons/hicolor/scalable/actions/grid-rectangular.svg
index 064631942..064631942 100644
--- a/share/icons/grid-rectangular.svg
+++ b/share/icons/hicolor/scalable/actions/grid-rectangular.svg
diff --git a/share/icons/guides.svg b/share/icons/hicolor/scalable/actions/guides.svg
index 5d3859e9f..5d3859e9f 100644
--- a/share/icons/guides.svg
+++ b/share/icons/hicolor/scalable/actions/guides.svg
diff --git a/share/icons/help-contents.svg b/share/icons/hicolor/scalable/actions/help-contents.svg
index 07eee6a85..07eee6a85 100644
--- a/share/icons/help-contents.svg
+++ b/share/icons/hicolor/scalable/actions/help-contents.svg
diff --git a/share/icons/help-keyborad-shortcuts.svg b/share/icons/hicolor/scalable/actions/help-keyborad-shortcuts.svg
index 4a88a534a..4a88a534a 100644
--- a/share/icons/help-keyborad-shortcuts.svg
+++ b/share/icons/hicolor/scalable/actions/help-keyborad-shortcuts.svg
diff --git a/share/icons/inkscape-logo.svg b/share/icons/hicolor/scalable/actions/inkscape-logo.svg
index 7c1bc6a5e..7c1bc6a5e 100644
--- a/share/icons/inkscape-logo.svg
+++ b/share/icons/hicolor/scalable/actions/inkscape-logo.svg
diff --git a/share/icons/inkscape.file.svg b/share/icons/hicolor/scalable/actions/inkscape.file.svg
index 5803d94bf..5803d94bf 100644
--- a/share/icons/inkscape.file.svg
+++ b/share/icons/hicolor/scalable/actions/inkscape.file.svg
diff --git a/share/icons/interactive_simplify.svg b/share/icons/hicolor/scalable/actions/interactive_simplify.svg
index a617a6431..a617a6431 100644
--- a/share/icons/interactive_simplify.svg
+++ b/share/icons/hicolor/scalable/actions/interactive_simplify.svg
diff --git a/share/icons/layer-bottom.svg b/share/icons/hicolor/scalable/actions/layer-bottom.svg
index 1012d93e4..1012d93e4 100644
--- a/share/icons/layer-bottom.svg
+++ b/share/icons/hicolor/scalable/actions/layer-bottom.svg
diff --git a/share/icons/layer-delete.svg b/share/icons/hicolor/scalable/actions/layer-delete.svg
index c2055361d..c2055361d 100644
--- a/share/icons/layer-delete.svg
+++ b/share/icons/hicolor/scalable/actions/layer-delete.svg
diff --git a/share/icons/layer-duplicate.svg b/share/icons/hicolor/scalable/actions/layer-duplicate.svg
index 8a8cf38ec..8a8cf38ec 100644
--- a/share/icons/layer-duplicate.svg
+++ b/share/icons/hicolor/scalable/actions/layer-duplicate.svg
diff --git a/share/icons/layer-lower.svg b/share/icons/hicolor/scalable/actions/layer-lower.svg
index eeba28c24..eeba28c24 100644
--- a/share/icons/layer-lower.svg
+++ b/share/icons/hicolor/scalable/actions/layer-lower.svg
diff --git a/share/icons/layer-new.svg b/share/icons/hicolor/scalable/actions/layer-new.svg
index 62888dd35..62888dd35 100644
--- a/share/icons/layer-new.svg
+++ b/share/icons/hicolor/scalable/actions/layer-new.svg
diff --git a/share/icons/layer-next.svg b/share/icons/hicolor/scalable/actions/layer-next.svg
index 911515c06..911515c06 100644
--- a/share/icons/layer-next.svg
+++ b/share/icons/hicolor/scalable/actions/layer-next.svg
diff --git a/share/icons/layer-previous.svg b/share/icons/hicolor/scalable/actions/layer-previous.svg
index f5d1d7676..f5d1d7676 100644
--- a/share/icons/layer-previous.svg
+++ b/share/icons/hicolor/scalable/actions/layer-previous.svg
diff --git a/share/icons/layer-raise.svg b/share/icons/hicolor/scalable/actions/layer-raise.svg
index 1951f4f3e..1951f4f3e 100644
--- a/share/icons/layer-raise.svg
+++ b/share/icons/hicolor/scalable/actions/layer-raise.svg
diff --git a/share/icons/layer-rename.svg b/share/icons/hicolor/scalable/actions/layer-rename.svg
index d8aa22ef1..d8aa22ef1 100644
--- a/share/icons/layer-rename.svg
+++ b/share/icons/hicolor/scalable/actions/layer-rename.svg
diff --git a/share/icons/layer-top.svg b/share/icons/hicolor/scalable/actions/layer-top.svg
index 8871f8e3c..8871f8e3c 100644
--- a/share/icons/layer-top.svg
+++ b/share/icons/hicolor/scalable/actions/layer-top.svg
diff --git a/share/icons/mesh-gradient-fit.svg b/share/icons/hicolor/scalable/actions/mesh-gradient-fit.svg
index ff3fd8c92..ff3fd8c92 100644
--- a/share/icons/mesh-gradient-fit.svg
+++ b/share/icons/hicolor/scalable/actions/mesh-gradient-fit.svg
diff --git a/share/icons/mesh-gradient.svg b/share/icons/hicolor/scalable/actions/mesh-gradient.svg
index 45001fb69..45001fb69 100644
--- a/share/icons/mesh-gradient.svg
+++ b/share/icons/hicolor/scalable/actions/mesh-gradient.svg
diff --git a/share/icons/no-marker.svg b/share/icons/hicolor/scalable/actions/no-marker.svg
index 7817e2fdc..7817e2fdc 100644
--- a/share/icons/no-marker.svg
+++ b/share/icons/hicolor/scalable/actions/no-marker.svg
diff --git a/share/icons/node-add.svg b/share/icons/hicolor/scalable/actions/node-add.svg
index 56a86a708..56a86a708 100644
--- a/share/icons/node-add.svg
+++ b/share/icons/hicolor/scalable/actions/node-add.svg
diff --git a/share/icons/node-break.svg b/share/icons/hicolor/scalable/actions/node-break.svg
index e50f96d48..e50f96d48 100644
--- a/share/icons/node-break.svg
+++ b/share/icons/hicolor/scalable/actions/node-break.svg
diff --git a/share/icons/node-delete-segment.svg b/share/icons/hicolor/scalable/actions/node-delete-segment.svg
index e7c3ba5ad..e7c3ba5ad 100644
--- a/share/icons/node-delete-segment.svg
+++ b/share/icons/hicolor/scalable/actions/node-delete-segment.svg
diff --git a/share/icons/node-delete.svg b/share/icons/hicolor/scalable/actions/node-delete.svg
index 212aa749c..212aa749c 100644
--- a/share/icons/node-delete.svg
+++ b/share/icons/hicolor/scalable/actions/node-delete.svg
diff --git a/share/icons/node-join-segment.svg b/share/icons/hicolor/scalable/actions/node-join-segment.svg
index 193ec567a..193ec567a 100644
--- a/share/icons/node-join-segment.svg
+++ b/share/icons/hicolor/scalable/actions/node-join-segment.svg
diff --git a/share/icons/node-join.svg b/share/icons/hicolor/scalable/actions/node-join.svg
index b8e0d6af3..b8e0d6af3 100644
--- a/share/icons/node-join.svg
+++ b/share/icons/hicolor/scalable/actions/node-join.svg
diff --git a/share/icons/node-segment-curve.svg b/share/icons/hicolor/scalable/actions/node-segment-curve.svg
index 99d2dcc0e..99d2dcc0e 100644
--- a/share/icons/node-segment-curve.svg
+++ b/share/icons/hicolor/scalable/actions/node-segment-curve.svg
diff --git a/share/icons/node-segment-line.svg b/share/icons/hicolor/scalable/actions/node-segment-line.svg
index 713181dff..713181dff 100644
--- a/share/icons/node-segment-line.svg
+++ b/share/icons/hicolor/scalable/actions/node-segment-line.svg
diff --git a/share/icons/node-transform.svg b/share/icons/hicolor/scalable/actions/node-transform.svg
index 93c42000b..93c42000b 100644
--- a/share/icons/node-transform.svg
+++ b/share/icons/hicolor/scalable/actions/node-transform.svg
diff --git a/share/icons/node-type-auto-smooth.svg b/share/icons/hicolor/scalable/actions/node-type-auto-smooth.svg
index 2c445c6ef..2c445c6ef 100644
--- a/share/icons/node-type-auto-smooth.svg
+++ b/share/icons/hicolor/scalable/actions/node-type-auto-smooth.svg
diff --git a/share/icons/node-type-cusp.svg b/share/icons/hicolor/scalable/actions/node-type-cusp.svg
index b971c0fa8..b971c0fa8 100644
--- a/share/icons/node-type-cusp.svg
+++ b/share/icons/hicolor/scalable/actions/node-type-cusp.svg
diff --git a/share/icons/node-type-smooth.svg b/share/icons/hicolor/scalable/actions/node-type-smooth.svg
index c7b28995e..c7b28995e 100644
--- a/share/icons/node-type-smooth.svg
+++ b/share/icons/hicolor/scalable/actions/node-type-smooth.svg
diff --git a/share/icons/node-type-symmetric.svg b/share/icons/hicolor/scalable/actions/node-type-symmetric.svg
index bfdfbf9ca..bfdfbf9ca 100644
--- a/share/icons/node-type-symmetric.svg
+++ b/share/icons/hicolor/scalable/actions/node-type-symmetric.svg
diff --git a/share/icons/node_insert_max_x.svg b/share/icons/hicolor/scalable/actions/node_insert_max_x.svg
index 2353c116f..2353c116f 100644
--- a/share/icons/node_insert_max_x.svg
+++ b/share/icons/hicolor/scalable/actions/node_insert_max_x.svg
diff --git a/share/icons/node_insert_max_y.svg b/share/icons/hicolor/scalable/actions/node_insert_max_y.svg
index 752b55e54..752b55e54 100644
--- a/share/icons/node_insert_max_y.svg
+++ b/share/icons/hicolor/scalable/actions/node_insert_max_y.svg
diff --git a/share/icons/node_insert_min_x.svg b/share/icons/hicolor/scalable/actions/node_insert_min_x.svg
index 09f51f6f3..09f51f6f3 100644
--- a/share/icons/node_insert_min_x.svg
+++ b/share/icons/hicolor/scalable/actions/node_insert_min_x.svg
diff --git a/share/icons/node_insert_min_y.svg b/share/icons/hicolor/scalable/actions/node_insert_min_y.svg
index b3fe7c7e1..b3fe7c7e1 100644
--- a/share/icons/node_insert_min_y.svg
+++ b/share/icons/hicolor/scalable/actions/node_insert_min_y.svg
diff --git a/share/icons/none.svg b/share/icons/hicolor/scalable/actions/none.svg
index 719498dc3..719498dc3 100644
--- a/share/icons/none.svg
+++ b/share/icons/hicolor/scalable/actions/none.svg
diff --git a/share/icons/object-columns.svg b/share/icons/hicolor/scalable/actions/object-columns.svg
index 0415e8444..0415e8444 100644
--- a/share/icons/object-columns.svg
+++ b/share/icons/hicolor/scalable/actions/object-columns.svg
diff --git a/share/icons/object-fill.svg b/share/icons/hicolor/scalable/actions/object-fill.svg
index 196c01f7b..196c01f7b 100644
--- a/share/icons/object-fill.svg
+++ b/share/icons/hicolor/scalable/actions/object-fill.svg
diff --git a/share/icons/object-flip-horizontal.svg b/share/icons/hicolor/scalable/actions/object-flip-horizontal.svg
index 936c28b82..936c28b82 100644
--- a/share/icons/object-flip-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/object-flip-horizontal.svg
diff --git a/share/icons/object-flip-vertical.svg b/share/icons/hicolor/scalable/actions/object-flip-vertical.svg
index edb4e51b6..edb4e51b6 100644
--- a/share/icons/object-flip-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/object-flip-vertical.svg
diff --git a/share/icons/object-group.svg b/share/icons/hicolor/scalable/actions/object-group.svg
index 706713159..706713159 100644
--- a/share/icons/object-group.svg
+++ b/share/icons/hicolor/scalable/actions/object-group.svg
diff --git a/share/icons/object-hidden.svg b/share/icons/hicolor/scalable/actions/object-hidden.svg
index aacac3bd8..aacac3bd8 100644
--- a/share/icons/object-hidden.svg
+++ b/share/icons/hicolor/scalable/actions/object-hidden.svg
diff --git a/share/icons/object-locked.svg b/share/icons/hicolor/scalable/actions/object-locked.svg
index 49b90e819..49b90e819 100644
--- a/share/icons/object-locked.svg
+++ b/share/icons/hicolor/scalable/actions/object-locked.svg
diff --git a/share/icons/object-rotate-left.svg b/share/icons/hicolor/scalable/actions/object-rotate-left.svg
index 81ec5346d..81ec5346d 100644
--- a/share/icons/object-rotate-left.svg
+++ b/share/icons/hicolor/scalable/actions/object-rotate-left.svg
diff --git a/share/icons/object-rotate-right.svg b/share/icons/hicolor/scalable/actions/object-rotate-right.svg
index f1f1e3d0d..f1f1e3d0d 100644
--- a/share/icons/object-rotate-right.svg
+++ b/share/icons/hicolor/scalable/actions/object-rotate-right.svg
diff --git a/share/icons/object-rows.svg b/share/icons/hicolor/scalable/actions/object-rows.svg
index 888e7814e..888e7814e 100644
--- a/share/icons/object-rows.svg
+++ b/share/icons/hicolor/scalable/actions/object-rows.svg
diff --git a/share/icons/object-stroke-style.svg b/share/icons/hicolor/scalable/actions/object-stroke-style.svg
index 61297e6f4..61297e6f4 100644
--- a/share/icons/object-stroke-style.svg
+++ b/share/icons/hicolor/scalable/actions/object-stroke-style.svg
diff --git a/share/icons/object-stroke.svg b/share/icons/hicolor/scalable/actions/object-stroke.svg
index fdf1abaee..fdf1abaee 100644
--- a/share/icons/object-stroke.svg
+++ b/share/icons/hicolor/scalable/actions/object-stroke.svg
diff --git a/share/icons/object-to-path.svg b/share/icons/hicolor/scalable/actions/object-to-path.svg
index e4d43f752..e4d43f752 100644
--- a/share/icons/object-to-path.svg
+++ b/share/icons/hicolor/scalable/actions/object-to-path.svg
diff --git a/share/icons/object-tweak-attract.svg b/share/icons/hicolor/scalable/actions/object-tweak-attract.svg
index a1393b277..a1393b277 100644
--- a/share/icons/object-tweak-attract.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-attract.svg
diff --git a/share/icons/object-tweak-blur.svg b/share/icons/hicolor/scalable/actions/object-tweak-blur.svg
index a77fe6254..a77fe6254 100644
--- a/share/icons/object-tweak-blur.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-blur.svg
diff --git a/share/icons/object-tweak-duplicate.svg b/share/icons/hicolor/scalable/actions/object-tweak-duplicate.svg
index 620950c7f..620950c7f 100644
--- a/share/icons/object-tweak-duplicate.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-duplicate.svg
diff --git a/share/icons/object-tweak-jitter-color.svg b/share/icons/hicolor/scalable/actions/object-tweak-jitter-color.svg
index db5d9a476..db5d9a476 100644
--- a/share/icons/object-tweak-jitter-color.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-jitter-color.svg
diff --git a/share/icons/object-tweak-paint.svg b/share/icons/hicolor/scalable/actions/object-tweak-paint.svg
index 2295bb9e0..2295bb9e0 100644
--- a/share/icons/object-tweak-paint.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-paint.svg
diff --git a/share/icons/object-tweak-push.svg b/share/icons/hicolor/scalable/actions/object-tweak-push.svg
index d7a6d9eef..d7a6d9eef 100644
--- a/share/icons/object-tweak-push.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-push.svg
diff --git a/share/icons/object-tweak-randomize.svg b/share/icons/hicolor/scalable/actions/object-tweak-randomize.svg
index b7c191694..b7c191694 100644
--- a/share/icons/object-tweak-randomize.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-randomize.svg
diff --git a/share/icons/object-tweak-rotate.svg b/share/icons/hicolor/scalable/actions/object-tweak-rotate.svg
index 20a74d370..20a74d370 100644
--- a/share/icons/object-tweak-rotate.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-rotate.svg
diff --git a/share/icons/object-tweak-shrink.svg b/share/icons/hicolor/scalable/actions/object-tweak-shrink.svg
index 70a13d296..70a13d296 100644
--- a/share/icons/object-tweak-shrink.svg
+++ b/share/icons/hicolor/scalable/actions/object-tweak-shrink.svg
diff --git a/share/icons/object-ungroup-pop-selection.svg b/share/icons/hicolor/scalable/actions/object-ungroup-pop-selection.svg
index 1a821cc4e..1a821cc4e 100644
--- a/share/icons/object-ungroup-pop-selection.svg
+++ b/share/icons/hicolor/scalable/actions/object-ungroup-pop-selection.svg
diff --git a/share/icons/object-ungroup.svg b/share/icons/hicolor/scalable/actions/object-ungroup.svg
index d24281110..d24281110 100644
--- a/share/icons/object-ungroup.svg
+++ b/share/icons/hicolor/scalable/actions/object-ungroup.svg
diff --git a/share/icons/object-unlocked.svg b/share/icons/hicolor/scalable/actions/object-unlocked.svg
index 76ed10ce6..76ed10ce6 100644
--- a/share/icons/object-unlocked.svg
+++ b/share/icons/hicolor/scalable/actions/object-unlocked.svg
diff --git a/share/icons/object-visible.svg b/share/icons/hicolor/scalable/actions/object-visible.svg
index 9016b9808..9016b9808 100644
--- a/share/icons/object-visible.svg
+++ b/share/icons/hicolor/scalable/actions/object-visible.svg
diff --git a/share/icons/off.svg b/share/icons/hicolor/scalable/actions/off.svg
index ff332a7f8..ff332a7f8 100644
--- a/share/icons/off.svg
+++ b/share/icons/hicolor/scalable/actions/off.svg
diff --git a/share/icons/on.svg b/share/icons/hicolor/scalable/actions/on.svg
index b94952ccf..b94952ccf 100644
--- a/share/icons/on.svg
+++ b/share/icons/hicolor/scalable/actions/on.svg
diff --git a/share/icons/out-of-gamut-icon.svg b/share/icons/hicolor/scalable/actions/out-of-gamut-icon.svg
index 4fb171139..4fb171139 100644
--- a/share/icons/out-of-gamut-icon.svg
+++ b/share/icons/hicolor/scalable/actions/out-of-gamut-icon.svg
diff --git a/share/icons/pack-less.svg b/share/icons/hicolor/scalable/actions/pack-less.svg
index 84485a390..84485a390 100644
--- a/share/icons/pack-less.svg
+++ b/share/icons/hicolor/scalable/actions/pack-less.svg
diff --git a/share/icons/pack-more.svg b/share/icons/hicolor/scalable/actions/pack-more.svg
index f7897c65d..f7897c65d 100644
--- a/share/icons/pack-more.svg
+++ b/share/icons/hicolor/scalable/actions/pack-more.svg
diff --git a/share/icons/paint-gradient-conical.svg b/share/icons/hicolor/scalable/actions/paint-gradient-conical.svg
index 4256a5310..4256a5310 100644
--- a/share/icons/paint-gradient-conical.svg
+++ b/share/icons/hicolor/scalable/actions/paint-gradient-conical.svg
diff --git a/share/icons/paint-gradient-linear.svg b/share/icons/hicolor/scalable/actions/paint-gradient-linear.svg
index da4eac18d..da4eac18d 100644
--- a/share/icons/paint-gradient-linear.svg
+++ b/share/icons/hicolor/scalable/actions/paint-gradient-linear.svg
diff --git a/share/icons/paint-gradient-mesh.svg b/share/icons/hicolor/scalable/actions/paint-gradient-mesh.svg
index b5082edea..b5082edea 100644
--- a/share/icons/paint-gradient-mesh.svg
+++ b/share/icons/hicolor/scalable/actions/paint-gradient-mesh.svg
diff --git a/share/icons/paint-gradient-radial.svg b/share/icons/hicolor/scalable/actions/paint-gradient-radial.svg
index 731bd2ba8..731bd2ba8 100644
--- a/share/icons/paint-gradient-radial.svg
+++ b/share/icons/hicolor/scalable/actions/paint-gradient-radial.svg
diff --git a/share/icons/paint-none.svg b/share/icons/hicolor/scalable/actions/paint-none.svg
index f46b4ebd1..f46b4ebd1 100644
--- a/share/icons/paint-none.svg
+++ b/share/icons/hicolor/scalable/actions/paint-none.svg
diff --git a/share/icons/paint-order-fms.svg b/share/icons/hicolor/scalable/actions/paint-order-fms.svg
index 034957e68..034957e68 100644
--- a/share/icons/paint-order-fms.svg
+++ b/share/icons/hicolor/scalable/actions/paint-order-fms.svg
diff --git a/share/icons/paint-order-fsm.svg b/share/icons/hicolor/scalable/actions/paint-order-fsm.svg
index ffc52fa47..ffc52fa47 100644
--- a/share/icons/paint-order-fsm.svg
+++ b/share/icons/hicolor/scalable/actions/paint-order-fsm.svg
diff --git a/share/icons/paint-order-mfs.svg b/share/icons/hicolor/scalable/actions/paint-order-mfs.svg
index e2e75ee6a..e2e75ee6a 100644
--- a/share/icons/paint-order-mfs.svg
+++ b/share/icons/hicolor/scalable/actions/paint-order-mfs.svg
diff --git a/share/icons/paint-order-msf.svg b/share/icons/hicolor/scalable/actions/paint-order-msf.svg
index e29b067fc..e29b067fc 100644
--- a/share/icons/paint-order-msf.svg
+++ b/share/icons/hicolor/scalable/actions/paint-order-msf.svg
diff --git a/share/icons/paint-order-sfm.svg b/share/icons/hicolor/scalable/actions/paint-order-sfm.svg
index 3f67a01e8..3f67a01e8 100644
--- a/share/icons/paint-order-sfm.svg
+++ b/share/icons/hicolor/scalable/actions/paint-order-sfm.svg
diff --git a/share/icons/paint-order-smf.svg b/share/icons/hicolor/scalable/actions/paint-order-smf.svg
index 007d36fe2..007d36fe2 100644
--- a/share/icons/paint-order-smf.svg
+++ b/share/icons/hicolor/scalable/actions/paint-order-smf.svg
diff --git a/share/icons/paint-pattern.svg b/share/icons/hicolor/scalable/actions/paint-pattern.svg
index 475fe87fe..475fe87fe 100644
--- a/share/icons/paint-pattern.svg
+++ b/share/icons/hicolor/scalable/actions/paint-pattern.svg
diff --git a/share/icons/paint-solid.svg b/share/icons/hicolor/scalable/actions/paint-solid.svg
index c6b29e071..c6b29e071 100644
--- a/share/icons/paint-solid.svg
+++ b/share/icons/hicolor/scalable/actions/paint-solid.svg
diff --git a/share/icons/paint-swatch.svg b/share/icons/hicolor/scalable/actions/paint-swatch.svg
index 914198c20..914198c20 100644
--- a/share/icons/paint-swatch.svg
+++ b/share/icons/hicolor/scalable/actions/paint-swatch.svg
diff --git a/share/icons/paint-unknown.svg b/share/icons/hicolor/scalable/actions/paint-unknown.svg
index 3537534f2..3537534f2 100644
--- a/share/icons/paint-unknown.svg
+++ b/share/icons/hicolor/scalable/actions/paint-unknown.svg
diff --git a/share/icons/path-break-apart.svg b/share/icons/hicolor/scalable/actions/path-break-apart.svg
index fe26a9063..fe26a9063 100644
--- a/share/icons/path-break-apart.svg
+++ b/share/icons/hicolor/scalable/actions/path-break-apart.svg
diff --git a/share/icons/path-clip-edit.svg b/share/icons/hicolor/scalable/actions/path-clip-edit.svg
index e5b9c0710..e5b9c0710 100644
--- a/share/icons/path-clip-edit.svg
+++ b/share/icons/hicolor/scalable/actions/path-clip-edit.svg
diff --git a/share/icons/path-combine.svg b/share/icons/hicolor/scalable/actions/path-combine.svg
index e88bc7d1f..e88bc7d1f 100644
--- a/share/icons/path-combine.svg
+++ b/share/icons/hicolor/scalable/actions/path-combine.svg
diff --git a/share/icons/path-cut.svg b/share/icons/hicolor/scalable/actions/path-cut.svg
index 56f17170b..56f17170b 100644
--- a/share/icons/path-cut.svg
+++ b/share/icons/hicolor/scalable/actions/path-cut.svg
diff --git a/share/icons/path-difference.svg b/share/icons/hicolor/scalable/actions/path-difference.svg
index 09d8828e0..09d8828e0 100644
--- a/share/icons/path-difference.svg
+++ b/share/icons/hicolor/scalable/actions/path-difference.svg
diff --git a/share/icons/path-division.svg b/share/icons/hicolor/scalable/actions/path-division.svg
index aa048c58e..aa048c58e 100644
--- a/share/icons/path-division.svg
+++ b/share/icons/hicolor/scalable/actions/path-division.svg
diff --git a/share/icons/path-effect-parameter-next.svg b/share/icons/hicolor/scalable/actions/path-effect-parameter-next.svg
index 5df826ea6..5df826ea6 100644
--- a/share/icons/path-effect-parameter-next.svg
+++ b/share/icons/hicolor/scalable/actions/path-effect-parameter-next.svg
diff --git a/share/icons/path-exclusion.svg b/share/icons/hicolor/scalable/actions/path-exclusion.svg
index f9c8b42ad..f9c8b42ad 100644
--- a/share/icons/path-exclusion.svg
+++ b/share/icons/hicolor/scalable/actions/path-exclusion.svg
diff --git a/share/icons/path-inset.svg b/share/icons/hicolor/scalable/actions/path-inset.svg
index 8d19edc3c..8d19edc3c 100644
--- a/share/icons/path-inset.svg
+++ b/share/icons/hicolor/scalable/actions/path-inset.svg
diff --git a/share/icons/path-intersection.svg b/share/icons/hicolor/scalable/actions/path-intersection.svg
index cd61f73e1..cd61f73e1 100644
--- a/share/icons/path-intersection.svg
+++ b/share/icons/hicolor/scalable/actions/path-intersection.svg
diff --git a/share/icons/path-mask-edit.svg b/share/icons/hicolor/scalable/actions/path-mask-edit.svg
index ea1a1de12..ea1a1de12 100644
--- a/share/icons/path-mask-edit.svg
+++ b/share/icons/hicolor/scalable/actions/path-mask-edit.svg
diff --git a/share/icons/path-mode-bezier.svg b/share/icons/hicolor/scalable/actions/path-mode-bezier.svg
index d6561421e..d6561421e 100644
--- a/share/icons/path-mode-bezier.svg
+++ b/share/icons/hicolor/scalable/actions/path-mode-bezier.svg
diff --git a/share/icons/path-mode-bspline.svg b/share/icons/hicolor/scalable/actions/path-mode-bspline.svg
index ca886f663..ca886f663 100644
--- a/share/icons/path-mode-bspline.svg
+++ b/share/icons/hicolor/scalable/actions/path-mode-bspline.svg
diff --git a/share/icons/path-mode-polyline-paraxial.svg b/share/icons/hicolor/scalable/actions/path-mode-polyline-paraxial.svg
index 1a1ac52a9..1a1ac52a9 100644
--- a/share/icons/path-mode-polyline-paraxial.svg
+++ b/share/icons/hicolor/scalable/actions/path-mode-polyline-paraxial.svg
diff --git a/share/icons/path-mode-polyline.svg b/share/icons/hicolor/scalable/actions/path-mode-polyline.svg
index 5c0bd8ae0..5c0bd8ae0 100644
--- a/share/icons/path-mode-polyline.svg
+++ b/share/icons/hicolor/scalable/actions/path-mode-polyline.svg
diff --git a/share/icons/path-mode-spiro.svg b/share/icons/hicolor/scalable/actions/path-mode-spiro.svg
index abc3046b6..abc3046b6 100644
--- a/share/icons/path-mode-spiro.svg
+++ b/share/icons/hicolor/scalable/actions/path-mode-spiro.svg
diff --git a/share/icons/path-offset-dynamic.svg b/share/icons/hicolor/scalable/actions/path-offset-dynamic.svg
index b494c1165..b494c1165 100644
--- a/share/icons/path-offset-dynamic.svg
+++ b/share/icons/hicolor/scalable/actions/path-offset-dynamic.svg
diff --git a/share/icons/path-offset-linked.svg b/share/icons/hicolor/scalable/actions/path-offset-linked.svg
index 6622b0cd5..6622b0cd5 100644
--- a/share/icons/path-offset-linked.svg
+++ b/share/icons/hicolor/scalable/actions/path-offset-linked.svg
diff --git a/share/icons/path-outset.svg b/share/icons/hicolor/scalable/actions/path-outset.svg
index b1a04a6f3..b1a04a6f3 100644
--- a/share/icons/path-outset.svg
+++ b/share/icons/hicolor/scalable/actions/path-outset.svg
diff --git a/share/icons/path-reverse.svg b/share/icons/hicolor/scalable/actions/path-reverse.svg
index f56b3c464..f56b3c464 100644
--- a/share/icons/path-reverse.svg
+++ b/share/icons/hicolor/scalable/actions/path-reverse.svg
diff --git a/share/icons/path-simplify.svg b/share/icons/hicolor/scalable/actions/path-simplify.svg
index 69db4a3d9..69db4a3d9 100644
--- a/share/icons/path-simplify.svg
+++ b/share/icons/hicolor/scalable/actions/path-simplify.svg
diff --git a/share/icons/path-tweak-attract.svg b/share/icons/hicolor/scalable/actions/path-tweak-attract.svg
index 174924c18..174924c18 100644
--- a/share/icons/path-tweak-attract.svg
+++ b/share/icons/hicolor/scalable/actions/path-tweak-attract.svg
diff --git a/share/icons/path-tweak-grow.svg b/share/icons/hicolor/scalable/actions/path-tweak-grow.svg
index 9f039cc5e..9f039cc5e 100644
--- a/share/icons/path-tweak-grow.svg
+++ b/share/icons/hicolor/scalable/actions/path-tweak-grow.svg
diff --git a/share/icons/path-tweak-push.svg b/share/icons/hicolor/scalable/actions/path-tweak-push.svg
index be97d0ebd..be97d0ebd 100644
--- a/share/icons/path-tweak-push.svg
+++ b/share/icons/hicolor/scalable/actions/path-tweak-push.svg
diff --git a/share/icons/path-tweak-repel.svg b/share/icons/hicolor/scalable/actions/path-tweak-repel.svg
index c45443385..c45443385 100644
--- a/share/icons/path-tweak-repel.svg
+++ b/share/icons/hicolor/scalable/actions/path-tweak-repel.svg
diff --git a/share/icons/path-tweak-roughen.svg b/share/icons/hicolor/scalable/actions/path-tweak-roughen.svg
index 0f512afa0..0f512afa0 100644
--- a/share/icons/path-tweak-roughen.svg
+++ b/share/icons/hicolor/scalable/actions/path-tweak-roughen.svg
diff --git a/share/icons/path-tweak-shrink.svg b/share/icons/hicolor/scalable/actions/path-tweak-shrink.svg
index dad870ebc..dad870ebc 100644
--- a/share/icons/path-tweak-shrink.svg
+++ b/share/icons/hicolor/scalable/actions/path-tweak-shrink.svg
diff --git a/share/icons/path-union.svg b/share/icons/hicolor/scalable/actions/path-union.svg
index b7cec9068..b7cec9068 100644
--- a/share/icons/path-union.svg
+++ b/share/icons/hicolor/scalable/actions/path-union.svg
diff --git a/share/icons/perspective-parallel.svg b/share/icons/hicolor/scalable/actions/perspective-parallel.svg
index 25286625b..25286625b 100644
--- a/share/icons/perspective-parallel.svg
+++ b/share/icons/hicolor/scalable/actions/perspective-parallel.svg
diff --git a/share/icons/pixelart-trace.svg b/share/icons/hicolor/scalable/actions/pixelart-trace.svg
index 49f81e224..49f81e224 100644
--- a/share/icons/pixelart-trace.svg
+++ b/share/icons/hicolor/scalable/actions/pixelart-trace.svg
diff --git a/share/icons/randomize.svg b/share/icons/hicolor/scalable/actions/randomize.svg
index 895ad8baf..895ad8baf 100644
--- a/share/icons/randomize.svg
+++ b/share/icons/hicolor/scalable/actions/randomize.svg
diff --git a/share/icons/rectangle-make-corners-sharp.svg b/share/icons/hicolor/scalable/actions/rectangle-make-corners-sharp.svg
index fd0297a4d..fd0297a4d 100644
--- a/share/icons/rectangle-make-corners-sharp.svg
+++ b/share/icons/hicolor/scalable/actions/rectangle-make-corners-sharp.svg
diff --git a/share/icons/remove-color.svg b/share/icons/hicolor/scalable/actions/remove-color.svg
index 63d56906b..63d56906b 100644
--- a/share/icons/remove-color.svg
+++ b/share/icons/hicolor/scalable/actions/remove-color.svg
diff --git a/share/icons/searching.svg b/share/icons/hicolor/scalable/actions/searching.svg
index 0bc5b57bc..0bc5b57bc 100644
--- a/share/icons/searching.svg
+++ b/share/icons/hicolor/scalable/actions/searching.svg
diff --git a/share/icons/selection-bottom.svg b/share/icons/hicolor/scalable/actions/selection-bottom.svg
index fc98bb37e..fc98bb37e 100644
--- a/share/icons/selection-bottom.svg
+++ b/share/icons/hicolor/scalable/actions/selection-bottom.svg
diff --git a/share/icons/selection-lower.svg b/share/icons/hicolor/scalable/actions/selection-lower.svg
index 23eaf6f7c..23eaf6f7c 100644
--- a/share/icons/selection-lower.svg
+++ b/share/icons/hicolor/scalable/actions/selection-lower.svg
diff --git a/share/icons/selection-make-bitmap-copy.svg b/share/icons/hicolor/scalable/actions/selection-make-bitmap-copy.svg
index 6efe93903..6efe93903 100644
--- a/share/icons/selection-make-bitmap-copy.svg
+++ b/share/icons/hicolor/scalable/actions/selection-make-bitmap-copy.svg
diff --git a/share/icons/selection-move-to-layer-above.svg b/share/icons/hicolor/scalable/actions/selection-move-to-layer-above.svg
index 333d36c34..333d36c34 100644
--- a/share/icons/selection-move-to-layer-above.svg
+++ b/share/icons/hicolor/scalable/actions/selection-move-to-layer-above.svg
diff --git a/share/icons/selection-move-to-layer-below.svg b/share/icons/hicolor/scalable/actions/selection-move-to-layer-below.svg
index d37b3dc3e..d37b3dc3e 100644
--- a/share/icons/selection-move-to-layer-below.svg
+++ b/share/icons/hicolor/scalable/actions/selection-move-to-layer-below.svg
diff --git a/share/icons/selection-raise.svg b/share/icons/hicolor/scalable/actions/selection-raise.svg
index 526fbd667..526fbd667 100644
--- a/share/icons/selection-raise.svg
+++ b/share/icons/hicolor/scalable/actions/selection-raise.svg
diff --git a/share/icons/selection-top.svg b/share/icons/hicolor/scalable/actions/selection-top.svg
index 3002bf141..3002bf141 100644
--- a/share/icons/selection-top.svg
+++ b/share/icons/hicolor/scalable/actions/selection-top.svg
diff --git a/share/icons/show-dialogs.svg b/share/icons/hicolor/scalable/actions/show-dialogs.svg
index 9e1bec508..9e1bec508 100644
--- a/share/icons/show-dialogs.svg
+++ b/share/icons/hicolor/scalable/actions/show-dialogs.svg
diff --git a/share/icons/show-grid.svg b/share/icons/hicolor/scalable/actions/show-grid.svg
index 08de34b3c..08de34b3c 100644
--- a/share/icons/show-grid.svg
+++ b/share/icons/hicolor/scalable/actions/show-grid.svg
diff --git a/share/icons/show-guides.svg b/share/icons/hicolor/scalable/actions/show-guides.svg
index b2e97a94c..b2e97a94c 100644
--- a/share/icons/show-guides.svg
+++ b/share/icons/hicolor/scalable/actions/show-guides.svg
diff --git a/share/icons/show-node-handles.svg b/share/icons/hicolor/scalable/actions/show-node-handles.svg
index 8b2ceeaec..8b2ceeaec 100644
--- a/share/icons/show-node-handles.svg
+++ b/share/icons/hicolor/scalable/actions/show-node-handles.svg
diff --git a/share/icons/show-path-outline.svg b/share/icons/hicolor/scalable/actions/show-path-outline.svg
index c2799dae5..c2799dae5 100644
--- a/share/icons/show-path-outline.svg
+++ b/share/icons/hicolor/scalable/actions/show-path-outline.svg
diff --git a/share/icons/snap-bounding-box-center.svg b/share/icons/hicolor/scalable/actions/snap-bounding-box-center.svg
index b30bb115f..b30bb115f 100644
--- a/share/icons/snap-bounding-box-center.svg
+++ b/share/icons/hicolor/scalable/actions/snap-bounding-box-center.svg
diff --git a/share/icons/snap-bounding-box-corners.svg b/share/icons/hicolor/scalable/actions/snap-bounding-box-corners.svg
index de8c5ac68..de8c5ac68 100644
--- a/share/icons/snap-bounding-box-corners.svg
+++ b/share/icons/hicolor/scalable/actions/snap-bounding-box-corners.svg
diff --git a/share/icons/snap-bounding-box-edges.svg b/share/icons/hicolor/scalable/actions/snap-bounding-box-edges.svg
index f52e611b8..f52e611b8 100644
--- a/share/icons/snap-bounding-box-edges.svg
+++ b/share/icons/hicolor/scalable/actions/snap-bounding-box-edges.svg
diff --git a/share/icons/snap-bounding-box-midpoints.svg b/share/icons/hicolor/scalable/actions/snap-bounding-box-midpoints.svg
index d8876f62c..d8876f62c 100644
--- a/share/icons/snap-bounding-box-midpoints.svg
+++ b/share/icons/hicolor/scalable/actions/snap-bounding-box-midpoints.svg
diff --git a/share/icons/snap-bounding-box.svg b/share/icons/hicolor/scalable/actions/snap-bounding-box.svg
index aaa5ee1c0..aaa5ee1c0 100644
--- a/share/icons/snap-bounding-box.svg
+++ b/share/icons/hicolor/scalable/actions/snap-bounding-box.svg
diff --git a/share/icons/snap-grid-guide-intersections.svg b/share/icons/hicolor/scalable/actions/snap-grid-guide-intersections.svg
index 9d7c75391..9d7c75391 100644
--- a/share/icons/snap-grid-guide-intersections.svg
+++ b/share/icons/hicolor/scalable/actions/snap-grid-guide-intersections.svg
diff --git a/share/icons/snap-nodes-center.svg b/share/icons/hicolor/scalable/actions/snap-nodes-center.svg
index 8d32311a2..8d32311a2 100644
--- a/share/icons/snap-nodes-center.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-center.svg
diff --git a/share/icons/snap-nodes-cusp.svg b/share/icons/hicolor/scalable/actions/snap-nodes-cusp.svg
index 5a70303b9..5a70303b9 100644
--- a/share/icons/snap-nodes-cusp.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-cusp.svg
diff --git a/share/icons/snap-nodes-intersection.svg b/share/icons/hicolor/scalable/actions/snap-nodes-intersection.svg
index 040385288..040385288 100644
--- a/share/icons/snap-nodes-intersection.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-intersection.svg
diff --git a/share/icons/snap-nodes-midpoint.svg b/share/icons/hicolor/scalable/actions/snap-nodes-midpoint.svg
index 9cfde3c72..9cfde3c72 100644
--- a/share/icons/snap-nodes-midpoint.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-midpoint.svg
diff --git a/share/icons/snap-nodes-path.svg b/share/icons/hicolor/scalable/actions/snap-nodes-path.svg
index 9c1f053e2..9c1f053e2 100644
--- a/share/icons/snap-nodes-path.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-path.svg
diff --git a/share/icons/snap-nodes-rotation-center.svg b/share/icons/hicolor/scalable/actions/snap-nodes-rotation-center.svg
index d3404ce64..d3404ce64 100644
--- a/share/icons/snap-nodes-rotation-center.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-rotation-center.svg
diff --git a/share/icons/snap-nodes-smooth.svg b/share/icons/hicolor/scalable/actions/snap-nodes-smooth.svg
index 7e7e3bae4..7e7e3bae4 100644
--- a/share/icons/snap-nodes-smooth.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes-smooth.svg
diff --git a/share/icons/snap-nodes.svg b/share/icons/hicolor/scalable/actions/snap-nodes.svg
index e0eb50284..e0eb50284 100644
--- a/share/icons/snap-nodes.svg
+++ b/share/icons/hicolor/scalable/actions/snap-nodes.svg
diff --git a/share/icons/snap-others.svg b/share/icons/hicolor/scalable/actions/snap-others.svg
index c626c47f3..c626c47f3 100644
--- a/share/icons/snap-others.svg
+++ b/share/icons/hicolor/scalable/actions/snap-others.svg
diff --git a/share/icons/snap-page.svg b/share/icons/hicolor/scalable/actions/snap-page.svg
index 2977d253c..2977d253c 100644
--- a/share/icons/snap-page.svg
+++ b/share/icons/hicolor/scalable/actions/snap-page.svg
diff --git a/share/icons/snap-text-baseline.svg b/share/icons/hicolor/scalable/actions/snap-text-baseline.svg
index ef61aa879..ef61aa879 100644
--- a/share/icons/snap-text-baseline.svg
+++ b/share/icons/hicolor/scalable/actions/snap-text-baseline.svg
diff --git a/share/icons/snap.svg b/share/icons/hicolor/scalable/actions/snap.svg
index 185bc99ed..185bc99ed 100644
--- a/share/icons/snap.svg
+++ b/share/icons/hicolor/scalable/actions/snap.svg
diff --git a/share/icons/spray-mode-clone.svg b/share/icons/hicolor/scalable/actions/spray-mode-clone.svg
index 968d5b76e..968d5b76e 100644
--- a/share/icons/spray-mode-clone.svg
+++ b/share/icons/hicolor/scalable/actions/spray-mode-clone.svg
diff --git a/share/icons/spray-mode-copy.svg b/share/icons/hicolor/scalable/actions/spray-mode-copy.svg
index 828b8604b..828b8604b 100644
--- a/share/icons/spray-mode-copy.svg
+++ b/share/icons/hicolor/scalable/actions/spray-mode-copy.svg
diff --git a/share/icons/spray-mode-union.svg b/share/icons/hicolor/scalable/actions/spray-mode-union.svg
index cf1042e4b..cf1042e4b 100644
--- a/share/icons/spray-mode-union.svg
+++ b/share/icons/hicolor/scalable/actions/spray-mode-union.svg
diff --git a/share/icons/sticky_zoom.svg b/share/icons/hicolor/scalable/actions/sticky_zoom.svg
index 0c9f9f0fa..0c9f9f0fa 100644
--- a/share/icons/sticky_zoom.svg
+++ b/share/icons/hicolor/scalable/actions/sticky_zoom.svg
diff --git a/share/icons/stroke-cap-butt.svg b/share/icons/hicolor/scalable/actions/stroke-cap-butt.svg
index 9b2eb6bae..9b2eb6bae 100644
--- a/share/icons/stroke-cap-butt.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-cap-butt.svg
diff --git a/share/icons/stroke-cap-round.svg b/share/icons/hicolor/scalable/actions/stroke-cap-round.svg
index 6cfab8638..6cfab8638 100644
--- a/share/icons/stroke-cap-round.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-cap-round.svg
diff --git a/share/icons/stroke-cap-square.svg b/share/icons/hicolor/scalable/actions/stroke-cap-square.svg
index b8a7d3bae..b8a7d3bae 100644
--- a/share/icons/stroke-cap-square.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-cap-square.svg
diff --git a/share/icons/stroke-join-bevel.svg b/share/icons/hicolor/scalable/actions/stroke-join-bevel.svg
index 2784c7070..2784c7070 100644
--- a/share/icons/stroke-join-bevel.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-join-bevel.svg
diff --git a/share/icons/stroke-join-miter.svg b/share/icons/hicolor/scalable/actions/stroke-join-miter.svg
index 89c5071ba..89c5071ba 100644
--- a/share/icons/stroke-join-miter.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-join-miter.svg
diff --git a/share/icons/stroke-join-round.svg b/share/icons/hicolor/scalable/actions/stroke-join-round.svg
index d604d2f0a..d604d2f0a 100644
--- a/share/icons/stroke-join-round.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-join-round.svg
diff --git a/share/icons/stroke-to-path.svg b/share/icons/hicolor/scalable/actions/stroke-to-path.svg
index b665a3006..b665a3006 100644
--- a/share/icons/stroke-to-path.svg
+++ b/share/icons/hicolor/scalable/actions/stroke-to-path.svg
diff --git a/share/icons/swatches.svg b/share/icons/hicolor/scalable/actions/swatches.svg
index da80b32d7..da80b32d7 100644
--- a/share/icons/swatches.svg
+++ b/share/icons/hicolor/scalable/actions/swatches.svg
diff --git a/share/icons/symbol-add.svg b/share/icons/hicolor/scalable/actions/symbol-add.svg
index 77385a227..77385a227 100644
--- a/share/icons/symbol-add.svg
+++ b/share/icons/hicolor/scalable/actions/symbol-add.svg
diff --git a/share/icons/symbol-bigger.svg b/share/icons/hicolor/scalable/actions/symbol-bigger.svg
index a5227518e..a5227518e 100644
--- a/share/icons/symbol-bigger.svg
+++ b/share/icons/hicolor/scalable/actions/symbol-bigger.svg
diff --git a/share/icons/symbol-fit.svg b/share/icons/hicolor/scalable/actions/symbol-fit.svg
index 1d0429091..1d0429091 100644
--- a/share/icons/symbol-fit.svg
+++ b/share/icons/hicolor/scalable/actions/symbol-fit.svg
diff --git a/share/icons/symbol-remove.svg b/share/icons/hicolor/scalable/actions/symbol-remove.svg
index 7bb09f127..7bb09f127 100644
--- a/share/icons/symbol-remove.svg
+++ b/share/icons/hicolor/scalable/actions/symbol-remove.svg
diff --git a/share/icons/symbol-smaller.svg b/share/icons/hicolor/scalable/actions/symbol-smaller.svg
index f8657a8a7..f8657a8a7 100644
--- a/share/icons/symbol-smaller.svg
+++ b/share/icons/hicolor/scalable/actions/symbol-smaller.svg
diff --git a/share/icons/symbols.svg b/share/icons/hicolor/scalable/actions/symbols.svg
index fe5b05d38..fe5b05d38 100644
--- a/share/icons/symbols.svg
+++ b/share/icons/hicolor/scalable/actions/symbols.svg
diff --git a/share/icons/symbols_old.svg b/share/icons/hicolor/scalable/actions/symbols_old.svg
index 6370b5640..6370b5640 100644
--- a/share/icons/symbols_old.svg
+++ b/share/icons/hicolor/scalable/actions/symbols_old.svg
diff --git a/share/icons/text-convert-to-regular.svg b/share/icons/hicolor/scalable/actions/text-convert-to-regular.svg
index 63162ca12..63162ca12 100644
--- a/share/icons/text-convert-to-regular.svg
+++ b/share/icons/hicolor/scalable/actions/text-convert-to-regular.svg
diff --git a/share/icons/text-flow-into-frame.svg b/share/icons/hicolor/scalable/actions/text-flow-into-frame.svg
index 9e4a25cb0..9e4a25cb0 100644
--- a/share/icons/text-flow-into-frame.svg
+++ b/share/icons/hicolor/scalable/actions/text-flow-into-frame.svg
diff --git a/share/icons/text-orientation-auto.svg b/share/icons/hicolor/scalable/actions/text-orientation-auto.svg
index a4bf06643..a4bf06643 100644
--- a/share/icons/text-orientation-auto.svg
+++ b/share/icons/hicolor/scalable/actions/text-orientation-auto.svg
diff --git a/share/icons/text-orientation-sideways.svg b/share/icons/hicolor/scalable/actions/text-orientation-sideways.svg
index a6ce53531..a6ce53531 100644
--- a/share/icons/text-orientation-sideways.svg
+++ b/share/icons/hicolor/scalable/actions/text-orientation-sideways.svg
diff --git a/share/icons/text-orientation-upright.svg b/share/icons/hicolor/scalable/actions/text-orientation-upright.svg
index 222a3d518..222a3d518 100644
--- a/share/icons/text-orientation-upright.svg
+++ b/share/icons/hicolor/scalable/actions/text-orientation-upright.svg
diff --git a/share/icons/text-put-on-path.svg b/share/icons/hicolor/scalable/actions/text-put-on-path.svg
index 1ac7eb9d5..1ac7eb9d5 100644
--- a/share/icons/text-put-on-path.svg
+++ b/share/icons/hicolor/scalable/actions/text-put-on-path.svg
diff --git a/share/icons/text-remove-from-path.svg b/share/icons/hicolor/scalable/actions/text-remove-from-path.svg
index b7cc590f8..b7cc590f8 100644
--- a/share/icons/text-remove-from-path.svg
+++ b/share/icons/hicolor/scalable/actions/text-remove-from-path.svg
diff --git a/share/icons/text-unflow.svg b/share/icons/hicolor/scalable/actions/text-unflow.svg
index 8782c72cb..8782c72cb 100644
--- a/share/icons/text-unflow.svg
+++ b/share/icons/hicolor/scalable/actions/text-unflow.svg
diff --git a/share/icons/text-unkern.svg b/share/icons/hicolor/scalable/actions/text-unkern.svg
index 5fc671147..5fc671147 100644
--- a/share/icons/text-unkern.svg
+++ b/share/icons/hicolor/scalable/actions/text-unkern.svg
diff --git a/share/icons/text_horz_kern.svg b/share/icons/hicolor/scalable/actions/text_horz_kern.svg
index 23e6cd18f..23e6cd18f 100644
--- a/share/icons/text_horz_kern.svg
+++ b/share/icons/hicolor/scalable/actions/text_horz_kern.svg
diff --git a/share/icons/text_letter_spacing.svg b/share/icons/hicolor/scalable/actions/text_letter_spacing.svg
index eda5bbab0..eda5bbab0 100644
--- a/share/icons/text_letter_spacing.svg
+++ b/share/icons/hicolor/scalable/actions/text_letter_spacing.svg
diff --git a/share/icons/text_line_spacing.svg b/share/icons/hicolor/scalable/actions/text_line_spacing.svg
index 381035c16..381035c16 100644
--- a/share/icons/text_line_spacing.svg
+++ b/share/icons/hicolor/scalable/actions/text_line_spacing.svg
diff --git a/share/icons/text_outer_style.svg b/share/icons/hicolor/scalable/actions/text_outer_style.svg
index 675007e8e..675007e8e 100644
--- a/share/icons/text_outer_style.svg
+++ b/share/icons/hicolor/scalable/actions/text_outer_style.svg
diff --git a/share/icons/text_remove_kerns.svg b/share/icons/hicolor/scalable/actions/text_remove_kerns.svg
index 149406c10..149406c10 100644
--- a/share/icons/text_remove_kerns.svg
+++ b/share/icons/hicolor/scalable/actions/text_remove_kerns.svg
diff --git a/share/icons/text_rotation.svg b/share/icons/hicolor/scalable/actions/text_rotation.svg
index 1a8080bf1..1a8080bf1 100644
--- a/share/icons/text_rotation.svg
+++ b/share/icons/hicolor/scalable/actions/text_rotation.svg
diff --git a/share/icons/text_subscript.svg b/share/icons/hicolor/scalable/actions/text_subscript.svg
index 2629eb5d2..2629eb5d2 100644
--- a/share/icons/text_subscript.svg
+++ b/share/icons/hicolor/scalable/actions/text_subscript.svg
diff --git a/share/icons/text_superscript.svg b/share/icons/hicolor/scalable/actions/text_superscript.svg
index bfe8c1e59..bfe8c1e59 100644
--- a/share/icons/text_superscript.svg
+++ b/share/icons/hicolor/scalable/actions/text_superscript.svg
diff --git a/share/icons/text_vert_kern.svg b/share/icons/hicolor/scalable/actions/text_vert_kern.svg
index 0088ec008..0088ec008 100644
--- a/share/icons/text_vert_kern.svg
+++ b/share/icons/hicolor/scalable/actions/text_vert_kern.svg
diff --git a/share/icons/text_word_spacing.svg b/share/icons/hicolor/scalable/actions/text_word_spacing.svg
index 8862b1915..8862b1915 100644
--- a/share/icons/text_word_spacing.svg
+++ b/share/icons/hicolor/scalable/actions/text_word_spacing.svg
diff --git a/share/icons/toggle_vp_y.svg b/share/icons/hicolor/scalable/actions/toggle_vp_y.svg
index e239d9bc2..e239d9bc2 100644
--- a/share/icons/toggle_vp_y.svg
+++ b/share/icons/hicolor/scalable/actions/toggle_vp_y.svg
diff --git a/share/icons/toggle_vp_z.svg b/share/icons/hicolor/scalable/actions/toggle_vp_z.svg
index 882b71b00..882b71b00 100644
--- a/share/icons/toggle_vp_z.svg
+++ b/share/icons/hicolor/scalable/actions/toggle_vp_z.svg
diff --git a/share/icons/too-much-ink-icon.svg b/share/icons/hicolor/scalable/actions/too-much-ink-icon.svg
index a04fe75e2..a04fe75e2 100644
--- a/share/icons/too-much-ink-icon.svg
+++ b/share/icons/hicolor/scalable/actions/too-much-ink-icon.svg
diff --git a/share/icons/tool-measure.svg b/share/icons/hicolor/scalable/actions/tool-measure.svg
index ff8050652..ff8050652 100644
--- a/share/icons/tool-measure.svg
+++ b/share/icons/hicolor/scalable/actions/tool-measure.svg
diff --git a/share/icons/tool-node-editor.svg b/share/icons/hicolor/scalable/actions/tool-node-editor.svg
index 4dd4b8575..4dd4b8575 100644
--- a/share/icons/tool-node-editor.svg
+++ b/share/icons/hicolor/scalable/actions/tool-node-editor.svg
diff --git a/share/icons/tool-pointer.svg b/share/icons/hicolor/scalable/actions/tool-pointer.svg
index c402bef55..c402bef55 100644
--- a/share/icons/tool-pointer.svg
+++ b/share/icons/hicolor/scalable/actions/tool-pointer.svg
diff --git a/share/icons/tool-spray.svg b/share/icons/hicolor/scalable/actions/tool-spray.svg
index efc5ef57b..efc5ef57b 100644
--- a/share/icons/tool-spray.svg
+++ b/share/icons/hicolor/scalable/actions/tool-spray.svg
diff --git a/share/icons/tool-tweak.svg b/share/icons/hicolor/scalable/actions/tool-tweak.svg
index 0e6403085..0e6403085 100644
--- a/share/icons/tool-tweak.svg
+++ b/share/icons/hicolor/scalable/actions/tool-tweak.svg
diff --git a/share/icons/transform-affect-gradient.svg b/share/icons/hicolor/scalable/actions/transform-affect-gradient.svg
index b8c1acbf6..b8c1acbf6 100644
--- a/share/icons/transform-affect-gradient.svg
+++ b/share/icons/hicolor/scalable/actions/transform-affect-gradient.svg
diff --git a/share/icons/transform-affect-pattern.svg b/share/icons/hicolor/scalable/actions/transform-affect-pattern.svg
index e7e51a2b0..e7e51a2b0 100644
--- a/share/icons/transform-affect-pattern.svg
+++ b/share/icons/hicolor/scalable/actions/transform-affect-pattern.svg
diff --git a/share/icons/transform-affect-rounded-corners.svg b/share/icons/hicolor/scalable/actions/transform-affect-rounded-corners.svg
index 89567779d..89567779d 100644
--- a/share/icons/transform-affect-rounded-corners.svg
+++ b/share/icons/hicolor/scalable/actions/transform-affect-rounded-corners.svg
diff --git a/share/icons/transform-affect-stroke.svg b/share/icons/hicolor/scalable/actions/transform-affect-stroke.svg
index df88840a4..df88840a4 100644
--- a/share/icons/transform-affect-stroke.svg
+++ b/share/icons/hicolor/scalable/actions/transform-affect-stroke.svg
diff --git a/share/icons/transform-move-horizontal.svg b/share/icons/hicolor/scalable/actions/transform-move-horizontal.svg
index 94cf23b00..94cf23b00 100644
--- a/share/icons/transform-move-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/transform-move-horizontal.svg
diff --git a/share/icons/transform-move-vertical.svg b/share/icons/hicolor/scalable/actions/transform-move-vertical.svg
index e3ecf3456..e3ecf3456 100644
--- a/share/icons/transform-move-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/transform-move-vertical.svg
diff --git a/share/icons/transform-rotate.svg b/share/icons/hicolor/scalable/actions/transform-rotate.svg
index 0d5a86fab..0d5a86fab 100644
--- a/share/icons/transform-rotate.svg
+++ b/share/icons/hicolor/scalable/actions/transform-rotate.svg
diff --git a/share/icons/transform-scale-horizontal.svg b/share/icons/hicolor/scalable/actions/transform-scale-horizontal.svg
index 93fe96f15..93fe96f15 100644
--- a/share/icons/transform-scale-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/transform-scale-horizontal.svg
diff --git a/share/icons/transform-scale-vertical.svg b/share/icons/hicolor/scalable/actions/transform-scale-vertical.svg
index c57d28f7a..c57d28f7a 100644
--- a/share/icons/transform-scale-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/transform-scale-vertical.svg
diff --git a/share/icons/transform-skew-horizontal.svg b/share/icons/hicolor/scalable/actions/transform-skew-horizontal.svg
index 56c159c2c..56c159c2c 100644
--- a/share/icons/transform-skew-horizontal.svg
+++ b/share/icons/hicolor/scalable/actions/transform-skew-horizontal.svg
diff --git a/share/icons/transform-skew-vertical.svg b/share/icons/hicolor/scalable/actions/transform-skew-vertical.svg
index 03936171c..03936171c 100644
--- a/share/icons/transform-skew-vertical.svg
+++ b/share/icons/hicolor/scalable/actions/transform-skew-vertical.svg
diff --git a/share/icons/view-fullscreen.svg b/share/icons/hicolor/scalable/actions/view-fullscreen.svg
index 744119f09..744119f09 100644
--- a/share/icons/view-fullscreen.svg
+++ b/share/icons/hicolor/scalable/actions/view-fullscreen.svg
diff --git a/share/icons/window-new.svg b/share/icons/hicolor/scalable/actions/window-new.svg
index 251897288..251897288 100644
--- a/share/icons/window-new.svg
+++ b/share/icons/hicolor/scalable/actions/window-new.svg
diff --git a/share/icons/window-next.svg b/share/icons/hicolor/scalable/actions/window-next.svg
index 35c55bc0f..35c55bc0f 100644
--- a/share/icons/window-next.svg
+++ b/share/icons/hicolor/scalable/actions/window-next.svg
diff --git a/share/icons/window-previous.svg b/share/icons/hicolor/scalable/actions/window-previous.svg
index 50f759ef6..50f759ef6 100644
--- a/share/icons/window-previous.svg
+++ b/share/icons/hicolor/scalable/actions/window-previous.svg
diff --git a/share/icons/xml-attribute-delete.svg b/share/icons/hicolor/scalable/actions/xml-attribute-delete.svg
index 40421decd..40421decd 100644
--- a/share/icons/xml-attribute-delete.svg
+++ b/share/icons/hicolor/scalable/actions/xml-attribute-delete.svg
diff --git a/share/icons/xml-element-new.svg b/share/icons/hicolor/scalable/actions/xml-element-new.svg
index 779698786..779698786 100644
--- a/share/icons/xml-element-new.svg
+++ b/share/icons/hicolor/scalable/actions/xml-element-new.svg
diff --git a/share/icons/xml-node-delete.svg b/share/icons/hicolor/scalable/actions/xml-node-delete.svg
index 186127b7c..186127b7c 100644
--- a/share/icons/xml-node-delete.svg
+++ b/share/icons/hicolor/scalable/actions/xml-node-delete.svg
diff --git a/share/icons/xml-node-duplicate.svg b/share/icons/hicolor/scalable/actions/xml-node-duplicate.svg
index da1773265..da1773265 100644
--- a/share/icons/xml-node-duplicate.svg
+++ b/share/icons/hicolor/scalable/actions/xml-node-duplicate.svg
diff --git a/share/icons/xml-text-new.svg b/share/icons/hicolor/scalable/actions/xml-text-new.svg
index e690f6c22..e690f6c22 100644
--- a/share/icons/xml-text-new.svg
+++ b/share/icons/hicolor/scalable/actions/xml-text-new.svg
diff --git a/share/icons/zoom-double-size.svg b/share/icons/hicolor/scalable/actions/zoom-double-size.svg
index 4c9f422f9..4c9f422f9 100644
--- a/share/icons/zoom-double-size.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-double-size.svg
diff --git a/share/icons/zoom-fit-drawing.svg b/share/icons/hicolor/scalable/actions/zoom-fit-drawing.svg
index 6270f6585..6270f6585 100644
--- a/share/icons/zoom-fit-drawing.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-fit-drawing.svg
diff --git a/share/icons/zoom-fit-page.svg b/share/icons/hicolor/scalable/actions/zoom-fit-page.svg
index 7a0db90f9..7a0db90f9 100644
--- a/share/icons/zoom-fit-page.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-fit-page.svg
diff --git a/share/icons/zoom-fit-selection.svg b/share/icons/hicolor/scalable/actions/zoom-fit-selection.svg
index 248b9b3ec..248b9b3ec 100644
--- a/share/icons/zoom-fit-selection.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-fit-selection.svg
diff --git a/share/icons/zoom-fit-width.svg b/share/icons/hicolor/scalable/actions/zoom-fit-width.svg
index c12a54dc4..c12a54dc4 100644
--- a/share/icons/zoom-fit-width.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-fit-width.svg
diff --git a/share/icons/zoom-half-size.svg b/share/icons/hicolor/scalable/actions/zoom-half-size.svg
index b293b1f3f..b293b1f3f 100644
--- a/share/icons/zoom-half-size.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-half-size.svg
diff --git a/share/icons/zoom-in.svg b/share/icons/hicolor/scalable/actions/zoom-in.svg
index 58379bd05..58379bd05 100644
--- a/share/icons/zoom-in.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-in.svg
diff --git a/share/icons/zoom-next.svg b/share/icons/hicolor/scalable/actions/zoom-next.svg
index ab5e16abf..ab5e16abf 100644
--- a/share/icons/zoom-next.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-next.svg
diff --git a/share/icons/zoom-original.svg b/share/icons/hicolor/scalable/actions/zoom-original.svg
index 553b01ea9..553b01ea9 100644
--- a/share/icons/zoom-original.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-original.svg
diff --git a/share/icons/zoom-out.svg b/share/icons/hicolor/scalable/actions/zoom-out.svg
index 210053f4d..210053f4d 100644
--- a/share/icons/zoom-out.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-out.svg
diff --git a/share/icons/zoom-previous.svg b/share/icons/hicolor/scalable/actions/zoom-previous.svg
index 69c83aa03..69c83aa03 100644
--- a/share/icons/zoom-previous.svg
+++ b/share/icons/hicolor/scalable/actions/zoom-previous.svg
diff --git a/share/icons/zoom.svg b/share/icons/hicolor/scalable/actions/zoom.svg
index 4a9322568..4a9322568 100644
--- a/share/icons/zoom.svg
+++ b/share/icons/hicolor/scalable/actions/zoom.svg
diff --git a/src/selection-chemistry.cpp b/src/selection-chemistry.cpp
index efc378845..b18cea034 100644
--- a/src/selection-chemistry.cpp
+++ b/src/selection-chemistry.cpp
@@ -3149,17 +3149,35 @@ void ObjectSet::toSymbol()
     // Create new <symbol>
     Inkscape::XML::Node *defsrepr = doc->getDefs()->getRepr();
     Inkscape::XML::Node *symbol_repr = xml_doc->createElement("svg:symbol");
+    Inkscape::XML::Node *title_repr = xml_doc->createElement("svg:title");
+    
     defsrepr->appendChild(symbol_repr);
-
+    bool settitle = false;
     // For a single group, copy relevant attributes.
     if( single_group ) {
+        Glib::ustring id = the_group->getAttribute("id");
         symbol_repr->setAttribute("style",  the_group->getAttribute("style"));
-        symbol_repr->setAttribute("title",  the_group->getAttribute("title"));
-        if (!the_group->getAttribute("title")) {
-            symbol_repr->setAttribute("title", _("Symbol without title"));
+        
+        gchar * title = the_group->title();
+        if (title) {
+            symbol_repr->appendChild(title_repr);
+            title_repr->appendChild(xml_doc->createTextNode(title));
+            title_repr->setPosition(0);
+            Inkscape::GC::release(title_repr);
+        }
+        g_free(title);
+        
+        gchar * desc = the_group->desc();
+        if (desc) {
+            Inkscape::XML::Node *desc_repr = xml_doc->createElement("svg:desc");
+            desc_repr->setContent(desc);
+            desc_repr->appendChild(xml_doc->createTextNode(desc));
+            symbol_repr->appendChild(desc_repr);
+            desc_repr->setPosition(1);
+            Inkscape::GC::release(desc_repr);
         }
+        g_free(desc);
         symbol_repr->setAttribute("class",  the_group->getAttribute("class"));
-        Glib::ustring id = the_group->getAttribute("id");
         the_group->setAttribute("id", id + "_transform");
         symbol_repr->setAttribute("id", id);
 
@@ -3176,9 +3194,27 @@ void ObjectSet::toSymbol()
 
     // Move selected items to new <symbol>
     for (std::vector<SPObject*>::const_reverse_iterator i=items_.rbegin();i!=items_.rend();++i){
-      Inkscape::XML::Node *repr = (*i)->getRepr();
-      repr->parent()->removeChild(repr);
-      symbol_repr->addChild(repr,NULL);
+        gchar* title = (*i)->title();
+        if (!single_group && !settitle && title) {
+            symbol_repr->appendChild(title_repr);
+            title_repr->appendChild(xml_doc->createTextNode(title));
+            title_repr->setPosition(0);
+            Inkscape::GC::release(title_repr);
+            gchar * desc = (*i)->desc();
+            if (desc) {
+                Inkscape::XML::Node *desc_repr = xml_doc->createElement("svg:desc");
+                desc_repr->appendChild(xml_doc->createTextNode(desc));
+                symbol_repr->appendChild(desc_repr);
+                Inkscape::GC::release(desc_repr);
+                desc_repr->setPosition(1);
+            }
+            g_free(desc);
+            settitle = true;
+        }
+        g_free(title);
+        Inkscape::XML::Node *repr = (*i)->getRepr();
+        repr->parent()->removeChild(repr);
+        symbol_repr->addChild(repr, NULL);
     }
 
     if( single_group && transform.isTranslation() ) {
diff --git a/src/ui/clipboard.cpp b/src/ui/clipboard.cpp
index dbeee644c..118d7ae1f 100644
--- a/src/ui/clipboard.cpp
+++ b/src/ui/clipboard.cpp
@@ -1049,9 +1049,12 @@ bool ClipboardManagerImpl::_pasteText(SPDesktop *desktop)
             SPCSSAttr *css = take_style_from_item(tc->text);
             for (int i = 0; i < nr_blocks; ++i)
             {
-                gchar const *w = sp_repr_css_property(css, "font-size", "40px");
-                if (w)
+                gchar const *w = sp_repr_css_property(css, "font-size", "0px");
+
+                // Don't set font-size if it wasn't set.
+                if (w && strcmp(w, "0px") != 0) {
                     sp_repr_css_set_property(te_selected_style[i], "font-size", w);
+                }
             }
 
             for (int i = 0; i < text.length(); ++i)
diff --git a/src/ui/dialog/symbols.cpp b/src/ui/dialog/symbols.cpp
index 1fcede8f1..3a15813c1 100644
--- a/src/ui/dialog/symbols.cpp
+++ b/src/ui/dialog/symbols.cpp
@@ -25,6 +25,7 @@
 #include "io/sys.h"
 #include "io/resource.h"
 
+#include "display/cairo-utils.h"
 #include "ui/cache/svg_preview_cache.h"
 #include "ui/clipboard.h"
 #include "ui/icon-names.h"
@@ -69,8 +70,8 @@ namespace Inkscape {
 namespace UI {
 
 namespace Dialog {
-const Glib::ustring CURRENTDOC = _("Current Document");
-const Glib::ustring ALLDOCS    = _("All symbols sets");
+const Glib::ustring CURRENTDOC = _("Current document");
+const Glib::ustring ALLDOCS    = _("All symbol sets");
 // See: http://developer.gnome.org/gtkmm/stable/classGtk_1_1TreeModelColumnRecord.html
 class SymbolColumns : public Gtk::TreeModel::ColumnRecord
 {
@@ -102,6 +103,7 @@ SymbolColumns* SymbolsDialog::getColumns()
 SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
   UI::Widget::Panel("", prefsPath, SP_VERB_DIALOG_SYMBOLS),
   store(Gtk::ListStore::create(*getColumns())),
+  all_docs_processed(0),
   icon_view(0),
   current_desktop(0),
   desk_track(),
@@ -225,6 +227,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
 #else
   table->attach(*Gtk::manage(scroller),0,row,2,1);
 #endif
+  previous_height = 0;
   ++row;
 
   /******************** Progress *******************************/
@@ -348,9 +351,7 @@ SymbolsDialog::SymbolsDialog( gchar const* prefsPath ) :
 
   // This might need to be a global variable so setTargetDesktop can modify it
   SPDefs *defs = current_document->getDefs();
-#if GTK_CHECK_VERSION(3,2,4)
-  overlay_opacity->set(getOverlay(overlay_opacity, "overlay", 1000));
-#endif
+
   sigc::connection defsModifiedConn = defs->connectModified(sigc::mem_fun(*this, &SymbolsDialog::defsModified));
   instanceConns.push_back(defsModifiedConn);
 
@@ -431,6 +432,7 @@ void SymbolsDialog::rebuild() {
   SPDocument* symbol_document = selectedSymbols();
   icons_found = false;
   //We are not in search all docs
+
   if (search->get_text() != _("Searching...") &&
     search->get_text() != _("Loading all symbols...") &&
     search->get_text() != _("Searching....") ) 
@@ -448,41 +450,37 @@ void SymbolsDialog::showOverlay() {
 #if GTK_CHECK_VERSION(3,2,4)
   Glib::ustring current = Glib::Markup::escape_text(symbol_set->get_active_text());
   overlay_icon->set_from_icon_name("none", iconsize);
-  if (current == ALLDOCS && 
-      search->get_text() != _("Loading all symbols...") &&
-      !l.size()) 
+  if (current == ALLDOCS && !l.size()) 
   {
     if (!all_docs_processed ) {
       overlay_icon->set_from_icon_name("searching", iconsize);
-      overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Search in all symbol sets ...")) + Glib::ustring("</span>"));
+      overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("</span>"));
       overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("First search can be slow.")) + Glib::ustring("</span>"));
     } else if (!icons_found && !search_str.empty()) {
       overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("No results found")) + Glib::ustring("</span>"));
       overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("Try a different search term.")) + Glib::ustring("</span>"));
     } else {
       overlay_icon->set_from_icon_name("searching", iconsize);
-      overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Search in all symbol sets ...")) + Glib::ustring("</span>"));
+      overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Search in all symbol sets...")) + Glib::ustring("</span>"));
       overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("")) + Glib::ustring("</span>"));
     }
-  } else if (current == ALLDOCS && search->get_text() == _("Loading all symbols...")) {
-    if (!all_docs_processed) {
-      overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("Loading all symbol sets ...")) + Glib::ustring("</span>"));
-      overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">")+ Glib::ustring(_("When run for the first time, search will be slow.\nPlease wait ...")) + Glib::ustring("</span>"));
-      overlay_icon->show();
-      overlay_title->show();
-      overlay_icon->set_from_icon_name("searching", iconsize);
-      overlay_desc->show();
-    } 
   } else if (!number_symbols && (current != CURRENTDOC || !search_str.empty())) {
       overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("No results found")) + Glib::ustring("</span>"));
       overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("Try a different search term,\nor switch to a different symbol set.")) + Glib::ustring("</span>"));
   } else if (!number_symbols && current == CURRENTDOC) {
       overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\"size=\"large\">")  + Glib::ustring(_("No symbols found")) + Glib::ustring("</span>"));
-      overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">")  + Glib::ustring(_("No symbols in current document\nChoose a different symbol set\nor add a new symbol.")) + Glib::ustring("</span>"));
+      overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">")  + Glib::ustring(_("No symbols in current document.\nChoose a different symbol set\nor add a new symbol.")) + Glib::ustring("</span>"));
   } else if (!icons_found && !search_str.empty()) {
       overlay_title->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"large\">") + Glib::ustring(_("No results found")) + Glib::ustring("</span>"));
-      overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("You could try a different search term,\nor switch to a different symbol set.")) + Glib::ustring("</span>"));
-  } 
+      overlay_desc->set_markup(Glib::ustring("<span foreground=\"#333333\" size=\"small\">") + Glib::ustring(_("Try a different search term,\nor switch to a different symbol set.")) + Glib::ustring("</span>"));
+  }
+  gint width = scroller->get_allocated_width();
+  gint height = scroller->get_allocated_height();
+  if (previous_height != height) {
+    previous_height = height;
+    overlay_opacity->set_size_request(width, height);
+    overlay_opacity->set(getOverlay(width, height));
+  }
   overlay_opacity->show();
   overlay_icon->show();
   overlay_title->show();
@@ -888,12 +886,17 @@ void SymbolsDialog::symbolsInDocRecursive (SPObject *r, std::map<Glib::ustring,
     return;
   }
 
-  if ( dynamic_cast<SPSymbol *>(r) && r->title()) {
-    Glib::ustring current = symbol_set->get_active_text();
-    if (current == ALLDOCS) {
-      l[doc_title + r->title()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r));
+  if ( dynamic_cast<SPSymbol *>(r)) {
+    if(r->title()) {
+      Glib::ustring current = symbol_set->get_active_text();
+      if (current == ALLDOCS) {
+        l[doc_title + r->title()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r));
+      } else {
+        l[r->title()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r));
+      }
     } else {
-      l[r->title()] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r));
+      Glib::ustring id = r->getAttribute("id");
+      l[Glib::ustring(_("Symbol without title ")) + id] = std::make_pair(doc_title,dynamic_cast<SPSymbol *>(r));
     }
   }
   for (auto& child: r->children) {
@@ -1030,7 +1033,7 @@ bool SymbolsDialog::callbackSymbols(){
           }
         }
       }
-      if (symbol && (search_str.empty() || found || (search_str.empty() && !symbol_title_char))) {
+      if (symbol && (search_str.empty() || found)) {
         addSymbol( symbol, doc_title);
         icons_found = true;
       }
@@ -1081,7 +1084,7 @@ bool SymbolsDialog::callbackAllSymbols(){
     progress_bar->set_fraction(1.0);
     all_docs_processed = true;
     addSymbols();
-    search->set_text("Searching....");
+    search->set_text("Searching...");
     return false;
   }
   return true;
@@ -1154,16 +1157,17 @@ void SymbolsDialog::addSymbol( SPObject* symbol, Glib::ustring doc_title) {
   SymbolColumns* columns = getColumns();
 
   gchar const *id    = symbol->getRepr()->attribute("id");
-  gchar const *title = symbol->title(); // From title element
-  if( !title ) {
-    title = id;
-  }
+  gchar * title = symbol->title(); // From title element
   if (doc_title.empty()) {
     doc_title = CURRENTDOC;
   }
-  Glib::ustring symbol_title = Glib::ustring(title) + Glib::ustring(" (") + doc_title + Glib::ustring(")");
+  Glib::ustring symbol_title = "";
+  if(title) {
+    symbol_title = Glib::ustring(title) + Glib::ustring(" (") + doc_title + Glib::ustring(")");
+  } else {
+    symbol_title = Glib::ustring(_("Symbol without title ")) + Glib::ustring(id) + Glib::ustring(" (") + doc_title + Glib::ustring(")");
+  }
   Glib::RefPtr<Gdk::Pixbuf> pixbuf = drawSymbol( symbol );
-
   if( pixbuf ) {
     Gtk::ListStore::iterator row = store->append();
     (*row)[columns->symbol_id]        = Glib::ustring( id );
@@ -1171,7 +1175,7 @@ void SymbolsDialog::addSymbol( SPObject* symbol, Glib::ustring doc_title) {
     (*row)[columns->symbol_doc_title] = Glib::Markup::escape_text(Glib::ustring( g_dpgettext2(NULL, "SymbolDoc", doc_title.c_str()) ));
     (*row)[columns->symbol_image]     = pixbuf;
   }
-
+  g_free(title);
   delete columns;
 }
 
@@ -1185,7 +1189,7 @@ void SymbolsDialog::addSymbol( SPObject* symbol, Glib::ustring doc_title) {
  * the temporary document is rendered.
  */
 Glib::RefPtr<Gdk::Pixbuf>
-SymbolsDialog::drawSymbol(SPObject *symbol, unsigned force_psize)
+SymbolsDialog::drawSymbol(SPObject *symbol)
 {
   // Create a copy repr of the symbol with id="the_symbol"
   Inkscape::XML::Document *xml_doc = preview_document->getReprDoc();
@@ -1263,11 +1267,6 @@ SymbolsDialog::drawSymbol(SPObject *symbol, unsigned force_psize)
     else
       scale = pow( 2.0, scale_factor/2.0 ) * psize / 32.0;
 
-    if (force_psize > 0) {
-      psize = force_psize;
-      scale = psize / ceil(std::max(width, height)); 
-    }
-     
     pixbuf = Glib::wrap(render_pixbuf(renderDrawing, scale, *dbox, psize));
   }
 
@@ -1299,41 +1298,18 @@ SPDocument* SymbolsDialog::symbolsPreviewDoc()
  * Update image widgets
  */
 Glib::RefPtr<Gdk::Pixbuf> 
-SymbolsDialog::getOverlay(Gtk::Image* image, gchar const * icon_title, unsigned psize)
+SymbolsDialog::getOverlay(gint width, gint height)
 {
-gchar const *buffer =
-"<svg xmlns=\"http://www.w3.org/2000/svg\""
-"     xmlns:sodipodi=\"http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd\""
-"     xmlns:inkscape=\"http://www.inkscape.org/namespaces/inkscape\""
-"     xmlns:xlink=\"http://www.w3.org/1999/xlink\">"
-"  <title>Inkscape</title> "
-"  <defs id=\"defs\">"
-"    <symbol"
-"       id=\"overlay\">"
-"      <title"
-"         id=\"overlay_title\">Overlay</title>"
-"      <desc"
-"         id=\"overlay_desc\">Overlay Square</desc>"
-"      <path"
-"         style=\"fill:#ffffff;opacity:0.75;stroke:none\""
-"         d=\"M 0,1 H 1 V 2 H 0 Z\""
-"         id=\"overlay_shape_1\" />"
-"    </symbol>"
-"  </defs>"
-"</svg>";
-  
-  SPDocument* doc = SPDocument::createNewDocFromMem( buffer, strlen(buffer), FALSE );
-  std::map<Glib::ustring, std::pair<Glib::ustring, SPSymbol*> > symbols_data = symbolsInDoc(doc, "Overlay Doc");
-  Glib::RefPtr<Gdk::Pixbuf> pixbuf(NULL);
-  for(auto data:symbols_data) {
-    Glib::ustring doc_title = data.second.first;
-    SPSymbol * symbol = data.second.second;
-    if (!strcmp(symbol->getId(), icon_title)) {
-      pixbuf = drawSymbol(symbol, psize);
-      return pixbuf;
-    }
-  }
-  return pixbuf;
+  cairo_surface_t *surface;
+  cairo_t *cr;
+  surface = cairo_image_surface_create (CAIRO_FORMAT_ARGB32, width, height);
+  cr = cairo_create (surface);
+  cairo_set_source_rgba(cr, 1, 1, 1, 0.75);
+  cairo_rectangle (cr, 0, 0, width, height);
+  cairo_fill (cr);
+  GdkPixbuf* pixbuf = ink_pixbuf_create_from_cairo_surface(surface);
+  cairo_destroy (cr);
+  return Glib::wrap(pixbuf);
 }
 
 void SymbolsDialog::setTargetDesktop(SPDesktop *desktop)
diff --git a/src/ui/dialog/symbols.h b/src/ui/dialog/symbols.h
index f387dde51..6e49939af 100644
--- a/src/ui/dialog/symbols.h
+++ b/src/ui/dialog/symbols.h
@@ -102,8 +102,8 @@ private:
     void enableWidgets(bool enable);
     Glib::ustring ellipsize(Glib::ustring data, size_t limit);
     gchar const* styleFromUse( gchar const* id, SPDocument* document);
-    Glib::RefPtr<Gdk::Pixbuf> drawSymbol(SPObject *symbol, unsigned force_psize = 0);
-    Glib::RefPtr<Gdk::Pixbuf> getOverlay(Gtk::Image* image, gchar const * icon_title, unsigned psize);
+    Glib::RefPtr<Gdk::Pixbuf> drawSymbol(SPObject *symbol);
+    Glib::RefPtr<Gdk::Pixbuf> getOverlay(gint width, gint height);
     /* Keep track of all symbol template documents */
     std::map<Glib::ustring, SPDocument*> symbol_sets;
     std::map<Glib::ustring, std::pair<Glib::ustring, SPSymbol*> > l;
@@ -112,6 +112,7 @@ private:
     // Scale factor
     int scale_factor;
     bool sensitive;
+    double previous_height;
     bool all_docs_processed;
     size_t number_docs;
     size_t number_symbols;
diff --git a/src/ui/widget/dock-item.cpp b/src/ui/widget/dock-item.cpp
index 18ab70eb4..4a06163e1 100644
--- a/src/ui/widget/dock-item.cpp
+++ b/src/ui/widget/dock-item.cpp
@@ -45,7 +45,12 @@ DockItem::DockItem(Dock& dock, const Glib::ustring& name, const Glib::ustring& l
         int width = 0;
         int height = 0;
         Gtk::IconSize::lookup(Gtk::ICON_SIZE_MENU, width, height);
-        _icon_pixbuf = iconTheme->load_icon(icon_name, width);
+        try {
+            _icon_pixbuf = iconTheme->load_icon(icon_name, width);
+        }
+        catch (const Gtk::IconThemeError& e) {
+            std::cerr << "DocItem::DocItem(): " << e.what() << std::endl;
+        }
     }
 
     if ( _icon_pixbuf ) {
diff --git a/src/ui/widget/imagetoggler.cpp b/src/ui/widget/imagetoggler.cpp
index a2783ecb1..38c84ca51 100644
--- a/src/ui/widget/imagetoggler.cpp
+++ b/src/ui/widget/imagetoggler.cpp
@@ -16,6 +16,8 @@
 #include "widgets/toolbox.h"
 #include "ui/icon-names.h"
 
+#include <iostream>
+
 namespace Inkscape {
 namespace UI {
 namespace Widget {
@@ -37,8 +39,13 @@ ImageToggler::ImageToggler( char const* on, char const* off) :
     int phys = width;
 
     Glib::RefPtr<Gtk::IconTheme> icon_theme = Gtk::IconTheme::get_default();
-    _property_pixbuf_on  = icon_theme->load_icon(_pixOnName,  phys, (Gtk::IconLookupFlags)0);
-    _property_pixbuf_off = icon_theme->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0);
+    try {
+        _property_pixbuf_on  = icon_theme->load_icon(_pixOnName,  phys, (Gtk::IconLookupFlags)0);
+        _property_pixbuf_off = icon_theme->load_icon(_pixOffName, phys, (Gtk::IconLookupFlags)0);
+    }
+    catch (const Gtk::IconThemeError& e) {
+        std::cerr << "ImageToggler::ImageToggler(): " << e.what() << std::endl;
+    }
 
     property_pixbuf() = _property_pixbuf_off.get_value();
 }
diff --git a/src/ui/widget/page-sizer.cpp b/src/ui/widget/page-sizer.cpp
index 06d54b682..7a3909975 100644
--- a/src/ui/widget/page-sizer.cpp
+++ b/src/ui/widget/page-sizer.cpp
@@ -219,7 +219,8 @@ PageSizer::PageSizer(Registry & _wr)
       _dimensionUnits( _("U_nits:"), "units", _wr ),
       _dimensionWidth( _("_Width:"), _("Width of paper"), "width", _dimensionUnits, _wr ),
       _dimensionHeight( _("_Height:"), _("Height of paper"), "height", _dimensionUnits, _wr ),
-      _marginLock( _("L_ock"), _("Lock margins"), "lock-margins", _wr ),
+      _marginLock( _("Loc_k margins"), _("Lock margins"), "lock-margins", _wr, false, NULL, NULL),
+      _lock_icon(),
       _marginTop( _("T_op margin:"), _("Top margin"), "fit-margin-top", _wr ),
       _marginLeft( _("L_eft:"), _("Left margin"), "fit-margin-left", _wr),
       _marginRight( _("Ri_ght:"), _("Right margin"), "fit-margin-right", _wr),
@@ -249,7 +250,6 @@ PageSizer::PageSizer(Registry & _wr)
     _viewboxY.setDigits(2);
     _viewboxW.setDigits(2);
     _viewboxH.setDigits(2);
-
     _dimensionWidth.setRange( 0.00001, 10000000 );
     _dimensionHeight.setRange( 0.00001, 10000000 );
     _scaleX.setRange( 0.00001, 100000 );
@@ -370,7 +370,6 @@ PageSizer::PageSizer(Registry & _wr)
     
     //## Set up margin settings
     _marginTable.set_border_width(4);
-
     _marginTable.set_row_spacing(4);
     _marginTable.set_column_spacing(4);
 
@@ -384,10 +383,19 @@ PageSizer::PageSizer(Registry & _wr)
     _marginLeft.set_hexpand();
     _marginLeft.set_vexpand();
     _marginTable.attach(_marginLeft,    0, 1, 1, 1);
-    
+
+    _marginLock.set_active(false);
     _marginLock.set_halign(Gtk::ALIGN_CENTER);
     _marginLock.set_hexpand();
     _marginLock.set_vexpand();
+
+    //_lock_icon = new Gtk::Image();
+    _lock_icon.set_halign(Gtk::ALIGN_CENTER);
+    _lock_icon.set_valign(Gtk::ALIGN_START);
+    _lock_icon.set_from_icon_name("object-unlocked", Gtk::ICON_SIZE_LARGE_TOOLBAR);
+    _lock_icon.show();    
+    _marginLock.add(_lock_icon);
+
     _marginTable.attach(_marginLock,    1, 1, 1, 1);
     
     _marginRight.set_halign(Gtk::ALIGN_CENTER);
@@ -481,6 +489,7 @@ PageSizer::init ()
     _changedvy_connection = _viewboxY.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_viewbox_changed));
     _changedvw_connection = _viewboxW.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_viewbox_changed));
     _changedvh_connection = _viewboxH.signal_value_changed().connect (sigc::mem_fun (*this, &PageSizer::on_viewbox_changed));
+    _changedlk_connection = _marginLock.signal_toggled().connect (sigc::mem_fun (*this, &PageSizer::on_margin_lock_changed));
     _changedmt_connection = _marginTop.signal_value_changed().connect (sigc::bind<RegisteredScalar*>(sigc::mem_fun (*this, &PageSizer::on_margin_changed), &_marginTop));
     _changedmb_connection = _marginBottom.signal_value_changed().connect (sigc::bind<RegisteredScalar*>(sigc::mem_fun (*this, &PageSizer::on_margin_changed), &_marginBottom));
     _changedml_connection = _marginLeft.signal_value_changed().connect (sigc::bind<RegisteredScalar*>(sigc::mem_fun (*this, &PageSizer::on_margin_changed), &_marginLeft));
@@ -903,21 +912,45 @@ PageSizer::on_viewbox_changed()
     }
 }
 
-/**
- * Callback for viewbox widgets
- */
+void
+PageSizer::on_margin_lock_changed()
+{
+    if (_marginLock.get_active()) {
+        _lock_icon.set_from_icon_name("object-locked", Gtk::ICON_SIZE_LARGE_TOOLBAR);
+        double left   = _marginLeft.getValue();
+        double right  = _marginRight.getValue();
+        double top    = _marginTop.getValue();
+        double bottom = _marginBottom.getValue();
+        if (Geom::are_near(left,right)) {
+            if (Geom::are_near(left, top)) {
+                on_margin_changed(&_marginBottom);
+            } else {
+                on_margin_changed(&_marginTop);
+            }
+        } else {
+            if (Geom::are_near(left, top)) {
+                on_margin_changed(&_marginRight);
+            } else {
+                on_margin_changed(&_marginLeft);
+            }
+        }
+    } else {
+        _lock_icon.set_from_icon_name("object-unlocked", Gtk::ICON_SIZE_LARGE_TOOLBAR);
+    }
+}
+
 void
 PageSizer::on_margin_changed(RegisteredScalar* widg)
 {
     double value = widg->getValue(); 
     if (_widgetRegistry->isUpdating()) return;
-    if (_marginLock.get_active() && !_marginLocked) {
-        _marginLocked = true;
+    if (_marginLock.get_active() && !_lockMarginUpdate) {
+        _lockMarginUpdate = true;
         _marginLeft.setValue(value);
         _marginRight.setValue(value);
         _marginTop.setValue(value);
         _marginBottom.setValue(value);
-        _marginLocked = false;
+        _lockMarginUpdate = false;
     }
 }
 
diff --git a/src/ui/widget/page-sizer.h b/src/ui/widget/page-sizer.h
index 7cf8bacfd..29cd204b9 100644
--- a/src/ui/widget/page-sizer.h
+++ b/src/ui/widget/page-sizer.h
@@ -166,6 +166,9 @@ public:
      * Updates the margin widgets. If lock widget is active
      */
     void on_margin_changed(RegisteredScalar* widg);
+    
+    void on_margin_lock_changed();
+    
     /**
      * Updates the scale widgets. (Just changes the values of the ui widgets.)
      */
@@ -229,15 +232,15 @@ protected:
     //### Fit Page options
     Gtk::Expander        _fitPageMarginExpander;
 
-    Gtk::Grid             _marginTable;
-    RegisteredCheckButton _marginLock;
-    RegisteredScalar      _marginTop;
-    RegisteredScalar      _marginLeft;
-    RegisteredScalar      _marginRight;
-    RegisteredScalar      _marginBottom;
-    Gtk::Button           _fitPageButton;
-    bool                  _lockMarginUpdate;
-    bool                  _marginLocked;
+    Gtk::Grid              _marginTable;
+    RegisteredToggleButton _marginLock;
+    Gtk::Image             _lock_icon;
+    RegisteredScalar       _marginTop;
+    RegisteredScalar       _marginLeft;
+    RegisteredScalar       _marginRight;
+    RegisteredScalar       _marginBottom;
+    Gtk::Button            _fitPageButton;
+    bool                   _lockMarginUpdate;
 
     // Document scale
     Gtk::Frame           _scaleFrame;
@@ -271,6 +274,7 @@ protected:
     sigc::connection    _changedvy_connection;
     sigc::connection    _changedvw_connection;
     sigc::connection    _changedvh_connection;
+    sigc::connection    _changedlk_connection;
     sigc::connection    _changedmt_connection;
     sigc::connection    _changedmb_connection;
     sigc::connection    _changedml_connection;