diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02049.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02049.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02049.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02049.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02050.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02050.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02050.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02050.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02051.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02051.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02051.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02051.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02052.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02052.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02052.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02052.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02054.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02054.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/av02054.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/av02054.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avaudiologo.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avaudiologo.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avaudiologo.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avaudiologo.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avemptylogo.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avemptylogo.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avemptylogo.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avemptylogo.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02049.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02049.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02049.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02049.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02050.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02050.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02050.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02050.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02051.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02051.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02051.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02051.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02052.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02052.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02052.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02052.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02054.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02054.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/avl02054.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/avl02054.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/done.2021-03-25 b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/done.2021-03-25
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/avmedia/res/done.2021-03-25
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/avmedia/res/done.2021-03-25
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_acceptalltrackedchanges.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_acceptalltrackedchanges.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_acceptalltrackedchanges.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_acceptalltrackedchanges.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchange.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchange.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchange.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchange.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchanges.idea.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchanges.idea.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchanges.idea.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchanges.idea.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchanges.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchanges.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchanges.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchanges.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchangetonext.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchangetonext.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_accepttrackedchangetonext.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_accepttrackedchangetonext.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_addwatch.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_addwatch.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_addwatch.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_addwatch.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignblock.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignblock.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignblock.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignblock.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignbottom.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignbottom.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignbottom.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignbottom.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignhorizontalcenter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignhorizontalcenter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignhorizontalcenter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignhorizontalcenter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignleft.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignleft.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignleft.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignleft.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignright.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignright.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignright.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignright.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_aligntop.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_aligntop.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_aligntop.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_aligntop.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignverticalcenter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignverticalcenter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_alignverticalcenter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_alignverticalcenter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arc.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arc.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arc.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arc.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.down-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.down-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.down-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.down-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.left-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.left-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.left-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.left-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.right-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.right-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.right-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.right-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.up-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.up-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_arrowshapes.up-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_arrowshapes.up-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_backcolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_backcolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_backcolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_backcolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_backgroundcolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_backgroundcolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_backgroundcolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_backgroundcolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.block-arc.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.block-arc.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.block-arc.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.block-arc.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.circle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.circle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.circle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.circle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.cross.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.cross.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.cross.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.cross.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.cube.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.cube.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.cube.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.cube.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.diamond.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.diamond.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.diamond.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.diamond.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.ellipse.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.ellipse.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.ellipse.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.ellipse.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.hexagon.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.hexagon.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.hexagon.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.hexagon.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.isosceles-triangle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.isosceles-triangle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.isosceles-triangle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.isosceles-triangle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.rectangle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.rectangle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.rectangle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.rectangle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.right-triangle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.right-triangle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.right-triangle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.right-triangle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.round-quadrat.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.round-quadrat.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.round-quadrat.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.round-quadrat.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.trapezoid.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.trapezoid.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_basicshapes.trapezoid.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_basicshapes.trapezoid.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_bezier_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_bezier_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_bezier_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_bezier_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_bold.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_bold.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_bold.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_bold.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.line-callout-1.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.line-callout-1.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.line-callout-1.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.line-callout-1.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.line-callout-2.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.line-callout-2.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.line-callout-2.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.line-callout-2.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.line-callout-3.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.line-callout-3.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.line-callout-3.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.line-callout-3.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.round-rectangular-callout.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.round-rectangular-callout.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_calloutshapes.round-rectangular-callout.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_calloutshapes.round-rectangular-callout.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_charfontname.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_charfontname.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_charfontname.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_charfontname.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_choosecontrols.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_choosecontrols.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_choosecontrols.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_choosecontrols.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_circlecut.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_circlecut.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_circlecut.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_circlecut.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_colorscaleformatdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_colorscaleformatdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_colorscaleformatdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_colorscaleformatdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_commentchangetracking.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_commentchangetracking.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_commentchangetracking.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_commentchangetracking.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_comparedocuments.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_comparedocuments.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_comparedocuments.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_comparedocuments.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_controlcodes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_controlcodes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_controlcodes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_controlcodes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_copy.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_copy.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_copy.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_copy.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_currencyfield.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_currencyfield.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_currencyfield.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_currencyfield.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_cut.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_cut.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_cut.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_cut.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datadatapilotrun.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datadatapilotrun.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datadatapilotrun.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datadatapilotrun.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datafilterautofilter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datafilterautofilter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datafilterautofilter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datafilterautofilter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datafilterspecialfilter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datafilterspecialfilter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datafilterspecialfilter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datafilterspecialfilter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datafilterstandardfilter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datafilterstandardfilter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datafilterstandardfilter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datafilterstandardfilter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datasort.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datasort.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_datasort.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_datasort.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_decrementindent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_decrementindent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_decrementindent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_decrementindent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_defaultbullet.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_defaultbullet.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_defaultbullet.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_defaultbullet.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_defaultnumbering.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_defaultnumbering.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_defaultnumbering.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_defaultnumbering.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_defineprintarea.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_defineprintarea.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_defineprintarea.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_defineprintarea.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_designerdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_designerdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_designerdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_designerdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_drawchart.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_drawchart.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_drawchart.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_drawchart.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_editheaderandfooter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_editheaderandfooter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_editheaderandfooter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_editheaderandfooter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_entirecolumn.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_entirecolumn.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_entirecolumn.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_entirecolumn.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_entirerow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_entirerow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_entirerow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_entirerow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_exportdirecttopdf.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_exportdirecttopdf.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_exportdirecttopdf.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_exportdirecttopdf.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_extrusiontoggle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_extrusiontoggle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_extrusiontoggle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_extrusiontoggle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_flowchartshapes.flowchart-data.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_flowchartshapes.flowchart-data.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_flowchartshapes.flowchart-data.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_flowchartshapes.flowchart-data.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_flowchartshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_flowchartshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_flowchartshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_flowchartshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_fontcolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_fontcolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_fontcolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_fontcolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_fontworkgalleryfloater.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_fontworkgalleryfloater.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_fontworkgalleryfloater.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_fontworkgalleryfloater.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_formatcolumns.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_formatcolumns.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_formatcolumns.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_formatcolumns.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_formatpaintbrush.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_formatpaintbrush.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_formatpaintbrush.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_formatpaintbrush.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_formproperties.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_formproperties.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_formproperties.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_formproperties.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_framelinecolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_framelinecolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_framelinecolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_framelinecolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freeline_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freeline_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freeline_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freeline_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freezepanes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freezepanes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freezepanes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freezepanes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freezepanesfirstcolumn.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freezepanesfirstcolumn.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freezepanesfirstcolumn.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freezepanesfirstcolumn.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freezepanesfirstrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freezepanesfirstrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_freezepanesfirstrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_freezepanesfirstrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_gallery.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_gallery.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_gallery.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_gallery.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_grow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_grow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_grow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_grow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_hangingindent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_hangingindent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_hangingindent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_hangingindent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_hyperlinkdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_hyperlinkdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_hyperlinkdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_hyperlinkdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_incrementindent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_incrementindent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_incrementindent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_incrementindent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertannotation.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertannotation.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertannotation.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertannotation.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertbookmark.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertbookmark.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertbookmark.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertbookmark.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertdraw.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertdraw.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertdraw.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertdraw.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertendnote.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertendnote.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertendnote.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertendnote.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertfield.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertfield.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertfield.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertfield.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertfootnote.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertfootnote.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertfootnote.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertfootnote.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertframe.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertframe.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertframe.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertframe.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertgraphic.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertgraphic.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertgraphic.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertgraphic.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertindexesentry.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertindexesentry.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertindexesentry.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertindexesentry.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertobject.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertobject.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertobject.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertobject.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertpagebreak.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertpagebreak.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertpagebreak.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertpagebreak.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertreferencefield.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertreferencefield.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertreferencefield.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertreferencefield.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertsection.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertsection.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_insertsection.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_insertsection.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_inserttable.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_inserttable.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_inserttable.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_inserttable.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_italic.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_italic.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_italic.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_italic.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_line.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_line.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_line.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_line.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_line_diagonal.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_line_diagonal.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_line_diagonal.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_line_diagonal.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowcircle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowcircle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowcircle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowcircle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowend.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowend.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowend.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowend.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrows.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrows.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrows.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrows.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowsquare.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowsquare.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowsquare.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowsquare.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowstart.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowstart.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linearrowstart.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linearrowstart.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linecirclearrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linecirclearrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linecirclearrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linecirclearrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linesquarearrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linesquarearrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linesquarearrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linesquarearrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linestyle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linestyle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_linestyle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_linestyle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_measureline.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_measureline.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_measureline.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_measureline.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_mergecells.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_mergecells.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_mergecells.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_mergecells.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_mergedocuments.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_mergedocuments.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_mergedocuments.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_mergedocuments.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_navigator.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_navigator.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_navigator.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_navigator.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_newdoc.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_newdoc.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_newdoc.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_newdoc.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatdate.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatdate.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatdate.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatdate.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatdecdecimals.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatdecdecimals.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatdecdecimals.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatdecdecimals.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatdecimal.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatdecimal.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatdecimal.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatdecimal.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatincdecimals.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatincdecimals.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatincdecimals.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatincdecimals.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatpercent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatpercent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_numberformatpercent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_numberformatpercent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_open.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_open.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_open.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_open.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_paraspacedecrease.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_paraspacedecrease.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_paraspacedecrease.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_paraspacedecrease.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_paraspaceincrease.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_paraspaceincrease.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_paraspaceincrease.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_paraspaceincrease.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_paste.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_paste.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_paste.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_paste.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_pie.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_pie.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_pie.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_pie.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_polygon_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_polygon_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_polygon_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_polygon_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_print.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_print.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_print.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_print.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_printpreview.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_printpreview.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_printpreview.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_printpreview.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_protect.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_protect.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_protect.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_protect.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_recsearch.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_recsearch.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_recsearch.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_recsearch.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rect_rounded_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rect_rounded_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rect_rounded_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rect_rounded_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_redo.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_redo.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_redo.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_redo.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rejectalltrackedchanges.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rejectalltrackedchanges.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rejectalltrackedchanges.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rejectalltrackedchanges.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rejecttrackedchange.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rejecttrackedchange.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rejecttrackedchange.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rejecttrackedchange.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rejecttrackedchangetonext.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rejecttrackedchangetonext.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_rejecttrackedchangetonext.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_rejecttrackedchangetonext.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_resetattributes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_resetattributes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_resetattributes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_resetattributes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_save.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_save.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_save.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_save.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_savebasicas.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_savebasicas.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_savebasicas.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_savebasicas.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_searchdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_searchdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_searchdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_searchdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_selectmode.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_selectmode.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_selectmode.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_selectmode.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_setborderstyle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_setborderstyle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_setborderstyle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_setborderstyle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_shadowed.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_shadowed.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_shadowed.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_shadowed.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_shapeslinemenu.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_shapeslinemenu.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_shapeslinemenu.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_shapeslinemenu.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_showannotations.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_showannotations.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_showannotations.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_showannotations.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_shrink.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_shrink.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_shrink.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_shrink.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_smallcaps.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_smallcaps.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_smallcaps.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_smallcaps.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_sortascending.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_sortascending.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_sortascending.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_sortascending.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_sortdescending.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_sortdescending.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_sortdescending.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_sortdescending.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacepara1.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacepara1.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacepara1.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacepara1.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacepara15.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacepara15.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacepara15.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacepara15.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacepara2.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacepara2.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacepara2.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacepara2.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacing.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacing.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spacing.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spacing.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spelling.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spelling.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_spelling.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_spelling.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_splitwindow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_splitwindow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_splitwindow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_splitwindow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_square_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_square_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_square_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_square_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_starshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_starshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_starshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_starshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_strikeout.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_strikeout.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_strikeout.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_strikeout.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_stylenewbyexample.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_stylenewbyexample.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_stylenewbyexample.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_stylenewbyexample.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_styleupdatebyexample.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_styleupdatebyexample.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_styleupdatebyexample.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_styleupdatebyexample.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_subscript.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_subscript.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_subscript.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_subscript.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_superscript.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_superscript.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_superscript.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_superscript.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_symbolcatalogue.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_symbolcatalogue.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_symbolcatalogue.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_symbolcatalogue.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_symbolshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_symbolshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_symbolshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_symbolshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_text.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_text.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_text.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_text.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_toggleanchortype.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_toggleanchortype.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_toggleanchortype.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_toggleanchortype.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_toggleobjectbeziermode.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_toggleobjectbeziermode.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_toggleobjectbeziermode.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_toggleobjectbeziermode.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_underline.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_underline.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_underline.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_underline.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_undo.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_undo.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_undo.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_undo.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_wraptext.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_wraptext.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/lc_wraptext.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/lc_wraptext.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_acceptalltrackedchanges.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_acceptalltrackedchanges.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_acceptalltrackedchanges.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_acceptalltrackedchanges.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchange.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchange.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchange.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchange.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchanges.idea.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchanges.idea.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchanges.idea.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchanges.idea.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchanges.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchanges.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchanges.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchanges.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchangetonext.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchangetonext.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_accepttrackedchangetonext.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_accepttrackedchangetonext.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_addwatch.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_addwatch.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_addwatch.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_addwatch.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignblock.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignblock.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignblock.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignblock.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignbottom.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignbottom.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignbottom.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignbottom.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignhorizontalcenter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignhorizontalcenter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignhorizontalcenter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignhorizontalcenter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignleft.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignleft.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignleft.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignleft.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignright.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignright.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignright.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignright.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_aligntop.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_aligntop.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_aligntop.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_aligntop.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignverticalcenter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignverticalcenter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_alignverticalcenter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_alignverticalcenter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arc.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arc.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arc.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arc.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.down-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.down-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.down-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.down-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.left-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.left-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.left-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.left-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.right-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.right-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.right-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.right-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.up-arrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.up-arrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_arrowshapes.up-arrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_arrowshapes.up-arrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_backcolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_backcolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_backcolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_backcolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_backgroundcolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_backgroundcolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_backgroundcolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_backgroundcolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.block-arc.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.block-arc.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.block-arc.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.block-arc.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.circle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.circle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.circle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.circle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.cross.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.cross.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.cross.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.cross.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.cube.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.cube.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.cube.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.cube.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.diamond.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.diamond.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.diamond.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.diamond.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.ellipse.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.ellipse.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.ellipse.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.ellipse.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.hexagon.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.hexagon.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.hexagon.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.hexagon.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.isosceles-triangle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.isosceles-triangle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.isosceles-triangle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.isosceles-triangle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.rectangle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.rectangle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.rectangle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.rectangle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.right-triangle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.right-triangle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.right-triangle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.right-triangle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.round-quadrat.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.round-quadrat.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.round-quadrat.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.round-quadrat.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.trapezoid.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.trapezoid.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_basicshapes.trapezoid.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_basicshapes.trapezoid.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_bezier_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_bezier_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_bezier_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_bezier_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_bold.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_bold.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_bold.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_bold.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.line-callout-1.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.line-callout-1.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.line-callout-1.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.line-callout-1.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.line-callout-2.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.line-callout-2.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.line-callout-2.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.line-callout-2.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.line-callout-3.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.line-callout-3.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.line-callout-3.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.line-callout-3.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.round-rectangular-callout.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.round-rectangular-callout.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_calloutshapes.round-rectangular-callout.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_calloutshapes.round-rectangular-callout.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_charfontname.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_charfontname.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_charfontname.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_charfontname.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_choosecontrols.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_choosecontrols.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_choosecontrols.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_choosecontrols.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_circlecut.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_circlecut.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_circlecut.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_circlecut.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_colorscaleformatdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_colorscaleformatdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_colorscaleformatdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_colorscaleformatdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_commentchangetracking.off.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_commentchangetracking.off.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_commentchangetracking.off.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_commentchangetracking.off.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_commentchangetracking.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_commentchangetracking.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_commentchangetracking.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_commentchangetracking.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_comparedocuments.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_comparedocuments.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_comparedocuments.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_comparedocuments.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_controlcodes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_controlcodes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_controlcodes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_controlcodes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_copy.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_copy.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_copy.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_copy.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_currencyfield.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_currencyfield.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_currencyfield.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_currencyfield.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_cut.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_cut.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_cut.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_cut.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datadatapilotrun.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datadatapilotrun.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datadatapilotrun.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datadatapilotrun.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datafilterautofilter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datafilterautofilter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datafilterautofilter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datafilterautofilter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datafilterspecialfilter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datafilterspecialfilter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datafilterspecialfilter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datafilterspecialfilter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datafilterstandardfilter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datafilterstandardfilter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datafilterstandardfilter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datafilterstandardfilter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datasort.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datasort.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_datasort.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_datasort.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_decrementindent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_decrementindent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_decrementindent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_decrementindent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_defaultbullet.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_defaultbullet.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_defaultbullet.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_defaultbullet.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_defaultnumbering.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_defaultnumbering.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_defaultnumbering.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_defaultnumbering.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_defineprintarea.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_defineprintarea.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_defineprintarea.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_defineprintarea.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_designerdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_designerdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_designerdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_designerdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_drawchart.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_drawchart.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_drawchart.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_drawchart.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_editheaderandfooter.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_editheaderandfooter.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_editheaderandfooter.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_editheaderandfooter.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_entirecolumn.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_entirecolumn.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_entirecolumn.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_entirecolumn.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_entirerow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_entirerow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_entirerow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_entirerow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_exportdirecttopdf.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_exportdirecttopdf.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_exportdirecttopdf.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_exportdirecttopdf.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_extrusiontoggle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_extrusiontoggle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_extrusiontoggle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_extrusiontoggle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_flowchartshapes.flowchart-data.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_flowchartshapes.flowchart-data.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_flowchartshapes.flowchart-data.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_flowchartshapes.flowchart-data.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_flowchartshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_flowchartshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_flowchartshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_flowchartshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_fontcolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_fontcolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_fontcolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_fontcolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_fontworkgalleryfloater.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_fontworkgalleryfloater.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_fontworkgalleryfloater.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_fontworkgalleryfloater.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_formatcolumns.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_formatcolumns.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_formatcolumns.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_formatcolumns.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_formatpaintbrush.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_formatpaintbrush.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_formatpaintbrush.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_formatpaintbrush.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_formproperties.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_formproperties.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_formproperties.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_formproperties.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_framelinecolor.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_framelinecolor.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_framelinecolor.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_framelinecolor.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freeline_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freeline_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freeline_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freeline_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freezepanes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freezepanes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freezepanes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freezepanes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freezepanesfirstcolumn.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freezepanesfirstcolumn.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freezepanesfirstcolumn.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freezepanesfirstcolumn.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freezepanesfirstrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freezepanesfirstrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_freezepanesfirstrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_freezepanesfirstrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_gallery.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_gallery.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_gallery.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_gallery.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_grow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_grow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_grow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_grow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_hangingindent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_hangingindent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_hangingindent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_hangingindent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_hyperlinkdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_hyperlinkdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_hyperlinkdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_hyperlinkdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_incrementindent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_incrementindent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_incrementindent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_incrementindent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertannotation.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertannotation.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertannotation.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertannotation.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertbookmark.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertbookmark.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertbookmark.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertbookmark.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertdraw.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertdraw.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertdraw.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertdraw.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertendnote.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertendnote.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertendnote.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertendnote.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertfield.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertfield.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertfield.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertfield.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertfootnote.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertfootnote.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertfootnote.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertfootnote.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertframe.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertframe.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertframe.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertframe.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertgraphic.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertgraphic.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertgraphic.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertgraphic.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertindexesentry.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertindexesentry.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertindexesentry.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertindexesentry.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertobject.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertobject.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertobject.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertobject.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertpagebreak.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertpagebreak.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertpagebreak.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertpagebreak.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertreferencefield.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertreferencefield.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertreferencefield.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertreferencefield.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertsection.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertsection.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_insertsection.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_insertsection.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_inserttable.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_inserttable.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_inserttable.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_inserttable.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_italic.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_italic.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_italic.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_italic.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_line.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_line.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_line.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_line.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_line_diagonal.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_line_diagonal.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_line_diagonal.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_line_diagonal.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowcircle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowcircle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowcircle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowcircle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowend.bad.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowend.bad.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowend.bad.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowend.bad.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowend.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowend.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowend.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowend.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrows.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrows.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrows.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrows.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowsquare.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowsquare.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowsquare.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowsquare.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowstart.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowstart.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linearrowstart.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linearrowstart.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linecirclearrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linecirclearrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linecirclearrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linecirclearrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linesquarearrow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linesquarearrow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linesquarearrow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linesquarearrow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linestyle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linestyle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_linestyle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_linestyle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_measureline.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_measureline.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_measureline.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_measureline.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_mergecells.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_mergecells.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_mergecells.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_mergecells.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_mergedocuments.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_mergedocuments.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_mergedocuments.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_mergedocuments.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_navigator.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_navigator.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_navigator.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_navigator.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_newdoc.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_newdoc.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_newdoc.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_newdoc.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatdate.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatdate.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatdate.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatdate.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatdecdecimals.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatdecdecimals.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatdecdecimals.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatdecdecimals.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatdecimal.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatdecimal.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatdecimal.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatdecimal.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatincdecimals.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatincdecimals.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatincdecimals.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatincdecimals.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatpercent.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatpercent.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_numberformatpercent.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_numberformatpercent.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_open.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_open.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_open.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_open.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_paraspacedecrease.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_paraspacedecrease.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_paraspacedecrease.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_paraspacedecrease.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_paraspaceincrease.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_paraspaceincrease.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_paraspaceincrease.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_paraspaceincrease.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_paste.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_paste.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_paste.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_paste.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_pie.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_pie.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_pie.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_pie.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_polygon_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_polygon_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_polygon_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_polygon_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_print.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_print.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_print.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_print.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_printpreview.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_printpreview.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_printpreview.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_printpreview.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_protect.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_protect.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_protect.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_protect.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_recsearch.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_recsearch.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_recsearch.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_recsearch.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rect_rounded_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rect_rounded_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rect_rounded_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rect_rounded_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_redo.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_redo.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_redo.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_redo.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rejectalltrackedchanges.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rejectalltrackedchanges.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rejectalltrackedchanges.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rejectalltrackedchanges.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rejecttrackedchange.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rejecttrackedchange.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rejecttrackedchange.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rejecttrackedchange.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rejecttrackedchangetonext.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rejecttrackedchangetonext.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_rejecttrackedchangetonext.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_rejecttrackedchangetonext.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_resetattributes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_resetattributes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_resetattributes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_resetattributes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_save.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_save.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_save.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_save.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_savebasicas.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_savebasicas.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_savebasicas.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_savebasicas.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_searchdialog.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_searchdialog.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_searchdialog.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_searchdialog.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_selectmode.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_selectmode.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_selectmode.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_selectmode.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_setborderstyle.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_setborderstyle.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_setborderstyle.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_setborderstyle.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_shadowed.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_shadowed.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_shadowed.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_shadowed.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_showannotations.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_showannotations.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_showannotations.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_showannotations.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_shrink.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_shrink.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_shrink.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_shrink.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_smallcaps.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_smallcaps.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_smallcaps.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_smallcaps.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_sortascending.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_sortascending.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_sortascending.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_sortascending.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_sortdescending.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_sortdescending.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_sortdescending.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_sortdescending.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacepara1.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacepara1.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacepara1.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacepara1.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacepara15.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacepara15.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacepara15.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacepara15.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacepara2.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacepara2.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacepara2.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacepara2.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacing.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacing.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spacing.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spacing.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spelling.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spelling.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_spelling.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_spelling.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_splitwindow.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_splitwindow.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_splitwindow.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_splitwindow.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_square_unfilled.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_square_unfilled.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_square_unfilled.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_square_unfilled.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_starshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_starshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_starshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_starshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_strikeout.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_strikeout.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_strikeout.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_strikeout.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_stylenewbyexample.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_stylenewbyexample.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_stylenewbyexample.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_stylenewbyexample.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_styleupdatebyexample.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_styleupdatebyexample.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_styleupdatebyexample.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_styleupdatebyexample.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_subscript.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_subscript.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_subscript.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_subscript.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_superscript.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_superscript.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_superscript.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_superscript.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_symbolcatalogue.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_symbolcatalogue.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_symbolcatalogue.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_symbolcatalogue.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_symbolshapes.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_symbolshapes.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_symbolshapes.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_symbolshapes.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_text.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_text.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_text.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_text.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_toggleanchortype.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_toggleanchortype.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_toggleanchortype.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_toggleanchortype.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_toggleobjectbeziermode.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_toggleobjectbeziermode.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_toggleobjectbeziermode.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_toggleobjectbeziermode.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_underline.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_underline.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_underline.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_underline.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_undo.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_undo.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_undo.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_undo.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_wraptext.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_wraptext.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/cmd/sc_wraptext.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/cmd/sc_wraptext.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/fixme b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/fixme
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/fixme
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/fixme
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/links.txt b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/links.txt
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/links.txt
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/links.txt
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/res/lx03250.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/lx03250.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/res/lx03250.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/lx03250.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/res/minus.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/minus.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/res/minus.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/minus.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/res/plus.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/plus.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/res/plus.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/plus.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/res/savemodified_large.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/savemodified_large.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/res/savemodified_large.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/savemodified_large.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/res/savemodified_small.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/savemodified_small.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/res/savemodified_small.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/savemodified_small.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/res/sx03250.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/sx03250.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/res/sx03250.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/res/sx03250.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_a.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_a.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_a.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_a.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_ab.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_ab.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_ab.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_ab.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_annotations.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_annotations.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_annotations.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_annotations.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_bezier.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_bezier.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_bezier.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_bezier.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_column.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_column.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_column.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_column.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_floppy.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_floppy.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_floppy.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_floppy.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_frame.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_frame.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_frame.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_frame.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_row.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_row.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/lc_row.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/lc_row.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/palette.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/palette.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/palette.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/palette.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_A.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_A.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_A.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_A.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_ab.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_ab.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_ab.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_ab.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_annotations.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_annotations.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_annotations.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_annotations.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_bezier.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_bezier.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_bezier.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_bezier.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_column.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_column.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_column.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_column.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_floppy.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_floppy.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_floppy.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_floppy.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_frame.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_frame.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_frame.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_frame.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_row.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_row.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/sc_row.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/sc_row.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/spacing.xcf b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/spacing.xcf
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sources/spacing.xcf
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sources/spacing.xcf
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/Indent2.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/Indent2.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/Indent2.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/Indent2.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/Indent3.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/Indent3.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/Indent3.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/Indent3.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/Indent4.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/Indent4.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/Indent4.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/Indent4.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/last_custom_common.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/last_custom_common.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/last_custom_common.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/last_custom_common.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/last_custom_grey.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/last_custom_grey.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/last_custom_grey.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/last_custom_grey.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing1.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing1.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing1.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing1.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing2.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing2.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing2.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing2.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_loose.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_loose.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_loose.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_loose.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_tight.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_tight.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_tight.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_tight.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_very_loose.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_very_loose.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_very_loose.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_very_loose.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_very_tight.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_very_tight.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/svx/res/symphony/spacing_very_tight.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/svx/res/symphony/spacing_very_tight.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/nc20000.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/nc20000.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/nc20000.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/nc20000.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20177.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20177.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20177.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20177.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20179.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20179.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20179.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20179.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20183.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20183.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20183.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20183.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20234.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20234.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20234.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20234.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20236.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20236.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sc20236.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sc20236.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sr20012.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sr20012.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sr20012.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sr20012.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sr20018.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sr20018.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sr20018.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sr20018.png
diff --git a/Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sr20019.png b/Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sr20019.png
similarity index 100%
rename from Extras/libreoffice-chicago95-iconset/iconsets/c95/sw/res/sr20019.png
rename to Extras/libreoffice-chicago95-iconset/Chicago95-theme/iconsets/c95/sw/res/sr20019.png
diff --git a/Extras/libreoffice-chicago95-iconset/build.sh b/Extras/libreoffice-chicago95-iconset/build.sh
index 3d996074..ac5e7350 100755
--- a/Extras/libreoffice-chicago95-iconset/build.sh
+++ b/Extras/libreoffice-chicago95-iconset/build.sh
@@ -3,13 +3,12 @@
 # Goal: automate making the Chicago95 theme, for CI/CD.
 
 TOPDIR="$( dirname "$( readlink -f "${0}" )" )" # for bgstack15, /mnt/public/work/vm2/icons/git
-IMAGES_ZIP_SDIR="${TOPDIR}"/iconsets/c95
 EXT_ZIP_SDIR="${TOPDIR}"/Chicago95-theme
+IMAGES_ZIP_SDIR="${EXT_ZIP_SDIR}"/iconsets/c95
 OUTDIR="${TOPDIR}"
 
 # PROCESS
-rm -f "${OUTDIR}/images_chicago95.zip"
-cd "${IMAGES_ZIP_SDIR}" ; 7za a "${OUTDIR}/images_chicago95.zip" *
-mv -f "${OUTDIR}/images_chicago95.zip" "${EXT_ZIP_SDIR}/iconsets/"
+rm -f "${EXT_ZIP_SDIR}/iconsets/images_chicago95.zip"
+cd "${IMAGES_ZIP_SDIR}" ; 7za a "${EXT_ZIP_SDIR}/iconsets/images_chicago95.zip" *
 rm -f "${OUTDIR}/Chicago95-theme-0.0.oxt"
 cd "${EXT_ZIP_SDIR}" ; 7za a "${OUTDIR}/Chicago95-theme-0.0.oxt"