Rename symphony (#444)

* Rename symphony

* Additional changes
diff --git a/main/default_images/sfx2/res/symphony/morebutton.png b/main/default_images/sfx2/res/sidebar/morebutton.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/morebutton.png
rename to main/default_images/sfx2/res/sidebar/morebutton.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/morebutton_h.png b/main/default_images/sfx2/res/sidebar/morebutton_h.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/morebutton_h.png
rename to main/default_images/sfx2/res/sidebar/morebutton_h.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/open_more.png b/main/default_images/sfx2/res/sidebar/open_more.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/open_more.png
rename to main/default_images/sfx2/res/sidebar/open_more.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/open_more_hc.png b/main/default_images/sfx2/res/sidebar/open_more_hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/open_more_hc.png
rename to main/default_images/sfx2/res/sidebar/open_more_hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-3d-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-3d-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-3d-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-3d-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-3d-large.png b/main/default_images/sfx2/res/sidebar/sidebar-3d-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-3d-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-3d-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-3d-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-3d-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-3d-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-3d-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-3d-small.png b/main/default_images/sfx2/res/sidebar/sidebar-3d-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-3d-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-3d-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-animation-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-animation-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-animation-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-animation-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-animation-large.png b/main/default_images/sfx2/res/sidebar/sidebar-animation-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-animation-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-animation-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-animation-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-animation-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-animation-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-animation-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-animation-small.png b/main/default_images/sfx2/res/sidebar/sidebar-animation-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-animation-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-animation-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-colors-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-colors-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-colors-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-colors-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-colors-large.png b/main/default_images/sfx2/res/sidebar/sidebar-colors-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-colors-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-colors-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-colors-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-colors-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-colors-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-colors-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-colors-small.png b/main/default_images/sfx2/res/sidebar/sidebar-colors-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-colors-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-colors-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-eyedropper-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-eyedropper-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-eyedropper-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-eyedropper-large.png b/main/default_images/sfx2/res/sidebar/sidebar-eyedropper-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-eyedropper-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-eyedropper-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-eyedropper-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-eyedropper-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-eyedropper-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-eyedropper-small.png b/main/default_images/sfx2/res/sidebar/sidebar-eyedropper-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-eyedropper-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-eyedropper-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-functions-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-functions-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-functions-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-functions-large.png b/main/default_images/sfx2/res/sidebar/sidebar-functions-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-functions-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-functions-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-functions-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-functions-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-functions-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-functions-small.png b/main/default_images/sfx2/res/sidebar/sidebar-functions-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-functions-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-functions-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-gallery-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-gallery-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-gallery-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-gallery-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-gallery-large.png b/main/default_images/sfx2/res/sidebar/sidebar-gallery-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-gallery-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-gallery-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-gallery-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-gallery-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-gallery-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-gallery-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-gallery-small.png b/main/default_images/sfx2/res/sidebar/sidebar-gallery-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-gallery-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-gallery-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-imganim-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-imganim-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-imganim-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-imganim-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-imganim-large.png b/main/default_images/sfx2/res/sidebar/sidebar-imganim-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-imganim-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-imganim-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-imganim-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-imganim-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-imganim-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-imganim-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-imganim-small.png b/main/default_images/sfx2/res/sidebar/sidebar-imganim-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-imganim-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-imganim-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-navigator-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-navigator-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-navigator-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-navigator-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-navigator-large.png b/main/default_images/sfx2/res/sidebar/sidebar-navigator-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-navigator-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-navigator-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-navigator-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-navigator-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-navigator-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-navigator-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-navigator-small.png b/main/default_images/sfx2/res/sidebar/sidebar-navigator-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-navigator-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-navigator-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-property-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-property-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-property-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-property-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-property-large.png b/main/default_images/sfx2/res/sidebar/sidebar-property-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-property-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-property-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-property-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-property-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-property-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-property-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-property-small.png b/main/default_images/sfx2/res/sidebar/sidebar-property-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-property-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-property-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-style-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-style-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-style-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-style-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-style-large.png b/main/default_images/sfx2/res/sidebar/sidebar-style-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-style-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-style-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-style-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-style-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-style-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-style-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-style-small.png b/main/default_images/sfx2/res/sidebar/sidebar-style-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-style-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-style-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-template-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-template-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-template-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-template-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-template-large.png b/main/default_images/sfx2/res/sidebar/sidebar-template-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-template-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-template-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-template-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-template-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-template-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-template-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-template-small.png b/main/default_images/sfx2/res/sidebar/sidebar-template-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-template-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-template-small.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-transition-large-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-transition-large-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-transition-large-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-transition-large-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-transition-large.png b/main/default_images/sfx2/res/sidebar/sidebar-transition-large.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-transition-large.png
rename to main/default_images/sfx2/res/sidebar/sidebar-transition-large.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-transition-small-hc.png b/main/default_images/sfx2/res/sidebar/sidebar-transition-small-hc.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-transition-small-hc.png
rename to main/default_images/sfx2/res/sidebar/sidebar-transition-small-hc.png
Binary files differ
diff --git a/main/default_images/sfx2/res/symphony/sidebar-transition-small.png b/main/default_images/sfx2/res/sidebar/sidebar-transition-small.png
similarity index 100%
rename from main/default_images/sfx2/res/symphony/sidebar-transition-small.png
rename to main/default_images/sfx2/res/sidebar/sidebar-transition-small.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png b/main/default_images/svx/res/sidebar/AdjustColorBlue_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/AdjustColorBlue_16x16.png
rename to main/default_images/svx/res/sidebar/AdjustColorBlue_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png b/main/default_images/svx/res/sidebar/AdjustColorGamma_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/AdjustColorGamma_16x16.png
rename to main/default_images/svx/res/sidebar/AdjustColorGamma_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png b/main/default_images/svx/res/sidebar/AdjustColorGreen_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/AdjustColorGreen_16x16.png
rename to main/default_images/svx/res/sidebar/AdjustColorGreen_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/AdjustColorRed_16x16.png b/main/default_images/svx/res/sidebar/AdjustColorRed_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/AdjustColorRed_16x16.png
rename to main/default_images/svx/res/sidebar/AdjustColorRed_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png b/main/default_images/svx/res/sidebar/ColorModeBlackWhite_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/ColorModeBlackWhite_16x16.png
rename to main/default_images/svx/res/sidebar/ColorModeBlackWhite_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/ColorModeGrey_16x16.png b/main/default_images/svx/res/sidebar/ColorModeGrey_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/ColorModeGrey_16x16.png
rename to main/default_images/svx/res/sidebar/ColorModeGrey_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/ColorModeNormal_16x16.png b/main/default_images/svx/res/sidebar/ColorModeNormal_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/ColorModeNormal_16x16.png
rename to main/default_images/svx/res/sidebar/ColorModeNormal_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png b/main/default_images/svx/res/sidebar/ColorModeWaterMark_16x16.png
similarity index 100%
rename from main/default_images/svx/res/symphony/ColorModeWaterMark_16x16.png
rename to main/default_images/svx/res/sidebar/ColorModeWaterMark_16x16.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Highlight.png b/main/default_images/svx/res/sidebar/Highlight.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Highlight.png
rename to main/default_images/svx/res/sidebar/Highlight.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Indent2.png b/main/default_images/svx/res/sidebar/Indent2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Indent2.png
rename to main/default_images/svx/res/sidebar/Indent2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Indent3.png b/main/default_images/svx/res/sidebar/Indent3.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Indent3.png
rename to main/default_images/svx/res/sidebar/Indent3.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Indent4.png b/main/default_images/svx/res/sidebar/Indent4.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Indent4.png
rename to main/default_images/svx/res/sidebar/Indent4.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Indent_Hanging.png b/main/default_images/svx/res/sidebar/Indent_Hanging.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Indent_Hanging.png
rename to main/default_images/svx/res/sidebar/Indent_Hanging.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Line_color.png b/main/default_images/svx/res/sidebar/Line_color.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Line_color.png
rename to main/default_images/svx/res/sidebar/Line_color.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Quadratic.png b/main/default_images/svx/res/sidebar/Quadratic.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Quadratic.png
rename to main/default_images/svx/res/sidebar/Quadratic.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Quadratic_h.png b/main/default_images/svx/res/sidebar/Quadratic_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Quadratic_h.png
rename to main/default_images/svx/res/sidebar/Quadratic_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Square.png b/main/default_images/svx/res/sidebar/Square.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Square.png
rename to main/default_images/svx/res/sidebar/Square.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/Square_h.png b/main/default_images/svx/res/sidebar/Square_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/Square_h.png
rename to main/default_images/svx/res/sidebar/Square_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/axial.png b/main/default_images/svx/res/sidebar/axial.png
similarity index 100%
rename from main/default_images/svx/res/symphony/axial.png
rename to main/default_images/svx/res/sidebar/axial.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/axial_h.png b/main/default_images/svx/res/sidebar/axial_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/axial_h.png
rename to main/default_images/svx/res/sidebar/axial_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/blank.png b/main/default_images/svx/res/sidebar/blank.png
similarity index 100%
rename from main/default_images/svx/res/symphony/blank.png
rename to main/default_images/svx/res/sidebar/blank.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/decrease font.png b/main/default_images/svx/res/sidebar/decrease font.png
similarity index 100%
rename from main/default_images/svx/res/symphony/decrease font.png
rename to main/default_images/svx/res/sidebar/decrease font.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/ellipsoid.png b/main/default_images/svx/res/sidebar/ellipsoid.png
similarity index 100%
rename from main/default_images/svx/res/symphony/ellipsoid.png
rename to main/default_images/svx/res/sidebar/ellipsoid.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/ellipsoid_h.png b/main/default_images/svx/res/sidebar/ellipsoid_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/ellipsoid_h.png
rename to main/default_images/svx/res/sidebar/ellipsoid_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/enlarge font.png b/main/default_images/svx/res/sidebar/enlarge font.png
similarity index 100%
rename from main/default_images/svx/res/symphony/enlarge font.png
rename to main/default_images/svx/res/sidebar/enlarge font.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/fill_color.png b/main/default_images/svx/res/sidebar/fill_color.png
similarity index 100%
rename from main/default_images/svx/res/symphony/fill_color.png
rename to main/default_images/svx/res/sidebar/fill_color.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/fill_color_h.png b/main/default_images/svx/res/sidebar/fill_color_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/fill_color_h.png
rename to main/default_images/svx/res/sidebar/fill_color_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/icon_normal.png b/main/default_images/svx/res/sidebar/icon_normal.png
similarity index 100%
rename from main/default_images/svx/res/symphony/icon_normal.png
rename to main/default_images/svx/res/sidebar/icon_normal.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/last_custom_common.png b/main/default_images/svx/res/sidebar/last_custom_common.png
similarity index 100%
rename from main/default_images/svx/res/symphony/last_custom_common.png
rename to main/default_images/svx/res/sidebar/last_custom_common.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/last_custom_common_grey.png b/main/default_images/svx/res/sidebar/last_custom_common_grey.png
similarity index 100%
rename from main/default_images/svx/res/symphony/last_custom_common_grey.png
rename to main/default_images/svx/res/sidebar/last_custom_common_grey.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line1.png b/main/default_images/svx/res/sidebar/line1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line1.png
rename to main/default_images/svx/res/sidebar/line1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line10.png b/main/default_images/svx/res/sidebar/line10.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line10.png
rename to main/default_images/svx/res/sidebar/line10.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line10_h.png b/main/default_images/svx/res/sidebar/line10_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line10_h.png
rename to main/default_images/svx/res/sidebar/line10_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line1_h.png b/main/default_images/svx/res/sidebar/line1_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line1_h.png
rename to main/default_images/svx/res/sidebar/line1_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line2.png b/main/default_images/svx/res/sidebar/line2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line2.png
rename to main/default_images/svx/res/sidebar/line2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line2_h.png b/main/default_images/svx/res/sidebar/line2_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line2_h.png
rename to main/default_images/svx/res/sidebar/line2_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line3.png b/main/default_images/svx/res/sidebar/line3.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line3.png
rename to main/default_images/svx/res/sidebar/line3.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line3_h.png b/main/default_images/svx/res/sidebar/line3_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line3_h.png
rename to main/default_images/svx/res/sidebar/line3_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line4.png b/main/default_images/svx/res/sidebar/line4.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line4.png
rename to main/default_images/svx/res/sidebar/line4.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line4_h.png b/main/default_images/svx/res/sidebar/line4_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line4_h.png
rename to main/default_images/svx/res/sidebar/line4_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line5.png b/main/default_images/svx/res/sidebar/line5.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line5.png
rename to main/default_images/svx/res/sidebar/line5.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line5_h.png b/main/default_images/svx/res/sidebar/line5_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line5_h.png
rename to main/default_images/svx/res/sidebar/line5_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line6.png b/main/default_images/svx/res/sidebar/line6.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line6.png
rename to main/default_images/svx/res/sidebar/line6.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line6_h.png b/main/default_images/svx/res/sidebar/line6_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line6_h.png
rename to main/default_images/svx/res/sidebar/line6_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line7.png b/main/default_images/svx/res/sidebar/line7.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line7.png
rename to main/default_images/svx/res/sidebar/line7.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line7_h.png b/main/default_images/svx/res/sidebar/line7_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line7_h.png
rename to main/default_images/svx/res/sidebar/line7_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line8.png b/main/default_images/svx/res/sidebar/line8.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line8.png
rename to main/default_images/svx/res/sidebar/line8.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line8_h.png b/main/default_images/svx/res/sidebar/line8_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line8_h.png
rename to main/default_images/svx/res/sidebar/line8_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line9.png b/main/default_images/svx/res/sidebar/line9.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line9.png
rename to main/default_images/svx/res/sidebar/line9.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/line9_h.png b/main/default_images/svx/res/sidebar/line9_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/line9_h.png
rename to main/default_images/svx/res/sidebar/line9_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/linear.png b/main/default_images/svx/res/sidebar/linear.png
similarity index 100%
rename from main/default_images/svx/res/symphony/linear.png
rename to main/default_images/svx/res/sidebar/linear.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/linear_h.png b/main/default_images/svx/res/sidebar/linear_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/linear_h.png
rename to main/default_images/svx/res/sidebar/linear_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpselected-spacing-1.png b/main/default_images/svx/res/sidebar/lpselected-spacing-1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpselected-spacing-1.png
rename to main/default_images/svx/res/sidebar/lpselected-spacing-1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpselected-spacing-1_15.png b/main/default_images/svx/res/sidebar/lpselected-spacing-1_15.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpselected-spacing-1_15.png
rename to main/default_images/svx/res/sidebar/lpselected-spacing-1_15.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpselected-spacing-1_5.png b/main/default_images/svx/res/sidebar/lpselected-spacing-1_5.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpselected-spacing-1_5.png
rename to main/default_images/svx/res/sidebar/lpselected-spacing-1_5.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpselected-spacing-2.png b/main/default_images/svx/res/sidebar/lpselected-spacing-2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpselected-spacing-2.png
rename to main/default_images/svx/res/sidebar/lpselected-spacing-2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpsmall-spacing-1.png b/main/default_images/svx/res/sidebar/lpsmall-spacing-1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpsmall-spacing-1.png
rename to main/default_images/svx/res/sidebar/lpsmall-spacing-1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpspacing-1.png b/main/default_images/svx/res/sidebar/lpspacing-1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpspacing-1.png
rename to main/default_images/svx/res/sidebar/lpspacing-1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpspacing-1_15.png b/main/default_images/svx/res/sidebar/lpspacing-1_15.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpspacing-1_15.png
rename to main/default_images/svx/res/sidebar/lpspacing-1_15.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpspacing-1_5.png b/main/default_images/svx/res/sidebar/lpspacing-1_5.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpspacing-1_5.png
rename to main/default_images/svx/res/sidebar/lpspacing-1_5.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/lpspacing-2.png b/main/default_images/svx/res/sidebar/lpspacing-2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/lpspacing-2.png
rename to main/default_images/svx/res/sidebar/lpspacing-2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/no color.png b/main/default_images/svx/res/sidebar/no color.png
similarity index 100%
rename from main/default_images/svx/res/symphony/no color.png
rename to main/default_images/svx/res/sidebar/no color.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/para_numbullet01.png b/main/default_images/svx/res/sidebar/para_numbullet01.png
similarity index 100%
rename from main/default_images/svx/res/symphony/para_numbullet01.png
rename to main/default_images/svx/res/sidebar/para_numbullet01.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/para_numbullet02.png b/main/default_images/svx/res/sidebar/para_numbullet02.png
similarity index 100%
rename from main/default_images/svx/res/symphony/para_numbullet02.png
rename to main/default_images/svx/res/sidebar/para_numbullet02.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/para_numbullet_rtl01.png b/main/default_images/svx/res/sidebar/para_numbullet_rtl01.png
similarity index 100%
rename from main/default_images/svx/res/symphony/para_numbullet_rtl01.png
rename to main/default_images/svx/res/sidebar/para_numbullet_rtl01.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/para_numbullet_rtl02.png b/main/default_images/svx/res/sidebar/para_numbullet_rtl02.png
similarity index 100%
rename from main/default_images/svx/res/symphony/para_numbullet_rtl02.png
rename to main/default_images/svx/res/sidebar/para_numbullet_rtl02.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/para_numbulleth01.png b/main/default_images/svx/res/sidebar/para_numbulleth01.png
similarity index 100%
rename from main/default_images/svx/res/symphony/para_numbulleth01.png
rename to main/default_images/svx/res/sidebar/para_numbulleth01.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/para_numbulleth02.png b/main/default_images/svx/res/sidebar/para_numbulleth02.png
similarity index 100%
rename from main/default_images/svx/res/symphony/para_numbulleth02.png
rename to main/default_images/svx/res/sidebar/para_numbulleth02.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/radial.png b/main/default_images/svx/res/sidebar/radial.png
similarity index 100%
rename from main/default_images/svx/res/symphony/radial.png
rename to main/default_images/svx/res/sidebar/radial.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/radial_h.png b/main/default_images/svx/res/sidebar/radial_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/radial_h.png
rename to main/default_images/svx/res/sidebar/radial_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/rotate_left.png b/main/default_images/svx/res/sidebar/rotate_left.png
similarity index 100%
rename from main/default_images/svx/res/symphony/rotate_left.png
rename to main/default_images/svx/res/sidebar/rotate_left.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/rotate_right.png b/main/default_images/svx/res/sidebar/rotate_right.png
similarity index 100%
rename from main/default_images/svx/res/symphony/rotate_right.png
rename to main/default_images/svx/res/sidebar/rotate_right.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/rotation.png b/main/default_images/svx/res/sidebar/rotation.png
similarity index 100%
rename from main/default_images/svx/res/symphony/rotation.png
rename to main/default_images/svx/res/sidebar/rotation.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/rotation_h.png b/main/default_images/svx/res/sidebar/rotation_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/rotation_h.png
rename to main/default_images/svx/res/sidebar/rotation_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_backgroundcolor.png b/main/default_images/svx/res/sidebar/sc_backgroundcolor.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_backgroundcolor.png
rename to main/default_images/svx/res/sidebar/sc_backgroundcolor.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_bold.png b/main/default_images/svx/res/sidebar/sc_bold.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_bold.png
rename to main/default_images/svx/res/sidebar/sc_bold.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_color.png b/main/default_images/svx/res/sidebar/sc_color.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_color.png
rename to main/default_images/svx/res/sidebar/sc_color.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_italic.png b/main/default_images/svx/res/sidebar/sc_italic.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_italic.png
rename to main/default_images/svx/res/sidebar/sc_italic.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_shadowed.png b/main/default_images/svx/res/sidebar/sc_shadowed.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_shadowed.png
rename to main/default_images/svx/res/sidebar/sc_shadowed.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_strikeout.png b/main/default_images/svx/res/sidebar/sc_strikeout.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_strikeout.png
rename to main/default_images/svx/res/sidebar/sc_strikeout.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_subscript.png b/main/default_images/svx/res/sidebar/sc_subscript.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_subscript.png
rename to main/default_images/svx/res/sidebar/sc_subscript.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_superscript.png b/main/default_images/svx/res/sidebar/sc_superscript.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_superscript.png
rename to main/default_images/svx/res/sidebar/sc_superscript.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sc_underline.png b/main/default_images/svx/res/sidebar/sc_underline.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sc_underline.png
rename to main/default_images/svx/res/sidebar/sc_underline.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/sch_backgroundcolor.png b/main/default_images/svx/res/sidebar/sch_backgroundcolor.png
similarity index 100%
rename from main/default_images/svx/res/symphony/sch_backgroundcolor.png
rename to main/default_images/svx/res/sidebar/sch_backgroundcolor.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line1.png b/main/default_images/svx/res/sidebar/selected-line1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line1.png
rename to main/default_images/svx/res/sidebar/selected-line1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line10.png b/main/default_images/svx/res/sidebar/selected-line10.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line10.png
rename to main/default_images/svx/res/sidebar/selected-line10.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line2.png b/main/default_images/svx/res/sidebar/selected-line2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line2.png
rename to main/default_images/svx/res/sidebar/selected-line2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line3.png b/main/default_images/svx/res/sidebar/selected-line3.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line3.png
rename to main/default_images/svx/res/sidebar/selected-line3.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line4.png b/main/default_images/svx/res/sidebar/selected-line4.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line4.png
rename to main/default_images/svx/res/sidebar/selected-line4.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line5.png b/main/default_images/svx/res/sidebar/selected-line5.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line5.png
rename to main/default_images/svx/res/sidebar/selected-line5.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line6.png b/main/default_images/svx/res/sidebar/selected-line6.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line6.png
rename to main/default_images/svx/res/sidebar/selected-line6.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line7.png b/main/default_images/svx/res/sidebar/selected-line7.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line7.png
rename to main/default_images/svx/res/sidebar/selected-line7.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line8.png b/main/default_images/svx/res/sidebar/selected-line8.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line8.png
rename to main/default_images/svx/res/sidebar/selected-line8.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/selected-line9.png b/main/default_images/svx/res/sidebar/selected-line9.png
similarity index 100%
rename from main/default_images/svx/res/symphony/selected-line9.png
rename to main/default_images/svx/res/sidebar/selected-line9.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing1.png b/main/default_images/svx/res/sidebar/spacing1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing1.png
rename to main/default_images/svx/res/sidebar/spacing1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing2.png b/main/default_images/svx/res/sidebar/spacing2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing2.png
rename to main/default_images/svx/res/sidebar/spacing2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing3.png b/main/default_images/svx/res/sidebar/spacing3.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing3.png
rename to main/default_images/svx/res/sidebar/spacing3.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_loose.png b/main/default_images/svx/res/sidebar/spacing_loose.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_loose.png
rename to main/default_images/svx/res/sidebar/spacing_loose.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_loose_s.png b/main/default_images/svx/res/sidebar/spacing_loose_s.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_loose_s.png
rename to main/default_images/svx/res/sidebar/spacing_loose_s.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_normal.png b/main/default_images/svx/res/sidebar/spacing_normal.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_normal.png
rename to main/default_images/svx/res/sidebar/spacing_normal.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_normal_s.png b/main/default_images/svx/res/sidebar/spacing_normal_s.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_normal_s.png
rename to main/default_images/svx/res/sidebar/spacing_normal_s.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_tight.png b/main/default_images/svx/res/sidebar/spacing_tight.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_tight.png
rename to main/default_images/svx/res/sidebar/spacing_tight.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_tight_s.png b/main/default_images/svx/res/sidebar/spacing_tight_s.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_tight_s.png
rename to main/default_images/svx/res/sidebar/spacing_tight_s.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_loose.png b/main/default_images/svx/res/sidebar/spacing_very_loose.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_very_loose.png
rename to main/default_images/svx/res/sidebar/spacing_very_loose.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_loose_s.png b/main/default_images/svx/res/sidebar/spacing_very_loose_s.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_very_loose_s.png
rename to main/default_images/svx/res/sidebar/spacing_very_loose_s.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_tight.png b/main/default_images/svx/res/sidebar/spacing_very_tight.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_very_tight.png
rename to main/default_images/svx/res/sidebar/spacing_very_tight.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/spacing_very_tight_s.png b/main/default_images/svx/res/sidebar/spacing_very_tight_s.png
similarity index 100%
rename from main/default_images/svx/res/symphony/spacing_very_tight_s.png
rename to main/default_images/svx/res/sidebar/spacing_very_tight_s.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width1.png b/main/default_images/svx/res/sidebar/width1.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width1.png
rename to main/default_images/svx/res/sidebar/width1.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width1_h.png b/main/default_images/svx/res/sidebar/width1_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width1_h.png
rename to main/default_images/svx/res/sidebar/width1_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width2.png b/main/default_images/svx/res/sidebar/width2.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width2.png
rename to main/default_images/svx/res/sidebar/width2.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width2_h.png b/main/default_images/svx/res/sidebar/width2_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width2_h.png
rename to main/default_images/svx/res/sidebar/width2_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width3.png b/main/default_images/svx/res/sidebar/width3.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width3.png
rename to main/default_images/svx/res/sidebar/width3.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width3_h.png b/main/default_images/svx/res/sidebar/width3_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width3_h.png
rename to main/default_images/svx/res/sidebar/width3_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width4.png b/main/default_images/svx/res/sidebar/width4.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width4.png
rename to main/default_images/svx/res/sidebar/width4.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width4_h.png b/main/default_images/svx/res/sidebar/width4_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width4_h.png
rename to main/default_images/svx/res/sidebar/width4_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width5.png b/main/default_images/svx/res/sidebar/width5.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width5.png
rename to main/default_images/svx/res/sidebar/width5.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width5_h.png b/main/default_images/svx/res/sidebar/width5_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width5_h.png
rename to main/default_images/svx/res/sidebar/width5_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width6.png b/main/default_images/svx/res/sidebar/width6.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width6.png
rename to main/default_images/svx/res/sidebar/width6.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width6_h.png b/main/default_images/svx/res/sidebar/width6_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width6_h.png
rename to main/default_images/svx/res/sidebar/width6_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width7.png b/main/default_images/svx/res/sidebar/width7.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width7.png
rename to main/default_images/svx/res/sidebar/width7.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width7_h.png b/main/default_images/svx/res/sidebar/width7_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width7_h.png
rename to main/default_images/svx/res/sidebar/width7_h.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width8.png b/main/default_images/svx/res/sidebar/width8.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width8.png
rename to main/default_images/svx/res/sidebar/width8.png
Binary files differ
diff --git a/main/default_images/svx/res/symphony/width8_h.png b/main/default_images/svx/res/sidebar/width8_h.png
similarity index 100%
rename from main/default_images/svx/res/symphony/width8_h.png
rename to main/default_images/svx/res/sidebar/width8_h.png
Binary files differ
diff --git a/main/helpcontent2/source/text/shared/guide/sidebar_window.xhp b/main/helpcontent2/source/text/shared/guide/sidebar_window.xhp
index 7a9fb68..b688d36 100644
--- a/main/helpcontent2/source/text/shared/guide/sidebar_window.xhp
+++ b/main/helpcontent2/source/text/shared/guide/sidebar_window.xhp
@@ -43,7 +43,7 @@
 <table id="tbl_id1000">
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id1001" role="tablecontent" l10n="NEW"><image id="img_id1002" src="sfx2/res/symphony/open_more.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id1002">Configuration Menu</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id1001" role="tablecontent" l10n="NEW"><image id="img_id1002" src="sfx2/res/sidebar/open_more.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id1002">Configuration Menu</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id1003" role="tablecontent" l10n="NEW">The drop-down list of the configuration menu button has two parts.</paragraph>
@@ -63,7 +63,7 @@
 <table id="tbl_id2000">
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2001" role="tablecontent" l10n="NEW"><image id="img_id2001" src="sfx2/res/symphony/sidebar-property-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2001">Property deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2001" role="tablecontent" l10n="NEW"><image id="img_id2001" src="sfx2/res/sidebar/sidebar-property-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2001">Property deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2002" role="tablecontent" l10n="NEW">The <item type="menuitem">Properties</item> deck provides panels for object formatting like font, background color, or object size. The content depends on the currently selected object.</paragraph>
@@ -71,7 +71,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2003" role="tablecontent" l10n="NEW"><image id="img_id2003" src="sfx2/res/symphony/sidebar-style-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2003">Styles and Formatting deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2003" role="tablecontent" l10n="NEW"><image id="img_id2003" src="sfx2/res/sidebar/sidebar-style-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2003">Styles and Formatting deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2004" role="tablecontent" l10n="NEW">The <item type="menuitem">Styles and Formatting</item> deck contains the <switchinline select="appl">
@@ -84,7 +84,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2005" role="tablecontent" l10n="NEW"><image id="img_id2005" src="sfx2/res/symphony/sidebar-gallery-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2005">Gallery deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2005" role="tablecontent" l10n="NEW"><image id="img_id2005" src="sfx2/res/sidebar/sidebar-gallery-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2005">Gallery deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2006" role="tablecontent" l10n="NEW">The <item type="menuitem">Gallery</item> deck contains the <link href="text/shared/01/gallery.xhp" name="gallery">Gallery</link> window.</paragraph>
@@ -92,7 +92,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2007" role="tablecontent" l10n="NEW"><image id="img_id2007" src="sfx2/res/symphony/sidebar-navigator-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2007">Navigator deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2007" role="tablecontent" l10n="NEW"><image id="img_id2007" src="sfx2/res/sidebar/sidebar-navigator-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2007">Navigator deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2008" role="tablecontent" l10n="NEW">The <item type="menuitem">Navigator</item> deck contains the <switchinline select="appl">
@@ -105,7 +105,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2009" role="tablecontent" l10n="NEW"><image id="img_id2009" src="sfx2/res/symphony/sidebar-functions-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2009">Function list deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2009" role="tablecontent" l10n="NEW"><image id="img_id2009" src="sfx2/res/sidebar/sidebar-functions-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2009">Function list deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2010" role="tablecontent" l10n="NEW">
@@ -114,7 +114,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2011" role="tablecontent" l10n="NEW"><image id="img_id2011" src="sfx2/res/symphony/sidebar-template-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2011">Master Pages deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2011" role="tablecontent" l10n="NEW"><image id="img_id2011" src="sfx2/res/sidebar/sidebar-template-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2011">Master Pages deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2012" role="tablecontent" l10n="NEW">The <item type="menuitem">Master Pages</item> deck lists currently used, recently used, and available master pages. Right-click a master page thumbnail for a sub-menu to apply or edit the master page. This deck is only available for presentations.</paragraph>
@@ -122,7 +122,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2013" role="tablecontent" l10n="NEW"><image id="img_id2013" src="sfx2/res/symphony/sidebar-animation-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2013">Custom Animation deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2013" role="tablecontent" l10n="NEW"><image id="img_id2013" src="sfx2/res/sidebar/sidebar-animation-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2013">Custom Animation deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2014" role="tablecontent" l10n="NEW">The <item type="menuitem">Custom Animation</item> deck provides tools to apply animation effects to presentation and graphic objects on your slide. This deck is only available for presentations.</paragraph>
@@ -130,7 +130,7 @@
 </tablerow>
 <tablerow>
 <tablecell>
-<paragraph xml-lang="en-US" id="par_id2015" role="tablecontent" l10n="NEW"><image id="img_id2015" src="sfx2/res/symphony/sidebar-transition-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2015">Slide Transition deck</alt></image></paragraph>
+<paragraph xml-lang="en-US" id="par_id2015" role="tablecontent" l10n="NEW"><image id="img_id2015" src="sfx2/res/sidebar/sidebar-transition-large.png" width="0.25in" height="0.25in"><alt xml-lang="en-US" id="alt_id2015">Slide Transition deck</alt></image></paragraph>
 </tablecell>
 <tablecell>
 <paragraph xml-lang="en-US" id="par_id2016" role="tablecontent" l10n="NEW">The <item type="menuitem">Slide Transition</item> deck provides tools to apply a special effect that plays when you display a slide. This deck is only available for presentations.</paragraph>
diff --git a/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index ac7adb9..1fc98f6 100644
--- a/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/main/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -34,10 +34,10 @@
           <value>PropertyDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-property-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-property-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-property-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -57,10 +57,10 @@
           <value>GalleryDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-gallery-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-gallery-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-gallery-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-gallery-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -80,10 +80,10 @@
           <value>MasterPagesDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-template-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-template-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-template-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-template-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -103,10 +103,10 @@
           <value>CustomAnimationDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-animation-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-animation-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-animation-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-animation-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -126,10 +126,10 @@
           <value>SlideTransitionDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-transition-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-transition-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-transition-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-transition-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -149,10 +149,10 @@
           <value>NavigatorDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-navigator-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-navigator-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-navigator-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-navigator-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -172,10 +172,10 @@
           <value>StyleListDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-style-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-style-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-style-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-style-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
@@ -195,10 +195,10 @@
           <value>FunctionsDeck</value>
         </prop>
         <prop oor:name="IconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-functions-large.png</value>
         </prop>
         <prop oor:name="HighContrastIconURL" oor:type="xs:string">
-          <value>private:graphicrepository/sfx2/res/symphony/sidebar-functions-large-hc.png</value>
+          <value>private:graphicrepository/sfx2/res/sidebar/sidebar-functions-large-hc.png</value>
         </prop>
         <prop oor:name="ContextList">
           <value oor:separator=";">
diff --git a/main/ooo_custom_images/classic/classic_images.tar.gz b/main/ooo_custom_images/classic/classic_images.tar.gz
index e283fd1..f4e2659 100644
--- a/main/ooo_custom_images/classic/classic_images.tar.gz
+++ b/main/ooo_custom_images/classic/classic_images.tar.gz
Binary files differ
diff --git a/main/sfx2/source/sidebar/Sidebar.src b/main/sfx2/source/sidebar/Sidebar.src
index bf4e6b1..83718a2 100644
--- a/main/sfx2/source/sidebar/Sidebar.src
+++ b/main/sfx2/source/sidebar/Sidebar.src
@@ -55,22 +55,22 @@
 
 	Image IMAGE_SIDEBAR_MENU
 	{
-		ImageBitmap = Bitmap { File = "symphony/open_more.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/open_more.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_MENU_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/open_more_hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/open_more_hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DETAIL_DIALOG
 	{
-		ImageBitmap = Bitmap { File = "symphony/morebutton.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/morebutton.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DETAIL_DIALOG_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/morebutton_h.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/morebutton_h.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_TOOLBOX_SEPARATOR
@@ -80,206 +80,206 @@
 
 	Image IMAGE_SIDEBAR_DECK_3D_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-3d-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_3D_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-3d-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_3D_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-3d-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_3D_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-3d-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-3d-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-animation-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_ANIMATION_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-animation-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-animation-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_ANIMATION_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-animation-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-animation-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_COLORS_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-colors-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_COLORS_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-colors-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_COLORS_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-colors-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_COLORS_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-colors-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-colors-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-eyedropper-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-eyedropper-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-eyedropper-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_EYEDROPPER_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-eyedropper-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-eyedropper-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-gallery-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_GALLERY_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-gallery-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-gallery-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_GALLERY_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-gallery-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-gallery-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-imganim-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_IMGANIM_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-imganim-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-imganim-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_IMGANIM_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-imganim-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-imganim-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-navigator-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-navigator-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-navigator-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_NAVIGATOR_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-navigator-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-navigator-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-property-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-property-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_PROPERTIES_DECK_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-property-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-property-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-property-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-property-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_PROPERTIES_DECK_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-property-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-property-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_STYLE_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-style-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-style-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_STYLE_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-style-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-style-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_STYLE_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-style-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-style-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_STYLE_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-style-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-style-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-template-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-template-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_TEMPLATE_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-template-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-template-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-template-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-template-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_TEMPLATE_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-template-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-template-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-transition-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_TRANSITION_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-transition-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-transition-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_TRANSITION_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-transition-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-transition-small-hc.png" ;} ;
 	};
 
 	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-functions-large.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_LARGE_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-large-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-functions-large-hc.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-functions-small.png" ;} ;
 	};
 	Image IMAGE_SIDEBAR_DECK_FUNCTIONS_SMALL_HC
 	{
-		ImageBitmap = Bitmap { File = "symphony/sidebar-functions-small-hc.png" ;} ;
+		ImageBitmap = Bitmap { File = "sidebar/sidebar-functions-small-hc.png" ;} ;
 	};
 
 	String STRING_CUSTOMIZATION
diff --git a/main/sfx2/source/sidebar/Theme.cxx b/main/sfx2/source/sidebar/Theme.cxx
index 733ed85..b156b91 100644
--- a/main/sfx2/source/sidebar/Theme.cxx
+++ b/main/sfx2/source/sidebar/Theme.cxx
@@ -330,14 +330,14 @@
 			maPropertyIdToNameMap[Image_TabBarMenu],
 			Any(
 				mbIsHighContrastMode
-					? A2S("private:graphicrepository/sfx2/res/symphony/open_more_hc.png")
-					: A2S("private:graphicrepository/sfx2/res/symphony/open_more.png")));
+					? A2S("private:graphicrepository/sfx2/res/sidebar/open_more_hc.png")
+					: A2S("private:graphicrepository/sfx2/res/sidebar/open_more.png")));
 		setPropertyValue(
 			maPropertyIdToNameMap[Image_PanelMenu],
 			Any(
 				mbIsHighContrastMode
-					? A2S("private:graphicrepository/sfx2/res/symphony/morebutton_h.png")
-					: A2S("private:graphicrepository/sfx2/res/symphony/morebutton.png")));
+					? A2S("private:graphicrepository/sfx2/res/sidebar/morebutton_h.png")
+					: A2S("private:graphicrepository/sfx2/res/sidebar/morebutton.png")));
 		setPropertyValue(
 			maPropertyIdToNameMap[Image_Closer],
 			Any(
diff --git a/main/svx/source/sidebar/area/AreaPropertyPanel.src b/main/svx/source/sidebar/area/AreaPropertyPanel.src
index 5332968..92da0f6 100644
--- a/main/svx/source/sidebar/area/AreaPropertyPanel.src
+++ b/main/svx/source/sidebar/area/AreaPropertyPanel.src
@@ -81,61 +81,61 @@
 	};
 	Image IMG_AXIAL
 	{
-		ImageBitmap = Bitmap {File = "symphony/axial.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/axial.png" ;} ;
 	};
 	Image IMG_ELLI
 	{
-		ImageBitmap = Bitmap {File = "symphony/ellipsoid.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/ellipsoid.png" ;} ;
 	};
 	Image IMG_QUAD
 	{
-		ImageBitmap = Bitmap {File = "symphony/Quadratic.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Quadratic.png" ;} ;
 	};
 	Image IMG_RADIAL
 	{
-		ImageBitmap = Bitmap {File = "symphony/radial.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/radial.png" ;} ;
 	};
 	Image IMG_SQUARE
 	{
-		ImageBitmap = Bitmap {File = "symphony/Square.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Square.png" ;} ;
 	};
 	Image IMG_LINEAR
 	{
-		ImageBitmap = Bitmap {File = "symphony/linear.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/linear.png" ;} ;
 	};
 	Image IMG_COLOR
 	{
-		ImageBitmap = Bitmap {File = "symphony/fill_color.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/fill_color.png" ;} ;
 	};
 
 	// high contract
 	Image IMG_AXIAL_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/axial_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/axial_h.png" ;} ;
 	};
 	Image IMG_ELLI_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/ellipsoid_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/ellipsoid_h.png" ;} ;
 	};
 	Image IMG_QUAD_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/Quadratic_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Quadratic_h.png" ;} ;
 	};
 	Image IMG_RADIAL_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/radial_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/radial_h.png" ;} ;
 	};
 	Image IMG_SQUARE_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/Square_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Square_h.png" ;} ;
 	};
 	Image IMG_LINEAR_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/linear_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/linear_h.png" ;} ;
 	};
 	Image IMG_COLOR_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/fill_color_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/fill_color_h.png" ;} ;
 	};
 
 	//=====================================================================================================================================
@@ -194,7 +194,7 @@
 				HelpID = HID_PPROPERTYPANEL_AREA_TBI_GRADIENT ;
 				ItemBitmap = Bitmap
 				{
-					File = "symphony/linear.png" ;
+					File = "sidebar/linear.png" ;
 				};
 				DropDown = TRUE ;
 				Text = "Gradient" ;
@@ -353,7 +353,7 @@
 				Text = "Rotate Left" ;
 				ItemBitmap = Bitmap
 				{
-		//			File = "symphony/rotate_left.png" ;
+		//			File = "sidebar/rotate_left.png" ;
 				};
 			};
 		};
@@ -374,7 +374,7 @@
 				Text = "Rotate Right" ;
 				ItemBitmap = Bitmap
 				{
-		//			File = "symphony/rotate_right.png" ;
+		//			File = "sidebar/rotate_right.png" ;
 				};
 			};
 		};
@@ -389,11 +389,11 @@
 	};
 	Image IMG_ROT_LEFT
 	{
-		ImageBitmap = Bitmap {File = "symphony/rotate_left.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/rotate_left.png" ;} ;
 	};
 	Image IMG_ROT_RIGHT
 	{
-		ImageBitmap = Bitmap {File = "symphony/rotate_right.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/rotate_right.png" ;} ;
 	};
 };
 Control RID_POPUPPANEL_AERAPAGE_COLOR
diff --git a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src
index 9caf48a..b1ed2d3 100644
--- a/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src
+++ b/main/svx/source/sidebar/graphic/GraphicPropertyPanel.src
@@ -44,20 +44,20 @@
 	DialogControl = TRUE ;
 	Border = FALSE ;
 
-	Size = MAP_APPFONT( PROPERTYPAGE_WIDTH, PAGE_HEIGHT ) ;
+	Size = MAP_APPFONT ( PROPERTYPAGE_WIDTH, PAGE_HEIGHT ) ;
 	HelpID = HID_PROPERTYPANEL_GRAPHIC_SECTION ;
 	Text = "Graphic" ;
 
 	FixedText FT_BRIGHTNESS
 	{
-		Pos = MAP_APPFONT (X0, Y0) ;
+		Pos = MAP_APPFONT ( X0, Y0 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
 		Text [ en-US ] = "~Brightness:" ;
 	};
 	MetricField MTR_BRIGHTNESS
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X0, Y1) ;
+		Pos = MAP_APPFONT ( X0, Y1 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_BRIGHT ;
 		QuickHelpText [ en-US ] = "Specify the luminance of the graphic." ;
@@ -72,14 +72,14 @@
 	};
 	FixedText FT_CONTRAST
 	{
-		Pos = MAP_APPFONT (X2, Y0) ;
+		Pos = MAP_APPFONT ( X2, Y0 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
 		Text [ en-US ] = "~Contrast:" ;
 	};
 	MetricField MTR_CONTRAST
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X2, Y1) ;
+		Pos = MAP_APPFONT ( X2, Y1 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_CONTRAST ;
 		QuickHelpText [ en-US ] = "Specify the degree of difference between the lightest and darkest parts of the graphic." ;
@@ -94,14 +94,14 @@
 	};
 	FixedText FT_COLOR_MODE
 	{
-		Pos = MAP_APPFONT (X0, Y2) ;
+		Pos = MAP_APPFONT ( X0, Y2 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
 		Text [ en-US ] = "Color ~mode:" ;
 	};
 	ListBox LB_COLOR_MODE
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X0, Y3) ;
+		Pos = MAP_APPFONT ( X0, Y3 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, 100 ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_LB_COLORMODE ;
 		QuickHelpText [ en-US ] = "Select the color mode of the graphic." ;
@@ -110,14 +110,14 @@
 	};
 	FixedText FT_TRANSPARENT
 	{
-		Pos = MAP_APPFONT (X2, Y2) ;
+		Pos = MAP_APPFONT ( X2, Y2 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH, TEXT_HEIGHT ) ;
 		Text [ en-US ] = "~Transparency:" ;
 	};
 	MetricField MTR_TRANSPARENT
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X2, Y3) ;
+		Pos = MAP_APPFONT ( X2, Y3 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH ,MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_TRANSP ;
 		QuickHelpText [ en-US ] = "Specify the percentage of transparency; 0% is fully opaque and 100% is fully transparent." ;
@@ -132,7 +132,7 @@
 	MetricField MF_RED
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X1, Y4) ;
+		Pos = MAP_APPFONT ( X1, Y4 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH - 10,MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_RED ;
 		QuickHelpText [ en-US ] = "Red" ;
@@ -148,7 +148,7 @@
 	MetricField MF_GREEN
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X3, Y4) ;
+		Pos = MAP_APPFONT ( X3, Y4 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_GREEN ;
 		QuickHelpText [ en-US ] = "Green" ;
@@ -164,7 +164,7 @@
 	MetricField MF_BLUE
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X1, Y5) ;
+		Pos = MAP_APPFONT ( X1, Y5 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_BLUE ;
 		QuickHelpText [ en-US ] = "Blue" ;
@@ -180,7 +180,7 @@
 	MetricField MF_GAMMA
 	{
 		Border = TRUE ;
-		Pos = MAP_APPFONT (X3, Y5) ;
+		Pos = MAP_APPFONT ( X3, Y5 ) ;
 		Size = MAP_APPFONT ( MBOX_WIDTH - 10 ,MBOX_HEIGHT ) ;
 		HelpID = HID_PROPERTY_PANEL_GRAPHIC_MTR_GAMMA ;
 		QuickHelpText [ en-US ] = "Specify the gamma value that affects the brightness of the midtone values." ;
@@ -194,38 +194,38 @@
 	};
 	FixedImage IMG_RED
 	{
-		Pos = MAP_APPFONT(X0, Y4) ;
-		Size = MAP_APPFONT( 10, 12 ) ;
+		Pos = MAP_APPFONT ( X0, Y4 ) ;
+		Size = MAP_APPFONT ( 10, 12 ) ;
 		Fixed = Image
 		{
-			ImageBitmap = Bitmap { File = "symphony/AdjustColorRed_16x16.png" ; };
+			ImageBitmap = Bitmap { File = "sidebar/AdjustColorRed_16x16.png" ; };
 		};
 	};
 	FixedImage IMG_GREEN
 	{
-		Pos = MAP_APPFONT(X2, Y4) ;
-		Size = MAP_APPFONT( 10, 12 ) ;
+		Pos = MAP_APPFONT ( X2, Y4 ) ;
+		Size = MAP_APPFONT ( 10, 12 ) ;
 		Fixed = Image
 		{
-			ImageBitmap = Bitmap { File = "symphony/AdjustColorGreen_16x16.png" ; };
+			ImageBitmap = Bitmap { File = "sidebar/AdjustColorGreen_16x16.png" ; };
 		};
 	};
 	FixedImage IMG_BLUE
 	{
-		Pos = MAP_APPFONT(X0, Y5) ;
-		Size = MAP_APPFONT( 10, 12 ) ;
+		Pos = MAP_APPFONT ( X0, Y5 ) ;
+		Size = MAP_APPFONT ( 10, 12 ) ;
 		Fixed = Image
 		{
-			ImageBitmap = Bitmap { File = "symphony/AdjustColorBlue_16x16.png" ; };
+			ImageBitmap = Bitmap { File = "sidebar/AdjustColorBlue_16x16.png" ; };
 		};
 	};
 	FixedImage IMG_GAMMA
 	{
-		Pos = MAP_APPFONT(X2, Y5) ;
-		Size = MAP_APPFONT( 10, 12 ) ;
+		Pos = MAP_APPFONT ( X2, Y5 ) ;
+		Size = MAP_APPFONT ( 10, 12 ) ;
 		Fixed = Image
 		{
-			ImageBitmap = Bitmap { File = "symphony/AdjustColorGamma_16x16.png" ; };
+			ImageBitmap = Bitmap { File = "sidebar/AdjustColorGamma_16x16.png" ; };
 		};
 	};
 };
diff --git a/main/svx/source/sidebar/line/LinePropertyPanel.src b/main/svx/source/sidebar/line/LinePropertyPanel.src
index 96fea7c..9b61179 100644
--- a/main/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/main/svx/source/sidebar/line/LinePropertyPanel.src
@@ -224,85 +224,85 @@
 
 	Image IMG_COLOR
 	{
-		ImageBitmap = Bitmap{File = "symphony/Line_color.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/Line_color.png" ;};
 	};
 	Image IMG_COLOR_NO
 	{
-		ImageBitmap = Bitmap{File = "symphony/no color.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/no color.png" ;};
 	};
 
 	Image IMG_NONE_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/blank.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/blank.png" ;};
 	};
 
 	//WIDTH ICON
 	Image IMG_WIDTH1_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width1.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width1.png" ;};
 	};
 	Image IMG_WIDTH2_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width2.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width2.png" ;};
 	};
 	Image IMG_WIDTH3_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width3.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width3.png" ;};
 	};
 	Image IMG_WIDTH4_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width4.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width4.png" ;};
 	};
 	Image IMG_WIDTH5_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width5.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width5.png" ;};
 	};
 	Image IMG_WIDTH6_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width6.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width6.png" ;};
 	};
 	Image IMG_WIDTH7_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width7.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width7.png" ;};
 	};
 	Image IMG_WIDTH8_ICON
 	{
-		ImageBitmap = Bitmap{File = "symphony/width8.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width8.png" ;};
 	};
 
 	//high contrast for line width
 	//WIDTH ICON
 	Image IMG_WIDTH1_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width1_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width1_h.png" ;};
 	};
 	Image IMG_WIDTH2_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width2_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width2_h.png" ;};
 	};
 	Image IMG_WIDTH3_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width3_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width3_h.png" ;};
 	};
 	Image IMG_WIDTH4_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width4_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width4_h.png" ;};
 	};
 	Image IMG_WIDTH5_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width5_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width5_h.png" ;};
 	};
 	Image IMG_WIDTH6_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width6_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width6_h.png" ;};
 	};
 	Image IMG_WIDTH7_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width7_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width7_h.png" ;};
 	};
 	Image IMG_WIDTH8_ICON_H
 	{
-		ImageBitmap = Bitmap{File = "symphony/width8_h.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/width8_h.png" ;};
 	};
 };
 Control RID_POPUPPANEL_LINEPAGE_COLOR
@@ -402,11 +402,11 @@
 
 	Image IMG_WIDTH_CUSTOM
 	{
-		ImageBitmap = Bitmap{File = "symphony/last_custom_common.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/last_custom_common.png" ;};
 	};
 	Image IMG_WIDTH_CUSTOM_GRAY
 	{
-		ImageBitmap = Bitmap{File = "symphony/last_custom_common_grey.png" ;};
+		ImageBitmap = Bitmap{File = "sidebar/last_custom_common_grey.png" ;};
 	};
 	String STR_WIDTH_LAST_CUSTOM
 	{
diff --git a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 288950b..963d3b6 100644
--- a/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/main/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #include "ParaPropertyPanel.hrc"
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "helpid.hrc"
@@ -284,7 +282,7 @@
 				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENT_HANG ;
 				ItemBitmap = Bitmap
 				{
-					File = "symphony/Indent_Hanging.png" ;
+					File = "sidebar/Indent_Hanging.png" ;
 				};
 			};
 		};
@@ -318,7 +316,7 @@
 				HelpID = HID_PPROPERTYPANEL_PARA_TBI_INDENTP_HANG ;
 				ItemBitmap = Bitmap
 				{
-					File = "symphony/Indent_Hanging.png" ;
+					File = "sidebar/Indent_Hanging.png" ;
 				};
 			};
 		};
@@ -387,7 +385,7 @@
 				Text [ en-US ] = "Line Spacing" ;
 				ItemBitmap = Bitmap
 				{
-					File = "symphony/lpsmall-spacing-1.png" ;
+					File = "sidebar/lpsmall-spacing-1.png" ;
 				};
 				DropDown = TRUE ;
 			};
@@ -421,59 +419,59 @@
 
 	ImageList IL_NUM_BULLET
 	{
-		Prefix = "symphony/para_numbullet" ;
+		Prefix = "sidebar/para_numbullet" ;
 		MaskColor = STD_MASKCOLOR ;
 		SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST
 	};
 	ImageList ILH_NUM_BULLET
 	{
-		Prefix = "symphony/para_numbulleth" ;
+		Prefix = "sidebar/para_numbulleth" ;
 		MaskColor = STD_MASKCOLOR ;
 		SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST
 	};
 	// for sym2_7380
 	ImageList IL_NUM_BULLET_RTL
 	{
-		Prefix = "symphony/para_numbullet_rtl" ;
+		Prefix = "sidebar/para_numbullet_rtl" ;
 		MaskColor = STD_MASKCOLOR ;
 		SVX_PROPERTYPANEL_PARA_NUMBULLET_IDLIST_RTL
 	};
 	// end
 	Image IMG_BACK_COLOR
 	{
-		ImageBitmap = Bitmap {File = "symphony/sc_backgroundcolor.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/sc_backgroundcolor.png" ;} ;
 	};
 	Image IMG_BACK_COLOR_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/sch_backgroundcolor.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/sch_backgroundcolor.png" ;} ;
 	};
 	Image IMG_SPACE1
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing1.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing1.png" ;} ;
 	};
 	Image IMG_SPACE2
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing2.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing2.png" ;} ;
 	};
 	Image IMG_SPACE3
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing3.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing3.png" ;} ;
 	};
 	Image IMG_INDENT1
 	{
-		ImageBitmap = Bitmap {File = "symphony/Indent2.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Indent2.png" ;} ;
 	};
 	Image IMG_INDENT2
 	{
-		ImageBitmap = Bitmap {File = "symphony/Indent3.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Indent3.png" ;} ;
 	};
 	Image IMG_INDENT3
 	{
-		ImageBitmap = Bitmap {File = "symphony/Indent4.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Indent4.png" ;} ;
 	};
 	Image IMG_INDENT_HANG
 	{
-		ImageBitmap = Bitmap {File = "symphony/Indent_Hanging.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/Indent_Hanging.png" ;} ;
 	};
 };
 
@@ -670,43 +668,43 @@
 	};
 	Image IMG_SPACING1
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpspacing-1.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpspacing-1.png" ;} ;
 	};
 	Image IMG_SPACING115
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpspacing-1_15.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpspacing-1_15.png" ;} ;
 	};
 	Image IMG_SPACING15
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpspacing-1_5.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpspacing-1_5.png" ;} ;
 	};
 	Image IMG_SPACING2
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpspacing-2.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpspacing-2.png" ;} ;
 	};
 	Image IMG_SEL_SPACING1
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-1.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpselected-spacing-1.png" ;} ;
 	};
 	Image IMG_SEL_SPACING115
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-1_15.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpselected-spacing-1_15.png" ;} ;
 	};
 	Image IMG_SEL_SPACING15
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-1_5.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpselected-spacing-1_5.png" ;} ;
 	};
 	Image IMG_SEL_SPACING2
 	{
-		ImageBitmap = Bitmap {File = "symphony/lpselected-spacing-2.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/lpselected-spacing-2.png" ;} ;
 	};
 	Image IMG_CUSTOM
 	{
-		ImageBitmap = Bitmap {File = "symphony/last_custom_common.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/last_custom_common.png" ;} ;
 	};
 	Image IMG_CUSTOM_GRAY
 	{
-		ImageBitmap = Bitmap {File = "symphony/last_custom_common_grey.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/last_custom_common_grey.png" ;} ;
 	};
 	String STR_LS_SINGLE
 	{
diff --git a/main/svx/source/sidebar/text/TextPropertyPanel.src b/main/svx/source/sidebar/text/TextPropertyPanel.src
index cb56060..d3280b7 100644
--- a/main/svx/source/sidebar/text/TextPropertyPanel.src
+++ b/main/svx/source/sidebar/text/TextPropertyPanel.src
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #include "TextPropertyPanel.hrc"
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "helpid.hrc"
@@ -282,127 +280,127 @@
 
 	Image IMG_SINGLE
 	{
-		ImageBitmap = Bitmap {File = "symphony/line1.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line1.png" ;} ;
 	};
 	Image IMG_DOUBLE
 	{
-		ImageBitmap = Bitmap {File = "symphony/line2.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line2.png" ;} ;
 	};
 	Image IMG_BOLD2
 	{
-		ImageBitmap = Bitmap {File = "symphony/line3.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line3.png" ;} ;
 	};
 	Image IMG_DOT
 	{
-		ImageBitmap = Bitmap {File = "symphony/line4.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line4.png" ;} ;
 	};
 	Image IMG_DOT_BOLD
 	{
-		ImageBitmap = Bitmap {File = "symphony/line5.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line5.png" ;} ;
 	};
 	Image IMG_DASH
 	{
-		ImageBitmap = Bitmap {File = "symphony/line6.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line6.png" ;} ;
 	};
 	Image IMG_DASH_LONG
 	{
-		ImageBitmap = Bitmap {File = "symphony/line7.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line7.png" ;} ;
 	};
 	Image IMG_DASH_DOT
 	{
-		ImageBitmap = Bitmap {File = "symphony/line8.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line8.png" ;} ;
 	};
 	Image IMG_DASH_DOT_DOT
 	{
-		ImageBitmap = Bitmap {File = "symphony/line9.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line9.png" ;} ;
 	};
 	Image IMG_WAVE
 	{
-		ImageBitmap = Bitmap {File = "symphony/line10.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line10.png" ;} ;
 	};
 
 	// high contract
 	Image IMG_SINGLE_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line1_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line1_h.png" ;} ;
 	};
 	Image IMG_DOUBLE_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line2_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line2_h.png" ;} ;
 	};
 	Image IMG_BOLD2_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line3_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line3_h.png" ;} ;
 	};
 	Image IMG_DOT_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line4_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line4_h.png" ;} ;
 	};
 	Image IMG_DOT_BOLD_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line5_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line5_h.png" ;} ;
 	};
 	Image IMG_DASH_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line6_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line6_h.png" ;} ;
 	};
 	Image IMG_DASH_LONG_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line7_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line7_h.png" ;} ;
 	};
 	Image IMG_DASH_DOT_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line8_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line8_h.png" ;} ;
 	};
 	Image IMG_DASH_DOT_DOT_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line9_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line9_h.png" ;} ;
 	};
 	Image IMG_WAVE_H
 	{
-		ImageBitmap = Bitmap {File = "symphony/line10_h.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/line10_h.png" ;} ;
 	};
 
 	// image when selected
 	Image IMG_SINGLE_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line1.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line1.png" ;} ;
 	};
 	Image IMG_DOUBLE_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line2.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line2.png" ;} ;
 	};
 	Image IMG_BOLD2_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line3.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line3.png" ;} ;
 	};
 	Image IMG_DOT_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line4.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line4.png" ;} ;
 	};
 	Image IMG_DOT_BOLD_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line5.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line5.png" ;} ;
 	};
 	Image IMG_DASH_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line6.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line6.png" ;} ;
 	};
 	Image IMG_DASH_LONG_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line7.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line7.png" ;} ;
 	};
 	Image IMG_DASH_DOT_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line8.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line8.png" ;} ;
 	};
 	Image IMG_DASH_DOT_DOT_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line9.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line9.png" ;} ;
 	};
 	Image IMG_WAVE_SEL
 	{
-		ImageBitmap = Bitmap {File = "symphony/selected-line10.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/selected-line10.png" ;} ;
 	};
 
 	String STR_WITHOUT
@@ -549,53 +547,53 @@
 
 	Image IMG_NORMAL
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_normal.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_normal.png" ;} ;
 	};
 	Image IMG_VERY_TIGHT
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_very_tight.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_very_tight.png" ;} ;
 	};
 	Image IMG_TIGHT
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_tight.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_tight.png" ;} ;
 	};
 	Image IMG_LOOSE
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_loose.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_loose.png" ;} ;
 	};
 	Image IMG_VERY_LOOSE
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_very_loose.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_very_loose.png" ;} ;
 	};
 
 	Image IMG_NORMAL_S
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_normal_s.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_normal_s.png" ;} ;
 	};
 	Image IMG_VERY_TIGHT_S
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_very_tight_s.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_very_tight_s.png" ;} ;
 	};
 	Image IMG_TIGHT_S
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_tight_s.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_tight_s.png" ;} ;
 	};
 	Image IMG_LOOSE_S
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_loose_s.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_loose_s.png" ;} ;
 	};
 	Image IMG_VERY_LOOSE_S
 	{
-		ImageBitmap = Bitmap {File = "symphony/spacing_very_loose_s.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/spacing_very_loose_s.png" ;} ;
 	};
 
 	Image IMG_CUSTOM
 	{
-		ImageBitmap = Bitmap {File = "symphony/last_custom_common.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/last_custom_common.png" ;} ;
 	};
 	Image IMG_CUSTOM_GRAY
 	{
-		ImageBitmap = Bitmap {File = "symphony/last_custom_common_grey.png" ;} ;
+		ImageBitmap = Bitmap {File = "sidebar/last_custom_common_grey.png" ;} ;
 	};
 
 	String STR_VERY_TIGHT