Move pixmaps to ui/pixmaps, and update the README accordingly.

77 files changed, 53 insertions, 57 deletions

diff --git a/src/desktop-events.cpp b/src/desktop-events.cpp
index 6f79f33e3..6af5a6210 100644
--- a/src/desktop-events.cpp
+++ b/src/desktop-events.cpp
@@ -51,7 +51,7 @@
 
 #include "helper/action.h"
 
-#include "pixmaps/cursor-select.xpm"
+#include "ui/pixmaps/cursor-select.xpm"
 
 #include "object/sp-guide.h"
 #include "object/sp-namedview.h"
diff --git a/src/pixmaps/README b/src/ui/pixmaps/README
index 5495fa268..0b78941bd 100644
--- a/src/pixmaps/README
+++ b/src/ui/pixmaps/README
@@ -1,6 +1,2 @@
 
 This directory contains cursor xpm's and handles for resizing/skewing/rotating.
-
-To do:
-
-* Move to 'ui'.
diff --git a/src/pixmaps/cursor-3dbox.xpm b/src/ui/pixmaps/cursor-3dbox.xpm
index c7fcb9248..c7fcb9248 100644
--- a/src/pixmaps/cursor-3dbox.xpm
+++ b/src/ui/pixmaps/cursor-3dbox.xpm
diff --git a/src/pixmaps/cursor-adj-a.xpm b/src/ui/pixmaps/cursor-adj-a.xpm
index 7af3d9c12..7af3d9c12 100644
--- a/src/pixmaps/cursor-adj-a.xpm
+++ b/src/ui/pixmaps/cursor-adj-a.xpm
diff --git a/src/pixmaps/cursor-adj-h.xpm b/src/ui/pixmaps/cursor-adj-h.xpm
index 5861934d3..5861934d3 100644
--- a/src/pixmaps/cursor-adj-h.xpm
+++ b/src/ui/pixmaps/cursor-adj-h.xpm
diff --git a/src/pixmaps/cursor-adj-l.xpm b/src/ui/pixmaps/cursor-adj-l.xpm
index 817ce449e..817ce449e 100644
--- a/src/pixmaps/cursor-adj-l.xpm
+++ b/src/ui/pixmaps/cursor-adj-l.xpm
diff --git a/src/pixmaps/cursor-adj-s.xpm b/src/ui/pixmaps/cursor-adj-s.xpm
index 351a5702d..351a5702d 100644
--- a/src/pixmaps/cursor-adj-s.xpm
+++ b/src/ui/pixmaps/cursor-adj-s.xpm
diff --git a/src/pixmaps/cursor-calligraphy.xpm b/src/ui/pixmaps/cursor-calligraphy.xpm
index 193bd6196..193bd6196 100644
--- a/src/pixmaps/cursor-calligraphy.xpm
+++ b/src/ui/pixmaps/cursor-calligraphy.xpm
diff --git a/src/pixmaps/cursor-connector.xpm b/src/ui/pixmaps/cursor-connector.xpm
index 86e8d1753..86e8d1753 100644
--- a/src/pixmaps/cursor-connector.xpm
+++ b/src/ui/pixmaps/cursor-connector.xpm
diff --git a/src/pixmaps/cursor-crosshairs.xpm b/src/ui/pixmaps/cursor-crosshairs.xpm
index 407b76048..407b76048 100644
--- a/src/pixmaps/cursor-crosshairs.xpm
+++ b/src/ui/pixmaps/cursor-crosshairs.xpm
diff --git a/src/pixmaps/cursor-dropper-f.xpm b/src/ui/pixmaps/cursor-dropper-f.xpm
index 2804f6614..2804f6614 100644
--- a/src/pixmaps/cursor-dropper-f.xpm
+++ b/src/ui/pixmaps/cursor-dropper-f.xpm
diff --git a/src/pixmaps/cursor-dropper-s.xpm b/src/ui/pixmaps/cursor-dropper-s.xpm
index c7cb9cc7e..c7cb9cc7e 100644
--- a/src/pixmaps/cursor-dropper-s.xpm
+++ b/src/ui/pixmaps/cursor-dropper-s.xpm
diff --git a/src/pixmaps/cursor-dropping-f.xpm b/src/ui/pixmaps/cursor-dropping-f.xpm
index 8490ba795..8490ba795 100644
--- a/src/pixmaps/cursor-dropping-f.xpm
+++ b/src/ui/pixmaps/cursor-dropping-f.xpm
diff --git a/src/pixmaps/cursor-dropping-s.xpm b/src/ui/pixmaps/cursor-dropping-s.xpm
index 3cc896531..3cc896531 100644
--- a/src/pixmaps/cursor-dropping-s.xpm
+++ b/src/ui/pixmaps/cursor-dropping-s.xpm
diff --git a/src/pixmaps/cursor-ellipse.xpm b/src/ui/pixmaps/cursor-ellipse.xpm
index 83a820f49..83a820f49 100644
--- a/src/pixmaps/cursor-ellipse.xpm
+++ b/src/ui/pixmaps/cursor-ellipse.xpm
diff --git a/src/pixmaps/cursor-eraser.xpm b/src/ui/pixmaps/cursor-eraser.xpm
index b3f8f2d84..b3f8f2d84 100644
--- a/src/pixmaps/cursor-eraser.xpm
+++ b/src/ui/pixmaps/cursor-eraser.xpm
diff --git a/src/pixmaps/cursor-gradient-add.xpm b/src/ui/pixmaps/cursor-gradient-add.xpm
index ea8341bb2..ea8341bb2 100644
--- a/src/pixmaps/cursor-gradient-add.xpm
+++ b/src/ui/pixmaps/cursor-gradient-add.xpm
diff --git a/src/pixmaps/cursor-gradient.xpm b/src/ui/pixmaps/cursor-gradient.xpm
index 92c9a9a15..92c9a9a15 100644
--- a/src/pixmaps/cursor-gradient.xpm
+++ b/src/ui/pixmaps/cursor-gradient.xpm
diff --git a/src/pixmaps/cursor-measure.xpm b/src/ui/pixmaps/cursor-measure.xpm
index 9f6497c65..9f6497c65 100644
--- a/src/pixmaps/cursor-measure.xpm
+++ b/src/ui/pixmaps/cursor-measure.xpm
diff --git a/src/pixmaps/cursor-node-d.xpm b/src/ui/pixmaps/cursor-node-d.xpm
index e28bc73d3..e28bc73d3 100644
--- a/src/pixmaps/cursor-node-d.xpm
+++ b/src/ui/pixmaps/cursor-node-d.xpm
diff --git a/src/pixmaps/cursor-node.xpm b/src/ui/pixmaps/cursor-node.xpm
index 4d3bd9407..4d3bd9407 100644
--- a/src/pixmaps/cursor-node.xpm
+++ b/src/ui/pixmaps/cursor-node.xpm
diff --git a/src/pixmaps/cursor-paintbucket.xpm b/src/ui/pixmaps/cursor-paintbucket.xpm
index 0c6767f75..0c6767f75 100644
--- a/src/pixmaps/cursor-paintbucket.xpm
+++ b/src/ui/pixmaps/cursor-paintbucket.xpm
diff --git a/src/pixmaps/cursor-pen.xpm b/src/ui/pixmaps/cursor-pen.xpm
index 79b68e9ba..79b68e9ba 100644
--- a/src/pixmaps/cursor-pen.xpm
+++ b/src/ui/pixmaps/cursor-pen.xpm
diff --git a/src/pixmaps/cursor-pencil.xpm b/src/ui/pixmaps/cursor-pencil.xpm
index 92c6331ab..92c6331ab 100644
--- a/src/pixmaps/cursor-pencil.xpm
+++ b/src/ui/pixmaps/cursor-pencil.xpm
diff --git a/src/pixmaps/cursor-rect.xpm b/src/ui/pixmaps/cursor-rect.xpm
index e54b7ce4f..e54b7ce4f 100644
--- a/src/pixmaps/cursor-rect.xpm
+++ b/src/ui/pixmaps/cursor-rect.xpm
diff --git a/src/pixmaps/cursor-select-d.xpm b/src/ui/pixmaps/cursor-select-d.xpm
index e84e4de9f..e84e4de9f 100644
--- a/src/pixmaps/cursor-select-d.xpm
+++ b/src/ui/pixmaps/cursor-select-d.xpm
diff --git a/src/pixmaps/cursor-select-m.xpm b/src/ui/pixmaps/cursor-select-m.xpm
index 8dd8fb076..8dd8fb076 100644
--- a/src/pixmaps/cursor-select-m.xpm
+++ b/src/ui/pixmaps/cursor-select-m.xpm
diff --git a/src/pixmaps/cursor-select.xpm b/src/ui/pixmaps/cursor-select.xpm
index 36b40c6c5..36b40c6c5 100644
--- a/src/pixmaps/cursor-select.xpm
+++ b/src/ui/pixmaps/cursor-select.xpm
diff --git a/src/pixmaps/cursor-spiral.xpm b/src/ui/pixmaps/cursor-spiral.xpm
index 1eaef1e8c..1eaef1e8c 100644
--- a/src/pixmaps/cursor-spiral.xpm
+++ b/src/ui/pixmaps/cursor-spiral.xpm
diff --git a/src/pixmaps/cursor-spray-move.xpm b/src/ui/pixmaps/cursor-spray-move.xpm
index 0c918392a..0c918392a 100644
--- a/src/pixmaps/cursor-spray-move.xpm
+++ b/src/ui/pixmaps/cursor-spray-move.xpm
diff --git a/src/pixmaps/cursor-spray.xpm b/src/ui/pixmaps/cursor-spray.xpm
index 19a40997c..19a40997c 100644
--- a/src/pixmaps/cursor-spray.xpm
+++ b/src/ui/pixmaps/cursor-spray.xpm
diff --git a/src/pixmaps/cursor-star.xpm b/src/ui/pixmaps/cursor-star.xpm
index c9f2e85e7..c9f2e85e7 100644
--- a/src/pixmaps/cursor-star.xpm
+++ b/src/ui/pixmaps/cursor-star.xpm
diff --git a/src/pixmaps/cursor-text-insert.xpm b/src/ui/pixmaps/cursor-text-insert.xpm
index 488791e2e..488791e2e 100644
--- a/src/pixmaps/cursor-text-insert.xpm
+++ b/src/ui/pixmaps/cursor-text-insert.xpm
diff --git a/src/pixmaps/cursor-text.xpm b/src/ui/pixmaps/cursor-text.xpm
index 6d74ae305..6d74ae305 100644
--- a/src/pixmaps/cursor-text.xpm
+++ b/src/ui/pixmaps/cursor-text.xpm
diff --git a/src/pixmaps/cursor-tweak-attract.xpm b/src/ui/pixmaps/cursor-tweak-attract.xpm
index 264360b2e..264360b2e 100644
--- a/src/pixmaps/cursor-tweak-attract.xpm
+++ b/src/ui/pixmaps/cursor-tweak-attract.xpm
diff --git a/src/pixmaps/cursor-tweak-color.xpm b/src/ui/pixmaps/cursor-tweak-color.xpm
index 4bce642d6..4bce642d6 100644
--- a/src/pixmaps/cursor-tweak-color.xpm
+++ b/src/ui/pixmaps/cursor-tweak-color.xpm
diff --git a/src/pixmaps/cursor-tweak-less.xpm b/src/ui/pixmaps/cursor-tweak-less.xpm
index c669bca77..c669bca77 100644
--- a/src/pixmaps/cursor-tweak-less.xpm
+++ b/src/ui/pixmaps/cursor-tweak-less.xpm
diff --git a/src/pixmaps/cursor-tweak-more.xpm b/src/ui/pixmaps/cursor-tweak-more.xpm
index 6321ce940..6321ce940 100644
--- a/src/pixmaps/cursor-tweak-more.xpm
+++ b/src/ui/pixmaps/cursor-tweak-more.xpm
diff --git a/src/pixmaps/cursor-tweak-move-in.xpm b/src/ui/pixmaps/cursor-tweak-move-in.xpm
index d80fa03c6..d80fa03c6 100644
--- a/src/pixmaps/cursor-tweak-move-in.xpm
+++ b/src/ui/pixmaps/cursor-tweak-move-in.xpm
diff --git a/src/pixmaps/cursor-tweak-move-jitter.xpm b/src/ui/pixmaps/cursor-tweak-move-jitter.xpm
index 7f0f8114d..7f0f8114d 100644
--- a/src/pixmaps/cursor-tweak-move-jitter.xpm
+++ b/src/ui/pixmaps/cursor-tweak-move-jitter.xpm
diff --git a/src/pixmaps/cursor-tweak-move-out.xpm b/src/ui/pixmaps/cursor-tweak-move-out.xpm
index 1fa0293bb..1fa0293bb 100644
--- a/src/pixmaps/cursor-tweak-move-out.xpm
+++ b/src/ui/pixmaps/cursor-tweak-move-out.xpm
diff --git a/src/pixmaps/cursor-tweak-move.xpm b/src/ui/pixmaps/cursor-tweak-move.xpm
index 67b10980b..67b10980b 100644
--- a/src/pixmaps/cursor-tweak-move.xpm
+++ b/src/ui/pixmaps/cursor-tweak-move.xpm
diff --git a/src/pixmaps/cursor-tweak-push.xpm b/src/ui/pixmaps/cursor-tweak-push.xpm
index bf331e58d..bf331e58d 100644
--- a/src/pixmaps/cursor-tweak-push.xpm
+++ b/src/ui/pixmaps/cursor-tweak-push.xpm
diff --git a/src/pixmaps/cursor-tweak-repel.xpm b/src/ui/pixmaps/cursor-tweak-repel.xpm
index 5dccefdb8..5dccefdb8 100644
--- a/src/pixmaps/cursor-tweak-repel.xpm
+++ b/src/ui/pixmaps/cursor-tweak-repel.xpm
diff --git a/src/pixmaps/cursor-tweak-rotate-clockwise.xpm b/src/ui/pixmaps/cursor-tweak-rotate-clockwise.xpm
index ecbbde820..ecbbde820 100644
--- a/src/pixmaps/cursor-tweak-rotate-clockwise.xpm
+++ b/src/ui/pixmaps/cursor-tweak-rotate-clockwise.xpm
diff --git a/src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm b/src/ui/pixmaps/cursor-tweak-rotate-counterclockwise.xpm
index a3c220842..a3c220842 100644
--- a/src/pixmaps/cursor-tweak-rotate-counterclockwise.xpm
+++ b/src/ui/pixmaps/cursor-tweak-rotate-counterclockwise.xpm
diff --git a/src/pixmaps/cursor-tweak-roughen.xpm b/src/ui/pixmaps/cursor-tweak-roughen.xpm
index 1581b95fa..1581b95fa 100644
--- a/src/pixmaps/cursor-tweak-roughen.xpm
+++ b/src/ui/pixmaps/cursor-tweak-roughen.xpm
diff --git a/src/pixmaps/cursor-tweak-scale-down.xpm b/src/ui/pixmaps/cursor-tweak-scale-down.xpm
index b1b15af17..b1b15af17 100644
--- a/src/pixmaps/cursor-tweak-scale-down.xpm
+++ b/src/ui/pixmaps/cursor-tweak-scale-down.xpm
diff --git a/src/pixmaps/cursor-tweak-scale-up.xpm b/src/ui/pixmaps/cursor-tweak-scale-up.xpm
index dcc73c122..dcc73c122 100644
--- a/src/pixmaps/cursor-tweak-scale-up.xpm
+++ b/src/ui/pixmaps/cursor-tweak-scale-up.xpm
diff --git a/src/pixmaps/cursor-tweak-thicken.xpm b/src/ui/pixmaps/cursor-tweak-thicken.xpm
index ba7a2dfb8..ba7a2dfb8 100644
--- a/src/pixmaps/cursor-tweak-thicken.xpm
+++ b/src/ui/pixmaps/cursor-tweak-thicken.xpm
diff --git a/src/pixmaps/cursor-tweak-thin.xpm b/src/ui/pixmaps/cursor-tweak-thin.xpm
index 7d10fe7e9..7d10fe7e9 100644
--- a/src/pixmaps/cursor-tweak-thin.xpm
+++ b/src/ui/pixmaps/cursor-tweak-thin.xpm
diff --git a/src/pixmaps/cursor-zoom-out.xpm b/src/ui/pixmaps/cursor-zoom-out.xpm
index 8f35ad049..8f35ad049 100644
--- a/src/pixmaps/cursor-zoom-out.xpm
+++ b/src/ui/pixmaps/cursor-zoom-out.xpm
diff --git a/src/pixmaps/cursor-zoom.xpm b/src/ui/pixmaps/cursor-zoom.xpm
index e869239d6..e869239d6 100644
--- a/src/pixmaps/cursor-zoom.xpm
+++ b/src/ui/pixmaps/cursor-zoom.xpm
diff --git a/src/pixmaps/handles.xpm b/src/ui/pixmaps/handles.xpm
index b61ad377c..b61ad377c 100644
--- a/src/pixmaps/handles.xpm
+++ b/src/ui/pixmaps/handles.xpm
diff --git a/src/ui/tools/arc-tool.cpp b/src/ui/tools/arc-tool.cpp
index e0378ff03..dc3f0db0f 100644
--- a/src/ui/tools/arc-tool.cpp
+++ b/src/ui/tools/arc-tool.cpp
@@ -40,7 +40,7 @@
 #include "object/sp-ellipse.h"
 #include "object/sp-namedview.h"
 
-#include "pixmaps/cursor-ellipse.xpm"
+#include "ui/pixmaps/cursor-ellipse.xpm"
 
 #include "ui/tools/arc-tool.h"
 #include "ui/shape-editor.h"
diff --git a/src/ui/tools/box3d-tool.cpp b/src/ui/tools/box3d-tool.cpp
index f643fc356..d7ec50360 100644
--- a/src/ui/tools/box3d-tool.cpp
+++ b/src/ui/tools/box3d-tool.cpp
@@ -35,7 +35,7 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas.h"
 
-#include "pixmaps/cursor-3dbox.xpm"
+#include "ui/pixmaps/cursor-3dbox.xpm"
 
 #include "object/box3d-side.h"
 #include "object/box3d.h"
diff --git a/src/ui/tools/calligraphic-tool.cpp b/src/ui/tools/calligraphic-tool.cpp
index 5cd2514ba..50c5f413a 100644
--- a/src/ui/tools/calligraphic-tool.cpp
+++ b/src/ui/tools/calligraphic-tool.cpp
@@ -58,7 +58,7 @@
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
 
-#include "pixmaps/cursor-calligraphy.xpm"
+#include "ui/pixmaps/cursor-calligraphy.xpm"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/connector-tool.cpp b/src/ui/tools/connector-tool.cpp
index 09f18e630..d41e1b3eb 100644
--- a/src/ui/tools/connector-tool.cpp
+++ b/src/ui/tools/connector-tool.cpp
@@ -97,7 +97,7 @@
 #include "object/sp-path.h"
 #include "object/sp-text.h"
 
-#include "pixmaps/cursor-connector.xpm"
+#include "ui/pixmaps/cursor-connector.xpm"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/dropper-tool.cpp b/src/ui/tools/dropper-tool.cpp
index d11ed1d83..c0be19479 100644
--- a/src/ui/tools/dropper-tool.cpp
+++ b/src/ui/tools/dropper-tool.cpp
@@ -40,10 +40,10 @@
 
 #include "object/sp-namedview.h"
 
-#include "pixmaps/cursor-dropper-f.xpm"
-#include "pixmaps/cursor-dropper-s.xpm"
-#include "pixmaps/cursor-dropping-f.xpm"
-#include "pixmaps/cursor-dropping-s.xpm"
+#include "ui/pixmaps/cursor-dropper-f.xpm"
+#include "ui/pixmaps/cursor-dropper-s.xpm"
+#include "ui/pixmaps/cursor-dropping-f.xpm"
+#include "ui/pixmaps/cursor-dropping-s.xpm"
 
 #include "svg/svg-color.h"
 
diff --git a/src/ui/tools/eraser-tool.cpp b/src/ui/tools/eraser-tool.cpp
index 60d572e16..c0742f9df 100644
--- a/src/ui/tools/eraser-tool.cpp
+++ b/src/ui/tools/eraser-tool.cpp
@@ -67,7 +67,7 @@
 #include "object/sp-use.h"
 #include "style.h"
 
-#include "pixmaps/cursor-eraser.xpm"
+#include "ui/pixmaps/cursor-eraser.xpm"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/flood-tool.cpp b/src/ui/tools/flood-tool.cpp
index bfd7f60dd..1d1930a4e 100644
--- a/src/ui/tools/flood-tool.cpp
+++ b/src/ui/tools/flood-tool.cpp
@@ -58,7 +58,7 @@
 #include "object/sp-path.h"
 #include "object/sp-root.h"
 
-#include "pixmaps/cursor-paintbucket.xpm"
+#include "ui/pixmaps/cursor-paintbucket.xpm"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/gradient-tool.cpp b/src/ui/tools/gradient-tool.cpp
index a443716d7..c00d0324e 100644
--- a/src/ui/tools/gradient-tool.cpp
+++ b/src/ui/tools/gradient-tool.cpp
@@ -38,8 +38,8 @@
 
 #include "display/sp-ctrlline.h"
 
-#include "pixmaps/cursor-gradient-add.xpm"
-#include "pixmaps/cursor-gradient.xpm"
+#include "ui/pixmaps/cursor-gradient-add.xpm"
+#include "ui/pixmaps/cursor-gradient.xpm"
 
 #include "svg/css-ostringstream.h"
 
diff --git a/src/ui/tools/lpe-tool.cpp b/src/ui/tools/lpe-tool.cpp
index c523b7bde..dae62d4f9 100644
--- a/src/ui/tools/lpe-tool.cpp
+++ b/src/ui/tools/lpe-tool.cpp
@@ -35,7 +35,7 @@
 
 #include "object/sp-path.h"
 
-#include "pixmaps/cursor-crosshairs.xpm"
+#include "ui/pixmaps/cursor-crosshairs.xpm"
 
 #include "util/units.h"
 
diff --git a/src/ui/tools/measure-tool.cpp b/src/ui/tools/measure-tool.cpp
index 2048dce23..a305fa350 100644
--- a/src/ui/tools/measure-tool.cpp
+++ b/src/ui/tools/measure-tool.cpp
@@ -45,7 +45,7 @@
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
 
-#include "pixmaps/cursor-measure.xpm"
+#include "ui/pixmaps/cursor-measure.xpm"
 
 #include "svg/stringstream.h"
 #include "svg/svg-color.h"
diff --git a/src/ui/tools/mesh-tool.cpp b/src/ui/tools/mesh-tool.cpp
index 93b94d750..251de33b3 100644
--- a/src/ui/tools/mesh-tool.cpp
+++ b/src/ui/tools/mesh-tool.cpp
@@ -48,8 +48,8 @@
 #include "object/sp-text.h"
 #include "style.h"
 
-#include "pixmaps/cursor-gradient.xpm"
-#include "pixmaps/cursor-gradient-add.xpm"
+#include "ui/pixmaps/cursor-gradient.xpm"
+#include "ui/pixmaps/cursor-gradient-add.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/tools/mesh-tool.h"
diff --git a/src/ui/tools/node-tool.cpp b/src/ui/tools/node-tool.cpp
index 3ec40d086..516839315 100644
--- a/src/ui/tools/node-tool.cpp
+++ b/src/ui/tools/node-tool.cpp
@@ -38,8 +38,8 @@
 #include "object/sp-shape.h"
 #include "object/sp-text.h"
 
-#include "pixmaps/cursor-node-d.xpm"
-#include "pixmaps/cursor-node.xpm"
+#include "ui/pixmaps/cursor-node-d.xpm"
+#include "ui/pixmaps/cursor-node.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/shape-editor.h" // temporary!
diff --git a/src/ui/tools/pen-tool.cpp b/src/ui/tools/pen-tool.cpp
index e7301152f..9ea403b09 100644
--- a/src/ui/tools/pen-tool.cpp
+++ b/src/ui/tools/pen-tool.cpp
@@ -42,7 +42,7 @@
 
 #include "object/sp-path.h"
 
-#include "pixmaps/cursor-pen.xpm"
+#include "ui/pixmaps/cursor-pen.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/draw-anchor.h"
diff --git a/src/ui/tools/pencil-tool.cpp b/src/ui/tools/pencil-tool.cpp
index f0d6639ab..b5257cecb 100644
--- a/src/ui/tools/pencil-tool.cpp
+++ b/src/ui/tools/pencil-tool.cpp
@@ -46,7 +46,7 @@
 #include "object/sp-path.h"
 #include "style.h"
 
-#include "pixmaps/cursor-pencil.xpm"
+#include "ui/pixmaps/cursor-pencil.xpm"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/rect-tool.cpp b/src/ui/tools/rect-tool.cpp
index cedf43962..7d2f78401 100644
--- a/src/ui/tools/rect-tool.cpp
+++ b/src/ui/tools/rect-tool.cpp
@@ -37,7 +37,7 @@
 #include "object/sp-rect.h"
 #include "object/sp-namedview.h"
 
-#include "pixmaps/cursor-rect.xpm"
+#include "ui/pixmaps/cursor-rect.xpm"
 
 #include "ui/shape-editor.h"
 #include "ui/tools/rect-tool.h"
diff --git a/src/ui/tools/select-tool.cpp b/src/ui/tools/select-tool.cpp
index 90451e662..835bb6f94 100644
--- a/src/ui/tools/select-tool.cpp
+++ b/src/ui/tools/select-tool.cpp
@@ -44,9 +44,9 @@
 #include "object/box3d.h"
 #include "style.h"
 
-#include "pixmaps/cursor-select-d.xpm"
-#include "pixmaps/cursor-select-m.xpm"
-#include "pixmaps/handles.xpm"
+#include "ui/pixmaps/cursor-select-d.xpm"
+#include "ui/pixmaps/cursor-select-m.xpm"
+#include "ui/pixmaps/handles.xpm"
 
 #include "ui/tools-switch.h"
 #include "ui/tools/select-tool.h"
diff --git a/src/ui/tools/spiral-tool.cpp b/src/ui/tools/spiral-tool.cpp
index 4b7743678..6add09442 100644
--- a/src/ui/tools/spiral-tool.cpp
+++ b/src/ui/tools/spiral-tool.cpp
@@ -27,7 +27,7 @@
 #include "document.h"
 #include "macros.h"
 #include "message-context.h"
-#include "pixmaps/cursor-spiral.xpm"
+#include "ui/pixmaps/cursor-spiral.xpm"
 #include "selection.h"
 #include "verbs.h"
 
diff --git a/src/ui/tools/spray-tool.cpp b/src/ui/tools/spray-tool.cpp
index f8a70a7d0..cf677ff0c 100644
--- a/src/ui/tools/spray-tool.cpp
+++ b/src/ui/tools/spray-tool.cpp
@@ -55,7 +55,7 @@
 #include "object/box3d.h"
 #include "object/sp-item-transform.h"
 
-#include "pixmaps/cursor-spray.xpm"
+#include "ui/pixmaps/cursor-spray.xpm"
 
 #include "svg/svg.h"
 #include "svg/svg-color.h"
diff --git a/src/ui/tools/star-tool.cpp b/src/ui/tools/star-tool.cpp
index 5c0111012..aa8fe48cd 100644
--- a/src/ui/tools/star-tool.cpp
+++ b/src/ui/tools/star-tool.cpp
@@ -40,7 +40,7 @@
 #include "object/sp-namedview.h"
 #include "object/sp-star.h"
 
-#include "pixmaps/cursor-star.xpm"
+#include "ui/pixmaps/cursor-star.xpm"
 
 #include "ui/shape-editor.h"
 #include "ui/tools/star-tool.h"
diff --git a/src/ui/tools/text-tool.cpp b/src/ui/tools/text-tool.cpp
index 8ed03ece1..713d72a40 100644
--- a/src/ui/tools/text-tool.cpp
+++ b/src/ui/tools/text-tool.cpp
@@ -44,8 +44,8 @@
 #include "object/sp-text.h"
 #include "style.h"
 
-#include "pixmaps/cursor-text-insert.xpm"
-#include "pixmaps/cursor-text.xpm"
+#include "ui/pixmaps/cursor-text-insert.xpm"
+#include "ui/pixmaps/cursor-text.xpm"
 
 #include "ui/control-manager.h"
 #include "ui/shape-editor.h"
diff --git a/src/ui/tools/tweak-tool.cpp b/src/ui/tools/tweak-tool.cpp
index 1e9307a40..060131b49 100644
--- a/src/ui/tools/tweak-tool.cpp
+++ b/src/ui/tools/tweak-tool.cpp
@@ -53,23 +53,23 @@
 #include "object/sp-text.h"
 #include "style.h"
 
-#include "pixmaps/cursor-tweak-attract.xpm"
-#include "pixmaps/cursor-tweak-color.xpm"
-#include "pixmaps/cursor-tweak-less.xpm"
-#include "pixmaps/cursor-tweak-more.xpm"
-#include "pixmaps/cursor-tweak-move-in.xpm"
-#include "pixmaps/cursor-tweak-move-jitter.xpm"
-#include "pixmaps/cursor-tweak-move-out.xpm"
-#include "pixmaps/cursor-tweak-move.xpm"
-#include "pixmaps/cursor-tweak-push.xpm"
-#include "pixmaps/cursor-tweak-repel.xpm"
-#include "pixmaps/cursor-tweak-rotate-clockwise.xpm"
-#include "pixmaps/cursor-tweak-rotate-counterclockwise.xpm"
-#include "pixmaps/cursor-tweak-roughen.xpm"
-#include "pixmaps/cursor-tweak-scale-down.xpm"
-#include "pixmaps/cursor-tweak-scale-up.xpm"
-#include "pixmaps/cursor-tweak-thicken.xpm"
-#include "pixmaps/cursor-tweak-thin.xpm"
+#include "ui/pixmaps/cursor-tweak-attract.xpm"
+#include "ui/pixmaps/cursor-tweak-color.xpm"
+#include "ui/pixmaps/cursor-tweak-less.xpm"
+#include "ui/pixmaps/cursor-tweak-more.xpm"
+#include "ui/pixmaps/cursor-tweak-move-in.xpm"
+#include "ui/pixmaps/cursor-tweak-move-jitter.xpm"
+#include "ui/pixmaps/cursor-tweak-move-out.xpm"
+#include "ui/pixmaps/cursor-tweak-move.xpm"
+#include "ui/pixmaps/cursor-tweak-push.xpm"
+#include "ui/pixmaps/cursor-tweak-repel.xpm"
+#include "ui/pixmaps/cursor-tweak-rotate-clockwise.xpm"
+#include "ui/pixmaps/cursor-tweak-rotate-counterclockwise.xpm"
+#include "ui/pixmaps/cursor-tweak-roughen.xpm"
+#include "ui/pixmaps/cursor-tweak-scale-down.xpm"
+#include "ui/pixmaps/cursor-tweak-scale-up.xpm"
+#include "ui/pixmaps/cursor-tweak-thicken.xpm"
+#include "ui/pixmaps/cursor-tweak-thin.xpm"
 
 #include "svg/svg.h"
 
diff --git a/src/ui/tools/zoom-tool.cpp b/src/ui/tools/zoom-tool.cpp
index 5310e0f17..907f66678 100644
--- a/src/ui/tools/zoom-tool.cpp
+++ b/src/ui/tools/zoom-tool.cpp
@@ -19,8 +19,8 @@
 #include "display/sp-canvas-item.h"
 #include "display/sp-canvas-util.h"
 #include "desktop.h"
-#include "pixmaps/cursor-zoom.xpm"
-#include "pixmaps/cursor-zoom-out.xpm"
+#include "ui/pixmaps/cursor-zoom.xpm"
+#include "ui/pixmaps/cursor-zoom-out.xpm"
 #include "selection-chemistry.h"
 
 #include "ui/tools/zoom-tool.h"
diff --git a/src/ui/widget/selected-style.cpp b/src/ui/widget/selected-style.cpp
index 9a5d35f3b..2f0a9a9ea 100644
--- a/src/ui/widget/selected-style.cpp
+++ b/src/ui/widget/selected-style.cpp
@@ -34,10 +34,10 @@
 #include "object/sp-radial-gradient.h"
 #include "style.h"
 
-#include "pixmaps/cursor-adj-a.xpm"
-#include "pixmaps/cursor-adj-h.xpm"
-#include "pixmaps/cursor-adj-l.xpm"
-#include "pixmaps/cursor-adj-s.xpm"
+#include "ui/pixmaps/cursor-adj-a.xpm"
+#include "ui/pixmaps/cursor-adj-h.xpm"
+#include "ui/pixmaps/cursor-adj-l.xpm"
+#include "ui/pixmaps/cursor-adj-s.xpm"
 
 #include "svg/css-ostringstream.h"
 #include "svg/svg-color.h"