View Issue Details

IDProjectCategoryView StatusLast Update
0017421ScribusGeneralpublic2025-02-16 22:01
Reporternitramr Assigned Tonitramr  
PrioritynormalSeverityminorReproducibilityN/A
Status resolvedResolutionfixed 
PlatformDesktop PCOSUbuntuOS Version24.10 64-bit
Product Version1.7.1.svn 
Fixed in Version1.7.1.svn 
Summary0017421: Replace icon ids in source code
DescriptionI replaced all legacy icon IDs with new names in the source code.

Please rename the following icon file name:
align-to-last-selected-1.svg
to
align-to-selection.svg

In addition, I noticed that the UndoManager::initIcons() class contains a list of file names that never had an SVG replacement. This is a follow-up task.
TagsNo tags attached.
PatchYes

Activities

nitramr

2025-02-15 22:38

developer  

iconids_2025-02-15_01.patch (301,683 bytes)   
Index: resources/iconsets/1_7_0/1_7_0.xml
===================================================================
--- resources/iconsets/1_7_0/1_7_0.xml	(Revision 26694)
+++ resources/iconsets/1_7_0/1_7_0.xml	(Arbeitskopie)
@@ -37,250 +37,217 @@
 	<nametext lang="fr">Scribus 1.7.0</nametext>
 	<nametext lang="de_DE">Scribus 1.7.0</nametext>
 	<icons>		   		
-    		<icon id="noicon.png" file="16/no-icon.svg" />
+    		<icon id="no-icon" file="16/no-icon.svg" />
     		
-		<!-- Action -->		
-		<icon id="/16/close.png" file="16/action-close.svg" />
-		<icon id="/16/document-new.png" file="16/file-new.svg" />
-		<icon id="/16/document-open.png" file="16/file-open.svg" />
-		<icon id="/16/document-properties.png" file="16/document-setup.svg" />
-		<icon id="/16/document-save.png" file="16/action-save.svg" />
-		<icon id="/16/edit-cut.png" file="16/action-cut.svg" />
-		<icon id="16/close.png" file="16/action-close.svg" />
-		<icon id="16/color-fill.png" file="16/fill-color.svg" />
-		<icon id="16/color-stroke.png" file="16/stroke-color.svg" />
-		<icon id="16/configure.png" file="16/properties-external-tools.svg" />
-		<icon id="16/document-new.png" file="16/file-new.svg" />
-		<icon id="16/document-open.png" file="16/file-open.svg" />
-		<icon id="16/document-print-preview.png" file="16/action-print-preview.svg" />
-		<icon id="16/document-print.png" file="16/action-print.svg" />
-		<icon id="16/document-properties.png" file="16/document-setup.svg" /><!-- file menu -->
-		<icon id="16/document-save-as.png" file="16/action-save.svg" />
-		<icon id="16/document-save.png" file="16/action-save.svg" />
-		<icon id="16/edit-clear.png" file="16/action-delete.svg" />
-		<icon id="16/edit-copy.png" file="16/action-copy.svg" />
-		<icon id="16/edit-cut.png" file="16/action-cut.svg" />
-		<icon id="16/edit-delete.png" file="16/action-delete.svg" />
-		<icon id="16/edit-find-replace.png" file="16/action-file-search.svg" />
-		<icon id="16/edit-paste.png" file="16/action-paste.svg" />
-		<icon id="16/edit-redo.png" file="16/action-redo.svg" />
-		<icon id="16/edit-select-all.png" file="16/action-select-all.svg" />
-		<icon id="16/edit-undo.png" file="16/action-undo.svg" />
-		<icon id="16/editdoc.png" file="16/action-edit-in-preview.svg" />
-		<icon id="16/flip-object-horizontal.png" file="16/object-flip-horizontal.svg" />
-		<icon id="16/flip-object-vertical.png" file="16/object-flip-vertical.svg" />
-		<icon id="16/go-first.png" file="16/navigation-first.svg" />
-		<icon id="16/go-home.png" file="16/navigation-home.svg" />
-		<icon id="16/go-last.png" file="16/navigation-last.svg" />
-		<icon id="16/go-next.png" file="16/navigation-next.svg" />
-		<icon id="16/go-previous.png" file="16/navigation-previous.svg" />
-		<icon id="16/help-browser.png" file="16/action-help.svg" />
-		<icon id="16/information.png" file="16/action-info.svg" />
-		<icon id="16/zoom-in.png" file="16/action-zoom-in.svg" />
-		<icon id="16/zoom-original.png" file="16/action-zoom-original.svg" />
-		<icon id="16/zoom-out.png" file="16/action-zoom-out.svg" />
-		<icon id="22/close.png" file="16/action-close.svg" />
-		<icon id="22/document-new.png" file="16/file-new.svg" />
-		<icon id="22/document-open.png" file="16/file-open.svg" />
-		<icon id="22/document-print-preview.png" file="16/action-print-preview.svg" />
-		<icon id="22/document-print.png" file="16/action-print.svg" />
-		<icon id="22/document-properties.png" file="16/document-setup.svg" />
-		<icon id="22/document-save-as.png" file="16/action-save.svg" />
-		<icon id="22/document-save.png" file="16/action-save.svg" />
-		<icon id="22/edit-copy.png" file="16/action-copy.svg" />
-		<icon id="22/edit-cut.png" file="16/action-cut.svg" />
-		<icon id="22/edit-delete.png" file="16/action-delete.svg" />
-		<icon id="22/edit-find-replace.png" file="16/action-file-search.svg" />
-		<icon id="22/edit-paste.png" file="16/action-paste.svg" />
-		<icon id="22/edit-redo.png" file="16/action-redo.svg" />
-		<icon id="22/edit-undo.png" file="16/action-undo.svg" />
-		<icon id="22/exit.png" file="16/action-exit.svg" />
-		<icon id="22/go-next.png" file="16/navigation-next.svg" />
-		<icon id="22/go-previous.png" file="16/navigation-previous.svg" />
-		<icon id="22/insert-latex.png" file="16/properties-typography.svg" /><!-- Outliner -->
-		<icon id="22/preflight-verifier.png" file="16/properties-preflight.svg" />
-		<icon id="22/zoom-in.png" file="16/action-zoom-in.svg" />
-		<icon id="22/zoom-original.png" file="16/action-zoom-original.svg" />
-		<icon id="22/zoom-out.png" file="16/action-zoom-out.svg" />
-		<icon id="acroread22.png" file="16/file-pdf.svg" />
-		<icon id="chain-closed.png" file="16/action-link.svg" />
-		<icon id="chain-open.png" file="16/action-unlink.svg" />
-		<icon id="clear_right.png" file="16/action-backspace-reverse.svg" />
-		<icon id="cmsOn.png" file="16/preview-colormanagement.svg" />
-		<icon id="compfile.png" file="16/document-import.svg" />
-		<icon id="compfile16.png" file="16/document-import.svg" />
-		<icon id="curve.png" file="16/curve.svg" /><!-- Image effect dialog-->
-		<icon id="curvebezier.png" file="16/curve-bezier.svg" />
-		<icon id="curvelinear.png" file="16/curve-linear.svg" />
-		<icon id="ellipsis.png" file="16/action-browse.svg" />
-		<icon id="exit.png" file="16/action-exit.svg" />
-		<icon id="exit22.png" file="16/action-exit.svg" />
-		<icon id="fill-rule-even-odd.png" file="16/fill-evenodd.svg" />
-		<icon id="fill-rule-nonzero.png" file="16/fill-nonzero.svg" />
-		<icon id="find.png" file="16/tool-zoom.svg" /><!-- Help browser-->
-		<icon id="framenoresize.png" file="16/object-frame-lock.svg" />
-		<icon id="frameresize.png" file="16/object-frame-unlock.svg" />
-		<icon id="group.png" file="16/object-group.svg" />
-		<icon id="invert.png" file="16/action-invert.svg" />
-		<icon id="mover.png" file="16/tool-guide-mover.svg" />
-		<icon id="NoPrint.png" file="16/action-print-off.svg" />
-		<icon id="ok22.png" file="16/alert-ok.svg" />
-		<icon id="previewOn.png" file="16/action-toggle-preview-mode.svg" />
-		<icon id="reload.png" file="16/action-reload.svg" />
-		<icon id="reload16.png" file="16/action-reload.svg" />
-		<icon id="revert.png" file="16/action-file-revert.svg" />
-		<icon id="rotate_ccw.png" file="16/action-rotate-left.svg" />
-		<icon id="rotate_cw.png" file="16/action-rotate-right.svg" />
-		<icon id="round-corners.png" file="16/object-rounded-corner.svg" />
-		<icon id="shade.png" file="16/color-shade.svg" />
-		<icon id="trashcan.png" file="16/action-delete.svg" />
-		<icon id="trashcan2.png" file="16/action-delete-open.svg" />
-		<icon id="u_group.png" file="16/object-group.svg" /><!-- Outliner -->
-		<icon id="u_undo16.png" file="16/action-undo.svg" /><!-- Barcode -->
-		<icon id="ungroup.png" file="16/object-ungroup.svg" />
+		<!-- Action -->	
 		<icon id="add" file="16/action-add.svg" />
+		<icon id="chain-closed" file="16/action-link.svg" />
+		<icon id="chain-open" file="16/action-unlink.svg" />
+		<icon id="clear-right" file="16/action-backspace-reverse.svg" />
+		<icon id="close" file="16/action-close.svg" />
+		<icon id="cms-on" file="16/preview-colormanagement.svg" />
 		<icon id="collapse" file="16/action-chevron-right.svg" />
+		<icon id="color-fill" file="16/fill-color.svg" />
+		<icon id="color-stroke" file="16/stroke-color.svg" />
+		<icon id="compfile" file="16/document-import.svg" />
+		<icon id="configure" file="16/properties-external-tools.svg" />		
 		<icon id="context-menu" file="16/action-menu.svg" />
+		<icon id="curve" file="16/curve.svg" /><!-- Image effect dialog-->
+		<icon id="curve-bezier" file="16/curve-bezier.svg" />
+		<icon id="curve-linear" file="16/curve-linear.svg" />
 		<icon id="delete" file="16/action-delete.svg" />
 		<icon id="delete-selected" file="16/action-delete-selected.svg" />
+		<icon id="document-new" file="16/file-new.svg" />
+		<icon id="document-open" file="16/file-open.svg" />
+		<icon id="document-print" file="16/action-print.svg" />
+		<icon id="document-print-preview" file="16/action-print-preview.svg" />
+		<icon id="document-properties" file="16/document-setup.svg" />
+		<icon id="document-save" file="16/action-save.svg" />
+		<icon id="document-save-as" file="16/action-save.svg" />
+		<icon id="edit-clear" file="16/action-delete.svg" />
+		<icon id="edit-copy" file="16/action-copy.svg" />
+		<icon id="edit-cut" file="16/action-cut.svg" />				
+		<icon id="edit-delete" file="16/action-delete.svg" />
+		<icon id="edit-find-replace" file="16/action-file-search.svg" />
+		<icon id="edit-paste" file="16/action-paste.svg" />
+		<icon id="edit-redo" file="16/action-redo.svg" />
+		<icon id="edit-select-all" file="16/action-select-all.svg" />
+		<icon id="edit-undo" file="16/action-undo.svg" />
+		<icon id="editdoc" file="16/action-edit-in-preview.svg" />
+		<icon id="ellipsis" file="16/action-browse.svg" />
 		<icon id="erase-shadow-off" file="16/action-shadow-erase-off.svg" />
 		<icon id="erase-shadow-on" file="16/action-shadow-erase-on.svg" />
+		<icon id="exit" file="16/action-exit.svg" />
 		<icon id="expand" file="16/action-chevron-down.svg" />
+		<icon id="fill-rule-even-odd" file="16/fill-evenodd.svg" />
+		<icon id="fill-rule-nonzero" file="16/fill-nonzero.svg" />
+		<icon id="find" file="16/tool-zoom.svg" /><!-- Help browser-->
+		<icon id="flip-object-horizontal" file="16/object-flip-horizontal.svg" />
+		<icon id="flip-object-vertical" file="16/object-flip-vertical.svg" />
+		<icon id="frame-no-resize" file="16/object-frame-lock.svg" />
+		<icon id="frame-resize" file="16/object-frame-unlock.svg" />
+		<icon id="go-first" file="16/navigation-first.svg" />
+		<icon id="go-home" file="16/navigation-home.svg" />
+		<icon id="go-last" file="16/navigation-last.svg" />
+		<icon id="go-next" file="16/navigation-next.svg" />
+		<icon id="go-previous" file="16/navigation-previous.svg" />
+		<icon id="group" file="16/object-group.svg" />
+		<icon id="help-browser" file="16/action-help.svg" />
 		<icon id="image-resolution-high" file="16/image-resolution-high.svg" />
 		<icon id="image-resolution-low" file="16/image-resolution-low.svg" />
 		<icon id="image-resolution-normal" file="16/image-resolution-normal.svg" />
+		<icon id="information" file="16/action-info.svg" />
 		<icon id="inherit-opacity-off" file="16/action-inherit-opacity-off.svg" />
 		<icon id="inherit-opacity-on" file="16/action-inherit-opacity-on.svg" />
+		<icon id="insert-latex" file="16/properties-typography.svg" /><!-- Outliner -->
+		<icon id="invert" file="16/action-invert.svg" />
+		<icon id="mover" file="16/tool-guide-mover.svg" />
 		<icon id="name" file="16/object-name.svg" />
+		<icon id="no-print" file="16/action-print-off.svg" />
 		<icon id="object-rotation" file="16/object-rotation.svg" />
+		<icon id="ok" file="16/alert-ok.svg" />
+		<icon id="preflight-verifier" file="16/properties-preflight.svg" />
+		<icon id="preview-on" file="16/action-toggle-preview-mode.svg" />
+		<icon id="reload" file="16/action-reload.svg" />
 		<icon id="remove" file="16/action-remove.svg" />
 		<icon id="reset" file="16/action-reload.svg" />
 		<icon id="reset-style-changes" file="16/action-reload.svg" /> <!-- 16/action-revert-changes.svg -->
+		<icon id="revert" file="16/action-file-revert.svg" />
+		<icon id="rotate-ccw" file="16/action-rotate-left.svg" />
+		<icon id="rotate-cw" file="16/action-rotate-right.svg" />
+		<icon id="round-corners" file="16/object-rounded-corner.svg" />
 		<icon id="scale-height" file="16/action-scale-height.svg" />
 		<icon id="scale-width" file="16/action-scale-width.svg" />
 		<icon id="settings" file="16/properties-external-tools.svg" />
-		<icon id="snap-items" file="16/action-snap-items.svg" />
+		<icon id="shade" file="16/color-shade.svg" />
 		<icon id="snap-grid" file="16/action-snap-grid.svg" />
 		<icon id="snap-guides" file="16/action-snap-guides.svg" />
+		<icon id="snap-items" file="16/action-snap-items.svg" />
 		<icon id="swap" file="16/action-swap.svg" />
 		<icon id="toggle-object-coordination" file="16/object-xycoordination.svg" />
+		<icon id="trashcan" file="16/action-delete.svg" />
+		<icon id="trashcan-open" file="16/action-delete-open.svg" />
+		<icon id="u_group" file="16/object-group.svg" /><!-- Outliner -->
+		<icon id="u_undo" file="16/action-undo.svg" /><!-- Barcode -->
+		<icon id="ungroup" file="16/object-ungroup.svg" />
 		<icon id="whitespace-review-mode" file="16/action-whitespace-review.svg" />
+		<icon id="zoom-in" file="16/action-zoom-in.svg" />
+		<icon id="zoom-original" file="16/action-zoom-original.svg" />
+		<icon id="zoom-out" file="16/action-zoom-out.svg" />	
 			
 		<!-- Alerts -->
-		<icon onLight="#E54545" onDark="#FF6666" id="22/dialog-error.png" file="16/alert-error.svg" />
-		<icon onLight="#D6922B" onDark="#FFC266" id="22/dialog-warning.png" file="16/alert-warning.svg" />
-		<icon onLight="#D6922B" onDark="#FFC266" id="alert.png" file="16/alert-warning.svg" />
-		<icon onLight="#68B259" onDark="#88CC7A" id="ok.png" file="16/alert-ok.svg" />
+		<icon onLight="#E54545" onDark="#FF6666" id="alert-error" file="16/alert-error.svg" />
+		<icon onLight="#D6922B" onDark="#FFC266" id="alert-warning" file="16/alert-warning.svg" />
+		<icon onLight="#68B259" onDark="#88CC7A" id="alert-ok" file="16/alert-ok.svg" />
 		
 		<!-- Align & Distribute -->
-		<icon id="22/align-to-first-selected.png" file="16/align-to-first-selected.svg" />
-		<icon id="22/align-to-guides.png" file="16/align-to-guides.svg" />
-		<icon id="22/align-to-last-selected-1.png" file="16/align-to-last-selected-1.svg" />
-		<icon id="22/align-to-last-selected.png" file="16/align-to-last-selected.svg" />
-		<icon id="22/align-to-margin.png" file="16/align-to-margin.svg" />
-		<icon id="22/align-to-page.png" file="16/align-to-page.svg" />
-		<icon id="22/align-mode-move.png" file="16/align-mode-move.svg" />
-		<icon id="22/align-mode-resize.png" file="16/align-mode-resize.svg" />
-		<icon id="22/align-reverse-distribution-right.png" file="16/align-reverse-distribution-right.svg" />
-		<icon id="22/align-reverse-distribution-left.png" file="16/align-reverse-distribution-left.svg" />
-		<icon id="22/align-horizontal-center.png" file="16/align-item-horizontal-center.svg" />
-		<icon id="22/align-horizontal-left-out.png" file="16/align-item-horizontal-left-out.svg" />
-		<icon id="22/align-horizontal-left.png" file="16/align-item-horizontal-left.svg" />
-		<icon id="22/align-horizontal-right-out.png" file="16/align-item-horizontal-right-out.svg" />
-		<icon id="22/align-horizontal-right.png" file="16/align-item-horizontal-right.svg" />
-		<icon id="22/align-vertical-bottom-out.png" file="16/align-item-vertical-bottom-out.svg" />
-		<icon id="22/align-vertical-bottom.png" file="16/align-item-vertical-bottom.svg" />
-		<icon id="22/align-vertical-center.png" file="16/align-item-vertical-center.svg" />
-		<icon id="22/align-vertical-top-out.png" file="16/align-item-vertical-top-out.svg" />
-		<icon id="22/align-vertical-top.png" file="16/align-item-vertical-top.svg" />
-		<icon id="22/distribute-horizontal-center.png" file="16/distribute-horizontal-center.svg" />
-		<icon id="22/distribute-horizontal-equal.png" file="16/distribute-item-horizontal.svg" />
-		<icon id="22/distribute-horizontal-left.png" file="16/distribute-horizontal-left.svg" />
-		<icon id="22/distribute-horizontal-margin.png" file="16/distribute-margin-horizontal.svg" />
-		<icon id="22/distribute-horizontal-page.png" file="16/distribute-page-horizontal.svg" />
-		<icon id="22/distribute-horizontal-right.png" file="16/distribute-horizontal-right.svg" />
-		<icon id="22/distribute-horizontal-x.png" file="16/distribute-item-horizontal-x.svg" />
-		<icon id="22/distribute-vertical-bottom.png" file="16/distribute-vertical-bottom.svg" />
-		<icon id="22/distribute-vertical-center.png" file="16/distribute-vertical-center.svg" />
-		<icon id="22/distribute-vertical-equal.png" file="16/distribute-item-vertical.svg" />
-		<icon id="22/distribute-vertical-margin.png" file="16/distribute-margin-vertical.svg" />
-		<icon id="22/distribute-vertical-page.png" file="16/distribute-page-vertical.svg" />
-		<icon id="22/distribute-vertical-top.png" file="16/distribute-vertical-top.svg" />
-		<icon id="22/distribute-vertical-y.png" file="16/distribute-item-vertical-x.svg" />
-		<icon id="22/swap-left.png" file="16/distribute-swap-left.svg" />
-		<icon id="22/swap-right.png" file="16/distribute-swap-right.svg" />
+				<icon id="align-horizontal-center" file="16/align-item-horizontal-center.svg" />
+		<icon id="align-horizontal-left" file="16/align-item-horizontal-left.svg" />
+		<icon id="align-horizontal-left-out" file="16/align-item-horizontal-left-out.svg" />
+		<icon id="align-horizontal-right" file="16/align-item-horizontal-right.svg" />
+		<icon id="align-horizontal-right-out" file="16/align-item-horizontal-right-out.svg" />
+		<icon id="align-mode-move" file="16/align-mode-move.svg" />
+		<icon id="align-mode-resize" file="16/align-mode-resize.svg" />
+		<icon id="align-reverse-distribution-left" file="16/align-reverse-distribution-left.svg" />
+		<icon id="align-reverse-distribution-right" file="16/align-reverse-distribution-right.svg" />
+		<icon id="align-to-first-selected" file="16/align-to-first-selected.svg" />
+		<icon id="align-to-guides" file="16/align-to-guides.svg" />
+		<icon id="align-to-last-selected" file="16/align-to-last-selected.svg" />
+		<icon id="align-to-last-selection" file="16/align-to-selection.svg" />
+		<icon id="align-to-margin" file="16/align-to-margin.svg" />
+		<icon id="align-to-page" file="16/align-to-page.svg" />
+		<icon id="align-vertical-bottom" file="16/align-item-vertical-bottom.svg" />
+		<icon id="align-vertical-bottom-out" file="16/align-item-vertical-bottom-out.svg" />
+		<icon id="align-vertical-center" file="16/align-item-vertical-center.svg" />
+		<icon id="align-vertical-top" file="16/align-item-vertical-top.svg" />
+		<icon id="align-vertical-top-out" file="16/align-item-vertical-top-out.svg" />
+		<icon id="distribute-horizontal-center" file="16/distribute-horizontal-center.svg" />
+		<icon id="distribute-horizontal-equal" file="16/distribute-item-horizontal.svg" />
+		<icon id="distribute-horizontal-left" file="16/distribute-horizontal-left.svg" />
+		<icon id="distribute-horizontal-margin" file="16/distribute-margin-horizontal.svg" />
+		<icon id="distribute-horizontal-page" file="16/distribute-page-horizontal.svg" />
+		<icon id="distribute-horizontal-right" file="16/distribute-horizontal-right.svg" />
+		<icon id="distribute-horizontal-x" file="16/distribute-item-horizontal-x.svg" />
+		<icon id="distribute-vertical-bottom" file="16/distribute-vertical-bottom.svg" />
+		<icon id="distribute-vertical-center" file="16/distribute-vertical-center.svg" />
+		<icon id="distribute-vertical-equal" file="16/distribute-item-vertical.svg" />
+		<icon id="distribute-vertical-margin" file="16/distribute-margin-vertical.svg" />
+		<icon id="distribute-vertical-page" file="16/distribute-page-vertical.svg" />
+		<icon id="distribute-vertical-top" file="16/distribute-vertical-top.svg" />
+		<icon id="distribute-vertical-y" file="16/distribute-item-vertical-x.svg" />
+		<icon id="swap-left" file="16/distribute-swap-left.svg" />
+		<icon id="swap-right" file="16/distribute-swap-right.svg" />
     
     		<!-- Application -->
-    		<icon id="AppIcon.png" file="scribus-icon.svg" />
-    		<icon id="AppIcon2.png" file="scribus-icon.svg" />
+    		<icon id="app-icon" file="scribus-icon.svg" />
     
     		<!-- Bezier & Vector Path-->
-    		<icon id="22/transform-shear-down.png" file="16/bezier-path-shear-down.svg" />
-		<icon id="22/transform-shear-left.png" file="16/bezier-path-shear-left.svg" />
-		<icon id="22/transform-shear-right.png" file="16/bezier-path-shear-right.svg" />
-		<icon id="22/transform-shear-up.png" file="16/bezier-path-shear-up.svg" />
-		<icon id="hmirror.png" file="16/object-flip-horizontal.svg" />
-		<icon id="vmirror.png" file="16/object-flip-vertical.svg" />
-		<icon id="AddNode.png" file="16/bezier-node-add.svg" />
-		<icon id="DeleteNode.png" file="16/bezier-node-delete.svg" />		
-		<icon id="Reset1Node.png" file="16/bezier-control-reset.svg" />
-		<icon id="ResetNode.png" file="16/bezier-controls-reset.svg" />
-		<icon id="MoveAsym.png" file="16/bezier-control-asymetric.svg" />
-		<icon id="MoveKontrol.png" file="16/bezier-control-move.svg" />
-		<icon id="MoveNode.png" file="16/bezier-node-move.svg" />
-		<icon id="MoveSym.png" file="16/bezier-control-symetric.svg" />
-		<icon id="PolyCut.png" file="16/bezier-split.svg" />
-		<icon id="BezierClose.png" file="16/bezier-close.svg" />
-		<icon id="expand.png" file="16/bezier-scale-up.svg" />
-		<icon id="crop.png" file="16/bezier-scale-down.svg" />
-		<icon id="pathexclusion.png" file="16/path-exclusion.svg" />
-		<icon id="pathintersection.png" file="16/path-intersection.svg" />
-		<icon id="pathparts.png" file="16/path-combine.svg" />
-		<icon id="pathsubtraction.png" file="16/path-difference.svg" />
-		<icon id="pathunite.png" file="16/path-union.svg" />
+    		<icon id="bezier-close" file="16/bezier-close.svg" />
+		<icon id="bezier-control-asymetric" file="16/bezier-control-asymetric.svg" />
+		<icon id="bezier-control-move" file="16/bezier-control-move.svg" />
+		<icon id="bezier-control-reset" file="16/bezier-control-reset.svg" />
+		<icon id="bezier-control-reset-all" file="16/bezier-controls-reset.svg" />
+		<icon id="bezier-control-symetric" file="16/bezier-control-symetric.svg" />
+		<icon id="bezier-node-add" file="16/bezier-node-add.svg" />
+		<icon id="bezier-node-delete" file="16/bezier-node-delete.svg" />		
+		<icon id="bezier-node-move" file="16/bezier-node-move.svg" />
+		<icon id="bezier-scale-down" file="16/bezier-scale-down.svg" />
+		<icon id="bezier-scale-up" file="16/bezier-scale-up.svg" />
+		<icon id="bezier-split" file="16/bezier-split.svg" />
+		<icon id="object-flip-horizontal" file="16/object-flip-horizontal.svg" />
+		<icon id="object-flip-vertical" file="16/object-flip-vertical.svg" />
+		<icon id="path-exclusion" file="16/path-exclusion.svg" />
+		<icon id="path-intersection" file="16/path-intersection.svg" />
+		<icon id="path-parts" file="16/path-combine.svg" />
+		<icon id="path-subtraction" file="16/path-difference.svg" />
+		<icon id="path-unite" file="16/path-union.svg" />
+		<icon id="transform-shear-down" file="16/bezier-path-shear-down.svg" />
+		<icon id="transform-shear-left" file="16/bezier-path-shear-left.svg" />
+		<icon id="transform-shear-right" file="16/bezier-path-shear-right.svg" />
+		<icon id="transform-shear-up" file="16/bezier-path-shear-up.svg" />
     
 		<!-- Color -->
-		<icon id="register.png" file="16/color-registration.svg" />
-		<icon id="spot.png" file="16/color-spot.svg" />
-		<icon id="rgb.png" file="16/color-rgb.svg" />
-		<icon id="cmyk.png" file="16/color-cmyk.svg" />
-		<icon id="lab.png" file="16/color-lab.svg" />
-		<icon id="colorpicker-gradient" file="16/colorpicker-gradient.svg" />
-		<icon id="colorpicker-hatch" file="16/colorpicker-hatch.svg" />
-		<icon id="colorpicker-pattern" file="16/colorpicker-pattern.svg" />
-		<icon id="colorpicker-solid" file="16/colorpicker-solid.svg" />
+		<icon id="color-cmyk" file="16/color-cmyk.svg" />
+		<icon id="color-lab" file="16/color-lab.svg" />
+		<icon id="color-registration" file="16/color-registration.svg" />
+		<icon id="color-rgb" file="16/color-rgb.svg" />
+		<icon id="color-spot" file="16/color-spot.svg" />
 		<icon id="color-vision-colorblind" file="16/color-vision-colorblind.svg" />
 		<icon id="color-vision-deuteranopia" file="16/color-vision-deuteranopia.svg" />
 		<icon id="color-vision-normal" file="16/color-vision-normal.svg" />
 		<icon id="color-vision-protanopia" file="16/color-vision-protanopia.svg" />
 		<icon id="color-vision-tritanopia" file="16/color-vision-tritanopia.svg" />
+		<icon id="colorpicker-gradient" file="16/colorpicker-gradient.svg" />
+		<icon id="colorpicker-hatch" file="16/colorpicker-hatch.svg" />
+		<icon id="colorpicker-pattern" file="16/colorpicker-pattern.svg" />
+		<icon id="colorpicker-solid" file="16/colorpicker-solid.svg" />
 		<icon id="mask" file="16/color-mask.svg" />
+		<icon id="text-background-color" file="16/paragraph-align-horizontal-center.svg" />
 		<icon id="text-color" file="16/text.svg" />
-		<icon id="text-background-color" file="16/paragraph-align-horizontal-center.svg" />
 		<icon id="text-outline-color" file="16/character-outline.svg" />
 		
 		<!-- Cursor -->
-		<icon id="LinkTextFrame.png" file="32/cursor-link-text-frame.svg" />
-		<icon id="drawtable.png" file="32/cursor-table.svg" />
-		<icon id="drawcalligraphy.png" file="32/cursor-calligraphy.svg" />
-		<icon id="drawframe.png" file="32/cursor-frame.svg" />
-		<icon id="DrawFreeLine.png" file="32/cursor-pen.svg" />
-		<icon id="drawimageframe.png" file="32/cursor-image.svg" />
-		<icon id="drawlatexframe.png" file="32/cursor-latex.svg" />
-		<icon id="drawpolyline.png" file="32/cursor-polygon.svg" />		
-		<icon id="drawtextframe.png" file="32/cursor-text.svg" />
-		<icon id="AddPoint.png" file="32/cursor-add.svg" />
-		<icon id="DelPoint.png" file="32/cursor-remove.svg" />
-		<icon id="handc.png" file="32/cursor-hand.svg" />
-		<icon id="colorpickercursor.png" file="32/cursor-color-picker.svg" />
-		<icon id="Split.png" file="32/cursor-split.svg" />
-		<icon id="lupez.png" file="32/cursor-zoom-in.svg" />
-		<icon id="lupezm.png" file="32/cursor-zoom-out.svg" />
-		<icon id="tab.png" file="32/cursor-tabulator.svg" />
-		<icon id="Rotieren2.png" file="32/cursor-rotate.svg" />
-		<icon id="select_column.png" file="32/cursor-select-column.svg" /><!-- table -->
-		<icon id="select_row.png" file="32/cursor-select-row.svg" /><!-- table -->
-		<icon id="dragpix.png" file="32/cursor-drop-image.svg" />
+		<icon id="cursor-add-point" file="32/cursor-add.svg" />
+		<icon id="cursor-calligraphy" file="32/cursor-calligraphy.svg" />
+		<icon id="cursor-color-picker" file="32/cursor-color-picker.svg" />
+		<icon id="cursor-drop-image" file="32/cursor-drop-image.svg" />
+		<icon id="cursor-frame" file="32/cursor-frame.svg" />
+		<icon id="cursor-hand" file="32/cursor-hand.svg" />
+		<icon id="cursor-image" file="32/cursor-image.svg" />
+		<icon id="cursor-latex-frame" file="32/cursor-latex.svg" />
+		<icon id="cursor-link-text-frame" file="32/cursor-link-text-frame.svg" />
+		<icon id="cursor-pen" file="32/cursor-pen.svg" />
+		<icon id="cursor-polygon" file="32/cursor-polygon.svg" />		
+		<icon id="cursor-remove-point" file="32/cursor-remove.svg" />
+		<icon id="cursor-rotate" file="32/cursor-rotate.svg" />
+		<icon id="cursor-select-column" file="32/cursor-select-column.svg" /><!-- table -->
+		<icon id="cursor-select-row" file="32/cursor-select-row.svg" /><!-- table -->
+		<icon id="cursor-split" file="32/cursor-split.svg" />
+		<icon id="cursor-table" file="32/cursor-table.svg" />
+		<icon id="cursor-tabulator" file="32/cursor-tabulator.svg" />
+		<icon id="cursor-text-frame" file="32/cursor-text.svg" />
+		<icon id="cursor-zoom-in" file="32/cursor-zoom-in.svg" />
+		<icon id="cursor-zoom-out" file="32/cursor-zoom-out.svg" />
 		
 		<!-- Drawable Shapes -->
 		<!--
@@ -377,39 +344,16 @@
 		-->
 		
 		<!-- Filesystem & Document-->
-		<icon id="16/folder.png" file="16/file-open.svg" />
-		<icon id="folder.png" file="16/file-open.svg" />
-		<icon id="postscript.png" file="16/file-postscript.svg" />
-		<icon id="ooo_draw.png" file="16/file-openoffice-draw.svg" />
-		<icon id="ooo_writer.png" file="16/file-openoffice-writer.svg" />
-		<icon id="txt.png" file="16/file-text.svg" />
-		<icon id="vectorgfx.png" file="16/file-image.svg" />
-		<icon id="pdf.png" file="16/file-pdf.svg" />
+		<icon id="file-doc" file="16/file-new.svg" />
+		<icon id="file-ooo-draw" file="16/file-openoffice-draw.svg" />
+		<icon id="file-ooo-writer" file="16/file-openoffice-writer.svg" />
+		<icon id="file-pdf" file="16/file-pdf.svg" />
+		<icon id="file-postscript" file="16/file-postscript.svg" />
+		<icon id="file-txt" file="16/file-text.svg" />
+		<icon id="file-vectorgfx" file="16/file-image.svg" />
+		<icon id="folder" file="16/file-open.svg" />
 				
 		<!-- Page & Layer -->
-		<icon id="16/page-3fold.png" file="16/page-type-threefold.svg" />
-		<icon id="16/page-4fold.png" file="16/page-type-fourfold.svg" />
-		<icon id="16/page-doublesided.png" file="16/page-type-facing.svg" />
-		<icon id="16/page-simple.png" file="16/page-type-single.svg" />
-		<icon id="16/go-bottom.png" file="16/object-level-background.svg" />
-		<icon id="16/go-down.png" file="16/action-chevron-down.svg" />
-		<icon id="16/go-top.png" file="16/object-level-foreground.svg" />
-		<icon id="16/go-up.png" file="16/action-chevron-up.svg" />
-		<icon id="22/go-bottom.png" file="16/object-level-background.svg" />
-		<icon id="22/go-down.png" file="16/action-chevron-down.svg" />
-		<icon id="22/go-top.png" file="16/object-level-foreground.svg" />
-		<icon id="22/go-up.png" file="16/action-chevron-up.svg" />
-		<icon id="layer-outline.png" file="16/object-outline.svg" />
-		<icon id="16/layer-flow-around.png" file="16/text-wrap-shape.svg" />
-		<icon id="16/lock-unlocked.png" file="16/action-unlock.svg" />
-		<icon id="16/lock.png" file="16/action-lock.svg" />
-		<icon id="16/show-object.png" file="16/object-visible.svg" />
-		<icon id="/16/list-add.png" file="16/action-add.svg" />
-		<icon id="16/list-add.png" file="16/action-add.svg" />
-		<icon id="22/list-add.png" file="16/action-add.svg" />
-		<icon id="/16/list-remove.png" file="16/action-remove.svg" />
-		<icon id="16/list-remove.png" file="16/action-remove.svg" />
-		<icon id="22/list-remove.png" file="16/action-remove.svg" />
 		<icon id="border-bottom" file="16/border-bottom.svg" />
 		<icon id="border-inside" file="16/border-inside.svg" />
 		<icon id="border-left" file="16/border-left.svg" />
@@ -416,8 +360,21 @@
 		<icon id="border-outside" file="16/border-outside.svg" />
 		<icon id="border-right" file="16/border-right.svg" />
 		<icon id="border-top" file="16/border-top.svg" />
+		<icon id="go-bottom" file="16/object-level-background.svg" />
+		<icon id="go-down" file="16/action-chevron-down.svg" />
+		<icon id="go-top" file="16/object-level-foreground.svg" />
+		<icon id="go-up" file="16/action-chevron-up.svg" />		
+		<icon id="layer-flow-around" file="16/text-wrap-shape.svg" />
 		<icon id="layer-move-down" file="16/object-level-down.svg" />
 		<icon id="layer-move-up" file="16/object-level-up.svg" />
+		<icon id="layer-outline" file="16/object-outline.svg" />
+		<icon id="list-add" file="16/action-add.svg" />
+		<icon id="list-remove" file="16/action-remove.svg" />		
+		<icon id="lock" file="16/action-lock.svg" />
+		<icon id="lock-unlocked" file="16/action-unlock.svg" />
+		<icon id="page-3fold" file="16/page-type-threefold.svg" />
+		<icon id="page-4fold" file="16/page-type-fourfold.svg" />
+		<icon id="page-doublesided" file="16/page-type-facing.svg" />
 		<icon id="page-duplicate" file="16/page-duplicate.svg" />
 		<icon id="page-first-left" file="16/page-first-left.svg" />
 		<icon id="page-first-right" file="16/page-first-right.svg" />
@@ -426,148 +383,116 @@
 		<icon id="page-move" file="16/page-move.svg" />
 		<icon id="page-orientation-horizontal" file="16/page-orientation-horizontal.svg" />
 		<icon id="page-orientation-vertical" file="16/page-orientation-vertical.svg" />
+		<icon id="page-simple" file="16/page-type-single.svg" />
 		<icon id="page-sizes" file="16/page-sizes.svg" />
+		<icon id="show-object" file="16/object-visible.svg" />
     
 		<!-- PDF Tools -->
-		<icon id="16/insert-button.png" file="16/pdf-button.svg" />
-		<icon id="22/insert-button.png" file="16/pdf-button.svg" />
-		<icon id="16/pdf-annotations.png" file="16/pdf-annotation-text.svg" />
-		<icon id="22/pdf-annotations.png" file="16/pdf-annotation-text.svg" />
-		<icon id="16/radiobutton.png" file="16/pdf-radiobox.svg" />
-		<icon id="22/radiobutton.png" file="16/pdf-radiobox.svg" />
-		<icon id="16/checkbox.png" file="16/pdf-checkbox.svg" />
-		<icon id="22/checkbox.png" file="16/pdf-checkbox.svg" />
-		<icon id="16/combobox.png" file="16/pdf-combobox.svg" />
-		<icon id="22/combobox.png" file="16/pdf-combobox.svg" />
-		<icon id="16/text-field.png" file="16/pdf-textinput.svg" />
-		<icon id="22/text-field.png" file="16/pdf-textinput.svg" />
-		<icon id="16/list-box.png" file="16/pdf-listbox.svg" />
-		<icon id="22/list-box.png" file="16/pdf-listbox.svg" />
-		<icon id="16/annot3d.png" file="16/pdf-annotation-3d.svg" />
-		<icon id="22/annot3d.png" file="16/pdf-annotation-3d.svg" />
-		<icon id="goto16.png" file="16/pdf-annotation-link.svg" />
-		<icon id="goto.png" file="16/pdf-annotation-link.svg" />
+		<icon id="pdf-annotation-3d" file="16/pdf-annotation-3d.svg" />
+		<icon id="pdf-annotation-link" file="16/pdf-annotation-link.svg" />
+		<icon id="pdf-annotation-text" file="16/pdf-annotation-text.svg" />
 		<icon id="pdf-bookmark" file="16/panel-bookmarks.svg" />
+		<icon id="pdf-button" file="16/pdf-button.svg" />
+		<icon id="pdf-checkbox" file="16/pdf-checkbox.svg" />
+		<icon id="pdf-combobox" file="16/pdf-combobox.svg" />
+		<icon id="pdf-listbox" file="16/pdf-listbox.svg" />
+		<icon id="pdf-radiobutton" file="16/pdf-radiobox.svg" />
+		<icon id="pdf-textfield" file="16/pdf-textinput.svg" />
+
 	
-		<!-- Picture Browser -->
-		<icon id="doc.png" file="16/file-new.svg" />
-		<icon id="viewmagin.png" file="16/action-zoom-in.svg" />
-		<icon id="viewmagout.png" file="16/action-zoom-out.svg" />
-		<icon onLight="hsl(0, 0, 80)" onDark="hsl(0, 0, 26)" id="testfill.png" file="checker.svg" />
-		<icon id="pitr_green_arrows_set_1.svg" file="16/action-sort-alphabetical-descending.svg" />
-		<icon id="pitr_green_arrows_set_5.svg" file="16/action-sort-alphabetical-ascending.svg" />
-		<icon id="sarxos_Paper_Sheets.svg" file="16/file-new.svg" /><!-- iconDocumentBrowser -->
-		<icon id="sarxos_Simple_Folder_Seek.svg" file="16/file-open.svg" /><!-- iconFolderBrowser -->
-		<icon id="sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg" file="16/image-collection.svg" /><!-- iconCollectionsBrowser -->
+		<!-- Picture Browser -->		
+		<icon id="action-sort-alphabetical-ascending" file="16/action-sort-alphabetical-ascending.svg" />
+		<icon id="action-sort-alphabetical-descending" file="16/action-sort-alphabetical-descending.svg" />
+		<icon id="document" file="16/file-new.svg" />
+		<icon id="image-collection" file="16/image-collection.svg" />
+		<icon onLight="hsl(0, 0, 80)" onDark="hsl(0, 0, 26)" id="testfill" file="checker.svg" />
 	
 		<!-- Preferences -->
-		<icon id="scribus16.png" file="16/properties-ui.svg" />
-		<icon id="scribusdoc16.png" file="16/document-setup.svg" />
-		<icon id="16/preferences-desktop-keyboard-shortcuts.png" file="16/properties-keystrokes.svg" />
-		<icon id="16/edit-guides.png" file="16/properties-guides.svg" />
-		<icon id="documentinfo.png" file="16/document-info.svg" />
-		<icon id="16/preferences-desktop-font.png" file="16/properties-fonts.svg" />
-		<icon id="16/draw-text.png" file="16/properties-typography.svg" />
-		<icon id="signature_16.png" file="16/properties-hyphenator.svg" />
-		<icon id="blend_16.png" file="16/properties-color-management.svg" />
-		<icon id="16/image-x-generic.png" file="16/properties-image-cache.svg" />
-		<icon id="16/video-display.png" file="16/properties-display.svg" />
-		<icon id="screen.png" file="16/properties-display.svg" />
-		<icon id="tools_16.png" file="16/properties-tools.svg" />
-		<icon id="gear_16.png" file="16/properties-external-tools.svg" />
-		<icon id="scrap_16.png" file="16/properties-scrapbook.svg" />		
-		<icon id="16/preflight-verifier.png" file="16/properties-preflight.svg" />
-		<icon id="16/printer.png" file="16/action-print.svg" />
-		<icon id="acroread16.png" file="16/file-pdf.svg" />
-		<icon id="misc_16.png" file="16/properties-miscellaneous.svg" />
-		<icon id="docattributes_16.png" file="16/properties-item-attributes.svg" />
-		<icon id="tabtocindex_16.png" file="16/properties-toc.svg" />
-		<icon id="plugins_16.png" file="16/properties-plugins.svg" />
-		<icon id="shortwords_16.png" file="16/properties-shortwords.svg" />
-		<icon id="python_16.png" file="16/properties-scripter.svg" />
-		<icon id="section" file="16/properties-section.svg" />
+		<icon id="image-x-generic" file="16/properties-image-cache.svg" />
+		<icon id="pref-color-management" file="16/properties-color-management.svg" />
+		<icon id="pref-display" file="16/properties-display.svg" />
+		<icon id="pref-document-info" file="16/document-info.svg" />
+		<icon id="pref-document-setup" file="16/document-setup.svg" />
+		<icon id="pref-experimental" file="16/properties-miscellaneous.svg" />
+		<icon id="pref-external-tools" file="16/properties-external-tools.svg" />
+		<icon id="pref-fonts" file="16/properties-fonts.svg" />
+		<icon id="pref-guides" file="16/properties-guides.svg" />
+		<icon id="pref-hyphenator" file="16/properties-hyphenator.svg" />
+		<icon id="pref-indexes" file="16/properties-toc.svg" />
+		<icon id="pref-item-attributes" file="16/properties-item-attributes.svg" />
+		<icon id="pref-keyboard-shortcuts" file="16/properties-keystrokes.svg" />
+		<icon id="pref-miscellaneous" file="16/properties-miscellaneous.svg" />
+		<icon id="pref-pdf-export" file="16/file-pdf.svg" />
+		<icon id="pref-plugins" file="16/properties-plugins.svg" />
+		<icon id="pref-printer" file="16/action-print.svg" />
+		<icon id="pref-scrapbook" file="16/properties-scrapbook.svg" />
+		<icon id="pref-scripter" file="16/properties-scripter.svg" />
+		<icon id="pref-section" file="16/properties-section.svg" />
+		<icon id="pref-shortwords" file="16/properties-shortwords.svg" />
+		<icon id="pref-toc" file="16/properties-toc.svg" />
+		<icon id="pref-tools" file="16/properties-tools.svg" />
+		<icon id="pref-typography" file="16/properties-typography.svg" />
+		<icon id="pref-ui" file="16/properties-ui.svg" />
 	
 		<!-- Shape -->
-		<icon id="flow-bounding.png" file="16/text-wrap-boundingbox.svg" />
-		<icon id="flow-contour.png" file="16/text-wrap-contour.svg" />
-		<icon id="flow-frame.png" file="16/text-wrap-shape.svg" />
-		<icon id="flow-none.png" file="16/text-wrap-none.svg" />
+		<icon id="text-wrap-boundingbox" file="16/text-wrap-boundingbox.svg" />
+		<icon id="text-wrap-contour" file="16/text-wrap-contour.svg" />
+		<icon id="text-wrap-image-clip" file="16/text-wrap-contour.svg" />
+		<icon id="text-wrap-none" file="16/text-wrap-none.svg" />
+		<icon id="text-wrap-shape" file="16/text-wrap-shape.svg" />		
 	
 		<!-- Stroke -->
-		<icon id="16/stroke-cap-butt.png" file="16/stroke-cap-butt.svg" />
-		<icon id="16/stroke-cap-round.png" file="16/stroke-cap-round.svg" />
-		<icon id="16/stroke-cap-square.png" file="16/stroke-cap-square.svg" />
-		<icon id="ButtCap.png" file="16/stroke-cap-butt.svg" />
-		<icon id="SquareCap.png" file="16/stroke-cap-square.svg" />
-		<icon id="RoundCap.png" file="16/stroke-cap-round.svg" />  
-		<icon id="16/stroke-join-bevel.png" file="16/stroke-join-bevel.svg" />
-		<icon id="16/stroke-join-miter.png" file="16/stroke-join-miter.svg" />
-		<icon id="16/stroke-join-round.png" file="16/stroke-join-round.svg" />
-		<icon id="MiterJoin.png" file="16/stroke-join-miter.svg" />
-		<icon id="RoundJoin.png" file="16/stroke-join-round.svg" />
-		<icon id="BevelJoin.png" file="16/stroke-join-bevel.svg" />
-		<icon id="penciladd.png" file="16/stroke-add.svg" />
-		<icon id="pencilsub.png" file="16/stroke-remove.svg" />
-		<icon id="stroke-style" file="16/stroke-style.svg" />
+		<icon id="stroke-add" file="16/stroke-add.svg" />
+		<icon id="stroke-cap-butt" file="16/stroke-cap-butt.svg" />
+		<icon id="stroke-cap-round" file="16/stroke-cap-round.svg" />
+		<icon id="stroke-cap-square" file="16/stroke-cap-square.svg" />
+		<icon id="stroke-join-bevel" file="16/stroke-join-bevel.svg" />
+		<icon id="stroke-join-miter" file="16/stroke-join-miter.svg" />
+		<icon id="stroke-join-round" file="16/stroke-join-round.svg" />
+		<icon id="stroke-remove" file="16/stroke-remove.svg" />
 		<icon id="stroke-style-edit" file="16/action-edit.svg" />
 		<icon id="stroke-style-new" file="16/action-add.svg" />
+		<icon id="stroke-style" file="16/stroke-style.svg" />
 		
 		<!-- Table -->
-		<icon id="16/delete-table-columns.png" file="16/table-column-remove.svg" />
-		<icon id="22/delete-table-columns.png" file="16/table-column-remove.svg" />
-		<icon id="16/delete-table-rows.png" file="16/table-row-remove.svg" />
-		<icon id="22/delete-table-rows.png" file="16/table-row-remove.svg" />
-		<icon id="16/insert-table-columns.png" file="16/table-column-insert.svg" />
-		<icon id="22/insert-table-columns.png" file="16/table-column-insert.svg" />
-		<icon id="16/insert-table-rows.png" file="16/table-row-insert.svg" />
-		<icon id="22/insert-table-rows.png" file="16/table-row-insert.svg" />		
-		<icon id="16/merge-table-cells.png" file="16/table-merge-cells.svg" />
-		<icon id="22/merge-table-cells.png" file="16/table-merge-cells.svg" />
-		<icon id="16/split-table-cells.png" file="16/table-split-cell.svg" />
-		<icon id="22/split-table-cells.png" file="16/table-split-cell.svg" />
+		<icon id="delete-table-columns" file="16/table-column-remove.svg" />
+		<icon id="delete-table-rows" file="16/table-row-remove.svg" />
+		<icon id="insert-table-columns" file="16/table-column-insert.svg" />
+		<icon id="insert-table-rows" file="16/table-row-insert.svg" />		
+		<icon id="merge-table-cells" file="16/table-merge-cells.svg" />
+		<icon id="split-table-cells" file="16/table-split-cell.svg" />
 		
 		<!-- Text & Font-->
-		<icon id="16/format-justify-center.png" file="16/paragraph-align-horizontal-center.svg" />
-		<icon id="16/format-justify-fill-block-right.png" file="16/paragraph-align-justify-rtl.svg" />
-		<icon id="16/format-justify-fill-block.png" file="16/paragraph-align-justify-ltr.svg" />
-		<icon id="16/format-justify-fill.png" file="16/paragraph-align-justify.svg" />
-		<icon id="16/format-justify-left.png" file="16/paragraph-align-left.svg" />
-		<icon id="16/format-justify-right.png" file="16/paragraph-align-right.svg" />
-		<icon id="16/text-direction-ltr.png" file="16/paragraph-direction-ltr.svg" />
-		<icon id="16/text-direction-rtl.png" file="16/paragraph-direction-rtl.svg" />
-		<icon id="font_otf16.png" file="16/font-otf.svg" />
-		<icon id="font_subst16.png" file="16/font-substitute.svg" />
-		<icon id="font_truetype16.png" file="16/font-truetype.svg" />
-		<icon id="font_type1_16.png" file="16/font-postscript.svg" />
-		<icon id="character-capitals-all" file="16/character-capitals-all.svg" />
+				<icon id="character-capitals-all" file="16/character-capitals-all.svg" />
 		<icon id="character-capitals-small" file="16/character-capitals-small.svg" />
 		<icon id="character-letter-tracking" file="16/character-letter-spacing.svg" />
 		<icon id="character-offset-baseline" file="16/character-offset-baseline.svg" />
 		<icon id="character-outline" file="16/character-outline.svg" />
 		<icon id="character-scale-height" file="16/character-scale-height.svg" />
-		<icon id="character-scale-width" file="16/character-scale-width.svg" />
 		<icon id="character-scale-width-max" file="16/character-scale-width-max.svg" />
 		<icon id="character-scale-width-min" file="16/character-scale-width-min.svg" />
+		<icon id="character-scale-width" file="16/character-scale-width.svg" />
 		<icon id="character-shadow" file="16/character-shadow.svg" />
+		<icon id="character-space-width-min" file="16/character-space-width-min.svg" />
 		<icon id="character-space-width" file="16/character-space-width.svg" />
-		<icon id="character-space-width-min" file="16/character-space-width-min.svg" />
 		<icon id="character-strikethrough" file="16/character-strikethrough.svg" />
-		<icon id="character-style" file="16/character-style.svg" />
 		<icon id="character-style-edit" file="16/action-edit.svg" />
 		<icon id="character-style-new" file="16/action-add.svg" />
+		<icon id="character-style" file="16/character-style.svg" />
 		<icon id="character-subscript" file="16/character-subscript.svg" />
 		<icon id="character-superscript" file="16/character-superscript.svg" />
+		<icon id="character-table" file="16/tool-insert-table.svg" />
+		<icon id="character-underline-word" file="16/character-underline-word.svg" />
 		<icon id="character-underline" file="16/character-underline.svg" />
-		<icon id="character-underline-word" file="16/character-underline-word.svg" />
 		<icon id="ff-afrc" file="16/ff-afrc.svg" />
+		<icon id="ff-c2sc-smcp" file="16/ff-c2sc-smcp.svg" />
 		<icon id="ff-c2sc" file="16/ff-c2sc.svg" />
-		<icon id="ff-c2sc-smcp" file="16/ff-c2sc-smcp.svg" />
 		<icon id="ff-frac" file="16/ff-frac.svg" />
 		<icon id="ff-lnum" file="16/ff-lnum.svg" />
 		<icon id="ff-onum" file="16/ff-onum.svg" />
 		<icon id="ff-ordn" file="16/ff-ordn.svg" />
+		<icon id="ff-p2pc-pcap" file="16/ff-p2pc-pcap.svg" />
 		<icon id="ff-p2pc" file="16/ff-p2pc.svg" />
-		<icon id="ff-p2pc-pcap" file="16/ff-p2pc-pcap.svg" />
 		<icon id="ff-pcap" file="16/ff-pcap.svg" />
 		<icon id="ff-pnum" file="16/ff-pnum.svg" />
 		<icon id="ff-smcp" file="16/ff-smcp.svg" />
@@ -581,8 +506,18 @@
 		<icon id="flop-linespace" file="16/paragraph-offset-linespace.svg" />
 		<icon id="flop-max" file="16/paragraph-offset-max.svg" />
 		<icon id="font-face" file="16/properties-fonts.svg" />
+		<icon id="font-otf" file="16/font-otf.svg" />
+		<icon id="font-postscript" file="16/font-postscript.svg" />
 		<icon id="font-size" file="16/font-size.svg" />
 		<icon id="font-style" file="16/font-style.svg" />
+		<icon id="font-substitute" file="16/font-substitute.svg" />
+		<icon id="font-truetype" file="16/font-truetype.svg" />
+		<icon id="format-justify-center" file="16/paragraph-align-horizontal-center.svg" />
+		<icon id="format-justify-fill-block-right" file="16/paragraph-align-justify-rtl.svg" />
+		<icon id="format-justify-fill-block" file="16/paragraph-align-justify-ltr.svg" />
+		<icon id="format-justify-fill" file="16/paragraph-align-justify.svg" />
+		<icon id="format-justify-left" file="16/paragraph-align-left.svg" />
+		<icon id="format-justify-right" file="16/paragraph-align-right.svg" />
 		<icon id="hyphen-character" file="16/hyphenation-character.svg" />
 		<icon id="hyphen-consecutive" file="16/hyphenation-consecutive.svg" />
 		<icon id="hyphen-smallest-word" file="16/hyphenation-smallest-word.svg" />
@@ -602,9 +537,9 @@
 		<icon id="paragraph-orphan" file="16/paragraph-orphan.svg" />
 		<icon id="paragraph-space-above" file="16/paragraph-space-above.svg" />
 		<icon id="paragraph-space-below" file="16/paragraph-space-below.svg" />
-		<icon id="paragraph-style" file="16/paragraph-style.svg" />
 		<icon id="paragraph-style-edit" file="16/action-edit.svg" />
 		<icon id="paragraph-style-new" file="16/action-add.svg" />
+		<icon id="paragraph-style" file="16/paragraph-style.svg" />
 		<icon id="paragraph-widow" file="16/paragraph-widow.svg" />
 		<icon id="tabulator-center" file="16/tabulator-center.svg" />
 		<icon id="tabulator-comma" file="16/tabulator-comma.svg" />
@@ -611,59 +546,37 @@
 		<icon id="tabulator-dot" file="16/tabulator-dot.svg" />
 		<icon id="tabulator-left" file="16/tabulator-left.svg" />
 		<icon id="tabulator-right" file="16/tabulator-right.svg" />
+		<icon id="text-direction-ltr" file="16/paragraph-direction-ltr.svg" />
+		<icon id="text-direction-rtl" file="16/paragraph-direction-rtl.svg" />
 		<icon id="text-on-path-distance" file="16/text-on-path-distance.svg" />
 		<icon id="text-on-path-flip" file="16/object-flip-vertical.svg" />
 		<icon id="text-on-path-offset" file="16/text-on-path-offset.svg" />
 				
 		<!-- Tools -->
-		<icon id="22/transform-crop-and-resize.png" file="16/tool-crop.svg" />
-		<icon id="16/pointer.png" file="16/tool-select.svg" />
-		<icon id="22/pointer.png" file="16/tool-select.svg" />
-		<icon id="16/insert-image.png" file="16/tool-insert-image.svg" />
-		<icon id="22/insert-image.png" file="16/tool-insert-image.svg" />
-		<icon id="16/insert-renderframe.png" file="16/tool-insert-render-frame.svg" />
-		<icon id="22/insert-renderframe.png" file="16/tool-insert-render-frame.svg" />
-		<icon id="/16/insert-table.png" file="16/tool-insert-table.svg" />
-		<icon id="16/insert-table.png" file="16/tool-insert-table.svg" />
-		<icon id="22/insert-table.png" file="16/tool-insert-table.svg" />
-		<icon id="16/insert-text-frame.png" file="16/tool-insert-text-frame.svg" />
-		<icon id="22/insert-text-frame.png" file="16/tool-insert-text-frame.svg" />
-		<icon id="16/draw-path.png" file="16/tool-draw-bezier.svg" />
-		<icon id="22/draw-path.png" file="16/tool-draw-bezier.svg" />
-		<icon id="16/draw-polygon.png" file="16/tool-insert-polygon.svg" />
-		<icon id="22/draw-polygon.png" file="16/tool-insert-polygon.svg" />
-		<icon id="16/draw-arc.png" file="16/tool-insert-arc.svg" />
-		<icon id="22/draw-arc.png" file="16/tool-insert-arc.svg" />
-		<icon id="16/draw-spiral.png" file="16/tool-insert-spiral.svg" />
-		<icon id="22/draw-spiral.png" file="16/tool-insert-spiral.svg" />
-		<icon id="stift.png" file="16/tool-insert-line.svg" />
-		<icon id="Stift16.png" file="16/tool-insert-line.svg" />
-		<icon id="16/draw-freehand.png" file="16/tool-draw-freehand.svg" />
-		<icon id="22/draw-freehand.png" file="16/tool-draw-freehand.svg" />
-		<icon id="16/draw-calligraphic.png" file="16/tool-draw-calligraphy.svg" />
-		<icon id="22/draw-calligraphic.png" file="16/tool-draw-calligraphy.svg" />
-		<icon id="16/transform-rotate.png" file="16/tool-rotate.svg" />
-		<icon id="22/transform-rotate.png" file="16/tool-rotate.svg" />
-		<icon id="16/measure.png" file="16/tool-ruler.svg" />
-		<icon id="22/measure.png" file="16/tool-ruler.svg" />
-		<icon id="16/color-picker.png" file="16/tool-color-picker.svg" />
-		<icon id="22/color-picker.png" file="16/tool-color-picker.svg" />
-		<icon id="editm.png" file="16/tool-edit-content.svg" />
-		<icon id="Editm16.png" file="16/tool-edit-content.svg" />
-		<icon id="/16/story-editor.png" file="16/tool-story-editor.svg" />
-		<icon id="16/story-editor.png" file="16/tool-story-editor.svg" />
-		<icon id="22/story-editor.png" file="16/tool-story-editor.svg" />
 		<icon id="gradient-edit" file="16/colorpicker-gradient.svg" />
-		<icon id="16/text-frame-link.png" file="16/tool-link-text-frame.svg" />
-		<icon id="22/text-frame-link.png" file="16/tool-link-text-frame.svg" />
-		<icon id="16/text-frame-unlink.png" file="16/tool-unlink-text-frame.svg" />    
-		<icon id="22/text-frame-unlink.png" file="16/tool-unlink-text-frame.svg" />
-		<icon id="16/zoom.png" file="16/tool-zoom.svg" />
-		<icon id="22/zoom.png" file="16/tool-zoom.svg" />
-		<icon id="wizard.png" file="16/tool-copy-style.svg" />
-		<icon id="wizard16.png" file="16/tool-copy-style.svg" />
-		<icon id="16/insert-barcode.png" file="16/tool-insert-barcode.svg" />
-		<icon id="22/insert-barcode.png" file="16/tool-insert-barcode.svg" />
+		<icon id="tool-color-picker" file="16/tool-color-picker.svg" />
+		<icon id="tool-copy-style" file="16/tool-copy-style.svg" />
+		<icon id="tool-draw-bezier" file="16/tool-draw-bezier.svg" />
+		<icon id="tool-draw-calligraphy" file="16/tool-draw-calligraphy.svg" />
+		<icon id="tool-draw-freehand" file="16/tool-draw-freehand.svg" />
+		<icon id="tool-edit-content" file="16/tool-edit-content.svg" />
+		<icon id="tool-insert-arc" file="16/tool-insert-arc.svg" />
+		<icon id="tool-insert-barcode" file="16/tool-insert-barcode.svg" />
+		<icon id="tool-insert-image" file="16/tool-insert-image.svg" />
+		<icon id="tool-insert-line" file="16/tool-insert-line.svg" />
+		<icon id="tool-insert-polygon" file="16/tool-insert-polygon.svg" />
+		<icon id="tool-insert-render-frame" file="16/tool-insert-render-frame.svg" />
+		<icon id="tool-insert-spiral" file="16/tool-insert-spiral.svg" />
+		<icon id="tool-insert-table" file="16/tool-insert-table.svg" />
+		<icon id="tool-insert-text-frame" file="16/tool-insert-text-frame.svg" />
+		<icon id="tool-link-text-frame" file="16/tool-link-text-frame.svg" />
+		<icon id="tool-measure" file="16/tool-ruler.svg" />
+		<icon id="tool-rotate" file="16/tool-rotate.svg" />
+		<icon id="tool-select" file="16/tool-select.svg" />
+		<icon id="tool-story-editor" file="16/tool-story-editor.svg" />
+		<icon id="tool-unlink-text-frame" file="16/tool-unlink-text-frame.svg" /> 
+		<icon id="tool-zoom" file="16/tool-zoom.svg" />
+		<icon id="transform-crop-and-resize" file="16/tool-crop.svg" />
 
 		<!-- Windows -->
 		<icon id="close" file="16/action-close.svg" />
Index: scribus/actionmanager.cpp
===================================================================
--- scribus/actionmanager.cpp	(Revision 26694)
+++ scribus/actionmanager.cpp	(Arbeitskopie)
@@ -69,7 +69,7 @@
 	undoManager = UndoManager::instance();
 
 #ifdef Q_OS_MACOS
-	noIcon = im.loadPixmap("noicon.png");
+	noIcon = im.loadPixmap("no-icon");
 #endif
 
 	createActions();
@@ -116,19 +116,19 @@
 	QString name;
 	//File Menu
 	name = "fileNew";
-	scrActions->insert(name, new ScrAction("16/document-new.png", "22/document-new.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-new", "document-new", "", defaultKey(name), mainWindow));
 	name = "fileNewFromTemplate";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "fileOpen";
-	scrActions->insert(name, new ScrAction("16/document-open.png", "22/document-open.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-open", "document-open", "", defaultKey(name), mainWindow));
 	name = "fileClose";
-	scrActions->insert(name, new ScrAction("16/close.png", "22/close.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("close", "close", "", defaultKey(name), mainWindow));
 	name = "fileSave";
-	scrActions->insert(name, new ScrAction("16/document-save.png", "22/document-save.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-save", "document-save", "", defaultKey(name), mainWindow));
 	name = "fileSaveAs";
-	scrActions->insert(name, new ScrAction("16/document-save-as.png", "22/document-save-as.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-save-as", "document-save-as", "", defaultKey(name), mainWindow));
 	name = "fileRevert";
-	scrActions->insert(name, new ScrAction("revert.png", QString(), "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("revert", QString(), "", defaultKey(name), mainWindow));
 	name = "fileCollect";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	//File Import Menu
@@ -149,12 +149,12 @@
 	name = "fileExportAsEPS";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "fileExportAsPDF";
-	scrActions->insert(name, new ScrAction("acroread16.png", "acroread22.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("pref-pdf-export", "pref-pdf-export", "", defaultKey(name), mainWindow));
 	//Rest of File Menu
 //	name = "fileDocSetup";
-//	scrActions->insert(name, new ScrAction("16/document-properties.png", "22/document-properties.png", "", defaultKey(name), mainWindow));
+//	scrActions->insert(name, new ScrAction("document-properties", "document-properties", "", defaultKey(name), mainWindow));
 	name = "fileDocSetup150";
-	scrActions->insert(name, new ScrAction("16/document-properties.png", "22/document-properties.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-properties", "document-properties", "", defaultKey(name), mainWindow));
 //	name = "filePreferences";
 //	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 //	(*scrActions)[name]->setMenuRole(QAction::NoRole);
@@ -162,15 +162,15 @@
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	(*scrActions)[name]->setMenuRole(QAction::PreferencesRole);
 	name = "filePrint";
-	scrActions->insert(name, new ScrAction("16/document-print.png", "22/document-print.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-print", "document-print", "", defaultKey(name), mainWindow));
 	name = "PrintPreview";
-	scrActions->insert(name, new ScrAction("16/document-print-preview.png", "22/document-print-preview.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("document-print-preview", "document-print-preview", "", defaultKey(name), mainWindow));
 	name = "OutputPreviewPDF";
 	scrActions->insert(name, new ScrAction(QString(), defaultKey(name), mainWindow));
 	name = "OutputPreviewPS";
 	scrActions->insert(name, new ScrAction(QString(), defaultKey(name), mainWindow));
 	name = "fileQuit";
-	scrActions->insert(name, new ScrAction("exit.png", QString(), "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("exit", QString(), "", defaultKey(name), mainWindow));
 	(*scrActions)[name]->setMenuRole(QAction::QuitRole);
 
 	//Connect our signals and slots
@@ -211,29 +211,29 @@
 	QString name;
 	//Edit Menu
 	name = "editUndoAction";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-undo.png", "22/edit-undo.png", "", defaultKey(name), mainWindow, 1));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "edit-undo", "edit-undo", "", defaultKey(name), mainWindow, 1));
 	name = "editRedoAction";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-redo.png", "22/edit-redo.png", "", defaultKey(name), mainWindow, 1));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "edit-redo", "edit-redo", "", defaultKey(name), mainWindow, 1));
 	name = "editActionMode";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	(*scrActions)["editActionMode"]->setToggleAction(true);
 
 	name = "editCut";
-	scrActions->insert(name, new ScrAction("16/edit-cut.png", "22/edit-cut.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-cut", "edit-cut", "", defaultKey(name), mainWindow));
 	name = "editCopy";
-	scrActions->insert(name, new ScrAction("16/edit-copy.png", "22/edit-copy.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-copy", "edit-copy", "", defaultKey(name), mainWindow));
 	name = "editPaste";
-	scrActions->insert(name, new ScrAction("16/edit-paste.png", "22/edit-paste.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-paste", "edit-paste", "", defaultKey(name), mainWindow));
 	name = "editCopyContents";
-	scrActions->insert(name, new ScrAction("16/edit-copy.png", "22/edit-copy.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-copy", "edit-copy", "", defaultKey(name), mainWindow));
 	name = "editPasteContents";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-paste.png", QString(), "", defaultKey(name), mainWindow, 0));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "edit-paste", QString(), "", defaultKey(name), mainWindow, 0));
 	name = "editPasteContentsAbs";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/edit-paste.png", QString(), "", defaultKey(name), mainWindow, 1));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "edit-paste", QString(), "", defaultKey(name), mainWindow, 1));
 	name = "editPasteImageFromClipboard";
-	scrActions->insert(name, new ScrAction("16/edit-paste.png", "22/edit-paste.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-paste", "edit-paste", "", defaultKey(name), mainWindow));
 	name = "editClearContents";
-	scrActions->insert(name, new ScrAction("16/edit-delete.png", "22/edit-delete.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-delete", "edit-delete", "", defaultKey(name), mainWindow));
 	name = "editTruncateContents";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "editSelectAll";
@@ -243,7 +243,7 @@
 	name = "editDeselectAll";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "editSearchReplace";
-	scrActions->insert(name, new ScrAction("16/edit-find-replace.png", "22/edit-find-replace.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("edit-find-replace", "edit-find-replace", "", defaultKey(name), mainWindow));
 	name = "editEditWithImageEditor";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "editEditRenderSource";
@@ -431,13 +431,13 @@
 	(*scrActions)["itemFlipH"]->setToggleAction(true, true);
 	(*scrActions)["itemFlipV"]->setToggleAction(true, true);
 	name = "itemLowerToBottom";
-	scrActions->insert(name, new ScrAction("16/go-bottom.png", "22/go-bottom.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("go-bottom", "go-bottom", "", defaultKey(name), mainWindow));
 	name = "itemRaiseToTop";
-	scrActions->insert(name, new ScrAction("16/go-top.png", "22/go-top.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("go-top", "go-top", "", defaultKey(name), mainWindow));
 	name = "itemLower";
-	scrActions->insert(name, new ScrAction("16/go-down.png", "22/go-down.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("go-down", "go-down", "", defaultKey(name), mainWindow));
 	name = "itemRaise";
-	scrActions->insert(name, new ScrAction("16/go-up.png", "22/go-up.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("go-up", "go-up", "", defaultKey(name), mainWindow));
 	name = "itemSendToPattern";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "itemSendToInline";
@@ -631,17 +631,17 @@
 	QString name;
 
 	name = "tableInsertRows";
-	scrActions->insert(name, new ScrAction("16/insert-table-rows.png", "22/insert-table-rows.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("insert-table-rows", "insert-table-rows", "", defaultKey(name), mainWindow));
 	name = "tableInsertColumns";
-	scrActions->insert(name, new ScrAction("16/insert-table-columns.png", "22/insert-table-columns.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("insert-table-columns", "insert-table-columns", "", defaultKey(name), mainWindow));
 	name = "tableDeleteRows";
-	scrActions->insert(name, new ScrAction("16/delete-table-rows.png", "22/delete-table-rows.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("delete-table-rows", "delete-table-rows", "", defaultKey(name), mainWindow));
 	name = "tableDeleteColumns";
-	scrActions->insert(name, new ScrAction("16/delete-table-columns.png", "22/delete-table-columns.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("delete-table-columns", "delete-table-columns", "", defaultKey(name), mainWindow));
 	name = "tableMergeCells";
-	scrActions->insert(name, new ScrAction("16/merge-table-cells.png", "22/merge-table-cells.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("merge-table-cells", "merge-table-cells", "", defaultKey(name), mainWindow));
 	name = "tableSplitCells";
-	scrActions->insert(name, new ScrAction("16/split-table-cells.png", "22/split-table-cells.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("split-table-cells", "split-table-cells", "", defaultKey(name), mainWindow));
 	name = "tableSetRowHeights";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "tableSetColumnWidths";
@@ -668,17 +668,17 @@
 	name = "viewFit75";
 	scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 75.0));
 	name = "viewFit100";
-	scrActions->insert(name, new ScrAction(ScrAction::DataDouble, "16/zoom-original.png", "22/zoom-original.png", "", defaultKey(name), mainWindow, 100.0));
+	scrActions->insert(name, new ScrAction(ScrAction::DataDouble, "zoom-original", "zoom-original", "", defaultKey(name), mainWindow, 100.0));
 	name = "viewFit200";
 	scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 200.0));
 	name = "viewFit400";
 	scrActions->insert(name, new ScrAction(ScrAction::DataDouble, QString(), QString(), "", defaultKey(name), mainWindow, 400.0));
 	name = "viewPreviewMode";
-	scrActions->insert(name, new ScrAction("previewOn.png", "previewOn.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("preview-on", "preview-on", "", defaultKey(name), mainWindow));
 	name = "viewEditInPreview";
-	scrActions->insert(name, new ScrAction("16/editdoc.png", "16/editdoc.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("editdoc", "editdoc", "", defaultKey(name), mainWindow));
 	name = "viewToggleCMS";
-	scrActions->insert(name, new ScrAction("cmsOn.png", "cmsOn.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("cms-on", "cms-on", "", defaultKey(name), mainWindow));
 	name = "viewToggleWhiteSpaceMode";
 	scrActions->insert(name, new ScrAction("whitespace-review-mode", "whitespace-review-mode", "", defaultKey(name), mainWindow));
 	name = "viewShowMargins";
@@ -816,11 +816,11 @@
 	name = "toolsResources";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "toolsMeasurements";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/measure.png", "22/measure.png", "", defaultKey(name), mainWindow, modeMeasurementTool));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-measure", "tool-measure", "", defaultKey(name), mainWindow, modeMeasurementTool));
 	name = "toolsActionHistory";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "toolsPreflightVerifier";
-	scrActions->insert(name, new ScrAction("16/preflight-verifier.png", "22/preflight-verifier.png","", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("preflight-verifier", "preflight-verifier","", defaultKey(name), mainWindow));
 	name = "toolsAlignDistribute";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "toolsSymbols";
@@ -836,74 +836,74 @@
 
 	//toolbar only items
 	name = "toolsSelect";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/pointer.png", "22/pointer.png", "", defaultKey(name), mainWindow, modeNormal));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-select", "tool-select", "", defaultKey(name), mainWindow, modeNormal));
 	name = "toolsInsertTextFrame";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-text-frame.png", "22/insert-text-frame.png", "", defaultKey(name), mainWindow, modeDrawText));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-text-frame", "tool-insert-text-frame", "", defaultKey(name), mainWindow, modeDrawText));
 	name = "toolsInsertImageFrame";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-image.png", "22/insert-image.png", "", defaultKey(name), mainWindow, modeDrawImage));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-image", "tool-insert-image", "", defaultKey(name), mainWindow, modeDrawImage));
 	name = "toolsInsertRenderFrame";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-renderframe.png", "22/insert-renderframe.png", "", defaultKey(name), mainWindow, modeDrawLatex));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-render-frame", "tool-insert-render-frame", "", defaultKey(name), mainWindow, modeDrawLatex));
 	name = "toolsInsertTable";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-table.png", "22/insert-table.png", "", defaultKey(name), mainWindow, modeDrawTable2));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-table", "tool-insert-table", "", defaultKey(name), mainWindow, modeDrawTable2));
 	name = "toolsInsertShape";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, modeDrawShapes));
 	name = "toolsInsertPolygon";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-polygon.png", "22/draw-polygon.png", "", defaultKey(name), mainWindow, modeDrawRegularPolygon));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-polygon", "tool-insert-polygon", "", defaultKey(name), mainWindow, modeDrawRegularPolygon));
 	name = "toolsInsertArc";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-arc.png", "22/draw-arc.png", "", defaultKey(name), mainWindow, modeDrawArc));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-arc", "tool-insert-arc", "", defaultKey(name), mainWindow, modeDrawArc));
 	name = "toolsInsertSpiral";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-spiral.png", "22/draw-spiral.png", "", defaultKey(name), mainWindow, modeDrawSpiral));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-spiral", "tool-insert-spiral", "", defaultKey(name), mainWindow, modeDrawSpiral));
 	name = "toolsInsertLine";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "Stift16.png", "stift.png", "", defaultKey(name), mainWindow, modeDrawLine));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-insert-line", "tool-insert-line", "", defaultKey(name), mainWindow, modeDrawLine));
 	name = "toolsInsertBezier";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-path.png", "22/draw-path.png", "", defaultKey(name), mainWindow, modeDrawBezierLine));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-draw-bezier", "tool-draw-bezier", "", defaultKey(name), mainWindow, modeDrawBezierLine));
 	name = "toolsInsertFreehandLine";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-freehand.png", "22/draw-freehand.png", "", defaultKey(name), mainWindow, modeDrawFreehandLine));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-draw-freehand", "tool-draw-freehand", "", defaultKey(name), mainWindow, modeDrawFreehandLine));
 	name = "toolsInsertCalligraphicLine";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/draw-calligraphic.png", "22/draw-calligraphic.png", "", defaultKey(name), mainWindow, modeDrawCalligraphicLine));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-draw-calligraphy", "tool-draw-calligraphy", "", defaultKey(name), mainWindow, modeDrawCalligraphicLine));
 	name = "toolsRotate";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/transform-rotate.png", "22/transform-rotate.png", "", defaultKey(name), mainWindow, modeRotation));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-rotate", "tool-rotate", "", defaultKey(name), mainWindow, modeRotation));
 	name = "toolsZoom";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/zoom.png", "22/zoom.png", "", defaultKey(name), mainWindow, modeMagnifier));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-zoom", "tool-zoom", "", defaultKey(name), mainWindow, modeMagnifier));
 	name = "toolsZoomIn";
-	scrActions->insert(name, new ScrAction("16/zoom-in.png", "22/zoom-in.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("zoom-in", "zoom-in", "", defaultKey(name), mainWindow));
 	name = "toolsZoomOut";
-	scrActions->insert(name, new ScrAction("16/zoom-out.png", "22/zoom-out.png", "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("zoom-out", "zoom-out", "", defaultKey(name), mainWindow));
 	name = "toolsEditContents";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "Editm16.png", "editm.png", "", defaultKey(name), mainWindow, modeEdit));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-edit-content", "tool-edit-content", "", defaultKey(name), mainWindow, modeEdit));
 	name = "toolsEditWithStoryEditor";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/story-editor.png", "22/story-editor.png", "", defaultKey(name), mainWindow, modeStoryEditor));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-story-editor", "tool-story-editor", "", defaultKey(name), mainWindow, modeStoryEditor));
 	name = "toolsLinkTextFrame";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/text-frame-link.png", "22/text-frame-link.png", "", defaultKey(name), mainWindow, modeLinkFrames));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-link-text-frame", "tool-link-text-frame", "", defaultKey(name), mainWindow, modeLinkFrames));
 	name = "toolsUnlinkTextFrame";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/text-frame-unlink.png", "22/text-frame-unlink.png", "", defaultKey(name), mainWindow, modeUnlinkFrames));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-unlink-text-frame", "tool-unlink-text-frame", "", defaultKey(name), mainWindow, modeUnlinkFrames));
 	name = "toolsEyeDropper";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/color-picker.png", "22/color-picker.png", "", defaultKey(name), mainWindow, modeEyeDropper));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-color-picker", "tool-color-picker", "", defaultKey(name), mainWindow, modeEyeDropper));
 	name = "toolsCopyProperties";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "wizard16.png", "wizard.png", "", defaultKey(name), mainWindow, modeCopyProperties));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "tool-copy-style", "tool-copy-style", "", defaultKey(name), mainWindow, modeCopyProperties));
 	name = "toolsUnlinkTextFrameAndCutText";
 	scrActions->insert(name, new ScrAction(ScrAction::DataInt, QString(), QString(), "", defaultKey(name), mainWindow, modeUnlinkFrames));
 
 	//PDF toolbar
 	name = "toolsPDFPushButton";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/insert-button.png", "22/insert-button.png", "", defaultKey(name), mainWindow, modeInsertPDFButton));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-button", "pdf-button", "", defaultKey(name), mainWindow, modeInsertPDFButton));
 	name = "toolsPDFRadioButton";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/radiobutton.png", "22/radiobutton.png", "", defaultKey(name), mainWindow, modeInsertPDFRadioButton));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-radiobutton", "pdf-radiobutton", "", defaultKey(name), mainWindow, modeInsertPDFRadioButton));
 	name = "toolsPDFTextField";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/text-field.png", "22/text-field.png", "", defaultKey(name), mainWindow, modeInsertPDFTextfield));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-textfield", "pdf-textfield", "", defaultKey(name), mainWindow, modeInsertPDFTextfield));
 	name = "toolsPDFCheckBox";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/checkbox.png", "22/checkbox.png", "", defaultKey(name), mainWindow, modeInsertPDFCheckbox));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-checkbox", "pdf-checkbox", "", defaultKey(name), mainWindow, modeInsertPDFCheckbox));
 	name = "toolsPDFComboBox";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/combobox.png", "22/combobox.png", "", defaultKey(name), mainWindow, modeInsertPDFCombobox));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-combobox", "pdf-combobox", "", defaultKey(name), mainWindow, modeInsertPDFCombobox));
 	name = "toolsPDFListBox";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/list-box.png", "22/list-box.png", "", defaultKey(name), mainWindow, modeInsertPDFListbox));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-listbox", "pdf-listbox", "", defaultKey(name), mainWindow, modeInsertPDFListbox));
 	name = "toolsPDFAnnotText";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/pdf-annotations.png", "22/pdf-annotations.png", "", defaultKey(name), mainWindow, modeInsertPDFTextAnnotation));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-annotation-text", "pdf-annotation-text", "", defaultKey(name), mainWindow, modeInsertPDFTextAnnotation));
 	name = "toolsPDFAnnotLink";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "goto16.png", "goto.png", "", defaultKey(name), mainWindow, modeInsertPDFLinkAnnotation));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-annotation-link", "pdf-annotation-link", "", defaultKey(name), mainWindow, modeInsertPDFLinkAnnotation));
 #ifdef HAVE_OSG
 	name = "toolsPDFAnnot3D";
-	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "16/annot3d.png", "22/annot3d.png", "", defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
+	scrActions->insert(name, new ScrAction(ScrAction::DataInt, "pdf-annotation-3d", "pdf-annotation-3d", "", defaultKey(name), mainWindow, modeInsertPDF3DAnnotation));
 #endif
 	//Set the application wide palette shortcuts
 	(*scrActions)["toolsProperties"]->setShortcutContext(Qt::ApplicationShortcut);
@@ -1013,7 +1013,7 @@
 	name = "helpTooltips";
 	scrActions->insert(name, new ScrAction("", defaultKey(name), mainWindow));
 	name = "helpManual";
-	scrActions->insert(name, new ScrAction("16/help-browser.png", QString(), "", defaultKey(name), mainWindow));
+	scrActions->insert(name, new ScrAction("help-browser", QString(), "", defaultKey(name), mainWindow));
 	name = "helpOnlineWWW";
 	scrActions->insert(name, new ScrAction(ScrAction::DataQString, QString(), QString(), "", defaultKey(name), mainWindow, "https://www.scribus.net"));
 	name = "helpOnlineDocs";
Index: scribus/canvasgesture_pan.cpp
===================================================================
--- scribus/canvasgesture_pan.cpp	(Revision 26694)
+++ scribus/canvasgesture_pan.cpp	(Arbeitskopie)
@@ -29,7 +29,7 @@
 {
 	CanvasGesture::activate(fromGesture);
 	m_cursor = m_view->cursor();
-	m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
+	m_view->setCursor(IconManager::instance().loadCursor("cursor-hand"));
 }
 
 void PanGesture::deactivate(bool forGesture)
Index: scribus/canvasgesture_rulermove.cpp
===================================================================
--- scribus/canvasgesture_rulermove.cpp	(Revision 26694)
+++ scribus/canvasgesture_rulermove.cpp	(Arbeitskopie)
@@ -248,7 +248,7 @@
 			{ 
 				if (m_haveGuide)
 				{
-					QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png"));
+					QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point"));
 					if (mouseRelease)
 					{
 						m_doc->Pages->at(m_page)->guides.deleteHorizontal( m_guide, GuideManagerCore::Standard);
@@ -316,7 +316,7 @@
 			{ 
 				if (m_haveGuide)
 				{
-					QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png"));
+					QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point"));
 					if (mouseRelease)
 					{
 						m_doc->Pages->at(m_page)->guides.deleteVertical( m_guide, GuideManagerCore::Standard);
Index: scribus/canvasmode.cpp
===================================================================
--- scribus/canvasmode.cpp	(Revision 26694)
+++ scribus/canvasmode.cpp	(Arbeitskopie)
@@ -631,22 +631,22 @@
 		case modeDrawShapes:
 		case modeDrawArc:
 		case modeDrawSpiral:
-			cursor = im.loadCursor("drawframe.png");
+			cursor = im.loadCursor("cursor-frame");
 			break;
 		case modeDrawImage:
-			cursor = im.loadCursor("drawimageframe.png");
+			cursor = im.loadCursor("cursor-image");
 			break;
 		case modeDrawLatex:
-			cursor = im.loadCursor("drawlatexframe.png");
+			cursor = im.loadCursor("cursor-latex-frame");
 			break;
 		case modeDrawText:
-			cursor = im.loadCursor("drawtextframe.png");
+			cursor = im.loadCursor("cursor-text-frame");
 			break;
 		case modeDrawTable2:
-			cursor = im.loadCursor("drawtable.png");
+			cursor = im.loadCursor("cursor-table");
 			break;
 		case modeDrawRegularPolygon:
-			cursor = im.loadCursor("drawpolyline.png");
+			cursor = im.loadCursor("cursor-polygon");
 			break;
 		case modeDrawLine:
 		case modeDrawBezierLine:
@@ -653,28 +653,28 @@
 			cursor = QCursor(Qt::CrossCursor);
 			break;
 		case modeDrawFreehandLine:
-			cursor = im.loadCursor("DrawFreeLine.png", 0, 31);
+			cursor = im.loadCursor("cursor-pen", 0, 31);
 			break;
 		case modeDrawCalligraphicLine:
-			cursor = im.loadCursor("drawcalligraphy.png", 4, 4);
+			cursor = im.loadCursor("cursor-calligraphy", 4, 4);
 			break;
 		case modeImportObject:
-			cursor = im.loadCursor("dragpix.png");
+			cursor = im.loadCursor("cursor-drop-image");
 			break;
 		case modeMagnifier:
 			if (m_view->Magnify)
-				cursor = im.loadCursor("lupez.png");
+				cursor = im.loadCursor("cursor-zoom-in");
 			else
-				cursor = im.loadCursor("lupezm.png");
+				cursor = im.loadCursor("cursor-zoom-out");
 			break;
 		case modePanning:
-			cursor = im.loadCursor("handc.png");
+			cursor = im.loadCursor("cursor-hand");
 			break;
 		case modeEyeDropper:
-			cursor = im.loadCursor("colorpickercursor.png", 0, 31);
+			cursor = im.loadCursor("cursor-color-picker", 0, 31);
 			break;
 		case modeLinkFrames:
-			cursor = im.loadCursor("LinkTextFrame.png", 0, 31);
+			cursor = im.loadCursor("cursor-link-text-frame", 0, 31);
 			break;
 		case modeMeasurementTool:
 		case modeEditGradientVectors:
@@ -849,7 +849,7 @@
 
 	if ((m_doc->appMode == modeMagnifier) && (kk == Qt::Key_Shift))
 	{
-		m_view->setCursor(IconManager::instance().loadCursor("lupezm.png"));
+		m_view->setCursor(IconManager::instance().loadCursor("cursor-zoom-out"));
 		return;
 	}
 
@@ -1680,7 +1680,7 @@
 	if ((m_doc->appMode == modePanning) && (e->key() == Qt::Key_Control) && (QApplication::mouseButtons() & Qt::RightButton))
 		m_view->requestMode(modeNormal);
 	if ((m_doc->appMode == modeMagnifier) && (e->key() == Qt::Key_Shift))
-		m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
+		m_view->setCursor(IconManager::instance().loadCursor("cursor-zoom-in"));
 	if (e->isAutoRepeat() || !m_arrowKeyDown)
 		return;
 	switch(e->key())
Index: scribus/canvasmode_edit.cpp
===================================================================
--- scribus/canvasmode_edit.cpp	(Revision 26694)
+++ scribus/canvasmode_edit.cpp	(Arbeitskopie)
@@ -144,38 +144,38 @@
 	m_keyRepeat = false;
 }
 
-void CanvasMode_Edit::keyReleaseEvent(QKeyEvent *e)
-{
-	PageItem* currItem;
-	if (!GetItem(&currItem))
-	{
-		return;
-	}
+void CanvasMode_Edit::keyReleaseEvent(QKeyEvent *e)
+{
+	PageItem* currItem;
+	if (!GetItem(&currItem))
+	{
+		return;
+	}
 
-	if (currItem->isImageFrame() && !currItem->locked())
-	{
-		switch (e->key())
-		{
-			case Qt::Key_Up:
-			case Qt::Key_Down:
-			case Qt::Key_Left:
-			case Qt::Key_Right:
-				m_doc->changedPagePreview();
-				break;
-			default:
-				break;
-		}
-	}
+	if (currItem->isImageFrame() && !currItem->locked())
+	{
+		switch (e->key())
+		{
+			case Qt::Key_Up:
+			case Qt::Key_Down:
+			case Qt::Key_Left:
+			case Qt::Key_Right:
+				m_doc->changedPagePreview();
+				break;
+			default:
+				break;
+		}
+	}
 
-	if (currItem->isTextFrame())
-	{
-		m_doc->changedPagePreview();
-	}
-
-}
-
-
-
+	if (currItem->isTextFrame())
+	{
+		m_doc->changedPagePreview();
+	}
+
+}
+
+
+
 void CanvasMode_Edit::rulerPreview(double base, double xp)
 {
 	PageItem* currItem;
@@ -432,7 +432,7 @@
 			{
 				if (m->modifiers() & Qt::ShiftModifier)
 				{
-					m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
+					m_view->setCursor(IconManager::instance().loadCursor("cursor-rotate"));
 					QTransform p = currItem->getTransform();
 					p.translate(currItem->imageXOffset()*currItem->imageXScale(), currItem->imageYOffset()*currItem->imageYScale());
 					QPointF rotP = p.map(QPointF(0.0, 0.0));
@@ -442,7 +442,7 @@
 				}
 				else
 				{
-					m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
+					m_view->setCursor(IconManager::instance().loadCursor("cursor-hand"));
 					QTransform mm1 = currItem->getTransform();
 					QTransform mm2 = mm1.inverted();
 					QPointF rota = mm2.map(QPointF(newX, newY)) - mm2.map(QPointF(Mxp, Myp));
@@ -512,9 +512,9 @@
 						if (currItem->isImageFrame())
 						{
 							if (m->modifiers() & Qt::ShiftModifier)
-								m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
+								m_view->setCursor(IconManager::instance().loadCursor("cursor-rotate"));
 							else
-								m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
+								m_view->setCursor(IconManager::instance().loadCursor("cursor-hand"));
 						}
 					}
 				}
@@ -772,8 +772,8 @@
 			m_canvas->m_viewMode.operItemResizing = false;
 			if (currItem->isLine())
 				m_view->updateContents();
-			if (currItem->isImageFrame())
-				m_doc->changedPagePreview();
+			if (currItem->isImageFrame())
+				m_doc->changedPagePreview();
 		}
 		if (m_canvas->m_viewMode.operItemMoving)
 		{
@@ -860,7 +860,7 @@
 			//currItem->emitAllToGUI();
 			m_view->updatesOn(true);
 			m_view->updateContents();
-			m_doc->changedPagePreview();
+			m_doc->changedPagePreview();
 		}
 	}
 	//CB Drag selection performed here
Index: scribus/canvasmode_edittable.cpp
===================================================================
--- scribus/canvasmode_edittable.cpp	(Revision 26694)
+++ scribus/canvasmode_edittable.cpp	(Arbeitskopie)
@@ -40,8 +40,8 @@
 
 CanvasMode_EditTable::CanvasMode_EditTable(ScribusView* view) : CanvasMode(view),
 	m_canvasUpdateTimer(new QTimer(view)),
-	m_selectRowCursor(IconManager::instance().loadCursor("select_row.png")),
-	m_selectColumnCursor(IconManager::instance().loadCursor("select_column.png")),
+	m_selectRowCursor(IconManager::instance().loadCursor("cursor-select-row")),
+	m_selectColumnCursor(IconManager::instance().loadCursor("cursor-select-column")),
 	m_tableResizeGesture(new TableResize(this)),
 	m_rowResizeGesture(new RowResize(this)),
 	m_columnResizeGesture(new ColumnResize(this)),
Index: scribus/canvasmode_imageimport.cpp
===================================================================
--- scribus/canvasmode_imageimport.cpp	(Revision 26694)
+++ scribus/canvasmode_imageimport.cpp	(Arbeitskopie)
@@ -62,7 +62,7 @@
 void CanvasMode_ImageImport::newToolTip(const QString& name)
 {
 	QImage pm(80, 80, QImage::Format_ARGB32_Premultiplied);
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	
 	QPainter p;
 	p.begin(&pm);
@@ -169,12 +169,12 @@
 	{
 		PageItem_ImageFrame *currItem;
 		if ((currItem = item->asImageFrame()) != nullptr)
-			m_view->setCursor(IconManager::instance().loadCursor("drawimageframe.png"));
+			m_view->setCursor(IconManager::instance().loadCursor("cursor-image"));
 		else
 			m_view->setCursor(QCursor(Qt::ArrowCursor));
 	}
 	else
-		m_view->setCursor(IconManager::instance().loadCursor("drawimageframe.png"));
+		m_view->setCursor(IconManager::instance().loadCursor("cursor-image"));
 	if (commonMouseMove(m))
 		return;
 }
Index: scribus/canvasmode_magnifier.cpp
===================================================================
--- scribus/canvasmode_magnifier.cpp	(Revision 26694)
+++ scribus/canvasmode_magnifier.cpp	(Arbeitskopie)
@@ -156,12 +156,12 @@
 	if ((m->modifiers() == Qt::ShiftModifier) || (m->button() == Qt::RightButton))
 	{
 		m_view->Magnify = false;
-		m_view->setCursor(IconManager::instance().loadCursor("lupezm.png"));
+		m_view->setCursor(IconManager::instance().loadCursor("cursor-zoom-out"));
 	}
 	else
 	{
 		m_view->Magnify = true;
-		m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
+		m_view->setCursor(IconManager::instance().loadCursor("cursor-zoom-in"));
 	}
 	m_Mxp = mousePointDoc.x();
 	m_Myp = mousePointDoc.y();
@@ -213,9 +213,9 @@
 		else
 		{
 			if (m->modifiers() & Qt::ShiftModifier)
-				m_view->setCursor(IconManager::instance().loadCursor("lupezm.png"));
+				m_view->setCursor(IconManager::instance().loadCursor("cursor-zoom-out"));
 			else
-				m_view->setCursor(IconManager::instance().loadCursor("lupez.png"));
+				m_view->setCursor(IconManager::instance().loadCursor("cursor-zoom-in"));
 		}
 	}
 
Index: scribus/canvasmode_nodeedit.cpp
===================================================================
--- scribus/canvasmode_nodeedit.cpp	(Revision 26694)
+++ scribus/canvasmode_nodeedit.cpp	(Arbeitskopie)
@@ -993,9 +993,9 @@
 				if (m_doc->nodeEdit.submode() == NodeEditContext::MOVE_POINT)
 					m_view->setCursor(QCursor(Qt::SizeAllCursor));
 				if (m_doc->nodeEdit.submode() == NodeEditContext::DEL_POINT)
-					m_view->setCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+					m_view->setCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 				if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)
-					m_view->setCursor(IconManager::instance().loadCursor("Split.png", 1, 1));
+					m_view->setCursor(IconManager::instance().loadCursor("cursor-split", 1, 1));
 				return true;
 			}
 		}
@@ -1024,11 +1024,11 @@
 					if (m_canvas->hitsCanvasPoint(m->globalPosition(), FPoint(pl.x(), pl.y())))
 					{
 						if (m_doc->nodeEdit.submode() == NodeEditContext::MOVE_POINT)
-							m_view->setCursor(IconManager::instance().loadCursor("handc.png"));
+							m_view->setCursor(IconManager::instance().loadCursor("cursor-hand"));
 						else if (m_doc->nodeEdit.submode() == NodeEditContext::ADD_POINT)
-							m_view->setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
+							m_view->setCursor(IconManager::instance().loadCursor("cursor-add-point", 1, 1));
 						else if (m_doc->nodeEdit.submode() == NodeEditContext::SPLIT_PATH)
-							m_view->setCursor(IconManager::instance().loadCursor("Split.png", 1, 1));
+							m_view->setCursor(IconManager::instance().loadCursor("cursor-split", 1, 1));
 						else
 							m_view->setCursor(QCursor(Qt::ArrowCursor));
 						m_doc->nodeEdit.setClre2(poi);
Index: scribus/canvasmode_normal.cpp
===================================================================
--- scribus/canvasmode_normal.cpp	(Revision 26694)
+++ scribus/canvasmode_normal.cpp	(Arbeitskopie)
@@ -471,7 +471,7 @@
 				ScElemMimeData* md = ScriXmlDoc::writeToMimeData(m_doc, m_doc->m_Selection);
 				QDrag* dr = new QDrag(m_view);
 				dr->setMimeData(md);
-				const QPixmap& pm = IconManager::instance().loadPixmap("dragpix.png");
+				const QPixmap& pm = IconManager::instance().loadPixmap("cursor-drop-image");
 				dr->setPixmap(pm);
 			//	dr->setDragCursor(pm, Qt::CopyAction);
 			//	dr->setDragCursor(pm, Qt::MoveAction);
Index: scribus/canvasmode_rotate.cpp
===================================================================
--- scribus/canvasmode_rotate.cpp	(Revision 26694)
+++ scribus/canvasmode_rotate.cpp	(Arbeitskopie)
@@ -113,7 +113,7 @@
 		pos.setXY(ma.m11() * n.x() + ma.m21() * n.y() + ma.dx(), ma.m22() * n.y() + ma.m12() * n.x() + ma.dy());
 		rotation = item->rotation() + newAngle;
 	}
-	else if (m_rotMode != AnchorPoint::TopLeft)
+	else if (m_rotMode != AnchorPoint::TopLeft)
 	{
 		FPoint n(0,0);
 		QTransform ma;
@@ -123,42 +123,42 @@
 		double ro = newAngle - item->rotation();
 		switch (m_rotMode)
 		{
-		case AnchorPoint::None:
-		case AnchorPoint::TopLeft:
-			// No translation
-			break;
-		case AnchorPoint::Top:
-			ma.translate(item->width()/2.0, 0);
-			n = FPoint(-item->width()/2.0, 0);
-			break;
-		case AnchorPoint::TopRight:
-			ma.translate(item->width(), 0);
-			n = FPoint(-item->width(), 0);
-			break;
-		case AnchorPoint::Left:
-			ma.translate(0, item->height()/2.0);
-			n = FPoint(0, -item->height()/2.0);
-			break;
-		case AnchorPoint::Center:
+		case AnchorPoint::None:
+		case AnchorPoint::TopLeft:
+			// No translation
+			break;
+		case AnchorPoint::Top:
+			ma.translate(item->width()/2.0, 0);
+			n = FPoint(-item->width()/2.0, 0);
+			break;
+		case AnchorPoint::TopRight:
+			ma.translate(item->width(), 0);
+			n = FPoint(-item->width(), 0);
+			break;
+		case AnchorPoint::Left:
+			ma.translate(0, item->height()/2.0);
+			n = FPoint(0, -item->height()/2.0);
+			break;
+		case AnchorPoint::Center:
 			ma.translate(item->width()/2.0, item->height()/2.0);
 			n = FPoint(-item->width()/2.0, -item->height()/2.0);
 			break;
-		case AnchorPoint::Right:
-			ma.translate(item->width(), item->height()/2.0);
-			n = FPoint(-item->width(), -item->height()/2.0);
+		case AnchorPoint::Right:
+			ma.translate(item->width(), item->height()/2.0);
+			n = FPoint(-item->width(), -item->height()/2.0);
 			break;
-		case AnchorPoint::BottomLeft:
+		case AnchorPoint::BottomLeft:
 			ma.translate(0, item->height());
 			n = FPoint(0, -item->height());
 			break;
-		case AnchorPoint::Bottom:
-			ma.translate(item->width()/2.0, item->height());
-			n = FPoint(-item->width()/2.0, -item->height());
+		case AnchorPoint::Bottom:
+			ma.translate(item->width()/2.0, item->height());
+			n = FPoint(-item->width()/2.0, -item->height());
 			break;
-		case AnchorPoint::BottomRight:
-			ma.translate(item->width(), item->height());
-			n = FPoint(-item->width(), -item->height());
-			break;
+		case AnchorPoint::BottomRight:
+			ma.translate(item->width(), item->height());
+			n = FPoint(-item->width(), -item->height());
+			break;
 		}
 		ma.rotate(ro);
 		pos.setXY(ma.m11() * n.x() + ma.m21() * n.y() + ma.dx(), ma.m22() * n.y() + ma.m12() * n.x() + ma.dy());
@@ -186,7 +186,7 @@
 	m_view->MidButt  = false;
 	m_inItemRotation = false;
 	m_canvasPressCoord.setXY(-1.0, -1.0);
-	m_oldRotMode   = m_rotMode   = AnchorPoint::TopLeft;
+	m_oldRotMode   = m_rotMode   = AnchorPoint::TopLeft;
 	m_oldRotCenter = m_rotCenter = FPoint(0.0, 0.0);
 	m_startAngle   = 0.0;
 	setModeCursor();
@@ -257,12 +257,12 @@
 			m_doc->m_Selection->getGroupRect(&gxR, &gyR, &gwR, &ghR);
 			if (QRect(static_cast<int>(gx), static_cast<int>(gy), static_cast<int>(gw), static_cast<int>(gh)).intersects(mpo))
 			{
-			m_rotMode   = AnchorPoint::Center;
+			m_rotMode   = AnchorPoint::Center;
 				m_rotCenter = FPoint(gxR + gwR / 2.0, gyR + ghR / 2.0);
 				if (QRect(static_cast<int>(gx + gw) - 6, static_cast<int>(gy + gh) - 6, 6, 6).intersects(mpo))
 				{
 					m_rotCenter = FPoint(gxR, gyR);
-					m_rotMode   = AnchorPoint::TopLeft;
+					m_rotMode   = AnchorPoint::TopLeft;
 				}
 				m_doc->setRotationMode(m_rotMode);
 				m_view->RCenter = m_rotCenter;
@@ -274,7 +274,7 @@
 		{
 			QTransform mat;
 			m_canvas->Transform(currItem, mat);
-			m_rotMode   = AnchorPoint::Center;
+			m_rotMode   = AnchorPoint::Center;
 			m_rotCenter = FPoint(currItem->width() / 2, currItem->height() / 2, 0, 0, currItem->rotation(), 1, 1, false);
 //			if (!currItem->asLine())
 //			{
@@ -283,43 +283,43 @@
 					if (mat.mapRect(QRect(0, 0, 6, 6)).intersects(mpo))
 					{
 						m_rotCenter = FPoint(currItem->width(), currItem->height(), 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::BottomRight;
+						m_rotMode   = AnchorPoint::BottomRight;
 					}
-					else if (mat.mapRect(QRect(static_cast<int>(currItem->width() / 2) - 6, 0, 6, 6)).intersects(mpo))
-					{
-						m_rotCenter = FPoint((currItem->width() / 2), currItem->height(), 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::Bottom;
-					}
+					else if (mat.mapRect(QRect(static_cast<int>(currItem->width() / 2) - 6, 0, 6, 6)).intersects(mpo))
+					{
+						m_rotCenter = FPoint((currItem->width() / 2), currItem->height(), 0, 0, currItem->rotation(), 1, 1, false);
+						m_rotMode   = AnchorPoint::Bottom;
+					}
 					else if (mat.mapRect(QRect(static_cast<int>(currItem->width()) - 6, 0, 6, 6)).intersects(mpo))
 					{
 						m_rotCenter = FPoint(0, currItem->height(), 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::BottomLeft;
+						m_rotMode   = AnchorPoint::BottomLeft;
 					}
 					else if (mat.mapRect(QRect(static_cast<int>(currItem->width()) - 6, static_cast<int>(currItem->height()) - 6, 6, 6)).intersects(mpo))
 					{
 						m_rotCenter = FPoint(0, 0);
-						m_rotMode   = AnchorPoint::TopLeft;
+						m_rotMode   = AnchorPoint::TopLeft;
 					}
-					else if (mat.mapRect(QRect(static_cast<int>(currItem->width() / 2) - 6, static_cast<int>(currItem->height()) - 6, 6, 6)).intersects(mpo))
-					{
-						m_rotCenter = FPoint(currItem->width() / 2, 0, 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::Top;
-					}
+					else if (mat.mapRect(QRect(static_cast<int>(currItem->width() / 2) - 6, static_cast<int>(currItem->height()) - 6, 6, 6)).intersects(mpo))
+					{
+						m_rotCenter = FPoint(currItem->width() / 2, 0, 0, 0, currItem->rotation(), 1, 1, false);
+						m_rotMode   = AnchorPoint::Top;
+					}
 					else if (mat.mapRect(QRect(0, static_cast<int>(currItem->height()) - 6, 6, 6)).intersects(mpo))
 					{
 						m_rotCenter = FPoint(currItem->width(), 0, 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::TopRight;
+						m_rotMode   = AnchorPoint::TopRight;
 					}	
-					else if (mat.mapRect(QRect(0, static_cast<int>(currItem->height() / 2) - 6, 6, 6)).intersects(mpo))
-					{
-						m_rotCenter = FPoint(0, currItem->height() / 2, 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::Left;
-					}
-					else if (mat.mapRect(QRect(currItem->width(), static_cast<int>(currItem->height() / 2) - 6, 6, 6)).intersects(mpo))
-					{
-						m_rotCenter = FPoint(currItem->width(), currItem->height() / 2, 0, 0, currItem->rotation(), 1, 1, false);
-						m_rotMode   = AnchorPoint::Right;
-					}
+					else if (mat.mapRect(QRect(0, static_cast<int>(currItem->height() / 2) - 6, 6, 6)).intersects(mpo))
+					{
+						m_rotCenter = FPoint(0, currItem->height() / 2, 0, 0, currItem->rotation(), 1, 1, false);
+						m_rotMode   = AnchorPoint::Left;
+					}
+					else if (mat.mapRect(QRect(currItem->width(), static_cast<int>(currItem->height() / 2) - 6, 6, 6)).intersects(mpo))
+					{
+						m_rotCenter = FPoint(currItem->width(), currItem->height() / 2, 0, 0, currItem->rotation(), 1, 1, false);
+						m_rotMode   = AnchorPoint::Right;
+					}
 				}
 				m_doc->setRotationMode(m_rotMode);
 				m_view->RCenter = m_rotCenter;
@@ -445,7 +445,7 @@
 				m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh);
 				int how = m_canvas->frameHitTest(QPointF(mousePointDoc.x(), mousePointDoc.y()), QRectF(gx, gy, gw, gh));
 				if (how >= 0)
-					m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
+					m_view->setCursor(IconManager::instance().loadCursor("cursor-rotate"));
 				else
 					setModeCursor();
 				return;
@@ -462,7 +462,7 @@
 				{
 					QRect tx = p.mapRect(QRect(0, 0, static_cast<int>(currItem->width()), static_cast<int>(currItem->height())));
 					if ((tx.intersects(mpo)) && (!currItem->locked()))
-						m_view->setCursor(IconManager::instance().loadCursor("Rotieren2.png"));
+						m_view->setCursor(IconManager::instance().loadCursor("cursor-rotate"));
 				}
 			}
 		}
@@ -499,38 +499,38 @@
 		m_oldRotCenter = m_rotCenter = m_view->RCenter;
 		m_doc->m_Selection->getVisualGroupRect(&gx, &gy, &gw, &gh);
 		m_rotMode   = m_doc->rotationMode();
-
-		switch(m_rotMode){
-		case AnchorPoint::TopLeft:
+
+		switch(m_rotMode){
+		case AnchorPoint::TopLeft:
 			m_rotCenter = FPoint(gx, gy);
-			break;
-		case AnchorPoint::Top:
-			m_rotCenter = FPoint(gx + gw / 2.0, gy);
-			break;
-		case AnchorPoint::TopRight:
+			break;
+		case AnchorPoint::Top:
+			m_rotCenter = FPoint(gx + gw / 2.0, gy);
+			break;
+		case AnchorPoint::TopRight:
 			m_rotCenter = FPoint(gx + gw, gy);
-			break;
-		case AnchorPoint::Left:
-			m_rotCenter = FPoint(gx, gy + gh / 2.0);
-			break;
-		case AnchorPoint::Right:
-			m_rotCenter = FPoint(gx + gw, gy + gh / 2.0);
-			break;
-		case AnchorPoint::BottomLeft:
+			break;
+		case AnchorPoint::Left:
+			m_rotCenter = FPoint(gx, gy + gh / 2.0);
+			break;
+		case AnchorPoint::Right:
+			m_rotCenter = FPoint(gx + gw, gy + gh / 2.0);
+			break;
+		case AnchorPoint::BottomLeft:
 			m_rotCenter = FPoint(gx, gy + gh);
-			break;
-		case AnchorPoint::Bottom:
-			m_rotCenter = FPoint(gx + gw / 2.0, gy + gh);
-			break;
-		case AnchorPoint::BottomRight:
+			break;
+		case AnchorPoint::Bottom:
+			m_rotCenter = FPoint(gx + gw / 2.0, gy + gh);
+			break;
+		case AnchorPoint::BottomRight:
 			m_rotCenter = FPoint(gx + gw, gy + gh);
-			break;
-		case AnchorPoint::Center:
-		default:
-			m_rotCenter = FPoint(gx + gw / 2.0, gy + gh / 2.0);
-			break;
-		}
-
+			break;
+		case AnchorPoint::Center:
+		default:
+			m_rotCenter = FPoint(gx + gw / 2.0, gy + gh / 2.0);
+			break;
+		}
+
 	}
 }
 
@@ -538,17 +538,17 @@
 {
 	if (e->key() == Qt::Key_Up)
 	{
-		auto id = m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->selectedAnchor();
-		//id = id > 0 ? id - 1 : 4;
-		m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->setSelectedAnchor(id);
+		auto id = m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->selectedAnchor();
+		//id = id > 0 ? id - 1 : 4;
+		m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->setSelectedAnchor(id);
 		m_doc->setRotationMode(id);
 		return;
 	}
 	if (e->key() == Qt::Key_Down)
 	{
-		auto id = m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->selectedAnchor();
-		//id = (id + 1) % 5;
-		m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->setSelectedAnchor(id);
+		auto id = m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->selectedAnchor();
+		//id = (id + 1) % 5;
+		m_view->m_ScMW->propertiesPalette->xyzPal->basePointWidget->setSelectedAnchor(id);
 		m_doc->setRotationMode(id);
 		return;
 	}
Index: scribus/colorsetmanager.cpp
===================================================================
--- scribus/colorsetmanager.cpp	(Revision 26694)
+++ scribus/colorsetmanager.cpp	(Arbeitskopie)
@@ -198,7 +198,7 @@
 					{
 						item = new QTreeWidgetItem(parent);
 						item->setFlags(Qt::ItemIsEditable | Qt::ItemIsUserCheckable | Qt::ItemIsEnabled);
-						item->setIcon(0, QIcon(IconManager::instance().loadIcon("16/folder.png")));
+						item->setIcon(0, QIcon(IconManager::instance().loadIcon("folder")));
 						item->setText(0, setName);
 					}
 					searchDir(path + dirs[dc] + "/", pList, item);
@@ -221,7 +221,7 @@
 					item->setText(0, setName);
 					item->setData(0, Qt::UserRole, fi.absolutePath());
 					if ((!fi.isWritable()) || (fi.absolutePath().contains(ScPaths::applicationDataDir()+"swatches/locked")))
-						item->setIcon(0, QIcon(IconManager::instance().loadIcon("16/lock.png")));
+						item->setIcon(0, QIcon(IconManager::instance().loadIcon("lock")));
 				}
 			}
 		}
Index: scribus/fontlistmodel.cpp
===================================================================
--- scribus/fontlistmodel.cpp	(Revision 26694)
+++ scribus/fontlistmodel.cpp	(Arbeitskopie)
@@ -29,10 +29,10 @@
 void FontListModel::iconSetChange()
 {
 	IconManager& iconManager = IconManager::instance();
-	ttfFont = iconManager.loadPixmap("font_truetype16.png");
-	otfFont = iconManager.loadPixmap("font_otf16.png");
-	psFont = iconManager.loadPixmap("font_type1_16.png");
-	substFont = iconManager.loadPixmap("font_subst16.png");
+	ttfFont = iconManager.loadPixmap("font-truetype");
+	otfFont = iconManager.loadPixmap("font-otf");
+	psFont = iconManager.loadPixmap("font-postscript");
+	substFont = iconManager.loadPixmap("font-substitute");
 }
 
 void FontListModel::setFonts(QList<QString> f)
Index: scribus/pageitem.cpp
===================================================================
--- scribus/pageitem.cpp	(Revision 26694)
+++ scribus/pageitem.cpp	(Arbeitskopie)
@@ -2020,7 +2020,7 @@
 				{
 					p->save();
 					p->translate(ofx, ofy);
-					QImage ico = IconManager::instance().loadPixmap("22/dialog-warning.png").toImage();
+					QImage ico = IconManager::instance().loadPixmap("alert-warning").toImage();
 					p->drawImage(&ico);
 					p->restore();
 				}
Index: scribus/plugins/barcodegenerator/barcode.cpp
===================================================================
--- scribus/plugins/barcodegenerator/barcode.cpp	(Revision 26694)
+++ scribus/plugins/barcodegenerator/barcode.cpp	(Arbeitskopie)
@@ -31,8 +31,8 @@
 		m_actionInfo.menuAfterName = "toolsInsertRenderFrame";
 		m_actionInfo.toolbar = "Tools";
 	}
-	m_actionInfo.iconPath1 = "16/insert-barcode.png";
-	m_actionInfo.iconPath2 = "22/insert-barcode.png";
+	m_actionInfo.iconPath1 = "tool-insert-barcode";
+	m_actionInfo.iconPath2 = "tool-insert-barcode";
 	m_actionInfo.enabledOnStartup = false;
 //	m_actionInfo.forAppMode.append(modeNormal);
 	m_actionInfo.needsNumObjects = -1;
Index: scribus/plugins/barcodegenerator/barcodegenerator.cpp
===================================================================
--- scribus/plugins/barcodegenerator/barcodegenerator.cpp	(Revision 26694)
+++ scribus/plugins/barcodegenerator/barcodegenerator.cpp	(Arbeitskopie)
@@ -285,7 +285,7 @@
 
 	ui.okButton->setText(CommonStrings::tr_OK);
 	ui.cancelButton->setText(CommonStrings::tr_Cancel);
-	ui.resetButton->setIcon(IconManager::instance().loadIcon("u_undo16.png"));
+	ui.resetButton->setIcon(IconManager::instance().loadIcon("u_undo"));
 
 	if (ScCore->primaryMainWindow()->doc->PageColors.contains("Black"))
 	{
Index: scribus/plugins/export/pixmapexport/dialog.cpp
===================================================================
--- scribus/plugins/export/pixmapexport/dialog.cpp	(Revision 26694)
+++ scribus/plugins/export/pixmapexport/dialog.cpp	(Arbeitskopie)
@@ -46,7 +46,7 @@
 	DPIBox->setValue(size);
 	enlargementBox->setValue(size);
 	onePageRadio->setChecked( true );
-	pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+	pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis"));
 	rangeVal->setEnabled(false);
 	pageNrButton->setEnabled(false);
 	noBackground->setChecked(false);
Index: scribus/plugins/fontpreview/fontpreview.cpp
===================================================================
--- scribus/plugins/fontpreview/fontpreview.cpp	(Revision 26694)
+++ scribus/plugins/fontpreview/fontpreview.cpp	(Arbeitskopie)
@@ -25,7 +25,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	m_sampleItem = new SampleItem();
 	m_sampleItem->setDevicePixelRatio(devicePixelRatioF());
Index: scribus/plugins/gettext/csvim/csvdia.cpp
===================================================================
--- scribus/plugins/gettext/csvim/csvdia.cpp	(Revision 26694)
+++ scribus/plugins/gettext/csvim/csvdia.cpp	(Arbeitskopie)
@@ -25,7 +25,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr("CSV Importer Options"));
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
 
 	QBoxLayout* layout = new QVBoxLayout(this);
 	layout->setContentsMargins(9, 9, 9, 9);
Index: scribus/plugins/gettext/sxwim/sxwdia.cpp
===================================================================
--- scribus/plugins/gettext/sxwim/sxwdia.cpp	(Revision 26694)
+++ scribus/plugins/gettext/sxwim/sxwdia.cpp	(Arbeitskopie)
@@ -20,7 +20,7 @@
 SxwDialog::SxwDialog(bool update, bool prefix, bool pack) : QDialog(nullptr)
 {
 	setModal(true);
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
 	setWindowTitle( tr("OpenOffice.org Writer Importer Options"));
 
 	QBoxLayout* layout = new QVBoxLayout(this);
Index: scribus/plugins/gettext/textfilter/tfdia.cpp
===================================================================
--- scribus/plugins/gettext/textfilter/tfdia.cpp	(Revision 26694)
+++ scribus/plugins/gettext/textfilter/tfdia.cpp	(Arbeitskopie)
@@ -32,7 +32,7 @@
 tfDia::tfDia()
 {
 	setModal(true);
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
 	setWindowTitle( tr("Create filter"));
 	setMinimumWidth(524);
 	prefs = PrefsManager::instance().prefsFile->getPluginContext("TextFilter");
Index: scribus/plugins/gettext/textfilter/tffilter.cpp
===================================================================
--- scribus/plugins/gettext/textfilter/tffilter.cpp	(Revision 26694)
+++ scribus/plugins/gettext/textfilter/tffilter.cpp	(Arbeitskopie)
@@ -134,12 +134,12 @@
 // 	layout->addStretch(10);
 
 	layout->addSpacing(20);
-	removeButton = new QPushButton(IconManager::instance().loadIcon("22/list-remove.png"), nullptr, this);
+	removeButton = new QPushButton(IconManager::instance().loadIcon("list-remove"), nullptr, this);
 	removeButton->setToolTip( tr("Remove this filter row"));
 	removeButton->setMaximumSize(QSize(25,25));
 	removeButton->setMinimumSize(QSize(25,25));
 	layout->addWidget(removeButton, 0, Qt::AlignTop);
-	addButton = new QPushButton(IconManager::instance().loadIcon("22/list-add.png"), nullptr, this);
+	addButton = new QPushButton(IconManager::instance().loadIcon("list-add"), nullptr, this);
 	addButton->setToolTip( tr("Add a new filter row"));
 	addButton->setMaximumSize(QSize(25,25));
 	addButton->setMinimumSize(QSize(25,25));
Index: scribus/plugins/gettext/xtgim/fontselectdialog.cpp
===================================================================
--- scribus/plugins/gettext/xtgim/fontselectdialog.cpp	(Revision 26694)
+++ scribus/plugins/gettext/xtgim/fontselectdialog.cpp	(Arbeitskopie)
@@ -31,7 +31,7 @@
 FontSelect::FontSelect(QStringList list):QDialog(0)
 {
 	setModal(true);
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
 	setWindowTitle( tr("Select Alternate Font"));
 
 	resize(370, 83);
Index: scribus/plugins/gettext/xtgim/xtgdialog.cpp
===================================================================
--- scribus/plugins/gettext/xtgim/xtgdialog.cpp	(Revision 26694)
+++ scribus/plugins/gettext/xtgim/xtgdialog.cpp	(Arbeitskopie)
@@ -40,38 +40,38 @@
 XtgDialog::XtgDialog(bool prefix) : QDialog(0)
 {
 	setModal(true);
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
-	setWindowTitle( tr("Quark XPress Tags Importer Options"));
-
-	QBoxLayout* layout = new QVBoxLayout(this);
-	layout->setContentsMargins(9, 9, 9, 9);
-	layout->setSpacing(6);
-
-	QBoxLayout* playout = new QHBoxLayout;
-	playout->setContentsMargins(0, 0, 0, 0);
-	playout->setSpacing(6);
-	prefixCheck = new QCheckBox( tr("Use document name as a prefix for Styles"), this);
-	prefixCheck->setChecked(prefix);
-	prefixCheck->setToolTip( "<qt>" + tr("Prepend the document name to the Style name in Scribus") +"</qt>");
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
+	setWindowTitle( tr("Quark XPress Tags Importer Options"));
+
+	QBoxLayout* layout = new QVBoxLayout(this);
+	layout->setContentsMargins(9, 9, 9, 9);
+	layout->setSpacing(6);
+
+	QBoxLayout* playout = new QHBoxLayout;
+	playout->setContentsMargins(0, 0, 0, 0);
+	playout->setSpacing(6);
+	prefixCheck = new QCheckBox( tr("Use document name as a prefix for Styles"), this);
+	prefixCheck->setChecked(prefix);
+	prefixCheck->setToolTip( "<qt>" + tr("Prepend the document name to the Style name in Scribus") +"</qt>");
 	playout->addWidget(prefixCheck);
-	layout->addLayout(playout);
-
-	QBoxLayout* dlayout = new QHBoxLayout;
-	dlayout->setContentsMargins(0, 0, 0, 0);
-	dlayout->setSpacing(6);
-	doNotAskCheck = new QCheckBox( tr("Do not ask again"), this);
-	doNotAskCheck->setChecked(false);
-	doNotAskCheck->setToolTip( "<qt>" + tr("Make these settings the default and do not prompt again when importing an XPress Tags document") +"</qt>");
+	layout->addLayout(playout);
+
+	QBoxLayout* dlayout = new QHBoxLayout;
+	dlayout->setContentsMargins(0, 0, 0, 0);
+	dlayout->setSpacing(6);
+	doNotAskCheck = new QCheckBox( tr("Do not ask again"), this);
+	doNotAskCheck->setChecked(false);
+	doNotAskCheck->setToolTip( "<qt>" + tr("Make these settings the default and do not prompt again when importing an XPress Tags document") +"</qt>");
 	//dlayout->addStretch(10);
 	dlayout->addWidget(doNotAskCheck);
-	layout->addLayout(dlayout);
-
-	QBoxLayout* blayout = new QHBoxLayout;
-	blayout->setContentsMargins(0, 0, 0, 0);
-	blayout->setSpacing(6);
-	blayout->addStretch(10);
-	okButton = new QPushButton( tr("OK"), this);
-	blayout->addWidget(okButton);
+	layout->addLayout(dlayout);
+
+	QBoxLayout* blayout = new QHBoxLayout;
+	blayout->setContentsMargins(0, 0, 0, 0);
+	blayout->setSpacing(6);
+	blayout->addStretch(10);
+	okButton = new QPushButton( tr("OK"), this);
+	blayout->addWidget(okButton);
 	cancelButton = new QPushButton( tr("Cancel"), this);
 	blayout->addWidget(cancelButton);
 	layout->addLayout(blayout);
Index: scribus/plugins/import/pdf/pdfimportoptions.cpp
===================================================================
--- scribus/plugins/import/pdf/pdfimportoptions.cpp	(Revision 26694)
+++ scribus/plugins/import/pdf/pdfimportoptions.cpp	(Arbeitskopie)
@@ -17,7 +17,7 @@
 PdfImportOptions::PdfImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui::PdfImportOptions)
 {
 	ui->setupUi(this);
-	ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+	ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis"));
 
 	connect(ui->buttonBox, SIGNAL(accepted()), this, SLOT(onOkButtonClicked()));
 	connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
Index: scribus/plugins/import/xps/xpsimportoptions.cpp
===================================================================
--- scribus/plugins/import/xps/xpsimportoptions.cpp	(Revision 26694)
+++ scribus/plugins/import/xps/xpsimportoptions.cpp	(Arbeitskopie)
@@ -13,7 +13,7 @@
 XpsImportOptions::XpsImportOptions(QWidget *parent) : QDialog(parent), ui(new Ui::XpsImportOptions)
 {
 	ui->setupUi(this);
-	ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+	ui->pageSelectButton->setIcon(IconManager::instance().loadIcon("ellipsis"));
 	resize(minimumSizeHint());
 }
 
Index: scribus/plugins/picbrowser/picturebrowser.cpp
===================================================================
--- scribus/plugins/picbrowser/picturebrowser.cpp	(Revision 26694)
+++ scribus/plugins/picbrowser/picturebrowser.cpp	(Arbeitskopie)
@@ -1561,26 +1561,26 @@
 {
 	IconManager& im = IconManager::instance();
 
-	iconArrowUp = QIcon(im.loadIcon("svg/pitr_green_arrows_set_1.svg"));
-	iconArrowDown = QIcon(im.loadIcon("svg/pitr_green_arrows_set_5.svg"));
-	iconFolderBrowser = QIcon(im.loadIcon("svg/sarxos_Simple_Folder_Seek.svg"));
-	iconCollectionsBrowser = QIcon(im.loadIcon("svg/sarxos_Simple_Green_Yellow_Blue_Violet_Folders.svg"));
-	iconDocumentBrowser = QIcon(im.loadIcon("svg/sarxos_Paper_Sheets.svg"));
-	iconDocument = QIcon(im.loadIcon("doc.png"));
-	iconCollection = QIcon(im.loadIcon("cmyk.png"));
-	iconOk = QIcon(im.loadIcon("ok22.png"));
-	iconClose = QIcon(im.loadIcon("16/close.png"));
-	iconZoomPlus = QIcon(im.loadIcon("viewmagin.png"));
-	iconZoomMinus = QIcon(im.loadIcon("viewmagout.png"));
-	iconNew = QIcon(im.loadIcon("16/insert-table.png"));
-	iconNew2 = QIcon(im.loadIcon("16/document-new.png"));
-	iconEdit = QIcon(im.loadIcon("16/document-properties.png"));
-	iconRemove = QIcon(im.loadIcon("16/edit-cut.png"));
-	iconLoad = QIcon(im.loadIcon("16/document-open.png"));
-	iconSave = QIcon(im.loadIcon("16/document-save.png"));
-	iconPlus = QIcon(im.loadIcon("16/list-add.png"));
-	iconMinus = QIcon(im.loadIcon("16/list-remove.png"));
-	iconPen = QIcon(im.loadIcon("16/story-editor.png"));
+	iconArrowUp = QIcon(im.loadIcon("action-sort-alphabetical-descending"));
+	iconArrowDown = QIcon(im.loadIcon("action-sort-alphabetical-ascending"));
+	iconFolderBrowser = QIcon(im.loadIcon("folder"));
+	iconCollectionsBrowser = QIcon(im.loadIcon("image-collection"));
+	iconDocumentBrowser = QIcon(im.loadIcon("document"));
+	iconDocument = QIcon(im.loadIcon("document"));
+	iconCollection = QIcon(im.loadIcon("color-cmyk"));
+	iconOk = QIcon(im.loadIcon("ok"));
+	iconClose = QIcon(im.loadIcon("close"));
+	iconZoomPlus = QIcon(im.loadIcon("zoom-in"));
+	iconZoomMinus = QIcon(im.loadIcon("zoom-out"));
+	iconNew = QIcon(im.loadIcon("tool-insert-table"));
+	iconNew2 = QIcon(im.loadIcon("document-new"));
+	iconEdit = QIcon(im.loadIcon("document-properties"));
+	iconRemove = QIcon(im.loadIcon("edit-cut"));
+	iconLoad = QIcon(im.loadIcon("document-open"));
+	iconSave = QIcon(im.loadIcon("document-save"));
+	iconPlus = QIcon(im.loadIcon("list-add"));
+	iconMinus = QIcon(im.loadIcon("list-remove"));
+	iconPen = QIcon(im.loadIcon("tool-story-editor"));
 
 	collectionsNewCategoryButton->setIcon(iconNew);
 	collectionsNewButton->setIcon(iconNew2);
@@ -1607,7 +1607,7 @@
 
 	//moreButton->setIcon(iconArrowDown);
 
-	filterSearchDirButton->setIcon(im.loadIcon("ellipsis.png"));
+	filterSearchDirButton->setIcon(im.loadIcon("ellipsis"));
 }
 
 
Index: scribus/plugins/picbrowser/previewimage.cpp
===================================================================
--- scribus/plugins/picbrowser/previewimage.cpp	(Revision 26694)
+++ scribus/plugins/picbrowser/previewimage.cpp	(Arbeitskopie)
@@ -70,7 +70,7 @@
 
 	previewIcon = QPixmap ( size, size );
 
-	QBrush b ( QColor ( 205,205,205 ), IconManager::instance().loadPixmap( "testfill.png" ) );
+	QBrush b ( QColor ( 205,205,205 ), IconManager::instance().loadPixmap( "testfill" ) );
 
 	p.begin ( &previewIcon );
 
@@ -396,7 +396,7 @@
 
 	defaultIcon = QPixmap ( size, size );
 
-	QBrush b ( QColor ( 205,205,205 ), IconManager::instance().loadPixmap( "testfill.png" ) );
+	QBrush b ( QColor ( 205,205,205 ), IconManager::instance().loadPixmap( "testfill" ) );
 
 	p.begin ( &defaultIcon );
 
Index: scribus/plugins/saveastemplateplugin/satdialog.cpp
===================================================================
--- scribus/plugins/saveastemplateplugin/satdialog.cpp	(Revision 26694)
+++ scribus/plugins/saveastemplateplugin/satdialog.cpp	(Arbeitskopie)
@@ -67,7 +67,7 @@
 	setupUi(this);
 	setModal(true);
 	setWindowTitle( tr("Save as Template"));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	readPrefs();
 	
 	nameEdit->setText(tmplName);
Index: scribus/plugins/scriptplugin/pconsole.cpp
===================================================================
--- scribus/plugins/scriptplugin/pconsole.cpp	(Revision 26694)
+++ scribus/plugins/scriptplugin/pconsole.cpp	(Arbeitskopie)
@@ -27,7 +27,7 @@
 	: QMainWindow( parent )
 {
 	setupUi(this);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	changedLabel = new QLabel(this);
 	cursorTemplate = tr("Col: %1 Row: %2/%3");
@@ -35,11 +35,11 @@
 	statusBar()->addPermanentWidget(changedLabel);
 	statusBar()->addPermanentWidget(cursorLabel);
 
-	action_Open->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
-	action_Save->setIcon(IconManager::instance().loadIcon("16/document-save.png"));
-	actionSave_As->setIcon(IconManager::instance().loadIcon("16/document-save-as.png"));
-	action_Exit->setIcon(IconManager::instance().loadIcon("exit.png"));
-	action_Run->setIcon(IconManager::instance().loadIcon("ok.png"));
+	action_Open->setIcon(IconManager::instance().loadIcon("document-open"));
+	action_Save->setIcon(IconManager::instance().loadIcon("document-save"));
+	actionSave_As->setIcon(IconManager::instance().loadIcon("document-save-as"));
+	action_Exit->setIcon(IconManager::instance().loadIcon("exit"));
+	action_Run->setIcon(IconManager::instance().loadIcon("ok"));
 
 	action_Open->setShortcut(tr("Ctrl+O"));
 	action_Save->setShortcut(tr("Ctrl+S"));
Index: scribus/plugins/scriptplugin/prefs_scripter.cpp
===================================================================
--- scribus/plugins/scriptplugin/prefs_scripter.cpp	(Revision 26694)
+++ scribus/plugins/scriptplugin/prefs_scripter.cpp	(Arbeitskopie)
@@ -28,7 +28,7 @@
 	languageChange();
 
 	m_caption = tr("Scripter");
-	m_icon = "python_16.png";
+	m_icon = "pref-scripter";
 
 	setupSyntaxColors();
 
Index: scribus/plugins/shapes/shapepalette.cpp
===================================================================
--- scribus/plugins/shapes/shapepalette.cpp	(Revision 26694)
+++ scribus/plugins/shapes/shapepalette.cpp	(Arbeitskopie)
@@ -295,7 +295,7 @@
 
 	importButton = new QToolButton(this);
 	importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	importButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
+	importButton->setIcon(IconManager::instance().loadIcon("document-open"));
 	importButton->setIconSize(QSize(16, 16));
 	buttonLayout->addWidget( importButton );
 
@@ -304,7 +304,7 @@
 
 	closeButton = new QToolButton(this);
 	closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	closeButton->setIcon(IconManager::instance().loadIcon("16/close.png"));
+	closeButton->setIcon(IconManager::instance().loadIcon("close"));
 	closeButton->setIconSize(QSize(16, 16));
 	buttonLayout->addWidget( closeButton );
 	vLayout->addLayout( buttonLayout );
@@ -601,10 +601,10 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	importButton->setIcon(iconManager.loadIcon("16/document-open.png"));
+	importButton->setIcon(iconManager.loadIcon("document-open"));
 	importButton->setIconSize(QSize(16, 16));
 
-	closeButton->setIcon(iconManager.loadIcon("16/close.png"));
+	closeButton->setIcon(iconManager.loadIcon("close"));
 	closeButton->setIconSize(QSize(16, 16));
 }
 
Index: scribus/plugins/short-words/prefs_shortwords.cpp
===================================================================
--- scribus/plugins/short-words/prefs_shortwords.cpp	(Revision 26694)
+++ scribus/plugins/short-words/prefs_shortwords.cpp	(Arbeitskopie)
@@ -22,7 +22,7 @@
 	languageChange();
 
 	m_caption = tr("Short Words");
-	m_icon = "shortwords_16.png";
+	m_icon = "pref-shortwords";
 
 	// defaults
 	if (QFile::exists(RC_PATH_USR))
Index: scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp
===================================================================
--- scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp	(Revision 26694)
+++ scribus/plugins/tools/2geomtools/meshdistortion/meshdistortiondialog.cpp	(Arbeitskopie)
@@ -123,9 +123,9 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
-	buttonZoomOut->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-out.png")));
-	buttonZoomIn->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-in.png")));
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
+	buttonZoomOut->setIcon(QIcon(IconManager::instance().loadIcon("zoom-out")));
+	buttonZoomIn->setIcon(QIcon(IconManager::instance().loadIcon("zoom-in")));
 	m_doc = doc;
 	addItemsToScene(doc->m_Selection, doc, nullptr, nullptr);
 	for(unsigned dim = 0; dim < 2; dim++)
Index: scribus/plugins/tools/lenseffects/lensdialog.cpp
===================================================================
--- scribus/plugins/tools/lenseffects/lensdialog.cpp	(Revision 26694)
+++ scribus/plugins/tools/lenseffects/lensdialog.cpp	(Arbeitskopie)
@@ -254,8 +254,8 @@
 	setupUi(this);
 	buttonRemove->setEnabled(false);
 	setModal(true);
-	buttonZoomOut->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-out.png")));
-	buttonZoomI->setIcon(QIcon(IconManager::instance().loadIcon("16/zoom-in.png")));
+	buttonZoomOut->setIcon(QIcon(IconManager::instance().loadIcon("zoom-out")));
+	buttonZoomI->setIcon(QIcon(IconManager::instance().loadIcon("zoom-in")));
 	addItemsToScene(doc->m_Selection, doc, nullptr, nullptr);
 	previewWidget->setRenderHint(QPainter::Antialiasing);
 	previewWidget->setScene(&scene);
Index: scribus/plugins/tools/pathcut/CMakeLists.txt
===================================================================
--- scribus/plugins/tools/pathcut/CMakeLists.txt	(Revision 26694)
+++ scribus/plugins/tools/pathcut/CMakeLists.txt	(Arbeitskopie)
@@ -3,11 +3,6 @@
 	${CMAKE_SOURCE_DIR}/scribus
 )
 
-install(FILES
-	transform-crop-and-resize.png
-	DESTINATION ${ICONDIR}/1_7_0/
-)
-
 set(PATHCUT_PLUGIN_SOURCES
 	pathcut.cpp
 )
Index: scribus/plugins/tools/pathcut/pathcut.cpp
===================================================================
--- scribus/plugins/tools/pathcut/pathcut.cpp	(Revision 26694)
+++ scribus/plugins/tools/pathcut/pathcut.cpp	(Arbeitskopie)
@@ -73,8 +73,8 @@
 	m_actionInfo.text = tr("Cut Polygon");
 	m_actionInfo.helpText = tr("Cuts a Polygon with a Path.");
 	// Menu
-	m_actionInfo.iconPath1 = "22/transform-crop-and-resize.png";
-	m_actionInfo.iconPath2 = "22/transform-crop-and-resize.png";
+	m_actionInfo.iconPath1 = "transform-crop-and-resize";
+	m_actionInfo.iconPath2 = "transform-crop-and-resize";
 	m_actionInfo.menu = "ItemPathOps";
 	m_actionInfo.parentMenu = "Item";
 	m_actionInfo.subMenuName = tr("Path Tools");
Index: scribus/plugins/tools/pathfinder/CMakeLists.txt
===================================================================
--- scribus/plugins/tools/pathfinder/CMakeLists.txt	(Revision 26694)
+++ scribus/plugins/tools/pathfinder/CMakeLists.txt	(Arbeitskopie)
@@ -4,11 +4,6 @@
 )
 
 install(FILES
-	pathexclusion.png
-	pathintersection.png
-	pathparts.png
-	pathsubtraction.png
-	pathunite.png
 	DESTINATION ${ICONDIR}/1_7_0/
 )
 
Index: scribus/plugins/tools/pathfinder/pathfinderdialog.cpp
===================================================================
--- scribus/plugins/tools/pathfinder/pathfinderdialog.cpp	(Revision 26694)
+++ scribus/plugins/tools/pathfinder/pathfinderdialog.cpp	(Arbeitskopie)
@@ -38,17 +38,17 @@
 	m_doc = doc;
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(QIcon(IconManager::instance().loadIcon("AppIcon.png")));
+	setWindowIcon(QIcon(IconManager::instance().loadIcon("app-icon")));
 	opCombine->setText( QString() );
 	opSubtraction->setText( QString() );
 	opIntersection->setText( QString() );
 	opExclusion->setText( QString() );
 	opParts->setText( QString() );
-	opExclusion->setIcon(QIcon(IconManager::instance().loadIcon("pathexclusion.png")));
-	opIntersection->setIcon(QIcon(IconManager::instance().loadIcon("pathintersection.png")));
-	opParts->setIcon(QIcon(IconManager::instance().loadIcon("pathparts.png")));
-	opSubtraction->setIcon(QIcon(IconManager::instance().loadIcon("pathsubtraction.png")));
-	opCombine->setIcon(QIcon(IconManager::instance().loadIcon("pathunite.png")));
+	opExclusion->setIcon(QIcon(IconManager::instance().loadIcon("path-exclusion")));
+	opIntersection->setIcon(QIcon(IconManager::instance().loadIcon("path-intersection")));
+	opParts->setIcon(QIcon(IconManager::instance().loadIcon("path-parts")));
+	opSubtraction->setIcon(QIcon(IconManager::instance().loadIcon("path-subtraction")));
+	opCombine->setIcon(QIcon(IconManager::instance().loadIcon("path-unite")));
 	otherColorComboLine->setPixmapType(ColorCombo::fancyPixmaps);
 	otherColorComboLine->setColors(m_doc->PageColors, true);
 	otherColorComboFill->setPixmapType(ColorCombo::fancyPixmaps);
@@ -151,7 +151,7 @@
 	QPainter p;
 	p.begin(&pm);
 	p.setRenderHint(QPainter::Antialiasing, true);
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	p.fillRect(0, 0, pm.width(), pm.height(), b);
 	QRectF bb = m_input1.boundingRect().united(m_input2.boundingRect());
 	p.translate(5, 5);
@@ -170,7 +170,7 @@
 	QPainter p;
 	p.begin(&pm);
 	p.setRenderHint(QPainter::Antialiasing, true);
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	p.fillRect(0, 0, pm.width(), pm.height(), b);
 	QRectF bb = m_input1.boundingRect().united(m_input2.boundingRect());
 	p.translate(5, 5);
Index: scribus/printpreviewcreator_gdi.cpp
===================================================================
--- scribus/printpreviewcreator_gdi.cpp	(Revision 26694)
+++ scribus/printpreviewcreator_gdi.cpp	(Arbeitskopie)
@@ -93,7 +93,7 @@
 		pixmap = QPixmap(image.width(), image.height());
 		pixmap.setDevicePixelRatio(m_devicePixelRatio);
 		QPainter p;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pixmap);
 		p.fillRect(0, 0, image.width(), image.height(), b);
 		p.drawImage(0, 0, image);
Index: scribus/printpreviewcreator_pdf.cpp
===================================================================
--- scribus/printpreviewcreator_pdf.cpp	(Revision 26694)
+++ scribus/printpreviewcreator_pdf.cpp	(Arbeitskopie)
@@ -313,7 +313,7 @@
 		pixmap = QPixmap(image.width(), image.height());
 		pixmap.setDevicePixelRatio(m_devicePixelRatio);
 		QPainter p;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pixmap);
 		p.fillRect(0, 0, image.width(), image.height(), b);
 		p.drawImage(0, 0, image);
Index: scribus/printpreviewcreator_ps.cpp
===================================================================
--- scribus/printpreviewcreator_ps.cpp	(Revision 26694)
+++ scribus/printpreviewcreator_ps.cpp	(Arbeitskopie)
@@ -313,7 +313,7 @@
 		pixmap = QPixmap(image.width(), image.height());
 		pixmap.setDevicePixelRatio(m_devicePixelRatio);
 		QPainter p;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pixmap);
 		p.fillRect(0, 0, image.width(), image.height(), b);
 		p.drawImage(0, 0, image);
Index: scribus/scribus.cpp
===================================================================
--- scribus/scribus.cpp	(Revision 26694)
+++ scribus/scribus.cpp	(Arbeitskopie)
@@ -278,7 +278,7 @@
 #ifdef Q_OS_MACOS
 	//commenting this out until this is resolved :https://bugreports.qt.io/browse/QTBUG-44565
 	//ScQApp->setAttribute(Qt::AA_DontShowIconsInMenus);
-	//noIcon = IconManager::instance().loadPixmap("noicon.png");
+	//noIcon = IconManager::instance().loadPixmap("no-icon");
 #endif
 
 }
@@ -344,7 +344,7 @@
 	setWindowTitle(scribusTitle);
 	setAttribute(Qt::WA_KeyCompression, false);
 	setAttribute(Qt::WA_InputMethodEnabled, true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setObjectName("MainWindow");
 	scrActionGroups.clear();
 	scrActions.clear();
@@ -1436,9 +1436,9 @@
 	zoomInToolbarButton->setDefault( false );
 	zoomInToolbarButton->setAutoDefault( false );
 
-	zoomDefaultToolbarButton->setIcon(IconManager::instance().loadIcon("16/zoom-original.png"));
-	zoomOutToolbarButton->setIcon(IconManager::instance().loadIcon("16/zoom-out.png"));
-	zoomInToolbarButton->setIcon(IconManager::instance().loadIcon("16/zoom-in.png"));
+	zoomDefaultToolbarButton->setIcon(IconManager::instance().loadIcon("zoom-original"));
+	zoomOutToolbarButton->setIcon(IconManager::instance().loadIcon("zoom-out"));
+	zoomInToolbarButton->setIcon(IconManager::instance().loadIcon("zoom-in"));
 
 	zoomLayout->addWidget( zoomSpinBox );
 	zoomLayout->addWidget( zoomOutToolbarButton );
@@ -3046,7 +3046,7 @@
 		md->setUrls(urls);
 		QDrag* dr = new QDrag(this);
 		dr->setMimeData(md);
-		const QPixmap& dragCursor = IconManager::instance().loadPixmap("dragpix.png");
+		const QPixmap& dragCursor = IconManager::instance().loadPixmap("cursor-drop-image");
 		dr->setPixmap(dragCursor);
 		dr->exec();
 	}
@@ -8486,12 +8486,12 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	setWindowIcon(iconManager.loadIcon("AppIcon.png"));
+	setWindowIcon(iconManager.loadIcon("app-icon"));
 	setStyleSheet();
 
-	zoomDefaultToolbarButton->setIcon(iconManager.loadIcon("16/zoom-original.png"));
-	zoomOutToolbarButton->setIcon(iconManager.loadIcon("16/zoom-out.png"));
-	zoomInToolbarButton->setIcon(iconManager.loadIcon("16/zoom-in.png"));
+	zoomDefaultToolbarButton->setIcon(iconManager.loadIcon("zoom-original"));
+	zoomOutToolbarButton->setIcon(iconManager.loadIcon("zoom-out"));
+	zoomInToolbarButton->setIcon(iconManager.loadIcon("zoom-in"));
 }
 
 void ScribusMainWindow::languageChange()
Index: scribus/scribusview.cpp
===================================================================
--- scribus/scribusview.cpp	(Revision 26694)
+++ scribus/scribusview.cpp	(Arbeitskopie)
@@ -183,7 +183,7 @@
 	clockLabel->setGeometry(m_vhRulerHW + 1, height() - m_vhRulerHW - 61, 60, 60);
 	clockLabel->setVisible(false);
 
-	endEditButton = new QPushButton(IconManager::instance().loadIcon("22/exit.png"), tr("End Edit"), this);
+	endEditButton = new QPushButton(IconManager::instance().loadIcon("exit", 22), tr("End Edit"), this);
 	endEditButton->setGeometry(m_vhRulerHW + 1, height() - m_vhRulerHW - endEditButton->minimumSizeHint().height() - 1, endEditButton->minimumSizeHint().width(), endEditButton->minimumSizeHint().height());
 	endEditButton->setVisible(false);
 
@@ -1588,7 +1588,7 @@
 {
 	m_dragTimerFired = true;
 	// #0007865
-	// 	qApp->changeOverrideCursor(QCursor(loadIcon("dragpix.png")));
+	// 	qApp->changeOverrideCursor(QCursor(loadIcon("cursor-drop-image")));
 }
 
 Qt::CursorShape ScribusView::getResizeCursor(PageItem *currItem, QRect mpo, Qt::CursorShape cursorShape) const
Index: scribus/scribuswin.cpp
===================================================================
--- scribus/scribuswin.cpp	(Revision 26694)
+++ scribus/scribuswin.cpp	(Arbeitskopie)
@@ -37,7 +37,7 @@
 ScribusWin::ScribusWin(QWidget* parent, ScribusDoc* doc) :
 	QMainWindow(parent)
 {
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon2.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setAttribute(Qt::WA_DeleteOnClose);
 	m_Doc = doc;
 }
Index: scribus/ui/AdapterWidget.cpp
===================================================================
--- scribus/ui/AdapterWidget.cpp	(Revision 26694)
+++ scribus/ui/AdapterWidget.cpp	(Arbeitskopie)
@@ -69,7 +69,7 @@
 			button = 2;
 			break;
 		case Qt::RightButton:
-			qApp->setOverrideCursor(IconManager::instance().loadCursor("lupez.png"));
+			qApp->setOverrideCursor(IconManager::instance().loadCursor("cursor-zoom-in"));
 			button = 3;
 			break;
 		case Qt::NoButton:
Index: scribus/ui/about.cpp
===================================================================
--- scribus/ui/about.cpp	(Revision 26694)
+++ scribus/ui/about.cpp	(Arbeitskopie)
@@ -108,7 +108,7 @@
 	m_mode = diaMode;
 	m_firstShow = true;
 	setWindowTitle( tr("About Scribus %1").arg(ScribusAPI::getVersion()) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png", true));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setModal(true);
 	aboutLayout = new QVBoxLayout( this );
 	aboutLayout->setSpacing(6);
Index: scribus/ui/aligndistribute.cpp
===================================================================
--- scribus/ui/aligndistribute.cpp	(Revision 26694)
+++ scribus/ui/aligndistribute.cpp	(Arbeitskopie)
@@ -219,51 +219,51 @@
 {
 	IconManager& im = IconManager::instance();
 
-	ad->alignLeftOutToolButton->setIcon(im.loadIcon("align-horizontal-left-out.png"));
-	ad->buttonReferenceFirst->setIcon(im.loadIcon("22/align-to-first-selected.png"));
-	ad->buttonReferenceLast->setIcon(im.loadIcon("22/align-to-last-selected.png"));
-	ad->buttonReferencePage->setIcon(im.loadIcon("22/align-to-page.png"));
-	ad->buttonReferenceMargins->setIcon(im.loadIcon("22/align-to-margin.png"));
-	ad->buttonReferenceGuide->setIcon(im.loadIcon("22/align-to-guides.png"));
-	ad->buttonReferenceSelection->setIcon(im.loadIcon("22/align-to-last-selected-1.png"));
-	ad->buttonModeMove->setIcon(im.loadIcon("22/align-mode-move.png"));
-	ad->buttonModeResize->setIcon(im.loadIcon("22/align-mode-resize.png"));
+	ad->alignLeftOutToolButton->setIcon(im.loadIcon("align-horizontal-left-out"));
+	ad->buttonReferenceFirst->setIcon(im.loadIcon("align-to-first-selected"));
+	ad->buttonReferenceLast->setIcon(im.loadIcon("align-to-last-selected"));
+	ad->buttonReferencePage->setIcon(im.loadIcon("align-to-page"));
+	ad->buttonReferenceMargins->setIcon(im.loadIcon("align-to-margin"));
+	ad->buttonReferenceGuide->setIcon(im.loadIcon("align-to-guides"));
+	ad->buttonReferenceSelection->setIcon(im.loadIcon("align-to-last-selection"));
+	ad->buttonModeMove->setIcon(im.loadIcon("align-mode-move"));
+	ad->buttonModeResize->setIcon(im.loadIcon("align-mode-resize"));
 	QIcon reverseDistributionIcon;
-	reverseDistributionIcon.addPixmap(im.loadPixmap("22/align-reverse-distribution-right.png"), QIcon::Normal, QIcon::On);
-	reverseDistributionIcon.addPixmap(im.loadPixmap("22/align-reverse-distribution-left.png"), QIcon::Normal, QIcon::Off);
+	reverseDistributionIcon.addPixmap(im.loadPixmap("align-reverse-distribution-right"), QIcon::Normal, QIcon::On);
+	reverseDistributionIcon.addPixmap(im.loadPixmap("align-reverse-distribution-left"), QIcon::Normal, QIcon::Off);
 	ad->reverseDistributionButton->setIcon(reverseDistributionIcon);
 
-	ad->alignLeftOutToolButton->setIcon(im.loadIcon("22/align-horizontal-left-out.png"));
-	ad->alignLeftInToolButton->setIcon(im.loadIcon("22/align-horizontal-left.png"));
-	ad->alignCenterHorToolButton->setIcon(im.loadIcon("22/align-horizontal-center.png"));
-	ad->alignRightInToolButton->setIcon(im.loadIcon("22/align-horizontal-right.png"));
-	ad->alignRightOutToolButton->setIcon(im.loadIcon("22/align-horizontal-right-out.png"));
+	ad->alignLeftOutToolButton->setIcon(im.loadIcon("align-horizontal-left-out"));
+	ad->alignLeftInToolButton->setIcon(im.loadIcon("align-horizontal-left"));
+	ad->alignCenterHorToolButton->setIcon(im.loadIcon("align-horizontal-center"));
+	ad->alignRightInToolButton->setIcon(im.loadIcon("align-horizontal-right"));
+	ad->alignRightOutToolButton->setIcon(im.loadIcon("align-horizontal-right-out"));
 
-	ad->alignTopOutToolButton->setIcon(im.loadIcon("22/align-vertical-top-out.png"));
-	ad->alignTopInToolButton->setIcon(im.loadIcon("22/align-vertical-top.png"));
-	ad->alignCenterVerToolButton->setIcon(im.loadIcon("22/align-vertical-center.png"));
-	ad->alignBottomInToolButton->setIcon(im.loadIcon("22/align-vertical-bottom.png"));
-	ad->alignBottomOutToolButton->setIcon(im.loadIcon("22/align-vertical-bottom-out.png"));
+	ad->alignTopOutToolButton->setIcon(im.loadIcon("align-vertical-top-out"));
+	ad->alignTopInToolButton->setIcon(im.loadIcon("align-vertical-top"));
+	ad->alignCenterVerToolButton->setIcon(im.loadIcon("align-vertical-center"));
+	ad->alignBottomInToolButton->setIcon(im.loadIcon("align-vertical-bottom"));
+	ad->alignBottomOutToolButton->setIcon(im.loadIcon("align-vertical-bottom-out"));
 
-	ad->distributeLeftToolButton->setIcon(im.loadIcon("22/distribute-horizontal-left.png"));
-	ad->distributeCenterHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-center.png"));
-	ad->distributeRightToolButton->setIcon(im.loadIcon("22/distribute-horizontal-right.png"));
-	ad->distributeDistHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-equal.png"));
+	ad->distributeLeftToolButton->setIcon(im.loadIcon("distribute-horizontal-left"));
+	ad->distributeCenterHToolButton->setIcon(im.loadIcon("distribute-horizontal-center"));
+	ad->distributeRightToolButton->setIcon(im.loadIcon("distribute-horizontal-right"));
+	ad->distributeDistHToolButton->setIcon(im.loadIcon("distribute-horizontal-equal"));
 
-	ad->distributeBottomToolButton->setIcon(im.loadIcon("22/distribute-vertical-bottom.png"));
-	ad->distributeCenterVToolButton->setIcon(im.loadIcon("22/distribute-vertical-center.png"));
-	ad->distributeTopToolButton->setIcon(im.loadIcon("22/distribute-vertical-top.png"));
-	ad->distributeDistVToolButton->setIcon(im.loadIcon("22/distribute-vertical-equal.png"));
+	ad->distributeBottomToolButton->setIcon(im.loadIcon("distribute-vertical-bottom"));
+	ad->distributeCenterVToolButton->setIcon(im.loadIcon("distribute-vertical-center"));
+	ad->distributeTopToolButton->setIcon(im.loadIcon("distribute-vertical-top"));
+	ad->distributeDistVToolButton->setIcon(im.loadIcon("distribute-vertical-equal"));
 
-	ad->distributeAcrossPageToolButton->setIcon(im.loadIcon("22/distribute-horizontal-page.png"));
-	ad->distributeDownPageToolButton->setIcon(im.loadIcon("22/distribute-vertical-page.png"));
-	ad->distributeAcrossMarginsToolButton->setIcon(im.loadIcon("22/distribute-horizontal-margin.png"));
-	ad->distributeDownMarginsToolButton->setIcon(im.loadIcon("22/distribute-vertical-margin.png"));
-	ad->distributeDistValueHToolButton->setIcon(im.loadIcon("22/distribute-horizontal-x.png"));
-	ad->distributeDistValueVToolButton->setIcon(im.loadIcon("22/distribute-vertical-y.png"));
+	ad->distributeAcrossPageToolButton->setIcon(im.loadIcon("distribute-horizontal-page"));
+	ad->distributeDownPageToolButton->setIcon(im.loadIcon("distribute-vertical-page"));
+	ad->distributeAcrossMarginsToolButton->setIcon(im.loadIcon("distribute-horizontal-margin"));
+	ad->distributeDownMarginsToolButton->setIcon(im.loadIcon("distribute-vertical-margin"));
+	ad->distributeDistValueHToolButton->setIcon(im.loadIcon("distribute-horizontal-x"));
+	ad->distributeDistValueVToolButton->setIcon(im.loadIcon("distribute-vertical-y"));
 
-	ad->swapLeftToolButton->setIcon(im.loadIcon("22/swap-left.png"));
-	ad->swapRightToolButton->setIcon(im.loadIcon("22/swap-right.png"));
+	ad->swapLeftToolButton->setIcon(im.loadIcon("swap-left"));
+	ad->swapRightToolButton->setIcon(im.loadIcon("swap-right"));
 }
 
 void AlignDistributePalette::unitChange()
Index: scribus/ui/alignselect.cpp
===================================================================
--- scribus/ui/alignselect.cpp	(Revision 26694)
+++ scribus/ui/alignselect.cpp	(Arbeitskopie)
@@ -104,11 +104,11 @@
 {
 	IconManager& im = IconManager::instance();
 
-	TextL->setIcon(im.loadIcon("16/format-justify-left.png"));
-	TextC->setIcon(im.loadIcon("16/format-justify-center.png"));
-	TextR->setIcon(im.loadIcon("16/format-justify-right.png"));
-	TextB->setIcon(im.loadIcon("16/format-justify-fill-block.png"));
-	TextF->setIcon(im.loadIcon("16/format-justify-fill.png"));
+	TextL->setIcon(im.loadIcon("format-justify-left"));
+	TextC->setIcon(im.loadIcon("format-justify-center"));
+	TextR->setIcon(im.loadIcon("format-justify-right"));
+	TextB->setIcon(im.loadIcon("format-justify-fill-block"));
+	TextF->setIcon(im.loadIcon("format-justify-fill"));
 }
 
 void AlignSelect::languageChange()
Index: scribus/ui/annot.cpp
===================================================================
--- scribus/ui/annot.cpp	(Revision 26694)
+++ scribus/ui/annot.cpp	(Arbeitskopie)
@@ -63,7 +63,7 @@
 	setupUi(this);
 	setModal(true);
 	setWindowTitle( tr( "Field Properties" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	Width = static_cast<int>(m_doc->pageWidth());
 	Height = static_cast<int>(m_doc->pageHeight());
Index: scribus/ui/applytemplatedialog.cpp
===================================================================
--- scribus/ui/applytemplatedialog.cpp	(Revision 26694)
+++ scribus/ui/applytemplatedialog.cpp	(Arbeitskopie)
@@ -50,7 +50,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Apply Master Page" ));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	ApplyMasterPageDialogLayout = new QVBoxLayout(this);
 	ApplyMasterPageDialogLayout->setContentsMargins(9, 9, 9, 9);
 	ApplyMasterPageDialogLayout->setSpacing(6);
Index: scribus/ui/buttonicon.cpp
===================================================================
--- scribus/ui/buttonicon.cpp	(Revision 26694)
+++ scribus/ui/buttonicon.cpp	(Arbeitskopie)
@@ -28,7 +28,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Icon Placement" ) );
-	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadPixmap("app-icon"));
 
 	auto* ButtonIconLayout = new QVBoxLayout( this );
 	ButtonIconLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/charselect.cpp
===================================================================
--- scribus/ui/charselect.cpp	(Revision 26694)
+++ scribus/ui/charselect.cpp	(Arbeitskopie)
@@ -58,11 +58,11 @@
 
 void CharSelect::iconSetChange()
 {
-	enhancedDialogButton->setIcon(IconManager::instance().loadIcon("16/insert-table.png"));
-	unicodeButton->setIcon(IconManager::instance().loadIcon("find.png"));
-	uniLoadButton->setIcon(IconManager::instance().loadIcon("16/document-open.png"));
-	uniSaveButton->setIcon(IconManager::instance().loadIcon("16/document-save.png"));
-	uniClearButton->setIcon(IconManager::instance().loadIcon("16/document-new.png"));
+	enhancedDialogButton->setIcon(IconManager::instance().loadIcon("tool-insert-table"));
+	unicodeButton->setIcon(IconManager::instance().loadIcon("find"));
+	uniLoadButton->setIcon(IconManager::instance().loadIcon("document-open"));
+	uniSaveButton->setIcon(IconManager::instance().loadIcon("document-save"));
+	uniClearButton->setIcon(IconManager::instance().loadIcon("document-new"));
 }
 
 void CharSelect::setDoc(ScribusDoc* doc)
Index: scribus/ui/checkDocument.cpp
===================================================================
--- scribus/ui/checkDocument.cpp	(Revision 26694)
+++ scribus/ui/checkDocument.cpp	(Arbeitskopie)
@@ -103,9 +103,9 @@
 
 void CheckDocument::iconSetChange()
 {
-	graveError = IconManager::instance().loadPixmap("22/dialog-error.png");
-	onlyWarning = IconManager::instance().loadPixmap("22/dialog-warning.png");
-	noErrors = IconManager::instance().loadPixmap("ok.png");
+	graveError = IconManager::instance().loadPixmap("alert-error");
+	onlyWarning = IconManager::instance().loadPixmap("alert-warning");
+	noErrors = IconManager::instance().loadPixmap("alert-ok");
 }
 
 void CheckDocument::languageChange()
Index: scribus/ui/cmykfw.cpp
===================================================================
--- scribus/ui/cmykfw.cpp	(Revision 26694)
+++ scribus/ui/cmykfw.cpp	(Arbeitskopie)
@@ -61,7 +61,7 @@
 	setModal(true);
 
 	CurrSwatch.clear();
-	alertIcon = IconManager::instance().loadPixmap("alert.png");
+	alertIcon = IconManager::instance().loadPixmap("alert-warning");
 	imageA.fill( ScColorEngine::getDisplayColor(orig, m_doc));
 	if ( ScColorEngine::isOutOfGamut(orig, m_doc))
 		paintAlert(alertIcon,imageA, 2, 2);
@@ -71,7 +71,7 @@
 
 	resize( 498, 306 );
 	setWindowTitle( tr( "Edit Color" ));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	setupUi(this);
 	ColorMap->setDoc(doc);
Index: scribus/ui/colorchart.cpp
===================================================================
--- scribus/ui/colorchart.cpp	(Revision 26694)
+++ scribus/ui/colorchart.cpp	(Arbeitskopie)
@@ -175,7 +175,7 @@
 	if (doSoftProofing && doGamutCheck)
 	{
 		QPainter p;
-		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&image);
 		p.fillRect(0, 0, image.width(), image.height(), b);
 		p.end();
Index: scribus/ui/colorlistbox.cpp
===================================================================
--- scribus/ui/colorlistbox.cpp	(Revision 26694)
+++ scribus/ui/colorlistbox.cpp	(Arbeitskopie)
@@ -158,12 +158,12 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	alertIcon = iconManager.loadPixmap("alert.png");
-	cmykIcon = iconManager.loadPixmap("cmyk.png");
-	rgbIcon = iconManager.loadPixmap("rgb.png");
-	labIcon = iconManager.loadPixmap("lab.png");
-	spotIcon = iconManager.loadPixmap("spot.png");
-	regIcon = iconManager.loadPixmap("register.png");
+	alertIcon = iconManager.loadPixmap("alert-warning");
+	cmykIcon = iconManager.loadPixmap("color-cmyk");
+	rgbIcon = iconManager.loadPixmap("color-rgb");
+	labIcon = iconManager.loadPixmap("color-lab");
+	spotIcon = iconManager.loadPixmap("color-spot");
+	regIcon = iconManager.loadPixmap("color-registration");
 }
 
 int ColorListBox::initialized;
Index: scribus/ui/colorpalette.cpp
===================================================================
--- scribus/ui/colorpalette.cpp	(Revision 26694)
+++ scribus/ui/colorpalette.cpp	(Arbeitskopie)
@@ -690,7 +690,7 @@
 		VGradient gr = gradientList->value(patK[i]);
 		QImage pixm(48, 12, QImage::Format_ARGB32_Premultiplied);
 		QPainter pb;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		pb.begin(&pixm);
 		pb.fillRect(0, 0, 48, 12, b);
 		pb.end();
Index: scribus/ui/colorpicker/colorpicker_gradient_properties.cpp
===================================================================
--- scribus/ui/colorpicker/colorpicker_gradient_properties.cpp	(Revision 26694)
+++ scribus/ui/colorpicker/colorpicker_gradient_properties.cpp	(Arbeitskopie)
@@ -373,14 +373,14 @@
 void ColorPickerGradientProperties::iconSetChange()
 {
 	IconManager& im = IconManager::instance();
-	editPoints->setIcon(im.loadIcon("MoveNode.png"));
-	editControlPoints->setIcon(im.loadIcon("MoveKontrol.png"));
-	resetControlPoint->setIcon(im.loadIcon("Reset1Node.png"));
-	resetAllControlPoints->setIcon(im.loadIcon("ResetNode.png"));
-	editPPoint->setIcon(im.loadIcon("MoveNode.png"));
-	editPControlPoints->setIcon(im.loadIcon("MoveKontrol.png"));
-	resetPControlPoint->setIcon(im.loadIcon("Reset1Node.png"));
-	resetAllPControlPoints->setIcon(im.loadIcon("ResetNode.png"));
+	editPoints->setIcon(im.loadIcon("bezier-node-move"));
+	editControlPoints->setIcon(im.loadIcon("bezier-control-move"));
+	resetControlPoint->setIcon(im.loadIcon("bezier-control-reset"));
+	resetAllControlPoints->setIcon(im.loadIcon("bezier-control-reset-all"));
+	editPPoint->setIcon(im.loadIcon("bezier-node-move"));
+	editPControlPoints->setIcon(im.loadIcon("bezier-control-move"));
+	resetPControlPoint->setIcon(im.loadIcon("bezier-control-reset"));
+	resetAllPControlPoints->setIcon(im.loadIcon("bezier-control-reset-all"));
 }
 
 void ColorPickerGradientProperties::unitChange(int unitIndex)
Index: scribus/ui/colorpicker/colorpicker_pattern.cpp
===================================================================
--- scribus/ui/colorpicker/colorpicker_pattern.cpp	(Revision 26694)
+++ scribus/ui/colorpicker/colorpicker_pattern.cpp	(Arbeitskopie)
@@ -277,8 +277,8 @@
 {
 	IconManager &iconManager = IconManager::instance();
 
-	buttonFlipHorizontal->setIcon( iconManager.loadIcon("16/flip-object-horizontal.png"));
-	buttonFlipVertical->setIcon( iconManager.loadIcon("16/flip-object-vertical.png"));
+	buttonFlipHorizontal->setIcon( iconManager.loadIcon("flip-object-horizontal"));
+	buttonFlipVertical->setIcon( iconManager.loadIcon("flip-object-vertical"));
 }
 
 void ColorPickerPattern::unitChange()
Index: scribus/ui/colorsandfills.cpp
===================================================================
--- scribus/ui/colorsandfills.cpp	(Revision 26694)
+++ scribus/ui/colorsandfills.cpp	(Arbeitskopie)
@@ -78,7 +78,7 @@
 	setupUi(this);
 	setModal(true);
 
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	dataTree->setContextMenuPolicy(Qt::CustomContextMenu);
 	dataTree->setIconSize(QSize(60, 48));
 	colorItems = new QTreeWidgetItem(dataTree);
@@ -232,7 +232,7 @@
 		VGradient gr = dialogGradients.value(patK[i]);
 		QImage pixm(48, 12, QImage::Format_ARGB32);
 		QPainter pb;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		pb.begin(&pixm);
 		pb.fillRect(0, 0, 48, 12, b);
 		pb.end();
Index: scribus/ui/cupsoptions.cpp
===================================================================
--- scribus/ui/cupsoptions.cpp	(Revision 26694)
+++ scribus/ui/cupsoptions.cpp	(Arbeitskopie)
@@ -52,7 +52,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Printer Options" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setSizeGripEnabled(true);
 
 	prefs = PrefsManager::instance().prefsFile->getContext("cups_options");
Index: scribus/ui/curvewidget.cpp
===================================================================
--- scribus/ui/curvewidget.cpp	(Revision 26694)
+++ scribus/ui/curvewidget.cpp	(Arbeitskopie)
@@ -343,19 +343,19 @@
 
 	invertButton = new QPushButton( this );
 	invertButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	invertButton->setIcon( IconManager::instance().loadIcon("invert.png") );
+	invertButton->setIcon( IconManager::instance().loadIcon("invert") );
 	invertButton->setIconSize(QSize(22, 22));
 	layout1->addWidget( invertButton );
 
 	resetButton = new QPushButton( this );
 	resetButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	resetButton->setIcon( IconManager::instance().loadIcon("reload.png") );
+	resetButton->setIcon( IconManager::instance().loadIcon("reload") );
 	resetButton->setIconSize(QSize(22, 22));
 	layout1->addWidget( resetButton );
 	linearButton = new QPushButton( this );
 	QIcon ic;
-	ic.addPixmap(IconManager::instance().loadPixmap("curvebezier.png"), QIcon::Normal, QIcon::Off);
-	ic.addPixmap(IconManager::instance().loadPixmap("curvelinear.png"), QIcon::Normal, QIcon::On);
+	ic.addPixmap(IconManager::instance().loadPixmap("curve-bezier"), QIcon::Normal, QIcon::Off);
+	ic.addPixmap(IconManager::instance().loadPixmap("curve-linear"), QIcon::Normal, QIcon::On);
 	linearButton->setIcon(ic);
 	linearButton->setCheckable( true );
 	linearButton->setChecked(false);
@@ -366,13 +366,13 @@
 	layout1->addItem( spacer1 );
 
 	loadButton = new QPushButton( this );
-	loadButton->setIcon( IconManager::instance().loadIcon("22/document-open.png") );
+	loadButton->setIcon( IconManager::instance().loadIcon("document-open", 22) );
 	loadButton->setIconSize(QSize(22, 22));
 	loadButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	layout1->addWidget( loadButton );
 
 	saveButton = new QPushButton( this );
-	saveButton->setIcon( IconManager::instance().loadIcon("22/document-save-as.png") );
+	saveButton->setIcon( IconManager::instance().loadIcon("document-save-as") );
 	saveButton->setIconSize(QSize(22, 22));
 	saveButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
 	layout1->addWidget( saveButton );
Index: scribus/ui/customfdialog.cpp
===================================================================
--- scribus/ui/customfdialog.cpp	(Revision 26694)
+++ scribus/ui/customfdialog.cpp	(Arbeitskopie)
@@ -68,14 +68,14 @@
 	for (size_t i = 0; i < arraySize; ++i)
 		fmts.append(tmp[i]);
 	IconManager& im = IconManager::instance();
-	imagepm = im.loadIcon("16/image-x-generic.png");
-	pspm = im.loadIcon("postscript.png");
-	txtpm = im.loadIcon("txt.png");
-	docpm = im.loadIcon("doc.png");
-	pdfpm = im.loadIcon("pdf.png");
-	oosxdpm = im.loadIcon("ooo_draw.png");
-	oosxwpm = im.loadIcon("ooo_writer.png");
-	vectorpm = im.loadIcon("vectorgfx.png");
+	imagepm = im.loadIcon("image-x-generic");
+	pspm = im.loadIcon("file-postscript");
+	txtpm = im.loadIcon("file-txt");
+	docpm = im.loadIcon("file-doc");
+	pdfpm = im.loadIcon("file-pdf");
+	oosxdpm = im.loadIcon("file-ooo-draw");
+	oosxwpm = im.loadIcon("file-ooo-writer");
+	vectorpm = im.loadIcon("file-vectorgfx");
 }
 
 QIcon ImIconProvider::icon(const QFileInfo &fi) const
@@ -172,7 +172,7 @@
 		QString tmp2;
 		QImage im2 = im.scaled(w - 5, h - 44, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 		QPainter p;
-		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill"));
 		// Qt4 FIXME imho should be better
 		pm = pixmap();
 		p.begin(&pm);
@@ -211,7 +211,7 @@
 		desc += value2String(im.text("YSize").toDouble(), PrefsManager::instance().appPrefs.docSetupPrefs.docUnitIndex, true, true);
 		im = im.scaled(w - 5, h - 21, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 		QPainter p;
-		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill"));
 		pm = pixmap();
 		p.begin(&pm);
 		p.fillRect(0, 0, w, h - 21, b);
@@ -235,7 +235,7 @@
 		QImage im = ScPreview::create(f);
 		im = im.scaled(w - 5, h - 21, Qt::KeepAspectRatio, Qt::SmoothTransformation);
 		QPainter p;
-		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill"));
 		pm = pixmap();
 		p.begin(&pm);
 		p.fillRect(0, 0, w, h - 21, b);
@@ -286,7 +286,7 @@
 
 	setModal(true);
 	setWindowTitle(caption);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	vboxLayout = new QVBoxLayout(this);
 	vboxLayout->setSpacing(6);
 	vboxLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/cxfimportdialog.cpp
===================================================================
--- scribus/ui/cxfimportdialog.cpp	(Revision 26694)
+++ scribus/ui/cxfimportdialog.cpp	(Arbeitskopie)
@@ -17,9 +17,9 @@
 	setupUi(this);
 	setDefaultPriorities();
 	
-	buttonUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
+	buttonUp->setIcon(IconManager::instance().loadIcon("go-up"));
 	buttonUp->setEnabled(false);
-	buttonDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
+	buttonDown->setIcon(IconManager::instance().loadIcon("go-down"));
 	buttonDown->setEnabled(false);
 
 	connect(buttonUp, SIGNAL(clicked()), this, SLOT(moveUp()));
Index: scribus/ui/dasheditor.cpp
===================================================================
--- scribus/ui/dasheditor.cpp	(Revision 26694)
+++ scribus/ui/dasheditor.cpp	(Arbeitskopie)
@@ -269,7 +269,7 @@
 	// hover
 	if ((!m_mousePressed) && saveAreaRect().contains(mousePos.toPoint()) && (m_dashValues.count() < 10))
 	{
-		setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
+		setCursor(IconManager::instance().loadCursor("cursor-add-point", 1, 1));
 		for (int i = 0; i < m_stops.count(); ++i)
 		{
 			if (handleRect(static_cast<int>(m_stops[i])).contains(m->pos()))
@@ -311,7 +311,7 @@
 	}
 
 	if ((m_mousePressed) && (m_outside || mousePos.y() > saveAreaRect().height()) && (m_currentStop >= 0) && (m_stops.count() > 2))
-		QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+		QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 }
 
 void DashPreview::leaveEvent(QEvent*)
@@ -319,7 +319,7 @@
 	if (m_mousePressed)
 	{
 		if ((m_currentStop >= 0) && (m_stops.count() > 2))
-			QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+			QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 		else
 			QApplication::changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	}
Index: scribus/ui/dcolor.cpp
===================================================================
--- scribus/ui/dcolor.cpp	(Revision 26694)
+++ scribus/ui/dcolor.cpp	(Arbeitskopie)
@@ -26,7 +26,7 @@
 	setModal(true);
 	cList = colorList;
 	setWindowTitle( tr( "Delete Color" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	dialogLayout = new QVBoxLayout( this );
 	dialogLayout->setContentsMargins(9, 9, 9, 9);
 	dialogLayout->setSpacing(6);
Index: scribus/ui/delpages.cpp
===================================================================
--- scribus/ui/delpages.cpp	(Revision 26694)
+++ scribus/ui/delpages.cpp	(Arbeitskopie)
@@ -16,7 +16,7 @@
 {
 	setWindowTitle( tr( "Delete Pages" ) );
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	dialogLayout = new QVBoxLayout( this );
 	dialogLayout->setSpacing(6);
 	dialogLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/directionselect.cpp
===================================================================
--- scribus/ui/directionselect.cpp	(Revision 26694)
+++ scribus/ui/directionselect.cpp	(Arbeitskopie)
@@ -77,8 +77,8 @@
 void DirectionSelect::iconSetChange()
 {
 	IconManager& iconManager = IconManager::instance();
-	LTR->setIcon(iconManager.loadIcon("16/text-direction-ltr.png"));
-	RTL->setIcon(iconManager.loadIcon("16/text-direction-rtl.png"));
+	LTR->setIcon(iconManager.loadIcon("text-direction-ltr"));
+	RTL->setIcon(iconManager.loadIcon("text-direction-rtl"));
 }
 
 void DirectionSelect::languageChange()
Index: scribus/ui/docks/dock_panelbase.cpp
===================================================================
--- scribus/ui/docks/dock_panelbase.cpp	(Revision 26694)
+++ scribus/ui/docks/dock_panelbase.cpp	(Arbeitskopie)
@@ -87,7 +87,7 @@
 
 	if(m_iconName.isEmpty())
 	{
-		setWindowIcon(iconManager.loadPixmap("AppIcon.png"));
+		setWindowIcon(iconManager.loadPixmap("app-icon"));
 		setIcon(QIcon());
 	}
 	else
Index: scribus/ui/editor.cpp
===================================================================
--- scribus/ui/editor.cpp	(Revision 26694)
+++ scribus/ui/editor.cpp	(Arbeitskopie)
@@ -36,15 +36,15 @@
 	setWindowTitle(tr("Editor"));
 
 	IconManager& im = IconManager::instance();
-	setWindowIcon(im.loadIcon("AppIcon.png"));
+	setWindowIcon(im.loadIcon("app-icon"));
 	view = vie;
 	dirs = PrefsManager::instance().prefsFile->getContext("dirs");
 	EditorLayout = new QVBoxLayout(this);
 	EditTex = new QTextEdit(this);
-	newAct = new QAction(im.loadIcon("16/document-new.png"), tr("&New"), this);
+	newAct = new QAction(im.loadIcon("document-new"), tr("&New"), this);
 	newAct->setShortcut(tr("Ctrl+N"));
 	connect(newAct, SIGNAL(triggered()), EditTex, SLOT(clear()));
-	openAct = new QAction(im.loadIcon("16/document-open.png"), tr("&Open..."), this);
+	openAct = new QAction(im.loadIcon("document-open"), tr("&Open..."), this);
 	connect(openAct, SIGNAL(triggered()), this, SLOT(OpenScript()));
 	saveAsAct = new QAction( tr("Save &As..."), this);
 	connect(saveAsAct, SIGNAL(triggered()), this, SLOT(SaveAs()));
@@ -52,21 +52,21 @@
 	connect(saveExitAct, SIGNAL(triggered()), this, SLOT(accept()));
 	exitAct = new QAction( tr("&Exit without Saving"), this);
 	connect(exitAct, SIGNAL(triggered()), this, SLOT(reject()));
-	undoAct = new QAction(im.loadIcon("16/edit-undo.png"), tr("&Undo"), this);
+	undoAct = new QAction(im.loadIcon("edit-undo"), tr("&Undo"), this);
 	undoAct->setShortcut(tr("Ctrl+Z"));
 	connect(undoAct, SIGNAL(triggered()), EditTex, SLOT(undo()));
-	redoAct = new QAction(im.loadIcon("16/edit-redo.png"),  tr("&Redo"), this);
+	redoAct = new QAction(im.loadIcon("edit-redo"),  tr("&Redo"), this);
 	connect(redoAct, SIGNAL(triggered()), EditTex, SLOT(redo()));
-	cutAct = new QAction(im.loadIcon("16/edit-cut.png"), tr("Cu&t"), this);
+	cutAct = new QAction(im.loadIcon("edit-cut"), tr("Cu&t"), this);
 	cutAct->setShortcut(tr("Ctrl+X"));
 	connect(cutAct, SIGNAL(triggered()), EditTex, SLOT(cut()));
-	copyAct = new QAction(im.loadIcon("16/edit-copy.png"), tr("&Copy"), this);
+	copyAct = new QAction(im.loadIcon("edit-copy"), tr("&Copy"), this);
 	copyAct->setShortcut(tr("Ctrl+C"));
 	connect(copyAct, SIGNAL(triggered()), EditTex, SLOT(copy()));
-	pasteAct = new QAction(im.loadIcon("16/edit-paste.png"), tr("&Paste"), this);
+	pasteAct = new QAction(im.loadIcon("edit-paste"), tr("&Paste"), this);
 	pasteAct->setShortcut(tr("Ctrl-V"));
 	connect(pasteAct, SIGNAL(triggered()), EditTex, SLOT(paste()));
-	clearAct = new QAction(im.loadIcon("16/edit-delete.png"), tr("C&lear"), this);
+	clearAct = new QAction(im.loadIcon("edit-delete"), tr("C&lear"), this);
 	connect(clearAct, SIGNAL(triggered()), this, SLOT(del()));
 	getFieldAct = new QAction( tr("&Get Field Names"), this);
 	connect(getFieldAct, SIGNAL(triggered()), this, SLOT(GetFieldNames()));
@@ -126,16 +126,16 @@
 {
 	IconManager& im = IconManager::instance();
 
-	setWindowIcon(im.loadIcon("AppIcon.png"));
+	setWindowIcon(im.loadIcon("app-icon"));
 
-	newAct->setIcon(im.loadIcon("16/document-new.png"));
-	openAct->setIcon(im.loadIcon("16/document-open.png"));
-	undoAct->setIcon(im.loadIcon("16/edit-undo.png"));
-	redoAct->setIcon(im.loadIcon("16/edit-redo.png"));
-	cutAct->setIcon(im.loadIcon("16/edit-cut.png"));
-	copyAct->setIcon(im.loadIcon("16/edit-copy.png"));
-	pasteAct->setIcon(im.loadIcon("16/edit-paste.png"));
-	clearAct->setIcon(im.loadIcon("16/edit-delete.png"));
+	newAct->setIcon(im.loadIcon("document-new"));
+	openAct->setIcon(im.loadIcon("document-open"));
+	undoAct->setIcon(im.loadIcon("edit-undo"));
+	redoAct->setIcon(im.loadIcon("edit-redo"));
+	cutAct->setIcon(im.loadIcon("edit-cut"));
+	copyAct->setIcon(im.loadIcon("edit-copy"));
+	pasteAct->setIcon(im.loadIcon("edit-paste"));
+	clearAct->setIcon(im.loadIcon("edit-delete"));
 }
 
 void Editor::GetFieldNames()
Index: scribus/ui/effectsdialog.cpp
===================================================================
--- scribus/ui/effectsdialog.cpp	(Revision 26694)
+++ scribus/ui/effectsdialog.cpp	(Arbeitskopie)
@@ -50,7 +50,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Image Effects" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	effectsList = m_item->effectsInUse;
 
@@ -260,7 +260,7 @@
 	CurveD1Button = new QToolButton( WStackPage_8 );
 	CurveD1Button->setText( "" );
 	CurveD1Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveD1Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveD1Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveD1Button->setMenu(CurveD1Pop);
 	CurveD1Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage8Layout->addWidget( CurveD1Button, 1, 2 );
@@ -282,7 +282,7 @@
 	CurveD2Button = new QToolButton( WStackPage_8 );
 	CurveD2Button->setText( "" );
 	CurveD2Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveD2Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveD2Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveD2Button->setMenu(CurveD2Pop);
 	CurveD2Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage8Layout->addWidget( CurveD2Button, 3, 2 );
@@ -312,7 +312,7 @@
 	CurveT1Button = new QToolButton( WStackPage_9 );
 	CurveT1Button->setText( "" );
 	CurveT1Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveT1Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveT1Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveT1Button->setMenu(CurveT1Pop);
 	CurveT1Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage9Layout->addWidget( CurveT1Button, 1, 2 );
@@ -333,7 +333,7 @@
 	CurveT2Button = new QToolButton( WStackPage_9 );
 	CurveT2Button->setText( "" );
 	CurveT2Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveT2Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveT2Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveT2Button->setMenu(CurveT2Pop);
 	CurveT2Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage9Layout->addWidget( CurveT2Button, 3, 2 );
@@ -354,7 +354,7 @@
 	CurveT3Button = new QToolButton( WStackPage_9 );
 	CurveT3Button->setText( "" );
 	CurveT3Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveT3Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveT3Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveT3Button->setMenu(CurveT3Pop);
 	CurveT3Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage9Layout->addWidget( CurveT3Button, 5, 2 );
@@ -381,7 +381,7 @@
 	CurveQ1Button = new QToolButton( WStackPage_10 );
 	CurveQ1Button->setText( "" );
 	CurveQ1Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQ1Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveQ1Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveQ1Button->setMenu(CurveQ1Pop);
 	CurveQ1Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQ1Button, 1, 2 );
@@ -402,7 +402,7 @@
 	CurveQ2Button = new QToolButton( WStackPage_10 );
 	CurveQ2Button->setText( "" );
 	CurveQ2Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQ2Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveQ2Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveQ2Button->setMenu(CurveQ2Pop);
 	CurveQ2Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQ2Button, 3, 2 );
@@ -423,7 +423,7 @@
 	CurveQc3Button = new QToolButton( WStackPage_10 );
 	CurveQc3Button->setText( "" );
 	CurveQc3Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQc3Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveQc3Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveQc3Button->setMenu(CurveQc3Pop);
 	CurveQc3Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQc3Button, 5, 2 );
@@ -444,7 +444,7 @@
 	CurveQ4Button = new QToolButton( WStackPage_10 );
 	CurveQ4Button->setText( "" );
 	CurveQ4Button->setMaximumSize( QSize( 22, 22 ) );
-	CurveQ4Button->setIcon(IconManager::instance().loadIcon("curve.png"));
+	CurveQ4Button->setIcon(IconManager::instance().loadIcon("curve"));
 	CurveQ4Button->setMenu(CurveQ4Pop);
 	CurveQ4Button->setPopupMode(QToolButton::InstantPopup);
 	WStackPage10Layout->addWidget( CurveQ4Button, 7, 2 );
@@ -585,12 +585,12 @@
 	layout7->addWidget( fromEffects );
 	effectUp = new QPushButton( this );
 	effectUp->setText( "" );
-	effectUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
+	effectUp->setIcon(IconManager::instance().loadIcon("go-up"));
 	effectUp->setEnabled(false);
 	layout7->addWidget( effectUp );
 	effectDown = new QPushButton( this );
 	effectDown->setText( "" );
-	effectDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
+	effectDown->setIcon(IconManager::instance().loadIcon("go-down"));
 	effectDown->setEnabled(false);
 	layout7->addWidget( effectDown );
 
@@ -638,7 +638,7 @@
 	int x = (pixmapLabel1->width() - im.qImage().width()) / 2;
 	int y = (pixmapLabel1->height() - im.qImage().height()) / 2;
 	QPainter p;
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	p.begin(&Bild);
 	p.fillRect(0, 0, pixmapLabel1->width(), pixmapLabel1->height(), b);
 	p.drawImage(x, y, im.qImage());
@@ -747,7 +747,7 @@
 	int x = (pixmapLabel1->width() - im.qImage().width()) / 2;
 	int y = (pixmapLabel1->height() - im.qImage().height()) / 2;
 	QPainter p;
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	p.begin(&Bild);
 	p.fillRect(0, 0, pixmapLabel1->width(), pixmapLabel1->height(), b);
 	p.drawImage(x, y, im.qImage());
Index: scribus/ui/extimageprops.cpp
===================================================================
--- scribus/ui/extimageprops.cpp	(Revision 26694)
+++ scribus/ui/extimageprops.cpp	(Arbeitskopie)
@@ -37,7 +37,7 @@
 
 	setModal(false);
 	setWindowTitle( tr( "Extended Image Properties" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	if (!item->pixm.imgInfo.valid)
 		return;
Index: scribus/ui/fontcombo.cpp
===================================================================
--- scribus/ui/fontcombo.cpp	(Revision 26694)
+++ scribus/ui/fontcombo.cpp	(Arbeitskopie)
@@ -58,10 +58,10 @@
 void FontCombo::iconSetChange()
 {
 	IconManager& iconManager = IconManager::instance();
-	ttfFont = iconManager.loadPixmap("font_truetype16.png");
-	otfFont = iconManager.loadPixmap("font_otf16.png");
-	psFont = iconManager.loadPixmap("font_type1_16.png");
-	substFont = iconManager.loadPixmap("font_subst16.png");
+	ttfFont = iconManager.loadPixmap("font-truetype");
+	otfFont = iconManager.loadPixmap("font-otf");
+	psFont = iconManager.loadPixmap("font-postscript");
+	substFont = iconManager.loadPixmap("font-substitute");
 }
 
 void FontCombo::RebuildList(ScribusDoc *currentDoc, bool forAnnotation, bool forSubstitute)
@@ -170,10 +170,10 @@
 {
 	IconManager &im = IconManager::instance();
 
-	ttfFont = im.loadPixmap("font_truetype16.png");
-	otfFont = im.loadPixmap("font_otf16.png");
-	psFont = im.loadPixmap("font_type1_16.png");
-	substFont = im.loadPixmap("font_subst16.png");
+	ttfFont = im.loadPixmap("font-truetype");
+	otfFont = im.loadPixmap("font-otf");
+	psFont = im.loadPixmap("font-postscript");
+	substFont = im.loadPixmap("font-substitute");
 
 	fontFaceLabel->setPixmap(im.loadPixmap("font-face"));
 	fontStyleLabel->setPixmap(im.loadPixmap("font-style"));
Index: scribus/ui/fontreplacedialog.cpp
===================================================================
--- scribus/ui/fontreplacedialog.cpp	(Revision 26694)
+++ scribus/ui/fontreplacedialog.cpp	(Arbeitskopie)
@@ -28,7 +28,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Font Substitution" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	ReplaceList = RList;
 	FontReplaceDialogLayout = new QVBoxLayout( this );
 	FontReplaceDialogLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/gradientpreview.cpp
===================================================================
--- scribus/ui/gradientpreview.cpp	(Revision 26694)
+++ scribus/ui/gradientpreview.cpp	(Arbeitskopie)
@@ -379,7 +379,7 @@
 		if (stopAtPosition(m_mousePos.toPoint()) > -1)
 			setCursor(QCursor(Qt::SizeHorCursor));
 		else
-			setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
+			setCursor(IconManager::instance().loadCursor("cursor-add-point", 1, 1));
 	}
 
 	// Press Left Mouse
@@ -392,7 +392,7 @@
 		QList<VColorStop*> cstops = fill_gradient.colorStops();
 		// Set "remove" cursor if gradient has more than 2 stops
 		if (isMouseOutside(m->pos()) && cstops.count() > 2)
-			QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+			QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 	}
 }
 
@@ -598,7 +598,7 @@
 	}
 	QImage pixm(width() - 20, 37, QImage::Format_ARGB32_Premultiplied);
 	QPainter pb;
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	pb.begin(&pixm);
 	pb.fillRect(0, 0, pixm.width(), pixm.height(), b);
 	pb.end();
@@ -763,7 +763,7 @@
 		qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		if ((!Mpressed) && (mousePos.y() < height()) && (mousePos.y() > 43) && (mousePos.x() > 9) && (mousePos.x() < width()-9))
 		{
-			setCursor(IconManager::instance().loadCursor("AddPoint.png", 1, 1));
+			setCursor(IconManager::instance().loadCursor("cursor-add-point", 1, 1));
 			for (int yg = 0; yg < static_cast<int>(StopM.count()); ++yg)
 			{
 				fpo = QRect(static_cast<int>(StopM[yg]) - 4, 43, 8, 13);
@@ -798,7 +798,7 @@
 				repaint();
 			}
 			if ((Mpressed) && (outside || !insideRect.contains(m->pos())) && (ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
-				qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+				qApp->changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 		}
 	}
 }
@@ -810,7 +810,7 @@
 		if (Mpressed)
 		{
 			if ((ActStop > 0) && (ActStop != static_cast<int>(StopM.count()-1)))
-				qApp->changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+				qApp->changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 			else
 				qApp->changeOverrideCursor(QCursor(Qt::ArrowCursor));
 		}
Index: scribus/ui/gtdialogs.cpp
===================================================================
--- scribus/ui/gtdialogs.cpp	(Revision 26694)
+++ scribus/ui/gtdialogs.cpp	(Arbeitskopie)
@@ -50,7 +50,7 @@
 		ext.prepend(".");
 
 	setWindowTitle( tr("Choose the importer to use"));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	QBoxLayout* layout = new QVBoxLayout(this);
 
Index: scribus/ui/helpbrowser.cpp
===================================================================
--- scribus/ui/helpbrowser.cpp	(Revision 26694)
+++ scribus/ui/helpbrowser.cpp	(Arbeitskopie)
@@ -250,7 +250,7 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	setWindowIcon(iconManager.loadIcon("AppIcon.png"));
+	setWindowIcon(iconManager.loadIcon("app-icon"));
 	//Add Menus
 	fileMenu = menuBar()->addMenu("");
 	editMenu = menuBar()->addMenu("");
@@ -259,10 +259,10 @@
 
 	//Add Menu items
 #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
-	filePrint = fileMenu->addAction(iconManager.loadIcon("16/document-print.png"), "", Qt::CTRL|Qt::Key_P, this, &HelpBrowser::print);
+	filePrint = fileMenu->addAction(iconManager.loadIcon("document-print"), "", Qt::CTRL|Qt::Key_P, this, &HelpBrowser::print);
 	fileMenu->addSeparator();
-	fileExit = fileMenu->addAction(iconManager.loadIcon("exit.png"), "", Qt::CTRL|Qt::Key_W, this, &HelpBrowser::close);
-	editFind = editMenu->addAction(iconManager.loadIcon("find.png"), "", Qt::CTRL|Qt::Key_F, this, &HelpBrowser::find);
+	fileExit = fileMenu->addAction(iconManager.loadIcon("exit"), "", Qt::CTRL|Qt::Key_W, this, &HelpBrowser::close);
+	editFind = editMenu->addAction(iconManager.loadIcon("find"), "", Qt::CTRL|Qt::Key_F, this, &HelpBrowser::find);
 	editFindNext = editMenu->addAction( "", Qt::Key_F3, this, &HelpBrowser::findNext);
 	editFindPrev = editMenu->addAction( "", Qt::SHIFT|Qt::Key_F3, this, &HelpBrowser::findPrevious);
 	bookAdd = bookMenu->addAction( "", Qt::CTRL|Qt::Key_D, this, &HelpBrowser::bookmarkButton_clicked);
@@ -269,10 +269,10 @@
 	bookDel = bookMenu->addAction( "", this, &HelpBrowser::deleteBookmarkButton_clicked);
 	bookDelAll = bookMenu->addAction( "", this, &HelpBrowser::deleteAllBookmarkButton_clicked);
 #else
-	filePrint = fileMenu->addAction(iconManager.loadIcon("16/document-print.png"), "", this, SLOT(print()), Qt::CTRL | Qt::Key_P);
+	filePrint = fileMenu->addAction(iconManager.loadIcon("document-print"), "", this, SLOT(print()), Qt::CTRL | Qt::Key_P);
 	fileMenu->addSeparator();
-	fileExit = fileMenu->addAction(iconManager.loadIcon("exit.png"), "", this, SLOT(close()), Qt::CTRL | Qt::Key_W);
-	editFind = editMenu->addAction(iconManager.loadIcon("find.png"), "", this, SLOT(find()), Qt::CTRL | Qt::Key_F);
+	fileExit = fileMenu->addAction(iconManager.loadIcon("exit"), "", this, SLOT(close()), Qt::CTRL | Qt::Key_W);
+	editFind = editMenu->addAction(iconManager.loadIcon("find"), "", this, SLOT(find()), Qt::CTRL | Qt::Key_F);
 	editFindNext = editMenu->addAction("", this, SLOT(findNext()), Qt::Key_F3);
 	editFindPrev = editMenu->addAction("", this, SLOT(findPrevious()), Qt::SHIFT | Qt::Key_F3);
 	bookAdd = bookMenu->addAction("", this, SLOT(bookmarkButton_clicked()), Qt::CTRL | Qt::Key_D);
@@ -282,13 +282,13 @@
 
 	//Add Toolbar items
 #if QT_VERSION >= QT_VERSION_CHECK(6, 3, 0)
-	goHome = toolBar->addAction(iconManager.loadIcon("16/go-home.png"), "", textBrowser, &ScTextBrowser::home);
-	goBack = toolBar->addAction(iconManager.loadIcon("16/go-previous.png"), "", textBrowser, &ScTextBrowser::backward);
-	goFwd = toolBar->addAction(iconManager.loadIcon("16/go-next.png"), "", textBrowser, &ScTextBrowser::forward);
+	goHome = toolBar->addAction(iconManager.loadIcon("go-home"), "", textBrowser, &ScTextBrowser::home);
+	goBack = toolBar->addAction(iconManager.loadIcon("go-previous"), "", textBrowser, &ScTextBrowser::backward);
+	goFwd = toolBar->addAction(iconManager.loadIcon("go-next"), "", textBrowser, &ScTextBrowser::forward);
 #else
-	goHome = toolBar->addAction(iconManager.loadIcon("16/go-home.png"), "", textBrowser, SLOT(home()));
-	goBack = toolBar->addAction(iconManager.loadIcon("16/go-previous.png"), "", textBrowser, SLOT(backward()));
-	goFwd = toolBar->addAction(iconManager.loadIcon("16/go-next.png"), "", textBrowser, SLOT(forward()));
+	goHome = toolBar->addAction(iconManager.loadIcon("go-home"), "", textBrowser, SLOT(home()));
+	goBack = toolBar->addAction(iconManager.loadIcon("go-previous"), "", textBrowser, SLOT(backward()));
+	goFwd = toolBar->addAction(iconManager.loadIcon("go-next"), "", textBrowser, SLOT(forward()));
 #endif
 	goBack->setMenu(histMenu);
 	
Index: scribus/ui/hruler.cpp
===================================================================
--- scribus/ui/hruler.cpp	(Revision 26694)
+++ scribus/ui/hruler.cpp	(Arbeitskopie)
@@ -312,7 +312,7 @@
 void Hruler::enterEvent(QEnterEvent* e)
 {
 	if (m_textEditMode)
-		QApplication::changeOverrideCursor(IconManager::instance().loadCursor("tab.png", 3));
+		QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-tabulator", 3));
 }
 
 void Hruler::leaveEvent(QEvent *m)
@@ -414,7 +414,7 @@
 		}
 		if ((!m_mousePressed) && (mousePos.y() < height()) && (mousePos.y() > 0) && (mousePos.x() > colStart - 2 * m_doc->guidesPrefs().grabRadius) && (mousePos.x() < colEnd + 2 * m_doc->guidesPrefs().grabRadius))
 		{
-			setCursor(IconManager::instance().loadCursor("tab.png", 3));
+			setCursor(IconManager::instance().loadCursor("cursor-tabulator", 3));
 			switch (findRulerHandle(m->pos(), m_doc->guidesPrefs().grabRadius))
 			{
 				case rc_leftFrameDist:
@@ -445,7 +445,7 @@
 		}
 		if (m_mousePressed && (m_rulerCode == rc_tab) && ((mousePos.y() > height()) || (mousePos.y() < 0)))
 		{
-			setCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+			setCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 			return;
 		}
 		setCursor(QCursor(Qt::ArrowCursor));
Index: scribus/ui/hyask.cpp
===================================================================
--- scribus/ui/hyask.cpp	(Revision 26694)
+++ scribus/ui/hyask.cpp	(Arbeitskopie)
@@ -49,7 +49,7 @@
 
 	setModal(true);
 	setWindowTitle( tr( "Possible Hyphenation" ));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	HyAskLayout = new QVBoxLayout(this);
 	HyAskLayout->setContentsMargins(9, 9, 9, 9);
 	HyAskLayout->setSpacing(6);
Index: scribus/ui/imageinfodialog.cpp
===================================================================
--- scribus/ui/imageinfodialog.cpp	(Revision 26694)
+++ scribus/ui/imageinfodialog.cpp	(Arbeitskopie)
@@ -21,7 +21,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Image Info" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	ImageInfoDialogLayout = new QVBoxLayout( this );
 	ImageInfoDialogLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/imagelayers.cpp
===================================================================
--- scribus/ui/imagelayers.cpp	(Revision 26694)
+++ scribus/ui/imagelayers.cpp	(Arbeitskopie)
@@ -68,7 +68,7 @@
 	blendMode->setCurrentIndex(0);
 
 	layerTable->setColumnCount(3);
-	layerTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("16/show-object.png"), ""));
+	layerTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("show-object"), ""));
 	layerTable->setHorizontalHeaderItem(1, new QTableWidgetItem(IconManager::instance().loadIcon("mask"), ""));
 	layerTable->setHorizontalHeaderItem(2, new QTableWidgetItem( tr("Name")));
 	layerTable->setColumnWidth(0, 64);
Index: scribus/ui/inlinepalette.cpp
===================================================================
--- scribus/ui/inlinepalette.cpp	(Revision 26694)
+++ scribus/ui/inlinepalette.cpp	(Arbeitskopie)
@@ -264,7 +264,7 @@
 		pm2.fill(palette().color(QPalette::Base));
 		QPainter p;
 		p.begin(&pm2);
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.setBrush(b);
 		p.drawRect(0, 0, 50, 50);
 		p.drawPixmap(25 - pm.width() / 2, 25 - pm.height() / 2, pm);
Index: scribus/ui/insertTable.cpp
===================================================================
--- scribus/ui/insertTable.cpp	(Revision 26694)
+++ scribus/ui/insertTable.cpp	(Arbeitskopie)
@@ -12,7 +12,7 @@
 InsertTable::InsertTable( QWidget* parent, int maxRow, int maxCol ) : QDialog( parent )
 {
 	setWindowTitle(tr("Insert Table"));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setModal(true);
 	InsertTableLayout = new QVBoxLayout( this );
 	InsertTableLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/insertaframe.cpp
===================================================================
--- scribus/ui/insertaframe.cpp	(Revision 26694)
+++ scribus/ui/insertaframe.cpp	(Arbeitskopie)
@@ -272,7 +272,7 @@
 {
 	IconManager& im = IconManager::instance();
 
-	placementPagesRangeButton->setIcon(im.loadIcon("ellipsis.png"));
-	selectDocFileButton->setIcon(im.loadIcon("ellipsis.png"));
-	selectImageFileButton->setIcon(im.loadIcon("ellipsis.png"));
+	placementPagesRangeButton->setIcon(im.loadIcon("ellipsis"));
+	selectDocFileButton->setIcon(im.loadIcon("ellipsis"));
+	selectImageFileButton->setIcon(im.loadIcon("ellipsis"));
 }
Index: scribus/ui/inspage.cpp
===================================================================
--- scribus/ui/inspage.cpp	(Revision 26694)
+++ scribus/ui/inspage.cpp	(Arbeitskopie)
@@ -31,7 +31,7 @@
 
 	setModal(true);
 	setWindowTitle( tr( "Insert Page" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	dialogLayout = new QVBoxLayout(this);
 	dialogLayout->setSpacing(4);
Index: scribus/ui/javadocs.cpp
===================================================================
--- scribus/ui/javadocs.cpp	(Revision 26694)
+++ scribus/ui/javadocs.cpp	(Arbeitskopie)
@@ -33,7 +33,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Edit JavaScripts" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	JavaDocsLayout = new QHBoxLayout(this);
 	JavaDocsLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/layers.cpp
===================================================================
--- scribus/ui/layers.cpp	(Revision 26694)
+++ scribus/ui/layers.cpp	(Arbeitskopie)
@@ -75,12 +75,12 @@
 	IconManager& im = IconManager::instance();
 	Table = new QTableWidget(0, 8, this );
 	Table->setHorizontalHeaderItem(0, new QTableWidgetItem(""));
-	Table->setHorizontalHeaderItem(1, new QTableWidgetItem(im.loadIcon("16/show-object.png"), ""));
-	Table->setHorizontalHeaderItem(2, new QTableWidgetItem(im.loadIcon("16/document-print.png"), ""));
-	Table->setHorizontalHeaderItem(3, new QTableWidgetItem(im.loadIcon("16/lock.png"), ""));
-	Table->setHorizontalHeaderItem(4, new QTableWidgetItem(im.loadIcon("16/layer-flow-around.png"), ""));
-	Table->setHorizontalHeaderItem(5, new QTableWidgetItem(im.loadIcon("layer-outline.png"), ""));
-	Table->setHorizontalHeaderItem(6, new QTableWidgetItem(im.loadIcon("16/pointer.png"), ""));
+	Table->setHorizontalHeaderItem(1, new QTableWidgetItem(im.loadIcon("show-object"), ""));
+	Table->setHorizontalHeaderItem(2, new QTableWidgetItem(im.loadIcon("document-print"), ""));
+	Table->setHorizontalHeaderItem(3, new QTableWidgetItem(im.loadIcon("lock"), ""));
+	Table->setHorizontalHeaderItem(4, new QTableWidgetItem(im.loadIcon("layer-flow-around"), ""));
+	Table->setHorizontalHeaderItem(5, new QTableWidgetItem(im.loadIcon("layer-outline"), ""));
+	Table->setHorizontalHeaderItem(6, new QTableWidgetItem(im.loadIcon("tool-select"), ""));
 	Table->setHorizontalHeaderItem(7, new QTableWidgetItem( tr("Name")));
 
 	QHeaderView *header = Table->horizontalHeader();
@@ -117,7 +117,7 @@
 	newLayerButton->setMinimumSize( QSize( 48, 0 ) );
 	newLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	newLayerButton->setText( "" );
-	newLayerButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
+	newLayerButton->setIcon(IconManager::instance().loadIcon("list-add"));
 	Layout1->addWidget( newLayerButton );
 
 	deleteLayerButton = new QToolButton( this );
@@ -125,7 +125,7 @@
 	deleteLayerButton->setMinimumSize( QSize( 48, 0 ) );
 	deleteLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	deleteLayerButton->setText( "" );
-	deleteLayerButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
+	deleteLayerButton->setIcon(IconManager::instance().loadIcon("list-remove"));
 	Layout1->addWidget( deleteLayerButton );
 	
 	duplicateLayerButton = new QToolButton( this );
@@ -133,7 +133,7 @@
 	duplicateLayerButton->setMinimumSize( QSize( 48, 0 ) );
 	duplicateLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	duplicateLayerButton->setText( "" );
-	duplicateLayerButton->setIcon(IconManager::instance().loadIcon("16/edit-copy.png"));
+	duplicateLayerButton->setIcon(IconManager::instance().loadIcon("edit-copy"));
 	Layout1->addWidget( duplicateLayerButton );
 
 	raiseLayerButton = new QToolButton( this );
@@ -141,7 +141,7 @@
 	raiseLayerButton->setMinimumSize( QSize( 48, 0 ) );
 	raiseLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	raiseLayerButton->setText( "" );
-	raiseLayerButton->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
+	raiseLayerButton->setIcon(IconManager::instance().loadIcon("go-up"));
 	Layout1->addWidget( raiseLayerButton );
 
 	lowerLayerButton = new QToolButton( this );
@@ -149,7 +149,7 @@
 	lowerLayerButton->setMinimumSize( QSize( 48, 0 ) );
 	lowerLayerButton->setMaximumSize( QSize( 48, 16777215 ) );
 	lowerLayerButton->setText( "" );
-	lowerLayerButton->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
+	lowerLayerButton->setIcon(IconManager::instance().loadIcon("go-down"));
 	Layout1->addWidget( lowerLayerButton );
 
 	LayerPaletteLayout->addLayout( Layout1 );
@@ -696,18 +696,18 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	Table->horizontalHeaderItem(1)->setIcon(iconManager.loadIcon("16/show-object.png"));
-	Table->horizontalHeaderItem(2)->setIcon(iconManager.loadIcon("16/document-print.png"));
-	Table->horizontalHeaderItem(3)->setIcon(iconManager.loadIcon("16/lock.png"));
-	Table->horizontalHeaderItem(4)->setIcon(iconManager.loadIcon("16/layer-flow-around.png"));
-	Table->horizontalHeaderItem(5)->setIcon(iconManager.loadIcon("layer-outline.png"));
-	Table->horizontalHeaderItem(6)->setIcon(iconManager.loadIcon("16/pointer.png"));
+	Table->horizontalHeaderItem(1)->setIcon(iconManager.loadIcon("show-object"));
+	Table->horizontalHeaderItem(2)->setIcon(iconManager.loadIcon("document-print"));
+	Table->horizontalHeaderItem(3)->setIcon(iconManager.loadIcon("lock"));
+	Table->horizontalHeaderItem(4)->setIcon(iconManager.loadIcon("layer-flow-around"));
+	Table->horizontalHeaderItem(5)->setIcon(iconManager.loadIcon("layer-outline"));
+	Table->horizontalHeaderItem(6)->setIcon(iconManager.loadIcon("tool-select"));
 
-	newLayerButton->setIcon(iconManager.loadIcon("16/list-add.png"));
-	deleteLayerButton->setIcon(iconManager.loadIcon("16/list-remove.png"));
-	duplicateLayerButton->setIcon(iconManager.loadIcon("16/edit-copy.png"));
-	raiseLayerButton->setIcon(iconManager.loadIcon("16/go-up.png"));
-	lowerLayerButton->setIcon(iconManager.loadIcon("16/go-down.png"));
+	newLayerButton->setIcon(iconManager.loadIcon("list-add"));
+	deleteLayerButton->setIcon(iconManager.loadIcon("list-remove"));
+	duplicateLayerButton->setIcon(iconManager.loadIcon("edit-copy"));
+	raiseLayerButton->setIcon(iconManager.loadIcon("go-up"));
+	lowerLayerButton->setIcon(iconManager.loadIcon("go-down"));
 }
 
 void LayerPalette::languageChange()
Index: scribus/ui/linkbutton.cpp
===================================================================
--- scribus/ui/linkbutton.cpp	(Revision 26694)
+++ scribus/ui/linkbutton.cpp	(Arbeitskopie)
@@ -42,7 +42,7 @@
 	QIcon a = QIcon();
 	IconManager& iconManager = IconManager::instance();
 
-	a.addPixmap(iconManager.loadPixmap("chain-closed.png"), QIcon::Normal, QIcon::On);
-	a.addPixmap(iconManager.loadPixmap("chain-open.png"), QIcon::Normal, QIcon::Off);
+	a.addPixmap(iconManager.loadPixmap("chain-closed"), QIcon::Normal, QIcon::On);
+	a.addPixmap(iconManager.loadPixmap("chain-open"), QIcon::Normal, QIcon::Off);
 	setIcon(a);
 }
Index: scribus/ui/loremipsum.cpp
===================================================================
--- scribus/ui/loremipsum.cpp	(Revision 26694)
+++ scribus/ui/loremipsum.cpp	(Arbeitskopie)
@@ -132,7 +132,7 @@
 	m_Doc = doc;
 	setModal(true);
 	setWindowTitle( tr( "Lorem Ipsum" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	LoremManagerLayout = new QGridLayout(this) ;
 	LoremManagerLayout->setContentsMargins(9, 9, 9, 9);
 	LoremManagerLayout->setSpacing(6);
Index: scribus/ui/mergedoc.cpp
===================================================================
--- scribus/ui/mergedoc.cpp	(Revision 26694)
+++ scribus/ui/mergedoc.cpp	(Arbeitskopie)
@@ -36,7 +36,7 @@
 	masterPages = importMasterPages;
 	setModal(true);
 	setWindowTitle((masterPages) ? tr("Import Master Page") : tr( "Import Page(s)" ));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	dialogLayout = new QVBoxLayout(this);
 	dialogLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/missing.cpp
===================================================================
--- scribus/ui/missing.cpp	(Revision 26694)
+++ scribus/ui/missing.cpp	(Arbeitskopie)
@@ -23,7 +23,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr("Missing Font"));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	missingFontLayout = new QHBoxLayout( this );
 	missingFontLayout->setContentsMargins(9, 9, 9, 9);
 	missingFontLayout->setSpacing(6);
Index: scribus/ui/movepage.cpp
===================================================================
--- scribus/ui/movepage.cpp	(Revision 26694)
+++ scribus/ui/movepage.cpp	(Arbeitskopie)
@@ -26,7 +26,7 @@
 {
 	move = moving;	
 	setWindowTitle (move ? tr("Move Pages") : tr("Copy Page"));
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setModal(true);
 	dialogLayout = new QVBoxLayout( this );
 	dialogLayout->setSpacing(6);
Index: scribus/ui/multipleduplicate.cpp
===================================================================
--- scribus/ui/multipleduplicate.cpp	(Revision 26694)
+++ scribus/ui/multipleduplicate.cpp	(Arbeitskopie)
@@ -55,7 +55,7 @@
 	createGapRadioButton->setChecked(true);
 	setCopiesGap();
 
-	toolButtonPageRange->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+	toolButtonPageRange->setIcon(IconManager::instance().loadIcon("ellipsis"));
 	radioButtonPageAll->setChecked(true);
 
 	// signals and slots connections
Index: scribus/ui/newdocdialog.cpp
===================================================================
--- scribus/ui/newdocdialog.cpp	(Revision 26694)
+++ scribus/ui/newdocdialog.cpp	(Arbeitskopie)
@@ -66,7 +66,7 @@
 
 	buttonVertical->setIcon(iconManager.loadIcon("page-orientation-vertical"));
 	buttonHorizontal->setIcon(iconManager.loadIcon("page-orientation-horizontal"));
-	buttonSinglePage->setIcon(iconManager.loadIcon("16/page-simple.png"));
+	buttonSinglePage->setIcon(iconManager.loadIcon("page-simple"));
 	buttonDoublePageLeft->setIcon(iconManager.loadIcon("page-first-left"));
 	buttonDoublePageRight->setIcon(iconManager.loadIcon("page-first-right"));
 	labelColumns->setPixmap(iconManager.loadPixmap("paragraph-columns"));
Index: scribus/ui/newtemp.cpp
===================================================================
--- scribus/ui/newtemp.cpp	(Revision 26694)
+++ scribus/ui/newtemp.cpp	(Arbeitskopie)
@@ -26,7 +26,7 @@
 {
 	setModal(true);
 	setWindowTitle(title);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	QueryLayout = new QVBoxLayout( this );
 	QueryLayout->setSpacing(6);
 	QueryLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/nftdialog.cpp
===================================================================
--- scribus/ui/nftdialog.cpp	(Revision 26694)
+++ scribus/ui/nftdialog.cpp	(Arbeitskopie)
@@ -19,7 +19,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	nftGui->setupSettings(lang);
 	buttonBox->button(QDialogButtonBox::Cancel)->setDefault(true);
 	buttonBox->button(QDialogButtonBox::Ok)->setDisabled(true);
Index: scribus/ui/nftwidget.cpp
===================================================================
--- scribus/ui/nftwidget.cpp	(Revision 26694)
+++ scribus/ui/nftwidget.cpp	(Arbeitskopie)
@@ -36,9 +36,9 @@
 	tnailGrid->addAction(removeAction);
 	tnailGrid->addAction(openAction);
 	setupAbout();
-	toolBox->setItemIcon(0, IconManager::instance().loadIcon("16/information.png"));
-	toolBox->setItemIcon(1, IconManager::instance().loadIcon("16/image-x-generic.png"));
-	toolBox->setItemIcon(2, IconManager::instance().loadIcon("16/help-browser.png"));
+	toolBox->setItemIcon(0, IconManager::instance().loadIcon("information"));
+	toolBox->setItemIcon(1, IconManager::instance().loadIcon("image-x-generic"));
+	toolBox->setItemIcon(2, IconManager::instance().loadIcon("help-browser"));
 	tnailGrid->setIconSize(QSize(ICONSIZE, ICONSIZE));
 	tnailGrid->setGridSize(QSize(160, 160));
 	tnailGrid->setResizeMode(QListView::Adjust);
Index: scribus/ui/nodeeditpalette.cpp
===================================================================
--- scribus/ui/nodeeditpalette.cpp	(Revision 26694)
+++ scribus/ui/nodeeditpalette.cpp	(Arbeitskopie)
@@ -303,7 +303,7 @@
 	hboxLayout = new QHBoxLayout();
 	hboxLayout->setSpacing(6);
 	hboxLayout->setContentsMargins(0, 0, 0, 0);
-	editEditButton = new QPushButton(IconManager::instance().loadIcon("22/exit.png"), tr("OK"), this);
+	editEditButton = new QPushButton(IconManager::instance().loadIcon("exit"), tr("OK"), this);
 	editEditButton->setEnabled(true);
 	editEditButton->setDefault(true);
 	hboxLayout->addWidget(editEditButton);
@@ -1069,28 +1069,28 @@
 {
 	IconManager& im = IconManager::instance();
 
-	MoveNode->setIcon(im.loadIcon("MoveNode.png"));
-	AddNode->setIcon(im.loadIcon("AddNode.png"));
-	DeleteNode->setIcon(im.loadIcon("DeleteNode.png"));
-	ResNode->setIcon(im.loadIcon("ResetNode.png"));
-	MoveControl->setIcon(im.loadIcon("MoveKontrol.png"));
-	AsymMove->setIcon(im.loadIcon("MoveAsym.png"));
-	SymMove->setIcon(im.loadIcon("MoveSym.png"));
-	Res1Node->setIcon(im.loadIcon("Reset1Node.png"));
-	PolySplit->setIcon(im.loadIcon("PolyCut.png"));
-	BezierClose->setIcon(im.loadIcon("BezierClose.png"));
-	PolyMirrorH->setIcon(im.loadIcon("hmirror.png"));
-	PolyMirrorV->setIcon(im.loadIcon("vmirror.png"));
-	PolyShearL->setIcon(im.loadIcon("22/transform-shear-left.png"));
-	PolyShearR->setIcon(im.loadIcon("22/transform-shear-right.png"));
-	PolyShearU->setIcon(im.loadIcon("22/transform-shear-up.png"));
-	PolyShearD->setIcon(im.loadIcon("22/transform-shear-down.png"));
-	RotateCCW->setIcon(im.loadIcon("rotate_ccw.png"));
-	RotateCW->setIcon(im.loadIcon("rotate_cw.png"));
-	Expand->setIcon(im.loadIcon("expand.png"));
-	Shrink->setIcon(im.loadIcon("crop.png"));
-	Enlarge->setIcon(im.loadIcon("expand.png"));
-	Reduce->setIcon(im.loadIcon("crop.png"));
+	MoveNode->setIcon(im.loadIcon("bezier-node-move"));
+	AddNode->setIcon(im.loadIcon("bezier-node-add"));
+	DeleteNode->setIcon(im.loadIcon("bezier-node-delete"));
+	ResNode->setIcon(im.loadIcon("bezier-control-reset-all"));
+	MoveControl->setIcon(im.loadIcon("bezier-control-move"));
+	AsymMove->setIcon(im.loadIcon("bezier-control-asymetric"));
+	SymMove->setIcon(im.loadIcon("bezier-control-symetric"));
+	Res1Node->setIcon(im.loadIcon("bezier-control-reset"));
+	PolySplit->setIcon(im.loadIcon("bezier-split"));
+	BezierClose->setIcon(im.loadIcon("bezier-close"));
+	PolyMirrorH->setIcon(im.loadIcon("object-flip-horizontal"));
+	PolyMirrorV->setIcon(im.loadIcon("object-flip-vertical"));
+	PolyShearL->setIcon(im.loadIcon("transform-shear-left"));
+	PolyShearR->setIcon(im.loadIcon("transform-shear-right"));
+	PolyShearU->setIcon(im.loadIcon("transform-shear-up"));
+	PolyShearD->setIcon(im.loadIcon("transform-shear-down"));
+	RotateCCW->setIcon(im.loadIcon("rotate-ccw"));
+	RotateCW->setIcon(im.loadIcon("rotate-cw"));
+	Expand->setIcon(im.loadIcon("bezier-scale-up"));
+	Shrink->setIcon(im.loadIcon("bezier-scale-down"));
+	Enlarge->setIcon(im.loadIcon("bezier-scale-up"));
+	Reduce->setIcon(im.loadIcon("bezier-scale-down"));
 }
 
 void NodePalette::languageChange()
Index: scribus/ui/outlinepalette.cpp
===================================================================
--- scribus/ui/outlinepalette.cpp	(Revision 26694)
+++ scribus/ui/outlinepalette.cpp	(Arbeitskopie)
@@ -328,7 +328,7 @@
 		PageItem *pgItem = item->PageItemObject;
 		QPainter p;
 		QImage pm = QImage(80, 80, QImage::Format_ARGB32_Premultiplied);
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pm);
 		p.fillRect(QRectF(0, 0, 80, 80), b);
 		QImage thumb = pgItem->DrawObj_toImage(80);
@@ -1460,25 +1460,25 @@
 void OutlinePalette::iconSetChange()
 {
 	IconManager& im = IconManager::instance();
-	imageIcon = im.loadPixmap("22/insert-image.png");
-	latexIcon = im.loadPixmap("22/insert-latex.png");
-	lineIcon = im.loadPixmap("stift.png");
-	textIcon = im.loadPixmap("22/insert-text-frame.png");
-	polylineIcon = im.loadPixmap("22/draw-path.png");
-	polygonIcon = im.loadPixmap("22/draw-polygon.png");
-	arcIcon = im.loadPixmap("22/draw-arc.png");
-	spiralIcon = im.loadPixmap("22/draw-spiral.png");
-	tableIcon = im.loadPixmap("22/insert-table.png");
-	groupIcon = im.loadPixmap("u_group.png");
-	buttonIcon = im.loadPixmap("22/insert-button.png");
-	radiobuttonIcon = im.loadPixmap("22/radiobutton.png");
-	textFieldIcon = im.loadPixmap("22/text-field.png");
-	checkBoxIcon = im.loadPixmap("22/checkbox.png");
-	comboBoxIcon = im.loadPixmap("22/combobox.png");
-	listBoxIcon = im.loadPixmap("22/list-box.png");
-	annotTextIcon = im.loadPixmap("22/pdf-annotations.png");
-	annotLinkIcon = im.loadPixmap("goto.png");
-	annot3DIcon = im.loadPixmap("22/annot3d.png");
+	imageIcon = im.loadPixmap("tool-insert-image");
+	latexIcon = im.loadPixmap("insert-latex");
+	lineIcon = im.loadPixmap("tool-insert-line");
+	textIcon = im.loadPixmap("tool-insert-text-frame");
+	polylineIcon = im.loadPixmap("tool-draw-bezier");
+	polygonIcon = im.loadPixmap("tool-insert-polygon");
+	arcIcon = im.loadPixmap("tool-insert-arc");
+	spiralIcon = im.loadPixmap("tool-insert-spiral");
+	tableIcon = im.loadPixmap("tool-insert-table");
+	groupIcon = im.loadPixmap("u_group");
+	buttonIcon = im.loadPixmap("pdf-button");
+	radiobuttonIcon = im.loadPixmap("pdf-radiobutton");
+	textFieldIcon = im.loadPixmap("pdf-textfield");
+	checkBoxIcon = im.loadPixmap("pdf-checkbox");
+	comboBoxIcon = im.loadPixmap("pdf-combobox");
+	listBoxIcon = im.loadPixmap("pdf-listbox");
+	annotTextIcon = im.loadPixmap("pdf-annotation-text");
+	annotLinkIcon = im.loadPixmap("pdf-annotation-link");
+	annot3DIcon = im.loadPixmap("pdf-annotation-3d");
 
 	if (this->isVisible() && (currDoc != nullptr))
 		BuildTree();
Index: scribus/ui/outputpreview_pdf.cpp
===================================================================
--- scribus/ui/outputpreview_pdf.cpp	(Revision 26694)
+++ scribus/ui/outputpreview_pdf.cpp	(Arbeitskopie)
@@ -40,7 +40,7 @@
 	int inkTableWidth = 0;
 
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	QString caption = tr("PDF Output Preview");
 	setWindowTitle(caption);
@@ -63,7 +63,7 @@
 
 		m_optionsUi->inkTable->setColumnCount(2);
 		m_optionsUi->inkTable->setRowCount(4 + spots.count());
-		m_optionsUi->inkTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("16/show-object.png"), ""));
+		m_optionsUi->inkTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("show-object"), ""));
 		m_optionsUi->inkTable->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Separation Name")));
 
 		QHeaderView *header = m_optionsUi->inkTable->horizontalHeader();
@@ -506,7 +506,7 @@
 		pixmap = QPixmap(image.width(), image.height());
 		pixmap.setDevicePixelRatio(devicePixelRatioF());
 		QPainter p;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pixmap);
 		p.fillRect(0, 0, image.width(), image.height(), b);
 		p.drawImage(0, 0, image);
Index: scribus/ui/outputpreview_ps.cpp
===================================================================
--- scribus/ui/outputpreview_ps.cpp	(Revision 26694)
+++ scribus/ui/outputpreview_ps.cpp	(Arbeitskopie)
@@ -44,7 +44,7 @@
 	int inkTableWidth = 0;
 
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	QString caption = tr("PostScript Output Preview");
 	setWindowTitle(caption);
@@ -71,7 +71,7 @@
 
 		m_optionsUi->inkTable->setColumnCount(2);
 		m_optionsUi->inkTable->setRowCount(4 + spots.count());
-		m_optionsUi->inkTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("16/show-object.png"), ""));
+		m_optionsUi->inkTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("show-object"), ""));
 		m_optionsUi->inkTable->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Separation Name")));
 
 		QHeaderView *header = m_optionsUi->inkTable->horizontalHeader();
@@ -540,7 +540,7 @@
 		pixmap = QPixmap(image.width(), image.height());
 		pixmap.setDevicePixelRatio(devicePixelRatioF());
 		QPainter p;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pixmap);
 		p.fillRect(0, 0, image.width(), image.height(), b);
 		p.drawImage(0, 0, image);
Index: scribus/ui/pagepalette_masterpages.cpp
===================================================================
--- scribus/ui/pagepalette_masterpages.cpp	(Revision 26694)
+++ scribus/ui/pagepalette_masterpages.cpp	(Arbeitskopie)
@@ -127,10 +127,10 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	importButton->setIcon(iconManager.loadIcon("16/document-open.png"));
-	newButton->setIcon(iconManager.loadIcon("16/document-new.png"));
-	duplicateButton->setIcon(iconManager.loadIcon("16/edit-copy.png"));
-	deleteButton->setIcon(iconManager.loadIcon("16/edit-delete.png"));
+	importButton->setIcon(iconManager.loadIcon("document-open"));
+	newButton->setIcon(iconManager.loadIcon("document-new"));
+	duplicateButton->setIcon(iconManager.loadIcon("edit-copy"));
+	deleteButton->setIcon(iconManager.loadIcon("edit-delete"));
 }
 
 void PagePalette_MasterPages::languageChange()
Index: scribus/ui/pagepalette_widgets.cpp
===================================================================
--- scribus/ui/pagepalette_widgets.cpp	(Revision 26694)
+++ scribus/ui/pagepalette_widgets.cpp	(Arbeitskopie)
@@ -1126,7 +1126,7 @@
 					mimeData->setText("2 " + tmp.setNum(p) + " " + str);
 					QDrag *dr = new QDrag(this);
 					dr->setMimeData(mimeData);
-					//const QPixmap& pm = IconManager::instance().loadPixmap("doc.png");
+					//const QPixmap& pm = IconManager::instance().loadPixmap("document");
 					const QPixmap& pm = ite->pagePreview;
 					dr->setPixmap(pm);
 					dr->exec(Qt::CopyAction | Qt::MoveAction);
@@ -1212,7 +1212,7 @@
 
 void TrashBin::iconSetChange()
 {
-	normal = IconManager::instance().loadPixmap("trashcan.png", 24);
-	open = IconManager::instance().loadPixmap("trashcan2.png", 24);
+	normal = IconManager::instance().loadPixmap("trashcan", 24);
+	open = IconManager::instance().loadPixmap("trashcan-open", 24);
 	setPixmap(normal);
 }
Index: scribus/ui/pagepropertiesdialog.cpp
===================================================================
--- scribus/ui/pagepropertiesdialog.cpp	(Revision 26694)
+++ scribus/ui/pagepropertiesdialog.cpp	(Arbeitskopie)
@@ -33,7 +33,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Manage Page Properties" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	dialogLayout = new QVBoxLayout(this);
 	dialogLayout->setContentsMargins(9, 9, 9, 9);
 	dialogLayout->setSpacing(4);
Index: scribus/ui/pageselector.cpp
===================================================================
--- scribus/ui/pageselector.cpp	(Revision 26694)
+++ scribus/ui/pageselector.cpp	(Arbeitskopie)
@@ -47,10 +47,10 @@
 	forwardButton->setAutoDefault( false );
 	lastButton->setAutoDefault( false );
 
-	startButton->setIcon(IconManager::instance().loadIcon("16/go-first.png"));
-	backButton->setIcon(IconManager::instance().loadIcon("16/go-previous.png"));
-	forwardButton->setIcon(IconManager::instance().loadIcon("16/go-next.png"));
-	lastButton->setIcon(IconManager::instance().loadIcon("16/go-last.png"));
+	startButton->setIcon(IconManager::instance().loadIcon("go-first"));
+	backButton->setIcon(IconManager::instance().loadIcon("go-previous"));
+	forwardButton->setIcon(IconManager::instance().loadIcon("go-next"));
+	lastButton->setIcon(IconManager::instance().loadIcon("go-last"));
 
 	startButton->setFocusPolicy(Qt::NoFocus);
 	backButton->setFocusPolicy(Qt::NoFocus);
Index: scribus/ui/patternpropsdialog.cpp
===================================================================
--- scribus/ui/patternpropsdialog.cpp	(Revision 26694)
+++ scribus/ui/patternpropsdialog.cpp	(Arbeitskopie)
@@ -120,11 +120,11 @@
 	QSpacerItem* spacer = new QSpacerItem( 0, 0, QSizePolicy::Expanding, QSizePolicy::Minimum );
 	groupFlipLayout->addItem( spacer );
 	FlipH = new QToolButton( this );
-	FlipH->setIcon(IconManager::instance().loadIcon("16/flip-object-horizontal.png"));
+	FlipH->setIcon(IconManager::instance().loadIcon("flip-object-horizontal"));
 	FlipH->setCheckable( true );
 	groupFlipLayout->addWidget( FlipH );
 	FlipV = new QToolButton( this );
-	FlipV->setIcon(IconManager::instance().loadIcon("16/flip-object-vertical.png"));
+	FlipV->setIcon(IconManager::instance().loadIcon("flip-object-vertical"));
 	FlipV->setCheckable( true );
 	groupFlipLayout->addWidget( FlipV );
 	frame3Layout->addLayout( groupFlipLayout );
Index: scribus/ui/pdfexportdialog.cpp
===================================================================
--- scribus/ui/pdfexportdialog.cpp	(Revision 26694)
+++ scribus/ui/pdfexportdialog.cpp	(Arbeitskopie)
@@ -59,7 +59,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Save as PDF" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	PDFExportLayout = new QVBoxLayout( this );
 	PDFExportLayout->setSpacing(6);
 	PDFExportLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/picsearch.cpp
===================================================================
--- scribus/ui/picsearch.cpp	(Revision 26694)
+++ scribus/ui/picsearch.cpp	(Arbeitskopie)
@@ -111,7 +111,7 @@
 		else
 			im2 = im.qImage(); // no need to copy
 		QPainter p;
-		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205, 205, 205), IconManager::instance().loadPixmap("testfill"));
 		p.begin(&pm);
 		p.fillRect(0, 0, w, h - 44, b);
 		p.fillRect(0, h - 44, w, 44, QColor(255, 255, 255));
Index: scribus/ui/picstatus.cpp
===================================================================
--- scribus/ui/picstatus.cpp	(Revision 26694)
+++ scribus/ui/picstatus.cpp	(Arbeitskopie)
@@ -64,7 +64,7 @@
 	imageViewArea->setIconSize(QSize(128, 128));
 	imageViewArea->setContextMenuPolicy(Qt::CustomContextMenu);
 	m_Doc = docu;
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	fillTable();
 	workTab->setCurrentIndex(0);
 	connect(closeButton, SIGNAL(clicked()), this, SLOT(accept()));
@@ -85,7 +85,7 @@
 {
 	QPainter p;
 	QPixmap pm(128, 128);
-	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+	QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 	p.begin(&pm);
 	p.fillRect(0, 0, 128, 128, imageViewArea->palette().window());
 	p.setPen(QPen(Qt::black, 1, Qt::SolidLine, Qt::FlatCap, Qt::MiterJoin));
Index: scribus/ui/polyprops.cpp
===================================================================
--- scribus/ui/polyprops.cpp	(Revision 26694)
+++ scribus/ui/polyprops.cpp	(Arbeitskopie)
@@ -17,7 +17,7 @@
 PolyVectorDialog::PolyVectorDialog(QWidget* parent, int polyC, double polyF, bool polyS, double polyR, double polyCurvature, double polyInnerRot, double polyOuterCurvature) : ScrPaletteBase(parent, "PolyVectorDialog", false, Qt::WindowFlags())
 {
 	setWindowTitle( tr( "Polygon Properties" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	PolygonPropsLayout = new QVBoxLayout( this );
 	PolygonPropsLayout->setContentsMargins(9, 9, 9, 9);
 	PolygonPropsLayout->setSpacing(6);
@@ -37,7 +37,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Polygon Properties" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	PolygonPropsLayout = new QVBoxLayout( this );
 	PolygonPropsLayout->setContentsMargins(9, 9, 9, 9);
 	PolygonPropsLayout->setSpacing(6);
Index: scribus/ui/prefs_colormanagement.cpp
===================================================================
--- scribus/ui/prefs_colormanagement.cpp	(Revision 26694)
+++ scribus/ui/prefs_colormanagement.cpp	(Arbeitskopie)
@@ -22,7 +22,7 @@
 	languageChange();
 
 	m_caption = tr("Color Management");
-	m_icon = "blend_16.png";
+	m_icon = "pref-color-management";
 
 	connect(activateCMCheckBox, SIGNAL(clicked(bool)), this, SLOT(cmActivated(bool)));
 	connect(simulatePrinterOnScreenCheckBox, SIGNAL(clicked(bool)), this, SLOT(simulatePrinter(bool)));
Index: scribus/ui/prefs_display.cpp
===================================================================
--- scribus/ui/prefs_display.cpp	(Revision 26694)
+++ scribus/ui/prefs_display.cpp	(Arbeitskopie)
@@ -27,9 +27,9 @@
 	languageChange();
 
 	m_caption = tr("Display");
-	m_icon = "16/video-display.png";
+	m_icon = "pref-display";
 
-	buttonRestoreDPI->setIcon(IconManager::instance().loadIcon("screen.png"));
+	buttonRestoreDPI->setIcon(IconManager::instance().loadIcon("pref-display"));
 
 	connect(pageFillColorButton, SIGNAL(clicked()), this, SLOT(changePaperColor()));
 
Index: scribus/ui/prefs_documentinformation.cpp
===================================================================
--- scribus/ui/prefs_documentinformation.cpp	(Revision 26694)
+++ scribus/ui/prefs_documentinformation.cpp	(Arbeitskopie)
@@ -21,7 +21,7 @@
 	languageChange();
 
 	m_caption = tr("Document Information");
-	m_icon = "documentinfo.png";
+	m_icon = "pref-document-info";
 
 	dateLineEdit->addItem(QDateTime::currentDateTime().toString("yyyy-MM-dd"));
 
Index: scribus/ui/prefs_documentitemattributes.cpp
===================================================================
--- scribus/ui/prefs_documentitemattributes.cpp	(Revision 26694)
+++ scribus/ui/prefs_documentitemattributes.cpp	(Arbeitskopie)
@@ -17,7 +17,7 @@
 	languageChange();
 
 	m_caption = tr("Document Item Attributes");
-	m_icon = "docattributes_16.png";
+	m_icon = "pref-item-attributes";
 
 	relationships << tr("None", "relationship") << tr("Relates To") << tr("Is Parent Of") << tr("Is Child Of");
 	relationshipsData << "none" << "relation" << "parent" << "child";
Index: scribus/ui/prefs_documentsections.cpp
===================================================================
--- scribus/ui/prefs_documentsections.cpp	(Revision 26694)
+++ scribus/ui/prefs_documentsections.cpp	(Arbeitskopie)
@@ -25,7 +25,7 @@
 	languageChange();
 
 	m_caption = tr("Sections");
-	m_icon = "section";
+	m_icon = "pref-section";
 
 	connect(sectionsTable, SIGNAL(cellChanged(int,int)), this, SLOT(tableItemChanged(int,int)));
 	connect(addButton, SIGNAL(clicked()), this, SLOT(addEntry()));
Index: scribus/ui/prefs_documentsetup.cpp
===================================================================
--- scribus/ui/prefs_documentsetup.cpp	(Revision 26694)
+++ scribus/ui/prefs_documentsetup.cpp	(Arbeitskopie)
@@ -32,7 +32,7 @@
 	scrollArea->widget()->setAutoFillBackground(false);
 
 	m_caption = tr("Document Setup");
-	m_icon = "scribusdoc16.png";
+	m_icon = "pref-document-setup";
 
 	if (!m_doc)
 	{
@@ -68,7 +68,7 @@
 	pageHeightSpinBox->setMaximum(16777215);
 	languageChange();
 
-	connect(pageSizeSelector, SIGNAL(pageSizeChanged(QString)), this, SLOT(setPageSize()));
+	connect(pageSizeSelector, SIGNAL(pageSizeChanged(QString)), this, SLOT(setPageSize()));
 	connect(pageOrientationComboBox, SIGNAL(activated(int)), this, SLOT(setPageOrientation(int)));
 	connect(pageWidthSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageWidth(double)));
 	connect(pageHeightSpinBox, SIGNAL(valueChanged(double)), this, SLOT(setPageHeight(double)));
@@ -121,7 +121,7 @@
 
 	pageWidthSpinBox->setToolTip( "<qt>" + tr( "Width of document pages, editable if you have chosen a custom page size" ) + "</qt>" );
 	pageHeightSpinBox->setToolTip( "<qt>" + tr( "Height of document pages, editable if you have chosen a custom page size" ) + "</qt>" );
-	pageSizeSelector->setToolTip( "<qt>" + tr( "Default page size, either a standard size or a custom size. More page sizes can be made visible by activating them in Preferences." ) + "</qt>" );
+	pageSizeSelector->setToolTip( "<qt>" + tr( "Default page size, either a standard size or a custom size. More page sizes can be made visible by activating them in Preferences." ) + "</qt>" );
 	pageSizeLinkToolButton->setToolTip( "<qt>" + tr( "Enable or disable more page sizes by jumping to Page Size preferences" ) + "</qt>" );
 	pageOrientationComboBox->setToolTip( "<qt>" + tr( "Default orientation of document pages" ) + "</qt>" );
 	pageUnitsComboBox->setToolTip( "<qt>" + tr( "Default unit of measurement for document editing" ) + "</qt>" );
@@ -138,7 +138,7 @@
 	pageWidthSpinBox->blockSignals(true);
 	pageHeightSpinBox->blockSignals(true);
 	pageOrientationComboBox->blockSignals(true);
-	pageSizeSelector->blockSignals(true);
+	pageSizeSelector->blockSignals(true);
 
 	setCurrentComboItem(languageComboBox, LanguageManager::instance()->getLangFromAbbrev(prefsData->docSetupPrefs.language, true));
 
@@ -179,7 +179,7 @@
 	pageWidthSpinBox->blockSignals(false);
 	pageHeightSpinBox->blockSignals(false);
 	pageOrientationComboBox->blockSignals(false);
-	pageSizeSelector->blockSignals(false);
+	pageSizeSelector->blockSignals(false);
 
 	marginsWidget->setup(prefsData->docSetupPrefs.margins, prefsData->docSetupPrefs.pagePositioning, prefsData->docSetupPrefs.docUnitIndex, NewMarginWidget::MarginWidgetFlags);
 	marginsWidget->setPageWidth(prefsData->docSetupPrefs.pageWidth);
@@ -273,17 +273,17 @@
 {
 	prefsPageSizeName = prefsData->docSetupPrefs.pageSize;
 
-	PageSize ps(prefsPageSizeName);
+	PageSize ps(prefsPageSizeName);
 
-	// try to find coresponding page size by dimensions
-	if (ps.name() == CommonStrings::customPageSize)
+	// try to find coresponding page size by dimensions
+	if (ps.name() == CommonStrings::customPageSize)
 	{
-		PageSizeInfoMap pages = ps.sizesByDimensions(QSize(prefsData->docSetupPrefs.pageWidth, prefsData->docSetupPrefs.pageHeight));
-		if (pages.count() > 0)
-			prefsPageSizeName = pages.firstKey();
+		PageSizeInfoMap pages = ps.sizesByDimensions(QSize(prefsData->docSetupPrefs.pageWidth, prefsData->docSetupPrefs.pageHeight));
+		if (pages.count() > 0)
+			prefsPageSizeName = pages.firstKey();
 	}
 
-	pageSizeSelector->setPageSize(prefsPageSizeName);
+	pageSizeSelector->setPageSize(prefsPageSizeName);
 	marginsWidget->setPageSize(prefsPageSizeName);
 	bleedsWidget->setPageSize(prefsPageSizeName);
 }
@@ -299,9 +299,9 @@
 {
 	pageW = pageWidthSpinBox->value() / unitRatio;
 	marginsWidget->setPageWidth(pageW);
-	QString psText = pageSizeSelector->pageSizeTR();
+	QString psText = pageSizeSelector->pageSizeTR();
 	if (psText != CommonStrings::trCustomPageSize && psText != CommonStrings::customPageSize)
-		pageSizeSelector->setPageSize(CommonStrings::customPageSize);
+		pageSizeSelector->setPageSize(CommonStrings::customPageSize);
 	int newOrientation = (pageWidthSpinBox->value() > pageHeightSpinBox->value()) ? landscapePage : portraitPage;
 	if (newOrientation != pageOrientationComboBox->currentIndex())
 	{
@@ -315,9 +315,9 @@
 {
 	pageH = pageHeightSpinBox->value() / unitRatio;
 	marginsWidget->setPageHeight(pageH);
-	QString psText = pageSizeSelector->pageSizeTR();
+	QString psText = pageSizeSelector->pageSizeTR();
 	if (psText != CommonStrings::trCustomPageSize && psText != CommonStrings::customPageSize)
-		pageSizeSelector->setPageSize(CommonStrings::customPageSize);
+		pageSizeSelector->setPageSize(CommonStrings::customPageSize);
 	int newOrientation = (pageWidthSpinBox->value() > pageHeightSpinBox->value()) ? landscapePage : portraitPage;
 	if (newOrientation != pageOrientationComboBox->currentIndex())
 	{
@@ -329,10 +329,10 @@
 
 void Prefs_DocumentSetup::setPageOrientation(int orientation)
 {
-	setSize(pageSizeSelector->pageSize());
+	setSize(pageSizeSelector->pageSize());
 	pageWidthSpinBox->blockSignals(true);
 	pageHeightSpinBox->blockSignals(true);
-	if ((orientation==0 && pageSizeSelector->pageSizeTR() == CommonStrings::trCustomPageSize) || orientation!=0)
+	if ((orientation==0 && pageSizeSelector->pageSizeTR() == CommonStrings::trCustomPageSize) || orientation!=0)
 	{
 		double w = pageWidthSpinBox->value(), h = pageHeightSpinBox->value();
 		pageWidthSpinBox->setValue((orientation == portraitPage) ? qMin(w, h) : qMax(w, h));
@@ -356,7 +356,7 @@
 
 	PageSize ps2(newSize);
 	prefsPageSizeName = ps2.name();
-	if (newSize != CommonStrings::customPageSize && newSize != CommonStrings::trCustomPageSize)
+	if (newSize != CommonStrings::customPageSize && newSize != CommonStrings::trCustomPageSize)
 	{
 		pageW = ps2.width();
 		pageH = ps2.height();
Index: scribus/ui/prefs_experimental.cpp
===================================================================
--- scribus/ui/prefs_experimental.cpp	(Revision 26694)
+++ scribus/ui/prefs_experimental.cpp	(Arbeitskopie)
@@ -16,7 +16,7 @@
 	languageChange();
 
 	m_caption = tr("Experimental");
-	m_icon = "misc_16.png";
+	m_icon = "pref-experimental";
 }
 
 Prefs_Experimental::~Prefs_Experimental() = default;
Index: scribus/ui/prefs_externaltools.cpp
===================================================================
--- scribus/ui/prefs_externaltools.cpp	(Revision 26694)
+++ scribus/ui/prefs_externaltools.cpp	(Arbeitskopie)
@@ -28,7 +28,7 @@
 	languageChange();
 
 	m_caption = tr("External Tools");
-	m_icon = "gear_16.png";
+	m_icon = "pref-external-tools";
 
 	connect(psToolChangeButton, SIGNAL(clicked()), this, SLOT(changePostScriptTool()));
 	connect(imageToolChangeButton, SIGNAL(clicked()), this, SLOT(changeImageTool()));
Index: scribus/ui/prefs_fonts.cpp
===================================================================
--- scribus/ui/prefs_fonts.cpp	(Revision 26694)
+++ scribus/ui/prefs_fonts.cpp	(Arbeitskopie)
@@ -42,7 +42,7 @@
 	languageChange();
 
 	m_caption = tr("Fonts");
-	m_icon = "16/preferences-desktop-font.png";
+	m_icon = "pref-fonts";
 
 	RList = PrefsManager::instance().appPrefs.fontPrefs.GFontSub;
 
Index: scribus/ui/prefs_guides.cpp
===================================================================
--- scribus/ui/prefs_guides.cpp	(Revision 26694)
+++ scribus/ui/prefs_guides.cpp	(Arbeitskopie)
@@ -22,11 +22,11 @@
 	languageChange();
 
 	m_caption = tr("Guides");
-	m_icon = "16/edit-guides.png";
+	m_icon = "pref-guides";
 
-	buttonUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
+	buttonUp->setIcon(IconManager::instance().loadIcon("go-up"));
 	buttonUp->setEnabled(false);
-	buttonDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
+	buttonDown->setIcon(IconManager::instance().loadIcon("go-down"));
 	buttonDown->setEnabled(false);
 
 	QString pxSuffix = QString(" %1").arg(CommonStrings::trStrPX);
Index: scribus/ui/prefs_hyphenator.cpp
===================================================================
--- scribus/ui/prefs_hyphenator.cpp	(Revision 26694)
+++ scribus/ui/prefs_hyphenator.cpp	(Arbeitskopie)
@@ -23,15 +23,15 @@
 	languageChange();
 
 	m_caption = tr("Hyphenator");
-	m_icon = "signature_16.png";
+	m_icon = "pref-hyphenator";
 
-	exceptionAddButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
+	exceptionAddButton->setIcon(IconManager::instance().loadIcon("list-add"));
 	exceptionEditButton->setEnabled(false);
-	exceptionRemoveButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
+	exceptionRemoveButton->setIcon(IconManager::instance().loadIcon("list-remove"));
 	exceptionRemoveButton->setEnabled(false);
-	ignoreAddButton->setIcon(IconManager::instance().loadIcon("16/list-add.png"));
+	ignoreAddButton->setIcon(IconManager::instance().loadIcon("list-add"));
 	ignoreEditButton->setEnabled(false);
-	ignoreRemoveButton->setIcon(IconManager::instance().loadIcon("16/list-remove.png"));
+	ignoreRemoveButton->setIcon(IconManager::instance().loadIcon("list-remove"));
 	ignoreRemoveButton->setEnabled(false);
 	connect(ignoreAddButton, SIGNAL(clicked()), this, SLOT(addToIgnoreList()));
 	connect(ignoreEditButton, SIGNAL(clicked()), this, SLOT(editIgnoreListEntry()));
Index: scribus/ui/prefs_imagecache.cpp
===================================================================
--- scribus/ui/prefs_imagecache.cpp	(Revision 26694)
+++ scribus/ui/prefs_imagecache.cpp	(Arbeitskopie)
@@ -19,7 +19,7 @@
 	languageChange();
 
 	m_caption = tr("Image Cache");
-	m_icon = "16/image-x-generic.png";
+	m_icon = "image-x-generic";
 }
 
 void Prefs_ImageCache::languageChange()
Index: scribus/ui/prefs_indexes.cpp
===================================================================
--- scribus/ui/prefs_indexes.cpp	(Revision 26694)
+++ scribus/ui/prefs_indexes.cpp	(Arbeitskopie)
@@ -24,7 +24,7 @@
 	languageChange();
 
 	m_caption = tr("Indexes");
-	m_icon = "tabtocindex_16.png";
+	m_icon = "pref-indexes";
 
 	updateStyleComboBoxes();
 
Index: scribus/ui/prefs_itemtools.cpp
===================================================================
--- scribus/ui/prefs_itemtools.cpp	(Revision 26694)
+++ scribus/ui/prefs_itemtools.cpp	(Arbeitskopie)
@@ -30,7 +30,7 @@
 	languageChange();
 
 	m_caption = tr("Item Tools");
-	m_icon = "tools_16.png";
+	m_icon = "pref-tools";
 
 	lineEndArrowComboBox->setArrowDirection(ArrowDirection::EndArrow);
 	shapeLineWidthSpinBox->setNewUnit(0);
Index: scribus/ui/prefs_keyboardshortcuts.cpp
===================================================================
--- scribus/ui/prefs_keyboardshortcuts.cpp	(Revision 26694)
+++ scribus/ui/prefs_keyboardshortcuts.cpp	(Arbeitskopie)
@@ -35,7 +35,7 @@
 	languageChange();
 
 	m_caption = tr("Keyboard Shortcuts");
-	m_icon = "16/preferences-desktop-keyboard-shortcuts.png";
+	m_icon = "pref-keyboard-shortcuts";
 
 	defMenus = ActionManager::defaultMenus();
 	defNonMenuActions = ActionManager::defaultNonMenuActions();
@@ -70,7 +70,7 @@
 	keyDisplay->setText("");
 	selectedLVI = nullptr;
 
-	clearSearchButton->setIcon(IconManager::instance().loadIcon("clear_right.png"));
+	clearSearchButton->setIcon(IconManager::instance().loadIcon("clear-right"));
 	// signals and slots connections
 	connect( keyTable, SIGNAL(currentItemChanged(QTreeWidgetItem*,QTreeWidgetItem*)), this, SLOT(dispKey(QTreeWidgetItem*,QTreeWidgetItem*)));
 	connect( noKey, SIGNAL(clicked()), this, SLOT(setNoKey()));
Index: scribus/ui/prefs_miscellaneous.cpp
===================================================================
--- scribus/ui/prefs_miscellaneous.cpp	(Revision 26694)
+++ scribus/ui/prefs_miscellaneous.cpp	(Arbeitskopie)
@@ -16,7 +16,7 @@
 	languageChange();
 
 	m_caption = tr("Miscellaneous");
-	m_icon = "misc_16.png";
+	m_icon = "pref-miscellaneous";
 }
 
 Prefs_Miscellaneous::~Prefs_Miscellaneous() = default;
Index: scribus/ui/prefs_operatortools.cpp
===================================================================
--- scribus/ui/prefs_operatortools.cpp	(Revision 26694)
+++ scribus/ui/prefs_operatortools.cpp	(Arbeitskopie)
@@ -19,7 +19,7 @@
 	languageChange();
 
 	m_caption = tr("Operator Tools");
-	m_icon = "tools_16.png";
+	m_icon = "pref-tools";
 
 	itemDuplicateXDispSpinBox->setMaximum(1000);
 	itemDuplicateYDispSpinBox->setMaximum(1000);
Index: scribus/ui/prefs_pagesizes.cpp
===================================================================
--- scribus/ui/prefs_pagesizes.cpp	(Revision 26694)
+++ scribus/ui/prefs_pagesizes.cpp	(Arbeitskopie)
@@ -28,8 +28,8 @@
 
 	languageChange();
 
-	toActiveButton->setIcon(IconManager::instance().loadIcon("22/go-next.png"));
-	fromActiveButton->setIcon(IconManager::instance().loadIcon("22/go-previous.png"));
+	toActiveButton->setIcon(IconManager::instance().loadIcon("go-next", 22));
+	fromActiveButton->setIcon(IconManager::instance().loadIcon("go-previous", 22));
 	connect(toActiveButton, SIGNAL(clicked()), this, SLOT(moveToActive()));
 	connect(fromActiveButton, SIGNAL(clicked()), this, SLOT(moveFromActive()));
 }
Index: scribus/ui/prefs_paths.cpp
===================================================================
--- scribus/ui/prefs_paths.cpp	(Revision 26694)
+++ scribus/ui/prefs_paths.cpp	(Arbeitskopie)
@@ -19,7 +19,7 @@
 	languageChange();
 
 	m_caption = tr("Paths");
-	m_icon = "16/folder.png";
+	m_icon = "folder";
 
 	connect(docDirChangeButton, SIGNAL(clicked()), this, SLOT(changeDocs()));
 	connect(profileDirChangeButton, SIGNAL(clicked()), this, SLOT(changeProfs()));
Index: scribus/ui/prefs_pdfexport.cpp
===================================================================
--- scribus/ui/prefs_pdfexport.cpp	(Revision 26694)
+++ scribus/ui/prefs_pdfexport.cpp	(Arbeitskopie)
@@ -35,15 +35,15 @@
 	scrollArea_3->viewport()->setAutoFillBackground(false);
 	scrollArea_3->widget()->setAutoFillBackground(false);
 
-	exportRangeMorePushButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
-	pageMirrorHorizontalToolButton->setIcon(IconManager::instance().loadIcon("16/flip-object-horizontal.png"));
-	pageMirrorVerticalToolButton->setIcon(IconManager::instance().loadIcon("16/flip-object-vertical.png"));
+	exportRangeMorePushButton->setIcon(IconManager::instance().loadIcon("ellipsis"));
+	pageMirrorHorizontalToolButton->setIcon(IconManager::instance().loadIcon("flip-object-horizontal"));
+	pageMirrorVerticalToolButton->setIcon(IconManager::instance().loadIcon("flip-object-vertical"));
 
 	unitChange(0);
 	languageChange();
 
 	m_caption = tr("PDF Export");
-	m_icon = "acroread16.png";
+	m_icon = "pref-pdf-export";
 
 	connect(fontEmbeddingCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(EmbeddingModeChange()));
 	connect(exportChosenPagesRadioButton, SIGNAL(toggled(bool)), this, SLOT(enableRangeControls(bool)));
@@ -167,13 +167,13 @@
 
 	const ScFace face = AllFonts.value(fontName);
 	if (face.isReplacement())
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_subst16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-substitute"), fontName, fontList );
 	else if (face.type() == ScFace::TYPE1)
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_type1_16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-postscript"), fontName, fontList );
 	else if (face.type() == ScFace::TTF)
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_truetype16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-truetype"), fontName, fontList );
 	else if (face.type() == ScFace::OTF)
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_otf16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-otf"), fontName, fontList );
 
 	return item;
 }
Index: scribus/ui/prefs_plugins.cpp
===================================================================
--- scribus/ui/prefs_plugins.cpp	(Revision 26694)
+++ scribus/ui/prefs_plugins.cpp	(Arbeitskopie)
@@ -25,7 +25,7 @@
 	languageChange();
 
 	m_caption = tr("Plugins");
-	m_icon = "plugins_16.png";
+	m_icon = "pref-plugins";
 
 	PluginManager& pluginManager(PluginManager::instance());
 	//Hide this stuff as we don't want it now we are not letting people turn plugins on or off
Index: scribus/ui/prefs_preflightverifier.cpp
===================================================================
--- scribus/ui/prefs_preflightverifier.cpp	(Revision 26694)
+++ scribus/ui/prefs_preflightverifier.cpp	(Arbeitskopie)
@@ -16,7 +16,7 @@
 	languageChange();
 
 	m_caption = tr("Preflight Verifier");
-	m_icon = "16/preflight-verifier.png";
+	m_icon = "preflight-verifier";
 
 	connect(currentProfileComboBox, SIGNAL(currentTextChanged(QString)), this, SLOT(setProfile(QString)));
 	connect(currentProfileComboBox, SIGNAL(editTextChanged(QString)), this, SLOT(setProfile(QString)));
Index: scribus/ui/prefs_printer.cpp
===================================================================
--- scribus/ui/prefs_printer.cpp	(Revision 26694)
+++ scribus/ui/prefs_printer.cpp	(Arbeitskopie)
@@ -21,7 +21,7 @@
 	languageChange();
 
 	m_caption = tr("Printer");
-	m_icon = "16/printer.png";
+	m_icon = "pref-printer";
 
 	connect(useAltPrinterCmdCheckBox, SIGNAL(clicked()), this, SLOT(selOtherComm()));
 }
Index: scribus/ui/prefs_scrapbook.cpp
===================================================================
--- scribus/ui/prefs_scrapbook.cpp	(Revision 26694)
+++ scribus/ui/prefs_scrapbook.cpp	(Arbeitskopie)
@@ -16,7 +16,7 @@
 	languageChange();
 
 	m_caption = tr("Scrapbook");
-	m_icon = "scrap_16.png";
+	m_icon = "pref-scrapbook";
 }
 
 Prefs_Scrapbook::~Prefs_Scrapbook() = default;
Index: scribus/ui/prefs_spelling.cpp
===================================================================
--- scribus/ui/prefs_spelling.cpp	(Revision 26694)
+++ scribus/ui/prefs_spelling.cpp	(Arbeitskopie)
@@ -30,7 +30,7 @@
 	languageChange();
 
 	m_caption = tr("Spelling");
-	m_icon = "signature_16.png";
+	m_icon = "pref-hyphenator";
 
 	updateDictList();
 	downloadLocation = ScPaths::downloadDir();
Index: scribus/ui/prefs_tableofcontents.cpp
===================================================================
--- scribus/ui/prefs_tableofcontents.cpp	(Revision 26694)
+++ scribus/ui/prefs_tableofcontents.cpp	(Arbeitskopie)
@@ -23,10 +23,10 @@
 	languageChange();
 
 	m_caption = tr("Tables of Contents");
-	m_icon = "tabtocindex_16.png";
+	m_icon = "pref-toc";
 
-	tocStyleUpButton->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
-	tocStyleDownButton->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
+	tocStyleUpButton->setIcon(IconManager::instance().loadIcon("go-up"));
+	tocStyleDownButton->setIcon(IconManager::instance().loadIcon("go-down"));
 
 	itemDestFrameComboBox->setMaximumWidth(fontMetrics().horizontalAdvance( "This is a very long Name" ));
 	itemAttrComboBox->setMaximumWidth(fontMetrics().horizontalAdvance( "This is a very long Name" ));
Index: scribus/ui/prefs_typography.cpp
===================================================================
--- scribus/ui/prefs_typography.cpp	(Revision 26694)
+++ scribus/ui/prefs_typography.cpp	(Arbeitskopie)
@@ -4,29 +4,29 @@
 a copyright and/or license notice that predates the release of Scribus 1.3.2
 for which a new license (GPL+exception) is in place.
 */
-
-#include "prefs_typography.h"
-#include "prefsstructs.h"
-#include "scribus.h"
-#include "scribusdoc.h"
-#include "stylemanager.h"
-#include "ui/smtextstyles.h"
-
-Prefs_Typography::Prefs_Typography(QWidget* parent, ScribusDoc* doc)
-	: Prefs_Pane(parent),
-	  m_Doc(doc)
-{
-	setupUi(this);
-	languageChange();
-
-	m_caption = tr("Typography");
-	m_icon = "16/draw-text.png";
-
-	connect(opticalMarginsEditor, &OpticalMarginEditor::setDeleted, this, &Prefs_Typography::updateParagraphStyles);
-}
-
-Prefs_Typography::~Prefs_Typography() = default;
 
+#include "prefs_typography.h"
+#include "prefsstructs.h"
+#include "scribus.h"
+#include "scribusdoc.h"
+#include "stylemanager.h"
+#include "ui/smtextstyles.h"
+
+Prefs_Typography::Prefs_Typography(QWidget* parent, ScribusDoc* doc)
+	: Prefs_Pane(parent),
+	  m_Doc(doc)
+{
+	setupUi(this);
+	languageChange();
+
+	m_caption = tr("Typography");
+	m_icon = "pref-typography";
+
+	connect(opticalMarginsEditor, &OpticalMarginEditor::setDeleted, this, &Prefs_Typography::updateParagraphStyles);
+}
+
+Prefs_Typography::~Prefs_Typography() = default;
+
 void Prefs_Typography::languageChange()
 {
 	QString autoText = tr("Auto");
@@ -44,27 +44,27 @@
 	strikeoutDisplacementSpinBox->setToolTip( tr( "Displacement above the baseline of the normal font expressed as a percentage of the fonts ascender" ) );
 	strikeoutLineWidthSpinBox->setToolTip( tr( "Line width expressed as a percentage of the font size" ) );
 	smallcapsScalingSpinBox->setToolTip( tr( "Relative size of the small caps font compared to the normal font" ) );
-	automaticLineSpacingSpinBox->setToolTip( tr( "Percentage increase over the font size for the line spacing" ) );
-}
-
-void Prefs_Typography::updateParagraphStyles(QString removedID, QString newID)
-{
-	if (!m_Doc)
-		return;
-
-	ResourceCollection res;
-	m_Doc->getNamedResources(res);
-	res.mapOpticalMarginSet(removedID, newID);
-	m_Doc->replaceNamedResources(res);
-
-	// We also need to update the Style Manager to load the updated paragraph styles.
-	// updateColorList() does what we want.
-	m_Doc->scMW()->styleMgr()->updateColorList();
-}
-
-void Prefs_Typography::restoreDefaults(struct ApplicationPrefs *prefsData)
-{
-	subscriptDisplacementSpinBox->setValue(prefsData->typoPrefs.valueSubScript);
+	automaticLineSpacingSpinBox->setToolTip( tr( "Percentage increase over the font size for the line spacing" ) );
+}
+
+void Prefs_Typography::updateParagraphStyles(QString removedID, QString newID)
+{
+	if (!m_Doc)
+		return;
+
+	ResourceCollection res;
+	m_Doc->getNamedResources(res);
+	res.mapOpticalMarginSet(removedID, newID);
+	m_Doc->replaceNamedResources(res);
+
+	// We also need to update the Style Manager to load the updated paragraph styles.
+	// updateColorList() does what we want.
+	m_Doc->scMW()->styleMgr()->updateColorList();
+}
+
+void Prefs_Typography::restoreDefaults(struct ApplicationPrefs *prefsData)
+{
+	subscriptDisplacementSpinBox->setValue(prefsData->typoPrefs.valueSubScript);
 	subscriptScalingSpinBox->setValue(prefsData->typoPrefs.scalingSubScript);
 	superscriptDisplacementSpinBox->setValue(prefsData->typoPrefs.valueSuperScript);
 	superscriptScalingSpinBox->setValue(prefsData->typoPrefs.scalingSuperScript);
@@ -71,13 +71,13 @@
 	underlineDisplacementSpinBox->setValue(prefsData->typoPrefs.valueUnderlinePos / 10.0);
 	underlineLineWidthSpinBox->setValue(prefsData->typoPrefs.valueUnderlineWidth / 10.0);
 	strikeoutDisplacementSpinBox->setValue(prefsData->typoPrefs.valueStrikeThruPos / 10.0);
-	strikeoutLineWidthSpinBox->setValue(prefsData->typoPrefs.valueStrikeThruWidth / 10.0);
-	smallcapsScalingSpinBox->setValue(prefsData->typoPrefs.valueSmallCaps);
-	automaticLineSpacingSpinBox->setValue(prefsData->typoPrefs.autoLineSpacing);
-	opticalMarginsEditor->setOpticalMarginSets(prefsData->typoPrefs.opticalMarginSets);
-}
-
-void Prefs_Typography::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
+	strikeoutLineWidthSpinBox->setValue(prefsData->typoPrefs.valueStrikeThruWidth / 10.0);
+	smallcapsScalingSpinBox->setValue(prefsData->typoPrefs.valueSmallCaps);
+	automaticLineSpacingSpinBox->setValue(prefsData->typoPrefs.autoLineSpacing);
+	opticalMarginsEditor->setOpticalMarginSets(prefsData->typoPrefs.opticalMarginSets);
+}
+
+void Prefs_Typography::saveGuiToPrefs(struct ApplicationPrefs *prefsData) const
 {
 	prefsData->typoPrefs.valueSubScript = subscriptDisplacementSpinBox->value();
 	prefsData->typoPrefs.scalingSubScript = subscriptScalingSpinBox->value();
@@ -86,9 +86,9 @@
 	prefsData->typoPrefs.valueUnderlinePos = underlineDisplacementSpinBox->value() * 10.0;
 	prefsData->typoPrefs.valueUnderlineWidth = underlineLineWidthSpinBox->value() * 10.0;
 	prefsData->typoPrefs.valueStrikeThruPos = strikeoutDisplacementSpinBox->value() * 10.0;
-	prefsData->typoPrefs.valueStrikeThruWidth = strikeoutLineWidthSpinBox->value() * 10.0;
-	prefsData->typoPrefs.valueSmallCaps = smallcapsScalingSpinBox->value();
-	prefsData->typoPrefs.autoLineSpacing = automaticLineSpacingSpinBox->value();
-	prefsData->typoPrefs.opticalMarginSets = opticalMarginsEditor->opticalMarginSets();
-}
-
+	prefsData->typoPrefs.valueStrikeThruWidth = strikeoutLineWidthSpinBox->value() * 10.0;
+	prefsData->typoPrefs.valueSmallCaps = smallcapsScalingSpinBox->value();
+	prefsData->typoPrefs.autoLineSpacing = automaticLineSpacingSpinBox->value();
+	prefsData->typoPrefs.opticalMarginSets = opticalMarginsEditor->opticalMarginSets();
+}
+
Index: scribus/ui/prefs_userinterface.cpp
===================================================================
--- scribus/ui/prefs_userinterface.cpp	(Revision 26694)
+++ scribus/ui/prefs_userinterface.cpp	(Arbeitskopie)
@@ -25,7 +25,7 @@
 	setupUi(this);
 	languageChange();
 	m_caption = tr("User Interface");
-	m_icon = "scribus16.png";
+	m_icon = "pref-ui";
 
 	// qt styles
 	QStringList styleList = QStyleFactory::keys();
Index: scribus/ui/printdialog.cpp
===================================================================
--- scribus/ui/printdialog.cpp	(Revision 26694)
+++ scribus/ui/printdialog.cpp	(Arbeitskopie)
@@ -52,8 +52,8 @@
 	m_unitRatio = unitGetRatioFromIndex(doc->unitIndex());
 	prefs = PrefsManager::instance().prefsFile->getContext("print_options");
 
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
-	pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
+	pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis"));
 	markLength->setNewUnit(m_unit);
 	markLength->setMinimum(1 * m_unitRatio);
 	markLength->setMaximum(3000 * m_unitRatio);
Index: scribus/ui/printpreview.cpp
===================================================================
--- scribus/ui/printpreview.cpp	(Revision 26694)
+++ scribus/ui/printpreview.cpp	(Arbeitskopie)
@@ -83,7 +83,7 @@
 	setWindowTitle(caption);
 
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	Q_ASSERT(!docu->masterPageMode());
 
 	bool printToFile = (printer == CommonStrings::File || printer == CommonStrings::trFile);
@@ -116,7 +116,7 @@
 
 		m_ui->inkTable->setColumnCount(2);
 		m_ui->inkTable->setRowCount(4 + spots.count());
-		m_ui->inkTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("16/show-object.png"), ""));
+		m_ui->inkTable->setHorizontalHeaderItem(0, new QTableWidgetItem(IconManager::instance().loadIcon("show-object"), ""));
 		m_ui->inkTable->setHorizontalHeaderItem(1, new QTableWidgetItem( tr("Separation Name")));
 
 		QHeaderView *header = m_ui->inkTable->horizontalHeader();
Index: scribus/ui/propertiespalette_attributes.cpp
===================================================================
--- scribus/ui/propertiespalette_attributes.cpp	(Revision 26694)
+++ scribus/ui/propertiespalette_attributes.cpp	(Arbeitskopie)
@@ -253,13 +253,13 @@
 	IconManager& im = IconManager::instance();
 
 	QIcon icoPrint;
-	icoPrint.addPixmap(im.loadPixmap("NoPrint.png"), QIcon::Normal, QIcon::On);
-	icoPrint.addPixmap(im.loadPixmap("16/document-print.png"), QIcon::Normal, QIcon::Off);
+	icoPrint.addPixmap(im.loadPixmap("no-print"), QIcon::Normal, QIcon::On);
+	icoPrint.addPixmap(im.loadPixmap("document-print"), QIcon::Normal, QIcon::Off);
 	noPrint->setIcon(icoPrint);
 
 	labelName->setPixmap(im.loadPixmap("name"));
 	buttonPDFBookmark->setIcon(im.loadPixmap("pdf-bookmark"));
-	buttonPDFAnnotation->setIcon(im.loadPixmap("16/pdf-annotations.png"));
+	buttonPDFAnnotation->setIcon(im.loadPixmap("pdf-annotation-text"));
 	buttonPDFAnnotationSettings->setIcon(im.loadIcon("settings"));
 
 }
Index: scribus/ui/propertiespalette_fill.cpp
===================================================================
--- scribus/ui/propertiespalette_fill.cpp	(Revision 26694)
+++ scribus/ui/propertiespalette_fill.cpp	(Arbeitskopie)
@@ -726,8 +726,8 @@
 {
 	IconManager& im = IconManager::instance();
 
-	evenOdd->setIcon(im.loadIcon("fill-rule-even-odd.png"));
-	nonZero->setIcon(im.loadIcon("fill-rule-nonzero.png"));
+	evenOdd->setIcon(im.loadIcon("fill-rule-even-odd"));
+	nonZero->setIcon(im.loadIcon("fill-rule-nonzero"));
 
 	buttonFillMask->setDotIcon(im.loadIcon("mask", 8));
 
Index: scribus/ui/propertiespalette_line.cpp
===================================================================
--- scribus/ui/propertiespalette_line.cpp	(Revision 26694)
+++ scribus/ui/propertiespalette_line.cpp	(Arbeitskopie)
@@ -855,13 +855,13 @@
 {
 	IconManager& im = IconManager::instance();
 
-	buttonJoinMiter->setIcon(im.loadIcon("16/stroke-join-miter.png"));
-	buttonJoinBevel->setIcon(im.loadIcon("16/stroke-join-bevel.png"));
-	buttonJoinRound->setIcon(im.loadIcon("16/stroke-join-round.png"));
+	buttonJoinMiter->setIcon(im.loadIcon("stroke-join-miter"));
+	buttonJoinBevel->setIcon(im.loadIcon("stroke-join-bevel"));
+	buttonJoinRound->setIcon(im.loadIcon("stroke-join-round"));
 
-	buttonCapFlat->setIcon(im.loadIcon("16/stroke-cap-butt.png"));
-	buttonCapRound->setIcon(im.loadIcon("16/stroke-cap-round.png"));
-	buttonCapSquare->setIcon(im.loadIcon("16/stroke-cap-square.png"));
+	buttonCapFlat->setIcon(im.loadIcon("stroke-cap-butt"));
+	buttonCapRound->setIcon(im.loadIcon("stroke-cap-round"));
+	buttonCapSquare->setIcon(im.loadIcon("stroke-cap-square"));
 
 	buttonSwapMarker->setIcon(im.loadIcon("swap"));
 	buttonLineMask->setDotIcon(im.loadIcon("mask", 8));
Index: scribus/ui/propertiespalette_shape.cpp
===================================================================
--- scribus/ui/propertiespalette_shape.cpp	(Revision 26694)
+++ scribus/ui/propertiespalette_shape.cpp	(Arbeitskopie)
@@ -492,13 +492,13 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	roundRectIcon->setPixmap(iconManager.loadPixmap("round-corners.png"));
+	roundRectIcon->setPixmap(iconManager.loadPixmap("round-corners"));
 
-	textFlowDisabled->setIcon(iconManager.loadIcon("flow-none.png"));
-	textFlowUsesFrameShape->setIcon(iconManager.loadIcon("flow-frame.png"));
-	textFlowUsesBoundingBox->setIcon(iconManager.loadIcon("flow-bounding.png"));
-	textFlowUsesContourLine->setIcon(iconManager.loadIcon("flow-contour.png"));
-	textFlowUsesImageClipping->setIcon(iconManager.loadIcon("flow-contour.png"));
+	textFlowDisabled->setIcon(iconManager.loadIcon("text-wrap-none"));
+	textFlowUsesFrameShape->setIcon(iconManager.loadIcon("text-wrap-shape"));
+	textFlowUsesBoundingBox->setIcon(iconManager.loadIcon("text-wrap-boundingbox"));
+	textFlowUsesContourLine->setIcon(iconManager.loadIcon("text-wrap-contour"));
+	textFlowUsesImageClipping->setIcon(iconManager.loadIcon("text-wrap-image-clip"));
 }
 
 void PropertiesPalette_Shape::languageChange()
Index: scribus/ui/propertiespalette_table.cpp
===================================================================
--- scribus/ui/propertiespalette_table.cpp	(Revision 26694)
+++ scribus/ui/propertiespalette_table.cpp	(Arbeitskopie)
@@ -51,10 +51,10 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	addBorderLineButton->setIcon(iconManager.loadIcon("penciladd.png"));
-	removeBorderLineButton->setIcon(iconManager.loadIcon("pencilsub.png"));
-	buttonClearTableStyle->setIcon(iconManager.loadIcon("16/edit-clear.png"));
-	buttonClearCellStyle->setIcon(iconManager.loadIcon("16/edit-clear.png"));
+	addBorderLineButton->setIcon(iconManager.loadIcon("stroke-add"));
+	removeBorderLineButton->setIcon(iconManager.loadIcon("stroke-remove"));
+	buttonClearTableStyle->setIcon(iconManager.loadIcon("edit-clear"));
+	buttonClearCellStyle->setIcon(iconManager.loadIcon("edit-clear"));
 }
 
 void PropertiesPalette_Table::handleUpdateRequest(int updateFlags)
Index: scribus/ui/propertiespalette_xyz.cpp
===================================================================
--- scribus/ui/propertiespalette_xyz.cpp	(Revision 26694)
+++ scribus/ui/propertiespalette_xyz.cpp	(Arbeitskopie)
@@ -1423,29 +1423,29 @@
 
 	levelUp->setIcon(im.loadIcon("layer-move-up"));
 	levelDown->setIcon(im.loadIcon("layer-move-down"));
-	levelTop->setIcon(im.loadIcon("16/go-top.png"));
-	levelBottom->setIcon(im.loadIcon("16/go-bottom.png"));
+	levelTop->setIcon(im.loadIcon("go-top"));
+	levelBottom->setIcon(im.loadIcon("go-bottom"));
 
-	doGroup->setIcon(im.loadIcon("group.png"));
-	doUnGroup->setIcon(im.loadIcon("ungroup.png"));
+	doGroup->setIcon(im.loadIcon("group"));
+	doUnGroup->setIcon(im.loadIcon("ungroup"));
 
-	flipH->setIcon(im.loadIcon("16/flip-object-horizontal.png"));
-	flipV->setIcon(im.loadIcon("16/flip-object-vertical.png"));
+	flipH->setIcon(im.loadIcon("flip-object-horizontal"));
+	flipV->setIcon(im.loadIcon("flip-object-vertical"));
 
-	rotateCCW->setIcon(im.loadIcon("rotate_ccw.png"));
-	rotateCW->setIcon(im.loadIcon("rotate_cw.png"));
+	rotateCCW->setIcon(im.loadIcon("rotate-ccw"));
+	rotateCW->setIcon(im.loadIcon("rotate-cw"));
 
 	buttonLineBasePoint->setIcon(im.loadIcon("toggle-object-coordination"));
 	labelRotation->setPixmap(im.loadPixmap("object-rotation"));
 	
 	QIcon a;
-	a.addPixmap(im.loadPixmap("16/lock.png"), QIcon::Normal, QIcon::On);
-	a.addPixmap(im.loadPixmap("16/lock-unlocked.png"), QIcon::Normal, QIcon::Off);
+	a.addPixmap(im.loadPixmap("lock"), QIcon::Normal, QIcon::On);
+	a.addPixmap(im.loadPixmap("lock-unlocked"), QIcon::Normal, QIcon::Off);
 	doLock->setIcon(a);
 
 	QIcon a3;
-	a3.addPixmap(im.loadPixmap("framenoresize.png"), QIcon::Normal, QIcon::On);
-	a3.addPixmap(im.loadPixmap("frameresize.png"), QIcon::Normal, QIcon::Off);
+	a3.addPixmap(im.loadPixmap("frame-no-resize"), QIcon::Normal, QIcon::On);
+	a3.addPixmap(im.loadPixmap("frame-resize"), QIcon::Normal, QIcon::Off);
 	noResize->setIcon(a3);
 }
 
Index: scribus/ui/propertywidget_pareffect.cpp
===================================================================
--- scribus/ui/propertywidget_pareffect.cpp	(Revision 26694)
+++ scribus/ui/propertywidget_pareffect.cpp	(Arbeitskopie)
@@ -115,7 +115,7 @@
 void PropertyWidget_ParEffect::iconSetChange()
 {
 	IconManager& iconManager = IconManager::instance();
-	bulletCharTableButton->setIcon(iconManager.loadIcon("22/insert-table.png"));
+	bulletCharTableButton->setIcon(iconManager.loadIcon("tool-insert-table"));
 	peCharStyleLabel->setPixmap(iconManager.loadPixmap("character-style"));
 	peOffsetLabel->setPixmap(iconManager.loadPixmap("paragraph-list-offset"));
 	peLabel->setPixmap(iconManager.loadPixmap("paragraph-effects-style"));
Index: scribus/ui/query.cpp
===================================================================
--- scribus/ui/query.cpp	(Revision 26694)
+++ scribus/ui/query.cpp	(Arbeitskopie)
@@ -21,7 +21,7 @@
 Query::Query( QWidget* parent,  const char* name, bool modal, const QString& text, const QString& title ) : QDialog( parent )
 {
 	setWindowTitle( title );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setModal(modal);
 	queryLayout = new QVBoxLayout( this );
 	queryLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/recoverdialog.cpp
===================================================================
--- scribus/ui/recoverdialog.cpp	(Revision 26694)
+++ scribus/ui/recoverdialog.cpp	(Arbeitskopie)
@@ -36,7 +36,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadPixmap("app-icon"));
 	m_files = files;
 	recoverFiles.clear();
 
Index: scribus/ui/replacecolors.cpp
===================================================================
--- scribus/ui/replacecolors.cpp	(Revision 26694)
+++ scribus/ui/replacecolors.cpp	(Arbeitskopie)
@@ -38,16 +38,16 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadPixmap("app-icon"));
 	EditColors = colorList;
 	UsedColors = colorListUsed;
 	replaceMap.clear();
-	alertIcon = IconManager::instance().loadPixmap("alert.png", true);
-	cmykIcon = IconManager::instance().loadPixmap("cmyk.png", true);
-	rgbIcon = IconManager::instance().loadPixmap("rgb.png", true);
-	labIcon = IconManager::instance().loadPixmap("lab.png", true);
-	spotIcon = IconManager::instance().loadPixmap("spot.png", true);
-	regIcon = IconManager::instance().loadPixmap("register.png", true);
+	alertIcon = IconManager::instance().loadPixmap("alert-warning");
+	cmykIcon = IconManager::instance().loadPixmap("color-cmyk");
+	rgbIcon = IconManager::instance().loadPixmap("color-rgb");
+	labIcon = IconManager::instance().loadPixmap("color-lab");
+	spotIcon = IconManager::instance().loadPixmap("color-spot");
+	regIcon = IconManager::instance().loadPixmap("color-registration");
 	replacementTable->horizontalHeader()->setSectionsClickable(false );
 	replacementTable->horizontalHeader()->setSectionsMovable( false );
 	replacementTable->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch);
Index: scribus/ui/replaceonecolor.cpp
===================================================================
--- scribus/ui/replaceonecolor.cpp	(Revision 26694)
+++ scribus/ui/replaceonecolor.cpp	(Arbeitskopie)
@@ -32,7 +32,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png" ));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon" ));
 	originalColor->setPixmapType(ColorCombo::fancyPixmaps);
 	originalColor->setColors(usedColors, true);
 	replacementColor->setPixmapType(ColorCombo::fancyPixmaps);
Index: scribus/ui/rulermover.cpp
===================================================================
--- scribus/ui/rulermover.cpp	(Revision 26694)
+++ scribus/ui/rulermover.cpp	(Arbeitskopie)
@@ -168,7 +168,7 @@
 {
 	QPalette palette;
 	//palette.setBrush(QPalette::Window, QColor(240, 240, 240));
-	palette.setBrush(backgroundRole(), QBrush(IconManager::instance().loadPixmap("mover.png")));
+	palette.setBrush(backgroundRole(), QBrush(IconManager::instance().loadPixmap("mover")));
 	setPalette(palette);
 }
 
Index: scribus/ui/scdialog.cpp
===================================================================
--- scribus/ui/scdialog.cpp	(Revision 26694)
+++ scribus/ui/scdialog.cpp	(Arbeitskopie)
@@ -41,7 +41,7 @@
 ScDialog::ScDialog(QWidget * parent, const QString& prefsContext)
         : QDialog(parent)
 {
-	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadPixmap("app-icon"));
 	setPrefsContext(prefsContext);
 	setObjectName(prefsContext);
 }
Index: scribus/ui/scdockpalette.cpp
===================================================================
--- scribus/ui/scdockpalette.cpp	(Revision 26694)
+++ scribus/ui/scdockpalette.cpp	(Arbeitskopie)
@@ -63,7 +63,7 @@
 	}
 	m_originalParent = parent;
 	setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea);
-	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadPixmap("app-icon"));
 	setPrefsContext(prefsContext);
 	setObjectName(prefsContext);
 	connect(&PrefsManager::instance(), SIGNAL(prefsChanged()), this, SLOT(setFontSize()));
Index: scribus/ui/scmenu.cpp
===================================================================
--- scribus/ui/scmenu.cpp	(Revision 26694)
+++ scribus/ui/scmenu.cpp	(Arbeitskopie)
@@ -165,7 +165,7 @@
 			}
 		}
 		if (newMenuAction->icon().isNull() && ! menuListHasNoIcons)
-			newMenuAction->setIcon(IconManager::instance().loadIcon("noicon.png"));
+			newMenuAction->setIcon(IconManager::instance().loadIcon("no-icon"));
 #endif
 
 		menuItemList.append(newMenuAction);
@@ -199,7 +199,7 @@
 #ifdef Q_OS_MACOS
 	if (newMenuAction && afterMenuAction)
 		if (newMenuAction->icon().isNull() && ! (afterMenuAction->icon().isNull()))
-			newMenuAction->setIcon(IconManager::instance().loadIcon("noicon.png"));
+			newMenuAction->setIcon(IconManager::instance().loadIcon("no-icon"));
 #endif
 
 	int pos = menuItemList.indexOf(QPointer<QObject>(afterMenuAction));
Index: scribus/ui/scrapbookpalette.cpp
===================================================================
--- scribus/ui/scrapbookpalette.cpp	(Revision 26694)
+++ scribus/ui/scrapbookpalette.cpp	(Arbeitskopie)
@@ -551,7 +551,7 @@
 			}
 			if (dd[dc].compare(".ScribusThumbs", Qt::CaseInsensitive) == 0)
 				continue;
-			QPixmap pm = IconManager::instance().loadPixmap("folder.png");
+			QPixmap pm = IconManager::instance().loadPixmap("folder");
 			addObject(dd[dc], "", pm, true);
 		}
 	}
@@ -712,7 +712,7 @@
 		pm.fill(palette().color(QPalette::Base));
 		QPainter p;
 		p.begin(&pm);
-		p.fillRect(0, 0, 60, 60, QBrush(iconManager.loadPixmap("testfill.png")));
+		p.fillRect(0, 0, 60, 60, QBrush(iconManager.loadPixmap("testfill")));
 		p.drawPixmap(30 - preview.width() / 2, 30 - preview.height() / 2, preview);
 		p.end();
 		auto *item = new QListWidgetItem(QIcon(pm), itf.key(), this);
@@ -737,23 +737,23 @@
 	buttonLayout->setContentsMargins(0, 0, 0, 0);
 	newButton = new QToolButton(this);
 	newButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	newButton->setIcon(IconManager::instance().loadPixmap("16/document-new.png"));
+	newButton->setIcon(IconManager::instance().loadPixmap("document-new"));
 	newButton->setIconSize(QSize(16, 16));
 	upButton = new QToolButton(this);
 	upButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	upButton->setIcon(IconManager::instance().loadPixmap("16/go-up.png"));
+	upButton->setIcon(IconManager::instance().loadPixmap("go-up"));
 	upButton->setIconSize(QSize(16, 16));
 	importButton = new QToolButton(this);
 	importButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	importButton->setIcon(IconManager::instance().loadPixmap("compfile16.png"));
+	importButton->setIcon(IconManager::instance().loadPixmap("compfile"));
 	importButton->setIconSize(QSize(16, 16));
 	closeButton = new QToolButton(this);
 	closeButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	closeButton->setIcon(IconManager::instance().loadPixmap("16/close.png"));
+	closeButton->setIcon(IconManager::instance().loadPixmap("close"));
 	closeButton->setIconSize(QSize(16, 16));
 	configButton = new QToolButton(this);
 	configButton->setSizePolicy(QSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed));
-	configButton->setIcon(IconManager::instance().loadPixmap("16/configure.png"));
+	configButton->setIcon(IconManager::instance().loadPixmap("configure"));
 	configButton->setIconSize(QSize(16, 16));
 
 	configMenue = new QMenu();
@@ -829,7 +829,7 @@
 		if (activeBView->canWrite)
 			Frame3->addItem(activeBView, d.dirName());
 		else
-			Frame3->addItem(activeBView, IconManager::instance().loadIcon("16/lock.png"), d.dirName());
+			Frame3->addItem(activeBView, IconManager::instance().loadIcon("lock"), d.dirName());
 		activeBView->readContents(fileName);
 		activeBView->ScFilename = fileName;
 		activeBView->visibleName = d.dirName();
@@ -966,7 +966,7 @@
 	if (activeBView->canWrite)
 		Frame3->addItem(activeBView, d.dirName());
 	else
-		Frame3->addItem(activeBView, IconManager::instance().loadIcon("16/lock.png"), d.dirName());
+		Frame3->addItem(activeBView, IconManager::instance().loadIcon("lock"), d.dirName());
 	activeBView->readContents(fileName);
 	activeBView->ScFilename = fileName;
 	activeBView->visibleName = d.dirName();
@@ -1120,7 +1120,7 @@
 			if (fd.isWritable())
 				Frame3->addItem(activeBView, d.dirName());
 			else
-				Frame3->addItem(activeBView, IconManager::instance().loadIcon("16/lock.png"), d.dirName());
+				Frame3->addItem(activeBView, IconManager::instance().loadIcon("lock"), d.dirName());
 		}
 		activeBView->canWrite = fd.isWritable();
 		activeBView->setAcceptDrops(activeBView->canWrite);
@@ -1129,7 +1129,7 @@
 		activeBView->visibleName = d.dirName();
 		Frame3->setItemText(Frame3->indexOf(activeBView), d.dirName());
 		if (!activeBView->canWrite)
-			Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance().loadIcon("16/lock.png"));
+			Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance().loadIcon("lock"));
 		ScCore->fileWatcher->addDir(d.absolutePath(), true);
 		d.cdUp();
 		PrefsContext* dirs = PrefsManager::instance().prefsFile->getContext("dirs");
@@ -1160,7 +1160,7 @@
 	activeBView->visibleName = d.dirName();
 	Frame3->setItemText(Frame3->indexOf(activeBView), d.dirName());
 	if (!activeBView->canWrite)
-		Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance().loadIcon("16/lock.png"));
+		Frame3->setItemIcon(Frame3->indexOf(activeBView), IconManager::instance().loadIcon("lock"));
 	ScCore->fileWatcher->addDir(d.absolutePath(), true);
 	d.cdUp();
 	PrefsContext* dirs = PrefsManager::instance().prefsFile->getContext("dirs");
@@ -2057,19 +2057,19 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	newButton->setIcon(iconManager.loadPixmap("16/document-new.png"));
+	newButton->setIcon(iconManager.loadPixmap("document-new"));
 	newButton->setIconSize(QSize(16, 16));
 
-	upButton->setIcon(iconManager.loadPixmap("16/go-up.png"));
+	upButton->setIcon(iconManager.loadPixmap("go-up"));
 	upButton->setIconSize(QSize(16, 16));
 
-	importButton->setIcon(iconManager.loadPixmap("compfile16.png"));
+	importButton->setIcon(iconManager.loadPixmap("compfile"));
 	importButton->setIconSize(QSize(16, 16));
 
-	closeButton->setIcon(iconManager.loadPixmap("16/close.png"));
+	closeButton->setIcon(iconManager.loadPixmap("close"));
 	closeButton->setIconSize(QSize(16, 16));
 
-	configButton->setIcon(iconManager.loadPixmap("16/configure.png"));
+	configButton->setIcon(iconManager.loadPixmap("configure"));
 	configButton->setIconSize(QSize(16, 16));
 }
 
Index: scribus/ui/scrpalettebase.cpp
===================================================================
--- scribus/ui/scrpalettebase.cpp	(Revision 26694)
+++ scribus/ui/scrpalettebase.cpp	(Arbeitskopie)
@@ -59,7 +59,7 @@
 	}
 	m_originalParent = parent;
 	m_tempParent = nullptr;
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	setPrefsContext(prefsContext);
 	setModal(modal);
 	connect(&PrefsManager::instance(), SIGNAL(prefsChanged()), this, SLOT(setFontSize()));
Index: scribus/ui/search.cpp
===================================================================
--- scribus/ui/search.cpp	(Revision 26694)
+++ scribus/ui/search.cpp	(Arbeitskopie)
@@ -50,7 +50,7 @@
 
 	setModal(true);
 	setWindowTitle( tr( "Search/Replace" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 
 	SearchReplaceLayout = new QVBoxLayout( this );
 	SearchReplaceLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/selectobjects.cpp
===================================================================
--- scribus/ui/selectobjects.cpp	(Revision 26694)
+++ scribus/ui/selectobjects.cpp	(Arbeitskopie)
@@ -32,7 +32,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	backgroundCombo->setPixmapType(ColorCombo::fancyPixmaps);
 	backgroundCombo->setColors(availableColors, true);
 	lineCombo->setPixmapType(ColorCombo::fancyPixmaps);
Index: scribus/ui/selfield.cpp
===================================================================
--- scribus/ui/selfield.cpp	(Revision 26694)
+++ scribus/ui/selfield.cpp	(Arbeitskopie)
@@ -25,7 +25,7 @@
 {
 	setModal(true);
 	setWindowTitle( tr( "Select Fields" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	FTyp = Art;
 	SelectFieldsLayout = new QVBoxLayout( this );
 	SelectFieldsLayout->setContentsMargins(9, 9, 9, 9);
Index: scribus/ui/smcellstylewidget.cpp
===================================================================
--- scribus/ui/smcellstylewidget.cpp	(Revision 26694)
+++ scribus/ui/smcellstylewidget.cpp	(Arbeitskopie)
@@ -36,8 +36,8 @@
 void SMCellStyleWidget::iconSetChange()
 {
 	IconManager& iconManager = IconManager::instance();
-	fillColorIcon->setPixmap(iconManager.loadPixmap("16/color-fill.png"));
-	fillShadeLabel->setPixmap(iconManager.loadPixmap("shade.png") );
+	fillColorIcon->setPixmap(iconManager.loadPixmap("color-fill"));
+	fillShadeLabel->setPixmap(iconManager.loadPixmap("shade") );
 }
 
 void SMCellStyleWidget::languageChange()
Index: scribus/ui/smlinestylewidget.cpp
===================================================================
--- scribus/ui/smlinestylewidget.cpp	(Revision 26694)
+++ scribus/ui/smlinestylewidget.cpp	(Arbeitskopie)
@@ -25,8 +25,8 @@
 
 	colorCombo->setPixmapType(ColorCombo::fancyPixmaps);
 
-	addButton->setIcon(IconManager::instance().loadIcon("penciladd.png"));
-	removeButton->setIcon(IconManager::instance().loadIcon("pencilsub.png"));
+	addButton->setIcon(IconManager::instance().loadIcon("stroke-add"));
+	removeButton->setIcon(IconManager::instance().loadIcon("stroke-remove"));
 
 	lineWidth->setMinimum(0.0);
 	lineWidth->setMaximum(300.0);
@@ -51,8 +51,8 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	addButton->setIcon(iconManager.loadIcon("penciladd.png"));
-	removeButton->setIcon(iconManager.loadIcon("pencilsub.png"));
+	addButton->setIcon(iconManager.loadIcon("stroke-add"));
+	removeButton->setIcon(iconManager.loadIcon("stroke-remove"));
 
 	int  oldEndComboIndex = endCombo->currentIndex();
 	bool endComboBlocked  = endCombo->blockSignals(true);
@@ -108,9 +108,9 @@
 	IconManager& im  = IconManager::instance();
 
 	endCombo->clear();
-	endCombo->addItem(im.loadIcon("ButtCap.png"), tr( "Flat Cap" ) );
-	endCombo->addItem(im.loadIcon("SquareCap.png"), tr( "Square Cap" ) );
-	endCombo->addItem(im.loadIcon("RoundCap.png"), tr( "Round Cap" ) );
+	endCombo->addItem(im.loadIcon("stroke-cap-butt"), tr( "Flat Cap" ) );
+	endCombo->addItem(im.loadIcon("stroke-cap-square"), tr( "Square Cap" ) );
+	endCombo->addItem(im.loadIcon("stroke-cap-round"), tr( "Round Cap" ) );
 }
 
 void SMLineStyleWidget::fillJoinCombo()
@@ -118,9 +118,9 @@
 	IconManager& im  = IconManager::instance();
 
 	joinCombo->clear();
-	joinCombo->addItem(im.loadIcon("MiterJoin.png"), tr( "Miter Join" ) );
-	joinCombo->addItem(im.loadIcon("BevelJoin.png"), tr( "Bevel Join" ) );
-	joinCombo->addItem(im.loadIcon("RoundJoin.png"), tr( "Round Join" ) );
+	joinCombo->addItem(im.loadIcon("stroke-join-miter"), tr( "Miter Join" ) );
+	joinCombo->addItem(im.loadIcon("stroke-join-bevel"), tr( "Bevel Join" ) );
+	joinCombo->addItem(im.loadIcon("stroke-join-round"), tr( "Round Join" ) );
 }
 
 void SMLineStyleWidget::showStyle(const MultiLine &lineStyle, ColorList &colorList, int subLine)
Index: scribus/ui/smpstylewidget.cpp
===================================================================
--- scribus/ui/smpstylewidget.cpp	(Revision 26694)
+++ scribus/ui/smpstylewidget.cpp	(Arbeitskopie)
@@ -37,13 +37,13 @@
 
 	iconSetChange();
 
-	backgroundColor->colorButton->setContext(Context::TextBackground);
-	backgroundColor->setColor(CommonStrings::tr_NoneColor);
-	backgroundColor->setText(tr("Background"));
-
-	lineSpacingMode->addItem( tr("Fixed"));
-	lineSpacingMode->addItem( tr("Automatic"));
-	lineSpacingMode->addItem( tr("Baseline"));
+	backgroundColor->colorButton->setContext(Context::TextBackground);
+	backgroundColor->setColor(CommonStrings::tr_NoneColor);
+	backgroundColor->setText(tr("Background"));
+
+	lineSpacingMode->addItem( tr("Fixed"));
+	lineSpacingMode->addItem( tr("Automatic"));
+	lineSpacingMode->addItem( tr("Baseline"));
 	connect(lineSpacingMode, SIGNAL(highlighted(int)), this, SLOT(slotLineSpacingModeChanged(int)));
 
 	lineSpacing->setSuffix(unitGetSuffixFromIndex(0));
@@ -65,18 +65,18 @@
 	numStartSpin->setMaximum(9999);
 	numLevelSpin->setMinimum(1);
 	numLevelSpin->setMaximum(1);
-	numPrefix->setMaxLength(5);
-	numPrefix->setMaximumWidth(QFontMetrics(numPrefix->font()).averageCharWidth() * 7);
-	numSuffix->setMaxLength(5);
-	numSuffix->setMaximumWidth(QFontMetrics(numSuffix->font()).averageCharWidth() * 7);
+	numPrefix->setMaxLength(5);
+	numPrefix->setMaximumWidth(QFontMetrics(numPrefix->font()).averageCharWidth() * 7);
+	numSuffix->setMaxLength(5);
+	numSuffix->setMaximumWidth(QFontMetrics(numSuffix->font()).averageCharWidth() * 7);
 	fillNumRestartCombo();
 	dropCapLines->setMinimum(2);
 	dropCapLines->setMaximum(99);
 
-	fillPECombo();
-	connect(peCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(handleParEffectUse(int)));
-	connect(parentParEffectsButton, SIGNAL(clicked()), this, SLOT(slotParentParEffects()));
-
+	fillPECombo();
+	connect(peCombo, SIGNAL(currentIndexChanged(int)), this, SLOT(handleParEffectUse(int)));
+	connect(parentParEffectsButton, SIGNAL(clicked()), this, SLOT(slotParentParEffects()));
+
 	minSpaceSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
 	minGlyphExtSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
 	maxGlyphExtSpin->setSuffix(unitGetSuffixFromIndex(SC_PERCENT));
@@ -107,21 +107,21 @@
 {
 	IconManager& iconManager = IconManager::instance();
 
-	lineSpacingLabel->setPixmap(iconManager.loadPixmap("paragraph-line-height"));
-	spaceAboveLabel->setPixmap(iconManager.loadPixmap("paragraph-space-above") );
-	spaceBelowLabel->setPixmap(iconManager.loadPixmap("paragraph-space-below") );
-	keepLabelStart->setPixmap(iconManager.loadPixmap("paragraph-orphan") );
-	keepLabelEnd->setPixmap(iconManager.loadPixmap("paragraph-widow") );
-	minSpaceLabel->setPixmap(iconManager.loadPixmap("character-space-width-min"));
-	minGlyphExtLabel->setPixmap(iconManager.loadPixmap("character-scale-width-min"));
-	maxGlyphExtLabel->setPixmap(iconManager.loadPixmap("character-scale-width-max"));
-	consecutiveHyphenLabel->setPixmap(iconManager.loadPixmap("hyphen-consecutive"));
+	lineSpacingLabel->setPixmap(iconManager.loadPixmap("paragraph-line-height"));
+	spaceAboveLabel->setPixmap(iconManager.loadPixmap("paragraph-space-above") );
+	spaceBelowLabel->setPixmap(iconManager.loadPixmap("paragraph-space-below") );
+	keepLabelStart->setPixmap(iconManager.loadPixmap("paragraph-orphan") );
+	keepLabelEnd->setPixmap(iconManager.loadPixmap("paragraph-widow") );
+	minSpaceLabel->setPixmap(iconManager.loadPixmap("character-space-width-min"));
+	minGlyphExtLabel->setPixmap(iconManager.loadPixmap("character-scale-width-min"));
+	maxGlyphExtLabel->setPixmap(iconManager.loadPixmap("character-scale-width-max"));
+	consecutiveHyphenLabel->setPixmap(iconManager.loadPixmap("hyphen-consecutive"));
 
-	bulletCharTableButton->setIcon(iconManager.loadIcon("22/insert-table.png"));
-	distFromTextLabel->setPixmap(iconManager.loadPixmap("paragraph-list-offset"));
-	parEffectCharStyleComboLabel->setPixmap(iconManager.loadPixmap("character-style"));
-	peLabel->setPixmap(iconManager.loadPixmap("paragraph-effects-style"));
-	parentParEffectsButton->setIcon(iconManager.loadIcon("reset-style-changes"));
+	bulletCharTableButton->setIcon(iconManager.loadIcon("character-table"));
+	distFromTextLabel->setPixmap(iconManager.loadPixmap("paragraph-list-offset"));
+	parEffectCharStyleComboLabel->setPixmap(iconManager.loadPixmap("character-style"));
+	peLabel->setPixmap(iconManager.loadPixmap("paragraph-effects-style"));
+	parentParEffectsButton->setIcon(iconManager.loadIcon("reset-style-changes"));
 }
 
 void SMPStyleWidget::languageChange()
@@ -135,9 +135,9 @@
 	int  oldLineSpacingModeIndex = lineSpacingMode->currentIndex();
 	bool lineSpacingModeBlocked = lineSpacingMode->blockSignals(true);
 	lineSpacingMode->clear();
-	lineSpacingMode->addItem( tr("Fixed"));
-	lineSpacingMode->addItem( tr("Automatic"));
-	lineSpacingMode->addItem( tr("Baseline"));
+	lineSpacingMode->addItem( tr("Fixed"));
+	lineSpacingMode->addItem( tr("Automatic"));
+	lineSpacingMode->addItem( tr("Baseline"));
 	lineSpacingMode->setCurrentIndex(oldLineSpacingModeIndex);
 	lineSpacingMode->blockSignals(lineSpacingModeBlocked);
 
@@ -154,8 +154,8 @@
 	numRestartCombo->setCurrentIndex(oldNumRestartIndex);
 	numRestartCombo->blockSignals(numRestartComboBlocked);
 
-	fillPECombo();
-
+	fillPECombo();
+
 /* #13455 stop making the font 2ce as big
 	QFont font1;
 	if (font1.pointSize())
@@ -166,8 +166,8 @@
 	(bulletStrEdit->lineEdit())->setFont(font1);
 */
 
-	backgroundColor->colorButton->setPersistentToolTip( tr("Background color of selected text"));
-	backgroundColor->setText(tr("Background"));
+	backgroundColor->colorButton->setPersistentToolTip( tr("Background color of selected text"));
+	backgroundColor->setText(tr("Background"));
 }
 
 void SMPStyleWidget::unitChange(double oldRatio, double newRatio, int unitIndex)
@@ -189,7 +189,7 @@
 	}
 
 	cpage->setDoc(m_Doc);
-	backgroundColor->colorButton->setDoc(m_Doc);
+	backgroundColor->colorButton->setDoc(m_Doc);
 }
 
 void SMPStyleWidget::show(ParagraphStyle *pstyle, QList<ParagraphStyle> &pstyles, QList<CharStyle> &cstyles, int unitIndex, const QString &defLang)
@@ -201,9 +201,9 @@
 	m_hasParent = pstyle->hasParent() && parent != nullptr && parent->hasName() && pstyle->parent() != "";
 
 	lineSpacingMode->clear();
-	lineSpacingMode->addItem( tr("Fixed"));
-	lineSpacingMode->addItem( tr("Automatic"));
-	lineSpacingMode->addItem( tr("Baseline"));
+	lineSpacingMode->addItem( tr("Fixed"));
+	lineSpacingMode->addItem( tr("Automatic"));
+	lineSpacingMode->addItem( tr("Baseline"));
 	
 //	optMarginCombo->clear();
 //	optMarginCombo->addItem(tr("None"), ParagraphStyle::OM_None);
@@ -309,11 +309,11 @@
 		parEffectOffset->setParentValue(parent->parEffectOffset() * unitRatio);
 		parEffectIndentBox->setChecked(pstyle->parEffectIndent(),pstyle->isInhParEffectIndent());
 		parEffectIndentBox->setParentValue(parent->parEffectIndent());
-		dropCapLines->setValue(pstyle->dropCapLines(), pstyle->isInhDropCapLines());
-		dropCapLines->setParentValue(parent->dropCapLines());
+		dropCapLines->setValue(pstyle->dropCapLines(), pstyle->isInhDropCapLines());
+		dropCapLines->setParentValue(parent->dropCapLines());
 		bulletStrEdit->setEditText(pstyle->bulletStr());
 		setWidgetBoldFont(bulletCharLabel, !pstyle->isInhBulletStr());
-
+
 		QString numName = pstyle->numName();
 		if (numName.isEmpty())
 			numName = "default";
@@ -344,7 +344,7 @@
 		numRestartOtherBox->setParentValue(parent->numOther());
 		numRestartHigherBox->setChecked(pstyle->numHigher(), pstyle->isInhNumHigher());
 		numRestartHigherBox->setParentValue(parent->numHigher());
-		backgroundColor->setColor(pstyle->backgroundColor(), qRound(pstyle->backgroundShade()), parent->backgroundColor(), qRound(pstyle->backgroundShade()), pstyle->isInhBackgroundColor());
+		backgroundColor->setColor(pstyle->backgroundColor(), qRound(pstyle->backgroundShade()), parent->backgroundColor(), qRound(pstyle->backgroundShade()), pstyle->isInhBackgroundColor());
 	}
 	else
 	{
@@ -363,7 +363,7 @@
 		parEffectIndentBox->setChecked(pstyle->parEffectIndent());
 		parentParEffectsButton->hide();
 		disconnect(parentParEffectsButton, SIGNAL(clicked()), this, SLOT(slotParentParEffects()));
-
+
 		dropCapLines->setValue(pstyle->dropCapLines());
 		bulletStrEdit->setEditText(pstyle->bulletStr());
 		setWidgetBoldFont(bulletCharLabel, false);
@@ -401,21 +401,21 @@
 		keepLinesEnd->setValue (pstyle->keepLinesEnd());
 		keepTogether->setChecked (pstyle->keepTogether());
 		keepWithNext->setChecked (pstyle->keepWithNext());
-		backgroundColor->setColor(pstyle->backgroundColor(), qRound(pstyle->backgroundShade()));
-
+		backgroundColor->setColor(pstyle->backgroundColor(), qRound(pstyle->backgroundShade()));
+
 	}
 
 	lineSpacing->setEnabled(pstyle->lineSpacingMode() == ParagraphStyle::FixedLineSpacing);
 
-	if (pstyle->hasDropCap())
-		setParagraphEffect(1);
-	else if (pstyle->hasBullet())
-		setParagraphEffect(2);
-	else if (pstyle->hasNum())
-		setParagraphEffect(3);
-	else
-		setParagraphEffect(0);
-
+	if (pstyle->hasDropCap())
+		setParagraphEffect(1);
+	else if (pstyle->hasBullet())
+		setParagraphEffect(2);
+	else if (pstyle->hasNum())
+		setParagraphEffect(3);
+	else
+		setParagraphEffect(0);
+
 	parEffectCharStyleCombo->clear();
 	parEffectCharStyleCombo->addItem(tr("No Style"));
 	for (int i =0; i < cstyles.count(); i++)
@@ -473,8 +473,8 @@
 		showTabs(pstyles, unitIndex);
 		showCStyle(pstyles, cstyles, defLang, unitIndex);
 		showParent(pstyles);
-		//checkParEffectState();
-		setParagraphEffect(0);
+		//checkParEffectState();
+		setParagraphEffect(0);
 		showColors(pstyles);
 	}
 }
@@ -502,16 +502,16 @@
 		}
 		s = cstyles[i]->backgroundColor();
 	}
-
-	backgroundColor->setColor(s, qRound(d));
+
+	backgroundColor->setColor(s, qRound(d));
 }
 
 void SMPStyleWidget::showLineSpacing(const QList<ParagraphStyle*> &pstyles)
 {
 	lineSpacingMode->clear();
-	lineSpacingMode->addItem( tr("Fixed"));
-	lineSpacingMode->addItem( tr("Automatic"));
-	lineSpacingMode->addItem( tr("Baseline"));
+	lineSpacingMode->addItem( tr("Fixed"));
+	lineSpacingMode->addItem( tr("Automatic"));
+	lineSpacingMode->addItem( tr("Baseline"));
 
 	int tmpLP = -1;
 	for (int i = 0; i < pstyles.count(); ++i)
@@ -866,9 +866,9 @@
 
 }
 
-/*********************************************************************
- *						Paragraph Effects
- * *******************************************************************/
+/*********************************************************************
+ *						Paragraph Effects
+ * *******************************************************************/
 
 void SMPStyleWidget::insertSpecialChars(const QVector<uint> &charCodes)
 {
Index: scribus/ui/smtablestylewidget.cpp
===================================================================
--- scribus/ui/smtablestylewidget.cpp	(Revision 26694)
+++ scribus/ui/smtablestylewidget.cpp	(Arbeitskopie)
@@ -35,8 +35,8 @@
 
 void SMTableStyleWidget::iconSetChange()
 {
-	fillColorIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
-	fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade.png") );
+	fillColorIcon->setPixmap(IconManager::instance().loadPixmap("color-fill"));
+	fillShadeLabel->setPixmap(IconManager::instance().loadPixmap("shade") );
 }
 
 void SMTableStyleWidget::handleUpdateRequest(int updateFlags)
Index: scribus/ui/storyeditor.cpp
===================================================================
--- scribus/ui/storyeditor.cpp	(Revision 26694)
+++ scribus/ui/storyeditor.cpp	(Arbeitskopie)
@@ -1132,7 +1132,7 @@
 SToolBColorF::SToolBColorF(QMainWindow* parent, ScribusDoc *doc) : QToolBar( tr("Fill Color Settings"), parent)
 {
 	FillIcon = new QLabel(this);
-	FillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
+	FillIcon->setPixmap(IconManager::instance().loadPixmap("color-fill"));
 	FillIcon->setScaledContents( false );
 	fillIconAction = addWidget(FillIcon);
 	fillIconAction->setVisible(true);
@@ -1166,7 +1166,7 @@
 
 void SToolBColorF::iconSetChange()
 {
-	FillIcon->setPixmap(IconManager::instance().loadPixmap("16/color-fill.png"));
+	FillIcon->setPixmap(IconManager::instance().loadPixmap("color-fill"));
 }
 
 void SToolBColorF::languageChange()
@@ -1205,7 +1205,7 @@
 SToolBColorS::SToolBColorS(QMainWindow* parent, ScribusDoc *doc) : QToolBar( tr("Stroke Color Settings"), parent)
 {
 	StrokeIcon = new QLabel( "", this );
-	StrokeIcon->setPixmap(IconManager::instance().loadPixmap("16/color-stroke.png"));
+	StrokeIcon->setPixmap(IconManager::instance().loadPixmap("color-stroke"));
 	StrokeIcon->setScaledContents(false);
 
 	strokeIconAction = addWidget(StrokeIcon);
@@ -1244,7 +1244,7 @@
 void SToolBColorS::iconSetChange()
 {
 	IconManager& iconManager = IconManager::instance();
-	StrokeIcon->setPixmap(iconManager.loadPixmap("16/color-stroke.png"));
+	StrokeIcon->setPixmap(iconManager.loadPixmap("color-stroke"));
 }
 
 void SToolBColorS::languageChange()
@@ -1567,7 +1567,7 @@
 	prefsManager(PrefsManager::instance())
 {
 #ifdef Q_OS_MACOS
-	noIcon = IconManager::instance().loadPixmap("noicon.png");
+	noIcon = IconManager::instance().loadPixmap("no-icon");
 #endif
 	buildGUI();
 	/*
@@ -1672,13 +1672,13 @@
 void StoryEditor::initActions()
 {
 	//File Menu
-	seActions.insert("fileNew", new ScrAction("16/document-new.png", "22/document-new.png", "", Qt::CTRL|Qt::Key_N, this));
-	seActions.insert("fileRevert", new ScrAction("reload16.png", "reload.png", "", QKeySequence(), this));
-	seActions.insert("fileSaveToFile", new ScrAction("16/document-save.png", "22/document-save.png", "", QKeySequence(), this));
-	seActions.insert("fileLoadFromFile", new ScrAction("16/document-open.png",  "22/document-open.png", "", QKeySequence(), this));
+	seActions.insert("fileNew", new ScrAction("document-new", "document-new", "", Qt::CTRL|Qt::Key_N, this));
+	seActions.insert("fileRevert", new ScrAction("reload", "reload", "", QKeySequence(), this));
+	seActions.insert("fileSaveToFile", new ScrAction("document-save", "document-save", "", QKeySequence(), this));
+	seActions.insert("fileLoadFromFile", new ScrAction("document-open",  "document-open", "", QKeySequence(), this));
 	seActions.insert("fileSaveDocument", new ScrAction("", Qt::CTRL|Qt::Key_S, this));
-	seActions.insert("fileUpdateAndExit", new ScrAction("ok.png", "ok22.png", "", Qt::CTRL|Qt::Key_W,  this));
-	seActions.insert("fileExit", new ScrAction("exit.png", "exit22.png", "", QKeySequence(),  this));
+	seActions.insert("fileUpdateAndExit", new ScrAction("ok", "ok", "", Qt::CTRL|Qt::Key_W,  this));
+	seActions.insert("fileExit", new ScrAction("exit", "exit", "", QKeySequence(),  this));
 
 	connect( seActions["fileNew"], SIGNAL(triggered()), this, SLOT(Do_new()) );
 	connect( seActions["fileRevert"], SIGNAL(triggered()), this, SLOT(slotFileRevert()) );
@@ -1689,15 +1689,15 @@
 	connect( seActions["fileExit"], SIGNAL(triggered()), this, SLOT(Do_leave()) );
 
 	//Edit Menu
-	seActions.insert("editCut", new ScrAction("16/edit-cut.png", QString(), "", Qt::CTRL|Qt::Key_X, this));
-	seActions.insert("editCopy", new ScrAction("16/edit-copy.png", QString(), "", Qt::CTRL|Qt::Key_C, this));
-	seActions.insert("editPaste", new ScrAction("16/edit-paste.png", QString(), "", Qt::CTRL|Qt::Key_V, this));
-	seActions.insert("editClear", new ScrAction("16/edit-delete.png", QString(), "", Qt::Key_Delete, this));
-	seActions.insert("editSelectAll", new ScrAction("16/edit-select-all.png", QString(), "", Qt::CTRL|Qt::Key_A, this));
-	seActions.insert("editSearchReplace", new ScrAction("16/edit-find-replace.png", QString(), "", Qt::CTRL|Qt::Key_F, this));
+	seActions.insert("editCut", new ScrAction("edit-cut", QString(), "", Qt::CTRL|Qt::Key_X, this));
+	seActions.insert("editCopy", new ScrAction("edit-copy", QString(), "", Qt::CTRL|Qt::Key_C, this));
+	seActions.insert("editPaste", new ScrAction("edit-paste", QString(), "", Qt::CTRL|Qt::Key_V, this));
+	seActions.insert("editClear", new ScrAction("edit-delete", QString(), "", Qt::Key_Delete, this));
+	seActions.insert("editSelectAll", new ScrAction("edit-select-all", QString(), "", Qt::CTRL|Qt::Key_A, this));
+	seActions.insert("editSearchReplace", new ScrAction("edit-find-replace", QString(), "", Qt::CTRL|Qt::Key_F, this));
 	//seActions.insert("editEditStyle", new ScrAction("", QKeySequence(), this));
 	seActions.insert("editFontPreview", new ScrAction("", QKeySequence(), this));
-	seActions.insert("editUpdateFrame", new ScrAction("compfile16.png", "compfile.png", "", Qt::CTRL|Qt::Key_U, this));
+	seActions.insert("editUpdateFrame", new ScrAction("compfile", "compfile", "", Qt::CTRL|Qt::Key_U, this));
 
 	connect( seActions["editCut"], SIGNAL(triggered()), this, SLOT(Do_cut()) );
 	connect( seActions["editCopy"], SIGNAL(triggered()), this, SLOT(Do_copy()) );
@@ -1860,7 +1860,7 @@
 	seActions["unicodeSoftHyphen"]->setEnabled(false);//CB TODO doesn't work in SE yet.
 	buildMenus();
 
-	setWindowIcon(IconManager::instance().loadPixmap("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadPixmap("app-icon"));
 	StoryEd2Layout = new QHBoxLayout;
 	StoryEd2Layout->setSpacing(6);
 	StoryEd2Layout->setContentsMargins(9, 9, 9, 9);
@@ -2013,9 +2013,9 @@
 {
 	IconManager& iconManager = IconManager::instance();
 #ifdef Q_OS_MACOS
-	noIcon = iconManager.loadPixmap("noicon.png");
+	noIcon = iconManager.loadPixmap("no-icon");
 #endif
-	setWindowIcon(iconManager.loadPixmap("AppIcon.png"));
+	setWindowIcon(iconManager.loadPixmap("app-icon"));
 }
 
 void StoryEditor::languageChange()
Index: scribus/ui/tabmanager.cpp
===================================================================
--- scribus/ui/tabmanager.cpp	(Revision 26694)
+++ scribus/ui/tabmanager.cpp	(Arbeitskopie)
@@ -21,7 +21,7 @@
 {
 	setModal(true);
     setWindowTitle( tr( "Manage Tabs" ) );
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	m_docUnitRatio = unitGetRatioFromIndex(dEin);
 	m_tabList = inTab;
 	TabManagerLayout = new QVBoxLayout( this );
Index: scribus/ui/tabpdfoptions.cpp
===================================================================
--- scribus/ui/tabpdfoptions.cpp	(Revision 26694)
+++ scribus/ui/tabpdfoptions.cpp	(Arbeitskopie)
@@ -63,10 +63,10 @@
 
 	// General tab
 	rangeGroupLayout->setAlignment( Qt::AlignTop );
-	pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis.png"));
-	MirrorH->setIcon(IconManager::instance().loadIcon("16/flip-object-horizontal.png"));
+	pageNrButton->setIcon(IconManager::instance().loadIcon("ellipsis"));
+	MirrorH->setIcon(IconManager::instance().loadIcon("flip-object-horizontal"));
 	MirrorH->setCheckable( true );
-	MirrorV->setIcon(IconManager::instance().loadIcon("16/flip-object-vertical.png"));
+	MirrorV->setIcon(IconManager::instance().loadIcon("flip-object-vertical"));
 	MirrorV->setCheckable( true );
 
 	fileOptionsLayout->setAlignment( Qt::AlignTop );
@@ -90,8 +90,8 @@
 	EmbedList->setSelectionMode(QListWidget::ExtendedSelection);
 	SubsetList->setMaximumHeight(300);
 	SubsetList->setSelectionMode(QListWidget::ExtendedSelection);
-	ToSubset->setIcon(IconManager::instance().loadIcon("22/go-next.png"));
-	FromSubset->setIcon(IconManager::instance().loadIcon("22/go-previous.png"));
+	ToSubset->setIcon(IconManager::instance().loadIcon("go-next", 22));
+	FromSubset->setIcon(IconManager::instance().loadIcon("go-previous", 22));
 
 	// Presentation tab
 	effectsLayout->setAlignment( Qt::AlignTop );
@@ -1386,13 +1386,13 @@
 
 	const ScFace& face = AllFonts.value(fontName);
 	if (face.isReplacement())
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_subst16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-substitute"), fontName, fontList );
 	else if (face.type() == ScFace::TYPE1)
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_type1_16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-postscript"), fontName, fontList );
 	else if (face.type() == ScFace::TTF)
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_truetype16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-truetype"), fontName, fontList );
 	else if (face.type() == ScFace::OTF)
-		item = new QListWidgetItem( IconManager::instance().loadIcon("font_otf16.png"), fontName, fontList );
+		item = new QListWidgetItem( IconManager::instance().loadIcon("font-otf"), fontName, fontList );
 
 	return item;
 }
Index: scribus/ui/tabruler.cpp
===================================================================
--- scribus/ui/tabruler.cpp	(Revision 26694)
+++ scribus/ui/tabruler.cpp	(Arbeitskopie)
@@ -347,7 +347,7 @@
 	}
 	if ((!mousePressed) && (mPosY < height()) && (mPosY > 0) && (mPosX > 0) && (mPosX < width()))
 	{
-		setCursor(IconManager::instance().loadCursor("tab.png", 3));
+		setCursor(IconManager::instance().loadCursor("cursor-tabulator", 3));
 		if (haveInd)
 		{
 			fpo = QRect(static_cast<int>(firstLine + leftIndent - offset) - 4, 0, 8, midline);
@@ -374,7 +374,7 @@
 		}
 	}
 	if (mousePressed && ((mPosY > height()) || (mPosY < 0) || (mPosX < 0) || (mPosX > width())))
-		QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+		QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 }
 
 void RulerT::wheelEvent(QWheelEvent* m)
@@ -395,7 +395,7 @@
 	if (mousePressed)
 	{
 		if (rulerCode == 3)
-			QApplication::changeOverrideCursor(IconManager::instance().loadCursor("DelPoint.png", 1, 1));
+			QApplication::changeOverrideCursor(IconManager::instance().loadCursor("cursor-remove-point", 1, 1));
 		else
 			QApplication::changeOverrideCursor(QCursor(Qt::ArrowCursor));
 	}
@@ -702,7 +702,7 @@
 		rightIndentLabel->setPixmap(iconManager.loadPixmap("paragraph-indent-right"));
 
 	clearOneButton->setIcon(iconManager.loadIcon("delete-selected"));
-	clearButton->setIcon(iconManager.loadIcon("16/edit-delete.png"));
+	clearButton->setIcon(iconManager.loadIcon("edit-delete"));
 }
 
 void Tabruler::languageChange()
Index: scribus/ui/transformdialog.cpp
===================================================================
--- scribus/ui/transformdialog.cpp	(Revision 26694)
+++ scribus/ui/transformdialog.cpp	(Arbeitskopie)
@@ -46,7 +46,7 @@
 {
 	setupUi(this);
 	setModal(true);
-	setWindowIcon(IconManager::instance().loadIcon("AppIcon.png"));
+	setWindowIcon(IconManager::instance().loadIcon("app-icon"));
 	transformStack->setCurrentIndex(0);
 	newTransformMenu = new QMenu(buttonAdd);
 	newTransformMenu->addAction( tr("Scaling"), this, SLOT(newScaling()));
@@ -56,9 +56,9 @@
 	buttonAdd->setMenu(newTransformMenu);
 	scaleLink->setChecked(true);
 	buttonUp->setText( "" );
-	buttonUp->setIcon(IconManager::instance().loadIcon("16/go-up.png"));
+	buttonUp->setIcon(IconManager::instance().loadIcon("go-up"));
 	buttonDown->setText( "" );
-	buttonDown->setIcon(IconManager::instance().loadIcon("16/go-down.png"));
+	buttonDown->setIcon(IconManager::instance().loadIcon("go-down"));
 	buttonBox->button(QDialogButtonBox::Ok)->setEnabled(false);
 	m_doc = doc;
 	m_unitRatio = unitGetRatioFromIndex(m_doc->unitIndex());
Index: scribus/ui/transparencypalette.cpp
===================================================================
--- scribus/ui/transparencypalette.cpp	(Revision 26694)
+++ scribus/ui/transparencypalette.cpp	(Arbeitskopie)
@@ -202,7 +202,7 @@
 		VGradient gr = gradientList->value(patK[i]);
 		QImage pixm(48, 12, QImage::Format_ARGB32_Premultiplied);
 		QPainter pb;
-		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill.png"));
+		QBrush b(QColor(205,205,205), IconManager::instance().loadPixmap("testfill"));
 		pb.begin(&pixm);
 		pb.fillRect(0, 0, 48, 12, b);
 		pb.end();
Index: scribus/ui/widgets/pagelayout.cpp
===================================================================
--- scribus/ui/widgets/pagelayout.cpp	(Revision 26694)
+++ scribus/ui/widgets/pagelayout.cpp	(Arbeitskopie)
@@ -118,15 +118,15 @@
 
 		QString psname = CommonStrings::translatePageSetString(m_pageSets[pg].Name);
 		if (pg == 0)
-			menuScheme->addAction(IconManager::instance().loadIcon("16/page-simple.png"), psname)->setData(QVariant(pg));
+			menuScheme->addAction(IconManager::instance().loadIcon("page-simple"), psname)->setData(QVariant(pg));
 		else if (pg == 1)
-			menuScheme->addAction(IconManager::instance().loadIcon("16/page-doublesided.png"), psname)->setData(QVariant(pg));
+			menuScheme->addAction(IconManager::instance().loadIcon("page-doublesided"), psname)->setData(QVariant(pg));
 		else if (pg == 2)
-			menuScheme->addAction(IconManager::instance().loadIcon("16/page-3fold.png"), psname)->setData(QVariant(pg));
+			menuScheme->addAction(IconManager::instance().loadIcon("page-3fold"), psname)->setData(QVariant(pg));
 		else if (pg == 3)
-			menuScheme->addAction(IconManager::instance().loadIcon("16/page-4fold.png"), psname)->setData(QVariant(pg));
+			menuScheme->addAction(IconManager::instance().loadIcon("page-4fold"), psname)->setData(QVariant(pg));
 		else
-			menuScheme->addAction(IconManager::instance().loadIcon("16/page-simple.png"), psname)->setData(QVariant(pg));
+			menuScheme->addAction(IconManager::instance().loadIcon("page-simple"), psname)->setData(QVariant(pg));
 	}
 
 	connect(menuScheme, &QMenu::triggered, this, &PageLayouts::changeScheme);
Index: scribus/undogui.cpp
===================================================================
--- scribus/undogui.cpp	(Revision 26694)
+++ scribus/undogui.cpp	(Arbeitskopie)
@@ -205,9 +205,9 @@
 	QHBoxLayout* buttonLayout = new QHBoxLayout;
 	buttonLayout->setContentsMargins(0, 0, 0, 0);
 	buttonLayout->setSpacing(6);
-	undoButton = new QPushButton(IconManager::instance().loadPixmap("16/edit-undo.png"), "", this);
+	undoButton = new QPushButton(IconManager::instance().loadPixmap("edit-undo"), "", this);
 	buttonLayout->addWidget(undoButton);
-	redoButton = new QPushButton(IconManager::instance().loadPixmap("16/edit-redo.png"), "", this);
+	redoButton = new QPushButton(IconManager::instance().loadPixmap("edit-redo"), "", this);
 	buttonLayout->addWidget(redoButton);
 	//Save the translated key sequence - hopefully we get the translated one here!
 	initialUndoKS = undoButton->shortcut();
Index: scribus/undomanager.cpp
===================================================================
--- scribus/undomanager.cpp	(Revision 26694)
+++ scribus/undomanager.cpp	(Arbeitskopie)
@@ -854,14 +854,14 @@
 	QString iconDir = ScPaths::instance().iconDir();
 
 /*** Icons for UndoObjects *******************************************/
-	UndoManager::IImageFrame      = new QPixmap(iconDir + "16/insert-image.png");
-	UndoManager::ITextFrame       = new QPixmap(iconDir + "16/insert-text-frame.png");
-	UndoManager::ILatexFrame      = new QPixmap(iconDir + "16/insert-latex.png");
-	UndoManager::ILine            = new QPixmap(iconDir + "stift.png");
-	UndoManager::IPolygon         = new QPixmap(iconDir + "16/draw-polygon.png");
-	UndoManager::IPolyline        = new QPixmap(iconDir + "16/draw-bezier-curves.png");
+	UndoManager::IImageFrame      = new QPixmap(iconDir + "tool-insert-image");
+	UndoManager::ITextFrame       = new QPixmap(iconDir + "tool-insert-text-frame");
+	UndoManager::ILatexFrame      = new QPixmap(iconDir + "insert-latex");
+	UndoManager::ILine            = new QPixmap(iconDir + "tool-insert-line");
+	UndoManager::IPolygon         = new QPixmap(iconDir + "tool-insert-polygon");
+	UndoManager::IPolyline        = new QPixmap(iconDir + "tool-draw-bezier");
 // 	UndoManager::IPathText        = new QPixmap(iconDir + "?";
-	UndoManager::IGroup           = new QPixmap(iconDir + "u_group.png");
+	UndoManager::IGroup           = new QPixmap(iconDir + "u_group");
 /*** Icons for actions ***********************************************/
 	UndoManager::IMove            = new QPixmap(iconDir + "u_move.png");
 	UndoManager::IResize          = new QPixmap(iconDir + "u_resize.png");
@@ -879,7 +879,7 @@
 	UndoManager::IDisablePrint    = new QPixmap(iconDir + "u_disableprint.png");
 	UndoManager::IDelete          = new QPixmap(iconDir + "u_delete.png");
 	UndoManager::ICreate          = new QPixmap(iconDir + "u_create.png");
-	UndoManager::IPaste           = new QPixmap(iconDir + "16/edit-paste.png");
+	UndoManager::IPaste           = new QPixmap(iconDir + "edit-paste");
 	UndoManager::ICut             = new QPixmap(iconDir + "u_cut.png");
 	UndoManager::ITransparency    = new QPixmap(iconDir + "u_transp.png");
 	UndoManager::ILineStyle       = new QPixmap(iconDir + "u_line.png");
@@ -888,7 +888,7 @@
 	UndoManager::IFont            = new QPixmap(iconDir + "u_font.png");
 	UndoManager::IAI              = new QPixmap(iconDir + "u_eps.png"); // using the icon for EPS for now
 	UndoManager::IEPS             = new QPixmap(iconDir + "u_eps.png");
-	UndoManager::IImportOOoDraw   = new QPixmap(iconDir + "ooo_draw.png");
+	UndoManager::IImportOOoDraw   = new QPixmap(iconDir + "file-ooo-draw");
 	UndoManager::ISVG             = new QPixmap(iconDir + "u_svg.png");
 	UndoManager::IUniconv         = new QPixmap(iconDir + "u_svg.png"); // using the icon for SVG for now
 	UndoManager::IWMF             = new QPixmap(iconDir + "u_eps.png"); // using the icon for EPS for now
@@ -895,7 +895,7 @@
 	UndoManager::IXFIG            = new QPixmap(iconDir + "u_eps.png"); // using the icon for EPS for now
 	UndoManager::IImageScaling    = new QPixmap(iconDir + "u_scale_image.png");
 	UndoManager::IBorder          = new QPixmap(iconDir + "u_shape.png");
-	UndoManager::IDocument        = new QPixmap(iconDir + "16/document-new.png");
+	UndoManager::IDocument        = new QPixmap(iconDir + "document-new");
 // 	UndoManager::ILayer           = new QPixmap(iconDir + "u_layer.png");
 // 	UndoManager::ILayerAction     = new QPixmap(iconDir + "u_layer_action.png");
 // 	UndoManager::IUp              = new QPixmap(iconDir + "u_up.png");
Index: scribus/util_color.cpp
===================================================================
--- scribus/util_color.cpp	(Revision 26694)
+++ scribus/util_color.cpp	(Arbeitskopie)
@@ -248,12 +248,12 @@
 	if (!iconsInitialized)
 	{
 		IconManager& im = IconManager::instance();
-		alertIcon = im.loadPixmap("alert.png");
-		cmykIcon = im.loadPixmap("cmyk.png");
-		rgbIcon = im.loadPixmap("rgb.png");
-		labIcon = im.loadPixmap("lab.png");
-		spotIcon = im.loadPixmap("spot.png");
-		regIcon = im.loadPixmap("register.png");
+		alertIcon = im.loadPixmap("alert-warning");
+		cmykIcon = im.loadPixmap("color-cmyk");
+		rgbIcon = im.loadPixmap("color-rgb");
+		labIcon = im.loadPixmap("color-lab");
+		spotIcon = im.loadPixmap("color-spot");
+		regIcon = im.loadPixmap("color-registration");
 		iconsInitialized = true;
 	}
 
iconids_2025-02-15_01.patch (301,683 bytes)   

nitramr

2025-02-15 22:49

developer   ~0052058

Oh, I just noticed that the old icon sets are no longer usable due to the ID changes.

Now is probably the time to remove the old sets from the selection in the preferences, since the sets are incomplete anyway due to the extensive UI changes in 1.7.0.

jghali

2025-02-15 23:07

administrator   ~0052059

Well, if you look at the CMakeLists.txt file in the iconsets directory, the old icon sets are in fact not installed anymore. If you still have them, they probably come from an old installation. On Windows, the 1.7.0 installers does not provide the old iconsets anymore either.

nitramr

2025-02-16 11:33

developer   ~0052061

@jghali you are right. I just cleaned the installation folder.

ale

2025-02-16 12:18

manager   ~0052062

this patch touches at so many parts of scribus that it will rot very fast.

please review and apply as soon as possible.
(and it will be risky to merge for anybody who is currently working on patches that touch at UI code...)

ale

2025-02-16 22:01

manager   ~0052064

thanks to you both : - )

Issue History

Date Modified Username Field Change
2025-02-15 22:38 nitramr New Issue
2025-02-15 22:38 nitramr File Added: iconids_2025-02-15_01.patch
2025-02-15 22:49 nitramr Note Added: 0052058
2025-02-15 22:51 nitramr Description Updated
2025-02-15 23:07 jghali Note Added: 0052059
2025-02-16 11:33 nitramr Note Added: 0052061
2025-02-16 12:18 ale Note Added: 0052062
2025-02-16 20:40 cbradney Assigned To => nitramr
2025-02-16 20:40 cbradney Status new => resolved
2025-02-16 20:40 cbradney Resolution open => fixed
2025-02-16 20:40 cbradney Fixed in Version => 1.7.1.svn
2025-02-16 22:01 ale Note Added: 0052064