Move all hicontrast icons to a separate theme directory

Rather than having them intermingled with the regular theme. Used
solenv/bin/hicontrast-to-theme.pl for identification of the
icons. Hicontrast-to-theme.pl can now be retired too.

3391 files changed, 0 insertions, 0 deletions

diff --git a/default_images/avmedia/res/avh02048.png b/ooo_custom_images/hicontrast/avmedia/res/av02048.png
index 892919bfea2a..892919bfea2a 100644
--- a/default_images/avmedia/res/avh02048.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02048.png
diff --git a/default_images/avmedia/res/avh02049.png b/ooo_custom_images/hicontrast/avmedia/res/av02049.png
index 5cfbc9ba784c..5cfbc9ba784c 100644
--- a/default_images/avmedia/res/avh02049.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02049.png
diff --git a/default_images/avmedia/res/avh02050.png b/ooo_custom_images/hicontrast/avmedia/res/av02050.png
index 63952fc93f90..63952fc93f90 100644
--- a/default_images/avmedia/res/avh02050.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02050.png
diff --git a/default_images/avmedia/res/avh02051.png b/ooo_custom_images/hicontrast/avmedia/res/av02051.png
index 7d51cff77c01..7d51cff77c01 100644
--- a/default_images/avmedia/res/avh02051.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02051.png
diff --git a/default_images/avmedia/res/avh02052.png b/ooo_custom_images/hicontrast/avmedia/res/av02052.png
index 979260d3bf73..979260d3bf73 100644
--- a/default_images/avmedia/res/avh02052.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02052.png
diff --git a/default_images/avmedia/res/avh02053.png b/ooo_custom_images/hicontrast/avmedia/res/av02053.png
index 49cb42a5f69f..49cb42a5f69f 100644
--- a/default_images/avmedia/res/avh02053.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02053.png
diff --git a/default_images/avmedia/res/avh02054.png b/ooo_custom_images/hicontrast/avmedia/res/av02054.png
index 8fea29281eb6..8fea29281eb6 100644
--- a/default_images/avmedia/res/avh02054.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/av02054.png
diff --git a/default_images/avmedia/res/avlh02048.png b/ooo_custom_images/hicontrast/avmedia/res/avl02048.png
index ab22bf9486dd..ab22bf9486dd 100644
--- a/default_images/avmedia/res/avlh02048.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02048.png
diff --git a/default_images/avmedia/res/avlh02049.png b/ooo_custom_images/hicontrast/avmedia/res/avl02049.png
index 574b9cb55bce..574b9cb55bce 100644
--- a/default_images/avmedia/res/avlh02049.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02049.png
diff --git a/default_images/avmedia/res/avlh02050.png b/ooo_custom_images/hicontrast/avmedia/res/avl02050.png
index fa0f33ce2277..fa0f33ce2277 100644
--- a/default_images/avmedia/res/avlh02050.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02050.png
diff --git a/default_images/avmedia/res/avlh02051.png b/ooo_custom_images/hicontrast/avmedia/res/avl02051.png
index 9a8abe340cf0..9a8abe340cf0 100644
--- a/default_images/avmedia/res/avlh02051.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02051.png
diff --git a/default_images/avmedia/res/avlh02052.png b/ooo_custom_images/hicontrast/avmedia/res/avl02052.png
index 4c7dfe34ee9a..4c7dfe34ee9a 100644
--- a/default_images/avmedia/res/avlh02052.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02052.png
diff --git a/default_images/avmedia/res/avlh02053.png b/ooo_custom_images/hicontrast/avmedia/res/avl02053.png
index ac65e8fea6fa..ac65e8fea6fa 100644
--- a/default_images/avmedia/res/avlh02053.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02053.png
diff --git a/default_images/avmedia/res/avlh02054.png b/ooo_custom_images/hicontrast/avmedia/res/avl02054.png
index 15363032d80a..15363032d80a 100644
--- a/default_images/avmedia/res/avlh02054.png
+++ b/ooo_custom_images/hicontrast/avmedia/res/avl02054.png
diff --git a/default_images/basctl/res/imh01.png b/ooo_custom_images/hicontrast/basctl/res/im01.png
index 53b7e5ba8044..53b7e5ba8044 100644
--- a/default_images/basctl/res/imh01.png
+++ b/ooo_custom_images/hicontrast/basctl/res/im01.png
diff --git a/default_images/basctl/res/locked_h.png b/ooo_custom_images/hicontrast/basctl/res/locked.png
index 5bbcb24e6f3c..5bbcb24e6f3c 100644
--- a/default_images/basctl/res/locked_h.png
+++ b/ooo_custom_images/hicontrast/basctl/res/locked.png
diff --git a/default_images/brand/shell/backing_hc.png b/ooo_custom_images/hicontrast/brand/shell/backing.png
index b975b84ac34a..b975b84ac34a 100644
--- a/default_images/brand/shell/backing_hc.png
+++ b/ooo_custom_images/hicontrast/brand/shell/backing.png
diff --git a/default_images/brand/shell/backing_right_hc.png b/ooo_custom_images/hicontrast/brand/shell/backing_right.png
index e16bf9637f87..e16bf9637f87 100644
--- a/default_images/brand/shell/backing_right_hc.png
+++ b/ooo_custom_images/hicontrast/brand/shell/backing_right.png
diff --git a/default_images/brand/shell/backing_rtl_left_hc.png b/ooo_custom_images/hicontrast/brand/shell/backing_rtl_left.png
index b975b84ac34a..b975b84ac34a 100644
--- a/default_images/brand/shell/backing_rtl_left_hc.png
+++ b/ooo_custom_images/hicontrast/brand/shell/backing_rtl_left.png
diff --git a/default_images/brand/shell/backing_rtl_right_hc.png b/ooo_custom_images/hicontrast/brand/shell/backing_rtl_right.png
index e16bf9637f87..e16bf9637f87 100644
--- a/default_images/brand/shell/backing_rtl_right_hc.png
+++ b/ooo_custom_images/hicontrast/brand/shell/backing_rtl_right.png
diff --git a/default_images/brand/shell/backing_space_hc.png b/ooo_custom_images/hicontrast/brand/shell/backing_space.png
index c81dcc3df7cb..c81dcc3df7cb 100644
--- a/default_images/brand/shell/backing_space_hc.png
+++ b/ooo_custom_images/hicontrast/brand/shell/backing_space.png
diff --git a/default_images/chart2/res/areas3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areas3d_52x60.png
index ab4c6d4b06f3..ab4c6d4b06f3 100644
--- a/default_images/chart2/res/areas3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areas3d_52x60.png
diff --git a/default_images/chart2/res/areas_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areas_52x60.png
index 08057eb93755..08057eb93755 100644
--- a/default_images/chart2/res/areas_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areas_52x60.png
diff --git a/default_images/chart2/res/areasfull3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areasfull3d_52x60.png
index 34a643737f27..34a643737f27 100644
--- a/default_images/chart2/res/areasfull3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areasfull3d_52x60.png
diff --git a/default_images/chart2/res/areasfull_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areasfull_52x60.png
index 942f360d830e..942f360d830e 100644
--- a/default_images/chart2/res/areasfull_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areasfull_52x60.png
diff --git a/default_images/chart2/res/areaspiled3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areaspiled3d_52x60.png
index 5e7738c63e05..5e7738c63e05 100644
--- a/default_images/chart2/res/areaspiled3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areaspiled3d_52x60.png
diff --git a/default_images/chart2/res/areaspiled_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/areaspiled_52x60.png
index 69d832334a79..69d832334a79 100644
--- a/default_images/chart2/res/areaspiled_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/areaspiled_52x60.png
diff --git a/default_images/chart2/res/bar3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bar3d_52x60.png
index 003cf473f134..003cf473f134 100644
--- a/default_images/chart2/res/bar3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bar3d_52x60.png
diff --git a/default_images/chart2/res/bar3ddeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bar3ddeep_52x60.png
index 7fe16396e94a..7fe16396e94a 100644
--- a/default_images/chart2/res/bar3ddeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bar3ddeep_52x60.png
diff --git a/default_images/chart2/res/bar_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bar_52x60.png
index b4c397f6acfd..b4c397f6acfd 100644
--- a/default_images/chart2/res/bar_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bar_52x60.png
diff --git a/default_images/chart2/res/barpercent3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barpercent3d_52x60.png
index 1490457423dd..1490457423dd 100644
--- a/default_images/chart2/res/barpercent3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barpercent3d_52x60.png
diff --git a/default_images/chart2/res/barpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barpercent_52x60.png
index ac920921d960..ac920921d960 100644
--- a/default_images/chart2/res/barpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barpercent_52x60.png
diff --git a/default_images/chart2/res/barstack3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barstack3d_52x60.png
index 2c75cfc47d0d..2c75cfc47d0d 100644
--- a/default_images/chart2/res/barstack3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barstack3d_52x60.png
diff --git a/default_images/chart2/res/barstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/barstack_52x60.png
index 576225daf6eb..576225daf6eb 100644
--- a/default_images/chart2/res/barstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/barstack_52x60.png
diff --git a/default_images/chart2/res/bubble_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/bubble_52x60.png
index 5aebfeb81121..5aebfeb81121 100644
--- a/default_images/chart2/res/bubble_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/bubble_52x60.png
diff --git a/default_images/chart2/res/columnline_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnline_52x60.png
index 064ac930e695..064ac930e695 100644
--- a/default_images/chart2/res/columnline_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnline_52x60.png
diff --git a/default_images/chart2/res/columnpercent3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnpercent3d_52x60.png
index 0443d09cc260..0443d09cc260 100644
--- a/default_images/chart2/res/columnpercent3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnpercent3d_52x60.png
diff --git a/default_images/chart2/res/columnpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnpercent_52x60.png
index d3573d750d9f..d3573d750d9f 100644
--- a/default_images/chart2/res/columnpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnpercent_52x60.png
diff --git a/default_images/chart2/res/columns3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columns3d_52x60.png
index 4c28217a4b38..4c28217a4b38 100644
--- a/default_images/chart2/res/columns3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columns3d_52x60.png
diff --git a/default_images/chart2/res/columns3ddeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columns3ddeep_52x60.png
index 663524e96107..663524e96107 100644
--- a/default_images/chart2/res/columns3ddeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columns3ddeep_52x60.png
diff --git a/default_images/chart2/res/columns_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columns_52x60.png
index 5e8737003a0e..5e8737003a0e 100644
--- a/default_images/chart2/res/columns_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columns_52x60.png
diff --git a/default_images/chart2/res/columnstack3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnstack3d_52x60.png
index 4112b5396289..4112b5396289 100644
--- a/default_images/chart2/res/columnstack3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnstack3d_52x60.png
diff --git a/default_images/chart2/res/columnstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnstack_52x60.png
index a5ad9dbb6aa0..a5ad9dbb6aa0 100644
--- a/default_images/chart2/res/columnstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnstack_52x60.png
diff --git a/default_images/chart2/res/columnstackline_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/columnstackline_52x60.png
index c39b5d488e55..c39b5d488e55 100644
--- a/default_images/chart2/res/columnstackline_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/columnstackline_52x60.png
diff --git a/default_images/chart2/res/cone_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cone_52x60.png
index 36fc5085e5f7..36fc5085e5f7 100644
--- a/default_images/chart2/res/cone_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cone_52x60.png
diff --git a/default_images/chart2/res/conedeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conedeep_52x60.png
index 7f45402b6cae..7f45402b6cae 100644
--- a/default_images/chart2/res/conedeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conedeep_52x60.png
diff --git a/default_images/chart2/res/conehori_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehori_52x60.png
index 1d7c34f6a777..1d7c34f6a777 100644
--- a/default_images/chart2/res/conehori_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehori_52x60.png
diff --git a/default_images/chart2/res/conehorideep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehorideep_52x60.png
index f71160315dd8..f71160315dd8 100644
--- a/default_images/chart2/res/conehorideep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehorideep_52x60.png
diff --git a/default_images/chart2/res/conehoripercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehoripercent_52x60.png
index a3db0d35eb0c..a3db0d35eb0c 100644
--- a/default_images/chart2/res/conehoripercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehoripercent_52x60.png
diff --git a/default_images/chart2/res/conehoristack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conehoristack_52x60.png
index 7f687b60b51b..7f687b60b51b 100644
--- a/default_images/chart2/res/conehoristack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conehoristack_52x60.png
diff --git a/default_images/chart2/res/conepercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conepercent_52x60.png
index 403a3799d23c..403a3799d23c 100644
--- a/default_images/chart2/res/conepercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conepercent_52x60.png
diff --git a/default_images/chart2/res/conestack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/conestack_52x60.png
index c753d72dc8ca..c753d72dc8ca 100644
--- a/default_images/chart2/res/conestack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/conestack_52x60.png
diff --git a/default_images/chart2/res/cylinder_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinder_52x60.png
index aedb8f108623..aedb8f108623 100644
--- a/default_images/chart2/res/cylinder_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinder_52x60.png
diff --git a/default_images/chart2/res/cylinderdeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderdeep_52x60.png
index 84be0da0b586..84be0da0b586 100644
--- a/default_images/chart2/res/cylinderdeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderdeep_52x60.png
diff --git a/default_images/chart2/res/cylinderhori_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhori_52x60.png
index 705bbad1b348..705bbad1b348 100644
--- a/default_images/chart2/res/cylinderhori_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhori_52x60.png
diff --git a/default_images/chart2/res/cylinderhorideep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhorideep_52x60.png
index e8028a0fd7c7..e8028a0fd7c7 100644
--- a/default_images/chart2/res/cylinderhorideep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhorideep_52x60.png
diff --git a/default_images/chart2/res/cylinderhoriprocent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhoriprocent_52x60.png
index a57705d2df53..a57705d2df53 100644
--- a/default_images/chart2/res/cylinderhoriprocent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhoriprocent_52x60.png
diff --git a/default_images/chart2/res/cylinderhoristack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderhoristack_52x60.png
index 794017eca6af..794017eca6af 100644
--- a/default_images/chart2/res/cylinderhoristack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderhoristack_52x60.png
diff --git a/default_images/chart2/res/cylinderpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderpercent_52x60.png
index d05c616d7507..d05c616d7507 100644
--- a/default_images/chart2/res/cylinderpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderpercent_52x60.png
diff --git a/default_images/chart2/res/cylinderstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/cylinderstack_52x60.png
index 9d3e16593b98..9d3e16593b98 100644
--- a/default_images/chart2/res/cylinderstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/cylinderstack_52x60.png
diff --git a/default_images/chart2/res/donut3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donut3d_52x60.png
index 1cbcdf9a3b25..1cbcdf9a3b25 100644
--- a/default_images/chart2/res/donut3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donut3d_52x60.png
diff --git a/default_images/chart2/res/donut3dexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donut3dexploded_52x60.png
index e5ed546d5183..e5ed546d5183 100644
--- a/default_images/chart2/res/donut3dexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donut3dexploded_52x60.png
diff --git a/default_images/chart2/res/donut_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donut_52x60.png
index 6c8cf0ddd17f..6c8cf0ddd17f 100644
--- a/default_images/chart2/res/donut_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donut_52x60.png
diff --git a/default_images/chart2/res/donutexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/donutexploded_52x60.png
index a001545fa72c..a001545fa72c 100644
--- a/default_images/chart2/res/donutexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/donutexploded_52x60.png
diff --git a/default_images/chart2/res/errorbothhori_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorbothhori_30.png
index cf19e10853b6..cf19e10853b6 100644
--- a/default_images/chart2/res/errorbothhori_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorbothhori_30.png
diff --git a/default_images/chart2/res/errorbothverti_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorbothverti_30.png
index 156c6013d5af..156c6013d5af 100644
--- a/default_images/chart2/res/errorbothverti_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorbothverti_30.png
diff --git a/default_images/chart2/res/errordown_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errordown_30.png
index 2419d6da8fa4..2419d6da8fa4 100644
--- a/default_images/chart2/res/errordown_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errordown_30.png
diff --git a/default_images/chart2/res/errorleft_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorleft_30.png
index 66dba3c64c2c..66dba3c64c2c 100644
--- a/default_images/chart2/res/errorleft_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorleft_30.png
diff --git a/default_images/chart2/res/errorright_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorright_30.png
index c566cbfc75ea..c566cbfc75ea 100644
--- a/default_images/chart2/res/errorright_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorright_30.png
diff --git a/default_images/chart2/res/errorup_30_h.png b/ooo_custom_images/hicontrast/chart2/res/errorup_30.png
index 884047076a7e..884047076a7e 100644
--- a/default_images/chart2/res/errorup_30_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/errorup_30.png
diff --git a/default_images/chart2/res/net_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/net_52x60.png
index 17700d0f78f7..17700d0f78f7 100644
--- a/default_images/chart2/res/net_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/net_52x60.png
diff --git a/default_images/chart2/res/netfill_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netfill_52x60.png
index 0b75834e7eb7..0b75834e7eb7 100644
--- a/default_images/chart2/res/netfill_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netfill_52x60.png
diff --git a/default_images/chart2/res/netlinepoint_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netlinepoint_52x60.png
index 468b8f8d81e0..468b8f8d81e0 100644
--- a/default_images/chart2/res/netlinepoint_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netlinepoint_52x60.png
diff --git a/default_images/chart2/res/netlinepointstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netlinepointstack_52x60.png
index cd6ce2d385cb..cd6ce2d385cb 100644
--- a/default_images/chart2/res/netlinepointstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netlinepointstack_52x60.png
diff --git a/default_images/chart2/res/netpoint_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netpoint_52x60.png
index efa51464b4c5..efa51464b4c5 100644
--- a/default_images/chart2/res/netpoint_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netpoint_52x60.png
diff --git a/default_images/chart2/res/netpointstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netpointstack_52x60.png
index 78bbf74880d9..78bbf74880d9 100644
--- a/default_images/chart2/res/netpointstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netpointstack_52x60.png
diff --git a/default_images/chart2/res/netstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netstack_52x60.png
index 2b12a581c593..2b12a581c593 100644
--- a/default_images/chart2/res/netstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netstack_52x60.png
diff --git a/default_images/chart2/res/netstackfill_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/netstackfill_52x60.png
index 60b01120d6c1..60b01120d6c1 100644
--- a/default_images/chart2/res/netstackfill_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/netstackfill_52x60.png
diff --git a/default_images/chart2/res/nostackdirect3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirect3d_52x60.png
index acb56b95ef56..acb56b95ef56 100644
--- a/default_images/chart2/res/nostackdirect3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirect3d_52x60.png
diff --git a/default_images/chart2/res/nostackdirectboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirectboth_52x60.png
index fd079bdc41ca..fd079bdc41ca 100644
--- a/default_images/chart2/res/nostackdirectboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirectboth_52x60.png
diff --git a/default_images/chart2/res/nostackdirectlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirectlines_52x60.png
index bb9447bca439..bb9447bca439 100644
--- a/default_images/chart2/res/nostackdirectlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirectlines_52x60.png
diff --git a/default_images/chart2/res/nostackdirectpoints_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostackdirectpoints_52x60.png
index 33c1b82a1fcd..33c1b82a1fcd 100644
--- a/default_images/chart2/res/nostackdirectpoints_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostackdirectpoints_52x60.png
diff --git a/default_images/chart2/res/nostacksmooth3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostacksmooth3d_52x60.png
index e31a33a2f6af..e31a33a2f6af 100644
--- a/default_images/chart2/res/nostacksmooth3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostacksmooth3d_52x60.png
diff --git a/default_images/chart2/res/nostacksmoothboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothboth_52x60.png
index d10c5cb1fbef..d10c5cb1fbef 100644
--- a/default_images/chart2/res/nostacksmoothboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothboth_52x60.png
diff --git a/default_images/chart2/res/nostacksmoothlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothlines_52x60.png
index aafb920fbffa..aafb920fbffa 100644
--- a/default_images/chart2/res/nostacksmoothlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/nostacksmoothlines_52x60.png
diff --git a/default_images/chart2/res/pie3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pie3d_52x60.png
index 45b85c92bb3f..45b85c92bb3f 100644
--- a/default_images/chart2/res/pie3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pie3d_52x60.png
diff --git a/default_images/chart2/res/pie3dexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pie3dexploded_52x60.png
index 1ffa4e7afba0..1ffa4e7afba0 100644
--- a/default_images/chart2/res/pie3dexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pie3dexploded_52x60.png
diff --git a/default_images/chart2/res/pie_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pie_52x60.png
index c6a642635f42..c6a642635f42 100644
--- a/default_images/chart2/res/pie_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pie_52x60.png
diff --git a/default_images/chart2/res/pieexploded_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pieexploded_52x60.png
index 67a6caae4177..67a6caae4177 100644
--- a/default_images/chart2/res/pieexploded_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pieexploded_52x60.png
diff --git a/default_images/chart2/res/pyramind_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramind_52x60.png
index 51fd9cebcf18..51fd9cebcf18 100644
--- a/default_images/chart2/res/pyramind_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramind_52x60.png
diff --git a/default_images/chart2/res/pyraminddeep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyraminddeep_52x60.png
index 81d0d1614ab6..81d0d1614ab6 100644
--- a/default_images/chart2/res/pyraminddeep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyraminddeep_52x60.png
diff --git a/default_images/chart2/res/pyramindhori_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhori_52x60.png
index e3c83e62b758..e3c83e62b758 100644
--- a/default_images/chart2/res/pyramindhori_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhori_52x60.png
diff --git a/default_images/chart2/res/pyramindhorideep_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhorideep_52x60.png
index 91ab219dcf4f..91ab219dcf4f 100644
--- a/default_images/chart2/res/pyramindhorideep_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhorideep_52x60.png
diff --git a/default_images/chart2/res/pyramindhoripercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhoripercent_52x60.png
index ff3d195bfd7d..ff3d195bfd7d 100644
--- a/default_images/chart2/res/pyramindhoripercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhoripercent_52x60.png
diff --git a/default_images/chart2/res/pyramindhoristack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindhoristack_52x60.png
index 498a3b3fafb3..498a3b3fafb3 100644
--- a/default_images/chart2/res/pyramindhoristack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindhoristack_52x60.png
diff --git a/default_images/chart2/res/pyramindpercent_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindpercent_52x60.png
index 8e32f5eb355f..8e32f5eb355f 100644
--- a/default_images/chart2/res/pyramindpercent_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindpercent_52x60.png
diff --git a/default_images/chart2/res/pyramindstack_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/pyramindstack_52x60.png
index 8e594b59bf45..8e594b59bf45 100644
--- a/default_images/chart2/res/pyramindstack_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/pyramindstack_52x60.png
diff --git a/default_images/chart2/res/regexp_h.png b/ooo_custom_images/hicontrast/chart2/res/regexp.png
index 1f8bc81783f8..1f8bc81783f8 100644
--- a/default_images/chart2/res/regexp_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/regexp.png
diff --git a/default_images/chart2/res/reglin_h.png b/ooo_custom_images/hicontrast/chart2/res/reglin.png
index ec92d0412b40..ec92d0412b40 100644
--- a/default_images/chart2/res/reglin_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/reglin.png
diff --git a/default_images/chart2/res/reglog_h.png b/ooo_custom_images/hicontrast/chart2/res/reglog.png
index 201b063282f7..201b063282f7 100644
--- a/default_images/chart2/res/reglog_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/reglog.png
diff --git a/default_images/chart2/res/regno_h.png b/ooo_custom_images/hicontrast/chart2/res/regno.png
index f45877ea5273..f45877ea5273 100644
--- a/default_images/chart2/res/regno_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/regno.png
diff --git a/default_images/chart2/res/regpow_h.png b/ooo_custom_images/hicontrast/chart2/res/regpow.png
index fa59f7cb0366..fa59f7cb0366 100644
--- a/default_images/chart2/res/regpow_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/regpow.png
diff --git a/default_images/chart2/res/selectrange_h.png b/ooo_custom_images/hicontrast/chart2/res/selectrange.png
index cf4145b3cf72..cf4145b3cf72 100644
--- a/default_images/chart2/res/selectrange_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/selectrange.png
diff --git a/default_images/chart2/res/stackdirect3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirect3d_52x60.png
index 926198c70c28..926198c70c28 100644
--- a/default_images/chart2/res/stackdirect3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirect3d_52x60.png
diff --git a/default_images/chart2/res/stackdirectboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirectboth_52x60.png
index 408c7bd4a7eb..408c7bd4a7eb 100644
--- a/default_images/chart2/res/stackdirectboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirectboth_52x60.png
diff --git a/default_images/chart2/res/stackdirectlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirectlines_52x60.png
index 66256bf3a9e3..66256bf3a9e3 100644
--- a/default_images/chart2/res/stackdirectlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirectlines_52x60.png
diff --git a/default_images/chart2/res/stackdirectpoints_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stackdirectpoints_52x60.png
index e35350eb518e..e35350eb518e 100644
--- a/default_images/chart2/res/stackdirectpoints_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stackdirectpoints_52x60.png
diff --git a/default_images/chart2/res/stacksmooth3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stacksmooth3d_52x60.png
index 21c7513396b2..21c7513396b2 100644
--- a/default_images/chart2/res/stacksmooth3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stacksmooth3d_52x60.png
diff --git a/default_images/chart2/res/stacksmoothboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stacksmoothboth_52x60.png
index c675e02d7c4b..c675e02d7c4b 100644
--- a/default_images/chart2/res/stacksmoothboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stacksmoothboth_52x60.png
diff --git a/default_images/chart2/res/stacksmoothlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stacksmoothlines_52x60.png
index 00330e6824ee..00330e6824ee 100644
--- a/default_images/chart2/res/stacksmoothlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stacksmoothlines_52x60.png
diff --git a/default_images/chart2/res/stock_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stock_52x60.png
index 2c3f893580bd..2c3f893580bd 100644
--- a/default_images/chart2/res/stock_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stock_52x60.png
diff --git a/default_images/chart2/res/stockblock_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stockblock_52x60.png
index de1bd09c57e8..de1bd09c57e8 100644
--- a/default_images/chart2/res/stockblock_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stockblock_52x60.png
diff --git a/default_images/chart2/res/stockcolumns_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stockcolumns_52x60.png
index 657d594a9bd2..657d594a9bd2 100644
--- a/default_images/chart2/res/stockcolumns_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stockcolumns_52x60.png
diff --git a/default_images/chart2/res/stockcolumnsattach_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/stockcolumnsattach_52x60.png
index a97f36996dc9..a97f36996dc9 100644
--- a/default_images/chart2/res/stockcolumnsattach_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/stockcolumnsattach_52x60.png
diff --git a/default_images/chart2/res/typearea_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typearea_16.png
index 3377629dd324..3377629dd324 100644
--- a/default_images/chart2/res/typearea_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typearea_16.png
diff --git a/default_images/chart2/res/typebar_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typebar_16.png
index abb1a018776e..abb1a018776e 100644
--- a/default_images/chart2/res/typebar_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typebar_16.png
diff --git a/default_images/chart2/res/typebubble_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typebubble_16.png
index 00f40cf76a86..00f40cf76a86 100644
--- a/default_images/chart2/res/typebubble_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typebubble_16.png
diff --git a/default_images/chart2/res/typecolumn_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typecolumn_16.png
index 4cfe08672db7..4cfe08672db7 100644
--- a/default_images/chart2/res/typecolumn_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typecolumn_16.png
diff --git a/default_images/chart2/res/typecolumnline_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typecolumnline_16.png
index d672a0420c00..d672a0420c00 100644
--- a/default_images/chart2/res/typecolumnline_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typecolumnline_16.png
diff --git a/default_images/chart2/res/typenet_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typenet_16.png
index 197b14f95aa7..197b14f95aa7 100644
--- a/default_images/chart2/res/typenet_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typenet_16.png
diff --git a/default_images/chart2/res/typepie_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typepie_16.png
index 66cef40825b9..66cef40825b9 100644
--- a/default_images/chart2/res/typepie_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typepie_16.png
diff --git a/default_images/chart2/res/typepointline_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typepointline_16.png
index c8fe9a440eea..c8fe9a440eea 100644
--- a/default_images/chart2/res/typepointline_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typepointline_16.png
diff --git a/default_images/chart2/res/typestock_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typestock_16.png
index 8ef5899e7d05..8ef5899e7d05 100644
--- a/default_images/chart2/res/typestock_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typestock_16.png
diff --git a/default_images/chart2/res/typexy_16_h.png b/ooo_custom_images/hicontrast/chart2/res/typexy_16.png
index b298b1802837..b298b1802837 100644
--- a/default_images/chart2/res/typexy_16_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/typexy_16.png
diff --git a/default_images/chart2/res/valueaxisdirect3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirect3d_52x60.png
index 6fc981aea364..6fc981aea364 100644
--- a/default_images/chart2/res/valueaxisdirect3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirect3d_52x60.png
diff --git a/default_images/chart2/res/valueaxisdirectboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectboth_52x60.png
index 29578b0383a3..29578b0383a3 100644
--- a/default_images/chart2/res/valueaxisdirectboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectboth_52x60.png
diff --git a/default_images/chart2/res/valueaxisdirectlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectlines_52x60.png
index d3a04f76f58a..d3a04f76f58a 100644
--- a/default_images/chart2/res/valueaxisdirectlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectlines_52x60.png
diff --git a/default_images/chart2/res/valueaxisdirectpoints_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectpoints_52x60.png
index 2c708671e5ff..2c708671e5ff 100644
--- a/default_images/chart2/res/valueaxisdirectpoints_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxisdirectpoints_52x60.png
diff --git a/default_images/chart2/res/valueaxissmooth3d_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxissmooth3d_52x60.png
index 27c98b800c49..27c98b800c49 100644
--- a/default_images/chart2/res/valueaxissmooth3d_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxissmooth3d_52x60.png
diff --git a/default_images/chart2/res/valueaxissmoothboth_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothboth_52x60.png
index d70bd7572015..d70bd7572015 100644
--- a/default_images/chart2/res/valueaxissmoothboth_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothboth_52x60.png
diff --git a/default_images/chart2/res/valueaxissmoothlines_52x60_h.png b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothlines_52x60.png
index cbdf277c809e..cbdf277c809e 100644
--- a/default_images/chart2/res/valueaxissmoothlines_52x60_h.png
+++ b/ooo_custom_images/hicontrast/chart2/res/valueaxissmoothlines_52x60.png
diff --git a/default_images/database/linked_text_table_hc.png b/ooo_custom_images/hicontrast/database/linked_text_table.png
index 48e2a663698a..48e2a663698a 100644
--- a/default_images/database/linked_text_table_hc.png
+++ b/ooo_custom_images/hicontrast/database/linked_text_table.png
diff --git a/default_images/dbaccess/res/all_left_h.png b/ooo_custom_images/hicontrast/dbaccess/res/all_left.png
index 434c8e78cfaf..434c8e78cfaf 100644
--- a/default_images/dbaccess/res/all_left_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/all_left.png
diff --git a/default_images/dbaccess/res/all_right_h.png b/ooo_custom_images/hicontrast/dbaccess/res/all_right.png
index 96cc16ea0296..96cc16ea0296 100644
--- a/default_images/dbaccess/res/all_right_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/all_right.png
diff --git a/default_images/dbaccess/res/db_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/db.png
index 1957da9c09b6..1957da9c09b6 100644
--- a/default_images/dbaccess/res/db_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/db.png
diff --git a/default_images/dbaccess/res/exerror_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/exerror.png
index aacdc837bdf2..aacdc837bdf2 100644
--- a/default_images/dbaccess/res/exerror_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/exerror.png
diff --git a/default_images/dbaccess/res/exinfo_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/exinfo.png
index 391878a51b8d..391878a51b8d 100644
--- a/default_images/dbaccess/res/exinfo_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/exinfo.png
diff --git a/default_images/dbaccess/res/exwarning_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/exwarning.png
index e71835f2813e..e71835f2813e 100644
--- a/default_images/dbaccess/res/exwarning_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/exwarning.png
diff --git a/default_images/dbaccess/res/form_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/form_16.png
index 2a3410139c0c..2a3410139c0c 100644
--- a/default_images/dbaccess/res/form_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/form_16.png
diff --git a/default_images/dbaccess/res/forms_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/forms_16.png
index a5a568c92ead..a5a568c92ead 100644
--- a/default_images/dbaccess/res/forms_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/forms_16.png
diff --git a/default_images/dbaccess/res/forms_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/forms_32.png
index cbf8fd8f8eee..cbf8fd8f8eee 100644
--- a/default_images/dbaccess/res/forms_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/forms_32.png
diff --git a/default_images/dbaccess/res/joh01.png b/ooo_custom_images/hicontrast/dbaccess/res/jo01.png
index 8b3f7c3866aa..8b3f7c3866aa 100644
--- a/default_images/dbaccess/res/joh01.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/jo01.png
diff --git a/default_images/dbaccess/res/joh02.png b/ooo_custom_images/hicontrast/dbaccess/res/jo02.png
index 48bc6b4d47f8..48bc6b4d47f8 100644
--- a/default_images/dbaccess/res/joh02.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/jo02.png
diff --git a/default_images/dbaccess/res/lch036.png b/ooo_custom_images/hicontrast/dbaccess/res/lc036.png
index 56493022c8f9..56493022c8f9 100644
--- a/default_images/dbaccess/res/lch036.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc036.png
diff --git a/default_images/dbaccess/res/lch037.png b/ooo_custom_images/hicontrast/dbaccess/res/lc037.png
index ba7f99d53f02..ba7f99d53f02 100644
--- a/default_images/dbaccess/res/lch037.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc037.png
diff --git a/default_images/dbaccess/res/lch038.png b/ooo_custom_images/hicontrast/dbaccess/res/lc038.png
index 71b0f7759320..71b0f7759320 100644
--- a/default_images/dbaccess/res/lch038.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc038.png
diff --git a/default_images/dbaccess/res/lch039.png b/ooo_custom_images/hicontrast/dbaccess/res/lc039.png
index 611b050228fc..611b050228fc 100644
--- a/default_images/dbaccess/res/lch039.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc039.png
diff --git a/default_images/dbaccess/res/lch040.png b/ooo_custom_images/hicontrast/dbaccess/res/lc040.png
index d5cf61087353..d5cf61087353 100644
--- a/default_images/dbaccess/res/lch040.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/lc040.png
diff --git a/default_images/dbaccess/res/nuh07.png b/ooo_custom_images/hicontrast/dbaccess/res/nu07.png
index 116c6f25209d..116c6f25209d 100644
--- a/default_images/dbaccess/res/nuh07.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/nu07.png
diff --git a/default_images/dbaccess/res/nuh08.png b/ooo_custom_images/hicontrast/dbaccess/res/nu08.png
index 7975f8f88258..7975f8f88258 100644
--- a/default_images/dbaccess/res/nuh08.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/nu08.png
diff --git a/default_images/dbaccess/res/nuh09.png b/ooo_custom_images/hicontrast/dbaccess/res/nu09.png
index 38aa7844d846..38aa7844d846 100644
--- a/default_images/dbaccess/res/nuh09.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/nu09.png
diff --git a/default_images/dbaccess/res/one_left_h.png b/ooo_custom_images/hicontrast/dbaccess/res/one_left.png
index 9438a2056498..9438a2056498 100644
--- a/default_images/dbaccess/res/one_left_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/one_left.png
diff --git a/default_images/dbaccess/res/one_right_h.png b/ooo_custom_images/hicontrast/dbaccess/res/one_right.png
index 0fd15a34441e..0fd15a34441e 100644
--- a/default_images/dbaccess/res/one_right_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/one_right.png
diff --git a/default_images/dbaccess/res/pkey_sch.png b/ooo_custom_images/hicontrast/dbaccess/res/pkey.png
index b0c01b9cd7fb..b0c01b9cd7fb 100644
--- a/default_images/dbaccess/res/pkey_sch.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/pkey.png
diff --git a/default_images/dbaccess/res/queries_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/queries_32.png
index 8364bbe4e9dc..8364bbe4e9dc 100644
--- a/default_images/dbaccess/res/queries_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/queries_32.png
diff --git a/default_images/dbaccess/res/report_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/report_16.png
index 6c23aac4cc85..6c23aac4cc85 100644
--- a/default_images/dbaccess/res/report_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/report_16.png
diff --git a/default_images/dbaccess/res/reports_16_h.png b/ooo_custom_images/hicontrast/dbaccess/res/reports_16.png
index 4df27d4af3b2..4df27d4af3b2 100644
--- a/default_images/dbaccess/res/reports_16_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/reports_16.png
diff --git a/default_images/dbaccess/res/reports_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/reports_32.png
index 13d570649bc8..13d570649bc8 100644
--- a/default_images/dbaccess/res/reports_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/reports_32.png
diff --git a/default_images/dbaccess/res/sch036.png b/ooo_custom_images/hicontrast/dbaccess/res/sc036.png
index 204ab83fa0dd..204ab83fa0dd 100644
--- a/default_images/dbaccess/res/sch036.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc036.png
diff --git a/default_images/dbaccess/res/sch037.png b/ooo_custom_images/hicontrast/dbaccess/res/sc037.png
index a497b4a907d4..a497b4a907d4 100644
--- a/default_images/dbaccess/res/sch037.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc037.png
diff --git a/default_images/dbaccess/res/sch038.png b/ooo_custom_images/hicontrast/dbaccess/res/sc038.png
index 5587a17bba8f..5587a17bba8f 100644
--- a/default_images/dbaccess/res/sch038.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc038.png
diff --git a/default_images/dbaccess/res/sch039.png b/ooo_custom_images/hicontrast/dbaccess/res/sc039.png
index 016cce802b86..016cce802b86 100644
--- a/default_images/dbaccess/res/sch039.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc039.png
diff --git a/default_images/dbaccess/res/sch040.png b/ooo_custom_images/hicontrast/dbaccess/res/sc040.png
index f5c2ed7916f3..f5c2ed7916f3 100644
--- a/default_images/dbaccess/res/sch040.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sc040.png
diff --git a/default_images/dbaccess/res/sortdown_h.png b/ooo_custom_images/hicontrast/dbaccess/res/sortdown.png
index e1537b0c9309..e1537b0c9309 100644
--- a/default_images/dbaccess/res/sortdown_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sortdown.png
diff --git a/default_images/dbaccess/res/sortup_h.png b/ooo_custom_images/hicontrast/dbaccess/res/sortup.png
index a9ac1e23e527..a9ac1e23e527 100644
--- a/default_images/dbaccess/res/sortup_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sortup.png
diff --git a/default_images/dbaccess/res/sxh03187.png b/ooo_custom_images/hicontrast/dbaccess/res/sx03187.png
index 728327d92696..728327d92696 100644
--- a/default_images/dbaccess/res/sxh03187.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sx03187.png
diff --git a/default_images/dbaccess/res/sxh16670.png b/ooo_custom_images/hicontrast/dbaccess/res/sx16670.png
index d0bb80e93687..d0bb80e93687 100644
--- a/default_images/dbaccess/res/sxh16670.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/sx16670.png
diff --git a/default_images/dbaccess/res/tables_32_h.png b/ooo_custom_images/hicontrast/dbaccess/res/tables_32.png
index a51e23e37cba..a51e23e37cba 100644
--- a/default_images/dbaccess/res/tables_32_h.png
+++ b/ooo_custom_images/hicontrast/dbaccess/res/tables_32.png
diff --git a/default_images/desktop/res/caution_12_h.png b/ooo_custom_images/hicontrast/desktop/res/caution_12.png
index 2f3b2f731fcd..2f3b2f731fcd 100644
--- a/default_images/desktop/res/caution_12_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/caution_12.png
diff --git a/default_images/desktop/res/caution_16_h.png b/ooo_custom_images/hicontrast/desktop/res/caution_16.png
index 42c2482f51ba..42c2482f51ba 100644
--- a/default_images/desktop/res/caution_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/caution_16.png
diff --git a/default_images/desktop/res/extension_16_h.png b/ooo_custom_images/hicontrast/desktop/res/extension_16.png
index 31ed87340c1f..31ed87340c1f 100644
--- a/default_images/desktop/res/extension_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/extension_16.png
diff --git a/default_images/desktop/res/extension_32_h.png b/ooo_custom_images/hicontrast/desktop/res/extension_32.png
index efb69cb582e4..efb69cb582e4 100644
--- a/default_images/desktop/res/extension_32_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/extension_32.png
diff --git a/default_images/desktop/res/info_16_h.png b/ooo_custom_images/hicontrast/desktop/res/info_16.png
index efecc9c56d90..efecc9c56d90 100644
--- a/default_images/desktop/res/info_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/info_16.png
diff --git a/default_images/desktop/res/lock_16_h.png b/ooo_custom_images/hicontrast/desktop/res/lock_16.png
index 1fd15626c206..1fd15626c206 100644
--- a/default_images/desktop/res/lock_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/lock_16.png
diff --git a/default_images/desktop/res/shared_16_h.png b/ooo_custom_images/hicontrast/desktop/res/shared_16.png
index 9ebfe1e73361..9ebfe1e73361 100644
--- a/default_images/desktop/res/shared_16_h.png
+++ b/ooo_custom_images/hicontrast/desktop/res/shared_16.png
diff --git a/default_images/extensions/res/buttonminus_hc.png b/ooo_custom_images/hicontrast/extensions/res/buttonminus.png
index baa9d9a24b6f..baa9d9a24b6f 100644
--- a/default_images/extensions/res/buttonminus_hc.png
+++ b/ooo_custom_images/hicontrast/extensions/res/buttonminus.png
diff --git a/default_images/extensions/res/buttonplus_hc.png b/ooo_custom_images/hicontrast/extensions/res/buttonplus.png
index 75ec8825ad90..75ec8825ad90 100644
--- a/default_images/extensions/res/buttonplus_hc.png
+++ b/ooo_custom_images/hicontrast/extensions/res/buttonplus.png
diff --git a/default_images/extensions/source/update/ui/onlineupdate_16_h.png b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_16.png
index 8a5fcfe2f04e..8a5fcfe2f04e 100644
--- a/default_images/extensions/source/update/ui/onlineupdate_16_h.png
+++ b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_16.png
diff --git a/default_images/extensions/source/update/ui/onlineupdate_26_h.png b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_26.png
index 4559ae79e756..4559ae79e756 100644
--- a/default_images/extensions/source/update/ui/onlineupdate_26_h.png
+++ b/ooo_custom_images/hicontrast/extensions/source/update/ui/onlineupdate_26.png
diff --git a/default_images/formula/res/fapclose_h.png b/ooo_custom_images/hicontrast/formula/res/fapclose.png
index c45570379c14..c45570379c14 100644
--- a/default_images/formula/res/fapclose_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fapclose.png
diff --git a/default_images/formula/res/faperror_h.png b/ooo_custom_images/hicontrast/formula/res/faperror.png
index c9a854f79f62..c9a854f79f62 100644
--- a/default_images/formula/res/faperror_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/faperror.png
diff --git a/default_images/formula/res/fapok_h.png b/ooo_custom_images/hicontrast/formula/res/fapok.png
index acb448ca9d25..acb448ca9d25 100644
--- a/default_images/formula/res/fapok_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fapok.png
diff --git a/default_images/formula/res/fapopen_h.png b/ooo_custom_images/hicontrast/formula/res/fapopen.png
index e76cdcea19ea..e76cdcea19ea 100644
--- a/default_images/formula/res/fapopen_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fapopen.png
diff --git a/default_images/formula/res/fx_h.png b/ooo_custom_images/hicontrast/formula/res/fx.png
index 16761616d67c..16761616d67c 100644
--- a/default_images/formula/res/fx_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/fx.png
diff --git a/default_images/formula/res/refinp1_h.png b/ooo_custom_images/hicontrast/formula/res/refinp1.png
index cf4145b3cf72..cf4145b3cf72 100644
--- a/default_images/formula/res/refinp1_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/refinp1.png
diff --git a/default_images/formula/res/refinp2_h.png b/ooo_custom_images/hicontrast/formula/res/refinp2.png
index 0bfcdacf820f..0bfcdacf820f 100644
--- a/default_images/formula/res/refinp2_h.png
+++ b/ooo_custom_images/hicontrast/formula/res/refinp2.png
diff --git a/default_images/fpicker/res/fph011.png b/ooo_custom_images/hicontrast/fpicker/res/fp011.png
index 5ca40188c7bf..5ca40188c7bf 100644
--- a/default_images/fpicker/res/fph011.png
+++ b/ooo_custom_images/hicontrast/fpicker/res/fp011.png
diff --git a/default_images/fpicker/res/fph014.png b/ooo_custom_images/hicontrast/fpicker/res/fp014.png
index c17d1f867bb3..c17d1f867bb3 100644
--- a/default_images/fpicker/res/fph014.png
+++ b/ooo_custom_images/hicontrast/fpicker/res/fp014.png
diff --git a/default_images/framework/res/backing_hc.png b/ooo_custom_images/hicontrast/framework/res/backing.png
index 0cbe207830ee..0cbe207830ee 100644
--- a/default_images/framework/res/backing_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/backing.png
diff --git a/default_images/framework/res/backing_right_hc.png b/ooo_custom_images/hicontrast/framework/res/backing_right.png
index ba0483c2a8cc..ba0483c2a8cc 100644
--- a/default_images/framework/res/backing_right_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/backing_right.png
diff --git a/default_images/framework/res/backing_rtl_left_hc.png b/ooo_custom_images/hicontrast/framework/res/backing_rtl_left.png
index c7b28576c3b1..c7b28576c3b1 100644
--- a/default_images/framework/res/backing_rtl_left_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/backing_rtl_left.png
diff --git a/default_images/framework/res/backing_rtl_right_hc.png b/ooo_custom_images/hicontrast/framework/res/backing_rtl_right.png
index d18927157780..d18927157780 100644
--- a/default_images/framework/res/backing_rtl_right_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/backing_rtl_right.png
diff --git a/default_images/framework/res/backing_space_hc.png b/ooo_custom_images/hicontrast/framework/res/backing_space.png
index 1e6b6464936c..1e6b6464936c 100644
--- a/default_images/framework/res/backing_space_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/backing_space.png
diff --git a/default_images/framework/res/extension_hc.png b/ooo_custom_images/hicontrast/framework/res/extension.png
index f822e74a0e16..f822e74a0e16 100644
--- a/default_images/framework/res/extension_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/extension.png
diff --git a/default_images/framework/res/folder_32_hc.png b/ooo_custom_images/hicontrast/framework/res/folder_32.png
index 5c23d6197e1b..5c23d6197e1b 100644
--- a/default_images/framework/res/folder_32_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/folder_32.png
diff --git a/default_images/framework/res/info_hc.png b/ooo_custom_images/hicontrast/framework/res/info.png
index c22d3ad04fed..c22d3ad04fed 100644
--- a/default_images/framework/res/info_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/info.png
diff --git a/default_images/framework/res/register_hc.png b/ooo_custom_images/hicontrast/framework/res/register.png
index 2bdf2e8b7502..2bdf2e8b7502 100644
--- a/default_images/framework/res/register_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/register.png
diff --git a/default_images/framework/res/template_hc.png b/ooo_custom_images/hicontrast/framework/res/template.png
index 1563a936ebc5..1563a936ebc5 100644
--- a/default_images/framework/res/template_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/template.png
diff --git a/default_images/framework/res/templates_32_hc.png b/ooo_custom_images/hicontrast/framework/res/templates_32.png
index b8be693e17a8..b8be693e17a8 100644
--- a/default_images/framework/res/templates_32_hc.png
+++ b/ooo_custom_images/hicontrast/framework/res/templates_32.png
diff --git a/default_images/minimizer/minimizepresi_80_h.png b/ooo_custom_images/hicontrast/minimizer/minimizepresi_80.png
index fecc7fa5e6c2..fecc7fa5e6c2 100644
--- a/default_images/minimizer/minimizepresi_80_h.png
+++ b/ooo_custom_images/hicontrast/minimizer/minimizepresi_80.png
diff --git a/default_images/minimizer/opt_16_h.png b/ooo_custom_images/hicontrast/minimizer/opt_16.png
index 7b7e85083c19..7b7e85083c19 100644
--- a/default_images/minimizer/opt_16_h.png
+++ b/ooo_custom_images/hicontrast/minimizer/opt_16.png
diff --git a/default_images/minimizer/opt_26_h.png b/ooo_custom_images/hicontrast/minimizer/opt_26.png
index 924ad50b71ee..924ad50b71ee 100644
--- a/default_images/minimizer/opt_26_h.png
+++ b/ooo_custom_images/hicontrast/minimizer/opt_26.png
diff --git a/default_images/padmin/source/fax_16_h.png b/ooo_custom_images/hicontrast/padmin/source/fax_16.png
index 1af40ce0d25e..1af40ce0d25e 100644
--- a/default_images/padmin/source/fax_16_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/fax_16.png
diff --git a/default_images/padmin/source/printer_16_h.png b/ooo_custom_images/hicontrast/padmin/source/printer_16.png
index 83f4fe50cd75..83f4fe50cd75 100644
--- a/default_images/padmin/source/printer_16_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/printer_16.png
diff --git a/default_images/padmin/source/printer_40x48_h.png b/ooo_custom_images/hicontrast/padmin/source/printer_40x48.png
index 5e2ed4c7ea7c..5e2ed4c7ea7c 100644
--- a/default_images/padmin/source/printer_40x48_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/printer_40x48.png
diff --git a/default_images/padmin/source/printpdf_16_h.png b/ooo_custom_images/hicontrast/padmin/source/printpdf_16.png
index c5a73e04b37f..c5a73e04b37f 100644
--- a/default_images/padmin/source/printpdf_16_h.png
+++ b/ooo_custom_images/hicontrast/padmin/source/printpdf_16.png
diff --git a/default_images/reportdesign/res/sch30768.png b/ooo_custom_images/hicontrast/reportdesign/res/sc30768.png
index d1648bdb1b02..d1648bdb1b02 100644
--- a/default_images/reportdesign/res/sch30768.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sc30768.png
diff --git a/default_images/reportdesign/res/sch30769.png b/ooo_custom_images/hicontrast/reportdesign/res/sc30769.png
index ddf57d53f4f5..ddf57d53f4f5 100644
--- a/default_images/reportdesign/res/sch30769.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sc30769.png
diff --git a/default_images/reportdesign/res/sch30770.png b/ooo_custom_images/hicontrast/reportdesign/res/sc30770.png
index 4ad3729d1189..4ad3729d1189 100644
--- a/default_images/reportdesign/res/sch30770.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sc30770.png
diff --git a/default_images/reportdesign/res/sortdown_h.png b/ooo_custom_images/hicontrast/reportdesign/res/sortdown.png
index bff4033b2a5e..bff4033b2a5e 100644
--- a/default_images/reportdesign/res/sortdown_h.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sortdown.png
diff --git a/default_images/reportdesign/res/sortup_h.png b/ooo_custom_images/hicontrast/reportdesign/res/sortup.png
index 2199d7426513..2199d7426513 100644
--- a/default_images/reportdesign/res/sortup_h.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sortup.png
diff --git a/default_images/reportdesign/res/sxh10454.png b/ooo_custom_images/hicontrast/reportdesign/res/sx10454.png
index c9c012135317..c9c012135317 100644
--- a/default_images/reportdesign/res/sxh10454.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx10454.png
diff --git a/default_images/reportdesign/res/sxh10928.png b/ooo_custom_images/hicontrast/reportdesign/res/sx10928.png
index 9c36609e0280..9c36609e0280 100644
--- a/default_images/reportdesign/res/sxh10928.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx10928.png
diff --git a/default_images/reportdesign/res/sxh10929.png b/ooo_custom_images/hicontrast/reportdesign/res/sx10929.png
index 85d985f4b115..85d985f4b115 100644
--- a/default_images/reportdesign/res/sxh10929.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx10929.png
diff --git a/default_images/reportdesign/res/sxh11047.png b/ooo_custom_images/hicontrast/reportdesign/res/sx11047.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/reportdesign/res/sxh11047.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx11047.png
diff --git a/default_images/reportdesign/res/sxh12452.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12452.png
index 34fc869da494..34fc869da494 100644
--- a/default_images/reportdesign/res/sxh12452.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12452.png
diff --git a/default_images/reportdesign/res/sxh12453.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12453.png
index 34fc869da494..34fc869da494 100644
--- a/default_images/reportdesign/res/sxh12453.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12453.png
diff --git a/default_images/reportdesign/res/sxh12454.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12454.png
index abfab0cde149..abfab0cde149 100644
--- a/default_images/reportdesign/res/sxh12454.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12454.png
diff --git a/default_images/reportdesign/res/sxh12464.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12464.png
index f8a2d1581c45..f8a2d1581c45 100644
--- a/default_images/reportdesign/res/sxh12464.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12464.png
diff --git a/default_images/reportdesign/res/sxh12466.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12466.png
index c1bcd02b1725..c1bcd02b1725 100644
--- a/default_images/reportdesign/res/sxh12466.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12466.png
diff --git a/default_images/reportdesign/res/sxh12468.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12468.png
index 6360520d6096..6360520d6096 100644
--- a/default_images/reportdesign/res/sxh12468.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12468.png
diff --git a/default_images/reportdesign/res/sxh12477.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12477.png
index 45f01a28dcb2..45f01a28dcb2 100644
--- a/default_images/reportdesign/res/sxh12477.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12477.png
diff --git a/default_images/reportdesign/res/sxh12594.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12594.png
index 7881b8c2af1b..7881b8c2af1b 100644
--- a/default_images/reportdesign/res/sxh12594.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12594.png
diff --git a/default_images/reportdesign/res/sxh12602.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12602.png
index 40f48898951b..40f48898951b 100644
--- a/default_images/reportdesign/res/sxh12602.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12602.png
diff --git a/default_images/reportdesign/res/sxh12603.png b/ooo_custom_images/hicontrast/reportdesign/res/sx12603.png
index e6fd9e2aaab5..e6fd9e2aaab5 100644
--- a/default_images/reportdesign/res/sxh12603.png
+++ b/ooo_custom_images/hicontrast/reportdesign/res/sx12603.png
diff --git a/default_images/res/adrbook_hc.png b/ooo_custom_images/hicontrast/res/adrbook.png
index aba8708aa560..aba8708aa560 100644
--- a/default_images/res/adrbook_hc.png
+++ b/ooo_custom_images/hicontrast/res/adrbook.png
diff --git a/default_images/res/arrow_move_down_hc.png b/ooo_custom_images/hicontrast/res/arrow_move_down.png
index e1537b0c9309..e1537b0c9309 100644
--- a/default_images/res/arrow_move_down_hc.png
+++ b/ooo_custom_images/hicontrast/res/arrow_move_down.png
diff --git a/default_images/res/arrow_move_up_hc.png b/ooo_custom_images/hicontrast/res/arrow_move_up.png
index f1803f7cc297..f1803f7cc297 100644
--- a/default_images/res/arrow_move_up_hc.png
+++ b/ooo_custom_images/hicontrast/res/arrow_move_up.png
diff --git a/default_images/res/baswatr_h.png b/ooo_custom_images/hicontrast/res/baswatr.png
index 604ae3afb311..604ae3afb311 100644
--- a/default_images/res/baswatr_h.png
+++ b/ooo_custom_images/hicontrast/res/baswatr.png
diff --git a/default_images/res/browse_hc.png b/ooo_custom_images/hicontrast/res/browse.png
index b98f12582239..b98f12582239 100644
--- a/default_images/res/browse_hc.png
+++ b/ooo_custom_images/hicontrast/res/browse.png
diff --git a/default_images/res/commandimagelist/ar/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_bold.png
index 01b82d00ce44..01b82d00ce44 100644
--- a/default_images/res/commandimagelist/ar/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_bold.png
diff --git a/default_images/res/commandimagelist/ar/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_italic.png
index 3da9184f8981..3da9184f8981 100644
--- a/default_images/res/commandimagelist/ar/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_italic.png
diff --git a/default_images/res/commandimagelist/ar/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/ar/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/lc_underline.png
diff --git a/default_images/res/commandimagelist/ar/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/ar/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_bold.png
diff --git a/default_images/res/commandimagelist/ar/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/ar/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_italic.png
diff --git a/default_images/res/commandimagelist/ar/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_underline.png
index d1ec3ca5ad7c..d1ec3ca5ad7c 100644
--- a/default_images/res/commandimagelist/ar/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ar/sc_underline.png
diff --git a/default_images/res/commandimagelist/bg/lch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_backcolor.png
index c3d3f9f05c71..c3d3f9f05c71 100644
--- a/default_images/res/commandimagelist/bg/lch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_backcolor.png
diff --git a/default_images/res/commandimagelist/bg/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_bold.png
index 2f2e7226486f..2f2e7226486f 100644
--- a/default_images/res/commandimagelist/bg/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_bold.png
diff --git a/default_images/res/commandimagelist/bg/lch_doubleclicktextedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_doubleclicktextedit.png
index a06b630af605..a06b630af605 100644
--- a/default_images/res/commandimagelist/bg/lch_doubleclicktextedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_doubleclicktextedit.png
diff --git a/default_images/res/commandimagelist/bg/lch_edit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_edit.png
index 4c8abf1c5149..4c8abf1c5149 100644
--- a/default_images/res/commandimagelist/bg/lch_edit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_edit.png
diff --git a/default_images/res/commandimagelist/bg/lch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_editglossary.png
index f9e4886cd71a..f9e4886cd71a 100644
--- a/default_images/res/commandimagelist/bg/lch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_editglossary.png
diff --git a/default_images/res/commandimagelist/bg/lch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenate.png
index ca3c38d77b74..ca3c38d77b74 100644
--- a/default_images/res/commandimagelist/bg/lch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenate.png
diff --git a/default_images/res/commandimagelist/bg/lch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenation.png
index 51058fd80f18..51058fd80f18 100644
--- a/default_images/res/commandimagelist/bg/lch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_hyphenation.png
diff --git a/default_images/res/commandimagelist/bg/lch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertedit.png
index 116d28a07650..116d28a07650 100644
--- a/default_images/res/commandimagelist/bg/lch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertedit.png
diff --git a/default_images/res/commandimagelist/bg/lch_insertfixedtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertfixedtext.png
index 4635f265cfa0..4635f265cfa0 100644
--- a/default_images/res/commandimagelist/bg/lch_insertfixedtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_insertfixedtext.png
diff --git a/default_images/res/commandimagelist/bg/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_italic.png
index 2d634432cefe..2d634432cefe 100644
--- a/default_images/res/commandimagelist/bg/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_italic.png
diff --git a/default_images/res/commandimagelist/bg/lch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_label.png
index 0fd2a61c49b1..0fd2a61c49b1 100644
--- a/default_images/res/commandimagelist/bg/lch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_label.png
diff --git a/default_images/res/commandimagelist/bg/lch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_ordercrit.png
index 327b986fbc1b..327b986fbc1b 100644
--- a/default_images/res/commandimagelist/bg/lch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_ordercrit.png
diff --git a/default_images/res/commandimagelist/bg/lch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_pickthrough.png
index d52d0163eccc..d52d0163eccc 100644
--- a/default_images/res/commandimagelist/bg/lch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_pickthrough.png
diff --git a/default_images/res/commandimagelist/bg/lch_quickedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_quickedit.png
index 3f5c9459b4fb..3f5c9459b4fb 100644
--- a/default_images/res/commandimagelist/bg/lch_quickedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_quickedit.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortascending.png
index 8f5af46059ac..8f5af46059ac 100644
--- a/default_images/res/commandimagelist/bg/lch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortascending.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdescending.png
index 3834a9bb6b09..3834a9bb6b09 100644
--- a/default_images/res/commandimagelist/bg/lch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdescending.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdown.png
index afa5bae1c96b..afa5bae1c96b 100644
--- a/default_images/res/commandimagelist/bg/lch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortdown.png
diff --git a/default_images/res/commandimagelist/bg/lch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortup.png
index 76be1d446e03..76be1d446e03 100644
--- a/default_images/res/commandimagelist/bg/lch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_sortup.png
diff --git a/default_images/res/commandimagelist/bg/lch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelldialog.png
index 10521aec12be..10521aec12be 100644
--- a/default_images/res/commandimagelist/bg/lch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelldialog.png
diff --git a/default_images/res/commandimagelist/bg/lch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelling.png
index d016977bdd17..d016977bdd17 100644
--- a/default_images/res/commandimagelist/bg/lch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spelling.png
diff --git a/default_images/res/commandimagelist/bg/lch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spellonline.png
index 06f772ca14cc..06f772ca14cc 100644
--- a/default_images/res/commandimagelist/bg/lch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_spellonline.png
diff --git a/default_images/res/commandimagelist/bg/lch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_strikeout.png
index 7ea761bdb99c..7ea761bdb99c 100644
--- a/default_images/res/commandimagelist/bg/lch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_strikeout.png
diff --git a/default_images/res/commandimagelist/bg/lch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_tablesort.png
index 4ce94ce855d2..4ce94ce855d2 100644
--- a/default_images/res/commandimagelist/bg/lch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_tablesort.png
diff --git a/default_images/res/commandimagelist/bg/lch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurus.png
index f0f23e844a9e..f0f23e844a9e 100644
--- a/default_images/res/commandimagelist/bg/lch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurus.png
diff --git a/default_images/res/commandimagelist/bg/lch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurusdialog.png
index ab760039caac..ab760039caac 100644
--- a/default_images/res/commandimagelist/bg/lch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/bg/lch_toggleaxistitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggleaxistitle.png
index 44c42640bd4e..44c42640bd4e 100644
--- a/default_images/res/commandimagelist/bg/lch_toggleaxistitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggleaxistitle.png
diff --git a/default_images/res/commandimagelist/bg/lch_toggletitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggletitle.png
index aee3caa5e386..aee3caa5e386 100644
--- a/default_images/res/commandimagelist/bg/lch_toggletitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_toggletitle.png
diff --git a/default_images/res/commandimagelist/bg/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underline.png
index 46e6906b9f91..46e6906b9f91 100644
--- a/default_images/res/commandimagelist/bg/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underline.png
diff --git a/default_images/res/commandimagelist/bg/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underlinedouble.png
index 50fc4b0b6ac5..50fc4b0b6ac5 100644
--- a/default_images/res/commandimagelist/bg/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/bg/sch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_backcolor.png
index 66771691b1b0..66771691b1b0 100644
--- a/default_images/res/commandimagelist/bg/sch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_backcolor.png
diff --git a/default_images/res/commandimagelist/bg/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_bold.png
index a9a5a5999d6e..a9a5a5999d6e 100644
--- a/default_images/res/commandimagelist/bg/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_bold.png
diff --git a/default_images/res/commandimagelist/bg/sch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_editglossary.png
index 4b8334be6a02..4b8334be6a02 100644
--- a/default_images/res/commandimagelist/bg/sch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_editglossary.png
diff --git a/default_images/res/commandimagelist/bg/sch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenate.png
index 205f9e4f12dc..205f9e4f12dc 100644
--- a/default_images/res/commandimagelist/bg/sch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenate.png
diff --git a/default_images/res/commandimagelist/bg/sch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenation.png
index 205f9e4f12dc..205f9e4f12dc 100644
--- a/default_images/res/commandimagelist/bg/sch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_hyphenation.png
diff --git a/default_images/res/commandimagelist/bg/sch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_insertedit.png
index 82c4b5565984..82c4b5565984 100644
--- a/default_images/res/commandimagelist/bg/sch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_insertedit.png
diff --git a/default_images/res/commandimagelist/bg/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_italic.png
index d8bc8978d6be..d8bc8978d6be 100644
--- a/default_images/res/commandimagelist/bg/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_italic.png
diff --git a/default_images/res/commandimagelist/bg/sch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_label.png
index 2bcead1a26c4..2bcead1a26c4 100644
--- a/default_images/res/commandimagelist/bg/sch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_label.png
diff --git a/default_images/res/commandimagelist/bg/sch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_ordercrit.png
index 982280ae64bf..982280ae64bf 100644
--- a/default_images/res/commandimagelist/bg/sch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_ordercrit.png
diff --git a/default_images/res/commandimagelist/bg/sch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_pickthrough.png
index f1fe74adb402..f1fe74adb402 100644
--- a/default_images/res/commandimagelist/bg/sch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_pickthrough.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortascending.png
index 6a8640f06204..6a8640f06204 100644
--- a/default_images/res/commandimagelist/bg/sch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortascending.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdescending.png
index 44379b818732..44379b818732 100644
--- a/default_images/res/commandimagelist/bg/sch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdescending.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdown.png
index 44379b818732..44379b818732 100644
--- a/default_images/res/commandimagelist/bg/sch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortdown.png
diff --git a/default_images/res/commandimagelist/bg/sch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortup.png
index 885d9a1523fa..885d9a1523fa 100644
--- a/default_images/res/commandimagelist/bg/sch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_sortup.png
diff --git a/default_images/res/commandimagelist/bg/sch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelldialog.png
index 6c679eeb2dba..6c679eeb2dba 100644
--- a/default_images/res/commandimagelist/bg/sch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelldialog.png
diff --git a/default_images/res/commandimagelist/bg/sch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelling.png
index eca9e9bde8fb..eca9e9bde8fb 100644
--- a/default_images/res/commandimagelist/bg/sch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spelling.png
diff --git a/default_images/res/commandimagelist/bg/sch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spellonline.png
index 300baee017e5..300baee017e5 100644
--- a/default_images/res/commandimagelist/bg/sch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_spellonline.png
diff --git a/default_images/res/commandimagelist/bg/sch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_strikeout.png
index 2630af1ca38d..2630af1ca38d 100644
--- a/default_images/res/commandimagelist/bg/sch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_strikeout.png
diff --git a/default_images/res/commandimagelist/bg/sch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_tablesort.png
index 982280ae64bf..982280ae64bf 100644
--- a/default_images/res/commandimagelist/bg/sch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_tablesort.png
diff --git a/default_images/res/commandimagelist/bg/sch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurus.png
index 6a6153e058e8..6a6153e058e8 100644
--- a/default_images/res/commandimagelist/bg/sch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurus.png
diff --git a/default_images/res/commandimagelist/bg/sch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurusdialog.png
index 6a6153e058e8..6a6153e058e8 100644
--- a/default_images/res/commandimagelist/bg/sch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/bg/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underline.png
index 4439cca5a97e..4439cca5a97e 100644
--- a/default_images/res/commandimagelist/bg/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underline.png
diff --git a/default_images/res/commandimagelist/bg/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underlinedouble.png
index 2e9e1117ab7b..2e9e1117ab7b 100644
--- a/default_images/res/commandimagelist/bg/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/bg/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ca/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_bold.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/commandimagelist/ca/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_bold.png
diff --git a/default_images/res/commandimagelist/ca/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_italic.png
index fdac4232a904..fdac4232a904 100644
--- a/default_images/res/commandimagelist/ca/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_italic.png
diff --git a/default_images/res/commandimagelist/ca/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underline.png
index 6e3f0a888de3..6e3f0a888de3 100644
--- a/default_images/res/commandimagelist/ca/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underline.png
diff --git a/default_images/res/commandimagelist/ca/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underlinedouble.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/commandimagelist/ca/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ca/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/ca/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_bold.png
diff --git a/default_images/res/commandimagelist/ca/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_italic.png
index 319658ff4366..319658ff4366 100644
--- a/default_images/res/commandimagelist/ca/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_italic.png
diff --git a/default_images/res/commandimagelist/ca/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underline.png
index e0f886dc31b3..e0f886dc31b3 100644
--- a/default_images/res/commandimagelist/ca/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underline.png
diff --git a/default_images/res/commandimagelist/ca/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/ca/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ca/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/cs/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_bold.png
index aa4385764f93..aa4385764f93 100644
--- a/default_images/res/commandimagelist/cs/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_bold.png
diff --git a/default_images/res/commandimagelist/cs/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/cs/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_italic.png
diff --git a/default_images/res/commandimagelist/cs/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_numberformatdecimal.png
index 2d1ff510c0b3..2d1ff510c0b3 100644
--- a/default_images/res/commandimagelist/cs/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/cs/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/cs/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underline.png
diff --git a/default_images/res/commandimagelist/cs/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underlinedouble.png
index f27304864369..f27304864369 100644
--- a/default_images/res/commandimagelist/cs/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/cs/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/cs/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_bold.png
diff --git a/default_images/res/commandimagelist/cs/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/cs/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_italic.png
diff --git a/default_images/res/commandimagelist/cs/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/cs/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/cs/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underline.png
index ed5562d1b20a..ed5562d1b20a 100644
--- a/default_images/res/commandimagelist/cs/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underline.png
diff --git a/default_images/res/commandimagelist/cs/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underlinedouble.png
index fcebadf2a5b0..fcebadf2a5b0 100644
--- a/default_images/res/commandimagelist/cs/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/cs/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/de/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_bold.png
index 21a8ec70058f..21a8ec70058f 100644
--- a/default_images/res/commandimagelist/de/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_bold.png
diff --git a/default_images/res/commandimagelist/de/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_italic.png
index 437beae30dde..437beae30dde 100644
--- a/default_images/res/commandimagelist/de/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_italic.png
diff --git a/default_images/res/commandimagelist/de/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_numberformatdecimal.png
index 19c0c5345b46..19c0c5345b46 100644
--- a/default_images/res/commandimagelist/de/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/de/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/de/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underline.png
diff --git a/default_images/res/commandimagelist/de/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underlinedouble.png
index 12970a163d35..12970a163d35 100644
--- a/default_images/res/commandimagelist/de/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/de/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_bold.png
index 874cfba4e7a9..874cfba4e7a9 100644
--- a/default_images/res/commandimagelist/de/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_bold.png
diff --git a/default_images/res/commandimagelist/de/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_italic.png
index 1bb15c11b894..1bb15c11b894 100644
--- a/default_images/res/commandimagelist/de/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_italic.png
diff --git a/default_images/res/commandimagelist/de/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_numberformatdecimal.png
index fbda15d0a004..fbda15d0a004 100644
--- a/default_images/res/commandimagelist/de/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/de/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underline.png
index 34038e4e8759..34038e4e8759 100644
--- a/default_images/res/commandimagelist/de/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underline.png
diff --git a/default_images/res/commandimagelist/de/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/de/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/de/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_bold.png
index 490c31e7bd1a..490c31e7bd1a 100644
--- a/default_images/res/commandimagelist/en-GB/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_bold.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_italic.png
index 10d43acdb631..10d43acdb631 100644
--- a/default_images/res/commandimagelist/en-GB/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_italic.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_numberformatdecimal.png
index 105afb0d5471..105afb0d5471 100644
--- a/default_images/res/commandimagelist/en-GB/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underline.png
index 54e6da7bf3e9..54e6da7bf3e9 100644
--- a/default_images/res/commandimagelist/en-GB/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underline.png
diff --git a/default_images/res/commandimagelist/en-GB/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underlinedouble.png
index a40405e5ae58..a40405e5ae58 100644
--- a/default_images/res/commandimagelist/en-GB/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/en-GB/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_bold.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_italic.png
index fa9e3aad5825..fa9e3aad5825 100644
--- a/default_images/res/commandimagelist/en-GB/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_italic.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/en-GB/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underline.png
index 5d22c8ec9838..5d22c8ec9838 100644
--- a/default_images/res/commandimagelist/en-GB/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underline.png
diff --git a/default_images/res/commandimagelist/en-GB/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/en-GB/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/en-GB/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/es/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_bold.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/commandimagelist/es/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_bold.png
diff --git a/default_images/res/commandimagelist/es/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_italic.png
index fdac4232a904..fdac4232a904 100644
--- a/default_images/res/commandimagelist/es/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_italic.png
diff --git a/default_images/res/commandimagelist/es/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_numberformatdecimal.png
index c216244a1bfc..c216244a1bfc 100644
--- a/default_images/res/commandimagelist/es/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/es/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underline.png
index 22380aa8140d..22380aa8140d 100644
--- a/default_images/res/commandimagelist/es/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underline.png
diff --git a/default_images/res/commandimagelist/es/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underlinedouble.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/commandimagelist/es/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/es/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/es/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_bold.png
diff --git a/default_images/res/commandimagelist/es/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_italic.png
index 221e37f23251..221e37f23251 100644
--- a/default_images/res/commandimagelist/es/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_italic.png
diff --git a/default_images/res/commandimagelist/es/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_numberformatdecimal.png
index 9e73e1231076..9e73e1231076 100644
--- a/default_images/res/commandimagelist/es/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/es/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/es/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underline.png
diff --git a/default_images/res/commandimagelist/es/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/es/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/es/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/et/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_bold.png
index 1800f69f2a61..1800f69f2a61 100644
--- a/default_images/res/commandimagelist/et/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_bold.png
diff --git a/default_images/res/commandimagelist/et/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/et/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_italic.png
diff --git a/default_images/res/commandimagelist/et/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_numberformatdecimal.png
index b493e7cc387c..b493e7cc387c 100644
--- a/default_images/res/commandimagelist/et/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/et/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underline.png
index 635a8c4ca20f..635a8c4ca20f 100644
--- a/default_images/res/commandimagelist/et/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underline.png
diff --git a/default_images/res/commandimagelist/et/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underlinedouble.png
index f27304864369..f27304864369 100644
--- a/default_images/res/commandimagelist/et/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/et/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/et/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_bold.png
diff --git a/default_images/res/commandimagelist/et/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/et/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_italic.png
diff --git a/default_images/res/commandimagelist/et/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/et/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/et/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underline.png
index c243963a1e73..c243963a1e73 100644
--- a/default_images/res/commandimagelist/et/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underline.png
diff --git a/default_images/res/commandimagelist/et/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underlinedouble.png
index fcebadf2a5b0..fcebadf2a5b0 100644
--- a/default_images/res/commandimagelist/et/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/et/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/fr/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_bold.png
index 5dd271636f9f..5dd271636f9f 100644
--- a/default_images/res/commandimagelist/fr/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_bold.png
diff --git a/default_images/res/commandimagelist/fr/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_italic.png
index 84fd9c032347..84fd9c032347 100644
--- a/default_images/res/commandimagelist/fr/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_italic.png
diff --git a/default_images/res/commandimagelist/fr/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underline.png
index 0421ef64f8ec..0421ef64f8ec 100644
--- a/default_images/res/commandimagelist/fr/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underline.png
diff --git a/default_images/res/commandimagelist/fr/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underlinedouble.png
index 3b988d605d2e..3b988d605d2e 100644
--- a/default_images/res/commandimagelist/fr/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/fr/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_bold.png
index 2e1ca2e2cd2c..2e1ca2e2cd2c 100644
--- a/default_images/res/commandimagelist/fr/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_bold.png
diff --git a/default_images/res/commandimagelist/fr/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_italic.png
index b77320ac40df..b77320ac40df 100644
--- a/default_images/res/commandimagelist/fr/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_italic.png
diff --git a/default_images/res/commandimagelist/fr/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underline.png
index b74305a8889c..b74305a8889c 100644
--- a/default_images/res/commandimagelist/fr/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underline.png
diff --git a/default_images/res/commandimagelist/fr/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underlinedouble.png
index 72d6a2871439..72d6a2871439 100644
--- a/default_images/res/commandimagelist/fr/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/fr/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/hu/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_bold.png
index 21a8ec70058f..21a8ec70058f 100644
--- a/default_images/res/commandimagelist/hu/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_bold.png
diff --git a/default_images/res/commandimagelist/hu/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_italic.png
index 4c3e3d1dbd3c..4c3e3d1dbd3c 100644
--- a/default_images/res/commandimagelist/hu/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_italic.png
diff --git a/default_images/res/commandimagelist/hu/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underline.png
index 39a2bcb34154..39a2bcb34154 100644
--- a/default_images/res/commandimagelist/hu/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underline.png
diff --git a/default_images/res/commandimagelist/hu/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underlinedouble.png
index 998f4c9808a8..998f4c9808a8 100644
--- a/default_images/res/commandimagelist/hu/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/hu/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_bold.png
index 874cfba4e7a9..874cfba4e7a9 100644
--- a/default_images/res/commandimagelist/hu/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_bold.png
diff --git a/default_images/res/commandimagelist/hu/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_italic.png
index 47963d183a73..47963d183a73 100644
--- a/default_images/res/commandimagelist/hu/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_italic.png
diff --git a/default_images/res/commandimagelist/hu/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underline.png
index ed0bb3dfc280..ed0bb3dfc280 100644
--- a/default_images/res/commandimagelist/hu/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underline.png
diff --git a/default_images/res/commandimagelist/hu/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underlinedouble.png
index 3d142bc3bc5a..3d142bc3bc5a 100644
--- a/default_images/res/commandimagelist/hu/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/hu/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/it/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_bold.png
index 846408113dc7..846408113dc7 100644
--- a/default_images/res/commandimagelist/it/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_bold.png
diff --git a/default_images/res/commandimagelist/it/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_italic.png
index 4cafe4753201..4cafe4753201 100644
--- a/default_images/res/commandimagelist/it/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_italic.png
diff --git a/default_images/res/commandimagelist/it/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underline.png
index 22380aa8140d..22380aa8140d 100644
--- a/default_images/res/commandimagelist/it/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underline.png
diff --git a/default_images/res/commandimagelist/it/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underlinedouble.png
index 187cdae1747c..187cdae1747c 100644
--- a/default_images/res/commandimagelist/it/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/it/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_bold.png
index cdb24fa5e585..cdb24fa5e585 100644
--- a/default_images/res/commandimagelist/it/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_bold.png
diff --git a/default_images/res/commandimagelist/it/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_italic.png
index 221e37f23251..221e37f23251 100644
--- a/default_images/res/commandimagelist/it/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_italic.png
diff --git a/default_images/res/commandimagelist/it/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/it/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underline.png
diff --git a/default_images/res/commandimagelist/it/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/it/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/it/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ja/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_bold.png
index e28c927efcf7..e28c927efcf7 100644
--- a/default_images/res/commandimagelist/ja/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_bold.png
diff --git a/default_images/res/commandimagelist/ja/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/ja/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_italic.png
diff --git a/default_images/res/commandimagelist/ja/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underline.png
index 1cb66a0c1179..1cb66a0c1179 100644
--- a/default_images/res/commandimagelist/ja/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underline.png
diff --git a/default_images/res/commandimagelist/ja/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underlinedouble.png
index 0eb4c2c0bb2f..0eb4c2c0bb2f 100644
--- a/default_images/res/commandimagelist/ja/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ja/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/ja/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_bold.png
diff --git a/default_images/res/commandimagelist/ja/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/ja/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_italic.png
diff --git a/default_images/res/commandimagelist/ja/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underline.png
index 159907e0bd8f..159907e0bd8f 100644
--- a/default_images/res/commandimagelist/ja/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underline.png
diff --git a/default_images/res/commandimagelist/ja/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underlinedouble.png
index 76aeb78a859d..76aeb78a859d 100644
--- a/default_images/res/commandimagelist/ja/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ja/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/km/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_bold.png
index 75eb8bac1fea..75eb8bac1fea 100644
--- a/default_images/res/commandimagelist/km/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_bold.png
diff --git a/default_images/res/commandimagelist/km/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_italic.png
index 8655a31f2278..8655a31f2278 100644
--- a/default_images/res/commandimagelist/km/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_italic.png
diff --git a/default_images/res/commandimagelist/km/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_numberformatdecimal.png
index b040fa766858..b040fa766858 100644
--- a/default_images/res/commandimagelist/km/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/km/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underline.png
index ae58a0135aa0..ae58a0135aa0 100644
--- a/default_images/res/commandimagelist/km/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underline.png
diff --git a/default_images/res/commandimagelist/km/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underlinedouble.png
index f1bef3f25374..f1bef3f25374 100644
--- a/default_images/res/commandimagelist/km/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/km/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_bold.png
index aa227b508ba2..aa227b508ba2 100644
--- a/default_images/res/commandimagelist/km/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_bold.png
diff --git a/default_images/res/commandimagelist/km/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_italic.png
index 642bd4e8706a..642bd4e8706a 100644
--- a/default_images/res/commandimagelist/km/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_italic.png
diff --git a/default_images/res/commandimagelist/km/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/km/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/km/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underline.png
index da04f08d3f39..da04f08d3f39 100644
--- a/default_images/res/commandimagelist/km/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underline.png
diff --git a/default_images/res/commandimagelist/km/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underlinedouble.png
index d6ee5e79a3b7..d6ee5e79a3b7 100644
--- a/default_images/res/commandimagelist/km/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/km/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ko/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_bold.png
index 59b72b41cd6a..59b72b41cd6a 100644
--- a/default_images/res/commandimagelist/ko/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_bold.png
diff --git a/default_images/res/commandimagelist/ko/lch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_charfontname.png
index d872dbb4d501..d872dbb4d501 100644
--- a/default_images/res/commandimagelist/ko/lch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_charfontname.png
diff --git a/default_images/res/commandimagelist/ko/lch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_color.png
index 6610d06b7fad..6610d06b7fad 100644
--- a/default_images/res/commandimagelist/ko/lch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_color.png
diff --git a/default_images/res/commandimagelist/ko/lch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_drawtext.png
index 531f1219d273..531f1219d273 100644
--- a/default_images/res/commandimagelist/ko/lch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_drawtext.png
diff --git a/default_images/res/commandimagelist/ko/lch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontcolor.png
index 8d2b985eb162..8d2b985eb162 100644
--- a/default_images/res/commandimagelist/ko/lch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontcolor.png
diff --git a/default_images/res/commandimagelist/ko/lch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontheight.png
index 7c296bbebaf0..7c296bbebaf0 100644
--- a/default_images/res/commandimagelist/ko/lch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_fontheight.png
diff --git a/default_images/res/commandimagelist/ko/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_italic.png
index f24bef2478c7..f24bef2478c7 100644
--- a/default_images/res/commandimagelist/ko/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_italic.png
diff --git a/default_images/res/commandimagelist/ko/lch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_ordercrit.png
index 4e5f2261d8c9..4e5f2261d8c9 100644
--- a/default_images/res/commandimagelist/ko/lch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_ordercrit.png
diff --git a/default_images/res/commandimagelist/ko/lch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_outlinefont.png
index ce28e9812974..ce28e9812974 100644
--- a/default_images/res/commandimagelist/ko/lch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_outlinefont.png
diff --git a/default_images/res/commandimagelist/ko/lch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_shadowed.png
index 6d333b146c0a..6d333b146c0a 100644
--- a/default_images/res/commandimagelist/ko/lch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_shadowed.png
diff --git a/default_images/res/commandimagelist/ko/lch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortdown.png
index 2ac47b53f403..2ac47b53f403 100644
--- a/default_images/res/commandimagelist/ko/lch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortdown.png
diff --git a/default_images/res/commandimagelist/ko/lch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortup.png
index 9df0e88f9606..9df0e88f9606 100644
--- a/default_images/res/commandimagelist/ko/lch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_sortup.png
diff --git a/default_images/res/commandimagelist/ko/lch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_strikeout.png
index dc48a9a3ec38..dc48a9a3ec38 100644
--- a/default_images/res/commandimagelist/ko/lch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_strikeout.png
diff --git a/default_images/res/commandimagelist/ko/lch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_tablesort.png
index 7cdfa59d9658..7cdfa59d9658 100644
--- a/default_images/res/commandimagelist/ko/lch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_tablesort.png
diff --git a/default_images/res/commandimagelist/ko/lch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text.png
index 531f1219d273..531f1219d273 100644
--- a/default_images/res/commandimagelist/ko/lch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text.png
diff --git a/default_images/res/commandimagelist/ko/lch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text_marquee.png
index 111df1e9b355..111df1e9b355 100644
--- a/default_images/res/commandimagelist/ko/lch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_text_marquee.png
diff --git a/default_images/res/commandimagelist/ko/lch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectionlefttoright.png
index fb6d82f74ce5..fb6d82f74ce5 100644
--- a/default_images/res/commandimagelist/ko/lch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/ko/lch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectiontoptobottom.png
index 8ac04fd0052e..8ac04fd0052e 100644
--- a/default_images/res/commandimagelist/ko/lch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/ko/lch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_texttoolbox.png
index a996a7fa1a37..a996a7fa1a37 100644
--- a/default_images/res/commandimagelist/ko/lch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/ko/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underline.png
index 7c549b819fd1..7c549b819fd1 100644
--- a/default_images/res/commandimagelist/ko/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underline.png
diff --git a/default_images/res/commandimagelist/ko/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underlinedouble.png
index d71907701e6e..d71907701e6e 100644
--- a/default_images/res/commandimagelist/ko/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ko/lch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_verticaltext.png
index 4622f33c5059..4622f33c5059 100644
--- a/default_images/res/commandimagelist/ko/lch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/lc_verticaltext.png
diff --git a/default_images/res/commandimagelist/ko/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_bold.png
index dc298860bd0d..dc298860bd0d 100644
--- a/default_images/res/commandimagelist/ko/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_bold.png
diff --git a/default_images/res/commandimagelist/ko/sch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_charfontname.png
index b0ebdd57603d..b0ebdd57603d 100644
--- a/default_images/res/commandimagelist/ko/sch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_charfontname.png
diff --git a/default_images/res/commandimagelist/ko/sch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_color.png
index f0e4da02899b..f0e4da02899b 100644
--- a/default_images/res/commandimagelist/ko/sch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_color.png
diff --git a/default_images/res/commandimagelist/ko/sch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_drawtext.png
index 0645fab5d7b2..0645fab5d7b2 100644
--- a/default_images/res/commandimagelist/ko/sch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_drawtext.png
diff --git a/default_images/res/commandimagelist/ko/sch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontcolor.png
index f0e4da02899b..f0e4da02899b 100644
--- a/default_images/res/commandimagelist/ko/sch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontcolor.png
diff --git a/default_images/res/commandimagelist/ko/sch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontheight.png
index 25f253f00e6c..25f253f00e6c 100644
--- a/default_images/res/commandimagelist/ko/sch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_fontheight.png
diff --git a/default_images/res/commandimagelist/ko/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_italic.png
index c0857ad9488b..c0857ad9488b 100644
--- a/default_images/res/commandimagelist/ko/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_italic.png
diff --git a/default_images/res/commandimagelist/ko/sch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_ordercrit.png
index 89b53117c003..89b53117c003 100644
--- a/default_images/res/commandimagelist/ko/sch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_ordercrit.png
diff --git a/default_images/res/commandimagelist/ko/sch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_outlinefont.png
index db7c393c7465..db7c393c7465 100644
--- a/default_images/res/commandimagelist/ko/sch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_outlinefont.png
diff --git a/default_images/res/commandimagelist/ko/sch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_shadowed.png
index 5c7312951f6f..5c7312951f6f 100644
--- a/default_images/res/commandimagelist/ko/sch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_shadowed.png
diff --git a/default_images/res/commandimagelist/ko/sch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortdown.png
index 0b868f65f371..0b868f65f371 100644
--- a/default_images/res/commandimagelist/ko/sch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortdown.png
diff --git a/default_images/res/commandimagelist/ko/sch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortup.png
index 734833afa4b9..734833afa4b9 100644
--- a/default_images/res/commandimagelist/ko/sch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_sortup.png
diff --git a/default_images/res/commandimagelist/ko/sch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_strikeout.png
index 81c260edc30f..81c260edc30f 100644
--- a/default_images/res/commandimagelist/ko/sch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_strikeout.png
diff --git a/default_images/res/commandimagelist/ko/sch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_tablesort.png
index 89b53117c003..89b53117c003 100644
--- a/default_images/res/commandimagelist/ko/sch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_tablesort.png
diff --git a/default_images/res/commandimagelist/ko/sch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text.png
index 0645fab5d7b2..0645fab5d7b2 100644
--- a/default_images/res/commandimagelist/ko/sch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text.png
diff --git a/default_images/res/commandimagelist/ko/sch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text_marquee.png
index 600ea8a7b36c..600ea8a7b36c 100644
--- a/default_images/res/commandimagelist/ko/sch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_text_marquee.png
diff --git a/default_images/res/commandimagelist/ko/sch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectionlefttoright.png
index 5bb84d7f8f53..5bb84d7f8f53 100644
--- a/default_images/res/commandimagelist/ko/sch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/ko/sch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectiontoptobottom.png
index 35bf576af2e4..35bf576af2e4 100644
--- a/default_images/res/commandimagelist/ko/sch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/ko/sch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_texttoolbox.png
index 0645fab5d7b2..0645fab5d7b2 100644
--- a/default_images/res/commandimagelist/ko/sch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/ko/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underline.png
index 37b3bb181b41..37b3bb181b41 100644
--- a/default_images/res/commandimagelist/ko/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underline.png
diff --git a/default_images/res/commandimagelist/ko/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underlinedouble.png
index 64f543197154..64f543197154 100644
--- a/default_images/res/commandimagelist/ko/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ko/sch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_verticaltext.png
index aacf4b3c874f..aacf4b3c874f 100644
--- a/default_images/res/commandimagelist/ko/sch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ko/sc_verticaltext.png
diff --git a/default_images/res/commandimagelist/lch_absoluterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_absoluterecord.png
index d5e0d3467ec3..d5e0d3467ec3 100644
--- a/default_images/res/commandimagelist/lch_absoluterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_absoluterecord.png
diff --git a/default_images/res/commandimagelist/lch_actionmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_actionmode.png
index fcff704d0662..fcff704d0662 100644
--- a/default_images/res/commandimagelist/lch_actionmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_actionmode.png
diff --git a/default_images/res/commandimagelist/lch_addbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addbookmark.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_addbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addbookmark.png
diff --git a/default_images/res/commandimagelist/lch_adddatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddatefield.png
index c1ce2f1e6c24..c1ce2f1e6c24 100644
--- a/default_images/res/commandimagelist/lch_adddatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddatefield.png
diff --git a/default_images/res/commandimagelist/lch_adddirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddirect.png
index 3a4eac5273b2..3a4eac5273b2 100644
--- a/default_images/res/commandimagelist/lch_adddirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adddirect.png
diff --git a/default_images/res/commandimagelist/lch_addfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addfield.png
index b61bef308486..b61bef308486 100644
--- a/default_images/res/commandimagelist/lch_addfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addfield.png
diff --git a/default_images/res/commandimagelist/lch_addons.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addons.png
index b796aa87bffb..b796aa87bffb 100644
--- a/default_images/res/commandimagelist/lch_addons.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addons.png
diff --git a/default_images/res/commandimagelist/lch_addprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addprintarea.png
index b3f18f429214..b3f18f429214 100644
--- a/default_images/res/commandimagelist/lch_addprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addprintarea.png
diff --git a/default_images/res/commandimagelist/lch_addtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addtable.png
index ab7db8767a89..ab7db8767a89 100644
--- a/default_images/res/commandimagelist/lch_addtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addtable.png
diff --git a/default_images/res/commandimagelist/lch_addwatch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addwatch.png
index 9168ddadfe32..9168ddadfe32 100644
--- a/default_images/res/commandimagelist/lch_addwatch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_addwatch.png
diff --git a/default_images/res/commandimagelist/lch_adjust.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adjust.png
index 60765d62a11f..60765d62a11f 100644
--- a/default_images/res/commandimagelist/lch_adjust.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_adjust.png
diff --git a/default_images/res/commandimagelist/lch_advancedmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_advancedmode.png
index 5e744d549201..5e744d549201 100644
--- a/default_images/res/commandimagelist/lch_advancedmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_advancedmode.png
diff --git a/default_images/res/commandimagelist/lch_alignblock.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignblock.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/res/commandimagelist/lch_alignblock.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignblock.png
diff --git a/default_images/res/commandimagelist/lch_alignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignbottom.png
index dc4c062aee9a..dc4c062aee9a 100644
--- a/default_images/res/commandimagelist/lch_alignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignbottom.png
diff --git a/default_images/res/commandimagelist/lch_aligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligncenter.png
index d704fbc78a1b..d704fbc78a1b 100644
--- a/default_images/res/commandimagelist/lch_aligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligncenter.png
diff --git a/default_images/res/commandimagelist/lch_aligndown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligndown.png
index e335da71668f..e335da71668f 100644
--- a/default_images/res/commandimagelist/lch_aligndown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligndown.png
diff --git a/default_images/res/commandimagelist/lch_alignhorizontalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignhorizontalcenter.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/res/commandimagelist/lch_alignhorizontalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignhorizontalcenter.png
diff --git a/default_images/res/commandimagelist/lch_alignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignleft.png
index 3255d27d9f5d..3255d27d9f5d 100644
--- a/default_images/res/commandimagelist/lch_alignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignleft.png
diff --git a/default_images/res/commandimagelist/lch_alignmiddle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignmiddle.png
index 09c8ee66fb23..09c8ee66fb23 100644
--- a/default_images/res/commandimagelist/lch_alignmiddle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignmiddle.png
diff --git a/default_images/res/commandimagelist/lch_alignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignright.png
index 073da720a0c4..073da720a0c4 100644
--- a/default_images/res/commandimagelist/lch_alignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignright.png
diff --git a/default_images/res/commandimagelist/lch_aligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligntop.png
index 0f42ed488d5a..0f42ed488d5a 100644
--- a/default_images/res/commandimagelist/lch_aligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_aligntop.png
diff --git a/default_images/res/commandimagelist/lch_alignup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignup.png
index 18a41643bb8a..18a41643bb8a 100644
--- a/default_images/res/commandimagelist/lch_alignup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignup.png
diff --git a/default_images/res/commandimagelist/lch_alignvcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignvcenter.png
index 8819a2f600c3..8819a2f600c3 100644
--- a/default_images/res/commandimagelist/lch_alignvcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignvcenter.png
diff --git a/default_images/res/commandimagelist/lch_alignverticalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignverticalcenter.png
index bdb0aec78e35..bdb0aec78e35 100644
--- a/default_images/res/commandimagelist/lch_alignverticalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_alignverticalcenter.png
diff --git a/default_images/res/commandimagelist/lch_animationeffects.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationeffects.png
index a648ffe39f03..a648ffe39f03 100644
--- a/default_images/res/commandimagelist/lch_animationeffects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationeffects.png
diff --git a/default_images/res/commandimagelist/lch_animationmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationmode.png
index 80c00f64eb2c..80c00f64eb2c 100644
--- a/default_images/res/commandimagelist/lch_animationmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationmode.png
diff --git a/default_images/res/commandimagelist/lch_animationobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationobjects.png
index 7bd9a1e00749..7bd9a1e00749 100644
--- a/default_images/res/commandimagelist/lch_animationobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_animationobjects.png
diff --git a/default_images/res/commandimagelist/lch_arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arc.png
index df72303ba3fc..df72303ba3fc 100644
--- a/default_images/res/commandimagelist/lch_arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arc.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.chevron.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.chevron.png
index 65da92af332a..65da92af332a 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.chevron.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.chevron.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.circular-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.circular-arrow.png
index 1d379f47089e..1d379f47089e 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.circular-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.circular-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.corner-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.corner-right-arrow.png
index a7998944d547..a7998944d547 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.corner-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.corner-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow-callout.png
index f734924103f1..f734924103f1 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow.png
index 9f7ffd65e45b..9f7ffd65e45b 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.down-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow-callout.png
index c6c0bc2e321a..c6c0bc2e321a 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow.png
index e5505a3cdd3c..e5505a3cdd3c 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow-callout.png
index 3bb9f0924c6d..3bb9f0924c6d 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow.png
index 9256767ca060..9256767ca060 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.left-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.left-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.notched-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.notched-right-arrow.png
index ffbf31646588..ffbf31646588 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.notched-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.notched-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.pentagon-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.pentagon-right.png
index 9d660a292664..9d660a292664 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.pentagon-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.pentagon-right.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.png
index 292afd3aa9bc..292afd3aa9bc 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow-callout.png
index 0bedf016fabb..0bedf016fabb 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow.png
index 3ad11ffd7dd3..3ad11ffd7dd3 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.quad-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.quad-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow-callout.png
index 1c42e39b533b..1c42e39b533b 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow.png
index 28c09945d0c8..28c09945d0c8 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.s-sharped-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.s-sharped-arrow.png
index 336f92143dc2..336f92143dc2 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.s-sharped-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.s-sharped-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.split-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-arrow.png
index 636cb324d252..636cb324d252 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.split-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.split-round-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-round-arrow.png
index 7d643da899a5..7d643da899a5 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.split-round-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.split-round-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.striped-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.striped-right-arrow.png
index d3e639892ab2..d3e639892ab2 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.striped-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.striped-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow-callout.png
index d2ebdc5316b6..d2ebdc5316b6 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow.png
index d5748e2c3ffb..d5748e2c3ffb 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow-callout.png
index 875963d82ce6..875963d82ce6 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow.png
index a60ba6b1ad25..a60ba6b1ad25 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-down-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow-callout.png
index 59853e04413f..59853e04413f 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow.png
index 7c64cff3a611..7c64cff3a611 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowshapes.up-right-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-down-arrow.png
index 00d68f9505c4..00d68f9505c4 100644
--- a/default_images/res/commandimagelist/lch_arrowshapes.up-right-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowshapes.up-right-down-arrow.png
diff --git a/default_images/res/commandimagelist/lch_arrowstoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowstoolbox.png
index a888e9ffece5..a888e9ffece5 100644
--- a/default_images/res/commandimagelist/lch_arrowstoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_arrowstoolbox.png
diff --git a/default_images/res/commandimagelist/lch_assignlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_assignlayout.png
index 7d44d073fb7f..7d44d073fb7f 100644
--- a/default_images/res/commandimagelist/lch_assignlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_assignlayout.png
diff --git a/default_images/res/commandimagelist/lch_autocontrolfocus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autocontrolfocus.png
index c54d2c9cc67b..c54d2c9cc67b 100644
--- a/default_images/res/commandimagelist/lch_autocontrolfocus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autocontrolfocus.png
diff --git a/default_images/res/commandimagelist/lch_autofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autofilter.png
index ff537b8f29bc..ff537b8f29bc 100644
--- a/default_images/res/commandimagelist/lch_autofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autofilter.png
diff --git a/default_images/res/commandimagelist/lch_autoformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autoformat.png
index d0f74d1ca7b1..d0f74d1ca7b1 100644
--- a/default_images/res/commandimagelist/lch_autoformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autoformat.png
diff --git a/default_images/res/commandimagelist/lch_autosum.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autosum.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/default_images/res/commandimagelist/lch_autosum.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_autosum.png
diff --git a/default_images/res/commandimagelist/lch_avmediaplayer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_avmediaplayer.png
index ba5dba91e5f2..ba5dba91e5f2 100644
--- a/default_images/res/commandimagelist/lch_avmediaplayer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_avmediaplayer.png
diff --git a/default_images/res/commandimagelist/lch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backcolor.png
index db7d70e49a8a..db7d70e49a8a 100644
--- a/default_images/res/commandimagelist/lch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backcolor.png
diff --git a/default_images/res/commandimagelist/lch_backgroundcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundcolor.png
index 4c2a060edf9d..4c2a060edf9d 100644
--- a/default_images/res/commandimagelist/lch_backgroundcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundcolor.png
diff --git a/default_images/res/commandimagelist/lch_backgroundpatterncontroller.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundpatterncontroller.png
index dac8d103c718..dac8d103c718 100644
--- a/default_images/res/commandimagelist/lch_backgroundpatterncontroller.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backgroundpatterncontroller.png
diff --git a/default_images/res/commandimagelist/lch_backward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backward.png
index dc258a06cf03..dc258a06cf03 100644
--- a/default_images/res/commandimagelist/lch_backward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_backward.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.block-arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.block-arc.png
index 21246d203356..21246d203356 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.block-arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.block-arc.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.can.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.can.png
index 049dfe53e5cc..049dfe53e5cc 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.can.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.can.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.circle-pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle-pie.png
index f05d5e1fa7da..f05d5e1fa7da 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.circle-pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle-pie.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle.png
index fd45d89c97b1..fd45d89c97b1 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.circle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.cross.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cross.png
index babf252ae07e..babf252ae07e 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.cross.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cross.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cube.png
index a52e949d13ec..a52e949d13ec 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.cube.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.diamond.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.diamond.png
index 8d98f158ad58..8d98f158ad58 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.diamond.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.diamond.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ellipse.png
index 339022f0266d..339022f0266d 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ellipse.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.frame.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.frame.png
index dcb68144e2d0..dcb68144e2d0 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.frame.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.frame.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.hexagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.hexagon.png
index 1ae3b43e66b7..1ae3b43e66b7 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.hexagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.hexagon.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.isosceles-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.isosceles-triangle.png
index d81d97275dea..d81d97275dea 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.isosceles-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.isosceles-triangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.octagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.octagon.png
index 2e16ce014052..2e16ce014052 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.octagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.octagon.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.paper.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.paper.png
index 6996258d5631..6996258d5631 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.paper.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.paper.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.parallelogram.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.parallelogram.png
index a4f4df01ca51..a4f4df01ca51 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.parallelogram.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.parallelogram.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.pentagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.pentagon.png
index 88a7f996e0c9..88a7f996e0c9 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.pentagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.pentagon.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.png
index 745cea617c9c..745cea617c9c 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.quadrat.png
index 57b939d774cb..57b939d774cb 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.quadrat.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.rectangle.png
index 6c4541bb8158..6c4541bb8158 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.rectangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.right-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.right-triangle.png
index db7f3881ab43..db7f3881ab43 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.right-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.right-triangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.ring.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ring.png
index 29446916708c..29446916708c 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.ring.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.ring.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.round-quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-quadrat.png
index a47fece69185..a47fece69185 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.round-quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-quadrat.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.round-rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-rectangle.png
index 936f6870bfbd..936f6870bfbd 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.round-rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.round-rectangle.png
diff --git a/default_images/res/commandimagelist/lch_basicshapes.trapezoid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.trapezoid.png
index 506f0b57fae8..506f0b57fae8 100644
--- a/default_images/res/commandimagelist/lch_basicshapes.trapezoid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicshapes.trapezoid.png
diff --git a/default_images/res/commandimagelist/lch_basicstepinto.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepinto.png
index 3b7a9147362d..3b7a9147362d 100644
--- a/default_images/res/commandimagelist/lch_basicstepinto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepinto.png
diff --git a/default_images/res/commandimagelist/lch_basicstepout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepout.png
index c8287ae2a57a..c8287ae2a57a 100644
--- a/default_images/res/commandimagelist/lch_basicstepout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepout.png
diff --git a/default_images/res/commandimagelist/lch_basicstepover.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepover.png
index d114c8efb980..d114c8efb980 100644
--- a/default_images/res/commandimagelist/lch_basicstepover.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstepover.png
diff --git a/default_images/res/commandimagelist/lch_basicstop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstop.png
index b3bb2ee303ce..b3bb2ee303ce 100644
--- a/default_images/res/commandimagelist/lch_basicstop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_basicstop.png
diff --git a/default_images/res/commandimagelist/lch_beamer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beamer.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_beamer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beamer.png
diff --git a/default_images/res/commandimagelist/lch_beforeobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beforeobject.png
index a9d59209b654..a9d59209b654 100644
--- a/default_images/res/commandimagelist/lch_beforeobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beforeobject.png
diff --git a/default_images/res/commandimagelist/lch_behindobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_behindobject.png
index 509e88deb0e1..509e88deb0e1 100644
--- a/default_images/res/commandimagelist/lch_behindobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_behindobject.png
diff --git a/default_images/res/commandimagelist/lch_bezier_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezier_unfilled.png
index c17481720c0d..c17481720c0d 100644
--- a/default_images/res/commandimagelist/lch_bezier_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezier_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_bezierappend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierappend.png
index 29f081ad3b15..29f081ad3b15 100644
--- a/default_images/res/commandimagelist/lch_bezierappend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierappend.png
diff --git a/default_images/res/commandimagelist/lch_bezierclose.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierclose.png
index d5a5ae46a803..d5a5ae46a803 100644
--- a/default_images/res/commandimagelist/lch_bezierclose.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierclose.png
diff --git a/default_images/res/commandimagelist/lch_bezierconvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierconvert.png
index 83362daff6ea..83362daff6ea 100644
--- a/default_images/res/commandimagelist/lch_bezierconvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierconvert.png
diff --git a/default_images/res/commandimagelist/lch_beziercutline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziercutline.png
index 89e3d5d708ef..89e3d5d708ef 100644
--- a/default_images/res/commandimagelist/lch_beziercutline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziercutline.png
diff --git a/default_images/res/commandimagelist/lch_bezierdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierdelete.png
index 1ad2cce4cb1d..1ad2cce4cb1d 100644
--- a/default_images/res/commandimagelist/lch_bezierdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierdelete.png
diff --git a/default_images/res/commandimagelist/lch_bezieredge.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezieredge.png
index a88c28485436..a88c28485436 100644
--- a/default_images/res/commandimagelist/lch_bezieredge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezieredge.png
diff --git a/default_images/res/commandimagelist/lch_beziereliminatepoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziereliminatepoints.png
index e00a7bd80e0a..e00a7bd80e0a 100644
--- a/default_images/res/commandimagelist/lch_beziereliminatepoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziereliminatepoints.png
diff --git a/default_images/res/commandimagelist/lch_bezierfill.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierfill.png
index 351ea223c506..351ea223c506 100644
--- a/default_images/res/commandimagelist/lch_bezierfill.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierfill.png
diff --git a/default_images/res/commandimagelist/lch_bezierinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierinsert.png
index 771f08e74c1e..771f08e74c1e 100644
--- a/default_images/res/commandimagelist/lch_bezierinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bezierinsert.png
diff --git a/default_images/res/commandimagelist/lch_beziermove.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziermove.png
index 90f812966a75..90f812966a75 100644
--- a/default_images/res/commandimagelist/lch_beziermove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziermove.png
diff --git a/default_images/res/commandimagelist/lch_beziersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersmooth.png
index 2d6ae4a05c8c..2d6ae4a05c8c 100644
--- a/default_images/res/commandimagelist/lch_beziersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersmooth.png
diff --git a/default_images/res/commandimagelist/lch_beziersymmetric.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersymmetric.png
index c0468acf36da..c0468acf36da 100644
--- a/default_images/res/commandimagelist/lch_beziersymmetric.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_beziersymmetric.png
diff --git a/default_images/res/commandimagelist/lch_bighandles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bighandles.png
index 5878ddf58108..5878ddf58108 100644
--- a/default_images/res/commandimagelist/lch_bighandles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bighandles.png
diff --git a/default_images/res/commandimagelist/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bold.png
index 92ef42be506e..92ef42be506e 100644
--- a/default_images/res/commandimagelist/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bold.png
diff --git a/default_images/res/commandimagelist/lch_borderdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_borderdialog.png
index a61a1a6c31a1..a61a1a6c31a1 100644
--- a/default_images/res/commandimagelist/lch_borderdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_borderdialog.png
diff --git a/default_images/res/commandimagelist/lch_bringtofront.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bringtofront.png
index f85c8b0fc09c..f85c8b0fc09c 100644
--- a/default_images/res/commandimagelist/lch_bringtofront.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bringtofront.png
diff --git a/default_images/res/commandimagelist/lch_browsebackward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browsebackward.png
index cad310a8f935..cad310a8f935 100644
--- a/default_images/res/commandimagelist/lch_browsebackward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browsebackward.png
diff --git a/default_images/res/commandimagelist/lch_browseforward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseforward.png
index 864d2eca03e1..864d2eca03e1 100644
--- a/default_images/res/commandimagelist/lch_browseforward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseforward.png
diff --git a/default_images/res/commandimagelist/lch_browseview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseview.png
index a31c6f55ccd7..a31c6f55ccd7 100644
--- a/default_images/res/commandimagelist/lch_browseview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_browseview.png
diff --git a/default_images/res/commandimagelist/lch_bullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bullet.png
index b623084be13b..b623084be13b 100644
--- a/default_images/res/commandimagelist/lch_bullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bullet.png
diff --git a/default_images/res/commandimagelist/lch_bulletsandnumberingdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bulletsandnumberingdialog.png
index 9c494e085a12..9c494e085a12 100644
--- a/default_images/res/commandimagelist/lch_bulletsandnumberingdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_bulletsandnumberingdialog.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.cloud-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.cloud-callout.png
index 10ea55d4986c..10ea55d4986c 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.cloud-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.cloud-callout.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-1.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-1.png
index 71119ae4a29d..71119ae4a29d 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-1.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-2.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-2.png
index 68994751c3a2..68994751c3a2 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-2.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-3.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-3.png
index f6e2c8c657ba..f6e2c8c657ba 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.line-callout-3.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.line-callout-3.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.png
index c867739ff35a..c867739ff35a 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.rectangular-callout.png
index 4fc62cf9a003..4fc62cf9a003 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.rectangular-callout.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.round-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-callout.png
index 9be7405247a6..9be7405247a6 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.round-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-callout.png
diff --git a/default_images/res/commandimagelist/lch_calloutshapes.round-rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-rectangular-callout.png
index 3d052a208be7..3d052a208be7 100644
--- a/default_images/res/commandimagelist/lch_calloutshapes.round-rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_calloutshapes.round-rectangular-callout.png
diff --git a/default_images/res/commandimagelist/lch_cellvertbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertbottom.png
index c65a0c27f92f..c65a0c27f92f 100644
--- a/default_images/res/commandimagelist/lch_cellvertbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertbottom.png
diff --git a/default_images/res/commandimagelist/lch_cellvertcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertcenter.png
index 97cc840234ad..97cc840234ad 100644
--- a/default_images/res/commandimagelist/lch_cellvertcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellvertcenter.png
diff --git a/default_images/res/commandimagelist/lch_cellverttop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellverttop.png
index 09c227ab214c..09c227ab214c 100644
--- a/default_images/res/commandimagelist/lch_cellverttop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cellverttop.png
diff --git a/default_images/res/commandimagelist/lch_centerpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_centerpara.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/res/commandimagelist/lch_centerpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_centerpara.png
diff --git a/default_images/res/commandimagelist/lch_chainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_chainframes.png
index f3187ac313aa..f3187ac313aa 100644
--- a/default_images/res/commandimagelist/lch_chainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_chainframes.png
diff --git a/default_images/res/commandimagelist/lch_changebezier.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changebezier.png
index c6b53aa17713..c6b53aa17713 100644
--- a/default_images/res/commandimagelist/lch_changebezier.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changebezier.png
diff --git a/default_images/res/commandimagelist/lch_changepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changepolygon.png
index fc0c1c3d2b09..fc0c1c3d2b09 100644
--- a/default_images/res/commandimagelist/lch_changepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_changepolygon.png
diff --git a/default_images/res/commandimagelist/lch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_charfontname.png
index 1e03a937e2fd..1e03a937e2fd 100644
--- a/default_images/res/commandimagelist/lch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_charfontname.png
diff --git a/default_images/res/commandimagelist/lch_checkbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_checkbox.png
index 3181e294fcbb..3181e294fcbb 100644
--- a/default_images/res/commandimagelist/lch_checkbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_checkbox.png
diff --git a/default_images/res/commandimagelist/lch_choosecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosecontrols.png
index 5d048b2f7760..5d048b2f7760 100644
--- a/default_images/res/commandimagelist/lch_choosecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosecontrols.png
diff --git a/default_images/res/commandimagelist/lch_choosedesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosedesign.png
index a03ec5b33d64..a03ec5b33d64 100644
--- a/default_images/res/commandimagelist/lch_choosedesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosedesign.png
diff --git a/default_images/res/commandimagelist/lch_choosemacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosemacro.png
index fe2ddee47d4e..fe2ddee47d4e 100644
--- a/default_images/res/commandimagelist/lch_choosemacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosemacro.png
diff --git a/default_images/res/commandimagelist/lch_choosepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosepolygon.png
index adb6a521cfb3..adb6a521cfb3 100644
--- a/default_images/res/commandimagelist/lch_choosepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_choosepolygon.png
diff --git a/default_images/res/commandimagelist/lch_circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle.png
index fd45d89c97b1..fd45d89c97b1 100644
--- a/default_images/res/commandimagelist/lch_circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle.png
diff --git a/default_images/res/commandimagelist/lch_circle_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle_unfilled.png
index 45b2ba1a131e..45b2ba1a131e 100644
--- a/default_images/res/commandimagelist/lch_circle_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circle_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_circlearc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlearc.png
index 9eef7cdc4dcd..9eef7cdc4dcd 100644
--- a/default_images/res/commandimagelist/lch_circlearc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlearc.png
diff --git a/default_images/res/commandimagelist/lch_circlecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut.png
index d1851fe3722f..d1851fe3722f 100644
--- a/default_images/res/commandimagelist/lch_circlecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut.png
diff --git a/default_images/res/commandimagelist/lch_circlecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut_unfilled.png
index 90f80a6b548c..90f80a6b548c 100644
--- a/default_images/res/commandimagelist/lch_circlecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlecut_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_circlepie.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie.png
index 82c756f7fbe8..82c756f7fbe8 100644
--- a/default_images/res/commandimagelist/lch_circlepie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie.png
diff --git a/default_images/res/commandimagelist/lch_circlepie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie_unfilled.png
index a931bebdfee4..a931bebdfee4 100644
--- a/default_images/res/commandimagelist/lch_circlepie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_circlepie_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_clickchangerotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_clickchangerotation.png
index b4f6cc0ab933..b4f6cc0ab933 100644
--- a/default_images/res/commandimagelist/lch_clickchangerotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_clickchangerotation.png
diff --git a/default_images/res/commandimagelist/lch_closedoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedoc.png
index d77a1a5dd715..d77a1a5dd715 100644
--- a/default_images/res/commandimagelist/lch_closedoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedoc.png
diff --git a/default_images/res/commandimagelist/lch_closedocs.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedocs.png
index 8d2034ac9807..8d2034ac9807 100644
--- a/default_images/res/commandimagelist/lch_closedocs.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closedocs.png
diff --git a/default_images/res/commandimagelist/lch_closemasterview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closemasterview.png
index 1ee2960e4905..1ee2960e4905 100644
--- a/default_images/res/commandimagelist/lch_closemasterview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closemasterview.png
diff --git a/default_images/res/commandimagelist/lch_closewin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closewin.png
index 729f4b8a27af..729f4b8a27af 100644
--- a/default_images/res/commandimagelist/lch_closewin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_closewin.png
diff --git a/default_images/res/commandimagelist/lch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_color.png
index eef3cac46a78..eef3cac46a78 100644
--- a/default_images/res/commandimagelist/lch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_color.png
diff --git a/default_images/res/commandimagelist/lch_colorsettings.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorsettings.png
index 03cacfecac9d..03cacfecac9d 100644
--- a/default_images/res/commandimagelist/lch_colorsettings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorsettings.png
diff --git a/default_images/res/commandimagelist/lch_colorview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorview.png
index e03250e07ca7..e03250e07ca7 100644
--- a/default_images/res/commandimagelist/lch_colorview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_colorview.png
diff --git a/default_images/res/commandimagelist/lch_combobox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_combobox.png
index 43170c65296b..43170c65296b 100644
--- a/default_images/res/commandimagelist/lch_combobox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_combobox.png
diff --git a/default_images/res/commandimagelist/lch_commontaskbarvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_commontaskbarvisible.png
index d4b679eb70bd..d4b679eb70bd 100644
--- a/default_images/res/commandimagelist/lch_commontaskbarvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_commontaskbarvisible.png
diff --git a/default_images/res/commandimagelist/lch_compilebasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_compilebasic.png
index 76232e45cc19..76232e45cc19 100644
--- a/default_images/res/commandimagelist/lch_compilebasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_compilebasic.png
diff --git a/default_images/res/commandimagelist/lch_cone.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cone.png
index 56a38fb2b40b..56a38fb2b40b 100644
--- a/default_images/res/commandimagelist/lch_cone.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cone.png
diff --git a/default_images/res/commandimagelist/lch_config.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_config.png
index f6b7b1c8d1c9..f6b7b1c8d1c9 100644
--- a/default_images/res/commandimagelist/lch_config.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_config.png
diff --git a/default_images/res/commandimagelist/lch_connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connector.png
index ba27f51d4dea..ba27f51d4dea 100644
--- a/default_images/res/commandimagelist/lch_connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connector.png
diff --git a/default_images/res/commandimagelist/lch_connectorarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowend.png
index 8954d6bf3c78..8954d6bf3c78 100644
--- a/default_images/res/commandimagelist/lch_connectorarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrows.png
index 4daa1da43c55..4daa1da43c55 100644
--- a/default_images/res/commandimagelist/lch_connectorarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowstart.png
index 887690ebfea7..887690ebfea7 100644
--- a/default_images/res/commandimagelist/lch_connectorarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorarrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorcircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircleend.png
index 602dc3cefadb..602dc3cefadb 100644
--- a/default_images/res/commandimagelist/lch_connectorcircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorcircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircles.png
index fbd84ac513c2..fbd84ac513c2 100644
--- a/default_images/res/commandimagelist/lch_connectorcircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorcirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcirclestart.png
index daba21b2b827..daba21b2b827 100644
--- a/default_images/res/commandimagelist/lch_connectorcirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurve.png
index e8a3136016e5..e8a3136016e5 100644
--- a/default_images/res/commandimagelist/lch_connectorcurve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurve.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowend.png
index b718b01084ba..b718b01084ba 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrows.png
index d8408015f2c3..d8408015f2c3 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowstart.png
index 27ca6e6a135d..27ca6e6a135d 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvearrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircleend.png
index 8f0bbd85b266..8f0bbd85b266 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircles.png
index b35ab306ff9d..b35ab306ff9d 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorcurvecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecirclestart.png
index 965d2feca920..965d2feca920 100644
--- a/default_images/res/commandimagelist/lch_connectorcurvecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorcurvecirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectorline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorline.png
index c98111ce9ef0..c98111ce9ef0 100644
--- a/default_images/res/commandimagelist/lch_connectorline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorline.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowend.png
index b306c62e140e..b306c62e140e 100644
--- a/default_images/res/commandimagelist/lch_connectorlinearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrows.png
index c3d35e90a31b..c3d35e90a31b 100644
--- a/default_images/res/commandimagelist/lch_connectorlinearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowstart.png
index e2523c86adeb..e2523c86adeb 100644
--- a/default_images/res/commandimagelist/lch_connectorlinearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinearrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircleend.png
index 481a784f04a5..481a784f04a5 100644
--- a/default_images/res/commandimagelist/lch_connectorlinecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircles.png
index 7d631133b200..7d631133b200 100644
--- a/default_images/res/commandimagelist/lch_connectorlinecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecirclestart.png
index 9f6a6955b8f6..9f6a6955b8f6 100644
--- a/default_images/res/commandimagelist/lch_connectorlinecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinecirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectorlines.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlines.png
index 74269f4be36f..74269f4be36f 100644
--- a/default_images/res/commandimagelist/lch_connectorlines.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlines.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinesarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowend.png
index fd3b01a5067a..fd3b01a5067a 100644
--- a/default_images/res/commandimagelist/lch_connectorlinesarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinesarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrows.png
index 6255d030c5b1..6255d030c5b1 100644
--- a/default_images/res/commandimagelist/lch_connectorlinesarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrows.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinesarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowstart.png
index c64c67c145ca..c64c67c145ca 100644
--- a/default_images/res/commandimagelist/lch_connectorlinesarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinesarrowstart.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinescircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircleend.png
index 593fdf3e9b33..593fdf3e9b33 100644
--- a/default_images/res/commandimagelist/lch_connectorlinescircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircleend.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinescircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircles.png
index 270deb51a29f..270deb51a29f 100644
--- a/default_images/res/commandimagelist/lch_connectorlinescircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescircles.png
diff --git a/default_images/res/commandimagelist/lch_connectorlinescirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescirclestart.png
index 181000d9c1d8..181000d9c1d8 100644
--- a/default_images/res/commandimagelist/lch_connectorlinescirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectorlinescirclestart.png
diff --git a/default_images/res/commandimagelist/lch_connectortoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectortoolbox.png
index 89a61220f8a1..89a61220f8a1 100644
--- a/default_images/res/commandimagelist/lch_connectortoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_connectortoolbox.png
diff --git a/default_images/res/commandimagelist/lch_contourdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_contourdialog.png
index 12002e9bd0cf..12002e9bd0cf 100644
--- a/default_images/res/commandimagelist/lch_contourdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_contourdialog.png
diff --git a/default_images/res/commandimagelist/lch_controlcodes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlcodes.png
index 0b22d94f6a3d..0b22d94f6a3d 100644
--- a/default_images/res/commandimagelist/lch_controlcodes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlcodes.png
diff --git a/default_images/res/commandimagelist/lch_controlproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlproperties.png
index 60f59cfa22e3..60f59cfa22e3 100644
--- a/default_images/res/commandimagelist/lch_controlproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_controlproperties.png
diff --git a/default_images/res/commandimagelist/lch_convertinto3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3d.png
index cc207f7159d4..cc207f7159d4 100644
--- a/default_images/res/commandimagelist/lch_convertinto3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3d.png
diff --git a/default_images/res/commandimagelist/lch_convertinto3dlathe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathe.png
index bf35697ac4cf..bf35697ac4cf 100644
--- a/default_images/res/commandimagelist/lch_convertinto3dlathe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathe.png
diff --git a/default_images/res/commandimagelist/lch_convertinto3dlathefast.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathefast.png
index 77ea553af9ed..77ea553af9ed 100644
--- a/default_images/res/commandimagelist/lch_convertinto3dlathefast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_convertinto3dlathefast.png
diff --git a/default_images/res/commandimagelist/lch_copy.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_copy.png
index bc8d1125b7a9..bc8d1125b7a9 100644
--- a/default_images/res/commandimagelist/lch_copy.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_copy.png
diff --git a/default_images/res/commandimagelist/lch_countall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_countall.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_countall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_countall.png
diff --git a/default_images/res/commandimagelist/lch_crookrotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookrotate.png
index 0c9bda38f234..0c9bda38f234 100644
--- a/default_images/res/commandimagelist/lch_crookrotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookrotate.png
diff --git a/default_images/res/commandimagelist/lch_crookslant.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookslant.png
index 3b40fbee4385..3b40fbee4385 100644
--- a/default_images/res/commandimagelist/lch_crookslant.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crookslant.png
diff --git a/default_images/res/commandimagelist/lch_crop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crop.png
index 371e995fedd9..371e995fedd9 100644
--- a/default_images/res/commandimagelist/lch_crop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_crop.png
diff --git a/default_images/res/commandimagelist/lch_cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cube.png
index 87fc3c0717e4..87fc3c0717e4 100644
--- a/default_images/res/commandimagelist/lch_cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cube.png
diff --git a/default_images/res/commandimagelist/lch_currencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_currencyfield.png
index 3d6e2d82ff28..3d6e2d82ff28 100644
--- a/default_images/res/commandimagelist/lch_currencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_currencyfield.png
diff --git a/default_images/res/commandimagelist/lch_customanimation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_customanimation.png
index 72b51b625068..72b51b625068 100644
--- a/default_images/res/commandimagelist/lch_customanimation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_customanimation.png
diff --git a/default_images/res/commandimagelist/lch_cut.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cut.png
index 371f078d4d95..371f078d4d95 100644
--- a/default_images/res/commandimagelist/lch_cut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cut.png
diff --git a/default_images/res/commandimagelist/lch_cylinder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cylinder.png
index 93f15bea4090..93f15bea4090 100644
--- a/default_images/res/commandimagelist/lch_cylinder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cylinder.png
diff --git a/default_images/res/commandimagelist/lch_cyramid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cyramid.png
index c7067c277794..c7067c277794 100644
--- a/default_images/res/commandimagelist/lch_cyramid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_cyramid.png
diff --git a/default_images/res/commandimagelist/lch_datadatapilotrun.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datadatapilotrun.png
index 187a465a1419..187a465a1419 100644
--- a/default_images/res/commandimagelist/lch_datadatapilotrun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datadatapilotrun.png
diff --git a/default_images/res/commandimagelist/lch_datafilterautofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterautofilter.png
index 5016b2619f5d..5016b2619f5d 100644
--- a/default_images/res/commandimagelist/lch_datafilterautofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterautofilter.png
diff --git a/default_images/res/commandimagelist/lch_datafilterspecialfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterspecialfilter.png
index a26bfac24edc..a26bfac24edc 100644
--- a/default_images/res/commandimagelist/lch_datafilterspecialfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterspecialfilter.png
diff --git a/default_images/res/commandimagelist/lch_datafilterstandardfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterstandardfilter.png
index 7fd4a23b55fd..7fd4a23b55fd 100644
--- a/default_images/res/commandimagelist/lch_datafilterstandardfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datafilterstandardfilter.png
diff --git a/default_images/res/commandimagelist/lch_dataimport.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataimport.png
index 84ad2e7a9209..84ad2e7a9209 100644
--- a/default_images/res/commandimagelist/lch_dataimport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataimport.png
diff --git a/default_images/res/commandimagelist/lch_dataincolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataincolumns.png
index 40c53d75a207..40c53d75a207 100644
--- a/default_images/res/commandimagelist/lch_dataincolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dataincolumns.png
diff --git a/default_images/res/commandimagelist/lch_datainrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datainrows.png
index 8d2cecbf6a45..8d2cecbf6a45 100644
--- a/default_images/res/commandimagelist/lch_datainrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datainrows.png
diff --git a/default_images/res/commandimagelist/lch_datefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datefield.png
index 22b29e58eabb..22b29e58eabb 100644
--- a/default_images/res/commandimagelist/lch_datefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_datefield.png
diff --git a/default_images/res/commandimagelist/lch_dbaddrelation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbaddrelation.png
index 50f6d8887729..50f6d8887729 100644
--- a/default_images/res/commandimagelist/lch_dbaddrelation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbaddrelation.png
diff --git a/default_images/res/commandimagelist/lch_dbchangedesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbchangedesignmode.png
index 47ed9b103d80..47ed9b103d80 100644
--- a/default_images/res/commandimagelist/lch_dbchangedesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbchangedesignmode.png
diff --git a/default_images/res/commandimagelist/lch_dbclearquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbclearquery.png
index b71d22fe52d1..b71d22fe52d1 100644
--- a/default_images/res/commandimagelist/lch_dbclearquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbclearquery.png
diff --git a/default_images/res/commandimagelist/lch_dbdistinctvalues.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbdistinctvalues.png
index 749727d71392..749727d71392 100644
--- a/default_images/res/commandimagelist/lch_dbdistinctvalues.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbdistinctvalues.png
diff --git a/default_images/res/commandimagelist/lch_dbformdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformdelete.png
index 0dc90e6c6615..0dc90e6c6615 100644
--- a/default_images/res/commandimagelist/lch_dbformdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformdelete.png
diff --git a/default_images/res/commandimagelist/lch_dbformedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformedit.png
index 7217a43f7d70..7217a43f7d70 100644
--- a/default_images/res/commandimagelist/lch_dbformedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformedit.png
diff --git a/default_images/res/commandimagelist/lch_dbformopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformopen.png
index d3a80c4dfc67..d3a80c4dfc67 100644
--- a/default_images/res/commandimagelist/lch_dbformopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformopen.png
diff --git a/default_images/res/commandimagelist/lch_dbformrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformrename.png
index d7d679882db0..d7d679882db0 100644
--- a/default_images/res/commandimagelist/lch_dbformrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbformrename.png
diff --git a/default_images/res/commandimagelist/lch_dbindexdesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbindexdesign.png
index 7d5bf64f3b80..7d5bf64f3b80 100644
--- a/default_images/res/commandimagelist/lch_dbindexdesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbindexdesign.png
diff --git a/default_images/res/commandimagelist/lch_dbnewform.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewform.png
index 06ef2579fb80..06ef2579fb80 100644
--- a/default_images/res/commandimagelist/lch_dbnewform.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewform.png
diff --git a/default_images/res/commandimagelist/lch_dbnewformautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewformautopilot.png
index a3f5c7824ae2..a3f5c7824ae2 100644
--- a/default_images/res/commandimagelist/lch_dbnewformautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewformautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquery.png
index b42f9f144ae0..b42f9f144ae0 100644
--- a/default_images/res/commandimagelist/lch_dbnewquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquery.png
diff --git a/default_images/res/commandimagelist/lch_dbnewqueryautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewqueryautopilot.png
index 6c38c3b56248..6c38c3b56248 100644
--- a/default_images/res/commandimagelist/lch_dbnewqueryautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewqueryautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewquerysql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquerysql.png
index cc9e2b5c217f..cc9e2b5c217f 100644
--- a/default_images/res/commandimagelist/lch_dbnewquerysql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewquerysql.png
diff --git a/default_images/res/commandimagelist/lch_dbnewreport.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreport.png
index 1fbb86e67cd6..1fbb86e67cd6 100644
--- a/default_images/res/commandimagelist/lch_dbnewreport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreport.png
diff --git a/default_images/res/commandimagelist/lch_dbnewreportautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreportautopilot.png
index b0fbb1a7b6d1..b0fbb1a7b6d1 100644
--- a/default_images/res/commandimagelist/lch_dbnewreportautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewreportautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtable.png
index d2baa8ae2e27..d2baa8ae2e27 100644
--- a/default_images/res/commandimagelist/lch_dbnewtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtable.png
diff --git a/default_images/res/commandimagelist/lch_dbnewtableautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtableautopilot.png
index f1f1a400c849..f1f1a400c849 100644
--- a/default_images/res/commandimagelist/lch_dbnewtableautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewtableautopilot.png
diff --git a/default_images/res/commandimagelist/lch_dbnewview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewview.png
index ad19e9e2db12..ad19e9e2db12 100644
--- a/default_images/res/commandimagelist/lch_dbnewview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewview.png
diff --git a/default_images/res/commandimagelist/lch_dbnewviewsql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewviewsql.png
index 554856004c50..554856004c50 100644
--- a/default_images/res/commandimagelist/lch_dbnewviewsql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbnewviewsql.png
diff --git a/default_images/res/commandimagelist/lch_dbquerydelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbquerydelete.png
index de0640410c2b..de0640410c2b 100644
--- a/default_images/res/commandimagelist/lch_dbquerydelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbquerydelete.png
diff --git a/default_images/res/commandimagelist/lch_dbqueryedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryedit.png
index 67516e48708f..67516e48708f 100644
--- a/default_images/res/commandimagelist/lch_dbqueryedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryedit.png
diff --git a/default_images/res/commandimagelist/lch_dbqueryopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryopen.png
index 9aabafeb0d42..9aabafeb0d42 100644
--- a/default_images/res/commandimagelist/lch_dbqueryopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryopen.png
diff --git a/default_images/res/commandimagelist/lch_dbqueryrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryrename.png
index 92befa836b7d..92befa836b7d 100644
--- a/default_images/res/commandimagelist/lch_dbqueryrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbqueryrename.png
diff --git a/default_images/res/commandimagelist/lch_dbreportdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportdelete.png
index ddd03cecbfc1..ddd03cecbfc1 100644
--- a/default_images/res/commandimagelist/lch_dbreportdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportdelete.png
diff --git a/default_images/res/commandimagelist/lch_dbreportedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportedit.png
index add76b8d809b..add76b8d809b 100644
--- a/default_images/res/commandimagelist/lch_dbreportedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportedit.png
diff --git a/default_images/res/commandimagelist/lch_dbreportopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportopen.png
index 66ae12f142a9..66ae12f142a9 100644
--- a/default_images/res/commandimagelist/lch_dbreportopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportopen.png
diff --git a/default_images/res/commandimagelist/lch_dbreportrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportrename.png
index 3b8066eb8143..3b8066eb8143 100644
--- a/default_images/res/commandimagelist/lch_dbreportrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbreportrename.png
diff --git a/default_images/res/commandimagelist/lch_dbsortingandgrouping.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbsortingandgrouping.png
index c0a046315f7d..c0a046315f7d 100644
--- a/default_images/res/commandimagelist/lch_dbsortingandgrouping.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbsortingandgrouping.png
diff --git a/default_images/res/commandimagelist/lch_dbtabledelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtabledelete.png
index 17846d3fd1c3..17846d3fd1c3 100644
--- a/default_images/res/commandimagelist/lch_dbtabledelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtabledelete.png
diff --git a/default_images/res/commandimagelist/lch_dbtableedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableedit.png
index b70fbcf2c3da..b70fbcf2c3da 100644
--- a/default_images/res/commandimagelist/lch_dbtableedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableedit.png
diff --git a/default_images/res/commandimagelist/lch_dbtableopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableopen.png
index b7fa2cdd38f7..b7fa2cdd38f7 100644
--- a/default_images/res/commandimagelist/lch_dbtableopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtableopen.png
diff --git a/default_images/res/commandimagelist/lch_dbtablerename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtablerename.png
index 3199adecd451..3199adecd451 100644
--- a/default_images/res/commandimagelist/lch_dbtablerename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbtablerename.png
diff --git a/default_images/res/commandimagelist/lch_dbviewaliases.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewaliases.png
index 834c58547da0..834c58547da0 100644
--- a/default_images/res/commandimagelist/lch_dbviewaliases.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewaliases.png
diff --git a/default_images/res/commandimagelist/lch_dbviewfunctions.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewfunctions.png
index b7e6c2486928..b7e6c2486928 100644
--- a/default_images/res/commandimagelist/lch_dbviewfunctions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewfunctions.png
diff --git a/default_images/res/commandimagelist/lch_dbviewtablenames.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewtablenames.png
index 8f4695ff1c35..8f4695ff1c35 100644
--- a/default_images/res/commandimagelist/lch_dbviewtablenames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dbviewtablenames.png
diff --git a/default_images/res/commandimagelist/lch_decrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementindent.png
index ed68849c3231..ed68849c3231 100644
--- a/default_images/res/commandimagelist/lch_decrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementindent.png
diff --git a/default_images/res/commandimagelist/lch_decrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementlevel.png
index c76b0ac6f1d2..c76b0ac6f1d2 100644
--- a/default_images/res/commandimagelist/lch_decrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementlevel.png
diff --git a/default_images/res/commandimagelist/lch_decrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementsublevels.png
index e5b9134413ff..e5b9134413ff 100644
--- a/default_images/res/commandimagelist/lch_decrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_decrementsublevels.png
diff --git a/default_images/res/commandimagelist/lch_defaultbullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultbullet.png
index 76e830f46927..76e830f46927 100644
--- a/default_images/res/commandimagelist/lch_defaultbullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultbullet.png
diff --git a/default_images/res/commandimagelist/lch_defaultnumbering.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultnumbering.png
index 50e37b50dc57..50e37b50dc57 100644
--- a/default_images/res/commandimagelist/lch_defaultnumbering.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defaultnumbering.png
diff --git a/default_images/res/commandimagelist/lch_definename.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_definename.png
index 73787f834f3c..73787f834f3c 100644
--- a/default_images/res/commandimagelist/lch_definename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_definename.png
diff --git a/default_images/res/commandimagelist/lch_defineprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defineprintarea.png
index 84c4874807d7..84c4874807d7 100644
--- a/default_images/res/commandimagelist/lch_defineprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_defineprintarea.png
diff --git a/default_images/res/commandimagelist/lch_delete.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_delete.png
index 3d54090e162b..3d54090e162b 100644
--- a/default_images/res/commandimagelist/lch_delete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_delete.png
diff --git a/default_images/res/commandimagelist/lch_deleteallannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteallannotation.png
index 304788e8276c..304788e8276c 100644
--- a/default_images/res/commandimagelist/lch_deleteallannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteallannotation.png
diff --git a/default_images/res/commandimagelist/lch_deleteannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteannotation.png
index 83fe46f9f24f..83fe46f9f24f 100644
--- a/default_images/res/commandimagelist/lch_deleteannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteannotation.png
diff --git a/default_images/res/commandimagelist/lch_deletecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletecolumns.png
index 4f4d8904f690..4f4d8904f690 100644
--- a/default_images/res/commandimagelist/lch_deletecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletecolumns.png
diff --git a/default_images/res/commandimagelist/lch_deletemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletemasterpage.png
index d7c872e2da72..d7c872e2da72 100644
--- a/default_images/res/commandimagelist/lch_deletemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deletemasterpage.png
diff --git a/default_images/res/commandimagelist/lch_deleteprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteprintarea.png
index 2d39b874f9c7..2d39b874f9c7 100644
--- a/default_images/res/commandimagelist/lch_deleteprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleteprintarea.png
diff --git a/default_images/res/commandimagelist/lch_deleterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterecord.png
index a01f0d265056..a01f0d265056 100644
--- a/default_images/res/commandimagelist/lch_deleterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterecord.png
diff --git a/default_images/res/commandimagelist/lch_deleterows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterows.png
index 30f391679e7e..30f391679e7e 100644
--- a/default_images/res/commandimagelist/lch_deleterows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_deleterows.png
diff --git a/default_images/res/commandimagelist/lch_designerdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_designerdialog.png
index 6ad322e4ae7d..6ad322e4ae7d 100644
--- a/default_images/res/commandimagelist/lch_designerdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_designerdialog.png
diff --git a/default_images/res/commandimagelist/lch_dia.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dia.png
index a7881199bd0b..a7881199bd0b 100644
--- a/default_images/res/commandimagelist/lch_dia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dia.png
diff --git a/default_images/res/commandimagelist/lch_diaauto.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaauto.png
index b3668c77bb30..b3668c77bb30 100644
--- a/default_images/res/commandimagelist/lch_diaauto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaauto.png
diff --git a/default_images/res/commandimagelist/lch_diaeffect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaeffect.png
index f35aa0ab6a4e..f35aa0ab6a4e 100644
--- a/default_images/res/commandimagelist/lch_diaeffect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaeffect.png
diff --git a/default_images/res/commandimagelist/lch_diagramdata.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramdata.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_diagramdata.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramdata.png
diff --git a/default_images/res/commandimagelist/lch_diagramtype.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramtype.png
index 77950fb1d1ec..77950fb1d1ec 100644
--- a/default_images/res/commandimagelist/lch_diagramtype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diagramtype.png
diff --git a/default_images/res/commandimagelist/lch_diaspeed.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaspeed.png
index 7fd9729c2158..7fd9729c2158 100644
--- a/default_images/res/commandimagelist/lch_diaspeed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diaspeed.png
diff --git a/default_images/res/commandimagelist/lch_diatime.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diatime.png
index 8a1db34fe87a..8a1db34fe87a 100644
--- a/default_images/res/commandimagelist/lch_diatime.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_diatime.png
diff --git a/default_images/res/commandimagelist/lch_distributecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributecolumns.png
index 5d191e2a5e15..5d191e2a5e15 100644
--- a/default_images/res/commandimagelist/lch_distributecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributecolumns.png
diff --git a/default_images/res/commandimagelist/lch_distributerows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributerows.png
index 22e0f2fdc105..22e0f2fdc105 100644
--- a/default_images/res/commandimagelist/lch_distributerows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_distributerows.png
diff --git a/default_images/res/commandimagelist/lch_doubleclicktextedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_doubleclicktextedit.png
index 8c0ad581558b..8c0ad581558b 100644
--- a/default_images/res/commandimagelist/lch_doubleclicktextedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_doubleclicktextedit.png
diff --git a/default_images/res/commandimagelist/lch_downsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_downsearch.png
index 4b46e46d4c63..4b46e46d4c63 100644
--- a/default_images/res/commandimagelist/lch_downsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_downsearch.png
diff --git a/default_images/res/commandimagelist/lch_draw.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_draw.png
index 5e991f6d5511..5e991f6d5511 100644
--- a/default_images/res/commandimagelist/lch_draw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_draw.png
diff --git a/default_images/res/commandimagelist/lch_drawcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawcaption.png
index 2fc77a14f7ca..2fc77a14f7ca 100644
--- a/default_images/res/commandimagelist/lch_drawcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawcaption.png
diff --git a/default_images/res/commandimagelist/lch_drawchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawchart.png
index d4d11140c074..d4d11140c074 100644
--- a/default_images/res/commandimagelist/lch_drawchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawchart.png
diff --git a/default_images/res/commandimagelist/lch_drawselect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawselect.png
index ddf8517faaa4..ddf8517faaa4 100644
--- a/default_images/res/commandimagelist/lch_drawselect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawselect.png
diff --git a/default_images/res/commandimagelist/lch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawtext.png
index 501d2c95ffd5..501d2c95ffd5 100644
--- a/default_images/res/commandimagelist/lch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_drawtext.png
diff --git a/default_images/res/commandimagelist/lch_dsbdocumentdatasource.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbdocumentdatasource.png
index 5da04610a409..5da04610a409 100644
--- a/default_images/res/commandimagelist/lch_dsbdocumentdatasource.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbdocumentdatasource.png
diff --git a/default_images/res/commandimagelist/lch_dsbeditdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbeditdoc.png
index 572dc216d391..572dc216d391 100644
--- a/default_images/res/commandimagelist/lch_dsbeditdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbeditdoc.png
diff --git a/default_images/res/commandimagelist/lch_dsbformletter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbformletter.png
index 2142572e3d8b..2142572e3d8b 100644
--- a/default_images/res/commandimagelist/lch_dsbformletter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbformletter.png
diff --git a/default_images/res/commandimagelist/lch_dsbinsertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcolumns.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_dsbinsertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcolumns.png
diff --git a/default_images/res/commandimagelist/lch_dsbinsertcontent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcontent.png
index c514fc300df4..c514fc300df4 100644
--- a/default_images/res/commandimagelist/lch_dsbinsertcontent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbinsertcontent.png
diff --git a/default_images/res/commandimagelist/lch_dsbrowserexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbrowserexplorer.png
index fc96e00927ca..fc96e00927ca 100644
--- a/default_images/res/commandimagelist/lch_dsbrowserexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_dsbrowserexplorer.png
diff --git a/default_images/res/commandimagelist/lch_duplicatepage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_duplicatepage.png
index 887f4ffa9e4b..887f4ffa9e4b 100644
--- a/default_images/res/commandimagelist/lch_duplicatepage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_duplicatepage.png
diff --git a/default_images/res/commandimagelist/lch_edit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_edit.png
index baa0b8ee8d9b..baa0b8ee8d9b 100644
--- a/default_images/res/commandimagelist/lch_edit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_edit.png
diff --git a/default_images/res/commandimagelist/lch_editdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editdoc.png
index ef6d2b8cc390..ef6d2b8cc390 100644
--- a/default_images/res/commandimagelist/lch_editdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editdoc.png
diff --git a/default_images/res/commandimagelist/lch_editframeset.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editframeset.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_editframeset.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editframeset.png
diff --git a/default_images/res/commandimagelist/lch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editglossary.png
index 2cde7330a425..2cde7330a425 100644
--- a/default_images/res/commandimagelist/lch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editglossary.png
diff --git a/default_images/res/commandimagelist/lch_editheaderandfooter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editheaderandfooter.png
index e107ed82f941..e107ed82f941 100644
--- a/default_images/res/commandimagelist/lch_editheaderandfooter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editheaderandfooter.png
diff --git a/default_images/res/commandimagelist/lch_editprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editprintarea.png
index 22791f079d0d..22791f079d0d 100644
--- a/default_images/res/commandimagelist/lch_editprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_editprintarea.png
diff --git a/default_images/res/commandimagelist/lch_ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse.png
index dde3af395c7d..dde3af395c7d 100644
--- a/default_images/res/commandimagelist/lch_ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse.png
diff --git a/default_images/res/commandimagelist/lch_ellipse_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse_unfilled.png
index f4579166e747..f4579166e747 100644
--- a/default_images/res/commandimagelist/lch_ellipse_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipse_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_ellipsecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut.png
index 4695ef2ffd42..4695ef2ffd42 100644
--- a/default_images/res/commandimagelist/lch_ellipsecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut.png
diff --git a/default_images/res/commandimagelist/lch_ellipsecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut_unfilled.png
index e047a8112a32..e047a8112a32 100644
--- a/default_images/res/commandimagelist/lch_ellipsecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsecut_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_ellipsetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsetoolbox.png
index c74f6d40098b..c74f6d40098b 100644
--- a/default_images/res/commandimagelist/lch_ellipsetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ellipsetoolbox.png
diff --git a/default_images/res/commandimagelist/lch_entergroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entergroup.png
index 52f3d0ec6302..52f3d0ec6302 100644
--- a/default_images/res/commandimagelist/lch_entergroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entergroup.png
diff --git a/default_images/res/commandimagelist/lch_entirecolumn.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirecolumn.png
index 00feadc47f3c..00feadc47f3c 100644
--- a/default_images/res/commandimagelist/lch_entirecolumn.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirecolumn.png
diff --git a/default_images/res/commandimagelist/lch_entirerow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirerow.png
index b63eb9c1e144..b63eb9c1e144 100644
--- a/default_images/res/commandimagelist/lch_entirerow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_entirerow.png
diff --git a/default_images/res/commandimagelist/lch_euroconverter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_euroconverter.png
index f7e4835df042..f7e4835df042 100644
--- a/default_images/res/commandimagelist/lch_euroconverter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_euroconverter.png
diff --git a/default_images/res/commandimagelist/lch_executereport.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_executereport.png
index e7f7369ff8aa..e7f7369ff8aa 100644
--- a/default_images/res/commandimagelist/lch_executereport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_executereport.png
diff --git a/default_images/res/commandimagelist/lch_expandpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_expandpage.png
index 0ec4f1be8779..0ec4f1be8779 100644
--- a/default_images/res/commandimagelist/lch_expandpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_expandpage.png
diff --git a/default_images/res/commandimagelist/lch_exportdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdialog.png
index 5e1beefab41e..5e1beefab41e 100644
--- a/default_images/res/commandimagelist/lch_exportdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdialog.png
diff --git a/default_images/res/commandimagelist/lch_exportdirecttopdf.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdirecttopdf.png
index cd5c77dd6dc7..cd5c77dd6dc7 100644
--- a/default_images/res/commandimagelist/lch_exportdirecttopdf.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportdirecttopdf.png
diff --git a/default_images/res/commandimagelist/lch_exportto.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportto.png
index 028cd7021d6f..028cd7021d6f 100644
--- a/default_images/res/commandimagelist/lch_exportto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_exportto.png
diff --git a/default_images/res/commandimagelist/lch_extendedhelp.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extendedhelp.png
index 1996c72e3b7e..1996c72e3b7e 100644
--- a/default_images/res/commandimagelist/lch_extendedhelp.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extendedhelp.png
diff --git a/default_images/res/commandimagelist/lch_extrusion3dcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusion3dcolor.png
index 380b0ca56202..380b0ca56202 100644
--- a/default_images/res/commandimagelist/lch_extrusion3dcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusion3dcolor.png
diff --git a/default_images/res/commandimagelist/lch_extrusiondepthfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondepthfloater.png
index 2a19a1cc1412..2a19a1cc1412 100644
--- a/default_images/res/commandimagelist/lch_extrusiondepthfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondepthfloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusiondirectionfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondirectionfloater.png
index 9a3ea121e4fb..9a3ea121e4fb 100644
--- a/default_images/res/commandimagelist/lch_extrusiondirectionfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiondirectionfloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusionlightingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionlightingfloater.png
index db2f46be77f7..db2f46be77f7 100644
--- a/default_images/res/commandimagelist/lch_extrusionlightingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionlightingfloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusionsurfacefloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionsurfacefloater.png
index 4a3d00908fc4..4a3d00908fc4 100644
--- a/default_images/res/commandimagelist/lch_extrusionsurfacefloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusionsurfacefloater.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltdown.png
index 5e27c352dd41..5e27c352dd41 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltdown.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltleft.png
index 9c198f8f6ef6..9c198f8f6ef6 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltleft.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltright.png
index 6ef237e04d13..6ef237e04d13 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltright.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontiltup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltup.png
index 1dca21ddfcac..1dca21ddfcac 100644
--- a/default_images/res/commandimagelist/lch_extrusiontiltup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontiltup.png
diff --git a/default_images/res/commandimagelist/lch_extrusiontoggle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontoggle.png
index 8d3b836091d2..8d3b836091d2 100644
--- a/default_images/res/commandimagelist/lch_extrusiontoggle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_extrusiontoggle.png
diff --git a/default_images/res/commandimagelist/lch_fieldnames.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fieldnames.png
index 1e384053393a..1e384053393a 100644
--- a/default_images/res/commandimagelist/lch_fieldnames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fieldnames.png
diff --git a/default_images/res/commandimagelist/lch_fields.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fields.png
index 1e384053393a..1e384053393a 100644
--- a/default_images/res/commandimagelist/lch_fields.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fields.png
diff --git a/default_images/res/commandimagelist/lch_filecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filecontrol.png
index 2ba9f4a9a72a..2ba9f4a9a72a 100644
--- a/default_images/res/commandimagelist/lch_filecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filecontrol.png
diff --git a/default_images/res/commandimagelist/lch_filedocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filedocument.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_filedocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filedocument.png
diff --git a/default_images/res/commandimagelist/lch_fillshadow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillshadow.png
index 6dcf618cc0f2..6dcf618cc0f2 100644
--- a/default_images/res/commandimagelist/lch_fillshadow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillshadow.png
diff --git a/default_images/res/commandimagelist/lch_fillstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillstyle.png
index bcce6fb79fac..bcce6fb79fac 100644
--- a/default_images/res/commandimagelist/lch_fillstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fillstyle.png
diff --git a/default_images/res/commandimagelist/lch_filtercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filtercrit.png
index 19dd3f7aaef2..19dd3f7aaef2 100644
--- a/default_images/res/commandimagelist/lch_filtercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_filtercrit.png
diff --git a/default_images/res/commandimagelist/lch_firstpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstpage.png
index 319e61edd17d..319e61edd17d 100644
--- a/default_images/res/commandimagelist/lch_firstpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstpage.png
diff --git a/default_images/res/commandimagelist/lch_firstrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstrecord.png
index a33de8c1474f..a33de8c1474f 100644
--- a/default_images/res/commandimagelist/lch_firstrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_firstrecord.png
diff --git a/default_images/res/commandimagelist/lch_fliphorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fliphorizontal.png
index e6e1de0befc5..e6e1de0befc5 100644
--- a/default_images/res/commandimagelist/lch_fliphorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fliphorizontal.png
diff --git a/default_images/res/commandimagelist/lch_flipvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flipvertical.png
index 0fe554636660..0fe554636660 100644
--- a/default_images/res/commandimagelist/lch_flipvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flipvertical.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-alternate-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-alternate-process.png
index 2ab92cabfa77..2ab92cabfa77 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-alternate-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-alternate-process.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-card.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-card.png
index 3a7049449acb..3a7049449acb 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-card.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-card.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-collate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-collate.png
index 1c28e2c3cd09..1c28e2c3cd09 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-collate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-collate.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-connector.png
index fd45d89c97b1..fd45d89c97b1 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-connector.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-data.png
index a4f4df01ca51..a4f4df01ca51 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-data.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-decision.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-decision.png
index 8eceabb7d712..8eceabb7d712 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-decision.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-decision.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-delay.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-delay.png
index 6a20a4084bbf..6a20a4084bbf 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-delay.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-delay.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-direct-access-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-direct-access-storage.png
index 55a22439e1f1..55a22439e1f1 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-direct-access-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-direct-access-storage.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-display.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-display.png
index dcf8bf0350c9..dcf8bf0350c9 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-display.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-display.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-document.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-document.png
index 38bad68e8603..38bad68e8603 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-document.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-document.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-extract.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-extract.png
index d81d97275dea..d81d97275dea 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-extract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-extract.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-internal-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-internal-storage.png
index 28a03e0ba5e8..28a03e0ba5e8 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-internal-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-internal-storage.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-magnetic-disk.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-magnetic-disk.png
index 96b923c7e039..96b923c7e039 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-magnetic-disk.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-magnetic-disk.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-input.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-input.png
index f872c2443f79..f872c2443f79 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-input.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-input.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-operation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-operation.png
index 506f0b57fae8..506f0b57fae8 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-manual-operation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-manual-operation.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-merge.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-merge.png
index c895e92d0700..c895e92d0700 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-merge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-merge.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-multidocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-multidocument.png
index dc1dec802ed6..dc1dec802ed6 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-multidocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-multidocument.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-off-page-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-off-page-connector.png
index 343f59972929..343f59972929 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-off-page-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-off-page-connector.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-or.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-or.png
index 031d7f3268f9..031d7f3268f9 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-or.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-or.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-predefined-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-predefined-process.png
index eb3c9873d527..eb3c9873d527 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-predefined-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-predefined-process.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-preparation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-preparation.png
index 3b121a1b1e08..3b121a1b1e08 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-preparation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-preparation.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-process.png
index 57b939d774cb..57b939d774cb 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-process.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-punched-tape.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-punched-tape.png
index 10f5dd99b25b..10f5dd99b25b 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-punched-tape.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-punched-tape.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sequential-access.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sequential-access.png
index 78c9fa63f082..78c9fa63f082 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sequential-access.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sequential-access.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sort.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sort.png
index b60727229e4f..b60727229e4f 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-sort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-sort.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-stored-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-stored-data.png
index 54d76366cb8a..54d76366cb8a 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-stored-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-stored-data.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-summing-junction.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-summing-junction.png
index af85b2f61c72..af85b2f61c72 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-summing-junction.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-summing-junction.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-terminator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-terminator.png
index 1eba0cc5f964..1eba0cc5f964 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.flowchart-terminator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.flowchart-terminator.png
diff --git a/default_images/res/commandimagelist/lch_flowchartshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.png
index 28a03e0ba5e8..28a03e0ba5e8 100644
--- a/default_images/res/commandimagelist/lch_flowchartshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_flowchartshapes.png
diff --git a/default_images/res/commandimagelist/lch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontcolor.png
index 08e9e9ded4ee..08e9e9ded4ee 100644
--- a/default_images/res/commandimagelist/lch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontcolor.png
diff --git a/default_images/res/commandimagelist/lch_fontdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontdialog.png
index 795384d6fccb..795384d6fccb 100644
--- a/default_images/res/commandimagelist/lch_fontdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontdialog.png
diff --git a/default_images/res/commandimagelist/lch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontheight.png
index 2448ef95f722..2448ef95f722 100644
--- a/default_images/res/commandimagelist/lch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontheight.png
diff --git a/default_images/res/commandimagelist/lch_fontwork.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontwork.png
index 4439542a895d..4439542a895d 100644
--- a/default_images/res/commandimagelist/lch_fontwork.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontwork.png
diff --git a/default_images/res/commandimagelist/lch_fontworkalignmentfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkalignmentfloater.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/res/commandimagelist/lch_fontworkalignmentfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkalignmentfloater.png
diff --git a/default_images/res/commandimagelist/lch_fontworkcharacterspacingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkcharacterspacingfloater.png
index 8fd680e52f87..8fd680e52f87 100644
--- a/default_images/res/commandimagelist/lch_fontworkcharacterspacingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkcharacterspacingfloater.png
diff --git a/default_images/res/commandimagelist/lch_fontworkgalleryfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkgalleryfloater.png
index 0a3add8fd8a2..0a3add8fd8a2 100644
--- a/default_images/res/commandimagelist/lch_fontworkgalleryfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkgalleryfloater.png
diff --git a/default_images/res/commandimagelist/lch_fontworksameletterheights.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworksameletterheights.png
index dcdbcf315f2a..dcdbcf315f2a 100644
--- a/default_images/res/commandimagelist/lch_fontworksameletterheights.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworksameletterheights.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-curve.png
index 7bcf1c86577a..7bcf1c86577a 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-pour.png
index 6ef4f865cbf6..6ef4f865cbf6 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-down-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-down-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-curve.png
index 55b07a1fc688..55b07a1fc688 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-pour.png
index 1a17239d4233..1a17239d4233 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-left-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-left-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-curve.png
index a139dcfc94ad..a139dcfc94ad 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-pour.png
index 9d8eb1aa8a94..9d8eb1aa8a94 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-right-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-right-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-curve.png
index 560ac3d52f6b..560ac3d52f6b 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-pour.png
index 7e20e45e3054..7e20e45e3054 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-arch-up-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-arch-up-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-down.png
index 40aaa51b8fca..40aaa51b8fca 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-up.png
index 748692fbff88..748692fbff88 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-chevron-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-chevron-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-curve.png
index 66751822b974..66751822b974 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-pour.png
index 68d1e08952a8..68d1e08952a8 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-circle-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-down.png
index d68ae7c2b5d9..d68ae7c2b5d9 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-up.png
index 9da8d33d011a..9da8d33d011a 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-curve-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-curve-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-down.png
index 8b602c315c15..8b602c315c15 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-left.png
index c43b695909ce..c43b695909ce 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-left.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-right.png
index 62e1c751616f..62e1c751616f 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-right.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-left.png
index 732e46c88a35..732e46c88a35 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-left.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-right.png
index ca570d54b304..ca570d54b304 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up-and-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up-and-right.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up.png
index 43ced8e52bcc..43ced8e52bcc 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-fade-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-fade-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-inflate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-inflate.png
index 9010620aa459..9010620aa459 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-inflate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-inflate.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-curve.png
index 78aaf1a3a4ff..78aaf1a3a4ff 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-curve.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-pour.png
index 014e521c71f0..014e521c71f0 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-open-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-open-circle-pour.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-plain-text.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-plain-text.png
index 9df579ff7f1e..9df579ff7f1e 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-plain-text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-plain-text.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-down.png
index bc434b4d8323..bc434b4d8323 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-up.png
index 07db6d705b4d..07db6d705b4d 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-slant-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-slant-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-stop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-stop.png
index 30527e4323b6..30527e4323b6 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-stop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-stop.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-down.png
index 26471a18cc9e..26471a18cc9e 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-down.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-up.png
index b33cb0f4c1c9..b33cb0f4c1c9 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-triangle-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-triangle-up.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-wave.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-wave.png
index ae886501278b..ae886501278b 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.fontwork-wave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.fontwork-wave.png
diff --git a/default_images/res/commandimagelist/lch_fontworkshapetype.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.png
index 4439542a895d..4439542a895d 100644
--- a/default_images/res/commandimagelist/lch_fontworkshapetype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fontworkshapetype.png
diff --git a/default_images/res/commandimagelist/lch_formatarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatarea.png
index 98d6f8c4309f..98d6f8c4309f 100644
--- a/default_images/res/commandimagelist/lch_formatarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatarea.png
diff --git a/default_images/res/commandimagelist/lch_formatgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatgroup.png
index 9bbac1a2e049..9bbac1a2e049 100644
--- a/default_images/res/commandimagelist/lch_formatgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatgroup.png
diff --git a/default_images/res/commandimagelist/lch_formatline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatline.png
index c1b70b706c6f..c1b70b706c6f 100644
--- a/default_images/res/commandimagelist/lch_formatline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatline.png
diff --git a/default_images/res/commandimagelist/lch_formatpaintbrush.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatpaintbrush.png
index 7316e14b5331..7316e14b5331 100644
--- a/default_images/res/commandimagelist/lch_formatpaintbrush.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatpaintbrush.png
diff --git a/default_images/res/commandimagelist/lch_formattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formattedfield.png
index 9917842f782b..9917842f782b 100644
--- a/default_images/res/commandimagelist/lch_formattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formattedfield.png
diff --git a/default_images/res/commandimagelist/lch_formatungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatungroup.png
index d77f18339b2f..d77f18339b2f 100644
--- a/default_images/res/commandimagelist/lch_formatungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formatungroup.png
diff --git a/default_images/res/commandimagelist/lch_formdesigntools.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formdesigntools.png
index c471f017e542..c471f017e542 100644
--- a/default_images/res/commandimagelist/lch_formdesigntools.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formdesigntools.png
diff --git a/default_images/res/commandimagelist/lch_formelcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formelcursor.png
index 518ff3eb788c..518ff3eb788c 100644
--- a/default_images/res/commandimagelist/lch_formelcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formelcursor.png
diff --git a/default_images/res/commandimagelist/lch_formfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilter.png
index 03b2a98e4ab8..03b2a98e4ab8 100644
--- a/default_images/res/commandimagelist/lch_formfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilter.png
diff --git a/default_images/res/commandimagelist/lch_formfiltered.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfiltered.png
index f8dd6b5d0b95..f8dd6b5d0b95 100644
--- a/default_images/res/commandimagelist/lch_formfiltered.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfiltered.png
diff --git a/default_images/res/commandimagelist/lch_formfilterexecute.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilterexecute.png
index a9bf6772d691..a9bf6772d691 100644
--- a/default_images/res/commandimagelist/lch_formfilterexecute.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilterexecute.png
diff --git a/default_images/res/commandimagelist/lch_formfilternavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilternavigator.png
index d39b165fd230..d39b165fd230 100644
--- a/default_images/res/commandimagelist/lch_formfilternavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formfilternavigator.png
diff --git a/default_images/res/commandimagelist/lch_formproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formproperties.png
index b97152a3fdcb..b97152a3fdcb 100644
--- a/default_images/res/commandimagelist/lch_formproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_formproperties.png
diff --git a/default_images/res/commandimagelist/lch_forward.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_forward.png
index 28ff785f35c3..28ff785f35c3 100644
--- a/default_images/res/commandimagelist/lch_forward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_forward.png
diff --git a/default_images/res/commandimagelist/lch_framedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framedialog.png
index a997d658ad4f..a997d658ad4f 100644
--- a/default_images/res/commandimagelist/lch_framedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framedialog.png
diff --git a/default_images/res/commandimagelist/lch_framelinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framelinecolor.png
index d5c614df66f1..d5c614df66f1 100644
--- a/default_images/res/commandimagelist/lch_framelinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_framelinecolor.png
diff --git a/default_images/res/commandimagelist/lch_freeline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline.png
index 7957ae706d69..7957ae706d69 100644
--- a/default_images/res/commandimagelist/lch_freeline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline.png
diff --git a/default_images/res/commandimagelist/lch_freeline_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline_unfilled.png
index b475c5717437..b475c5717437 100644
--- a/default_images/res/commandimagelist/lch_freeline_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_freeline_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_fullscreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fullscreen.png
index fe2052359417..fe2052359417 100644
--- a/default_images/res/commandimagelist/lch_fullscreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_fullscreen.png
diff --git a/default_images/res/commandimagelist/lch_gallery.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gallery.png
index 0c40385aaf93..0c40385aaf93 100644
--- a/default_images/res/commandimagelist/lch_gallery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gallery.png
diff --git a/default_images/res/commandimagelist/lch_getactivetask.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_getactivetask.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_getactivetask.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_getactivetask.png
diff --git a/default_images/res/commandimagelist/lch_glueeditmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueeditmode.png
index 7ce8113cd553..7ce8113cd553 100644
--- a/default_images/res/commandimagelist/lch_glueeditmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueeditmode.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectionbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionbottom.png
index 8ef27a2ce409..8ef27a2ce409 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectionbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionbottom.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectionleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionleft.png
index dc32db97e38a..dc32db97e38a 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectionleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionleft.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectionright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionright.png
index 2f91d8d343d6..2f91d8d343d6 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectionright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectionright.png
diff --git a/default_images/res/commandimagelist/lch_glueescapedirectiontop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectiontop.png
index 66772855d671..66772855d671 100644
--- a/default_images/res/commandimagelist/lch_glueescapedirectiontop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueescapedirectiontop.png
diff --git a/default_images/res/commandimagelist/lch_gluehorzaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzaligncenter.png
index 9bff830c7521..9bff830c7521 100644
--- a/default_images/res/commandimagelist/lch_gluehorzaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzaligncenter.png
diff --git a/default_images/res/commandimagelist/lch_gluehorzalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignleft.png
index e6c552c6a744..e6c552c6a744 100644
--- a/default_images/res/commandimagelist/lch_gluehorzalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignleft.png
diff --git a/default_images/res/commandimagelist/lch_gluehorzalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignright.png
index fb5c739cfd2f..fb5c739cfd2f 100644
--- a/default_images/res/commandimagelist/lch_gluehorzalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluehorzalignright.png
diff --git a/default_images/res/commandimagelist/lch_glueinsertpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueinsertpoint.png
index 5a535ebd0410..5a535ebd0410 100644
--- a/default_images/res/commandimagelist/lch_glueinsertpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_glueinsertpoint.png
diff --git a/default_images/res/commandimagelist/lch_gluepercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluepercent.png
index bbe4c0e52bf0..bbe4c0e52bf0 100644
--- a/default_images/res/commandimagelist/lch_gluepercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluepercent.png
diff --git a/default_images/res/commandimagelist/lch_gluevertalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertalignbottom.png
index b0884d2b035e..b0884d2b035e 100644
--- a/default_images/res/commandimagelist/lch_gluevertalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertalignbottom.png
diff --git a/default_images/res/commandimagelist/lch_gluevertaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligncenter.png
index 2e31fc8c5a16..2e31fc8c5a16 100644
--- a/default_images/res/commandimagelist/lch_gluevertaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligncenter.png
diff --git a/default_images/res/commandimagelist/lch_gluevertaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligntop.png
index 01471bc5edc7..01471bc5edc7 100644
--- a/default_images/res/commandimagelist/lch_gluevertaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gluevertaligntop.png
diff --git a/default_images/res/commandimagelist/lch_goalseekdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_goalseekdialog.png
index 2716af9825fa..2716af9825fa 100644
--- a/default_images/res/commandimagelist/lch_goalseekdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_goalseekdialog.png
diff --git a/default_images/res/commandimagelist/lch_gotoend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoend.png
index 1216b9381d39..1216b9381d39 100644
--- a/default_images/res/commandimagelist/lch_gotoend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoend.png
diff --git a/default_images/res/commandimagelist/lch_gotoendofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoendofdoc.png
index b8a273f6d78e..b8a273f6d78e 100644
--- a/default_images/res/commandimagelist/lch_gotoendofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotoendofdoc.png
diff --git a/default_images/res/commandimagelist/lch_gotostartofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartofdoc.png
index 6c57b0b4346e..6c57b0b4346e 100644
--- a/default_images/res/commandimagelist/lch_gotostartofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartofdoc.png
diff --git a/default_images/res/commandimagelist/lch_gotostartoftable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartoftable.png
index 3203541890c5..3203541890c5 100644
--- a/default_images/res/commandimagelist/lch_gotostartoftable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gotostartoftable.png
diff --git a/default_images/res/commandimagelist/lch_grafattrcrop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafattrcrop.png
index c1f0992402a2..c1f0992402a2 100644
--- a/default_images/res/commandimagelist/lch_grafattrcrop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafattrcrop.png
diff --git a/default_images/res/commandimagelist/lch_grafblue.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafblue.png
index 7ce95d2d79a8..7ce95d2d79a8 100644
--- a/default_images/res/commandimagelist/lch_grafblue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafblue.png
diff --git a/default_images/res/commandimagelist/lch_grafcontrast.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafcontrast.png
index 9608a5203fb2..9608a5203fb2 100644
--- a/default_images/res/commandimagelist/lch_grafcontrast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafcontrast.png
diff --git a/default_images/res/commandimagelist/lch_grafgamma.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgamma.png
index 7c8c41261684..7c8c41261684 100644
--- a/default_images/res/commandimagelist/lch_grafgamma.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgamma.png
diff --git a/default_images/res/commandimagelist/lch_grafgreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgreen.png
index d41de651d15e..d41de651d15e 100644
--- a/default_images/res/commandimagelist/lch_grafgreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafgreen.png
diff --git a/default_images/res/commandimagelist/lch_grafinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafinvert.png
index a2b28bf14eea..a2b28bf14eea 100644
--- a/default_images/res/commandimagelist/lch_grafinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafinvert.png
diff --git a/default_images/res/commandimagelist/lch_grafluminance.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafluminance.png
index 98b3864307d2..98b3864307d2 100644
--- a/default_images/res/commandimagelist/lch_grafluminance.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafluminance.png
diff --git a/default_images/res/commandimagelist/lch_grafmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafmode.png
index e569acc0951a..e569acc0951a 100644
--- a/default_images/res/commandimagelist/lch_grafmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafmode.png
diff --git a/default_images/res/commandimagelist/lch_grafred.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafred.png
index 928edf656143..928edf656143 100644
--- a/default_images/res/commandimagelist/lch_grafred.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grafred.png
diff --git a/default_images/res/commandimagelist/lch_graftransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graftransparence.png
index a9ebe2198c41..a9ebe2198c41 100644
--- a/default_images/res/commandimagelist/lch_graftransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graftransparence.png
diff --git a/default_images/res/commandimagelist/lch_graphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphic.png
index 687822059884..687822059884 100644
--- a/default_images/res/commandimagelist/lch_graphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphic.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterinvert.png
index a2b28bf14eea..a2b28bf14eea 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterinvert.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltermosaic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltermosaic.png
index ea3bd175f0e7..ea3bd175f0e7 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltermosaic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltermosaic.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterpopart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterpopart.png
index 87f1a3eb99d4..87f1a3eb99d4 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterpopart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterpopart.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterposter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterposter.png
index 27bfc6ba6e83..27bfc6ba6e83 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterposter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterposter.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterrelief.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterrelief.png
index f0daa58e2d19..f0daa58e2d19 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterrelief.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterrelief.png
diff --git a/default_images/res/commandimagelist/lch_graphicfilterremovenoise.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterremovenoise.png
index ba1961bfc607..ba1961bfc607 100644
--- a/default_images/res/commandimagelist/lch_graphicfilterremovenoise.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfilterremovenoise.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersepia.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersepia.png
index a4a2a6054512..a4a2a6054512 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersepia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersepia.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersharpen.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersharpen.png
index eb229b14be0a..eb229b14be0a 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersharpen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersharpen.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersmooth.png
index 00869b42c0fb..00869b42c0fb 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersmooth.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersobel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersobel.png
index a22d25c7a845..a22d25c7a845 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersobel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersobel.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltersolarize.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersolarize.png
index 9efd250ba717..9efd250ba717 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltersolarize.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltersolarize.png
diff --git a/default_images/res/commandimagelist/lch_graphicfiltertoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltertoolbox.png
index 5875ddcae7b9..5875ddcae7b9 100644
--- a/default_images/res/commandimagelist/lch_graphicfiltertoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_graphicfiltertoolbox.png
diff --git a/default_images/res/commandimagelist/lch_greatestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestheight.png
index dcb3977354a0..dcb3977354a0 100644
--- a/default_images/res/commandimagelist/lch_greatestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestheight.png
diff --git a/default_images/res/commandimagelist/lch_greatestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestwidth.png
index fb01c3d7ce4a..fb01c3d7ce4a 100644
--- a/default_images/res/commandimagelist/lch_greatestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_greatestwidth.png
diff --git a/default_images/res/commandimagelist/lch_grid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grid.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_grid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grid.png
diff --git a/default_images/res/commandimagelist/lch_griduse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_griduse.png
index fb0f6b5883a3..fb0f6b5883a3 100644
--- a/default_images/res/commandimagelist/lch_griduse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_griduse.png
diff --git a/default_images/res/commandimagelist/lch_gridvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gridvisible.png
index 08964d11e138..08964d11e138 100644
--- a/default_images/res/commandimagelist/lch_gridvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_gridvisible.png
diff --git a/default_images/res/commandimagelist/lch_group.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_group.png
index 84ad2e7a9209..84ad2e7a9209 100644
--- a/default_images/res/commandimagelist/lch_group.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_group.png
diff --git a/default_images/res/commandimagelist/lch_groupbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_groupbox.png
index 7302cfc494d3..7302cfc494d3 100644
--- a/default_images/res/commandimagelist/lch_groupbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_groupbox.png
diff --git a/default_images/res/commandimagelist/lch_grow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grow.png
index 86f0cff36062..86f0cff36062 100644
--- a/default_images/res/commandimagelist/lch_grow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_grow.png
diff --git a/default_images/res/commandimagelist/lch_halfsphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_halfsphere.png
index 81b6121105c3..81b6121105c3 100644
--- a/default_images/res/commandimagelist/lch_halfsphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_halfsphere.png
diff --git a/default_images/res/commandimagelist/lch_handlesdraft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_handlesdraft.png
index 7d5411a94e4a..7d5411a94e4a 100644
--- a/default_images/res/commandimagelist/lch_handlesdraft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_handlesdraft.png
diff --git a/default_images/res/commandimagelist/lch_helpannotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpannotate.png
index 165c2b1a7fe3..165c2b1a7fe3 100644
--- a/default_images/res/commandimagelist/lch_helpannotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpannotate.png
diff --git a/default_images/res/commandimagelist/lch_helpbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpbookmark.png
index ce40be534c58..ce40be534c58 100644
--- a/default_images/res/commandimagelist/lch_helpbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpbookmark.png
diff --git a/default_images/res/commandimagelist/lch_helpdownload.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpdownload.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_helpdownload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpdownload.png
diff --git a/default_images/res/commandimagelist/lch_helperdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helperdialog.png
index 8aaca82bd130..8aaca82bd130 100644
--- a/default_images/res/commandimagelist/lch_helperdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helperdialog.png
diff --git a/default_images/res/commandimagelist/lch_helpindex.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpindex.png
index 227dbc74f5a3..227dbc74f5a3 100644
--- a/default_images/res/commandimagelist/lch_helpindex.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpindex.png
diff --git a/default_images/res/commandimagelist/lch_helplinesmove.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesmove.png
index 833baf11d75b..833baf11d75b 100644
--- a/default_images/res/commandimagelist/lch_helplinesmove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesmove.png
diff --git a/default_images/res/commandimagelist/lch_helplinesuse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesuse.png
index 7aa293e8aefe..7aa293e8aefe 100644
--- a/default_images/res/commandimagelist/lch_helplinesuse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesuse.png
diff --git a/default_images/res/commandimagelist/lch_helplinesvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesvisible.png
index 781c6791b770..781c6791b770 100644
--- a/default_images/res/commandimagelist/lch_helplinesvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helplinesvisible.png
diff --git a/default_images/res/commandimagelist/lch_helpmenu.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpmenu.png
index 1ff252c57581..1ff252c57581 100644
--- a/default_images/res/commandimagelist/lch_helpmenu.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpmenu.png
diff --git a/default_images/res/commandimagelist/lch_helpsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpsearch.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/commandimagelist/lch_helpsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpsearch.png
diff --git a/default_images/res/commandimagelist/lch_helpzoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomin.png
index 21e4e78cc541..21e4e78cc541 100644
--- a/default_images/res/commandimagelist/lch_helpzoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomin.png
diff --git a/default_images/res/commandimagelist/lch_helpzoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomout.png
index ee427ddf6d46..ee427ddf6d46 100644
--- a/default_images/res/commandimagelist/lch_helpzoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_helpzoomout.png
diff --git a/default_images/res/commandimagelist/lch_hfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hfixedline.png
index 9d9e9b05e3a8..9d9e9b05e3a8 100644
--- a/default_images/res/commandimagelist/lch_hfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hfixedline.png
diff --git a/default_images/res/commandimagelist/lch_hideslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hideslide.png
index 80b6e4a51927..80b6e4a51927 100644
--- a/default_images/res/commandimagelist/lch_hideslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hideslide.png
diff --git a/default_images/res/commandimagelist/lch_hscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hscrollbar.png
index 705191c09153..705191c09153 100644
--- a/default_images/res/commandimagelist/lch_hscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hscrollbar.png
diff --git a/default_images/res/commandimagelist/lch_hyperlinkdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyperlinkdialog.png
index 62c4e6046be4..62c4e6046be4 100644
--- a/default_images/res/commandimagelist/lch_hyperlinkdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyperlinkdialog.png
diff --git a/default_images/res/commandimagelist/lch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenate.png
index 8431fbbe567b..8431fbbe567b 100644
--- a/default_images/res/commandimagelist/lch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenate.png
diff --git a/default_images/res/commandimagelist/lch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenation.png
index 01f819dbf298..01f819dbf298 100644
--- a/default_images/res/commandimagelist/lch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_hyphenation.png
diff --git a/default_images/res/commandimagelist/lch_imagebutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagebutton.png
index fdebd5bdf8e5..fdebd5bdf8e5 100644
--- a/default_images/res/commandimagelist/lch_imagebutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagebutton.png
diff --git a/default_images/res/commandimagelist/lch_imagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagecontrol.png
index 1a46412d36f7..1a46412d36f7 100644
--- a/default_images/res/commandimagelist/lch_imagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagecontrol.png
diff --git a/default_images/res/commandimagelist/lch_imagemapdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagemapdialog.png
index 967da9955454..967da9955454 100644
--- a/default_images/res/commandimagelist/lch_imagemapdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_imagemapdialog.png
diff --git a/default_images/res/commandimagelist/lch_importdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importdialog.png
index 068755d9b6fa..068755d9b6fa 100644
--- a/default_images/res/commandimagelist/lch_importdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importdialog.png
diff --git a/default_images/res/commandimagelist/lch_importfromfile.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importfromfile.png
index 226f44e31836..226f44e31836 100644
--- a/default_images/res/commandimagelist/lch_importfromfile.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_importfromfile.png
diff --git a/default_images/res/commandimagelist/lch_incrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementindent.png
index ba24d3b3d95a..ba24d3b3d95a 100644
--- a/default_images/res/commandimagelist/lch_incrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementindent.png
diff --git a/default_images/res/commandimagelist/lch_incrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementlevel.png
index 617254be3926..617254be3926 100644
--- a/default_images/res/commandimagelist/lch_incrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementlevel.png
diff --git a/default_images/res/commandimagelist/lch_incrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementsublevels.png
index 38eba8aa8114..38eba8aa8114 100644
--- a/default_images/res/commandimagelist/lch_incrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_incrementsublevels.png
diff --git a/default_images/res/commandimagelist/lch_inscellsctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inscellsctrl.png
index abf18d4ee67a..abf18d4ee67a 100644
--- a/default_images/res/commandimagelist/lch_inscellsctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inscellsctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertannotation.png
index 29b3e472a450..29b3e472a450 100644
--- a/default_images/res/commandimagelist/lch_insertannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertannotation.png
diff --git a/default_images/res/commandimagelist/lch_insertauthorfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertauthorfield.png
index ea575d597b01..ea575d597b01 100644
--- a/default_images/res/commandimagelist/lch_insertauthorfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertauthorfield.png
diff --git a/default_images/res/commandimagelist/lch_insertavmedia.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertavmedia.png
index e702867df362..e702867df362 100644
--- a/default_images/res/commandimagelist/lch_insertavmedia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertavmedia.png
diff --git a/default_images/res/commandimagelist/lch_insertbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertbookmark.png
index a63fcf93087f..a63fcf93087f 100644
--- a/default_images/res/commandimagelist/lch_insertbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertbookmark.png
diff --git a/default_images/res/commandimagelist/lch_insertcaptiondialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcaptiondialog.png
index e090fe23af9c..e090fe23af9c 100644
--- a/default_images/res/commandimagelist/lch_insertcaptiondialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcaptiondialog.png
diff --git a/default_images/res/commandimagelist/lch_insertcellsdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsdown.png
index 92f7e4fab08d..92f7e4fab08d 100644
--- a/default_images/res/commandimagelist/lch_insertcellsdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsdown.png
diff --git a/default_images/res/commandimagelist/lch_insertcellsright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsright.png
index f3e4c8b5b97d..f3e4c8b5b97d 100644
--- a/default_images/res/commandimagelist/lch_insertcellsright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcellsright.png
diff --git a/default_images/res/commandimagelist/lch_insertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcolumns.png
index f0d7b9dcaf53..f0d7b9dcaf53 100644
--- a/default_images/res/commandimagelist/lch_insertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcolumns.png
diff --git a/default_images/res/commandimagelist/lch_insertctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertctrl.png
index 07994d2a5af6..07994d2a5af6 100644
--- a/default_images/res/commandimagelist/lch_insertctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertcurrencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcurrencyfield.png
index 3c030ca8ae4d..3c030ca8ae4d 100644
--- a/default_images/res/commandimagelist/lch_insertcurrencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertcurrencyfield.png
diff --git a/default_images/res/commandimagelist/lch_insertdatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdatefield.png
index 22b29e58eabb..22b29e58eabb 100644
--- a/default_images/res/commandimagelist/lch_insertdatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdatefield.png
diff --git a/default_images/res/commandimagelist/lch_insertdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdoc.png
index f2ce1a11c761..f2ce1a11c761 100644
--- a/default_images/res/commandimagelist/lch_insertdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdoc.png
diff --git a/default_images/res/commandimagelist/lch_insertdraw.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdraw.png
index 4cd45611abf8..4cd45611abf8 100644
--- a/default_images/res/commandimagelist/lch_insertdraw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertdraw.png
diff --git a/default_images/res/commandimagelist/lch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertedit.png
index 78ca07f7acff..78ca07f7acff 100644
--- a/default_images/res/commandimagelist/lch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertedit.png
diff --git a/default_images/res/commandimagelist/lch_insertendnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertendnote.png
index dcae9bb35905..dcae9bb35905 100644
--- a/default_images/res/commandimagelist/lch_insertendnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertendnote.png
diff --git a/default_images/res/commandimagelist/lch_insertfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfield.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_insertfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfield.png
diff --git a/default_images/res/commandimagelist/lch_insertfieldctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfieldctrl.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_insertfieldctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfieldctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertfilecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfilecontrol.png
index 2ecba0bdaf7d..2ecba0bdaf7d 100644
--- a/default_images/res/commandimagelist/lch_insertfilecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfilecontrol.png
diff --git a/default_images/res/commandimagelist/lch_insertfixedtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfixedtext.png
index b1be8dc3bb66..b1be8dc3bb66 100644
--- a/default_images/res/commandimagelist/lch_insertfixedtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfixedtext.png
diff --git a/default_images/res/commandimagelist/lch_insertfootnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfootnote.png
index 980e8a40cab8..980e8a40cab8 100644
--- a/default_images/res/commandimagelist/lch_insertfootnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertfootnote.png
diff --git a/default_images/res/commandimagelist/lch_insertformattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformattedfield.png
index 9917842f782b..9917842f782b 100644
--- a/default_images/res/commandimagelist/lch_insertformattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformattedfield.png
diff --git a/default_images/res/commandimagelist/lch_insertformula.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformula.png
index 6856aaabc434..6856aaabc434 100644
--- a/default_images/res/commandimagelist/lch_insertformula.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertformula.png
diff --git a/default_images/res/commandimagelist/lch_insertframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframe.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_insertframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframe.png
diff --git a/default_images/res/commandimagelist/lch_insertframeinteract.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteract.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_insertframeinteract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteract.png
diff --git a/default_images/res/commandimagelist/lch_insertframeinteractnocolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteractnocolumns.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_insertframeinteractnocolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertframeinteractnocolumns.png
diff --git a/default_images/res/commandimagelist/lch_insertgraphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertgraphic.png
index 0c9474dc2170..0c9474dc2170 100644
--- a/default_images/res/commandimagelist/lch_insertgraphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertgraphic.png
diff --git a/default_images/res/commandimagelist/lch_inserthyperlink.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserthyperlink.png
index 0145da28005f..0145da28005f 100644
--- a/default_images/res/commandimagelist/lch_inserthyperlink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserthyperlink.png
diff --git a/default_images/res/commandimagelist/lch_insertimagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertimagecontrol.png
index b295b34cc785..b295b34cc785 100644
--- a/default_images/res/commandimagelist/lch_insertimagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertimagecontrol.png
diff --git a/default_images/res/commandimagelist/lch_insertindexesentry.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertindexesentry.png
index c1c9a35f2f60..c1c9a35f2f60 100644
--- a/default_images/res/commandimagelist/lch_insertindexesentry.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertindexesentry.png
diff --git a/default_images/res/commandimagelist/lch_insertlistbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertlistbox.png
index dbc038bf66a2..dbc038bf66a2 100644
--- a/default_images/res/commandimagelist/lch_insertlistbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertlistbox.png
diff --git a/default_images/res/commandimagelist/lch_insertmasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmasterpage.png
index e1cc5c3d19e1..e1cc5c3d19e1 100644
--- a/default_images/res/commandimagelist/lch_insertmasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmasterpage.png
diff --git a/default_images/res/commandimagelist/lch_insertmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmath.png
index 88369d31b753..88369d31b753 100644
--- a/default_images/res/commandimagelist/lch_insertmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertmath.png
diff --git a/default_images/res/commandimagelist/lch_insertneutralparagraph.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertneutralparagraph.png
index f94c478e3f48..f94c478e3f48 100644
--- a/default_images/res/commandimagelist/lch_insertneutralparagraph.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertneutralparagraph.png
diff --git a/default_images/res/commandimagelist/lch_insertnumericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertnumericfield.png
index 87103f498aea..87103f498aea 100644
--- a/default_images/res/commandimagelist/lch_insertnumericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertnumericfield.png
diff --git a/default_images/res/commandimagelist/lch_insertobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjctrl.png
index cae18a1bde90..cae18a1bde90 100644
--- a/default_images/res/commandimagelist/lch_insertobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjctrl.png
diff --git a/default_images/res/commandimagelist/lch_insertobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobject.png
index a9967513deae..a9967513deae 100644
--- a/default_images/res/commandimagelist/lch_insertobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobject.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectchart.png
index d4d11140c074..d4d11140c074 100644
--- a/default_images/res/commandimagelist/lch_insertobjectchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectchart.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectdialog.png
index 036a2d7ac527..036a2d7ac527 100644
--- a/default_images/res/commandimagelist/lch_insertobjectdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectdialog.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectfloatingframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectfloatingframe.png
index 1fe282df7bcf..1fe282df7bcf 100644
--- a/default_images/res/commandimagelist/lch_insertobjectfloatingframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectfloatingframe.png
diff --git a/default_images/res/commandimagelist/lch_insertobjectstarmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectstarmath.png
index 2dfb6c559de8..2dfb6c559de8 100644
--- a/default_images/res/commandimagelist/lch_insertobjectstarmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertobjectstarmath.png
diff --git a/default_images/res/commandimagelist/lch_insertpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpage.png
index ed84fc9cb5df..ed84fc9cb5df 100644
--- a/default_images/res/commandimagelist/lch_insertpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpage.png
diff --git a/default_images/res/commandimagelist/lch_insertpagecountfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagecountfield.png
index 6054b3cb9532..6054b3cb9532 100644
--- a/default_images/res/commandimagelist/lch_insertpagecountfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagecountfield.png
diff --git a/default_images/res/commandimagelist/lch_insertpagenumberfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagenumberfield.png
index e3de60c7e4da..e3de60c7e4da 100644
--- a/default_images/res/commandimagelist/lch_insertpagenumberfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpagenumberfield.png
diff --git a/default_images/res/commandimagelist/lch_insertpatternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpatternfield.png
index 358b89a5f7b6..358b89a5f7b6 100644
--- a/default_images/res/commandimagelist/lch_insertpatternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpatternfield.png
diff --git a/default_images/res/commandimagelist/lch_insertplugin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertplugin.png
index 19e367c8d76e..19e367c8d76e 100644
--- a/default_images/res/commandimagelist/lch_insertplugin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertplugin.png
diff --git a/default_images/res/commandimagelist/lch_insertpushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpushbutton.png
index 46454486eb2a..46454486eb2a 100644
--- a/default_images/res/commandimagelist/lch_insertpushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertpushbutton.png
diff --git a/default_images/res/commandimagelist/lch_insertreferencefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertreferencefield.png
index 589c75767335..589c75767335 100644
--- a/default_images/res/commandimagelist/lch_insertreferencefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertreferencefield.png
diff --git a/default_images/res/commandimagelist/lch_insertrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertrows.png
index 784530c4a28c..784530c4a28c 100644
--- a/default_images/res/commandimagelist/lch_insertrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertrows.png
diff --git a/default_images/res/commandimagelist/lch_insertsection.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsection.png
index 1cb2c20941c8..1cb2c20941c8 100644
--- a/default_images/res/commandimagelist/lch_insertsection.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsection.png
diff --git a/default_images/res/commandimagelist/lch_insertsound.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsound.png
index 8fb43f4c3fdd..8fb43f4c3fdd 100644
--- a/default_images/res/commandimagelist/lch_insertsound.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsound.png
diff --git a/default_images/res/commandimagelist/lch_insertspreadsheet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertspreadsheet.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_insertspreadsheet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertspreadsheet.png
diff --git a/default_images/res/commandimagelist/lch_insertsymbol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsymbol.png
index a9166d91225a..a9166d91225a 100644
--- a/default_images/res/commandimagelist/lch_insertsymbol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertsymbol.png
diff --git a/default_images/res/commandimagelist/lch_inserttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttable.png
index 38cf6834897e..38cf6834897e 100644
--- a/default_images/res/commandimagelist/lch_inserttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttable.png
diff --git a/default_images/res/commandimagelist/lch_inserttextframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttextframe.png
index 9732156e640a..9732156e640a 100644
--- a/default_images/res/commandimagelist/lch_inserttextframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttextframe.png
diff --git a/default_images/res/commandimagelist/lch_inserttimefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttimefield.png
index 296cc9aae5ef..296cc9aae5ef 100644
--- a/default_images/res/commandimagelist/lch_inserttimefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttimefield.png
diff --git a/default_images/res/commandimagelist/lch_inserttitlefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttitlefield.png
index 5c96190e3469..5c96190e3469 100644
--- a/default_images/res/commandimagelist/lch_inserttitlefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttitlefield.png
diff --git a/default_images/res/commandimagelist/lch_inserttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttoolbox.png
index 226f44e31836..226f44e31836 100644
--- a/default_images/res/commandimagelist/lch_inserttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttoolbox.png
diff --git a/default_images/res/commandimagelist/lch_inserttopicfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttopicfield.png
index 1d8c9c08d354..1d8c9c08d354 100644
--- a/default_images/res/commandimagelist/lch_inserttopicfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttopicfield.png
diff --git a/default_images/res/commandimagelist/lch_inserttreecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttreecontrol.png
index 151761941036..151761941036 100644
--- a/default_images/res/commandimagelist/lch_inserttreecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_inserttreecontrol.png
diff --git a/default_images/res/commandimagelist/lch_insertvideo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertvideo.png
index 7bd9a1e00749..7bd9a1e00749 100644
--- a/default_images/res/commandimagelist/lch_insertvideo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insertvideo.png
diff --git a/default_images/res/commandimagelist/lch_insobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insobjctrl.png
index 9909e0380cbf..9909e0380cbf 100644
--- a/default_images/res/commandimagelist/lch_insobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_insobjctrl.png
diff --git a/default_images/res/commandimagelist/lch_interactivegradient.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivegradient.png
index c590b83ee4cb..c590b83ee4cb 100644
--- a/default_images/res/commandimagelist/lch_interactivegradient.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivegradient.png
diff --git a/default_images/res/commandimagelist/lch_interactivetransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivetransparence.png
index 6068521b768b..6068521b768b 100644
--- a/default_images/res/commandimagelist/lch_interactivetransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_interactivetransparence.png
diff --git a/default_images/res/commandimagelist/lch_internetonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_internetonline.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_internetonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_internetonline.png
diff --git a/default_images/res/commandimagelist/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_italic.png
index 76481b6c9f83..76481b6c9f83 100644
--- a/default_images/res/commandimagelist/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_italic.png
diff --git a/default_images/res/commandimagelist/lch_justifypara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_justifypara.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/res/commandimagelist/lch_justifypara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_justifypara.png
diff --git a/default_images/res/commandimagelist/lch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_label.png
index 805c1b01ad11..805c1b01ad11 100644
--- a/default_images/res/commandimagelist/lch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_label.png
diff --git a/default_images/res/commandimagelist/lch_lastpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastpage.png
index 66f841cbf50c..66f841cbf50c 100644
--- a/default_images/res/commandimagelist/lch_lastpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastpage.png
diff --git a/default_images/res/commandimagelist/lch_lastrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastrecord.png
index 0f57ffddf595..0f57ffddf595 100644
--- a/default_images/res/commandimagelist/lch_lastrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lastrecord.png
diff --git a/default_images/res/commandimagelist/lch_leaveallgroups.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leaveallgroups.png
index 92c080bef67d..92c080bef67d 100644
--- a/default_images/res/commandimagelist/lch_leaveallgroups.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leaveallgroups.png
diff --git a/default_images/res/commandimagelist/lch_leavegroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leavegroup.png
index 21612be206c7..21612be206c7 100644
--- a/default_images/res/commandimagelist/lch_leavegroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leavegroup.png
diff --git a/default_images/res/commandimagelist/lch_leftpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leftpara.png
index 3255d27d9f5d..3255d27d9f5d 100644
--- a/default_images/res/commandimagelist/lch_leftpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_leftpara.png
diff --git a/default_images/res/commandimagelist/lch_line.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line.png
index 8165a9a30656..8165a9a30656 100644
--- a/default_images/res/commandimagelist/lch_line.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line.png
diff --git a/default_images/res/commandimagelist/lch_line_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line_diagonal.png
index 77f5bae15507..77f5bae15507 100644
--- a/default_images/res/commandimagelist/lch_line_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_line_diagonal.png
diff --git a/default_images/res/commandimagelist/lch_linearrowcircle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowcircle.png
index 0d990ffe3c2f..0d990ffe3c2f 100644
--- a/default_images/res/commandimagelist/lch_linearrowcircle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowcircle.png
diff --git a/default_images/res/commandimagelist/lch_linearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowend.png
index a888e9ffece5..a888e9ffece5 100644
--- a/default_images/res/commandimagelist/lch_linearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowend.png
diff --git a/default_images/res/commandimagelist/lch_linearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrows.png
index 3c21a3936da4..3c21a3936da4 100644
--- a/default_images/res/commandimagelist/lch_linearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrows.png
diff --git a/default_images/res/commandimagelist/lch_linearrowsquare.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowsquare.png
index 508e2ea273b2..508e2ea273b2 100644
--- a/default_images/res/commandimagelist/lch_linearrowsquare.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowsquare.png
diff --git a/default_images/res/commandimagelist/lch_linearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowstart.png
index 8efa836a1bd4..8efa836a1bd4 100644
--- a/default_images/res/commandimagelist/lch_linearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linearrowstart.png
diff --git a/default_images/res/commandimagelist/lch_linecirclearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linecirclearrow.png
index fa25c4ed2006..fa25c4ed2006 100644
--- a/default_images/res/commandimagelist/lch_linecirclearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linecirclearrow.png
diff --git a/default_images/res/commandimagelist/lch_lineendstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lineendstyle.png
index fce55452e992..fce55452e992 100644
--- a/default_images/res/commandimagelist/lch_lineendstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_lineendstyle.png
diff --git a/default_images/res/commandimagelist/lch_linesquarearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linesquarearrow.png
index cde37ebed995..cde37ebed995 100644
--- a/default_images/res/commandimagelist/lch_linesquarearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linesquarearrow.png
diff --git a/default_images/res/commandimagelist/lch_linestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linestyle.png
index a61a1a6c31a1..a61a1a6c31a1 100644
--- a/default_images/res/commandimagelist/lch_linestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linestyle.png
diff --git a/default_images/res/commandimagelist/lch_linetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linetoolbox.png
index 34a68e479613..34a68e479613 100644
--- a/default_images/res/commandimagelist/lch_linetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linetoolbox.png
diff --git a/default_images/res/commandimagelist/lch_linewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linewidth.png
index 64fd27c27d5f..64fd27c27d5f 100644
--- a/default_images/res/commandimagelist/lch_linewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_linewidth.png
diff --git a/default_images/res/commandimagelist/lch_listbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_listbox.png
index dbc038bf66a2..dbc038bf66a2 100644
--- a/default_images/res/commandimagelist/lch_listbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_listbox.png
diff --git a/default_images/res/commandimagelist/lch_loadbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_loadbasic.png
index a7964383484e..a7964383484e 100644
--- a/default_images/res/commandimagelist/lch_loadbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_loadbasic.png
diff --git a/default_images/res/commandimagelist/lch_macrorecorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecorder.png
index 16ef57e0b0fc..16ef57e0b0fc 100644
--- a/default_images/res/commandimagelist/lch_macrorecorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecorder.png
diff --git a/default_images/res/commandimagelist/lch_macrorecordingfloat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecordingfloat.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_macrorecordingfloat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_macrorecordingfloat.png
diff --git a/default_images/res/commandimagelist/lch_mailwindow.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mailwindow.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_mailwindow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mailwindow.png
diff --git a/default_images/res/commandimagelist/lch_managebreakpoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managebreakpoints.png
index 4599ec7cf082..4599ec7cf082 100644
--- a/default_images/res/commandimagelist/lch_managebreakpoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managebreakpoints.png
diff --git a/default_images/res/commandimagelist/lch_managelanguage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managelanguage.png
index 77f006398a60..77f006398a60 100644
--- a/default_images/res/commandimagelist/lch_managelanguage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_managelanguage.png
diff --git a/default_images/res/commandimagelist/lch_marks.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_marks.png
index c1b284d40859..c1b284d40859 100644
--- a/default_images/res/commandimagelist/lch_marks.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_marks.png
diff --git a/default_images/res/commandimagelist/lch_matchgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_matchgroup.png
index 6769c00fba19..6769c00fba19 100644
--- a/default_images/res/commandimagelist/lch_matchgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_matchgroup.png
diff --git a/default_images/res/commandimagelist/lch_measureline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_measureline.png
index bf7cd92747c0..bf7cd92747c0 100644
--- a/default_images/res/commandimagelist/lch_measureline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_measureline.png
diff --git a/default_images/res/commandimagelist/lch_mergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergecells.png
index 1003d3c39f8b..1003d3c39f8b 100644
--- a/default_images/res/commandimagelist/lch_mergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergecells.png
diff --git a/default_images/res/commandimagelist/lch_mergedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergedialog.png
index 32a48130f3b8..32a48130f3b8 100644
--- a/default_images/res/commandimagelist/lch_mergedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mergedialog.png
diff --git a/default_images/res/commandimagelist/lch_mirror.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mirror.png
index 6db1e0e0f956..6db1e0e0f956 100644
--- a/default_images/res/commandimagelist/lch_mirror.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_mirror.png
diff --git a/default_images/res/commandimagelist/lch_modifyframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifyframe.png
index c4bfcaf9f954..c4bfcaf9f954 100644
--- a/default_images/res/commandimagelist/lch_modifyframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifyframe.png
diff --git a/default_images/res/commandimagelist/lch_modifypage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifypage.png
index 09d09d26828f..09d09d26828f 100644
--- a/default_images/res/commandimagelist/lch_modifypage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_modifypage.png
diff --git a/default_images/res/commandimagelist/lch_moduledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moduledialog.png
index 81cc653ce925..81cc653ce925 100644
--- a/default_images/res/commandimagelist/lch_moduledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moduledialog.png
diff --git a/default_images/res/commandimagelist/lch_morecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_morecontrols.png
index 0822a8159a9b..0822a8159a9b 100644
--- a/default_images/res/commandimagelist/lch_morecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_morecontrols.png
diff --git a/default_images/res/commandimagelist/lch_movedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedown.png
index 0a04b3544984..0a04b3544984 100644
--- a/default_images/res/commandimagelist/lch_movedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedown.png
diff --git a/default_images/res/commandimagelist/lch_movedownsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedownsubitems.png
index a86e5c677027..a86e5c677027 100644
--- a/default_images/res/commandimagelist/lch_movedownsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_movedownsubitems.png
diff --git a/default_images/res/commandimagelist/lch_moveup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveup.png
index bcf47ed9918c..bcf47ed9918c 100644
--- a/default_images/res/commandimagelist/lch_moveup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveup.png
diff --git a/default_images/res/commandimagelist/lch_moveupsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveupsubitems.png
index 66fc3e6f81a6..66fc3e6f81a6 100644
--- a/default_images/res/commandimagelist/lch_moveupsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_moveupsubitems.png
diff --git a/default_images/res/commandimagelist/lch_navigationbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigationbar.png
index e5463c52443e..e5463c52443e 100644
--- a/default_images/res/commandimagelist/lch_navigationbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigationbar.png
diff --git a/default_images/res/commandimagelist/lch_navigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigator.png
index 142ca8cf0b27..142ca8cf0b27 100644
--- a/default_images/res/commandimagelist/lch_navigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_navigator.png
diff --git a/default_images/res/commandimagelist/lch_newarrangement.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newarrangement.png
index bb6d6bf42cc1..bb6d6bf42cc1 100644
--- a/default_images/res/commandimagelist/lch_newarrangement.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newarrangement.png
diff --git a/default_images/res/commandimagelist/lch_newdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newdoc.png
index 3b4ed8743002..3b4ed8743002 100644
--- a/default_images/res/commandimagelist/lch_newdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newdoc.png
diff --git a/default_images/res/commandimagelist/lch_newrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newrecord.png
index f8c399d4d3d5..f8c399d4d3d5 100644
--- a/default_images/res/commandimagelist/lch_newrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_newrecord.png
diff --git a/default_images/res/commandimagelist/lch_nextannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextannotation.png
index 4bc858a55bdc..4bc858a55bdc 100644
--- a/default_images/res/commandimagelist/lch_nextannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextannotation.png
diff --git a/default_images/res/commandimagelist/lch_nextpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextpage.png
index 7aba8a131267..7aba8a131267 100644
--- a/default_images/res/commandimagelist/lch_nextpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextpage.png
diff --git a/default_images/res/commandimagelist/lch_nextrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextrecord.png
index 4c537b9952b1..4c537b9952b1 100644
--- a/default_images/res/commandimagelist/lch_nextrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_nextrecord.png
diff --git a/default_images/res/commandimagelist/lch_numberformatcurrency.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatcurrency.png
index 4e49f237994a..4e49f237994a 100644
--- a/default_images/res/commandimagelist/lch_numberformatcurrency.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatcurrency.png
diff --git a/default_images/res/commandimagelist/lch_numberformatdate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdate.png
index 48307be09e81..48307be09e81 100644
--- a/default_images/res/commandimagelist/lch_numberformatdate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdate.png
diff --git a/default_images/res/commandimagelist/lch_numberformatdecdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecdecimals.png
index 0ff41c48b005..0ff41c48b005 100644
--- a/default_images/res/commandimagelist/lch_numberformatdecdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecdecimals.png
diff --git a/default_images/res/commandimagelist/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecimal.png
index e02228dd02dc..e02228dd02dc 100644
--- a/default_images/res/commandimagelist/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/lch_numberformatincdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatincdecimals.png
index 7c7ac1dbe453..7c7ac1dbe453 100644
--- a/default_images/res/commandimagelist/lch_numberformatincdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatincdecimals.png
diff --git a/default_images/res/commandimagelist/lch_numberformatpercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatpercent.png
index 20c46a5963f9..20c46a5963f9 100644
--- a/default_images/res/commandimagelist/lch_numberformatpercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatpercent.png
diff --git a/default_images/res/commandimagelist/lch_numberformatscientific.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatscientific.png
index c37bae9fabf8..c37bae9fabf8 100644
--- a/default_images/res/commandimagelist/lch_numberformatscientific.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatscientific.png
diff --git a/default_images/res/commandimagelist/lch_numberformatstandard.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatstandard.png
index 04ccf33a52d4..04ccf33a52d4 100644
--- a/default_images/res/commandimagelist/lch_numberformatstandard.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberformatstandard.png
diff --git a/default_images/res/commandimagelist/lch_numberingstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberingstart.png
index 9a0e081a7508..9a0e081a7508 100644
--- a/default_images/res/commandimagelist/lch_numberingstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numberingstart.png
diff --git a/default_images/res/commandimagelist/lch_numericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numericfield.png
index 87103f498aea..87103f498aea 100644
--- a/default_images/res/commandimagelist/lch_numericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_numericfield.png
diff --git a/default_images/res/commandimagelist/lch_objectalign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalign.png
index 2946cda99455..2946cda99455 100644
--- a/default_images/res/commandimagelist/lch_objectalign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalign.png
diff --git a/default_images/res/commandimagelist/lch_objectalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignleft.png
index 2946cda99455..2946cda99455 100644
--- a/default_images/res/commandimagelist/lch_objectalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignleft.png
diff --git a/default_images/res/commandimagelist/lch_objectalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignright.png
index e0fe825d91bd..e0fe825d91bd 100644
--- a/default_images/res/commandimagelist/lch_objectalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectalignright.png
diff --git a/default_images/res/commandimagelist/lch_objectcatalog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectcatalog.png
index d97ac5b5b634..d97ac5b5b634 100644
--- a/default_images/res/commandimagelist/lch_objectcatalog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectcatalog.png
diff --git a/default_images/res/commandimagelist/lch_objectposition.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectposition.png
index b635afc71812..b635afc71812 100644
--- a/default_images/res/commandimagelist/lch_objectposition.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objectposition.png
diff --git a/default_images/res/commandimagelist/lch_objects3dtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objects3dtoolbox.png
index d1338bb7ad2e..d1338bb7ad2e 100644
--- a/default_images/res/commandimagelist/lch_objects3dtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_objects3dtoolbox.png
diff --git a/default_images/res/commandimagelist/lch_open.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_open.png
index ab22bf9486dd..ab22bf9486dd 100644
--- a/default_images/res/commandimagelist/lch_open.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_open.png
diff --git a/default_images/res/commandimagelist/lch_openreadonly.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openreadonly.png
index df7ae519b71b..df7ae519b71b 100644
--- a/default_images/res/commandimagelist/lch_openreadonly.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openreadonly.png
diff --git a/default_images/res/commandimagelist/lch_openurl.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openurl.png
index fbb0d3d844e0..fbb0d3d844e0 100644
--- a/default_images/res/commandimagelist/lch_openurl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_openurl.png
diff --git a/default_images/res/commandimagelist/lch_optimizetable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_optimizetable.png
index 44944c55e8ec..44944c55e8ec 100644
--- a/default_images/res/commandimagelist/lch_optimizetable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_optimizetable.png
diff --git a/default_images/res/commandimagelist/lch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ordercrit.png
index e54d5a57f1c4..e54d5a57f1c4 100644
--- a/default_images/res/commandimagelist/lch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ordercrit.png
diff --git a/default_images/res/commandimagelist/lch_outlinebullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinebullet.png
index 148e5fdc752b..148e5fdc752b 100644
--- a/default_images/res/commandimagelist/lch_outlinebullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinebullet.png
diff --git a/default_images/res/commandimagelist/lch_outlinecollapse.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapse.png
index 505963375397..505963375397 100644
--- a/default_images/res/commandimagelist/lch_outlinecollapse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapse.png
diff --git a/default_images/res/commandimagelist/lch_outlinecollapseall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapseall.png
index 8b6dab11bb07..8b6dab11bb07 100644
--- a/default_images/res/commandimagelist/lch_outlinecollapseall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinecollapseall.png
diff --git a/default_images/res/commandimagelist/lch_outlinedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinedown.png
index 0a04b3544984..0a04b3544984 100644
--- a/default_images/res/commandimagelist/lch_outlinedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinedown.png
diff --git a/default_images/res/commandimagelist/lch_outlineexpand.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpand.png
index d8ff4d007f91..d8ff4d007f91 100644
--- a/default_images/res/commandimagelist/lch_outlineexpand.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpand.png
diff --git a/default_images/res/commandimagelist/lch_outlineexpandall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpandall.png
index dcf2783108b0..dcf2783108b0 100644
--- a/default_images/res/commandimagelist/lch_outlineexpandall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineexpandall.png
diff --git a/default_images/res/commandimagelist/lch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinefont.png
index 9e3979228b8c..9e3979228b8c 100644
--- a/default_images/res/commandimagelist/lch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlinefont.png
diff --git a/default_images/res/commandimagelist/lch_outlineformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineformat.png
index 795384d6fccb..795384d6fccb 100644
--- a/default_images/res/commandimagelist/lch_outlineformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineformat.png
diff --git a/default_images/res/commandimagelist/lch_outlineleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineleft.png
index 8da4b49266e6..8da4b49266e6 100644
--- a/default_images/res/commandimagelist/lch_outlineleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineleft.png
diff --git a/default_images/res/commandimagelist/lch_outlineright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineright.png
index c76b0ac6f1d2..c76b0ac6f1d2 100644
--- a/default_images/res/commandimagelist/lch_outlineright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineright.png
diff --git a/default_images/res/commandimagelist/lch_outlineup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineup.png
index 1f8c58d508aa..1f8c58d508aa 100644
--- a/default_images/res/commandimagelist/lch_outlineup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_outlineup.png
diff --git a/default_images/res/commandimagelist/lch_overline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_overline.png
index f9a253069780..f9a253069780 100644
--- a/default_images/res/commandimagelist/lch_overline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_overline.png
diff --git a/default_images/res/commandimagelist/lch_pagedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pagedown.png
index 2ede714197bc..2ede714197bc 100644
--- a/default_images/res/commandimagelist/lch_pagedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pagedown.png
diff --git a/default_images/res/commandimagelist/lch_pageup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pageup.png
index 508b7d5ddb18..508b7d5ddb18 100644
--- a/default_images/res/commandimagelist/lch_pageup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pageup.png
diff --git a/default_images/res/commandimagelist/lch_paragraphdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paragraphdialog.png
index 5aeb4f0c6bdc..5aeb4f0c6bdc 100644
--- a/default_images/res/commandimagelist/lch_paragraphdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paragraphdialog.png
diff --git a/default_images/res/commandimagelist/lch_paralefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paralefttoright.png
index a4b58d8d0749..a4b58d8d0749 100644
--- a/default_images/res/commandimagelist/lch_paralefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paralefttoright.png
diff --git a/default_images/res/commandimagelist/lch_pararighttoleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pararighttoleft.png
index b55becf1b995..b55becf1b995 100644
--- a/default_images/res/commandimagelist/lch_pararighttoleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pararighttoleft.png
diff --git a/default_images/res/commandimagelist/lch_paraspacedecrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspacedecrease.png
index 674d12f4f81f..674d12f4f81f 100644
--- a/default_images/res/commandimagelist/lch_paraspacedecrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspacedecrease.png
diff --git a/default_images/res/commandimagelist/lch_paraspaceincrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspaceincrease.png
index 76deb2176fb9..76deb2176fb9 100644
--- a/default_images/res/commandimagelist/lch_paraspaceincrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paraspaceincrease.png
diff --git a/default_images/res/commandimagelist/lch_paste.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paste.png
index 6d1894023f38..6d1894023f38 100644
--- a/default_images/res/commandimagelist/lch_paste.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_paste.png
diff --git a/default_images/res/commandimagelist/lch_patternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_patternfield.png
index 358b89a5f7b6..358b89a5f7b6 100644
--- a/default_images/res/commandimagelist/lch_patternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_patternfield.png
diff --git a/default_images/res/commandimagelist/lch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pickthrough.png
index 0e38ae956967..0e38ae956967 100644
--- a/default_images/res/commandimagelist/lch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pickthrough.png
diff --git a/default_images/res/commandimagelist/lch_pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie.png
index 7e8eb6efa2b8..7e8eb6efa2b8 100644
--- a/default_images/res/commandimagelist/lch_pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie.png
diff --git a/default_images/res/commandimagelist/lch_pie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie_unfilled.png
index 390895c9ff7b..390895c9ff7b 100644
--- a/default_images/res/commandimagelist/lch_pie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pie_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_playmacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_playmacro.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_playmacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_playmacro.png
diff --git a/default_images/res/commandimagelist/lch_pluginsactive.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pluginsactive.png
index d19efdd77a9b..d19efdd77a9b 100644
--- a/default_images/res/commandimagelist/lch_pluginsactive.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pluginsactive.png
diff --git a/default_images/res/commandimagelist/lch_polygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon.png
index fb63b0c50bfa..fb63b0c50bfa 100644
--- a/default_images/res/commandimagelist/lch_polygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon.png
diff --git a/default_images/res/commandimagelist/lch_polygon_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal.png
index adc640508435..adc640508435 100644
--- a/default_images/res/commandimagelist/lch_polygon_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal.png
diff --git a/default_images/res/commandimagelist/lch_polygon_diagonal_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal_unfilled.png
index cf18983c218c..cf18983c218c 100644
--- a/default_images/res/commandimagelist/lch_polygon_diagonal_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_diagonal_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_polygon_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_unfilled.png
index 3fdea258b5e0..3fdea258b5e0 100644
--- a/default_images/res/commandimagelist/lch_polygon_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_polygon_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_presentation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentation.png
index eeac9ddf4e8c..eeac9ddf4e8c 100644
--- a/default_images/res/commandimagelist/lch_presentation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentation.png
diff --git a/default_images/res/commandimagelist/lch_presentationlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentationlayout.png
index 9013c9e7e7f3..9013c9e7e7f3 100644
--- a/default_images/res/commandimagelist/lch_presentationlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_presentationlayout.png
diff --git a/default_images/res/commandimagelist/lch_preview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_preview.png
index fdebd5bdf8e5..fdebd5bdf8e5 100644
--- a/default_images/res/commandimagelist/lch_preview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_preview.png
diff --git a/default_images/res/commandimagelist/lch_previewprintoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewprintoptions.png
index e4bb819967e1..e4bb819967e1 100644
--- a/default_images/res/commandimagelist/lch_previewprintoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewprintoptions.png
diff --git a/default_images/res/commandimagelist/lch_previewzoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewzoom.png
index 435846e077ff..435846e077ff 100644
--- a/default_images/res/commandimagelist/lch_previewzoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previewzoom.png
diff --git a/default_images/res/commandimagelist/lch_previousannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previousannotation.png
index cfc6b8f021d6..cfc6b8f021d6 100644
--- a/default_images/res/commandimagelist/lch_previousannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previousannotation.png
diff --git a/default_images/res/commandimagelist/lch_previouspage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previouspage.png
index 508b7d5ddb18..508b7d5ddb18 100644
--- a/default_images/res/commandimagelist/lch_previouspage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_previouspage.png
diff --git a/default_images/res/commandimagelist/lch_prevrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_prevrecord.png
index 940212f66abd..940212f66abd 100644
--- a/default_images/res/commandimagelist/lch_prevrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_prevrecord.png
diff --git a/default_images/res/commandimagelist/lch_print.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_print.png
index 9950dfb640f6..9950dfb640f6 100644
--- a/default_images/res/commandimagelist/lch_print.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_print.png
diff --git a/default_images/res/commandimagelist/lch_printdefault.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printdefault.png
index 21e2aa663dcf..21e2aa663dcf 100644
--- a/default_images/res/commandimagelist/lch_printdefault.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printdefault.png
diff --git a/default_images/res/commandimagelist/lch_printersetup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printersetup.png
index d4a7c5400b26..d4a7c5400b26 100644
--- a/default_images/res/commandimagelist/lch_printersetup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printersetup.png
diff --git a/default_images/res/commandimagelist/lch_printlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printlayout.png
index 8e7f16b1d0d6..8e7f16b1d0d6 100644
--- a/default_images/res/commandimagelist/lch_printlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printlayout.png
diff --git a/default_images/res/commandimagelist/lch_printpagepreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpagepreview.png
index 51578f054cdf..51578f054cdf 100644
--- a/default_images/res/commandimagelist/lch_printpagepreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpagepreview.png
diff --git a/default_images/res/commandimagelist/lch_printpreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpreview.png
index a95a92c60e12..a95a92c60e12 100644
--- a/default_images/res/commandimagelist/lch_printpreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_printpreview.png
diff --git a/default_images/res/commandimagelist/lch_progressbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_progressbar.png
index 70492efcd095..70492efcd095 100644
--- a/default_images/res/commandimagelist/lch_progressbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_progressbar.png
diff --git a/default_images/res/commandimagelist/lch_pushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pushbutton.png
index 46454486eb2a..46454486eb2a 100644
--- a/default_images/res/commandimagelist/lch_pushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_pushbutton.png
diff --git a/default_images/res/commandimagelist/lch_quickedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quickedit.png
index 6dc4293e83ff..6dc4293e83ff 100644
--- a/default_images/res/commandimagelist/lch_quickedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quickedit.png
diff --git a/default_images/res/commandimagelist/lch_quit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quit.png
index 7da933da25cc..7da933da25cc 100644
--- a/default_images/res/commandimagelist/lch_quit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_quit.png
diff --git a/default_images/res/commandimagelist/lch_radiobutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_radiobutton.png
index 16488054c1f2..16488054c1f2 100644
--- a/default_images/res/commandimagelist/lch_radiobutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_radiobutton.png
diff --git a/default_images/res/commandimagelist/lch_recsave.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsave.png
index 42239f157116..42239f157116 100644
--- a/default_images/res/commandimagelist/lch_recsave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsave.png
diff --git a/default_images/res/commandimagelist/lch_recsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsearch.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/commandimagelist/lch_recsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recsearch.png
diff --git a/default_images/res/commandimagelist/lch_rect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect.png
index 6c4541bb8158..6c4541bb8158 100644
--- a/default_images/res/commandimagelist/lch_rect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect.png
diff --git a/default_images/res/commandimagelist/lch_rect_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded.png
index 21ebbb9b5e2f..21ebbb9b5e2f 100644
--- a/default_images/res/commandimagelist/lch_rect_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded.png
diff --git a/default_images/res/commandimagelist/lch_rect_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded_unfilled.png
index 6d28c0239033..6d28c0239033 100644
--- a/default_images/res/commandimagelist/lch_rect_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_rect_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_unfilled.png
index 8c0360b27720..8c0360b27720 100644
--- a/default_images/res/commandimagelist/lch_rect_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rect_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_rectangletoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rectangletoolbox.png
index 6c4541bb8158..6c4541bb8158 100644
--- a/default_images/res/commandimagelist/lch_rectangletoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rectangletoolbox.png
diff --git a/default_images/res/commandimagelist/lch_recundo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recundo.png
index 83b7f6057455..83b7f6057455 100644
--- a/default_images/res/commandimagelist/lch_recundo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_recundo.png
diff --git a/default_images/res/commandimagelist/lch_redo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_redo.png
index ebae5235e862..ebae5235e862 100644
--- a/default_images/res/commandimagelist/lch_redo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_redo.png
diff --git a/default_images/res/commandimagelist/lch_refresh.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refresh.png
index 5e991f6d5511..5e991f6d5511 100644
--- a/default_images/res/commandimagelist/lch_refresh.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refresh.png
diff --git a/default_images/res/commandimagelist/lch_refreshformcontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refreshformcontrol.png
index 15f9b7f4d969..15f9b7f4d969 100644
--- a/default_images/res/commandimagelist/lch_refreshformcontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_refreshformcontrol.png
diff --git a/default_images/res/commandimagelist/lch_rehearsetimings.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rehearsetimings.png
index 3818d395ea69..3818d395ea69 100644
--- a/default_images/res/commandimagelist/lch_rehearsetimings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rehearsetimings.png
diff --git a/default_images/res/commandimagelist/lch_reload.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reload.png
index 6cbb51e3265e..6cbb51e3265e 100644
--- a/default_images/res/commandimagelist/lch_reload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reload.png
diff --git a/default_images/res/commandimagelist/lch_removebullets.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removebullets.png
index 3b51ceaaae66..3b51ceaaae66 100644
--- a/default_images/res/commandimagelist/lch_removebullets.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removebullets.png
diff --git a/default_images/res/commandimagelist/lch_removefilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefilter.png
index a973dad9a1aa..a973dad9a1aa 100644
--- a/default_images/res/commandimagelist/lch_removefilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefilter.png
diff --git a/default_images/res/commandimagelist/lch_removefiltersort.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefiltersort.png
index a973dad9a1aa..a973dad9a1aa 100644
--- a/default_images/res/commandimagelist/lch_removefiltersort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_removefiltersort.png
diff --git a/default_images/res/commandimagelist/lch_renamemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_renamemasterpage.png
index 2cf5bf55a990..2cf5bf55a990 100644
--- a/default_images/res/commandimagelist/lch_renamemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_renamemasterpage.png
diff --git a/default_images/res/commandimagelist/lch_repeat.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_repeat.png
index c27027fa4cb8..c27027fa4cb8 100644
--- a/default_images/res/commandimagelist/lch_repeat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_repeat.png
diff --git a/default_images/res/commandimagelist/lch_reportnavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reportnavigator.png
index 4667bda7fe37..4667bda7fe37 100644
--- a/default_images/res/commandimagelist/lch_reportnavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reportnavigator.png
diff --git a/default_images/res/commandimagelist/lch_reverseorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reverseorder.png
index aef4c4b4513a..aef4c4b4513a 100644
--- a/default_images/res/commandimagelist/lch_reverseorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_reverseorder.png
diff --git a/default_images/res/commandimagelist/lch_rightpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rightpara.png
index 073da720a0c4..073da720a0c4 100644
--- a/default_images/res/commandimagelist/lch_rightpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rightpara.png
diff --git a/default_images/res/commandimagelist/lch_rulerrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrows.png
index f3fe93f1e3ab..f3fe93f1e3ab 100644
--- a/default_images/res/commandimagelist/lch_rulerrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrows.png
diff --git a/default_images/res/commandimagelist/lch_rulerrowsvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrowsvertical.png
index a72ced771770..a72ced771770 100644
--- a/default_images/res/commandimagelist/lch_rulerrowsvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_rulerrowsvertical.png
diff --git a/default_images/res/commandimagelist/lch_runbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_runbasic.png
index dd4a8b337f21..dd4a8b337f21 100644
--- a/default_images/res/commandimagelist/lch_runbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_runbasic.png
diff --git a/default_images/res/commandimagelist/lch_save.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_save.png
index d40dc75a0e9c..d40dc75a0e9c 100644
--- a/default_images/res/commandimagelist/lch_save.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_save.png
diff --git a/default_images/res/commandimagelist/lch_saveas.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveas.png
index 763cd6b2d9f7..763cd6b2d9f7 100644
--- a/default_images/res/commandimagelist/lch_saveas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveas.png
diff --git a/default_images/res/commandimagelist/lch_saveastemplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveastemplate.png
index f15f0c19af9a..f15f0c19af9a 100644
--- a/default_images/res/commandimagelist/lch_saveastemplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_saveastemplate.png
diff --git a/default_images/res/commandimagelist/lch_savebasicas.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_savebasicas.png
index 3d87be88b5ab..3d87be88b5ab 100644
--- a/default_images/res/commandimagelist/lch_savebasicas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_savebasicas.png
diff --git a/default_images/res/commandimagelist/lch_sbabrwinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbabrwinsert.png
index 972c1e9c88bd..972c1e9c88bd 100644
--- a/default_images/res/commandimagelist/lch_sbabrwinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbabrwinsert.png
diff --git a/default_images/res/commandimagelist/lch_sbaexecutesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbaexecutesql.png
index 829fd179325d..829fd179325d 100644
--- a/default_images/res/commandimagelist/lch_sbaexecutesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbaexecutesql.png
diff --git a/default_images/res/commandimagelist/lch_sbanativesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbanativesql.png
index 24f7b7dcb222..24f7b7dcb222 100644
--- a/default_images/res/commandimagelist/lch_sbanativesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sbanativesql.png
diff --git a/default_images/res/commandimagelist/lch_scaletext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scaletext.png
index 9e3bca535c39..9e3bca535c39 100644
--- a/default_images/res/commandimagelist/lch_scaletext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scaletext.png
diff --git a/default_images/res/commandimagelist/lch_scrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scrollbar.png
index ffba6ae86c00..ffba6ae86c00 100644
--- a/default_images/res/commandimagelist/lch_scrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_scrollbar.png
diff --git a/default_images/res/commandimagelist/lch_searchdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_searchdialog.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/commandimagelist/lch_searchdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_searchdialog.png
diff --git a/default_images/res/commandimagelist/lch_sectionalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignbottom.png
index 4f3a375090f2..4f3a375090f2 100644
--- a/default_images/res/commandimagelist/lch_sectionalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignbottom.png
diff --git a/default_images/res/commandimagelist/lch_sectionalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignleft.png
index ea05965cf840..ea05965cf840 100644
--- a/default_images/res/commandimagelist/lch_sectionalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignleft.png
diff --git a/default_images/res/commandimagelist/lch_sectionalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignright.png
index c73689b46daf..c73689b46daf 100644
--- a/default_images/res/commandimagelist/lch_sectionalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionalignright.png
diff --git a/default_images/res/commandimagelist/lch_sectionaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionaligntop.png
index 1e33a0dd2229..1e33a0dd2229 100644
--- a/default_images/res/commandimagelist/lch_sectionaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionaligntop.png
diff --git a/default_images/res/commandimagelist/lch_sectionshrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrink.png
index 19affdf918f6..19affdf918f6 100644
--- a/default_images/res/commandimagelist/lch_sectionshrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrink.png
diff --git a/default_images/res/commandimagelist/lch_sectionshrinkbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinkbottom.png
index 2f468938fdf0..2f468938fdf0 100644
--- a/default_images/res/commandimagelist/lch_sectionshrinkbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinkbottom.png
diff --git a/default_images/res/commandimagelist/lch_sectionshrinktop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinktop.png
index 8ea155b2ddbc..8ea155b2ddbc 100644
--- a/default_images/res/commandimagelist/lch_sectionshrinktop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sectionshrinktop.png
diff --git a/default_images/res/commandimagelist/lch_selectall.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectall.png
index b4ec2fa8171d..b4ec2fa8171d 100644
--- a/default_images/res/commandimagelist/lch_selectall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectall.png
diff --git a/default_images/res/commandimagelist/lch_selectmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectmode.png
index f04e1c79aed8..f04e1c79aed8 100644
--- a/default_images/res/commandimagelist/lch_selectmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectmode.png
diff --git a/default_images/res/commandimagelist/lch_selectobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectobject.png
index eb965188f8a0..eb965188f8a0 100644
--- a/default_images/res/commandimagelist/lch_selectobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selectobject.png
diff --git a/default_images/res/commandimagelist/lch_selecttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selecttable.png
index bf9d3f0896ea..bf9d3f0896ea 100644
--- a/default_images/res/commandimagelist/lch_selecttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_selecttable.png
diff --git a/default_images/res/commandimagelist/lch_sendfax.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendfax.png
index c5a25f1bf070..c5a25f1bf070 100644
--- a/default_images/res/commandimagelist/lch_sendfax.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendfax.png
diff --git a/default_images/res/commandimagelist/lch_sendmail.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendmail.png
index a8db064523b1..a8db064523b1 100644
--- a/default_images/res/commandimagelist/lch_sendmail.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendmail.png
diff --git a/default_images/res/commandimagelist/lch_sendtoback.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendtoback.png
index f0c5a60f9647..f0c5a60f9647 100644
--- a/default_images/res/commandimagelist/lch_sendtoback.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sendtoback.png
diff --git a/default_images/res/commandimagelist/lch_setborderstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setborderstyle.png
index 16e46170710f..16e46170710f 100644
--- a/default_images/res/commandimagelist/lch_setborderstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setborderstyle.png
diff --git a/default_images/res/commandimagelist/lch_setdocumentproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setdocumentproperties.png
index 6fc57645c46c..6fc57645c46c 100644
--- a/default_images/res/commandimagelist/lch_setdocumentproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setdocumentproperties.png
diff --git a/default_images/res/commandimagelist/lch_setobjecttobackground.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttobackground.png
index 1513994a7b43..1513994a7b43 100644
--- a/default_images/res/commandimagelist/lch_setobjecttobackground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttobackground.png
diff --git a/default_images/res/commandimagelist/lch_setobjecttoforeground.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttoforeground.png
index 9964b1e0877b..9964b1e0877b 100644
--- a/default_images/res/commandimagelist/lch_setobjecttoforeground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setobjecttoforeground.png
diff --git a/default_images/res/commandimagelist/lch_setoptimalcolumnwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidth.png
index f7a8c17b75fc..f7a8c17b75fc 100644
--- a/default_images/res/commandimagelist/lch_setoptimalcolumnwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidth.png
diff --git a/default_images/res/commandimagelist/lch_setoptimalcolumnwidthdirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidthdirect.png
index 7f8a585061bd..7f8a585061bd 100644
--- a/default_images/res/commandimagelist/lch_setoptimalcolumnwidthdirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalcolumnwidthdirect.png
diff --git a/default_images/res/commandimagelist/lch_setoptimalrowheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalrowheight.png
index d4ef90e61997..d4ef90e61997 100644
--- a/default_images/res/commandimagelist/lch_setoptimalrowheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_setoptimalrowheight.png
diff --git a/default_images/res/commandimagelist/lch_shadowcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowcursor.png
index 24d77cf14855..24d77cf14855 100644
--- a/default_images/res/commandimagelist/lch_shadowcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowcursor.png
diff --git a/default_images/res/commandimagelist/lch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowed.png
index 1bb802ddfc69..1bb802ddfc69 100644
--- a/default_images/res/commandimagelist/lch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shadowed.png
diff --git a/default_images/res/commandimagelist/lch_shear.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shear.png
index 94c82aba07d3..94c82aba07d3 100644
--- a/default_images/res/commandimagelist/lch_shear.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shear.png
diff --git a/default_images/res/commandimagelist/lch_shell3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shell3d.png
index e82dd27be38b..e82dd27be38b 100644
--- a/default_images/res/commandimagelist/lch_shell3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shell3d.png
diff --git a/default_images/res/commandimagelist/lch_showannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotation.png
index 7c12bb0decf7..7c12bb0decf7 100644
--- a/default_images/res/commandimagelist/lch_showannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showannotation.png
diff --git a/default_images/res/commandimagelist/lch_showbookview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbookview.png
index 7b00e601b170..7b00e601b170 100644
--- a/default_images/res/commandimagelist/lch_showbookview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbookview.png
diff --git a/default_images/res/commandimagelist/lch_showbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbrowser.png
index 2e3f431ae631..2e3f431ae631 100644
--- a/default_images/res/commandimagelist/lch_showbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showbrowser.png
diff --git a/default_images/res/commandimagelist/lch_showdatanavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showdatanavigator.png
index 3e705d147da0..3e705d147da0 100644
--- a/default_images/res/commandimagelist/lch_showdatanavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showdatanavigator.png
diff --git a/default_images/res/commandimagelist/lch_showfmexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showfmexplorer.png
index 3e8dae47e01f..3e8dae47e01f 100644
--- a/default_images/res/commandimagelist/lch_showfmexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showfmexplorer.png
diff --git a/default_images/res/commandimagelist/lch_showmultiplepages.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showmultiplepages.png
index 7226eeaba4af..7226eeaba4af 100644
--- a/default_images/res/commandimagelist/lch_showmultiplepages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showmultiplepages.png
diff --git a/default_images/res/commandimagelist/lch_showpropbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showpropbrowser.png
index 84271204703f..84271204703f 100644
--- a/default_images/res/commandimagelist/lch_showpropbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showpropbrowser.png
diff --git a/default_images/res/commandimagelist/lch_showslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showslide.png
index c0b2decb4718..c0b2decb4718 100644
--- a/default_images/res/commandimagelist/lch_showslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showslide.png
diff --git a/default_images/res/commandimagelist/lch_showtwopages.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showtwopages.png
index 474b0d4d756e..474b0d4d756e 100644
--- a/default_images/res/commandimagelist/lch_showtwopages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_showtwopages.png
diff --git a/default_images/res/commandimagelist/lch_shrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shrink.png
index 73de1b5a7ae6..73de1b5a7ae6 100644
--- a/default_images/res/commandimagelist/lch_shrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_shrink.png
diff --git a/default_images/res/commandimagelist/lch_smallestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestheight.png
index 0beb459fa8a8..0beb459fa8a8 100644
--- a/default_images/res/commandimagelist/lch_smallestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestheight.png
diff --git a/default_images/res/commandimagelist/lch_smallestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestwidth.png
index 793d24c027a5..793d24c027a5 100644
--- a/default_images/res/commandimagelist/lch_smallestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_smallestwidth.png
diff --git a/default_images/res/commandimagelist/lch_snapborder.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapborder.png
index e93977f60ae0..e93977f60ae0 100644
--- a/default_images/res/commandimagelist/lch_snapborder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapborder.png
diff --git a/default_images/res/commandimagelist/lch_snapframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapframe.png
index cb2559f10e3c..cb2559f10e3c 100644
--- a/default_images/res/commandimagelist/lch_snapframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snapframe.png
diff --git a/default_images/res/commandimagelist/lch_snappoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snappoints.png
index 384c36c204f9..384c36c204f9 100644
--- a/default_images/res/commandimagelist/lch_snappoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_snappoints.png
diff --git a/default_images/res/commandimagelist/lch_solidcreate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_solidcreate.png
index 1b8bbb7ac76b..1b8bbb7ac76b 100644
--- a/default_images/res/commandimagelist/lch_solidcreate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_solidcreate.png
diff --git a/default_images/res/commandimagelist/lch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortascending.png
index e831f90cecb7..e831f90cecb7 100644
--- a/default_images/res/commandimagelist/lch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortascending.png
diff --git a/default_images/res/commandimagelist/lch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdescending.png
index 4359b34c8b96..4359b34c8b96 100644
--- a/default_images/res/commandimagelist/lch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdescending.png
diff --git a/default_images/res/commandimagelist/lch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdown.png
index c4402ef7737c..c4402ef7737c 100644
--- a/default_images/res/commandimagelist/lch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortdown.png
diff --git a/default_images/res/commandimagelist/lch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortup.png
index 2b95a2600027..2b95a2600027 100644
--- a/default_images/res/commandimagelist/lch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sortup.png
diff --git a/default_images/res/commandimagelist/lch_sourceview.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sourceview.png
index 7a207fd42d7a..7a207fd42d7a 100644
--- a/default_images/res/commandimagelist/lch_sourceview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sourceview.png
diff --git a/default_images/res/commandimagelist/lch_spacepara1.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara1.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/res/commandimagelist/lch_spacepara1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara1.png
diff --git a/default_images/res/commandimagelist/lch_spacepara15.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara15.png
index f45eaeb8badc..f45eaeb8badc 100644
--- a/default_images/res/commandimagelist/lch_spacepara15.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara15.png
diff --git a/default_images/res/commandimagelist/lch_spacepara2.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara2.png
index 191cf44563d5..191cf44563d5 100644
--- a/default_images/res/commandimagelist/lch_spacepara2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spacepara2.png
diff --git a/default_images/res/commandimagelist/lch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelldialog.png
index ab0f02b22d14..ab0f02b22d14 100644
--- a/default_images/res/commandimagelist/lch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelldialog.png
diff --git a/default_images/res/commandimagelist/lch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelling.png
index ab0f02b22d14..ab0f02b22d14 100644
--- a/default_images/res/commandimagelist/lch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spelling.png
diff --git a/default_images/res/commandimagelist/lch_spellingandgrammardialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellingandgrammardialog.png
index ab0f02b22d14..ab0f02b22d14 100644
--- a/default_images/res/commandimagelist/lch_spellingandgrammardialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellingandgrammardialog.png
diff --git a/default_images/res/commandimagelist/lch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellonline.png
index 3804f77e343a..3804f77e343a 100644
--- a/default_images/res/commandimagelist/lch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spellonline.png
diff --git a/default_images/res/commandimagelist/lch_sphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sphere.png
index 0b3af098ff6b..0b3af098ff6b 100644
--- a/default_images/res/commandimagelist/lch_sphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_sphere.png
diff --git a/default_images/res/commandimagelist/lch_spinbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spinbutton.png
index 363ebb19c1b2..363ebb19c1b2 100644
--- a/default_images/res/commandimagelist/lch_spinbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_spinbutton.png
diff --git a/default_images/res/commandimagelist/lch_splitcell.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitcell.png
index 7a25f88119ff..7a25f88119ff 100644
--- a/default_images/res/commandimagelist/lch_splitcell.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitcell.png
diff --git a/default_images/res/commandimagelist/lch_splithorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splithorizontal.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splithorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splithorizontal.png
diff --git a/default_images/res/commandimagelist/lch_splitparenthorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparenthorizontal.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splitparenthorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparenthorizontal.png
diff --git a/default_images/res/commandimagelist/lch_splitparentvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparentvertical.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splitparentvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitparentvertical.png
diff --git a/default_images/res/commandimagelist/lch_splitvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitvertical.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_splitvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_splitvertical.png
diff --git a/default_images/res/commandimagelist/lch_square.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square.png
index 57b939d774cb..57b939d774cb 100644
--- a/default_images/res/commandimagelist/lch_square.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square.png
diff --git a/default_images/res/commandimagelist/lch_square_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded.png
index 429f9bbfe20b..429f9bbfe20b 100644
--- a/default_images/res/commandimagelist/lch_square_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded.png
diff --git a/default_images/res/commandimagelist/lch_square_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded_unfilled.png
index 317d7c9992b2..317d7c9992b2 100644
--- a/default_images/res/commandimagelist/lch_square_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_square_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_unfilled.png
index 8ee3fe7a4cce..8ee3fe7a4cce 100644
--- a/default_images/res/commandimagelist/lch_square_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_square_unfilled.png
diff --git a/default_images/res/commandimagelist/lch_starchartdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starchartdialog.png
index d5ca8ff8e96c..d5ca8ff8e96c 100644
--- a/default_images/res/commandimagelist/lch_starchartdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starchartdialog.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.bang.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.bang.png
index 9f51f683f09e..9f51f683f09e 100644
--- a/default_images/res/commandimagelist/lch_starshapes.bang.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.bang.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.concave-star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.concave-star6.png
index 98ca635d2fb1..98ca635d2fb1 100644
--- a/default_images/res/commandimagelist/lch_starshapes.concave-star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.concave-star6.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.doorplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.doorplate.png
index f4ad37768e04..f4ad37768e04 100644
--- a/default_images/res/commandimagelist/lch_starshapes.doorplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.doorplate.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.horizontal-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.horizontal-scroll.png
index d2ec842d0116..d2ec842d0116 100644
--- a/default_images/res/commandimagelist/lch_starshapes.horizontal-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.horizontal-scroll.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.png
index 17df0ea360d0..17df0ea360d0 100644
--- a/default_images/res/commandimagelist/lch_starshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.signet.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.signet.png
index 9c1ef05a9a26..9c1ef05a9a26 100644
--- a/default_images/res/commandimagelist/lch_starshapes.signet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.signet.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star12.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star12.png
index b31b5b317d81..b31b5b317d81 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star12.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star12.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star24.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star24.png
index f8120b1bb136..f8120b1bb136 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star24.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star24.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star4.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star4.png
index 42cdbac8b47f..42cdbac8b47f 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star4.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star4.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star5.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star5.png
index 3fffaefc699c..3fffaefc699c 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star5.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star5.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star6.png
index 8f1e5987019d..8f1e5987019d 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star6.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.star8.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star8.png
index b4e1b157d04e..b4e1b157d04e 100644
--- a/default_images/res/commandimagelist/lch_starshapes.star8.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.star8.png
diff --git a/default_images/res/commandimagelist/lch_starshapes.vertical-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.vertical-scroll.png
index c57cc2927b34..c57cc2927b34 100644
--- a/default_images/res/commandimagelist/lch_starshapes.vertical-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_starshapes.vertical-scroll.png
diff --git a/default_images/res/commandimagelist/lch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_strikeout.png
index 1a6468db23cf..1a6468db23cf 100644
--- a/default_images/res/commandimagelist/lch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_strikeout.png
diff --git a/default_images/res/commandimagelist/lch_styleapply.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleapply.png
index 2feb2b0b85cf..2feb2b0b85cf 100644
--- a/default_images/res/commandimagelist/lch_styleapply.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleapply.png
diff --git a/default_images/res/commandimagelist/lch_stylenewbyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_stylenewbyexample.png
index c55e3112d07c..c55e3112d07c 100644
--- a/default_images/res/commandimagelist/lch_stylenewbyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_stylenewbyexample.png
diff --git a/default_images/res/commandimagelist/lch_styleupdatebyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleupdatebyexample.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_styleupdatebyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_styleupdatebyexample.png
diff --git a/default_images/res/commandimagelist/lch_subscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_subscript.png
index 7c5b66468331..7c5b66468331 100644
--- a/default_images/res/commandimagelist/lch_subscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_subscript.png
diff --git a/default_images/res/commandimagelist/lch_superscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_superscript.png
index 46920237b587..46920237b587 100644
--- a/default_images/res/commandimagelist/lch_superscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_superscript.png
diff --git a/default_images/res/commandimagelist/lch_switchcontroldesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchcontroldesignmode.png
index fd8864cc579c..fd8864cc579c 100644
--- a/default_images/res/commandimagelist/lch_switchcontroldesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchcontroldesignmode.png
diff --git a/default_images/res/commandimagelist/lch_switchxformsdesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchxformsdesignmode.png
index fd8864cc579c..fd8864cc579c 100644
--- a/default_images/res/commandimagelist/lch_switchxformsdesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_switchxformsdesignmode.png
diff --git a/default_images/res/commandimagelist/lch_symbolcatalogue.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolcatalogue.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/default_images/res/commandimagelist/lch_symbolcatalogue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolcatalogue.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.brace-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.brace-pair.png
index accae4d96318..accae4d96318 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.brace-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.brace-pair.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.bracket-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.bracket-pair.png
index 40f62798c26a..40f62798c26a 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.bracket-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.bracket-pair.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.cloud.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.cloud.png
index 767dd84a975b..767dd84a975b 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.cloud.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.cloud.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.diamond-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.diamond-bevel.png
index e9f66bd1de7e..e9f66bd1de7e 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.diamond-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.diamond-bevel.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.flower.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.flower.png
index 3b2f50f67505..3b2f50f67505 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.flower.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.flower.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.forbidden.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.forbidden.png
index 4087574739e2..4087574739e2 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.forbidden.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.forbidden.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.heart.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.heart.png
index 56096a3c3476..56096a3c3476 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.heart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.heart.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.left-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-brace.png
index 7404d0ed8930..7404d0ed8930 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.left-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-brace.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.left-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-bracket.png
index 6efc2e029b6f..6efc2e029b6f 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.left-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.left-bracket.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.lightning.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.lightning.png
index 41367d3206b0..41367d3206b0 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.lightning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.lightning.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.moon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.moon.png
index 3675ee1aad30..3675ee1aad30 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.moon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.moon.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.octagon-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.octagon-bevel.png
index 07c012602e60..07c012602e60 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.octagon-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.octagon-bevel.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.png
index f9e7c599adc6..f9e7c599adc6 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.puzzle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.puzzle.png
index b5116a124315..b5116a124315 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.puzzle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.puzzle.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.quad-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.quad-bevel.png
index cd57d069f14f..cd57d069f14f 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.quad-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.quad-bevel.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.right-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-brace.png
index 96b0b4e3f2de..96b0b4e3f2de 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.right-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-brace.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.right-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-bracket.png
index 1a421de7f51d..1a421de7f51d 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.right-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.right-bracket.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.smiley.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.smiley.png
index 565340220474..565340220474 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.smiley.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.smiley.png
diff --git a/default_images/res/commandimagelist/lch_symbolshapes.sun.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.sun.png
index d2f3f7418634..d2f3f7418634 100644
--- a/default_images/res/commandimagelist/lch_symbolshapes.sun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_symbolshapes.sun.png
diff --git a/default_images/res/commandimagelist/lch_tabdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabdialog.png
index 8f28d9730890..8f28d9730890 100644
--- a/default_images/res/commandimagelist/lch_tabdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabdialog.png
diff --git a/default_images/res/commandimagelist/lch_tabledesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledesign.png
index 5ff782358614..5ff782358614 100644
--- a/default_images/res/commandimagelist/lch_tabledesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledesign.png
diff --git a/default_images/res/commandimagelist/lch_tabledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledialog.png
index e5bf420f6101..e5bf420f6101 100644
--- a/default_images/res/commandimagelist/lch_tabledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tabledialog.png
diff --git a/default_images/res/commandimagelist/lch_tablemodefix.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefix.png
index 3c60b16c1fa9..3c60b16c1fa9 100644
--- a/default_images/res/commandimagelist/lch_tablemodefix.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefix.png
diff --git a/default_images/res/commandimagelist/lch_tablemodefixprop.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefixprop.png
index 51927f7d3cc9..51927f7d3cc9 100644
--- a/default_images/res/commandimagelist/lch_tablemodefixprop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodefixprop.png
diff --git a/default_images/res/commandimagelist/lch_tablemodevariable.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodevariable.png
index a6a349c55ea3..a6a349c55ea3 100644
--- a/default_images/res/commandimagelist/lch_tablemodevariable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablemodevariable.png
diff --git a/default_images/res/commandimagelist/lch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablesort.png
index e54d5a57f1c4..e54d5a57f1c4 100644
--- a/default_images/res/commandimagelist/lch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_tablesort.png
diff --git a/default_images/res/commandimagelist/lch_testmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_testmode.png
index fd8864cc579c..fd8864cc579c 100644
--- a/default_images/res/commandimagelist/lch_testmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_testmode.png
diff --git a/default_images/res/commandimagelist/lch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text.png
index 501d2c95ffd5..501d2c95ffd5 100644
--- a/default_images/res/commandimagelist/lch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text.png
diff --git a/default_images/res/commandimagelist/lch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text_marquee.png
index 1fbfacbfd370..1fbfacbfd370 100644
--- a/default_images/res/commandimagelist/lch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_text_marquee.png
diff --git a/default_images/res/commandimagelist/lch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectionlefttoright.png
index a081fc68e710..a081fc68e710 100644
--- a/default_images/res/commandimagelist/lch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/lch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectiontoptobottom.png
index d2d9a0a3d170..d2d9a0a3d170 100644
--- a/default_images/res/commandimagelist/lch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/lch_textfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textfittosizetool.png
index 7ad4323c1a02..7ad4323c1a02 100644
--- a/default_images/res/commandimagelist/lch_textfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_textfittosizetool.png
diff --git a/default_images/res/commandimagelist/lch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_texttoolbox.png
index 501d2c95ffd5..501d2c95ffd5 100644
--- a/default_images/res/commandimagelist/lch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/lch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurus.png
index b1a0be3bbe14..b1a0be3bbe14 100644
--- a/default_images/res/commandimagelist/lch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurus.png
diff --git a/default_images/res/commandimagelist/lch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurusdialog.png
index 53c6f894e219..53c6f894e219 100644
--- a/default_images/res/commandimagelist/lch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/lch_timefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_timefield.png
index edc4dd6dd285..edc4dd6dd285 100644
--- a/default_images/res/commandimagelist/lch_timefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_timefield.png
diff --git a/default_images/res/commandimagelist/lch_toggleanchortype.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleanchortype.png
index d197c59b13f6..d197c59b13f6 100644
--- a/default_images/res/commandimagelist/lch_toggleanchortype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleanchortype.png
diff --git a/default_images/res/commandimagelist/lch_toggleaxisdescr.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxisdescr.png
index a14420796089..a14420796089 100644
--- a/default_images/res/commandimagelist/lch_toggleaxisdescr.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxisdescr.png
diff --git a/default_images/res/commandimagelist/lch_toggleaxistitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxistitle.png
index 32315ab3de66..32315ab3de66 100644
--- a/default_images/res/commandimagelist/lch_toggleaxistitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleaxistitle.png
diff --git a/default_images/res/commandimagelist/lch_togglebreakpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglebreakpoint.png
index 799d3803ea13..799d3803ea13 100644
--- a/default_images/res/commandimagelist/lch_togglebreakpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglebreakpoint.png
diff --git a/default_images/res/commandimagelist/lch_togglegridhorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridhorizontal.png
index bf70d699653c..bf70d699653c 100644
--- a/default_images/res/commandimagelist/lch_togglegridhorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridhorizontal.png
diff --git a/default_images/res/commandimagelist/lch_togglegridvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridvertical.png
index 9684a5911bfe..9684a5911bfe 100644
--- a/default_images/res/commandimagelist/lch_togglegridvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglegridvertical.png
diff --git a/default_images/res/commandimagelist/lch_togglelegend.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglelegend.png
index 619b07779ce8..619b07779ce8 100644
--- a/default_images/res/commandimagelist/lch_togglelegend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglelegend.png
diff --git a/default_images/res/commandimagelist/lch_togglemergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglemergecells.png
index 1003d3c39f8b..1003d3c39f8b 100644
--- a/default_images/res/commandimagelist/lch_togglemergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglemergecells.png
diff --git a/default_images/res/commandimagelist/lch_toggleobjectbeziermode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectbeziermode.png
index 2256033c5d73..2256033c5d73 100644
--- a/default_images/res/commandimagelist/lch_toggleobjectbeziermode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectbeziermode.png
diff --git a/default_images/res/commandimagelist/lch_toggleobjectrotatemode.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectrotatemode.png
index 61c9ce4fd14c..61c9ce4fd14c 100644
--- a/default_images/res/commandimagelist/lch_toggleobjectrotatemode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggleobjectrotatemode.png
diff --git a/default_images/res/commandimagelist/lch_togglesheetgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglesheetgrid.png
index 85ab79189176..85ab79189176 100644
--- a/default_images/res/commandimagelist/lch_togglesheetgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_togglesheetgrid.png
diff --git a/default_images/res/commandimagelist/lch_toggletitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggletitle.png
index d0ece01e6bee..d0ece01e6bee 100644
--- a/default_images/res/commandimagelist/lch_toggletitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toggletitle.png
diff --git a/default_images/res/commandimagelist/lch_toolsmacroedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsmacroedit.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_toolsmacroedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsmacroedit.png
diff --git a/default_images/res/commandimagelist/lch_toolsoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsoptions.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_toolsoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_toolsoptions.png
diff --git a/default_images/res/commandimagelist/lch_torus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_torus.png
index 48b09f3b7f0f..48b09f3b7f0f 100644
--- a/default_images/res/commandimagelist/lch_torus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_torus.png
diff --git a/default_images/res/commandimagelist/lch_transformdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_transformdialog.png
index 870f26eab8c1..870f26eab8c1 100644
--- a/default_images/res/commandimagelist/lch_transformdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_transformdialog.png
diff --git a/default_images/res/commandimagelist/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underline.png
index 4a6b12fa433b..4a6b12fa433b 100644
--- a/default_images/res/commandimagelist/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underline.png
diff --git a/default_images/res/commandimagelist/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underlinedouble.png
index 5bcacbf9fa64..5bcacbf9fa64 100644
--- a/default_images/res/commandimagelist/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/lch_undo.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_undo.png
index 19043e9f6cc7..19043e9f6cc7 100644
--- a/default_images/res/commandimagelist/lch_undo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_undo.png
diff --git a/default_images/res/commandimagelist/lch_ungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ungroup.png
index 5151aca6c0b7..5151aca6c0b7 100644
--- a/default_images/res/commandimagelist/lch_ungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_ungroup.png
diff --git a/default_images/res/commandimagelist/lch_unhainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_unhainframes.png
index 2cf3cc4de408..2cf3cc4de408 100644
--- a/default_images/res/commandimagelist/lch_unhainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_unhainframes.png
diff --git a/default_images/res/commandimagelist/lch_upsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_upsearch.png
index d15f2fa9d7c9..d15f2fa9d7c9 100644
--- a/default_images/res/commandimagelist/lch_upsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_upsearch.png
diff --git a/default_images/res/commandimagelist/lch_urlbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_urlbutton.png
index a36adb4f1db6..a36adb4f1db6 100644
--- a/default_images/res/commandimagelist/lch_urlbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_urlbutton.png
diff --git a/default_images/res/commandimagelist/lch_usewizards.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_usewizards.png
index ef183ad55ace..ef183ad55ace 100644
--- a/default_images/res/commandimagelist/lch_usewizards.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_usewizards.png
diff --git a/default_images/res/commandimagelist/lch_verticalcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticalcaption.png
index 4dbd366aabbe..4dbd366aabbe 100644
--- a/default_images/res/commandimagelist/lch_verticalcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticalcaption.png
diff --git a/default_images/res/commandimagelist/lch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltext.png
index d4fa48558d62..d4fa48558d62 100644
--- a/default_images/res/commandimagelist/lch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltext.png
diff --git a/default_images/res/commandimagelist/lch_verticaltextfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltextfittosizetool.png
index 2791e6e7f83b..2791e6e7f83b 100644
--- a/default_images/res/commandimagelist/lch_verticaltextfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_verticaltextfittosizetool.png
diff --git a/default_images/res/commandimagelist/lch_vfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vfixedline.png
index aea0f339ef5c..aea0f339ef5c 100644
--- a/default_images/res/commandimagelist/lch_vfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vfixedline.png
diff --git a/default_images/res/commandimagelist/lch_view100.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_view100.png
index 33af72d31e51..33af72d31e51 100644
--- a/default_images/res/commandimagelist/lch_view100.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_view100.png
diff --git a/default_images/res/commandimagelist/lch_viewdatasourcebrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewdatasourcebrowser.png
index 73115f94ef51..73115f94ef51 100644
--- a/default_images/res/commandimagelist/lch_viewdatasourcebrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewdatasourcebrowser.png
diff --git a/default_images/res/commandimagelist/lch_viewformasgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewformasgrid.png
index 889664bc1971..889664bc1971 100644
--- a/default_images/res/commandimagelist/lch_viewformasgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_viewformasgrid.png
diff --git a/default_images/res/commandimagelist/lch_vscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vscrollbar.png
index ffba6ae86c00..ffba6ae86c00 100644
--- a/default_images/res/commandimagelist/lch_vscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_vscrollbar.png
diff --git a/default_images/res/commandimagelist/lch_window3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_window3d.png
index 80f6752e8a22..80f6752e8a22 100644
--- a/default_images/res/commandimagelist/lch_window3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_window3d.png
diff --git a/default_images/res/commandimagelist/lch_wrapcontour.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapcontour.png
index f0d2aca5846e..f0d2aca5846e 100644
--- a/default_images/res/commandimagelist/lch_wrapcontour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapcontour.png
diff --git a/default_images/res/commandimagelist/lch_wrapideal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapideal.png
index c0fa0f02c1a8..c0fa0f02c1a8 100644
--- a/default_images/res/commandimagelist/lch_wrapideal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapideal.png
diff --git a/default_images/res/commandimagelist/lch_wrapleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapleft.png
index 23d985b67be7..23d985b67be7 100644
--- a/default_images/res/commandimagelist/lch_wrapleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapleft.png
diff --git a/default_images/res/commandimagelist/lch_wrapoff.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapoff.png
index 59a2c67a46ea..59a2c67a46ea 100644
--- a/default_images/res/commandimagelist/lch_wrapoff.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapoff.png
diff --git a/default_images/res/commandimagelist/lch_wrapon.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapon.png
index c3c8ada7a569..c3c8ada7a569 100644
--- a/default_images/res/commandimagelist/lch_wrapon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapon.png
diff --git a/default_images/res/commandimagelist/lch_wrapright.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapright.png
index 564cf68f6fe2..564cf68f6fe2 100644
--- a/default_images/res/commandimagelist/lch_wrapright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapright.png
diff --git a/default_images/res/commandimagelist/lch_wrapthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapthrough.png
index 55f9ab93c643..55f9ab93c643 100644
--- a/default_images/res/commandimagelist/lch_wrapthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_wrapthrough.png
diff --git a/default_images/res/commandimagelist/lch_xlinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinecolor.png
index 1c8c05439184..1c8c05439184 100644
--- a/default_images/res/commandimagelist/lch_xlinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinecolor.png
diff --git a/default_images/res/commandimagelist/lch_xlinestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinestyle.png
index 98d6f8c4309f..98d6f8c4309f 100644
--- a/default_images/res/commandimagelist/lch_xlinestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_xlinestyle.png
diff --git a/default_images/res/commandimagelist/lch_zoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom.png
index 67e7675cb166..67e7675cb166 100644
--- a/default_images/res/commandimagelist/lch_zoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom.png
diff --git a/default_images/res/commandimagelist/lch_zoom100percent.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom100percent.png
index 37b82c84193a..37b82c84193a 100644
--- a/default_images/res/commandimagelist/lch_zoom100percent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoom100percent.png
diff --git a/default_images/res/commandimagelist/lch_zoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomin.png
index 6fe2a729cf64..6fe2a729cf64 100644
--- a/default_images/res/commandimagelist/lch_zoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomin.png
diff --git a/default_images/res/commandimagelist/lch_zoomminus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomminus.png
index ee427ddf6d46..ee427ddf6d46 100644
--- a/default_images/res/commandimagelist/lch_zoomminus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomminus.png
diff --git a/default_images/res/commandimagelist/lch_zoomnext.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomnext.png
index 3bf3ad4534e4..3bf3ad4534e4 100644
--- a/default_images/res/commandimagelist/lch_zoomnext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomnext.png
diff --git a/default_images/res/commandimagelist/lch_zoomobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomobjects.png
index 54cb6d8279b5..54cb6d8279b5 100644
--- a/default_images/res/commandimagelist/lch_zoomobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomobjects.png
diff --git a/default_images/res/commandimagelist/lch_zoomoptimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomoptimal.png
index d0d6f41217ea..d0d6f41217ea 100644
--- a/default_images/res/commandimagelist/lch_zoomoptimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomoptimal.png
diff --git a/default_images/res/commandimagelist/lch_zoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomout.png
index 81ae2b2037af..81ae2b2037af 100644
--- a/default_images/res/commandimagelist/lch_zoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomout.png
diff --git a/default_images/res/commandimagelist/lch_zoompage.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompage.png
index a95a92c60e12..a95a92c60e12 100644
--- a/default_images/res/commandimagelist/lch_zoompage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompage.png
diff --git a/default_images/res/commandimagelist/lch_zoompagewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompagewidth.png
index e693bfbbf700..e693bfbbf700 100644
--- a/default_images/res/commandimagelist/lch_zoompagewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompagewidth.png
diff --git a/default_images/res/commandimagelist/lch_zoompanning.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompanning.png
index 88e6a88530af..88e6a88530af 100644
--- a/default_images/res/commandimagelist/lch_zoompanning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoompanning.png
diff --git a/default_images/res/commandimagelist/lch_zoomplus.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomplus.png
index 37e71dca7fd3..37e71dca7fd3 100644
--- a/default_images/res/commandimagelist/lch_zoomplus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomplus.png
diff --git a/default_images/res/commandimagelist/lch_zoomprevious.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomprevious.png
index c0d522306b53..c0d522306b53 100644
--- a/default_images/res/commandimagelist/lch_zoomprevious.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomprevious.png
diff --git a/default_images/res/commandimagelist/lch_zoomtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomtoolbox.png
index fa8e09684b80..fa8e09684b80 100644
--- a/default_images/res/commandimagelist/lch_zoomtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/lc_zoomtoolbox.png
diff --git a/default_images/res/commandimagelist/nl/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_bold.png
index 7ef4f83c691f..7ef4f83c691f 100644
--- a/default_images/res/commandimagelist/nl/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_bold.png
diff --git a/default_images/res/commandimagelist/nl/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_italic.png
index fdac4232a904..fdac4232a904 100644
--- a/default_images/res/commandimagelist/nl/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_italic.png
diff --git a/default_images/res/commandimagelist/nl/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underline.png
index 7f6098403980..7f6098403980 100644
--- a/default_images/res/commandimagelist/nl/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underline.png
diff --git a/default_images/res/commandimagelist/nl/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underlinedouble.png
index 2a7906c13a3a..2a7906c13a3a 100644
--- a/default_images/res/commandimagelist/nl/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/nl/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_bold.png
index d953cb67ca15..d953cb67ca15 100644
--- a/default_images/res/commandimagelist/nl/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_bold.png
diff --git a/default_images/res/commandimagelist/nl/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_italic.png
index 221e37f23251..221e37f23251 100644
--- a/default_images/res/commandimagelist/nl/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_italic.png
diff --git a/default_images/res/commandimagelist/nl/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underline.png
index 97baeae91af4..97baeae91af4 100644
--- a/default_images/res/commandimagelist/nl/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underline.png
diff --git a/default_images/res/commandimagelist/nl/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underlinedouble.png
index 051561c76f8f..051561c76f8f 100644
--- a/default_images/res/commandimagelist/nl/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/nl/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pl/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_bold.png
index 4e30037a0ff1..4e30037a0ff1 100644
--- a/default_images/res/commandimagelist/pl/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_bold.png
diff --git a/default_images/res/commandimagelist/pl/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_italic.png
index 71108004b9f3..71108004b9f3 100644
--- a/default_images/res/commandimagelist/pl/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_italic.png
diff --git a/default_images/res/commandimagelist/pl/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underline.png
index c05c2d7ae69c..c05c2d7ae69c 100644
--- a/default_images/res/commandimagelist/pl/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underline.png
diff --git a/default_images/res/commandimagelist/pl/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underlinedouble.png
index 1042f6539ffa..1042f6539ffa 100644
--- a/default_images/res/commandimagelist/pl/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pl/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_bold.png
index 421dbda38d6a..421dbda38d6a 100644
--- a/default_images/res/commandimagelist/pl/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_bold.png
diff --git a/default_images/res/commandimagelist/pl/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_italic.png
index 7c9e9374adca..7c9e9374adca 100644
--- a/default_images/res/commandimagelist/pl/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_italic.png
diff --git a/default_images/res/commandimagelist/pl/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underline.png
index d6c46520d2e5..d6c46520d2e5 100644
--- a/default_images/res/commandimagelist/pl/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underline.png
diff --git a/default_images/res/commandimagelist/pl/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underlinedouble.png
index 38e97651aea2..38e97651aea2 100644
--- a/default_images/res/commandimagelist/pl/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pl/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_bold.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_bold.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_italic.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underline.png
index 22380aa8140d..22380aa8140d 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underline.png
diff --git a/default_images/res/commandimagelist/pt-BR/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underlinedouble.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/commandimagelist/pt-BR/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_bold.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_italic.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underline.png
diff --git a/default_images/res/commandimagelist/pt-BR/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underlinedouble.png
index e6ca7151c21a..e6ca7151c21a 100644
--- a/default_images/res/commandimagelist/pt-BR/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt-BR/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_bold.png
index a02adca8d132..a02adca8d132 100644
--- a/default_images/res/commandimagelist/pt/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_bold.png
diff --git a/default_images/res/commandimagelist/pt/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/pt/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_italic.png
diff --git a/default_images/res/commandimagelist/pt/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underline.png
index cf70275afa8f..cf70275afa8f 100644
--- a/default_images/res/commandimagelist/pt/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underline.png
diff --git a/default_images/res/commandimagelist/pt/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underlinedouble.png
index 187cdae1747c..187cdae1747c 100644
--- a/default_images/res/commandimagelist/pt/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/pt/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_bold.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/commandimagelist/pt/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_bold.png
diff --git a/default_images/res/commandimagelist/pt/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/pt/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_italic.png
diff --git a/default_images/res/commandimagelist/pt/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underline.png
index be355a85731a..be355a85731a 100644
--- a/default_images/res/commandimagelist/pt/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underline.png
diff --git a/default_images/res/commandimagelist/pt/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underlinedouble.png
index f9e9ae49d21b..f9e9ae49d21b 100644
--- a/default_images/res/commandimagelist/pt/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/pt/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ru/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_bold.png
index 540131c41f5b..540131c41f5b 100644
--- a/default_images/res/commandimagelist/ru/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_bold.png
diff --git a/default_images/res/commandimagelist/ru/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_italic.png
index 89e29ab49a23..89e29ab49a23 100644
--- a/default_images/res/commandimagelist/ru/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_italic.png
diff --git a/default_images/res/commandimagelist/ru/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underline.png
index 1803b52c19c2..1803b52c19c2 100644
--- a/default_images/res/commandimagelist/ru/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underline.png
diff --git a/default_images/res/commandimagelist/ru/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underlinedouble.png
index 12aa4698dd4a..12aa4698dd4a 100644
--- a/default_images/res/commandimagelist/ru/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/ru/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_bold.png
index a66c42419251..a66c42419251 100644
--- a/default_images/res/commandimagelist/ru/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_bold.png
diff --git a/default_images/res/commandimagelist/ru/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_italic.png
index 4e118592f355..4e118592f355 100644
--- a/default_images/res/commandimagelist/ru/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_italic.png
diff --git a/default_images/res/commandimagelist/ru/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underline.png
index 958a30b6d969..958a30b6d969 100644
--- a/default_images/res/commandimagelist/ru/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underline.png
diff --git a/default_images/res/commandimagelist/ru/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underlinedouble.png
index 22b717e0f9c9..22b717e0f9c9 100644
--- a/default_images/res/commandimagelist/ru/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/ru/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sch_absoluterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_absoluterecord.png
index 50cad4630ced..50cad4630ced 100644
--- a/default_images/res/commandimagelist/sch_absoluterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_absoluterecord.png
diff --git a/default_images/res/commandimagelist/sch_actionmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_actionmode.png
index dd5b34c304b4..dd5b34c304b4 100644
--- a/default_images/res/commandimagelist/sch_actionmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_actionmode.png
diff --git a/default_images/res/commandimagelist/sch_addbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addbookmark.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_addbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addbookmark.png
diff --git a/default_images/res/commandimagelist/sch_adddatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddatefield.png
index 12a8235c7d95..12a8235c7d95 100644
--- a/default_images/res/commandimagelist/sch_adddatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddatefield.png
diff --git a/default_images/res/commandimagelist/sch_adddirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddirect.png
index e1802f421387..e1802f421387 100644
--- a/default_images/res/commandimagelist/sch_adddirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adddirect.png
diff --git a/default_images/res/commandimagelist/sch_addfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addfield.png
index 87e5f0ab1b5b..87e5f0ab1b5b 100644
--- a/default_images/res/commandimagelist/sch_addfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addfield.png
diff --git a/default_images/res/commandimagelist/sch_addons.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addons.png
index 6e2fae41cc62..6e2fae41cc62 100644
--- a/default_images/res/commandimagelist/sch_addons.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addons.png
diff --git a/default_images/res/commandimagelist/sch_addprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addprintarea.png
index 2ba16a01b51b..2ba16a01b51b 100644
--- a/default_images/res/commandimagelist/sch_addprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addprintarea.png
diff --git a/default_images/res/commandimagelist/sch_addtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addtable.png
index 432bbe32407c..432bbe32407c 100644
--- a/default_images/res/commandimagelist/sch_addtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addtable.png
diff --git a/default_images/res/commandimagelist/sch_addwatch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addwatch.png
index 99ea25d27e21..99ea25d27e21 100644
--- a/default_images/res/commandimagelist/sch_addwatch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_addwatch.png
diff --git a/default_images/res/commandimagelist/sch_adjust.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adjust.png
index fdaabf5f84f6..fdaabf5f84f6 100644
--- a/default_images/res/commandimagelist/sch_adjust.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_adjust.png
diff --git a/default_images/res/commandimagelist/sch_advancedmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_advancedmode.png
index c8e150f4830e..c8e150f4830e 100644
--- a/default_images/res/commandimagelist/sch_advancedmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_advancedmode.png
diff --git a/default_images/res/commandimagelist/sch_alignblock.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignblock.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/res/commandimagelist/sch_alignblock.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignblock.png
diff --git a/default_images/res/commandimagelist/sch_alignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignbottom.png
index 85331353dea1..85331353dea1 100644
--- a/default_images/res/commandimagelist/sch_alignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignbottom.png
diff --git a/default_images/res/commandimagelist/sch_aligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligncenter.png
index 97bb71d9e94f..97bb71d9e94f 100644
--- a/default_images/res/commandimagelist/sch_aligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligncenter.png
diff --git a/default_images/res/commandimagelist/sch_aligndown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligndown.png
index 82090bbd4750..82090bbd4750 100644
--- a/default_images/res/commandimagelist/sch_aligndown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligndown.png
diff --git a/default_images/res/commandimagelist/sch_alignhorizontalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignhorizontalcenter.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/res/commandimagelist/sch_alignhorizontalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignhorizontalcenter.png
diff --git a/default_images/res/commandimagelist/sch_alignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignleft.png
index 32cbbf9f5d2b..32cbbf9f5d2b 100644
--- a/default_images/res/commandimagelist/sch_alignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignleft.png
diff --git a/default_images/res/commandimagelist/sch_alignmiddle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignmiddle.png
index 98abb5b47b19..98abb5b47b19 100644
--- a/default_images/res/commandimagelist/sch_alignmiddle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignmiddle.png
diff --git a/default_images/res/commandimagelist/sch_alignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignright.png
index 89cdc084247b..89cdc084247b 100644
--- a/default_images/res/commandimagelist/sch_alignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignright.png
diff --git a/default_images/res/commandimagelist/sch_aligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligntop.png
index 3959925b9832..3959925b9832 100644
--- a/default_images/res/commandimagelist/sch_aligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_aligntop.png
diff --git a/default_images/res/commandimagelist/sch_alignup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignup.png
index 6a45c5dabf0d..6a45c5dabf0d 100644
--- a/default_images/res/commandimagelist/sch_alignup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignup.png
diff --git a/default_images/res/commandimagelist/sch_alignvcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignvcenter.png
index 16a01eefcef2..16a01eefcef2 100644
--- a/default_images/res/commandimagelist/sch_alignvcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignvcenter.png
diff --git a/default_images/res/commandimagelist/sch_alignverticalcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignverticalcenter.png
index 16a01eefcef2..16a01eefcef2 100644
--- a/default_images/res/commandimagelist/sch_alignverticalcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_alignverticalcenter.png
diff --git a/default_images/res/commandimagelist/sch_animationeffects.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationeffects.png
index 68738546fa93..68738546fa93 100644
--- a/default_images/res/commandimagelist/sch_animationeffects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationeffects.png
diff --git a/default_images/res/commandimagelist/sch_animationmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationmode.png
index 190088629707..190088629707 100644
--- a/default_images/res/commandimagelist/sch_animationmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationmode.png
diff --git a/default_images/res/commandimagelist/sch_animationobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationobjects.png
index ba586fdd40b9..ba586fdd40b9 100644
--- a/default_images/res/commandimagelist/sch_animationobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_animationobjects.png
diff --git a/default_images/res/commandimagelist/sch_arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arc.png
index 675ac11043f3..675ac11043f3 100644
--- a/default_images/res/commandimagelist/sch_arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arc.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.chevron.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.chevron.png
index b5757d34ae55..b5757d34ae55 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.chevron.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.chevron.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.circular-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.circular-arrow.png
index 22a52931e77b..22a52931e77b 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.circular-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.circular-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.corner-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.corner-right-arrow.png
index 6abcdd4acc90..6abcdd4acc90 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.corner-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.corner-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow-callout.png
index bd701c61ec98..bd701c61ec98 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow.png
index 54547d455c3d..54547d455c3d 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.down-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow-callout.png
index b6a39f344a18..b6a39f344a18 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow.png
index 786f321f9ece..786f321f9ece 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow-callout.png
index 26062a03d1f2..26062a03d1f2 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow.png
index 20ae1974f73a..20ae1974f73a 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.left-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.left-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.notched-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.notched-right-arrow.png
index 84ae8492cada..84ae8492cada 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.notched-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.notched-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.pentagon-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.pentagon-right.png
index e919a5964574..e919a5964574 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.pentagon-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.pentagon-right.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.png
index 41fedf4ca9ee..41fedf4ca9ee 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow-callout.png
index ec9ddce7b565..ec9ddce7b565 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow.png
index 36c952f1f491..36c952f1f491 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.quad-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.quad-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow-callout.png
index 0b3dc00f9929..0b3dc00f9929 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow.png
index 9c0691ec94e5..9c0691ec94e5 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.s-sharped-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.s-sharped-arrow.png
index f381c3abc40d..f381c3abc40d 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.s-sharped-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.s-sharped-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.split-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-arrow.png
index 39830048509f..39830048509f 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.split-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.split-round-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-round-arrow.png
index 45447c1bdadc..45447c1bdadc 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.split-round-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.split-round-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.striped-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.striped-right-arrow.png
index d87ac8118dbc..d87ac8118dbc 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.striped-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.striped-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow-callout.png
index d3cfc99de188..d3cfc99de188 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow.png
index 90d68d9070b3..90d68d9070b3 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow-callout.png
index 12b50e959eab..12b50e959eab 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow.png
index c85c03460c31..c85c03460c31 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-down-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow-callout.png
index 345d36cdcc3c..345d36cdcc3c 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow-callout.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow.png
index df1bc1f7bf02..df1bc1f7bf02 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-right-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowshapes.up-right-down-arrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-down-arrow.png
index 980bc65a415c..980bc65a415c 100644
--- a/default_images/res/commandimagelist/sch_arrowshapes.up-right-down-arrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowshapes.up-right-down-arrow.png
diff --git a/default_images/res/commandimagelist/sch_arrowstoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowstoolbox.png
index 42339021bec1..42339021bec1 100644
--- a/default_images/res/commandimagelist/sch_arrowstoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_arrowstoolbox.png
diff --git a/default_images/res/commandimagelist/sch_assignlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_assignlayout.png
index e62be6a81a9b..e62be6a81a9b 100644
--- a/default_images/res/commandimagelist/sch_assignlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_assignlayout.png
diff --git a/default_images/res/commandimagelist/sch_autocontrolfocus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autocontrolfocus.png
index 66c48a9cae14..66c48a9cae14 100644
--- a/default_images/res/commandimagelist/sch_autocontrolfocus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autocontrolfocus.png
diff --git a/default_images/res/commandimagelist/sch_autofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autofilter.png
index 5eed21603dcf..5eed21603dcf 100644
--- a/default_images/res/commandimagelist/sch_autofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autofilter.png
diff --git a/default_images/res/commandimagelist/sch_autoformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autoformat.png
index 1f3aac168232..1f3aac168232 100644
--- a/default_images/res/commandimagelist/sch_autoformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autoformat.png
diff --git a/default_images/res/commandimagelist/sch_autosum.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autosum.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/default_images/res/commandimagelist/sch_autosum.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_autosum.png
diff --git a/default_images/res/commandimagelist/sch_avmediaplayer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_avmediaplayer.png
index f111edc3afe6..f111edc3afe6 100644
--- a/default_images/res/commandimagelist/sch_avmediaplayer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_avmediaplayer.png
diff --git a/default_images/res/commandimagelist/sch_backcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backcolor.png
index bec1316d0739..bec1316d0739 100644
--- a/default_images/res/commandimagelist/sch_backcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backcolor.png
diff --git a/default_images/res/commandimagelist/sch_backgroundcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundcolor.png
index af10bb66c9fe..af10bb66c9fe 100644
--- a/default_images/res/commandimagelist/sch_backgroundcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundcolor.png
diff --git a/default_images/res/commandimagelist/sch_backgroundpatterncontroller.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundpatterncontroller.png
index 82728549e649..82728549e649 100644
--- a/default_images/res/commandimagelist/sch_backgroundpatterncontroller.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backgroundpatterncontroller.png
diff --git a/default_images/res/commandimagelist/sch_backward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backward.png
index 0b4277fda77a..0b4277fda77a 100644
--- a/default_images/res/commandimagelist/sch_backward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_backward.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.block-arc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.block-arc.png
index cb2409184af0..cb2409184af0 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.block-arc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.block-arc.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.can.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.can.png
index 8f9d536f0b47..8f9d536f0b47 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.can.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.can.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.circle-pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle-pie.png
index 03dfb12df364..03dfb12df364 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.circle-pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle-pie.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle.png
index 5958503263f9..5958503263f9 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.circle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.cross.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cross.png
index 64a4817f392e..64a4817f392e 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.cross.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cross.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cube.png
index 0bd5595bd730..0bd5595bd730 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.cube.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.diamond.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.diamond.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.diamond.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.diamond.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ellipse.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ellipse.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.frame.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.frame.png
index 2645d075ce37..2645d075ce37 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.frame.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.frame.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.hexagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.hexagon.png
index 75ad5b561769..75ad5b561769 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.hexagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.hexagon.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.isosceles-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.isosceles-triangle.png
index c171a23dccf1..c171a23dccf1 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.isosceles-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.isosceles-triangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.octagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.octagon.png
index dc87d8098d39..dc87d8098d39 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.octagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.octagon.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.paper.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.paper.png
index ccceb9be83fa..ccceb9be83fa 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.paper.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.paper.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.parallelogram.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.parallelogram.png
index 086e39604151..086e39604151 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.parallelogram.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.parallelogram.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.pentagon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.pentagon.png
index abb369944852..abb369944852 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.pentagon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.pentagon.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.quadrat.png
index 409e91d061bf..409e91d061bf 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.quadrat.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.rectangle.png
index 05498575b823..05498575b823 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.rectangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.right-triangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.right-triangle.png
index 16c7ea4226f3..16c7ea4226f3 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.right-triangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.right-triangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.ring.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ring.png
index e7ae14d5afc3..e7ae14d5afc3 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.ring.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.ring.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.round-quadrat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-quadrat.png
index afc0127f13cd..afc0127f13cd 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.round-quadrat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-quadrat.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.round-rectangle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-rectangle.png
index b8d9fa717421..b8d9fa717421 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.round-rectangle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.round-rectangle.png
diff --git a/default_images/res/commandimagelist/sch_basicshapes.trapezoid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.trapezoid.png
index e38a7229a856..e38a7229a856 100644
--- a/default_images/res/commandimagelist/sch_basicshapes.trapezoid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicshapes.trapezoid.png
diff --git a/default_images/res/commandimagelist/sch_basicstepinto.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepinto.png
index 6efdfd465911..6efdfd465911 100644
--- a/default_images/res/commandimagelist/sch_basicstepinto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepinto.png
diff --git a/default_images/res/commandimagelist/sch_basicstepout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepout.png
index 310da3d78e0d..310da3d78e0d 100644
--- a/default_images/res/commandimagelist/sch_basicstepout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepout.png
diff --git a/default_images/res/commandimagelist/sch_basicstepover.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepover.png
index 7b8dfdf7bab8..7b8dfdf7bab8 100644
--- a/default_images/res/commandimagelist/sch_basicstepover.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstepover.png
diff --git a/default_images/res/commandimagelist/sch_basicstop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstop.png
index 16c76c8fb180..16c76c8fb180 100644
--- a/default_images/res/commandimagelist/sch_basicstop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_basicstop.png
diff --git a/default_images/res/commandimagelist/sch_beamer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beamer.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_beamer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beamer.png
diff --git a/default_images/res/commandimagelist/sch_beforeobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beforeobject.png
index db2a152c8415..db2a152c8415 100644
--- a/default_images/res/commandimagelist/sch_beforeobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beforeobject.png
diff --git a/default_images/res/commandimagelist/sch_behindobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_behindobject.png
index 1ddd47160989..1ddd47160989 100644
--- a/default_images/res/commandimagelist/sch_behindobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_behindobject.png
diff --git a/default_images/res/commandimagelist/sch_bezier_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezier_unfilled.png
index a2acf0b153de..a2acf0b153de 100644
--- a/default_images/res/commandimagelist/sch_bezier_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezier_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_bezierappend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierappend.png
index 274a659e6c7b..274a659e6c7b 100644
--- a/default_images/res/commandimagelist/sch_bezierappend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierappend.png
diff --git a/default_images/res/commandimagelist/sch_bezierclose.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierclose.png
index 40a779e41f27..40a779e41f27 100644
--- a/default_images/res/commandimagelist/sch_bezierclose.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierclose.png
diff --git a/default_images/res/commandimagelist/sch_bezierconvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierconvert.png
index d6e378bfe663..d6e378bfe663 100644
--- a/default_images/res/commandimagelist/sch_bezierconvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierconvert.png
diff --git a/default_images/res/commandimagelist/sch_beziercutline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziercutline.png
index e14e5d0e6544..e14e5d0e6544 100644
--- a/default_images/res/commandimagelist/sch_beziercutline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziercutline.png
diff --git a/default_images/res/commandimagelist/sch_bezierdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierdelete.png
index 8215b8fd15b5..8215b8fd15b5 100644
--- a/default_images/res/commandimagelist/sch_bezierdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierdelete.png
diff --git a/default_images/res/commandimagelist/sch_bezieredge.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezieredge.png
index 00a26f095984..00a26f095984 100644
--- a/default_images/res/commandimagelist/sch_bezieredge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezieredge.png
diff --git a/default_images/res/commandimagelist/sch_beziereliminatepoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziereliminatepoints.png
index ad2b76a7b28c..ad2b76a7b28c 100644
--- a/default_images/res/commandimagelist/sch_beziereliminatepoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziereliminatepoints.png
diff --git a/default_images/res/commandimagelist/sch_bezierfill.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierfill.png
index d75ce1351880..d75ce1351880 100644
--- a/default_images/res/commandimagelist/sch_bezierfill.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierfill.png
diff --git a/default_images/res/commandimagelist/sch_bezierinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierinsert.png
index dbfa12e95495..dbfa12e95495 100644
--- a/default_images/res/commandimagelist/sch_bezierinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bezierinsert.png
diff --git a/default_images/res/commandimagelist/sch_beziermove.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziermove.png
index b46e90d2fc9d..b46e90d2fc9d 100644
--- a/default_images/res/commandimagelist/sch_beziermove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziermove.png
diff --git a/default_images/res/commandimagelist/sch_beziersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersmooth.png
index a977c7688759..a977c7688759 100644
--- a/default_images/res/commandimagelist/sch_beziersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersmooth.png
diff --git a/default_images/res/commandimagelist/sch_beziersymmetric.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersymmetric.png
index 01a2bb87e562..01a2bb87e562 100644
--- a/default_images/res/commandimagelist/sch_beziersymmetric.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_beziersymmetric.png
diff --git a/default_images/res/commandimagelist/sch_bighandles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bighandles.png
index 879e51c5d898..879e51c5d898 100644
--- a/default_images/res/commandimagelist/sch_bighandles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bighandles.png
diff --git a/default_images/res/commandimagelist/sc_bmpmask_h.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bmpmask.png
index 4821b98b5683..4821b98b5683 100644
--- a/default_images/res/commandimagelist/sc_bmpmask_h.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bmpmask.png
diff --git a/default_images/res/commandimagelist/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bold.png
index 5e5a6efc5b88..5e5a6efc5b88 100644
--- a/default_images/res/commandimagelist/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bold.png
diff --git a/default_images/res/commandimagelist/sch_borderdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_borderdialog.png
index 6c65b3646dd9..6c65b3646dd9 100644
--- a/default_images/res/commandimagelist/sch_borderdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_borderdialog.png
diff --git a/default_images/res/commandimagelist/sch_bringtofront.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bringtofront.png
index 20ddff45a587..20ddff45a587 100644
--- a/default_images/res/commandimagelist/sch_bringtofront.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bringtofront.png
diff --git a/default_images/res/commandimagelist/sch_browsebackward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browsebackward.png
index 62f6fe9b45ad..62f6fe9b45ad 100644
--- a/default_images/res/commandimagelist/sch_browsebackward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browsebackward.png
diff --git a/default_images/res/commandimagelist/sch_browseforward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseforward.png
index 2aa913553c1d..2aa913553c1d 100644
--- a/default_images/res/commandimagelist/sch_browseforward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseforward.png
diff --git a/default_images/res/commandimagelist/sch_browseview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseview.png
index e5ff2f82ad49..e5ff2f82ad49 100644
--- a/default_images/res/commandimagelist/sch_browseview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_browseview.png
diff --git a/default_images/res/commandimagelist/sch_bullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bullet.png
index 21b62e77e951..21b62e77e951 100644
--- a/default_images/res/commandimagelist/sch_bullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bullet.png
diff --git a/default_images/res/commandimagelist/sch_bulletsandnumberingdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bulletsandnumberingdialog.png
index e988b15a1c01..e988b15a1c01 100644
--- a/default_images/res/commandimagelist/sch_bulletsandnumberingdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_bulletsandnumberingdialog.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.cloud-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.cloud-callout.png
index 7c5accae3688..7c5accae3688 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.cloud-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.cloud-callout.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-1.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-1.png
index a97ca6b90891..a97ca6b90891 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-1.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-2.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-2.png
index bb22c46d4923..bb22c46d4923 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-2.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-3.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-3.png
index 1be3f4ce5a75..1be3f4ce5a75 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.line-callout-3.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.line-callout-3.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.png
index 2e636beb3735..2e636beb3735 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.rectangular-callout.png
index 4ba537e9f9cd..4ba537e9f9cd 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.rectangular-callout.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.round-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-callout.png
index a5a0d13e1c2c..a5a0d13e1c2c 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.round-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-callout.png
diff --git a/default_images/res/commandimagelist/sch_calloutshapes.round-rectangular-callout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-rectangular-callout.png
index 58de773621a6..58de773621a6 100644
--- a/default_images/res/commandimagelist/sch_calloutshapes.round-rectangular-callout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_calloutshapes.round-rectangular-callout.png
diff --git a/default_images/res/commandimagelist/sch_cellvertbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertbottom.png
index f4e09722f89a..f4e09722f89a 100644
--- a/default_images/res/commandimagelist/sch_cellvertbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertbottom.png
diff --git a/default_images/res/commandimagelist/sch_cellvertcenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertcenter.png
index 16a01eefcef2..16a01eefcef2 100644
--- a/default_images/res/commandimagelist/sch_cellvertcenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellvertcenter.png
diff --git a/default_images/res/commandimagelist/sch_cellverttop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellverttop.png
index c61ca4c35211..c61ca4c35211 100644
--- a/default_images/res/commandimagelist/sch_cellverttop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cellverttop.png
diff --git a/default_images/res/commandimagelist/sch_centerpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_centerpara.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/res/commandimagelist/sch_centerpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_centerpara.png
diff --git a/default_images/res/commandimagelist/sch_chainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_chainframes.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/res/commandimagelist/sch_chainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_chainframes.png
diff --git a/default_images/res/commandimagelist/sch_changebezier.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changebezier.png
index e4fe74e64027..e4fe74e64027 100644
--- a/default_images/res/commandimagelist/sch_changebezier.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changebezier.png
diff --git a/default_images/res/commandimagelist/sch_changecasetolower.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetolower.png
index 67c2850d0d1d..67c2850d0d1d 100644
--- a/default_images/res/commandimagelist/sch_changecasetolower.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetolower.png
diff --git a/default_images/res/commandimagelist/sch_changecasetoupper.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetoupper.png
index 88a27a4355cb..88a27a4355cb 100644
--- a/default_images/res/commandimagelist/sch_changecasetoupper.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changecasetoupper.png
diff --git a/default_images/res/commandimagelist/sch_changedatabasefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changedatabasefield.png
index 40c7157b58e1..40c7157b58e1 100644
--- a/default_images/res/commandimagelist/sch_changedatabasefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changedatabasefield.png
diff --git a/default_images/res/commandimagelist/sch_changepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changepolygon.png
index 9e3d4cd74f00..9e3d4cd74f00 100644
--- a/default_images/res/commandimagelist/sch_changepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_changepolygon.png
diff --git a/default_images/res/commandimagelist/sch_charfontname.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_charfontname.png
index 4ab8187fd3a2..4ab8187fd3a2 100644
--- a/default_images/res/commandimagelist/sch_charfontname.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_charfontname.png
diff --git a/default_images/res/commandimagelist/sch_checkbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_checkbox.png
index 47f1e58b7089..47f1e58b7089 100644
--- a/default_images/res/commandimagelist/sch_checkbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_checkbox.png
diff --git a/default_images/res/commandimagelist/sch_choosecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosecontrols.png
index 0847ecf3f1b7..0847ecf3f1b7 100644
--- a/default_images/res/commandimagelist/sch_choosecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosecontrols.png
diff --git a/default_images/res/commandimagelist/sch_choosedesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosedesign.png
index 7b2e7bb53f63..7b2e7bb53f63 100644
--- a/default_images/res/commandimagelist/sch_choosedesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosedesign.png
diff --git a/default_images/res/commandimagelist/sch_choosemacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosemacro.png
index ee521dd3dcba..ee521dd3dcba 100644
--- a/default_images/res/commandimagelist/sch_choosemacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosemacro.png
diff --git a/default_images/res/commandimagelist/sch_choosepolygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosepolygon.png
index d705fc47b9d2..d705fc47b9d2 100644
--- a/default_images/res/commandimagelist/sch_choosepolygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_choosepolygon.png
diff --git a/default_images/res/commandimagelist/sch_circle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle.png
index 5958503263f9..5958503263f9 100644
--- a/default_images/res/commandimagelist/sch_circle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle.png
diff --git a/default_images/res/commandimagelist/sch_circle_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle_unfilled.png
index 3673205da08d..3673205da08d 100644
--- a/default_images/res/commandimagelist/sch_circle_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circle_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_circlearc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlearc.png
index 67b08c7896e5..67b08c7896e5 100644
--- a/default_images/res/commandimagelist/sch_circlearc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlearc.png
diff --git a/default_images/res/commandimagelist/sch_circlecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut.png
index 74aeb29c8121..74aeb29c8121 100644
--- a/default_images/res/commandimagelist/sch_circlecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut.png
diff --git a/default_images/res/commandimagelist/sch_circlecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut_unfilled.png
index 8a4db2f92dc7..8a4db2f92dc7 100644
--- a/default_images/res/commandimagelist/sch_circlecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlecut_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_circlepie.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie.png
index 6e93cfaa57e3..6e93cfaa57e3 100644
--- a/default_images/res/commandimagelist/sch_circlepie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie.png
diff --git a/default_images/res/commandimagelist/sch_circlepie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie_unfilled.png
index 1708421a34a4..1708421a34a4 100644
--- a/default_images/res/commandimagelist/sch_circlepie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_circlepie_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_clickchangerotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_clickchangerotation.png
index abe523344f94..abe523344f94 100644
--- a/default_images/res/commandimagelist/sch_clickchangerotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_clickchangerotation.png
diff --git a/default_images/res/commandimagelist/sch_closedoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedoc.png
index 75fe03d80cae..75fe03d80cae 100644
--- a/default_images/res/commandimagelist/sch_closedoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedoc.png
diff --git a/default_images/res/commandimagelist/sch_closedocs.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedocs.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/commandimagelist/sch_closedocs.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closedocs.png
diff --git a/default_images/res/commandimagelist/sch_closemasterview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closemasterview.png
index cd71390e2b5e..cd71390e2b5e 100644
--- a/default_images/res/commandimagelist/sch_closemasterview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closemasterview.png
diff --git a/default_images/res/commandimagelist/sch_closewin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closewin.png
index c65043c7777c..c65043c7777c 100644
--- a/default_images/res/commandimagelist/sch_closewin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_closewin.png
diff --git a/default_images/res/commandimagelist/sch_color.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_color.png
index f6baeed08643..f6baeed08643 100644
--- a/default_images/res/commandimagelist/sch_color.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_color.png
diff --git a/default_images/res/commandimagelist/sch_colorsettings.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorsettings.png
index 0d9c76eb2784..0d9c76eb2784 100644
--- a/default_images/res/commandimagelist/sch_colorsettings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorsettings.png
diff --git a/default_images/res/commandimagelist/sch_colorview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorview.png
index 4376c3b52e3a..4376c3b52e3a 100644
--- a/default_images/res/commandimagelist/sch_colorview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_colorview.png
diff --git a/default_images/res/commandimagelist/sch_combobox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_combobox.png
index 08e5c1013760..08e5c1013760 100644
--- a/default_images/res/commandimagelist/sch_combobox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_combobox.png
diff --git a/default_images/res/commandimagelist/sch_commontaskbarvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_commontaskbarvisible.png
index fb6b34927a2c..fb6b34927a2c 100644
--- a/default_images/res/commandimagelist/sch_commontaskbarvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_commontaskbarvisible.png
diff --git a/default_images/res/commandimagelist/sch_compilebasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_compilebasic.png
index 79a7ed7f4035..79a7ed7f4035 100644
--- a/default_images/res/commandimagelist/sch_compilebasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_compilebasic.png
diff --git a/default_images/res/commandimagelist/sch_cone.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cone.png
index 41e102178147..41e102178147 100644
--- a/default_images/res/commandimagelist/sch_cone.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cone.png
diff --git a/default_images/res/commandimagelist/sch_config.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_config.png
index 550b12970009..550b12970009 100644
--- a/default_images/res/commandimagelist/sch_config.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_config.png
diff --git a/default_images/res/commandimagelist/sch_connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connector.png
index ddf5128e7439..ddf5128e7439 100644
--- a/default_images/res/commandimagelist/sch_connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connector.png
diff --git a/default_images/res/commandimagelist/sch_connectorarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowend.png
index 230d63e5f944..230d63e5f944 100644
--- a/default_images/res/commandimagelist/sch_connectorarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrows.png
index fa63eea54990..fa63eea54990 100644
--- a/default_images/res/commandimagelist/sch_connectorarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowstart.png
index b8bd90ebfc6e..b8bd90ebfc6e 100644
--- a/default_images/res/commandimagelist/sch_connectorarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorarrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorcircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircleend.png
index 2d3f3538a82a..2d3f3538a82a 100644
--- a/default_images/res/commandimagelist/sch_connectorcircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorcircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircles.png
index fab8cb3b9675..fab8cb3b9675 100644
--- a/default_images/res/commandimagelist/sch_connectorcircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorcirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcirclestart.png
index 25e96b332ca1..25e96b332ca1 100644
--- a/default_images/res/commandimagelist/sch_connectorcirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurve.png
index fb66741a5f75..fb66741a5f75 100644
--- a/default_images/res/commandimagelist/sch_connectorcurve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurve.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowend.png
index 0fcc5fff4a76..0fcc5fff4a76 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrows.png
index 781405c59b80..781405c59b80 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowstart.png
index f748f49b1e38..f748f49b1e38 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvearrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircleend.png
index 13246c6d9c03..13246c6d9c03 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircles.png
index 4f5fb862f5be..4f5fb862f5be 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorcurvecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecirclestart.png
index 8ff408f07f75..8ff408f07f75 100644
--- a/default_images/res/commandimagelist/sch_connectorcurvecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorcurvecirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectorline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorline.png
index 65750f3fe5c3..65750f3fe5c3 100644
--- a/default_images/res/commandimagelist/sch_connectorline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorline.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowend.png
index 93d742b50835..93d742b50835 100644
--- a/default_images/res/commandimagelist/sch_connectorlinearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrows.png
index 7f0311014edd..7f0311014edd 100644
--- a/default_images/res/commandimagelist/sch_connectorlinearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowstart.png
index 8ca31b61f58d..8ca31b61f58d 100644
--- a/default_images/res/commandimagelist/sch_connectorlinearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinearrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinecircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircleend.png
index 89b93c5d5a58..89b93c5d5a58 100644
--- a/default_images/res/commandimagelist/sch_connectorlinecircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinecircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircles.png
index 8df6dc5b9423..8df6dc5b9423 100644
--- a/default_images/res/commandimagelist/sch_connectorlinecircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinecirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecirclestart.png
index 841e99970e48..841e99970e48 100644
--- a/default_images/res/commandimagelist/sch_connectorlinecirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinecirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectorlines.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlines.png
index 5fa1604982fb..5fa1604982fb 100644
--- a/default_images/res/commandimagelist/sch_connectorlines.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlines.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinesarrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowend.png
index 28428ac515a9..28428ac515a9 100644
--- a/default_images/res/commandimagelist/sch_connectorlinesarrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinesarrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrows.png
index 16e3feda5573..16e3feda5573 100644
--- a/default_images/res/commandimagelist/sch_connectorlinesarrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrows.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinesarrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowstart.png
index 6ef1fe168382..6ef1fe168382 100644
--- a/default_images/res/commandimagelist/sch_connectorlinesarrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinesarrowstart.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinescircleend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircleend.png
index e1b4ec622857..e1b4ec622857 100644
--- a/default_images/res/commandimagelist/sch_connectorlinescircleend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircleend.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinescircles.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircles.png
index 8adc7f20d605..8adc7f20d605 100644
--- a/default_images/res/commandimagelist/sch_connectorlinescircles.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescircles.png
diff --git a/default_images/res/commandimagelist/sch_connectorlinescirclestart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescirclestart.png
index 221d32f23e49..221d32f23e49 100644
--- a/default_images/res/commandimagelist/sch_connectorlinescirclestart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectorlinescirclestart.png
diff --git a/default_images/res/commandimagelist/sch_connectortoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectortoolbox.png
index fab8cb3b9675..fab8cb3b9675 100644
--- a/default_images/res/commandimagelist/sch_connectortoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_connectortoolbox.png
diff --git a/default_images/res/commandimagelist/sch_contourdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_contourdialog.png
index 173f3bceb4c1..173f3bceb4c1 100644
--- a/default_images/res/commandimagelist/sch_contourdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_contourdialog.png
diff --git a/default_images/res/commandimagelist/sch_controlcodes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlcodes.png
index ba31845f6a4b..ba31845f6a4b 100644
--- a/default_images/res/commandimagelist/sch_controlcodes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlcodes.png
diff --git a/default_images/res/commandimagelist/sch_controlproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlproperties.png
index fb40afb1f4db..fb40afb1f4db 100644
--- a/default_images/res/commandimagelist/sch_controlproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_controlproperties.png
diff --git a/default_images/res/commandimagelist/sch_convertinto3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3d.png
index a2a8852d04e2..a2a8852d04e2 100644
--- a/default_images/res/commandimagelist/sch_convertinto3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3d.png
diff --git a/default_images/res/commandimagelist/sch_convertinto3dlathe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathe.png
index f1ba0ce08468..f1ba0ce08468 100644
--- a/default_images/res/commandimagelist/sch_convertinto3dlathe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathe.png
diff --git a/default_images/res/commandimagelist/sch_convertinto3dlathefast.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathefast.png
index 4b96c05279fd..4b96c05279fd 100644
--- a/default_images/res/commandimagelist/sch_convertinto3dlathefast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_convertinto3dlathefast.png
diff --git a/default_images/res/commandimagelist/sch_copy.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_copy.png
index 6f3eaf1138f3..6f3eaf1138f3 100644
--- a/default_images/res/commandimagelist/sch_copy.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_copy.png
diff --git a/default_images/res/commandimagelist/sch_countall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_countall.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_countall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_countall.png
diff --git a/default_images/res/commandimagelist/sch_crookrotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookrotate.png
index e5e9bccd7045..e5e9bccd7045 100644
--- a/default_images/res/commandimagelist/sch_crookrotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookrotate.png
diff --git a/default_images/res/commandimagelist/sch_crookslant.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookslant.png
index c72e0185809b..c72e0185809b 100644
--- a/default_images/res/commandimagelist/sch_crookslant.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crookslant.png
diff --git a/default_images/res/commandimagelist/sch_crop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crop.png
index aff300909548..aff300909548 100644
--- a/default_images/res/commandimagelist/sch_crop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_crop.png
diff --git a/default_images/res/commandimagelist/sch_cube.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cube.png
index 3d0f14fa2bb0..3d0f14fa2bb0 100644
--- a/default_images/res/commandimagelist/sch_cube.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cube.png
diff --git a/default_images/res/commandimagelist/sch_currencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_currencyfield.png
index 3b599c2c8a0d..3b599c2c8a0d 100644
--- a/default_images/res/commandimagelist/sch_currencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_currencyfield.png
diff --git a/default_images/res/commandimagelist/sch_customanimation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_customanimation.png
index 35382393cc2d..35382393cc2d 100644
--- a/default_images/res/commandimagelist/sch_customanimation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_customanimation.png
diff --git a/default_images/res/commandimagelist/sch_cut.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cut.png
index 6ca14bc6e3b3..6ca14bc6e3b3 100644
--- a/default_images/res/commandimagelist/sch_cut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cut.png
diff --git a/default_images/res/commandimagelist/sch_cylinder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cylinder.png
index b52e134e06a8..b52e134e06a8 100644
--- a/default_images/res/commandimagelist/sch_cylinder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cylinder.png
diff --git a/default_images/res/commandimagelist/sch_cyramid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cyramid.png
index 9786a4387980..9786a4387980 100644
--- a/default_images/res/commandimagelist/sch_cyramid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_cyramid.png
diff --git a/default_images/res/commandimagelist/sch_datadatapilotrun.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datadatapilotrun.png
index 00b6144460aa..00b6144460aa 100644
--- a/default_images/res/commandimagelist/sch_datadatapilotrun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datadatapilotrun.png
diff --git a/default_images/res/commandimagelist/sch_datafilterautofilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterautofilter.png
index 591b6ab0dffb..591b6ab0dffb 100644
--- a/default_images/res/commandimagelist/sch_datafilterautofilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterautofilter.png
diff --git a/default_images/res/commandimagelist/sch_datafilterspecialfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterspecialfilter.png
index 0aa85cc9624c..0aa85cc9624c 100644
--- a/default_images/res/commandimagelist/sch_datafilterspecialfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterspecialfilter.png
diff --git a/default_images/res/commandimagelist/sch_datafilterstandardfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterstandardfilter.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/commandimagelist/sch_datafilterstandardfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datafilterstandardfilter.png
diff --git a/default_images/res/commandimagelist/sch_dataimport.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataimport.png
index 971b3c0bca57..971b3c0bca57 100644
--- a/default_images/res/commandimagelist/sch_dataimport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataimport.png
diff --git a/default_images/res/commandimagelist/sch_dataincolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataincolumns.png
index a2be5faaee2f..a2be5faaee2f 100644
--- a/default_images/res/commandimagelist/sch_dataincolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dataincolumns.png
diff --git a/default_images/res/commandimagelist/sch_datainrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datainrows.png
index 718aec92fe3e..718aec92fe3e 100644
--- a/default_images/res/commandimagelist/sch_datainrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datainrows.png
diff --git a/default_images/res/commandimagelist/sch_datefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datefield.png
index 720550d4a9db..720550d4a9db 100644
--- a/default_images/res/commandimagelist/sch_datefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_datefield.png
diff --git a/default_images/res/commandimagelist/sch_dbaddrelation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbaddrelation.png
index ae8980c31324..ae8980c31324 100644
--- a/default_images/res/commandimagelist/sch_dbaddrelation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbaddrelation.png
diff --git a/default_images/res/commandimagelist/sch_dbchangedesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbchangedesignmode.png
index 90e2b8d05cbb..90e2b8d05cbb 100644
--- a/default_images/res/commandimagelist/sch_dbchangedesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbchangedesignmode.png
diff --git a/default_images/res/commandimagelist/sch_dbclearquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbclearquery.png
index 96bd9d89bef7..96bd9d89bef7 100644
--- a/default_images/res/commandimagelist/sch_dbclearquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbclearquery.png
diff --git a/default_images/res/commandimagelist/sch_dbdistinctvalues.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbdistinctvalues.png
index 3aeea3fd066c..3aeea3fd066c 100644
--- a/default_images/res/commandimagelist/sch_dbdistinctvalues.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbdistinctvalues.png
diff --git a/default_images/res/commandimagelist/sch_dbformdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformdelete.png
index dfc359a6403f..dfc359a6403f 100644
--- a/default_images/res/commandimagelist/sch_dbformdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformdelete.png
diff --git a/default_images/res/commandimagelist/sch_dbformedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformedit.png
index 35c2d38f045d..35c2d38f045d 100644
--- a/default_images/res/commandimagelist/sch_dbformedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformedit.png
diff --git a/default_images/res/commandimagelist/sch_dbformopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformopen.png
index 546830a49d02..546830a49d02 100644
--- a/default_images/res/commandimagelist/sch_dbformopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformopen.png
diff --git a/default_images/res/commandimagelist/sch_dbformrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformrename.png
index b137d7fb85d2..b137d7fb85d2 100644
--- a/default_images/res/commandimagelist/sch_dbformrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbformrename.png
diff --git a/default_images/res/commandimagelist/sch_dbindexdesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbindexdesign.png
index 7564c96b0ea9..7564c96b0ea9 100644
--- a/default_images/res/commandimagelist/sch_dbindexdesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbindexdesign.png
diff --git a/default_images/res/commandimagelist/sch_dbnewform.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewform.png
index 7cb6f3571773..7cb6f3571773 100644
--- a/default_images/res/commandimagelist/sch_dbnewform.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewform.png
diff --git a/default_images/res/commandimagelist/sch_dbnewformautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewformautopilot.png
index b6561f1a81f0..b6561f1a81f0 100644
--- a/default_images/res/commandimagelist/sch_dbnewformautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewformautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewquery.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquery.png
index 1f0b5c621783..1f0b5c621783 100644
--- a/default_images/res/commandimagelist/sch_dbnewquery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquery.png
diff --git a/default_images/res/commandimagelist/sch_dbnewqueryautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewqueryautopilot.png
index bf498241c5e9..bf498241c5e9 100644
--- a/default_images/res/commandimagelist/sch_dbnewqueryautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewqueryautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewquerysql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquerysql.png
index 732b2a5bb6d3..732b2a5bb6d3 100644
--- a/default_images/res/commandimagelist/sch_dbnewquerysql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewquerysql.png
diff --git a/default_images/res/commandimagelist/sch_dbnewreport.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreport.png
index b23533aca72c..b23533aca72c 100644
--- a/default_images/res/commandimagelist/sch_dbnewreport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreport.png
diff --git a/default_images/res/commandimagelist/sch_dbnewreportautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreportautopilot.png
index 83a7331393e3..83a7331393e3 100644
--- a/default_images/res/commandimagelist/sch_dbnewreportautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewreportautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewtable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtable.png
index cfb45bd15477..cfb45bd15477 100644
--- a/default_images/res/commandimagelist/sch_dbnewtable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtable.png
diff --git a/default_images/res/commandimagelist/sch_dbnewtableautopilot.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtableautopilot.png
index 46251a915ed6..46251a915ed6 100644
--- a/default_images/res/commandimagelist/sch_dbnewtableautopilot.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewtableautopilot.png
diff --git a/default_images/res/commandimagelist/sch_dbnewview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewview.png
index b1af2b81931f..b1af2b81931f 100644
--- a/default_images/res/commandimagelist/sch_dbnewview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewview.png
diff --git a/default_images/res/commandimagelist/sch_dbnewviewsql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewviewsql.png
index c4f6fb9f25cc..c4f6fb9f25cc 100644
--- a/default_images/res/commandimagelist/sch_dbnewviewsql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbnewviewsql.png
diff --git a/default_images/res/commandimagelist/sch_dbquerydelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbquerydelete.png
index c8da800ad431..c8da800ad431 100644
--- a/default_images/res/commandimagelist/sch_dbquerydelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbquerydelete.png
diff --git a/default_images/res/commandimagelist/sch_dbqueryedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryedit.png
index e23ae708a990..e23ae708a990 100644
--- a/default_images/res/commandimagelist/sch_dbqueryedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryedit.png
diff --git a/default_images/res/commandimagelist/sch_dbqueryopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryopen.png
index 437473da1b5c..437473da1b5c 100644
--- a/default_images/res/commandimagelist/sch_dbqueryopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryopen.png
diff --git a/default_images/res/commandimagelist/sch_dbqueryrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryrename.png
index 05cf9c98ae40..05cf9c98ae40 100644
--- a/default_images/res/commandimagelist/sch_dbqueryrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbqueryrename.png
diff --git a/default_images/res/commandimagelist/sch_dbreportdelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportdelete.png
index 2056640746a3..2056640746a3 100644
--- a/default_images/res/commandimagelist/sch_dbreportdelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportdelete.png
diff --git a/default_images/res/commandimagelist/sch_dbreportedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportedit.png
index 8752c3a3ad34..8752c3a3ad34 100644
--- a/default_images/res/commandimagelist/sch_dbreportedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportedit.png
diff --git a/default_images/res/commandimagelist/sch_dbreportopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportopen.png
index 55362273fbc4..55362273fbc4 100644
--- a/default_images/res/commandimagelist/sch_dbreportopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportopen.png
diff --git a/default_images/res/commandimagelist/sch_dbreportrename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportrename.png
index 50f66a12e4f8..50f66a12e4f8 100644
--- a/default_images/res/commandimagelist/sch_dbreportrename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbreportrename.png
diff --git a/default_images/res/commandimagelist/sch_dbsortingandgrouping.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbsortingandgrouping.png
index abfab0cde149..abfab0cde149 100644
--- a/default_images/res/commandimagelist/sch_dbsortingandgrouping.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbsortingandgrouping.png
diff --git a/default_images/res/commandimagelist/sch_dbtabledelete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtabledelete.png
index 9e5853b52f09..9e5853b52f09 100644
--- a/default_images/res/commandimagelist/sch_dbtabledelete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtabledelete.png
diff --git a/default_images/res/commandimagelist/sch_dbtableedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableedit.png
index 04a7a85671bc..04a7a85671bc 100644
--- a/default_images/res/commandimagelist/sch_dbtableedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableedit.png
diff --git a/default_images/res/commandimagelist/sch_dbtableopen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableopen.png
index 76fd1e8c5ec4..76fd1e8c5ec4 100644
--- a/default_images/res/commandimagelist/sch_dbtableopen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtableopen.png
diff --git a/default_images/res/commandimagelist/sch_dbtablerename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtablerename.png
index 8da47f932034..8da47f932034 100644
--- a/default_images/res/commandimagelist/sch_dbtablerename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbtablerename.png
diff --git a/default_images/res/commandimagelist/sch_dbviewaliases.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewaliases.png
index 1f761216842d..1f761216842d 100644
--- a/default_images/res/commandimagelist/sch_dbviewaliases.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewaliases.png
diff --git a/default_images/res/commandimagelist/sch_dbviewfunctions.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewfunctions.png
index 9f115c406f78..9f115c406f78 100644
--- a/default_images/res/commandimagelist/sch_dbviewfunctions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewfunctions.png
diff --git a/default_images/res/commandimagelist/sch_dbviewtablenames.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewtablenames.png
index 252b2e890cfd..252b2e890cfd 100644
--- a/default_images/res/commandimagelist/sch_dbviewtablenames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dbviewtablenames.png
diff --git a/default_images/res/commandimagelist/sch_decrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementindent.png
index 1b1126da90a9..1b1126da90a9 100644
--- a/default_images/res/commandimagelist/sch_decrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementindent.png
diff --git a/default_images/res/commandimagelist/sch_decrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementlevel.png
index 0ed6d39bd2d4..0ed6d39bd2d4 100644
--- a/default_images/res/commandimagelist/sch_decrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementlevel.png
diff --git a/default_images/res/commandimagelist/sch_decrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementsublevels.png
index c5a0b19bbbcf..c5a0b19bbbcf 100644
--- a/default_images/res/commandimagelist/sch_decrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_decrementsublevels.png
diff --git a/default_images/res/commandimagelist/sch_defaultbullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultbullet.png
index 8e6e8b554b94..8e6e8b554b94 100644
--- a/default_images/res/commandimagelist/sch_defaultbullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultbullet.png
diff --git a/default_images/res/commandimagelist/sch_defaultnumbering.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultnumbering.png
index 97acde164ab7..97acde164ab7 100644
--- a/default_images/res/commandimagelist/sch_defaultnumbering.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defaultnumbering.png
diff --git a/default_images/res/commandimagelist/sch_definename.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_definename.png
index 4b3d4555147d..4b3d4555147d 100644
--- a/default_images/res/commandimagelist/sch_definename.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_definename.png
diff --git a/default_images/res/commandimagelist/sch_defineprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defineprintarea.png
index 0e9db1050ac6..0e9db1050ac6 100644
--- a/default_images/res/commandimagelist/sch_defineprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_defineprintarea.png
diff --git a/default_images/res/commandimagelist/sch_delete.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_delete.png
index deedf75daa1b..deedf75daa1b 100644
--- a/default_images/res/commandimagelist/sch_delete.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_delete.png
diff --git a/default_images/res/commandimagelist/sch_deleteallannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteallannotation.png
index d09be10e3a94..d09be10e3a94 100644
--- a/default_images/res/commandimagelist/sch_deleteallannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteallannotation.png
diff --git a/default_images/res/commandimagelist/sch_deleteannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteannotation.png
index f3c9c0d5315f..f3c9c0d5315f 100644
--- a/default_images/res/commandimagelist/sch_deleteannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteannotation.png
diff --git a/default_images/res/commandimagelist/sch_deletecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletecolumns.png
index 264a83ad5b28..264a83ad5b28 100644
--- a/default_images/res/commandimagelist/sch_deletecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletecolumns.png
diff --git a/default_images/res/commandimagelist/sch_deletemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletemasterpage.png
index bf8e98f2e0b0..bf8e98f2e0b0 100644
--- a/default_images/res/commandimagelist/sch_deletemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deletemasterpage.png
diff --git a/default_images/res/commandimagelist/sch_deleteprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteprintarea.png
index 85cdc69f997d..85cdc69f997d 100644
--- a/default_images/res/commandimagelist/sch_deleteprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleteprintarea.png
diff --git a/default_images/res/commandimagelist/sch_deleterecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterecord.png
index e67b18e0f768..e67b18e0f768 100644
--- a/default_images/res/commandimagelist/sch_deleterecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterecord.png
diff --git a/default_images/res/commandimagelist/sch_deleterows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterows.png
index d72592d15bb2..d72592d15bb2 100644
--- a/default_images/res/commandimagelist/sch_deleterows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_deleterows.png
diff --git a/default_images/res/commandimagelist/sch_designerdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_designerdialog.png
index 80178396c8c1..80178396c8c1 100644
--- a/default_images/res/commandimagelist/sch_designerdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_designerdialog.png
diff --git a/default_images/res/commandimagelist/sch_dia.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dia.png
index 867eda5e2d05..867eda5e2d05 100644
--- a/default_images/res/commandimagelist/sch_dia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dia.png
diff --git a/default_images/res/commandimagelist/sch_diaauto.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaauto.png
index 4e766476d4bf..4e766476d4bf 100644
--- a/default_images/res/commandimagelist/sch_diaauto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaauto.png
diff --git a/default_images/res/commandimagelist/sch_diaeffect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaeffect.png
index 33a9e4365ec3..33a9e4365ec3 100644
--- a/default_images/res/commandimagelist/sch_diaeffect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaeffect.png
diff --git a/default_images/res/commandimagelist/sch_diagramdata.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramdata.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_diagramdata.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramdata.png
diff --git a/default_images/res/commandimagelist/sch_diagramtype.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramtype.png
index dd67b0c006a0..dd67b0c006a0 100644
--- a/default_images/res/commandimagelist/sch_diagramtype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diagramtype.png
diff --git a/default_images/res/commandimagelist/sch_diaspeed.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaspeed.png
index 7a450e1b7153..7a450e1b7153 100644
--- a/default_images/res/commandimagelist/sch_diaspeed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diaspeed.png
diff --git a/default_images/res/commandimagelist/sch_diatime.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diatime.png
index f04c3ce18ff6..f04c3ce18ff6 100644
--- a/default_images/res/commandimagelist/sch_diatime.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_diatime.png
diff --git a/default_images/res/commandimagelist/sch_distributecolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributecolumns.png
index 0fdc0f2dc42b..0fdc0f2dc42b 100644
--- a/default_images/res/commandimagelist/sch_distributecolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributecolumns.png
diff --git a/default_images/res/commandimagelist/sch_distributerows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributerows.png
index 3ecde0921c2f..3ecde0921c2f 100644
--- a/default_images/res/commandimagelist/sch_distributerows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_distributerows.png
diff --git a/default_images/res/commandimagelist/sch_doubleclicktextedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_doubleclicktextedit.png
index d51d52a5dc58..d51d52a5dc58 100644
--- a/default_images/res/commandimagelist/sch_doubleclicktextedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_doubleclicktextedit.png
diff --git a/default_images/res/commandimagelist/sch_downsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_downsearch.png
index 6781fbb1344e..6781fbb1344e 100644
--- a/default_images/res/commandimagelist/sch_downsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_downsearch.png
diff --git a/default_images/res/commandimagelist/sch_draw.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_draw.png
index 7c3d649a211e..7c3d649a211e 100644
--- a/default_images/res/commandimagelist/sch_draw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_draw.png
diff --git a/default_images/res/commandimagelist/sch_drawcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawcaption.png
index 6753d4d1e1d4..6753d4d1e1d4 100644
--- a/default_images/res/commandimagelist/sch_drawcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawcaption.png
diff --git a/default_images/res/commandimagelist/sch_drawchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawchart.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/res/commandimagelist/sch_drawchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawchart.png
diff --git a/default_images/res/commandimagelist/sch_drawselect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawselect.png
index fd37063dbf57..fd37063dbf57 100644
--- a/default_images/res/commandimagelist/sch_drawselect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawselect.png
diff --git a/default_images/res/commandimagelist/sch_drawtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawtext.png
index 4066acea5ce4..4066acea5ce4 100644
--- a/default_images/res/commandimagelist/sch_drawtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_drawtext.png
diff --git a/default_images/res/commandimagelist/sch_dsbdocumentdatasource.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbdocumentdatasource.png
index 93956b232e59..93956b232e59 100644
--- a/default_images/res/commandimagelist/sch_dsbdocumentdatasource.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbdocumentdatasource.png
diff --git a/default_images/res/commandimagelist/sch_dsbeditdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbeditdoc.png
index ea0ac07e7239..ea0ac07e7239 100644
--- a/default_images/res/commandimagelist/sch_dsbeditdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbeditdoc.png
diff --git a/default_images/res/commandimagelist/sch_dsbformletter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbformletter.png
index d28fb499104a..d28fb499104a 100644
--- a/default_images/res/commandimagelist/sch_dsbformletter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbformletter.png
diff --git a/default_images/res/commandimagelist/sch_dsbinsertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcolumns.png
index 140cdc15f484..140cdc15f484 100644
--- a/default_images/res/commandimagelist/sch_dsbinsertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcolumns.png
diff --git a/default_images/res/commandimagelist/sch_dsbinsertcontent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcontent.png
index 63232c592e9f..63232c592e9f 100644
--- a/default_images/res/commandimagelist/sch_dsbinsertcontent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbinsertcontent.png
diff --git a/default_images/res/commandimagelist/sch_dsbrowserexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbrowserexplorer.png
index d2b0263d4671..d2b0263d4671 100644
--- a/default_images/res/commandimagelist/sch_dsbrowserexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_dsbrowserexplorer.png
diff --git a/default_images/res/commandimagelist/sch_duplicatepage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_duplicatepage.png
index d69afca72bc0..d69afca72bc0 100644
--- a/default_images/res/commandimagelist/sch_duplicatepage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_duplicatepage.png
diff --git a/default_images/res/commandimagelist/sch_edit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_edit.png
index 6245ac512b79..6245ac512b79 100644
--- a/default_images/res/commandimagelist/sch_edit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_edit.png
diff --git a/default_images/res/commandimagelist/sch_editdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editdoc.png
index ea0ac07e7239..ea0ac07e7239 100644
--- a/default_images/res/commandimagelist/sch_editdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editdoc.png
diff --git a/default_images/res/commandimagelist/sch_editframeset.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editframeset.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_editframeset.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editframeset.png
diff --git a/default_images/res/commandimagelist/sch_editglossary.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editglossary.png
index c64d8eb36109..c64d8eb36109 100644
--- a/default_images/res/commandimagelist/sch_editglossary.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editglossary.png
diff --git a/default_images/res/commandimagelist/sch_editheaderandfooter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editheaderandfooter.png
index 5893d454caae..5893d454caae 100644
--- a/default_images/res/commandimagelist/sch_editheaderandfooter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editheaderandfooter.png
diff --git a/default_images/res/commandimagelist/sch_editprintarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editprintarea.png
index c7372f93b221..c7372f93b221 100644
--- a/default_images/res/commandimagelist/sch_editprintarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_editprintarea.png
diff --git a/default_images/res/commandimagelist/sch_ellipse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/res/commandimagelist/sch_ellipse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse.png
diff --git a/default_images/res/commandimagelist/sch_ellipse_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse_unfilled.png
index 0d7f6acd038c..0d7f6acd038c 100644
--- a/default_images/res/commandimagelist/sch_ellipse_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipse_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_ellipsecut.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut.png
index 2e664c150015..2e664c150015 100644
--- a/default_images/res/commandimagelist/sch_ellipsecut.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut.png
diff --git a/default_images/res/commandimagelist/sch_ellipsecut_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut_unfilled.png
index 2cd950502210..2cd950502210 100644
--- a/default_images/res/commandimagelist/sch_ellipsecut_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsecut_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_ellipsetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsetoolbox.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/res/commandimagelist/sch_ellipsetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ellipsetoolbox.png
diff --git a/default_images/res/commandimagelist/sch_entergroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entergroup.png
index d5d36f5c32b4..d5d36f5c32b4 100644
--- a/default_images/res/commandimagelist/sch_entergroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entergroup.png
diff --git a/default_images/res/commandimagelist/sch_entirecolumn.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirecolumn.png
index d7fd197a56af..d7fd197a56af 100644
--- a/default_images/res/commandimagelist/sch_entirecolumn.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirecolumn.png
diff --git a/default_images/res/commandimagelist/sch_entirerow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirerow.png
index 5ce7f577f879..5ce7f577f879 100644
--- a/default_images/res/commandimagelist/sch_entirerow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_entirerow.png
diff --git a/default_images/res/commandimagelist/sch_euroconverter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_euroconverter.png
index 3e53e0e50963..3e53e0e50963 100644
--- a/default_images/res/commandimagelist/sch_euroconverter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_euroconverter.png
diff --git a/default_images/res/commandimagelist/sch_executereport.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_executereport.png
index 1e3733596b88..1e3733596b88 100644
--- a/default_images/res/commandimagelist/sch_executereport.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_executereport.png
diff --git a/default_images/res/commandimagelist/sch_expandpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_expandpage.png
index 8d9900edda64..8d9900edda64 100644
--- a/default_images/res/commandimagelist/sch_expandpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_expandpage.png
diff --git a/default_images/res/commandimagelist/sch_exportdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdialog.png
index 01113531e2f8..01113531e2f8 100644
--- a/default_images/res/commandimagelist/sch_exportdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdialog.png
diff --git a/default_images/res/commandimagelist/sch_exportdirecttopdf.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdirecttopdf.png
index b2e44c4aaad7..b2e44c4aaad7 100644
--- a/default_images/res/commandimagelist/sch_exportdirecttopdf.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportdirecttopdf.png
diff --git a/default_images/res/commandimagelist/sch_exportto.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportto.png
index 817875393a6a..817875393a6a 100644
--- a/default_images/res/commandimagelist/sch_exportto.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_exportto.png
diff --git a/default_images/res/commandimagelist/sch_extendedhelp.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extendedhelp.png
index d33cc8837392..d33cc8837392 100644
--- a/default_images/res/commandimagelist/sch_extendedhelp.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extendedhelp.png
diff --git a/default_images/res/commandimagelist/sch_extrusion3dcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusion3dcolor.png
index 5e147488d3c5..5e147488d3c5 100644
--- a/default_images/res/commandimagelist/sch_extrusion3dcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusion3dcolor.png
diff --git a/default_images/res/commandimagelist/sch_extrusiondepthfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondepthfloater.png
index b30f113d2387..b30f113d2387 100644
--- a/default_images/res/commandimagelist/sch_extrusiondepthfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondepthfloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusiondirectionfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondirectionfloater.png
index c0891d770c02..c0891d770c02 100644
--- a/default_images/res/commandimagelist/sch_extrusiondirectionfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiondirectionfloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusionlightingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionlightingfloater.png
index 9ed48cdf30a7..9ed48cdf30a7 100644
--- a/default_images/res/commandimagelist/sch_extrusionlightingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionlightingfloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusionsurfacefloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionsurfacefloater.png
index ba9e6fc6a462..ba9e6fc6a462 100644
--- a/default_images/res/commandimagelist/sch_extrusionsurfacefloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusionsurfacefloater.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltdown.png
index ac7453ca5486..ac7453ca5486 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltdown.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltleft.png
index 3d5252958cb9..3d5252958cb9 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltleft.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltright.png
index ebe9f7a1f2e6..ebe9f7a1f2e6 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltright.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontiltup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltup.png
index b68ca2bc261c..b68ca2bc261c 100644
--- a/default_images/res/commandimagelist/sch_extrusiontiltup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontiltup.png
diff --git a/default_images/res/commandimagelist/sch_extrusiontoggle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontoggle.png
index 3938e908f8d3..3938e908f8d3 100644
--- a/default_images/res/commandimagelist/sch_extrusiontoggle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_extrusiontoggle.png
diff --git a/default_images/res/commandimagelist/sch_fieldnames.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fieldnames.png
index 5b95655cfa90..5b95655cfa90 100644
--- a/default_images/res/commandimagelist/sch_fieldnames.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fieldnames.png
diff --git a/default_images/res/commandimagelist/sch_fields.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fields.png
index 5b95655cfa90..5b95655cfa90 100644
--- a/default_images/res/commandimagelist/sch_fields.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fields.png
diff --git a/default_images/res/commandimagelist/sch_filecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filecontrol.png
index 724eb1248921..724eb1248921 100644
--- a/default_images/res/commandimagelist/sch_filecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filecontrol.png
diff --git a/default_images/res/commandimagelist/sch_filedocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filedocument.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_filedocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filedocument.png
diff --git a/default_images/res/commandimagelist/sch_fillshadow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillshadow.png
index f38c4583a2de..f38c4583a2de 100644
--- a/default_images/res/commandimagelist/sch_fillshadow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillshadow.png
diff --git a/default_images/res/commandimagelist/sch_fillstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillstyle.png
index 7530e245db62..7530e245db62 100644
--- a/default_images/res/commandimagelist/sch_fillstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fillstyle.png
diff --git a/default_images/res/commandimagelist/sch_filtercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filtercrit.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/commandimagelist/sch_filtercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_filtercrit.png
diff --git a/default_images/res/commandimagelist/sch_firstpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstpage.png
index b1296765d04f..b1296765d04f 100644
--- a/default_images/res/commandimagelist/sch_firstpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstpage.png
diff --git a/default_images/res/commandimagelist/sch_firstrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstrecord.png
index 80c6152c0e02..80c6152c0e02 100644
--- a/default_images/res/commandimagelist/sch_firstrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_firstrecord.png
diff --git a/default_images/res/commandimagelist/sch_fliphorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fliphorizontal.png
index 13513090b973..13513090b973 100644
--- a/default_images/res/commandimagelist/sch_fliphorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fliphorizontal.png
diff --git a/default_images/res/commandimagelist/sch_flipvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flipvertical.png
index b4e7252daa1f..b4e7252daa1f 100644
--- a/default_images/res/commandimagelist/sch_flipvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flipvertical.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-alternate-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-alternate-process.png
index afc0127f13cd..afc0127f13cd 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-alternate-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-alternate-process.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-card.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-card.png
index cfa0941f8319..cfa0941f8319 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-card.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-card.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-collate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-collate.png
index 7edab658ff3f..7edab658ff3f 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-collate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-collate.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-connector.png
index 5958503263f9..5958503263f9 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-connector.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-data.png
index 086e39604151..086e39604151 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-data.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-decision.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-decision.png
index 130b1627676a..130b1627676a 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-decision.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-decision.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-delay.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-delay.png
index 6c85bfdfcabb..6c85bfdfcabb 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-delay.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-delay.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-direct-access-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-direct-access-storage.png
index f0487710018a..f0487710018a 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-direct-access-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-direct-access-storage.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-display.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-display.png
index 2cc424f61aa7..2cc424f61aa7 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-display.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-display.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-document.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-document.png
index 767e09a79f10..767e09a79f10 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-document.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-document.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-extract.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-extract.png
index c171a23dccf1..c171a23dccf1 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-extract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-extract.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-internal-storage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-internal-storage.png
index 6e44ca69f7f6..6e44ca69f7f6 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-internal-storage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-internal-storage.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-magnetic-disk.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-magnetic-disk.png
index 369c8972af29..369c8972af29 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-magnetic-disk.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-magnetic-disk.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-input.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-input.png
index 8be5654a94f2..8be5654a94f2 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-input.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-input.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-operation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-operation.png
index e38a7229a856..e38a7229a856 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-manual-operation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-manual-operation.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-merge.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-merge.png
index 619eb614549b..619eb614549b 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-merge.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-merge.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-multidocument.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-multidocument.png
index 9c0c7e7d9897..9c0c7e7d9897 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-multidocument.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-multidocument.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-off-page-connector.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-off-page-connector.png
index 5f645d4b4ec7..5f645d4b4ec7 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-off-page-connector.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-off-page-connector.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-or.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-or.png
index 513846e0bdc7..513846e0bdc7 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-or.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-or.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-predefined-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-predefined-process.png
index 14157b473827..14157b473827 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-predefined-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-predefined-process.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-preparation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-preparation.png
index 75ad5b561769..75ad5b561769 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-preparation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-preparation.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-process.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-process.png
index 409e91d061bf..409e91d061bf 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-process.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-process.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-punched-tape.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-punched-tape.png
index 97f37fa46e07..97f37fa46e07 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-punched-tape.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-punched-tape.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sequential-access.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sequential-access.png
index 31b713c90314..31b713c90314 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sequential-access.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sequential-access.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sort.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sort.png
index b37ad09fabb8..b37ad09fabb8 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-sort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-sort.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-stored-data.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-stored-data.png
index 08929be93545..08929be93545 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-stored-data.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-stored-data.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-summing-junction.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-summing-junction.png
index 1ffc8aaf0d50..1ffc8aaf0d50 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-summing-junction.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-summing-junction.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-terminator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-terminator.png
index 84aaf48e193c..84aaf48e193c 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.flowchart-terminator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.flowchart-terminator.png
diff --git a/default_images/res/commandimagelist/sch_flowchartshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.png
index 6e44ca69f7f6..6e44ca69f7f6 100644
--- a/default_images/res/commandimagelist/sch_flowchartshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_flowchartshapes.png
diff --git a/default_images/res/commandimagelist/sch_fontcolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontcolor.png
index 04549c95ecda..04549c95ecda 100644
--- a/default_images/res/commandimagelist/sch_fontcolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontcolor.png
diff --git a/default_images/res/commandimagelist/sch_fontdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontdialog.png
index fb25a2275ab5..fb25a2275ab5 100644
--- a/default_images/res/commandimagelist/sch_fontdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontdialog.png
diff --git a/default_images/res/commandimagelist/sch_fontheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontheight.png
index f01894fa92c9..f01894fa92c9 100644
--- a/default_images/res/commandimagelist/sch_fontheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontheight.png
diff --git a/default_images/res/commandimagelist/sch_fontwork.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontwork.png
index a02602c0766e..a02602c0766e 100644
--- a/default_images/res/commandimagelist/sch_fontwork.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontwork.png
diff --git a/default_images/res/commandimagelist/sch_fontworkalignmentfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkalignmentfloater.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/res/commandimagelist/sch_fontworkalignmentfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkalignmentfloater.png
diff --git a/default_images/res/commandimagelist/sch_fontworkcharacterspacingfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkcharacterspacingfloater.png
index 226e18cb1823..226e18cb1823 100644
--- a/default_images/res/commandimagelist/sch_fontworkcharacterspacingfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkcharacterspacingfloater.png
diff --git a/default_images/res/commandimagelist/sch_fontworkgalleryfloater.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkgalleryfloater.png
index 0125fa695ca7..0125fa695ca7 100644
--- a/default_images/res/commandimagelist/sch_fontworkgalleryfloater.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkgalleryfloater.png
diff --git a/default_images/res/commandimagelist/sch_fontworksameletterheights.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworksameletterheights.png
index ef8a7e97d159..ef8a7e97d159 100644
--- a/default_images/res/commandimagelist/sch_fontworksameletterheights.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworksameletterheights.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-curve.png
index a1be35c91044..a1be35c91044 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-pour.png
index 9f63003ba025..9f63003ba025 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-down-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-down-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-curve.png
index 5254082f127a..5254082f127a 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-pour.png
index ef4ec1a80878..ef4ec1a80878 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-left-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-left-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-curve.png
index f9a3c10cfef5..f9a3c10cfef5 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-pour.png
index d58de8e4e394..d58de8e4e394 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-right-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-right-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-curve.png
index 0036f747d0b8..0036f747d0b8 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-pour.png
index 64a795884d7e..64a795884d7e 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-arch-up-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-arch-up-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-down.png
index 67940af3fff9..67940af3fff9 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-up.png
index 74de2b10f34d..74de2b10f34d 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-chevron-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-chevron-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-curve.png
index c2646d6f35c3..c2646d6f35c3 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-pour.png
index 03ec7b1ce4fc..03ec7b1ce4fc 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-circle-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-down.png
index 90e37c4a7c74..90e37c4a7c74 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-up.png
index 75fb39baf33d..75fb39baf33d 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-curve-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-curve-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-down.png
index 5624d8d21544..5624d8d21544 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-left.png
index f513482d7a69..f513482d7a69 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-left.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-right.png
index 7d6e9a682d68..7d6e9a682d68 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-right.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-left.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-left.png
index 4ad6f88965aa..4ad6f88965aa 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-left.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-left.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-right.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-right.png
index 590da8ff91ae..590da8ff91ae 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up-and-right.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up-and-right.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up.png
index e73aaf79faa6..e73aaf79faa6 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-fade-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-fade-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-inflate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-inflate.png
index 3a33283322fc..3a33283322fc 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-inflate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-inflate.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-curve.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-curve.png
index 4ddd53ea4437..4ddd53ea4437 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-curve.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-curve.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-pour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-pour.png
index 042ac23771c5..042ac23771c5 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-open-circle-pour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-open-circle-pour.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-plain-text.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-plain-text.png
index 614b00469aa6..614b00469aa6 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-plain-text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-plain-text.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-down.png
index 67774d2d6dcd..67774d2d6dcd 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-up.png
index 5d3f6cbd5b84..5d3f6cbd5b84 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-slant-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-slant-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-stop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-stop.png
index b9ebee0f2f1a..b9ebee0f2f1a 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-stop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-stop.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-down.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-down.png
index bc9aa4bf9d0d..bc9aa4bf9d0d 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-down.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-down.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-up.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-up.png
index a6cf281d501f..a6cf281d501f 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-triangle-up.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-triangle-up.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-wave.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-wave.png
index 7d58e8f937ad..7d58e8f937ad 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.fontwork-wave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.fontwork-wave.png
diff --git a/default_images/res/commandimagelist/sch_fontworkshapetype.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.png
index 82c396a384d9..82c396a384d9 100644
--- a/default_images/res/commandimagelist/sch_fontworkshapetype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fontworkshapetype.png
diff --git a/default_images/res/commandimagelist/sch_formatarea.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatarea.png
index 14b38a7d511a..14b38a7d511a 100644
--- a/default_images/res/commandimagelist/sch_formatarea.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatarea.png
diff --git a/default_images/res/commandimagelist/sch_formatgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatgroup.png
index 77519875a076..77519875a076 100644
--- a/default_images/res/commandimagelist/sch_formatgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatgroup.png
diff --git a/default_images/res/commandimagelist/sch_formatline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatline.png
index d254b10caf2f..d254b10caf2f 100644
--- a/default_images/res/commandimagelist/sch_formatline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatline.png
diff --git a/default_images/res/commandimagelist/sch_formatpaintbrush.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatpaintbrush.png
index 8fc342475371..8fc342475371 100644
--- a/default_images/res/commandimagelist/sch_formatpaintbrush.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatpaintbrush.png
diff --git a/default_images/res/commandimagelist/sch_formattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formattedfield.png
index d546a44014a7..d546a44014a7 100644
--- a/default_images/res/commandimagelist/sch_formattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formattedfield.png
diff --git a/default_images/res/commandimagelist/sch_formatungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatungroup.png
index 1f9de64442ee..1f9de64442ee 100644
--- a/default_images/res/commandimagelist/sch_formatungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formatungroup.png
diff --git a/default_images/res/commandimagelist/sch_formdesigntools.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formdesigntools.png
index ed6bb73ad064..ed6bb73ad064 100644
--- a/default_images/res/commandimagelist/sch_formdesigntools.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formdesigntools.png
diff --git a/default_images/res/commandimagelist/sch_formelcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formelcursor.png
index 9725a7e5136f..9725a7e5136f 100644
--- a/default_images/res/commandimagelist/sch_formelcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formelcursor.png
diff --git a/default_images/res/commandimagelist/sch_formfilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilter.png
index c3560ba43a2e..c3560ba43a2e 100644
--- a/default_images/res/commandimagelist/sch_formfilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilter.png
diff --git a/default_images/res/commandimagelist/sch_formfiltered.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfiltered.png
index c9f9cafcf849..c9f9cafcf849 100644
--- a/default_images/res/commandimagelist/sch_formfiltered.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfiltered.png
diff --git a/default_images/res/commandimagelist/sch_formfilterexecute.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilterexecute.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/commandimagelist/sch_formfilterexecute.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilterexecute.png
diff --git a/default_images/res/commandimagelist/sch_formfilternavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilternavigator.png
index 95b34ad869ce..95b34ad869ce 100644
--- a/default_images/res/commandimagelist/sch_formfilternavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formfilternavigator.png
diff --git a/default_images/res/commandimagelist/sch_formproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formproperties.png
index 5855c8d8d62e..5855c8d8d62e 100644
--- a/default_images/res/commandimagelist/sch_formproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_formproperties.png
diff --git a/default_images/res/commandimagelist/sch_forward.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_forward.png
index a6047cac06df..a6047cac06df 100644
--- a/default_images/res/commandimagelist/sch_forward.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_forward.png
diff --git a/default_images/res/commandimagelist/sch_framedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framedialog.png
index e2ac78504a3d..e2ac78504a3d 100644
--- a/default_images/res/commandimagelist/sch_framedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framedialog.png
diff --git a/default_images/res/commandimagelist/sch_framelinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framelinecolor.png
index 0daf9423c892..0daf9423c892 100644
--- a/default_images/res/commandimagelist/sch_framelinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_framelinecolor.png
diff --git a/default_images/res/commandimagelist/sch_freeline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline.png
index b582370d10ca..b582370d10ca 100644
--- a/default_images/res/commandimagelist/sch_freeline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline.png
diff --git a/default_images/res/commandimagelist/sch_freeline_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline_unfilled.png
index ca56144b6731..ca56144b6731 100644
--- a/default_images/res/commandimagelist/sch_freeline_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_freeline_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_fullscreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fullscreen.png
index 65229c2a25b5..65229c2a25b5 100644
--- a/default_images/res/commandimagelist/sch_fullscreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_fullscreen.png
diff --git a/default_images/res/commandimagelist/sch_gallery.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gallery.png
index 70c23eeea9ba..70c23eeea9ba 100644
--- a/default_images/res/commandimagelist/sch_gallery.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gallery.png
diff --git a/default_images/res/commandimagelist/sch_getactivetask.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_getactivetask.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_getactivetask.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_getactivetask.png
diff --git a/default_images/res/commandimagelist/sch_glueeditmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueeditmode.png
index c356ac580e75..c356ac580e75 100644
--- a/default_images/res/commandimagelist/sch_glueeditmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueeditmode.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectionbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionbottom.png
index ef731d00e1b4..ef731d00e1b4 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectionbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionbottom.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectionleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionleft.png
index 9ff0197125b2..9ff0197125b2 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectionleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionleft.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectionright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionright.png
index 9ae0e0b9133d..9ae0e0b9133d 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectionright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectionright.png
diff --git a/default_images/res/commandimagelist/sch_glueescapedirectiontop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectiontop.png
index 568ec5f8bf40..568ec5f8bf40 100644
--- a/default_images/res/commandimagelist/sch_glueescapedirectiontop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueescapedirectiontop.png
diff --git a/default_images/res/commandimagelist/sch_gluehorzaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzaligncenter.png
index 32e134fcf1e6..32e134fcf1e6 100644
--- a/default_images/res/commandimagelist/sch_gluehorzaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzaligncenter.png
diff --git a/default_images/res/commandimagelist/sch_gluehorzalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignleft.png
index 73c0f80f2338..73c0f80f2338 100644
--- a/default_images/res/commandimagelist/sch_gluehorzalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignleft.png
diff --git a/default_images/res/commandimagelist/sch_gluehorzalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignright.png
index f3fd62448c1b..f3fd62448c1b 100644
--- a/default_images/res/commandimagelist/sch_gluehorzalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluehorzalignright.png
diff --git a/default_images/res/commandimagelist/sch_glueinsertpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueinsertpoint.png
index b5c1358f292b..b5c1358f292b 100644
--- a/default_images/res/commandimagelist/sch_glueinsertpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_glueinsertpoint.png
diff --git a/default_images/res/commandimagelist/sch_gluepercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluepercent.png
index cbf28c949bd9..cbf28c949bd9 100644
--- a/default_images/res/commandimagelist/sch_gluepercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluepercent.png
diff --git a/default_images/res/commandimagelist/sch_gluevertalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertalignbottom.png
index 01f9b410654a..01f9b410654a 100644
--- a/default_images/res/commandimagelist/sch_gluevertalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertalignbottom.png
diff --git a/default_images/res/commandimagelist/sch_gluevertaligncenter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligncenter.png
index cd285bd874b0..cd285bd874b0 100644
--- a/default_images/res/commandimagelist/sch_gluevertaligncenter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligncenter.png
diff --git a/default_images/res/commandimagelist/sch_gluevertaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligntop.png
index 474097659cda..474097659cda 100644
--- a/default_images/res/commandimagelist/sch_gluevertaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gluevertaligntop.png
diff --git a/default_images/res/commandimagelist/sch_goalseekdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_goalseekdialog.png
index b062dc8bb580..b062dc8bb580 100644
--- a/default_images/res/commandimagelist/sch_goalseekdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_goalseekdialog.png
diff --git a/default_images/res/commandimagelist/sch_gotoend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoend.png
index eb05f9ccd025..eb05f9ccd025 100644
--- a/default_images/res/commandimagelist/sch_gotoend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoend.png
diff --git a/default_images/res/commandimagelist/sch_gotoendofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoendofdoc.png
index 00018f39c79b..00018f39c79b 100644
--- a/default_images/res/commandimagelist/sch_gotoendofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotoendofdoc.png
diff --git a/default_images/res/commandimagelist/sch_gotostartofdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartofdoc.png
index 3cf107c55d4e..3cf107c55d4e 100644
--- a/default_images/res/commandimagelist/sch_gotostartofdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartofdoc.png
diff --git a/default_images/res/commandimagelist/sch_gotostartoftable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartoftable.png
index f09685edbe73..f09685edbe73 100644
--- a/default_images/res/commandimagelist/sch_gotostartoftable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gotostartoftable.png
diff --git a/default_images/res/commandimagelist/sch_grafattrcrop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafattrcrop.png
index 755c46c95042..755c46c95042 100644
--- a/default_images/res/commandimagelist/sch_grafattrcrop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafattrcrop.png
diff --git a/default_images/res/commandimagelist/sch_grafblue.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafblue.png
index 0ad1d7bc808f..0ad1d7bc808f 100644
--- a/default_images/res/commandimagelist/sch_grafblue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafblue.png
diff --git a/default_images/res/commandimagelist/sch_grafcontrast.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafcontrast.png
index 1eb671c10ac2..1eb671c10ac2 100644
--- a/default_images/res/commandimagelist/sch_grafcontrast.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafcontrast.png
diff --git a/default_images/res/commandimagelist/sch_grafgamma.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgamma.png
index 6963c334275c..6963c334275c 100644
--- a/default_images/res/commandimagelist/sch_grafgamma.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgamma.png
diff --git a/default_images/res/commandimagelist/sch_grafgreen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgreen.png
index aa464cab2a7a..aa464cab2a7a 100644
--- a/default_images/res/commandimagelist/sch_grafgreen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafgreen.png
diff --git a/default_images/res/commandimagelist/sch_grafinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafinvert.png
index 977d84a0f596..977d84a0f596 100644
--- a/default_images/res/commandimagelist/sch_grafinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafinvert.png
diff --git a/default_images/res/commandimagelist/sch_grafluminance.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafluminance.png
index a6d8a4e84e79..a6d8a4e84e79 100644
--- a/default_images/res/commandimagelist/sch_grafluminance.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafluminance.png
diff --git a/default_images/res/commandimagelist/sch_grafmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafmode.png
index 3bd4fd4a0c5d..3bd4fd4a0c5d 100644
--- a/default_images/res/commandimagelist/sch_grafmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafmode.png
diff --git a/default_images/res/commandimagelist/sch_grafred.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafred.png
index 31d9ee5668cd..31d9ee5668cd 100644
--- a/default_images/res/commandimagelist/sch_grafred.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grafred.png
diff --git a/default_images/res/commandimagelist/sch_graftransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graftransparence.png
index c4fbda3baf9b..c4fbda3baf9b 100644
--- a/default_images/res/commandimagelist/sch_graftransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graftransparence.png
diff --git a/default_images/res/commandimagelist/sch_graphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphic.png
index ac2edafb68db..ac2edafb68db 100644
--- a/default_images/res/commandimagelist/sch_graphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphic.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterinvert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterinvert.png
index 977d84a0f596..977d84a0f596 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterinvert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterinvert.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltermosaic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltermosaic.png
index 7790f0f149af..7790f0f149af 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltermosaic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltermosaic.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterpopart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterpopart.png
index e063da211b9f..e063da211b9f 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterpopart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterpopart.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterposter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterposter.png
index ce4b19941f0a..ce4b19941f0a 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterposter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterposter.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterrelief.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterrelief.png
index a1c002e4eaae..a1c002e4eaae 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterrelief.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterrelief.png
diff --git a/default_images/res/commandimagelist/sch_graphicfilterremovenoise.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterremovenoise.png
index fbdc97b808f0..fbdc97b808f0 100644
--- a/default_images/res/commandimagelist/sch_graphicfilterremovenoise.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfilterremovenoise.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersepia.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersepia.png
index f28472457178..f28472457178 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersepia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersepia.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersharpen.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersharpen.png
index 7a799eeac764..7a799eeac764 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersharpen.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersharpen.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersmooth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersmooth.png
index 13331baf59cd..13331baf59cd 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersmooth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersmooth.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersobel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersobel.png
index aa129b46d4a8..aa129b46d4a8 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersobel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersobel.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltersolarize.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersolarize.png
index b6e22bb74527..b6e22bb74527 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltersolarize.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltersolarize.png
diff --git a/default_images/res/commandimagelist/sch_graphicfiltertoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltertoolbox.png
index 0d3484dccedb..0d3484dccedb 100644
--- a/default_images/res/commandimagelist/sch_graphicfiltertoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_graphicfiltertoolbox.png
diff --git a/default_images/res/commandimagelist/sch_greatestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestheight.png
index ea55b8ea693c..ea55b8ea693c 100644
--- a/default_images/res/commandimagelist/sch_greatestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestheight.png
diff --git a/default_images/res/commandimagelist/sch_greatestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestwidth.png
index 243832750869..243832750869 100644
--- a/default_images/res/commandimagelist/sch_greatestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_greatestwidth.png
diff --git a/default_images/res/commandimagelist/sch_grid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grid.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_grid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grid.png
diff --git a/default_images/res/commandimagelist/sch_griduse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_griduse.png
index 43804a5a7790..43804a5a7790 100644
--- a/default_images/res/commandimagelist/sch_griduse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_griduse.png
diff --git a/default_images/res/commandimagelist/sch_gridvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gridvisible.png
index 47db19b13c08..47db19b13c08 100644
--- a/default_images/res/commandimagelist/sch_gridvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_gridvisible.png
diff --git a/default_images/res/commandimagelist/sch_group.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_group.png
index 971b3c0bca57..971b3c0bca57 100644
--- a/default_images/res/commandimagelist/sch_group.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_group.png
diff --git a/default_images/res/commandimagelist/sch_groupbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_groupbox.png
index d8ffe4b9fa09..d8ffe4b9fa09 100644
--- a/default_images/res/commandimagelist/sch_groupbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_groupbox.png
diff --git a/default_images/res/commandimagelist/sch_grow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grow.png
index b1058bb03353..b1058bb03353 100644
--- a/default_images/res/commandimagelist/sch_grow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_grow.png
diff --git a/default_images/res/commandimagelist/sch_halfsphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_halfsphere.png
index 528d6a53ca15..528d6a53ca15 100644
--- a/default_images/res/commandimagelist/sch_halfsphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_halfsphere.png
diff --git a/default_images/res/commandimagelist/sch_handlesdraft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_handlesdraft.png
index 19c36c5e7955..19c36c5e7955 100644
--- a/default_images/res/commandimagelist/sch_handlesdraft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_handlesdraft.png
diff --git a/default_images/res/commandimagelist/sch_helpannotate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpannotate.png
index e284986fec4d..e284986fec4d 100644
--- a/default_images/res/commandimagelist/sch_helpannotate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpannotate.png
diff --git a/default_images/res/commandimagelist/sch_helpbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpbookmark.png
index 501468e1ab10..501468e1ab10 100644
--- a/default_images/res/commandimagelist/sch_helpbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpbookmark.png
diff --git a/default_images/res/commandimagelist/sch_helpdownload.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpdownload.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_helpdownload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpdownload.png
diff --git a/default_images/res/commandimagelist/sch_helperdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helperdialog.png
index 706c336e9a55..706c336e9a55 100644
--- a/default_images/res/commandimagelist/sch_helperdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helperdialog.png
diff --git a/default_images/res/commandimagelist/sch_helpindex.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpindex.png
index 7d8635e8d8d3..7d8635e8d8d3 100644
--- a/default_images/res/commandimagelist/sch_helpindex.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpindex.png
diff --git a/default_images/res/commandimagelist/sch_helplinesmove.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesmove.png
index f4f6c2dbc3c9..f4f6c2dbc3c9 100644
--- a/default_images/res/commandimagelist/sch_helplinesmove.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesmove.png
diff --git a/default_images/res/commandimagelist/sch_helplinesuse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesuse.png
index 05421a329625..05421a329625 100644
--- a/default_images/res/commandimagelist/sch_helplinesuse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesuse.png
diff --git a/default_images/res/commandimagelist/sch_helplinesvisible.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesvisible.png
index 76abe21038e5..76abe21038e5 100644
--- a/default_images/res/commandimagelist/sch_helplinesvisible.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helplinesvisible.png
diff --git a/default_images/res/commandimagelist/sch_helpmenu.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpmenu.png
index 0706e1691e4c..0706e1691e4c 100644
--- a/default_images/res/commandimagelist/sch_helpmenu.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpmenu.png
diff --git a/default_images/res/commandimagelist/sch_helpsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpsearch.png
index b2cd5ae2ef14..b2cd5ae2ef14 100644
--- a/default_images/res/commandimagelist/sch_helpsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpsearch.png
diff --git a/default_images/res/commandimagelist/sch_helpzoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomin.png
index 0dfac21e94ff..0dfac21e94ff 100644
--- a/default_images/res/commandimagelist/sch_helpzoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomin.png
diff --git a/default_images/res/commandimagelist/sch_helpzoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomout.png
index d5ea657c387a..d5ea657c387a 100644
--- a/default_images/res/commandimagelist/sch_helpzoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_helpzoomout.png
diff --git a/default_images/res/commandimagelist/sch_hfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hfixedline.png
index 9c36609e0280..9c36609e0280 100644
--- a/default_images/res/commandimagelist/sch_hfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hfixedline.png
diff --git a/default_images/res/commandimagelist/sch_hideslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hideslide.png
index 5516e0455a62..5516e0455a62 100644
--- a/default_images/res/commandimagelist/sch_hideslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hideslide.png
diff --git a/default_images/res/commandimagelist/sch_hscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hscrollbar.png
index ee3372263881..ee3372263881 100644
--- a/default_images/res/commandimagelist/sch_hscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hscrollbar.png
diff --git a/default_images/res/commandimagelist/sch_hyperlinkdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyperlinkdialog.png
index 84ac8c1721f3..84ac8c1721f3 100644
--- a/default_images/res/commandimagelist/sch_hyperlinkdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyperlinkdialog.png
diff --git a/default_images/res/commandimagelist/sch_hyphenate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenate.png
index 59bdcaa9ebd6..59bdcaa9ebd6 100644
--- a/default_images/res/commandimagelist/sch_hyphenate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenate.png
diff --git a/default_images/res/commandimagelist/sch_hyphenation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenation.png
index 41af30eeb250..41af30eeb250 100644
--- a/default_images/res/commandimagelist/sch_hyphenation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_hyphenation.png
diff --git a/default_images/res/commandimagelist/sch_imagebutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagebutton.png
index 0635d2be3491..0635d2be3491 100644
--- a/default_images/res/commandimagelist/sch_imagebutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagebutton.png
diff --git a/default_images/res/commandimagelist/sch_imagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagecontrol.png
index d7c7f22a5390..d7c7f22a5390 100644
--- a/default_images/res/commandimagelist/sch_imagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagecontrol.png
diff --git a/default_images/res/commandimagelist/sch_imagemapdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagemapdialog.png
index bc8cbfb764bc..bc8cbfb764bc 100644
--- a/default_images/res/commandimagelist/sch_imagemapdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_imagemapdialog.png
diff --git a/default_images/res/commandimagelist/sch_importdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importdialog.png
index e8961ea6c198..e8961ea6c198 100644
--- a/default_images/res/commandimagelist/sch_importdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importdialog.png
diff --git a/default_images/res/commandimagelist/sch_importfromfile.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importfromfile.png
index 11b15809b6aa..11b15809b6aa 100644
--- a/default_images/res/commandimagelist/sch_importfromfile.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_importfromfile.png
diff --git a/default_images/res/commandimagelist/sch_incrementindent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementindent.png
index ec9579f41460..ec9579f41460 100644
--- a/default_images/res/commandimagelist/sch_incrementindent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementindent.png
diff --git a/default_images/res/commandimagelist/sch_incrementlevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementlevel.png
index 3214cbc65203..3214cbc65203 100644
--- a/default_images/res/commandimagelist/sch_incrementlevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementlevel.png
diff --git a/default_images/res/commandimagelist/sch_incrementsublevels.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementsublevels.png
index 0e5f8d8fd7f5..0e5f8d8fd7f5 100644
--- a/default_images/res/commandimagelist/sch_incrementsublevels.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_incrementsublevels.png
diff --git a/default_images/res/commandimagelist/sch_inscellsctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inscellsctrl.png
index a842e4547e61..a842e4547e61 100644
--- a/default_images/res/commandimagelist/sch_inscellsctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inscellsctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertannotation.png
index 75a0c8721d62..75a0c8721d62 100644
--- a/default_images/res/commandimagelist/sch_insertannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertannotation.png
diff --git a/default_images/res/commandimagelist/sch_insertauthorfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertauthorfield.png
index 0ede7bd22e85..0ede7bd22e85 100644
--- a/default_images/res/commandimagelist/sch_insertauthorfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertauthorfield.png
diff --git a/default_images/res/commandimagelist/sch_insertavmedia.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertavmedia.png
index 1265009e7cc6..1265009e7cc6 100644
--- a/default_images/res/commandimagelist/sch_insertavmedia.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertavmedia.png
diff --git a/default_images/res/commandimagelist/sch_insertbookmark.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertbookmark.png
index 12c09f3d38dd..12c09f3d38dd 100644
--- a/default_images/res/commandimagelist/sch_insertbookmark.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertbookmark.png
diff --git a/default_images/res/commandimagelist/sch_insertcaptiondialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcaptiondialog.png
index ebd4201127fa..ebd4201127fa 100644
--- a/default_images/res/commandimagelist/sch_insertcaptiondialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcaptiondialog.png
diff --git a/default_images/res/commandimagelist/sch_insertcellsdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsdown.png
index 2281133484f2..2281133484f2 100644
--- a/default_images/res/commandimagelist/sch_insertcellsdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsdown.png
diff --git a/default_images/res/commandimagelist/sch_insertcellsright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsright.png
index b998a0d5db2b..b998a0d5db2b 100644
--- a/default_images/res/commandimagelist/sch_insertcellsright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcellsright.png
diff --git a/default_images/res/commandimagelist/sch_insertcolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcolumns.png
index badc08eed41d..badc08eed41d 100644
--- a/default_images/res/commandimagelist/sch_insertcolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcolumns.png
diff --git a/default_images/res/commandimagelist/sch_insertctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertctrl.png
index 41467754f389..41467754f389 100644
--- a/default_images/res/commandimagelist/sch_insertctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertcurrencyfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcurrencyfield.png
index 314d60cb92ab..314d60cb92ab 100644
--- a/default_images/res/commandimagelist/sch_insertcurrencyfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertcurrencyfield.png
diff --git a/default_images/res/commandimagelist/sch_insertdatefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdatefield.png
index 720550d4a9db..720550d4a9db 100644
--- a/default_images/res/commandimagelist/sch_insertdatefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdatefield.png
diff --git a/default_images/res/commandimagelist/sch_insertdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdoc.png
index 5e50dc3dd6ca..5e50dc3dd6ca 100644
--- a/default_images/res/commandimagelist/sch_insertdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdoc.png
diff --git a/default_images/res/commandimagelist/sch_insertdraw.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdraw.png
index c25570e93495..c25570e93495 100644
--- a/default_images/res/commandimagelist/sch_insertdraw.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertdraw.png
diff --git a/default_images/res/commandimagelist/sch_insertedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertedit.png
index 6245ac512b79..6245ac512b79 100644
--- a/default_images/res/commandimagelist/sch_insertedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertedit.png
diff --git a/default_images/res/commandimagelist/sch_insertendnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertendnote.png
index abc8ccff0ec4..abc8ccff0ec4 100644
--- a/default_images/res/commandimagelist/sch_insertendnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertendnote.png
diff --git a/default_images/res/commandimagelist/sch_insertfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfield.png
index 140cdc15f484..140cdc15f484 100644
--- a/default_images/res/commandimagelist/sch_insertfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfield.png
diff --git a/default_images/res/commandimagelist/sch_insertfieldctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfieldctrl.png
index 140cdc15f484..140cdc15f484 100644
--- a/default_images/res/commandimagelist/sch_insertfieldctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfieldctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertfilecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfilecontrol.png
index 724eb1248921..724eb1248921 100644
--- a/default_images/res/commandimagelist/sch_insertfilecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfilecontrol.png
diff --git a/default_images/res/commandimagelist/sch_insertfixedtext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfixedtext.png
index c84f1dcebfc6..c84f1dcebfc6 100644
--- a/default_images/res/commandimagelist/sch_insertfixedtext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfixedtext.png
diff --git a/default_images/res/commandimagelist/sch_insertfootnote.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfootnote.png
index e7c18c91a85b..e7c18c91a85b 100644
--- a/default_images/res/commandimagelist/sch_insertfootnote.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertfootnote.png
diff --git a/default_images/res/commandimagelist/sch_insertformattedfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformattedfield.png
index d546a44014a7..d546a44014a7 100644
--- a/default_images/res/commandimagelist/sch_insertformattedfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformattedfield.png
diff --git a/default_images/res/commandimagelist/sch_insertformula.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformula.png
index f623a6037a96..f623a6037a96 100644
--- a/default_images/res/commandimagelist/sch_insertformula.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertformula.png
diff --git a/default_images/res/commandimagelist/sch_insertframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframe.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_insertframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframe.png
diff --git a/default_images/res/commandimagelist/sch_insertframeinteract.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteract.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_insertframeinteract.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteract.png
diff --git a/default_images/res/commandimagelist/sch_insertframeinteractnocolumns.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteractnocolumns.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_insertframeinteractnocolumns.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertframeinteractnocolumns.png
diff --git a/default_images/res/commandimagelist/sch_insertgraphic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertgraphic.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/res/commandimagelist/sch_insertgraphic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertgraphic.png
diff --git a/default_images/res/commandimagelist/sch_inserthyperlink.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserthyperlink.png
index 83f07138b498..83f07138b498 100644
--- a/default_images/res/commandimagelist/sch_inserthyperlink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserthyperlink.png
diff --git a/default_images/res/commandimagelist/sch_insertimagecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertimagecontrol.png
index c4d8d0d62553..c4d8d0d62553 100644
--- a/default_images/res/commandimagelist/sch_insertimagecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertimagecontrol.png
diff --git a/default_images/res/commandimagelist/sch_insertindexesentry.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertindexesentry.png
index 4392542b80b7..4392542b80b7 100644
--- a/default_images/res/commandimagelist/sch_insertindexesentry.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertindexesentry.png
diff --git a/default_images/res/commandimagelist/sch_insertlistbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertlistbox.png
index 31d3858cfca1..31d3858cfca1 100644
--- a/default_images/res/commandimagelist/sch_insertlistbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertlistbox.png
diff --git a/default_images/res/commandimagelist/sch_insertmasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmasterpage.png
index 8c110b8da687..8c110b8da687 100644
--- a/default_images/res/commandimagelist/sch_insertmasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmasterpage.png
diff --git a/default_images/res/commandimagelist/sch_insertmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmath.png
index e7befa3be7e1..e7befa3be7e1 100644
--- a/default_images/res/commandimagelist/sch_insertmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertmath.png
diff --git a/default_images/res/commandimagelist/sch_insertneutralparagraph.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertneutralparagraph.png
index e790779620db..e790779620db 100644
--- a/default_images/res/commandimagelist/sch_insertneutralparagraph.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertneutralparagraph.png
diff --git a/default_images/res/commandimagelist/sch_insertnumericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertnumericfield.png
index 4384a6e50bc0..4384a6e50bc0 100644
--- a/default_images/res/commandimagelist/sch_insertnumericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertnumericfield.png
diff --git a/default_images/res/commandimagelist/sch_insertobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjctrl.png
index eb81341f06d2..eb81341f06d2 100644
--- a/default_images/res/commandimagelist/sch_insertobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjctrl.png
diff --git a/default_images/res/commandimagelist/sch_insertobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobject.png
index dc1afe126a89..dc1afe126a89 100644
--- a/default_images/res/commandimagelist/sch_insertobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobject.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectchart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectchart.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/res/commandimagelist/sch_insertobjectchart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectchart.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectdialog.png
index 34469342810c..34469342810c 100644
--- a/default_images/res/commandimagelist/sch_insertobjectdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectdialog.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectfloatingframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectfloatingframe.png
index ac067364111d..ac067364111d 100644
--- a/default_images/res/commandimagelist/sch_insertobjectfloatingframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectfloatingframe.png
diff --git a/default_images/res/commandimagelist/sch_insertobjectstarmath.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectstarmath.png
index e7befa3be7e1..e7befa3be7e1 100644
--- a/default_images/res/commandimagelist/sch_insertobjectstarmath.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertobjectstarmath.png
diff --git a/default_images/res/commandimagelist/sch_insertpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpage.png
index 0be6bcb2e846..0be6bcb2e846 100644
--- a/default_images/res/commandimagelist/sch_insertpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpage.png
diff --git a/default_images/res/commandimagelist/sch_insertpagecountfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagecountfield.png
index 5226be6f3920..5226be6f3920 100644
--- a/default_images/res/commandimagelist/sch_insertpagecountfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagecountfield.png
diff --git a/default_images/res/commandimagelist/sch_insertpagenumberfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagenumberfield.png
index 68fe826ca897..68fe826ca897 100644
--- a/default_images/res/commandimagelist/sch_insertpagenumberfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpagenumberfield.png
diff --git a/default_images/res/commandimagelist/sch_insertpatternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpatternfield.png
index 90da08b232d6..90da08b232d6 100644
--- a/default_images/res/commandimagelist/sch_insertpatternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpatternfield.png
diff --git a/default_images/res/commandimagelist/sch_insertplugin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertplugin.png
index 2bdc304b2c95..2bdc304b2c95 100644
--- a/default_images/res/commandimagelist/sch_insertplugin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertplugin.png
diff --git a/default_images/res/commandimagelist/sch_insertpushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpushbutton.png
index aa4bbb676cb3..aa4bbb676cb3 100644
--- a/default_images/res/commandimagelist/sch_insertpushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertpushbutton.png
diff --git a/default_images/res/commandimagelist/sch_insertreferencefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertreferencefield.png
index 4dafb9fcb802..4dafb9fcb802 100644
--- a/default_images/res/commandimagelist/sch_insertreferencefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertreferencefield.png
diff --git a/default_images/res/commandimagelist/sch_insertrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertrows.png
index a7d562eebb82..a7d562eebb82 100644
--- a/default_images/res/commandimagelist/sch_insertrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertrows.png
diff --git a/default_images/res/commandimagelist/sch_insertsection.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsection.png
index 77726a87acc8..77726a87acc8 100644
--- a/default_images/res/commandimagelist/sch_insertsection.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsection.png
diff --git a/default_images/res/commandimagelist/sch_insertsound.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsound.png
index 7f61f661992f..7f61f661992f 100644
--- a/default_images/res/commandimagelist/sch_insertsound.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsound.png
diff --git a/default_images/res/commandimagelist/sch_insertspreadsheet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertspreadsheet.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_insertspreadsheet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertspreadsheet.png
diff --git a/default_images/res/commandimagelist/sch_insertsymbol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsymbol.png
index c0f7f5ce03c3..c0f7f5ce03c3 100644
--- a/default_images/res/commandimagelist/sch_insertsymbol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertsymbol.png
diff --git a/default_images/res/commandimagelist/sch_inserttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttable.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/commandimagelist/sch_inserttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttable.png
diff --git a/default_images/res/commandimagelist/sch_inserttextframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttextframe.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/res/commandimagelist/sch_inserttextframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttextframe.png
diff --git a/default_images/res/commandimagelist/sch_inserttimefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttimefield.png
index 708642e6d7aa..708642e6d7aa 100644
--- a/default_images/res/commandimagelist/sch_inserttimefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttimefield.png
diff --git a/default_images/res/commandimagelist/sch_inserttitlefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttitlefield.png
index 70c804ebf96d..70c804ebf96d 100644
--- a/default_images/res/commandimagelist/sch_inserttitlefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttitlefield.png
diff --git a/default_images/res/commandimagelist/sch_inserttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttoolbox.png
index 5d7a4668ebb6..5d7a4668ebb6 100644
--- a/default_images/res/commandimagelist/sch_inserttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttoolbox.png
diff --git a/default_images/res/commandimagelist/sch_inserttopicfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttopicfield.png
index e0931cd7d307..e0931cd7d307 100644
--- a/default_images/res/commandimagelist/sch_inserttopicfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttopicfield.png
diff --git a/default_images/res/commandimagelist/sch_inserttreecontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttreecontrol.png
index 3ef32310502d..3ef32310502d 100644
--- a/default_images/res/commandimagelist/sch_inserttreecontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_inserttreecontrol.png
diff --git a/default_images/res/commandimagelist/sch_insertvideo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertvideo.png
index ba586fdd40b9..ba586fdd40b9 100644
--- a/default_images/res/commandimagelist/sch_insertvideo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insertvideo.png
diff --git a/default_images/res/commandimagelist/sch_insobjctrl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insobjctrl.png
index ab65e9bdd9e8..ab65e9bdd9e8 100644
--- a/default_images/res/commandimagelist/sch_insobjctrl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_insobjctrl.png
diff --git a/default_images/res/commandimagelist/sch_interactivegradient.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivegradient.png
index 641a9a446331..641a9a446331 100644
--- a/default_images/res/commandimagelist/sch_interactivegradient.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivegradient.png
diff --git a/default_images/res/commandimagelist/sch_interactivetransparence.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivetransparence.png
index 264d3977380a..264d3977380a 100644
--- a/default_images/res/commandimagelist/sch_interactivetransparence.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_interactivetransparence.png
diff --git a/default_images/res/commandimagelist/sch_internetonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_internetonline.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_internetonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_internetonline.png
diff --git a/default_images/res/commandimagelist/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_italic.png
index 1e0bbddad047..1e0bbddad047 100644
--- a/default_images/res/commandimagelist/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_italic.png
diff --git a/default_images/res/commandimagelist/sch_justifypara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_justifypara.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/res/commandimagelist/sch_justifypara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_justifypara.png
diff --git a/default_images/res/commandimagelist/sch_label.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_label.png
index c84f1dcebfc6..c84f1dcebfc6 100644
--- a/default_images/res/commandimagelist/sch_label.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_label.png
diff --git a/default_images/res/commandimagelist/sch_lastpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastpage.png
index cd980e40a1aa..cd980e40a1aa 100644
--- a/default_images/res/commandimagelist/sch_lastpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastpage.png
diff --git a/default_images/res/commandimagelist/sch_lastrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastrecord.png
index 844e697e87a3..844e697e87a3 100644
--- a/default_images/res/commandimagelist/sch_lastrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lastrecord.png
diff --git a/default_images/res/commandimagelist/sch_leaveallgroups.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leaveallgroups.png
index a0d753c4049f..a0d753c4049f 100644
--- a/default_images/res/commandimagelist/sch_leaveallgroups.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leaveallgroups.png
diff --git a/default_images/res/commandimagelist/sch_leavegroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leavegroup.png
index 776864f3e73f..776864f3e73f 100644
--- a/default_images/res/commandimagelist/sch_leavegroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leavegroup.png
diff --git a/default_images/res/commandimagelist/sch_leftpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leftpara.png
index 32cbbf9f5d2b..32cbbf9f5d2b 100644
--- a/default_images/res/commandimagelist/sch_leftpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_leftpara.png
diff --git a/default_images/res/commandimagelist/sch_line.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line.png
index fe13e8cb882f..fe13e8cb882f 100644
--- a/default_images/res/commandimagelist/sch_line.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line.png
diff --git a/default_images/res/commandimagelist/sch_line_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line_diagonal.png
index 78ab014e7733..78ab014e7733 100644
--- a/default_images/res/commandimagelist/sch_line_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_line_diagonal.png
diff --git a/default_images/res/commandimagelist/sch_linearrowcircle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowcircle.png
index 0a11b9b36bf6..0a11b9b36bf6 100644
--- a/default_images/res/commandimagelist/sch_linearrowcircle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowcircle.png
diff --git a/default_images/res/commandimagelist/sch_linearrowend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowend.png
index 42339021bec1..42339021bec1 100644
--- a/default_images/res/commandimagelist/sch_linearrowend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowend.png
diff --git a/default_images/res/commandimagelist/sch_linearrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrows.png
index d8725b5dbcaf..d8725b5dbcaf 100644
--- a/default_images/res/commandimagelist/sch_linearrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrows.png
diff --git a/default_images/res/commandimagelist/sch_linearrowsquare.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowsquare.png
index 80470715316d..80470715316d 100644
--- a/default_images/res/commandimagelist/sch_linearrowsquare.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowsquare.png
diff --git a/default_images/res/commandimagelist/sch_linearrowstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowstart.png
index 46c4b54aeeb6..46c4b54aeeb6 100644
--- a/default_images/res/commandimagelist/sch_linearrowstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linearrowstart.png
diff --git a/default_images/res/commandimagelist/sch_linecirclearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linecirclearrow.png
index 27c6d567c037..27c6d567c037 100644
--- a/default_images/res/commandimagelist/sch_linecirclearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linecirclearrow.png
diff --git a/default_images/res/commandimagelist/sch_lineendstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lineendstyle.png
index 4f3fa869dfb0..4f3fa869dfb0 100644
--- a/default_images/res/commandimagelist/sch_lineendstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_lineendstyle.png
diff --git a/default_images/res/commandimagelist/sch_linesquarearrow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linesquarearrow.png
index eda9c2dec10d..eda9c2dec10d 100644
--- a/default_images/res/commandimagelist/sch_linesquarearrow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linesquarearrow.png
diff --git a/default_images/res/commandimagelist/sch_linestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linestyle.png
index 6c65b3646dd9..6c65b3646dd9 100644
--- a/default_images/res/commandimagelist/sch_linestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linestyle.png
diff --git a/default_images/res/commandimagelist/sch_linetoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linetoolbox.png
index d73f193424a6..d73f193424a6 100644
--- a/default_images/res/commandimagelist/sch_linetoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linetoolbox.png
diff --git a/default_images/res/commandimagelist/sch_linewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linewidth.png
index b79a42cd1cf3..b79a42cd1cf3 100644
--- a/default_images/res/commandimagelist/sch_linewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_linewidth.png
diff --git a/default_images/res/commandimagelist/sch_listbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_listbox.png
index 71f92a898bdb..71f92a898bdb 100644
--- a/default_images/res/commandimagelist/sch_listbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_listbox.png
diff --git a/default_images/res/commandimagelist/sch_loadbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_loadbasic.png
index e6f9e0232614..e6f9e0232614 100644
--- a/default_images/res/commandimagelist/sch_loadbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_loadbasic.png
diff --git a/default_images/res/commandimagelist/sch_macrorecorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecorder.png
index a258d5165a47..a258d5165a47 100644
--- a/default_images/res/commandimagelist/sch_macrorecorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecorder.png
diff --git a/default_images/res/commandimagelist/sch_macrorecordingfloat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecordingfloat.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_macrorecordingfloat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_macrorecordingfloat.png
diff --git a/default_images/res/commandimagelist/sch_mailwindow.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mailwindow.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_mailwindow.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mailwindow.png
diff --git a/default_images/res/commandimagelist/sch_managebreakpoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managebreakpoints.png
index 801dd1de5dec..801dd1de5dec 100644
--- a/default_images/res/commandimagelist/sch_managebreakpoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managebreakpoints.png
diff --git a/default_images/res/commandimagelist/sch_managelanguage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managelanguage.png
index 51446e6b14ee..51446e6b14ee 100644
--- a/default_images/res/commandimagelist/sch_managelanguage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_managelanguage.png
diff --git a/default_images/res/commandimagelist/sch_marks.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_marks.png
index b443a39349c7..b443a39349c7 100644
--- a/default_images/res/commandimagelist/sch_marks.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_marks.png
diff --git a/default_images/res/commandimagelist/sch_matchgroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_matchgroup.png
index 5d78b2688d67..5d78b2688d67 100644
--- a/default_images/res/commandimagelist/sch_matchgroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_matchgroup.png
diff --git a/default_images/res/commandimagelist/sch_measureline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_measureline.png
index c2161e85c047..c2161e85c047 100644
--- a/default_images/res/commandimagelist/sch_measureline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_measureline.png
diff --git a/default_images/res/commandimagelist/sch_mergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergecells.png
index a36508ebf299..a36508ebf299 100644
--- a/default_images/res/commandimagelist/sch_mergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergecells.png
diff --git a/default_images/res/commandimagelist/sch_mergedialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergedialog.png
index 428bcadc6d41..428bcadc6d41 100644
--- a/default_images/res/commandimagelist/sch_mergedialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mergedialog.png
diff --git a/default_images/res/commandimagelist/sch_mirror.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mirror.png
index 9a4d2d550169..9a4d2d550169 100644
--- a/default_images/res/commandimagelist/sch_mirror.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_mirror.png
diff --git a/default_images/res/commandimagelist/sch_modifyframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifyframe.png
index 5625d8491938..5625d8491938 100644
--- a/default_images/res/commandimagelist/sch_modifyframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifyframe.png
diff --git a/default_images/res/commandimagelist/sch_modifypage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifypage.png
index 5005f3958ba8..5005f3958ba8 100644
--- a/default_images/res/commandimagelist/sch_modifypage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_modifypage.png
diff --git a/default_images/res/commandimagelist/sch_moduledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moduledialog.png
index 7e39aad8f559..7e39aad8f559 100644
--- a/default_images/res/commandimagelist/sch_moduledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moduledialog.png
diff --git a/default_images/res/commandimagelist/sch_morecontrols.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_morecontrols.png
index 5b2ad25a9e19..5b2ad25a9e19 100644
--- a/default_images/res/commandimagelist/sch_morecontrols.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_morecontrols.png
diff --git a/default_images/res/commandimagelist/sch_movedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedown.png
index 6c71a8166a46..6c71a8166a46 100644
--- a/default_images/res/commandimagelist/sch_movedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedown.png
diff --git a/default_images/res/commandimagelist/sch_movedownsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedownsubitems.png
index bcdbbd8e231e..bcdbbd8e231e 100644
--- a/default_images/res/commandimagelist/sch_movedownsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_movedownsubitems.png
diff --git a/default_images/res/commandimagelist/sch_moveup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveup.png
index 588901138dd6..588901138dd6 100644
--- a/default_images/res/commandimagelist/sch_moveup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveup.png
diff --git a/default_images/res/commandimagelist/sch_moveupsubitems.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveupsubitems.png
index 34724f187bb6..34724f187bb6 100644
--- a/default_images/res/commandimagelist/sch_moveupsubitems.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_moveupsubitems.png
diff --git a/default_images/res/commandimagelist/sch_navigationbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigationbar.png
index 1a1e3ae314e0..1a1e3ae314e0 100644
--- a/default_images/res/commandimagelist/sch_navigationbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigationbar.png
diff --git a/default_images/res/commandimagelist/sch_navigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigator.png
index 5b5e9864858d..5b5e9864858d 100644
--- a/default_images/res/commandimagelist/sch_navigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_navigator.png
diff --git a/default_images/res/commandimagelist/sch_newarrangement.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newarrangement.png
index 4b2ce893077c..4b2ce893077c 100644
--- a/default_images/res/commandimagelist/sch_newarrangement.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newarrangement.png
diff --git a/default_images/res/commandimagelist/sch_newdoc.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newdoc.png
index 8a0a8580c03e..8a0a8580c03e 100644
--- a/default_images/res/commandimagelist/sch_newdoc.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newdoc.png
diff --git a/default_images/res/commandimagelist/sch_newrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newrecord.png
index 03678b506e1e..03678b506e1e 100644
--- a/default_images/res/commandimagelist/sch_newrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_newrecord.png
diff --git a/default_images/res/commandimagelist/sch_nextannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextannotation.png
index bf24d42f9b50..bf24d42f9b50 100644
--- a/default_images/res/commandimagelist/sch_nextannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextannotation.png
diff --git a/default_images/res/commandimagelist/sch_nextpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextpage.png
index 7518d18b259f..7518d18b259f 100644
--- a/default_images/res/commandimagelist/sch_nextpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextpage.png
diff --git a/default_images/res/commandimagelist/sch_nextrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextrecord.png
index 54ed7861b0f2..54ed7861b0f2 100644
--- a/default_images/res/commandimagelist/sch_nextrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_nextrecord.png
diff --git a/default_images/res/commandimagelist/sch_numberformatcurrency.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatcurrency.png
index b847dfbe0afe..b847dfbe0afe 100644
--- a/default_images/res/commandimagelist/sch_numberformatcurrency.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatcurrency.png
diff --git a/default_images/res/commandimagelist/sch_numberformatdate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdate.png
index 720550d4a9db..720550d4a9db 100644
--- a/default_images/res/commandimagelist/sch_numberformatdate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdate.png
diff --git a/default_images/res/commandimagelist/sch_numberformatdecdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecdecimals.png
index dfae989b07bf..dfae989b07bf 100644
--- a/default_images/res/commandimagelist/sch_numberformatdecdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecdecimals.png
diff --git a/default_images/res/commandimagelist/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecimal.png
index b5c8c6fb25d3..b5c8c6fb25d3 100644
--- a/default_images/res/commandimagelist/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/sch_numberformatincdecimals.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatincdecimals.png
index be0430885269..be0430885269 100644
--- a/default_images/res/commandimagelist/sch_numberformatincdecimals.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatincdecimals.png
diff --git a/default_images/res/commandimagelist/sch_numberformatpercent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatpercent.png
index 3bc719e43b39..3bc719e43b39 100644
--- a/default_images/res/commandimagelist/sch_numberformatpercent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatpercent.png
diff --git a/default_images/res/commandimagelist/sch_numberformatscientific.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatscientific.png
index 95cb555e985a..95cb555e985a 100644
--- a/default_images/res/commandimagelist/sch_numberformatscientific.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatscientific.png
diff --git a/default_images/res/commandimagelist/sch_numberformatstandard.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatstandard.png
index a3f5e58c5f1b..a3f5e58c5f1b 100644
--- a/default_images/res/commandimagelist/sch_numberformatstandard.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberformatstandard.png
diff --git a/default_images/res/commandimagelist/sch_numberingstart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberingstart.png
index c6d4517e10a0..c6d4517e10a0 100644
--- a/default_images/res/commandimagelist/sch_numberingstart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numberingstart.png
diff --git a/default_images/res/commandimagelist/sch_numericfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numericfield.png
index 4384a6e50bc0..4384a6e50bc0 100644
--- a/default_images/res/commandimagelist/sch_numericfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_numericfield.png
diff --git a/default_images/res/commandimagelist/sch_objectalign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalign.png
index ef297105e756..ef297105e756 100644
--- a/default_images/res/commandimagelist/sch_objectalign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalign.png
diff --git a/default_images/res/commandimagelist/sch_objectalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignleft.png
index ef297105e756..ef297105e756 100644
--- a/default_images/res/commandimagelist/sch_objectalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignleft.png
diff --git a/default_images/res/commandimagelist/sch_objectalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignright.png
index 6d85642d28f0..6d85642d28f0 100644
--- a/default_images/res/commandimagelist/sch_objectalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectalignright.png
diff --git a/default_images/res/commandimagelist/sch_objectcatalog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectcatalog.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/res/commandimagelist/sch_objectcatalog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectcatalog.png
diff --git a/default_images/res/commandimagelist/sch_objectposition.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectposition.png
index 5abc00f69507..5abc00f69507 100644
--- a/default_images/res/commandimagelist/sch_objectposition.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objectposition.png
diff --git a/default_images/res/commandimagelist/sch_objects3dtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objects3dtoolbox.png
index 3d0f14fa2bb0..3d0f14fa2bb0 100644
--- a/default_images/res/commandimagelist/sch_objects3dtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_objects3dtoolbox.png
diff --git a/default_images/res/commandimagelist/sch_open.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_open.png
index da6aa8418910..da6aa8418910 100644
--- a/default_images/res/commandimagelist/sch_open.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_open.png
diff --git a/default_images/res/commandimagelist/sch_openreadonly.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openreadonly.png
index 10b469f12d48..10b469f12d48 100644
--- a/default_images/res/commandimagelist/sch_openreadonly.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openreadonly.png
diff --git a/default_images/res/commandimagelist/sch_openurl.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openurl.png
index 3020653d793a..3020653d793a 100644
--- a/default_images/res/commandimagelist/sch_openurl.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_openurl.png
diff --git a/default_images/res/commandimagelist/sch_optimizetable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_optimizetable.png
index 130bafceff23..130bafceff23 100644
--- a/default_images/res/commandimagelist/sch_optimizetable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_optimizetable.png
diff --git a/default_images/res/commandimagelist/sch_ordercrit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ordercrit.png
index 50bf5911ce98..50bf5911ce98 100644
--- a/default_images/res/commandimagelist/sch_ordercrit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ordercrit.png
diff --git a/default_images/res/commandimagelist/sch_outlinebullet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinebullet.png
index d055b4e28bb0..d055b4e28bb0 100644
--- a/default_images/res/commandimagelist/sch_outlinebullet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinebullet.png
diff --git a/default_images/res/commandimagelist/sch_outlinecollapse.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapse.png
index d9921d2a7762..d9921d2a7762 100644
--- a/default_images/res/commandimagelist/sch_outlinecollapse.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapse.png
diff --git a/default_images/res/commandimagelist/sch_outlinecollapseall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapseall.png
index e106f41145d3..e106f41145d3 100644
--- a/default_images/res/commandimagelist/sch_outlinecollapseall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinecollapseall.png
diff --git a/default_images/res/commandimagelist/sch_outlinedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinedown.png
index 6e60c875f9bd..6e60c875f9bd 100644
--- a/default_images/res/commandimagelist/sch_outlinedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinedown.png
diff --git a/default_images/res/commandimagelist/sch_outlineexpand.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpand.png
index f2662e8ef155..f2662e8ef155 100644
--- a/default_images/res/commandimagelist/sch_outlineexpand.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpand.png
diff --git a/default_images/res/commandimagelist/sch_outlineexpandall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpandall.png
index d1d2e834045d..d1d2e834045d 100644
--- a/default_images/res/commandimagelist/sch_outlineexpandall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineexpandall.png
diff --git a/default_images/res/commandimagelist/sch_outlinefont.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinefont.png
index c36e5c7ea6d3..c36e5c7ea6d3 100644
--- a/default_images/res/commandimagelist/sch_outlinefont.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlinefont.png
diff --git a/default_images/res/commandimagelist/sch_outlineformat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineformat.png
index 06762c45842a..06762c45842a 100644
--- a/default_images/res/commandimagelist/sch_outlineformat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineformat.png
diff --git a/default_images/res/commandimagelist/sch_outlineleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineleft.png
index 3214cbc65203..3214cbc65203 100644
--- a/default_images/res/commandimagelist/sch_outlineleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineleft.png
diff --git a/default_images/res/commandimagelist/sch_outlineright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineright.png
index 0ed6d39bd2d4..0ed6d39bd2d4 100644
--- a/default_images/res/commandimagelist/sch_outlineright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineright.png
diff --git a/default_images/res/commandimagelist/sch_outlineup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineup.png
index 588901138dd6..588901138dd6 100644
--- a/default_images/res/commandimagelist/sch_outlineup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_outlineup.png
diff --git a/default_images/res/commandimagelist/sch_overline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_overline.png
index f5681ee913a7..f5681ee913a7 100644
--- a/default_images/res/commandimagelist/sch_overline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_overline.png
diff --git a/default_images/res/commandimagelist/sch_pagedown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pagedown.png
index 0d6d2ff72d07..0d6d2ff72d07 100644
--- a/default_images/res/commandimagelist/sch_pagedown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pagedown.png
diff --git a/default_images/res/commandimagelist/sch_pageup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pageup.png
index 5fcd461ce669..5fcd461ce669 100644
--- a/default_images/res/commandimagelist/sch_pageup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pageup.png
diff --git a/default_images/res/commandimagelist/sch_paragraphdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paragraphdialog.png
index 7ad56af76d65..7ad56af76d65 100644
--- a/default_images/res/commandimagelist/sch_paragraphdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paragraphdialog.png
diff --git a/default_images/res/commandimagelist/sch_paralefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paralefttoright.png
index 743789daa1d9..743789daa1d9 100644
--- a/default_images/res/commandimagelist/sch_paralefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paralefttoright.png
diff --git a/default_images/res/commandimagelist/sch_pararighttoleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pararighttoleft.png
index 0ab0e20d3520..0ab0e20d3520 100644
--- a/default_images/res/commandimagelist/sch_pararighttoleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pararighttoleft.png
diff --git a/default_images/res/commandimagelist/sch_paraspacedecrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspacedecrease.png
index 22059c3246ab..22059c3246ab 100644
--- a/default_images/res/commandimagelist/sch_paraspacedecrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspacedecrease.png
diff --git a/default_images/res/commandimagelist/sch_paraspaceincrease.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspaceincrease.png
index 69c05df90663..69c05df90663 100644
--- a/default_images/res/commandimagelist/sch_paraspaceincrease.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paraspaceincrease.png
diff --git a/default_images/res/commandimagelist/sch_paste.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paste.png
index 26059505adb2..26059505adb2 100644
--- a/default_images/res/commandimagelist/sch_paste.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_paste.png
diff --git a/default_images/res/commandimagelist/sch_patternfield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_patternfield.png
index 90da08b232d6..90da08b232d6 100644
--- a/default_images/res/commandimagelist/sch_patternfield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_patternfield.png
diff --git a/default_images/res/commandimagelist/sch_pickthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pickthrough.png
index b1f3958967d4..b1f3958967d4 100644
--- a/default_images/res/commandimagelist/sch_pickthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pickthrough.png
diff --git a/default_images/res/commandimagelist/sch_pie.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie.png
index 74c04e4a359c..74c04e4a359c 100644
--- a/default_images/res/commandimagelist/sch_pie.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie.png
diff --git a/default_images/res/commandimagelist/sch_pie_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie_unfilled.png
index 35fa968bf476..35fa968bf476 100644
--- a/default_images/res/commandimagelist/sch_pie_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pie_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_playmacro.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_playmacro.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_playmacro.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_playmacro.png
diff --git a/default_images/res/commandimagelist/sch_pluginsactive.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pluginsactive.png
index 2bdc304b2c95..2bdc304b2c95 100644
--- a/default_images/res/commandimagelist/sch_pluginsactive.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pluginsactive.png
diff --git a/default_images/res/commandimagelist/sch_polygon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon.png
index 3b426e062a3f..3b426e062a3f 100644
--- a/default_images/res/commandimagelist/sch_polygon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon.png
diff --git a/default_images/res/commandimagelist/sch_polygon_diagonal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal.png
index dc4767f64407..dc4767f64407 100644
--- a/default_images/res/commandimagelist/sch_polygon_diagonal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal.png
diff --git a/default_images/res/commandimagelist/sch_polygon_diagonal_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal_unfilled.png
index c559e02f1e62..c559e02f1e62 100644
--- a/default_images/res/commandimagelist/sch_polygon_diagonal_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_diagonal_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_polygon_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_unfilled.png
index b33ade0f148e..b33ade0f148e 100644
--- a/default_images/res/commandimagelist/sch_polygon_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_polygon_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_presentation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentation.png
index 9d4fd34985e4..9d4fd34985e4 100644
--- a/default_images/res/commandimagelist/sch_presentation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentation.png
diff --git a/default_images/res/commandimagelist/sch_presentationlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentationlayout.png
index 2b91dbb16b24..2b91dbb16b24 100644
--- a/default_images/res/commandimagelist/sch_presentationlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_presentationlayout.png
diff --git a/default_images/res/commandimagelist/sch_preview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_preview.png
index 23e5126a30ab..23e5126a30ab 100644
--- a/default_images/res/commandimagelist/sch_preview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_preview.png
diff --git a/default_images/res/commandimagelist/sch_previewprintoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewprintoptions.png
index b0277e6decba..b0277e6decba 100644
--- a/default_images/res/commandimagelist/sch_previewprintoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewprintoptions.png
diff --git a/default_images/res/commandimagelist/sch_previewzoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewzoom.png
index 58b8c6c2ec5b..58b8c6c2ec5b 100644
--- a/default_images/res/commandimagelist/sch_previewzoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previewzoom.png
diff --git a/default_images/res/commandimagelist/sch_previousannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previousannotation.png
index d314f18c4517..d314f18c4517 100644
--- a/default_images/res/commandimagelist/sch_previousannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previousannotation.png
diff --git a/default_images/res/commandimagelist/sch_previouspage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previouspage.png
index 42753ec8bd77..42753ec8bd77 100644
--- a/default_images/res/commandimagelist/sch_previouspage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_previouspage.png
diff --git a/default_images/res/commandimagelist/sch_prevrecord.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_prevrecord.png
index 348efed0f0f3..348efed0f0f3 100644
--- a/default_images/res/commandimagelist/sch_prevrecord.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_prevrecord.png
diff --git a/default_images/res/commandimagelist/sch_print.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_print.png
index 67cb5d1ff186..67cb5d1ff186 100644
--- a/default_images/res/commandimagelist/sch_print.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_print.png
diff --git a/default_images/res/commandimagelist/sch_printdefault.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printdefault.png
index 3bb245a71008..3bb245a71008 100644
--- a/default_images/res/commandimagelist/sch_printdefault.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printdefault.png
diff --git a/default_images/res/commandimagelist/sch_printersetup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printersetup.png
index a83089ebbc12..a83089ebbc12 100644
--- a/default_images/res/commandimagelist/sch_printersetup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printersetup.png
diff --git a/default_images/res/commandimagelist/sch_printlayout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printlayout.png
index c261664599ef..c261664599ef 100644
--- a/default_images/res/commandimagelist/sch_printlayout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printlayout.png
diff --git a/default_images/res/commandimagelist/sch_printpagepreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpagepreview.png
index cb1f07735691..cb1f07735691 100644
--- a/default_images/res/commandimagelist/sch_printpagepreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpagepreview.png
diff --git a/default_images/res/commandimagelist/sch_printpreview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpreview.png
index a705f64a0dc5..a705f64a0dc5 100644
--- a/default_images/res/commandimagelist/sch_printpreview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_printpreview.png
diff --git a/default_images/res/commandimagelist/sch_progressbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_progressbar.png
index 0342fdd21f72..0342fdd21f72 100644
--- a/default_images/res/commandimagelist/sch_progressbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_progressbar.png
diff --git a/default_images/res/commandimagelist/sch_pushbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pushbutton.png
index aa4bbb676cb3..aa4bbb676cb3 100644
--- a/default_images/res/commandimagelist/sch_pushbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_pushbutton.png
diff --git a/default_images/res/commandimagelist/sch_quickedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quickedit.png
index 07843b37fa9c..07843b37fa9c 100644
--- a/default_images/res/commandimagelist/sch_quickedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quickedit.png
diff --git a/default_images/res/commandimagelist/sch_quit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quit.png
index e9eadb62f6e3..e9eadb62f6e3 100644
--- a/default_images/res/commandimagelist/sch_quit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_quit.png
diff --git a/default_images/res/commandimagelist/sch_radiobutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_radiobutton.png
index f4b7641df677..f4b7641df677 100644
--- a/default_images/res/commandimagelist/sch_radiobutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_radiobutton.png
diff --git a/default_images/res/commandimagelist/sch_recsave.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsave.png
index 33692f73cf62..33692f73cf62 100644
--- a/default_images/res/commandimagelist/sch_recsave.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsave.png
diff --git a/default_images/res/commandimagelist/sch_recsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsearch.png
index 3f24a7a5af19..3f24a7a5af19 100644
--- a/default_images/res/commandimagelist/sch_recsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recsearch.png
diff --git a/default_images/res/commandimagelist/sch_rect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect.png
index 05498575b823..05498575b823 100644
--- a/default_images/res/commandimagelist/sch_rect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect.png
diff --git a/default_images/res/commandimagelist/sch_rect_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded.png
index b8d9fa717421..b8d9fa717421 100644
--- a/default_images/res/commandimagelist/sch_rect_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded.png
diff --git a/default_images/res/commandimagelist/sch_rect_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded_unfilled.png
index 7621ad42a247..7621ad42a247 100644
--- a/default_images/res/commandimagelist/sch_rect_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_rect_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_unfilled.png
index 4420d7c31907..4420d7c31907 100644
--- a/default_images/res/commandimagelist/sch_rect_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rect_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_rectangletoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rectangletoolbox.png
index 05498575b823..05498575b823 100644
--- a/default_images/res/commandimagelist/sch_rectangletoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rectangletoolbox.png
diff --git a/default_images/res/commandimagelist/sch_recundo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recundo.png
index 948dc8ba3ece..948dc8ba3ece 100644
--- a/default_images/res/commandimagelist/sch_recundo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_recundo.png
diff --git a/default_images/res/commandimagelist/sch_redo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_redo.png
index ec12483664f5..ec12483664f5 100644
--- a/default_images/res/commandimagelist/sch_redo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_redo.png
diff --git a/default_images/res/commandimagelist/sch_refresh.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refresh.png
index c8c62db27805..c8c62db27805 100644
--- a/default_images/res/commandimagelist/sch_refresh.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refresh.png
diff --git a/default_images/res/commandimagelist/sch_refreshformcontrol.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refreshformcontrol.png
index e5aa4f6ca076..e5aa4f6ca076 100644
--- a/default_images/res/commandimagelist/sch_refreshformcontrol.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_refreshformcontrol.png
diff --git a/default_images/res/commandimagelist/sch_rehearsetimings.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rehearsetimings.png
index 4ea821c93769..4ea821c93769 100644
--- a/default_images/res/commandimagelist/sch_rehearsetimings.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rehearsetimings.png
diff --git a/default_images/res/commandimagelist/sch_reload.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reload.png
index 2b2bf3264732..2b2bf3264732 100644
--- a/default_images/res/commandimagelist/sch_reload.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reload.png
diff --git a/default_images/res/commandimagelist/sch_removebullets.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removebullets.png
index f240167773d1..f240167773d1 100644
--- a/default_images/res/commandimagelist/sch_removebullets.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removebullets.png
diff --git a/default_images/res/commandimagelist/sch_removefilter.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefilter.png
index 0e04871779e5..0e04871779e5 100644
--- a/default_images/res/commandimagelist/sch_removefilter.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefilter.png
diff --git a/default_images/res/commandimagelist/sch_removefiltersort.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefiltersort.png
index d80f2f32f42b..d80f2f32f42b 100644
--- a/default_images/res/commandimagelist/sch_removefiltersort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_removefiltersort.png
diff --git a/default_images/res/commandimagelist/sch_renamemasterpage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_renamemasterpage.png
index d3c874fca47f..d3c874fca47f 100644
--- a/default_images/res/commandimagelist/sch_renamemasterpage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_renamemasterpage.png
diff --git a/default_images/res/commandimagelist/sch_repeat.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_repeat.png
index 5101a6e85593..5101a6e85593 100644
--- a/default_images/res/commandimagelist/sch_repeat.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_repeat.png
diff --git a/default_images/res/commandimagelist/sch_reportnavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reportnavigator.png
index bd247a9f25ce..bd247a9f25ce 100644
--- a/default_images/res/commandimagelist/sch_reportnavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reportnavigator.png
diff --git a/default_images/res/commandimagelist/sch_reverseorder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reverseorder.png
index e7e9f13284ad..e7e9f13284ad 100644
--- a/default_images/res/commandimagelist/sch_reverseorder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_reverseorder.png
diff --git a/default_images/res/commandimagelist/sch_rightpara.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rightpara.png
index 89cdc084247b..89cdc084247b 100644
--- a/default_images/res/commandimagelist/sch_rightpara.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rightpara.png
diff --git a/default_images/res/commandimagelist/sch_rulerrows.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrows.png
index 89b6cb002bbe..89b6cb002bbe 100644
--- a/default_images/res/commandimagelist/sch_rulerrows.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrows.png
diff --git a/default_images/res/commandimagelist/sch_rulerrowsvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrowsvertical.png
index e52e2371344a..e52e2371344a 100644
--- a/default_images/res/commandimagelist/sch_rulerrowsvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_rulerrowsvertical.png
diff --git a/default_images/res/commandimagelist/sch_runbasic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_runbasic.png
index f5e8de8f94cc..f5e8de8f94cc 100644
--- a/default_images/res/commandimagelist/sch_runbasic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_runbasic.png
diff --git a/default_images/res/commandimagelist/sch_save.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_save.png
index b5add43c0596..b5add43c0596 100644
--- a/default_images/res/commandimagelist/sch_save.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_save.png
diff --git a/default_images/res/commandimagelist/sch_saveas.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveas.png
index b8914b52f420..b8914b52f420 100644
--- a/default_images/res/commandimagelist/sch_saveas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveas.png
diff --git a/default_images/res/commandimagelist/sch_saveastemplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveastemplate.png
index 776319cac4ec..776319cac4ec 100644
--- a/default_images/res/commandimagelist/sch_saveastemplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_saveastemplate.png
diff --git a/default_images/res/commandimagelist/sch_savebasicas.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_savebasicas.png
index 5aade5f46ed0..5aade5f46ed0 100644
--- a/default_images/res/commandimagelist/sch_savebasicas.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_savebasicas.png
diff --git a/default_images/res/commandimagelist/sch_sbabrwinsert.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbabrwinsert.png
index b116ca53d5c8..b116ca53d5c8 100644
--- a/default_images/res/commandimagelist/sch_sbabrwinsert.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbabrwinsert.png
diff --git a/default_images/res/commandimagelist/sch_sbaexecutesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbaexecutesql.png
index 3943408dac30..3943408dac30 100644
--- a/default_images/res/commandimagelist/sch_sbaexecutesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbaexecutesql.png
diff --git a/default_images/res/commandimagelist/sch_sbanativesql.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbanativesql.png
index b7e9607a619b..b7e9607a619b 100644
--- a/default_images/res/commandimagelist/sch_sbanativesql.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sbanativesql.png
diff --git a/default_images/res/commandimagelist/sch_scaletext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scaletext.png
index 1f12e6bbba96..1f12e6bbba96 100644
--- a/default_images/res/commandimagelist/sch_scaletext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scaletext.png
diff --git a/default_images/res/commandimagelist/sch_scrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scrollbar.png
index 79b3148cfd1c..79b3148cfd1c 100644
--- a/default_images/res/commandimagelist/sch_scrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_scrollbar.png
diff --git a/default_images/res/commandimagelist/sch_searchdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_searchdialog.png
index 0901cc237f6d..0901cc237f6d 100644
--- a/default_images/res/commandimagelist/sch_searchdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_searchdialog.png
diff --git a/default_images/res/commandimagelist/sch_sectionalignbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignbottom.png
index 7201672783d1..7201672783d1 100644
--- a/default_images/res/commandimagelist/sch_sectionalignbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignbottom.png
diff --git a/default_images/res/commandimagelist/sch_sectionalignleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignleft.png
index d8e591690358..d8e591690358 100644
--- a/default_images/res/commandimagelist/sch_sectionalignleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignleft.png
diff --git a/default_images/res/commandimagelist/sch_sectionalignright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignright.png
index e9c32766047d..e9c32766047d 100644
--- a/default_images/res/commandimagelist/sch_sectionalignright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionalignright.png
diff --git a/default_images/res/commandimagelist/sch_sectionaligntop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionaligntop.png
index 66f82c4c3641..66f82c4c3641 100644
--- a/default_images/res/commandimagelist/sch_sectionaligntop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionaligntop.png
diff --git a/default_images/res/commandimagelist/sch_sectionshrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrink.png
index 9daa3dc30ed7..9daa3dc30ed7 100644
--- a/default_images/res/commandimagelist/sch_sectionshrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrink.png
diff --git a/default_images/res/commandimagelist/sch_sectionshrinkbottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinkbottom.png
index f01836f55163..f01836f55163 100644
--- a/default_images/res/commandimagelist/sch_sectionshrinkbottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinkbottom.png
diff --git a/default_images/res/commandimagelist/sch_sectionshrinktop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinktop.png
index f2de4c747e3e..f2de4c747e3e 100644
--- a/default_images/res/commandimagelist/sch_sectionshrinktop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sectionshrinktop.png
diff --git a/default_images/res/commandimagelist/sch_selectall.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectall.png
index cac437f00146..cac437f00146 100644
--- a/default_images/res/commandimagelist/sch_selectall.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectall.png
diff --git a/default_images/res/commandimagelist/sch_selectmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectmode.png
index f8d2ff0a175e..f8d2ff0a175e 100644
--- a/default_images/res/commandimagelist/sch_selectmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectmode.png
diff --git a/default_images/res/commandimagelist/sch_selectobject.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectobject.png
index 206ab1534e90..206ab1534e90 100644
--- a/default_images/res/commandimagelist/sch_selectobject.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selectobject.png
diff --git a/default_images/res/commandimagelist/sch_selecttable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selecttable.png
index 5b4798ef8e26..5b4798ef8e26 100644
--- a/default_images/res/commandimagelist/sch_selecttable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_selecttable.png
diff --git a/default_images/res/commandimagelist/sch_sendfax.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendfax.png
index 1af40ce0d25e..1af40ce0d25e 100644
--- a/default_images/res/commandimagelist/sch_sendfax.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendfax.png
diff --git a/default_images/res/commandimagelist/sch_sendmail.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendmail.png
index eb0e2705085c..eb0e2705085c 100644
--- a/default_images/res/commandimagelist/sch_sendmail.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendmail.png
diff --git a/default_images/res/commandimagelist/sch_sendtoback.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendtoback.png
index 64c6f61eff24..64c6f61eff24 100644
--- a/default_images/res/commandimagelist/sch_sendtoback.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sendtoback.png
diff --git a/default_images/res/commandimagelist/sch_setborderstyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setborderstyle.png
index e94aff18c5a9..e94aff18c5a9 100644
--- a/default_images/res/commandimagelist/sch_setborderstyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setborderstyle.png
diff --git a/default_images/res/commandimagelist/sch_setdocumentproperties.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setdocumentproperties.png
index e9a94d606362..e9a94d606362 100644
--- a/default_images/res/commandimagelist/sch_setdocumentproperties.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setdocumentproperties.png
diff --git a/default_images/res/commandimagelist/sch_setobjecttobackground.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttobackground.png
index f629237f485f..f629237f485f 100644
--- a/default_images/res/commandimagelist/sch_setobjecttobackground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttobackground.png
diff --git a/default_images/res/commandimagelist/sch_setobjecttoforeground.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttoforeground.png
index 2efc600092e6..2efc600092e6 100644
--- a/default_images/res/commandimagelist/sch_setobjecttoforeground.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setobjecttoforeground.png
diff --git a/default_images/res/commandimagelist/sch_setoptimalcolumnwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidth.png
index bd7188f3a9f8..bd7188f3a9f8 100644
--- a/default_images/res/commandimagelist/sch_setoptimalcolumnwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidth.png
diff --git a/default_images/res/commandimagelist/sch_setoptimalcolumnwidthdirect.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidthdirect.png
index 72f347c2a4d7..72f347c2a4d7 100644
--- a/default_images/res/commandimagelist/sch_setoptimalcolumnwidthdirect.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalcolumnwidthdirect.png
diff --git a/default_images/res/commandimagelist/sch_setoptimalrowheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalrowheight.png
index 15b3506c6fbc..15b3506c6fbc 100644
--- a/default_images/res/commandimagelist/sch_setoptimalrowheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_setoptimalrowheight.png
diff --git a/default_images/res/commandimagelist/sch_shadowcursor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowcursor.png
index 75cc3ab656bb..75cc3ab656bb 100644
--- a/default_images/res/commandimagelist/sch_shadowcursor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowcursor.png
diff --git a/default_images/res/commandimagelist/sch_shadowed.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowed.png
index c2c23ab411ec..c2c23ab411ec 100644
--- a/default_images/res/commandimagelist/sch_shadowed.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shadowed.png
diff --git a/default_images/res/commandimagelist/sch_shear.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shear.png
index 0cb9ce0ed165..0cb9ce0ed165 100644
--- a/default_images/res/commandimagelist/sch_shear.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shear.png
diff --git a/default_images/res/commandimagelist/sch_shell3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shell3d.png
index b2017d563fa9..b2017d563fa9 100644
--- a/default_images/res/commandimagelist/sch_shell3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shell3d.png
diff --git a/default_images/res/commandimagelist/sch_showannotation.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showannotation.png
index 55de1a69d16e..55de1a69d16e 100644
--- a/default_images/res/commandimagelist/sch_showannotation.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showannotation.png
diff --git a/default_images/res/commandimagelist/sch_showbookview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbookview.png
index 964957d35693..964957d35693 100644
--- a/default_images/res/commandimagelist/sch_showbookview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbookview.png
diff --git a/default_images/res/commandimagelist/sch_showbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbrowser.png
index 12e0be1ab5cf..12e0be1ab5cf 100644
--- a/default_images/res/commandimagelist/sch_showbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showbrowser.png
diff --git a/default_images/res/commandimagelist/sch_showdatanavigator.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showdatanavigator.png
index 76c0a0ac22f5..76c0a0ac22f5 100644
--- a/default_images/res/commandimagelist/sch_showdatanavigator.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showdatanavigator.png
diff --git a/default_images/res/commandimagelist/sch_showfmexplorer.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showfmexplorer.png
index 94191ffbecf7..94191ffbecf7 100644
--- a/default_images/res/commandimagelist/sch_showfmexplorer.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showfmexplorer.png
diff --git a/default_images/res/commandimagelist/sch_showmultiplepages.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showmultiplepages.png
index a6bda4395e1c..a6bda4395e1c 100644
--- a/default_images/res/commandimagelist/sch_showmultiplepages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showmultiplepages.png
diff --git a/default_images/res/commandimagelist/sch_showpropbrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showpropbrowser.png
index fb40afb1f4db..fb40afb1f4db 100644
--- a/default_images/res/commandimagelist/sch_showpropbrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showpropbrowser.png
diff --git a/default_images/res/commandimagelist/sch_showslide.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showslide.png
index 78086efdb73d..78086efdb73d 100644
--- a/default_images/res/commandimagelist/sch_showslide.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showslide.png
diff --git a/default_images/res/commandimagelist/sch_showtwopages.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showtwopages.png
index e0ccf6be8274..e0ccf6be8274 100644
--- a/default_images/res/commandimagelist/sch_showtwopages.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_showtwopages.png
diff --git a/default_images/res/commandimagelist/sch_shrink.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shrink.png
index a5bd3c8222ac..a5bd3c8222ac 100644
--- a/default_images/res/commandimagelist/sch_shrink.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_shrink.png
diff --git a/default_images/res/commandimagelist/sch_smallestheight.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestheight.png
index 411e4aac7b13..411e4aac7b13 100644
--- a/default_images/res/commandimagelist/sch_smallestheight.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestheight.png
diff --git a/default_images/res/commandimagelist/sch_smallestwidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestwidth.png
index 5973e2c97bf1..5973e2c97bf1 100644
--- a/default_images/res/commandimagelist/sch_smallestwidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_smallestwidth.png
diff --git a/default_images/res/commandimagelist/sch_snapborder.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapborder.png
index 6197d556c69a..6197d556c69a 100644
--- a/default_images/res/commandimagelist/sch_snapborder.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapborder.png
diff --git a/default_images/res/commandimagelist/sch_snapframe.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapframe.png
index 9afc70641844..9afc70641844 100644
--- a/default_images/res/commandimagelist/sch_snapframe.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snapframe.png
diff --git a/default_images/res/commandimagelist/sch_snappoints.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snappoints.png
index f2949438a55a..f2949438a55a 100644
--- a/default_images/res/commandimagelist/sch_snappoints.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_snappoints.png
diff --git a/default_images/res/commandimagelist/sch_solidcreate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_solidcreate.png
index a644b4ac15ca..a644b4ac15ca 100644
--- a/default_images/res/commandimagelist/sch_solidcreate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_solidcreate.png
diff --git a/default_images/res/commandimagelist/sch_sortascending.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortascending.png
index 8f3ceada0efe..8f3ceada0efe 100644
--- a/default_images/res/commandimagelist/sch_sortascending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortascending.png
diff --git a/default_images/res/commandimagelist/sch_sortdescending.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdescending.png
index 03c3f9146ae2..03c3f9146ae2 100644
--- a/default_images/res/commandimagelist/sch_sortdescending.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdescending.png
diff --git a/default_images/res/commandimagelist/sch_sortdown.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdown.png
index 041274d08227..041274d08227 100644
--- a/default_images/res/commandimagelist/sch_sortdown.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortdown.png
diff --git a/default_images/res/commandimagelist/sch_sortup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortup.png
index 70f7f8e37ca9..70f7f8e37ca9 100644
--- a/default_images/res/commandimagelist/sch_sortup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sortup.png
diff --git a/default_images/res/commandimagelist/sch_sourceview.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sourceview.png
index 2149d66fcd7e..2149d66fcd7e 100644
--- a/default_images/res/commandimagelist/sch_sourceview.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sourceview.png
diff --git a/default_images/res/commandimagelist/sch_spacepara1.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara1.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/res/commandimagelist/sch_spacepara1.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara1.png
diff --git a/default_images/res/commandimagelist/sch_spacepara15.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara15.png
index b0e9aa9d55a7..b0e9aa9d55a7 100644
--- a/default_images/res/commandimagelist/sch_spacepara15.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara15.png
diff --git a/default_images/res/commandimagelist/sch_spacepara2.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara2.png
index 1c7ad82bf048..1c7ad82bf048 100644
--- a/default_images/res/commandimagelist/sch_spacepara2.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spacepara2.png
diff --git a/default_images/res/commandimagelist/sch_spelldialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelldialog.png
index ee12cb00b554..ee12cb00b554 100644
--- a/default_images/res/commandimagelist/sch_spelldialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelldialog.png
diff --git a/default_images/res/commandimagelist/sch_spelling.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelling.png
index ef6d27b312d9..ef6d27b312d9 100644
--- a/default_images/res/commandimagelist/sch_spelling.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spelling.png
diff --git a/default_images/res/commandimagelist/sch_spellingandgrammardialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellingandgrammardialog.png
index ee12cb00b554..ee12cb00b554 100644
--- a/default_images/res/commandimagelist/sch_spellingandgrammardialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellingandgrammardialog.png
diff --git a/default_images/res/commandimagelist/sch_spellonline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellonline.png
index 579a4f0749da..579a4f0749da 100644
--- a/default_images/res/commandimagelist/sch_spellonline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spellonline.png
diff --git a/default_images/res/commandimagelist/sch_sphere.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sphere.png
index b2a703c9dc3e..b2a703c9dc3e 100644
--- a/default_images/res/commandimagelist/sch_sphere.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_sphere.png
diff --git a/default_images/res/commandimagelist/sch_spinbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spinbutton.png
index 0c66e0d5d9be..0c66e0d5d9be 100644
--- a/default_images/res/commandimagelist/sch_spinbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_spinbutton.png
diff --git a/default_images/res/commandimagelist/sch_splitcell.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitcell.png
index 6b59a11744ff..6b59a11744ff 100644
--- a/default_images/res/commandimagelist/sch_splitcell.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitcell.png
diff --git a/default_images/res/commandimagelist/sch_splithorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splithorizontal.png
index 31fd771fc749..31fd771fc749 100644
--- a/default_images/res/commandimagelist/sch_splithorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splithorizontal.png
diff --git a/default_images/res/commandimagelist/sch_splitparenthorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparenthorizontal.png
index 31fd771fc749..31fd771fc749 100644
--- a/default_images/res/commandimagelist/sch_splitparenthorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparenthorizontal.png
diff --git a/default_images/res/commandimagelist/sch_splitparentvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparentvertical.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_splitparentvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitparentvertical.png
diff --git a/default_images/res/commandimagelist/sch_splitvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitvertical.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_splitvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_splitvertical.png
diff --git a/default_images/res/commandimagelist/sch_square.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square.png
index 409e91d061bf..409e91d061bf 100644
--- a/default_images/res/commandimagelist/sch_square.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square.png
diff --git a/default_images/res/commandimagelist/sch_square_rounded.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded.png
index afc0127f13cd..afc0127f13cd 100644
--- a/default_images/res/commandimagelist/sch_square_rounded.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded.png
diff --git a/default_images/res/commandimagelist/sch_square_rounded_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded_unfilled.png
index 32dfb1b91be9..32dfb1b91be9 100644
--- a/default_images/res/commandimagelist/sch_square_rounded_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_rounded_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_square_unfilled.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_unfilled.png
index 766af567301e..766af567301e 100644
--- a/default_images/res/commandimagelist/sch_square_unfilled.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_square_unfilled.png
diff --git a/default_images/res/commandimagelist/sch_starchartdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starchartdialog.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/res/commandimagelist/sch_starchartdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starchartdialog.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.bang.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.bang.png
index 1b1b56f5a91b..1b1b56f5a91b 100644
--- a/default_images/res/commandimagelist/sch_starshapes.bang.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.bang.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.concave-star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.concave-star6.png
index aa3b1f0c2e4d..aa3b1f0c2e4d 100644
--- a/default_images/res/commandimagelist/sch_starshapes.concave-star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.concave-star6.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.doorplate.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.doorplate.png
index 01b4cf4be264..01b4cf4be264 100644
--- a/default_images/res/commandimagelist/sch_starshapes.doorplate.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.doorplate.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.horizontal-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.horizontal-scroll.png
index 99bd71e797d9..99bd71e797d9 100644
--- a/default_images/res/commandimagelist/sch_starshapes.horizontal-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.horizontal-scroll.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.png
index f2f45a94cb4d..f2f45a94cb4d 100644
--- a/default_images/res/commandimagelist/sch_starshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.signet.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.signet.png
index a78b1d23775c..a78b1d23775c 100644
--- a/default_images/res/commandimagelist/sch_starshapes.signet.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.signet.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star12.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star12.png
index 6e063f999d3f..6e063f999d3f 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star12.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star12.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star24.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star24.png
index f7cd23edb919..f7cd23edb919 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star24.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star24.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star4.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star4.png
index 9a8437ae79eb..9a8437ae79eb 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star4.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star4.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star5.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star5.png
index 201aa5fe7913..201aa5fe7913 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star5.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star5.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star6.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star6.png
index 4bd91e172846..4bd91e172846 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star6.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star6.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.star8.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star8.png
index cb57b50c15ff..cb57b50c15ff 100644
--- a/default_images/res/commandimagelist/sch_starshapes.star8.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.star8.png
diff --git a/default_images/res/commandimagelist/sch_starshapes.vertical-scroll.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.vertical-scroll.png
index d326c946e45f..d326c946e45f 100644
--- a/default_images/res/commandimagelist/sch_starshapes.vertical-scroll.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_starshapes.vertical-scroll.png
diff --git a/default_images/res/commandimagelist/sch_strikeout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_strikeout.png
index cd2076f20913..cd2076f20913 100644
--- a/default_images/res/commandimagelist/sch_strikeout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_strikeout.png
diff --git a/default_images/res/commandimagelist/sch_styleapply.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleapply.png
index 4270ab7ad34c..4270ab7ad34c 100644
--- a/default_images/res/commandimagelist/sch_styleapply.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleapply.png
diff --git a/default_images/res/commandimagelist/sch_stylenewbyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylenewbyexample.png
index 0f8ccee50cf0..0f8ccee50cf0 100644
--- a/default_images/res/commandimagelist/sch_stylenewbyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylenewbyexample.png
diff --git a/default_images/res/commandimagelist/sch_styleupdatebyexample.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleupdatebyexample.png
index 25b70311b3b8..25b70311b3b8 100644
--- a/default_images/res/commandimagelist/sch_styleupdatebyexample.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_styleupdatebyexample.png
diff --git a/default_images/res/commandimagelist/sch_stylewatercanmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylewatercanmode.png
index 4b87f07ff683..4b87f07ff683 100644
--- a/default_images/res/commandimagelist/sch_stylewatercanmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_stylewatercanmode.png
diff --git a/default_images/res/commandimagelist/sch_subscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_subscript.png
index 6b9d77705d6b..6b9d77705d6b 100644
--- a/default_images/res/commandimagelist/sch_subscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_subscript.png
diff --git a/default_images/res/commandimagelist/sch_superscript.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_superscript.png
index 86767f3e3d9a..86767f3e3d9a 100644
--- a/default_images/res/commandimagelist/sch_superscript.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_superscript.png
diff --git a/default_images/res/commandimagelist/sch_switchcontroldesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchcontroldesignmode.png
index 6ab001253a18..6ab001253a18 100644
--- a/default_images/res/commandimagelist/sch_switchcontroldesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchcontroldesignmode.png
diff --git a/default_images/res/commandimagelist/sch_switchxformsdesignmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchxformsdesignmode.png
index 94c705c5f122..94c705c5f122 100644
--- a/default_images/res/commandimagelist/sch_switchxformsdesignmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_switchxformsdesignmode.png
diff --git a/default_images/res/commandimagelist/sch_symbolcatalogue.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolcatalogue.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/default_images/res/commandimagelist/sch_symbolcatalogue.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolcatalogue.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.brace-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.brace-pair.png
index ede6a204ab49..ede6a204ab49 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.brace-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.brace-pair.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.bracket-pair.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.bracket-pair.png
index 3b32a49e2b8f..3b32a49e2b8f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.bracket-pair.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.bracket-pair.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.cloud.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.cloud.png
index e7ed198e4b2a..e7ed198e4b2a 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.cloud.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.cloud.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.diamond-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.diamond-bevel.png
index ba240f2e90ec..ba240f2e90ec 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.diamond-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.diamond-bevel.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.flower.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.flower.png
index a6a1956963e2..a6a1956963e2 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.flower.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.flower.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.forbidden.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.forbidden.png
index 3f3c22760f3d..3f3c22760f3d 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.forbidden.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.forbidden.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.heart.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.heart.png
index 6d82375660d4..6d82375660d4 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.heart.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.heart.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.left-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-brace.png
index 023663e7563f..023663e7563f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.left-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-brace.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.left-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-bracket.png
index 06c55c6bea83..06c55c6bea83 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.left-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.left-bracket.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.lightning.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.lightning.png
index 0454db470427..0454db470427 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.lightning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.lightning.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.moon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.moon.png
index d96a691c635f..d96a691c635f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.moon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.moon.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.octagon-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.octagon-bevel.png
index 0a0b67a42b7f..0a0b67a42b7f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.octagon-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.octagon-bevel.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.png
index 35bcea8f03ee..35bcea8f03ee 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.puzzle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.puzzle.png
index d69422c8626f..d69422c8626f 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.puzzle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.puzzle.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.quad-bevel.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.quad-bevel.png
index 6776173cd2c4..6776173cd2c4 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.quad-bevel.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.quad-bevel.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.right-brace.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-brace.png
index 6504c45f5cc0..6504c45f5cc0 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.right-brace.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-brace.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.right-bracket.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-bracket.png
index ee8d5cf00b4e..ee8d5cf00b4e 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.right-bracket.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.right-bracket.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.smiley.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.smiley.png
index a0773bac2f8c..a0773bac2f8c 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.smiley.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.smiley.png
diff --git a/default_images/res/commandimagelist/sch_symbolshapes.sun.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.sun.png
index 13d1efa4aed4..13d1efa4aed4 100644
--- a/default_images/res/commandimagelist/sch_symbolshapes.sun.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_symbolshapes.sun.png
diff --git a/default_images/res/commandimagelist/sch_tabdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabdialog.png
index 544a317c7f2c..544a317c7f2c 100644
--- a/default_images/res/commandimagelist/sch_tabdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabdialog.png
diff --git a/default_images/res/commandimagelist/sch_tabledesign.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledesign.png
index 3a6c79344c10..3a6c79344c10 100644
--- a/default_images/res/commandimagelist/sch_tabledesign.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledesign.png
diff --git a/default_images/res/commandimagelist/sch_tabledialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledialog.png
index 8c875cde558a..8c875cde558a 100644
--- a/default_images/res/commandimagelist/sch_tabledialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tabledialog.png
diff --git a/default_images/res/commandimagelist/sch_tablemodefix.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefix.png
index 1eb61ad13ed6..1eb61ad13ed6 100644
--- a/default_images/res/commandimagelist/sch_tablemodefix.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefix.png
diff --git a/default_images/res/commandimagelist/sch_tablemodefixprop.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefixprop.png
index e92b28f3f6a2..e92b28f3f6a2 100644
--- a/default_images/res/commandimagelist/sch_tablemodefixprop.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodefixprop.png
diff --git a/default_images/res/commandimagelist/sch_tablemodevariable.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodevariable.png
index bd435100f296..bd435100f296 100644
--- a/default_images/res/commandimagelist/sch_tablemodevariable.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablemodevariable.png
diff --git a/default_images/res/commandimagelist/sch_tablesort.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablesort.png
index 50bf5911ce98..50bf5911ce98 100644
--- a/default_images/res/commandimagelist/sch_tablesort.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_tablesort.png
diff --git a/default_images/res/commandimagelist/sch_testmode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_testmode.png
index 25581fd448e4..25581fd448e4 100644
--- a/default_images/res/commandimagelist/sch_testmode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_testmode.png
diff --git a/default_images/res/commandimagelist/sch_text.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text.png
index 4066acea5ce4..4066acea5ce4 100644
--- a/default_images/res/commandimagelist/sch_text.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text.png
diff --git a/default_images/res/commandimagelist/sch_text_marquee.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text_marquee.png
index 2aeb5d4b6a5b..2aeb5d4b6a5b 100644
--- a/default_images/res/commandimagelist/sch_text_marquee.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_text_marquee.png
diff --git a/default_images/res/commandimagelist/sch_textdirectionlefttoright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectionlefttoright.png
index 0e15f5a6b56b..0e15f5a6b56b 100644
--- a/default_images/res/commandimagelist/sch_textdirectionlefttoright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectionlefttoright.png
diff --git a/default_images/res/commandimagelist/sch_textdirectiontoptobottom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectiontoptobottom.png
index dad485e2b9f9..dad485e2b9f9 100644
--- a/default_images/res/commandimagelist/sch_textdirectiontoptobottom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textdirectiontoptobottom.png
diff --git a/default_images/res/commandimagelist/sch_textfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textfittosizetool.png
index 4b233f1f2a06..4b233f1f2a06 100644
--- a/default_images/res/commandimagelist/sch_textfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_textfittosizetool.png
diff --git a/default_images/res/commandimagelist/sch_texttoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_texttoolbox.png
index 4066acea5ce4..4066acea5ce4 100644
--- a/default_images/res/commandimagelist/sch_texttoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_texttoolbox.png
diff --git a/default_images/res/commandimagelist/sch_thesaurus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurus.png
index 44a989f8296b..44a989f8296b 100644
--- a/default_images/res/commandimagelist/sch_thesaurus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurus.png
diff --git a/default_images/res/commandimagelist/sch_thesaurusdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurusdialog.png
index 40563f2b880e..40563f2b880e 100644
--- a/default_images/res/commandimagelist/sch_thesaurusdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_thesaurusdialog.png
diff --git a/default_images/res/commandimagelist/sch_timefield.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_timefield.png
index 708642e6d7aa..708642e6d7aa 100644
--- a/default_images/res/commandimagelist/sch_timefield.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_timefield.png
diff --git a/default_images/res/commandimagelist/sch_toggleanchortype.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleanchortype.png
index 5cd7a8cce0ae..5cd7a8cce0ae 100644
--- a/default_images/res/commandimagelist/sch_toggleanchortype.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleanchortype.png
diff --git a/default_images/res/commandimagelist/sch_toggleaxisdescr.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxisdescr.png
index 4b98f99795c1..4b98f99795c1 100644
--- a/default_images/res/commandimagelist/sch_toggleaxisdescr.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxisdescr.png
diff --git a/default_images/res/commandimagelist/sch_toggleaxistitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxistitle.png
index 0be8f485c534..0be8f485c534 100644
--- a/default_images/res/commandimagelist/sch_toggleaxistitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleaxistitle.png
diff --git a/default_images/res/commandimagelist/sch_togglebreakpoint.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglebreakpoint.png
index a2660af865fb..a2660af865fb 100644
--- a/default_images/res/commandimagelist/sch_togglebreakpoint.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglebreakpoint.png
diff --git a/default_images/res/commandimagelist/sch_togglegridhorizontal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridhorizontal.png
index 56f50cc53485..56f50cc53485 100644
--- a/default_images/res/commandimagelist/sch_togglegridhorizontal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridhorizontal.png
diff --git a/default_images/res/commandimagelist/sch_togglegridvertical.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridvertical.png
index d39f3c002d9d..d39f3c002d9d 100644
--- a/default_images/res/commandimagelist/sch_togglegridvertical.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglegridvertical.png
diff --git a/default_images/res/commandimagelist/sch_togglelegend.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglelegend.png
index e2a502f8e384..e2a502f8e384 100644
--- a/default_images/res/commandimagelist/sch_togglelegend.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglelegend.png
diff --git a/default_images/res/commandimagelist/sch_togglemergecells.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglemergecells.png
index a36508ebf299..a36508ebf299 100644
--- a/default_images/res/commandimagelist/sch_togglemergecells.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglemergecells.png
diff --git a/default_images/res/commandimagelist/sch_toggleobjectbeziermode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectbeziermode.png
index 778af89bd345..778af89bd345 100644
--- a/default_images/res/commandimagelist/sch_toggleobjectbeziermode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectbeziermode.png
diff --git a/default_images/res/commandimagelist/sch_toggleobjectrotatemode.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectrotatemode.png
index c8e150f4830e..c8e150f4830e 100644
--- a/default_images/res/commandimagelist/sch_toggleobjectrotatemode.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggleobjectrotatemode.png
diff --git a/default_images/res/commandimagelist/sch_togglesheetgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglesheetgrid.png
index 971b3c0bca57..971b3c0bca57 100644
--- a/default_images/res/commandimagelist/sch_togglesheetgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_togglesheetgrid.png
diff --git a/default_images/res/commandimagelist/sch_toggletitle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggletitle.png
index 1ddb475ca71e..1ddb475ca71e 100644
--- a/default_images/res/commandimagelist/sch_toggletitle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toggletitle.png
diff --git a/default_images/res/commandimagelist/sch_toolsmacroedit.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsmacroedit.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_toolsmacroedit.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsmacroedit.png
diff --git a/default_images/res/commandimagelist/sch_toolsoptions.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsoptions.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_toolsoptions.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_toolsoptions.png
diff --git a/default_images/res/commandimagelist/sch_torus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_torus.png
index a65c61037e90..a65c61037e90 100644
--- a/default_images/res/commandimagelist/sch_torus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_torus.png
diff --git a/default_images/res/commandimagelist/sch_transformdialog.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_transformdialog.png
index ec7c85e2cc35..ec7c85e2cc35 100644
--- a/default_images/res/commandimagelist/sch_transformdialog.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_transformdialog.png
diff --git a/default_images/res/commandimagelist/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underline.png
index 24c12507996a..24c12507996a 100644
--- a/default_images/res/commandimagelist/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underline.png
diff --git a/default_images/res/commandimagelist/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underlinedouble.png
index d51f41526fe1..d51f41526fe1 100644
--- a/default_images/res/commandimagelist/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sch_undo.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_undo.png
index 4da4ad791ef5..4da4ad791ef5 100644
--- a/default_images/res/commandimagelist/sch_undo.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_undo.png
diff --git a/default_images/res/commandimagelist/sch_ungroup.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ungroup.png
index 11c9cfe7b588..11c9cfe7b588 100644
--- a/default_images/res/commandimagelist/sch_ungroup.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_ungroup.png
diff --git a/default_images/res/commandimagelist/sch_unhainframes.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_unhainframes.png
index b1a8a54f307b..b1a8a54f307b 100644
--- a/default_images/res/commandimagelist/sch_unhainframes.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_unhainframes.png
diff --git a/default_images/res/commandimagelist/sch_upsearch.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_upsearch.png
index 02c5e4ff51ba..02c5e4ff51ba 100644
--- a/default_images/res/commandimagelist/sch_upsearch.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_upsearch.png
diff --git a/default_images/res/commandimagelist/sch_urlbutton.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_urlbutton.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/commandimagelist/sch_urlbutton.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_urlbutton.png
diff --git a/default_images/res/commandimagelist/sch_usewizards.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_usewizards.png
index 02493cf9a4e1..02493cf9a4e1 100644
--- a/default_images/res/commandimagelist/sch_usewizards.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_usewizards.png
diff --git a/default_images/res/commandimagelist/sch_verticalcaption.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticalcaption.png
index c9a6c78db09f..c9a6c78db09f 100644
--- a/default_images/res/commandimagelist/sch_verticalcaption.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticalcaption.png
diff --git a/default_images/res/commandimagelist/sch_verticaltext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltext.png
index 63252bb46595..63252bb46595 100644
--- a/default_images/res/commandimagelist/sch_verticaltext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltext.png
diff --git a/default_images/res/commandimagelist/sch_verticaltextfittosizetool.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltextfittosizetool.png
index 425838acc958..425838acc958 100644
--- a/default_images/res/commandimagelist/sch_verticaltextfittosizetool.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_verticaltextfittosizetool.png
diff --git a/default_images/res/commandimagelist/sch_vfixedline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vfixedline.png
index 85d985f4b115..85d985f4b115 100644
--- a/default_images/res/commandimagelist/sch_vfixedline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vfixedline.png
diff --git a/default_images/res/commandimagelist/sch_view100.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_view100.png
index 2254149657b0..2254149657b0 100644
--- a/default_images/res/commandimagelist/sch_view100.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_view100.png
diff --git a/default_images/res/commandimagelist/sch_viewdatasourcebrowser.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewdatasourcebrowser.png
index 366943153ea2..366943153ea2 100644
--- a/default_images/res/commandimagelist/sch_viewdatasourcebrowser.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewdatasourcebrowser.png
diff --git a/default_images/res/commandimagelist/sch_viewformasgrid.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewformasgrid.png
index 8f6a1b481912..8f6a1b481912 100644
--- a/default_images/res/commandimagelist/sch_viewformasgrid.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_viewformasgrid.png
diff --git a/default_images/res/commandimagelist/sch_vscrollbar.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vscrollbar.png
index 79b3148cfd1c..79b3148cfd1c 100644
--- a/default_images/res/commandimagelist/sch_vscrollbar.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_vscrollbar.png
diff --git a/default_images/res/commandimagelist/sch_window3d.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_window3d.png
index b64c98604dbe..b64c98604dbe 100644
--- a/default_images/res/commandimagelist/sch_window3d.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_window3d.png
diff --git a/default_images/res/commandimagelist/sch_wrapcontour.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapcontour.png
index 549b59c63420..549b59c63420 100644
--- a/default_images/res/commandimagelist/sch_wrapcontour.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapcontour.png
diff --git a/default_images/res/commandimagelist/sch_wrapideal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapideal.png
index 126ceac4b969..126ceac4b969 100644
--- a/default_images/res/commandimagelist/sch_wrapideal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapideal.png
diff --git a/default_images/res/commandimagelist/sch_wrapleft.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapleft.png
index f7f22669878d..f7f22669878d 100644
--- a/default_images/res/commandimagelist/sch_wrapleft.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapleft.png
diff --git a/default_images/res/commandimagelist/sch_wrapoff.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapoff.png
index dcc9f4563b32..dcc9f4563b32 100644
--- a/default_images/res/commandimagelist/sch_wrapoff.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapoff.png
diff --git a/default_images/res/commandimagelist/sch_wrapon.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapon.png
index 47f48d5d1b1f..47f48d5d1b1f 100644
--- a/default_images/res/commandimagelist/sch_wrapon.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapon.png
diff --git a/default_images/res/commandimagelist/sch_wrapright.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapright.png
index 0178a33b8a2e..0178a33b8a2e 100644
--- a/default_images/res/commandimagelist/sch_wrapright.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapright.png
diff --git a/default_images/res/commandimagelist/sch_wrapthrough.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapthrough.png
index a65dec5a5d78..a65dec5a5d78 100644
--- a/default_images/res/commandimagelist/sch_wrapthrough.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_wrapthrough.png
diff --git a/default_images/res/commandimagelist/sch_xlinecolor.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinecolor.png
index 007166f95b84..007166f95b84 100644
--- a/default_images/res/commandimagelist/sch_xlinecolor.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinecolor.png
diff --git a/default_images/res/commandimagelist/sch_xlinestyle.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinestyle.png
index 0318bcc06dfb..0318bcc06dfb 100644
--- a/default_images/res/commandimagelist/sch_xlinestyle.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_xlinestyle.png
diff --git a/default_images/res/commandimagelist/sch_zoom.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom.png
index b024e89336ad..b024e89336ad 100644
--- a/default_images/res/commandimagelist/sch_zoom.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom.png
diff --git a/default_images/res/commandimagelist/sch_zoom100percent.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom100percent.png
index fcda6ac58267..fcda6ac58267 100644
--- a/default_images/res/commandimagelist/sch_zoom100percent.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoom100percent.png
diff --git a/default_images/res/commandimagelist/sch_zoomin.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomin.png
index 6518edae0ee9..6518edae0ee9 100644
--- a/default_images/res/commandimagelist/sch_zoomin.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomin.png
diff --git a/default_images/res/commandimagelist/sch_zoomminus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomminus.png
index 765e231cdcc8..765e231cdcc8 100644
--- a/default_images/res/commandimagelist/sch_zoomminus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomminus.png
diff --git a/default_images/res/commandimagelist/sch_zoomnext.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomnext.png
index b7bcf5023ce4..b7bcf5023ce4 100644
--- a/default_images/res/commandimagelist/sch_zoomnext.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomnext.png
diff --git a/default_images/res/commandimagelist/sch_zoomobjects.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomobjects.png
index 21b61681772b..21b61681772b 100644
--- a/default_images/res/commandimagelist/sch_zoomobjects.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomobjects.png
diff --git a/default_images/res/commandimagelist/sch_zoomoptimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomoptimal.png
index bdfe9add9a92..bdfe9add9a92 100644
--- a/default_images/res/commandimagelist/sch_zoomoptimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomoptimal.png
diff --git a/default_images/res/commandimagelist/sch_zoomout.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomout.png
index 765e231cdcc8..765e231cdcc8 100644
--- a/default_images/res/commandimagelist/sch_zoomout.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomout.png
diff --git a/default_images/res/commandimagelist/sch_zoompage.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompage.png
index 06ffc94eed5c..06ffc94eed5c 100644
--- a/default_images/res/commandimagelist/sch_zoompage.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompage.png
diff --git a/default_images/res/commandimagelist/sch_zoompagewidth.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompagewidth.png
index 92b2d3b24cde..92b2d3b24cde 100644
--- a/default_images/res/commandimagelist/sch_zoompagewidth.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompagewidth.png
diff --git a/default_images/res/commandimagelist/sch_zoompanning.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompanning.png
index d32cf3af0ccb..d32cf3af0ccb 100644
--- a/default_images/res/commandimagelist/sch_zoompanning.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoompanning.png
diff --git a/default_images/res/commandimagelist/sch_zoomplus.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomplus.png
index d0773683ff6a..d0773683ff6a 100644
--- a/default_images/res/commandimagelist/sch_zoomplus.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomplus.png
diff --git a/default_images/res/commandimagelist/sch_zoomprevious.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomprevious.png
index 33d94a883c56..33d94a883c56 100644
--- a/default_images/res/commandimagelist/sch_zoomprevious.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomprevious.png
diff --git a/default_images/res/commandimagelist/sch_zoomtoolbox.png b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomtoolbox.png
index b6d88256e0d2..b6d88256e0d2 100644
--- a/default_images/res/commandimagelist/sch_zoomtoolbox.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sc_zoomtoolbox.png
diff --git a/default_images/res/commandimagelist/sk/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_bold.png
index 490c31e7bd1a..490c31e7bd1a 100644
--- a/default_images/res/commandimagelist/sk/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_bold.png
diff --git a/default_images/res/commandimagelist/sk/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/sk/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_italic.png
diff --git a/default_images/res/commandimagelist/sk/lch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_numberformatdecimal.png
index beffd59f0e56..beffd59f0e56 100644
--- a/default_images/res/commandimagelist/sk/lch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/sk/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underline.png
index 1cb66a0c1179..1cb66a0c1179 100644
--- a/default_images/res/commandimagelist/sk/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underline.png
diff --git a/default_images/res/commandimagelist/sk/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underlinedouble.png
index 2125c5551829..2125c5551829 100644
--- a/default_images/res/commandimagelist/sk/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sk/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/sk/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_bold.png
diff --git a/default_images/res/commandimagelist/sk/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_italic.png
index d7c33542fc66..d7c33542fc66 100644
--- a/default_images/res/commandimagelist/sk/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_italic.png
diff --git a/default_images/res/commandimagelist/sk/sch_numberformatdecimal.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_numberformatdecimal.png
index 3a247754b915..3a247754b915 100644
--- a/default_images/res/commandimagelist/sk/sch_numberformatdecimal.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_numberformatdecimal.png
diff --git a/default_images/res/commandimagelist/sk/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underline.png
index f289df3eb6e2..f289df3eb6e2 100644
--- a/default_images/res/commandimagelist/sk/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underline.png
diff --git a/default_images/res/commandimagelist/sk/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/sk/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sk/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sl/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_bold.png
index 280605d9b811..280605d9b811 100644
--- a/default_images/res/commandimagelist/sl/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_bold.png
diff --git a/default_images/res/commandimagelist/sl/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_italic.png
index 7cdd004e0854..7cdd004e0854 100644
--- a/default_images/res/commandimagelist/sl/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_italic.png
diff --git a/default_images/res/commandimagelist/sl/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underline.png
index 1f0b1e8ea165..1f0b1e8ea165 100644
--- a/default_images/res/commandimagelist/sl/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underline.png
diff --git a/default_images/res/commandimagelist/sl/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underlinedouble.png
index e72e565189c4..e72e565189c4 100644
--- a/default_images/res/commandimagelist/sl/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sl/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_bold.png
index a7fef09e6a97..a7fef09e6a97 100644
--- a/default_images/res/commandimagelist/sl/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_bold.png
diff --git a/default_images/res/commandimagelist/sl/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_italic.png
index f3f9ef17e45c..f3f9ef17e45c 100644
--- a/default_images/res/commandimagelist/sl/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_italic.png
diff --git a/default_images/res/commandimagelist/sl/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underline.png
index 23a5db1f4a62..23a5db1f4a62 100644
--- a/default_images/res/commandimagelist/sl/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underline.png
diff --git a/default_images/res/commandimagelist/sl/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underlinedouble.png
index bdc019987582..bdc019987582 100644
--- a/default_images/res/commandimagelist/sl/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sl/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sv/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_bold.png
index 21a8ec70058f..21a8ec70058f 100644
--- a/default_images/res/commandimagelist/sv/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_bold.png
diff --git a/default_images/res/commandimagelist/sv/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_italic.png
index 71108004b9f3..71108004b9f3 100644
--- a/default_images/res/commandimagelist/sv/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_italic.png
diff --git a/default_images/res/commandimagelist/sv/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underline.png
index 86cb2b0348de..86cb2b0348de 100644
--- a/default_images/res/commandimagelist/sv/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underline.png
diff --git a/default_images/res/commandimagelist/sv/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underlinedouble.png
index 88887f5a0011..88887f5a0011 100644
--- a/default_images/res/commandimagelist/sv/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/sv/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_bold.png
index 874cfba4e7a9..874cfba4e7a9 100644
--- a/default_images/res/commandimagelist/sv/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_bold.png
diff --git a/default_images/res/commandimagelist/sv/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_italic.png
index 7c9e9374adca..7c9e9374adca 100644
--- a/default_images/res/commandimagelist/sv/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_italic.png
diff --git a/default_images/res/commandimagelist/sv/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underline.png
index ed5562d1b20a..ed5562d1b20a 100644
--- a/default_images/res/commandimagelist/sv/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underline.png
diff --git a/default_images/res/commandimagelist/sv/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underlinedouble.png
index 9a8cf9bdc4ab..9a8cf9bdc4ab 100644
--- a/default_images/res/commandimagelist/sv/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/sv/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/tr/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_bold.png
index c0a2632d510f..c0a2632d510f 100644
--- a/default_images/res/commandimagelist/tr/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_bold.png
diff --git a/default_images/res/commandimagelist/tr/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_italic.png
index 13aaeea54849..13aaeea54849 100644
--- a/default_images/res/commandimagelist/tr/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_italic.png
diff --git a/default_images/res/commandimagelist/tr/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underline.png
index 267a096dd17f..267a096dd17f 100644
--- a/default_images/res/commandimagelist/tr/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underline.png
diff --git a/default_images/res/commandimagelist/tr/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underlinedouble.png
index 3661cae19a20..3661cae19a20 100644
--- a/default_images/res/commandimagelist/tr/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/tr/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_bold.png
index 530f13b8da44..530f13b8da44 100644
--- a/default_images/res/commandimagelist/tr/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_bold.png
diff --git a/default_images/res/commandimagelist/tr/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_italic.png
index ca25f8d0c52e..ca25f8d0c52e 100644
--- a/default_images/res/commandimagelist/tr/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_italic.png
diff --git a/default_images/res/commandimagelist/tr/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underline.png
index ed0bb3dfc280..ed0bb3dfc280 100644
--- a/default_images/res/commandimagelist/tr/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underline.png
diff --git a/default_images/res/commandimagelist/tr/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underlinedouble.png
index 3d142bc3bc5a..3d142bc3bc5a 100644
--- a/default_images/res/commandimagelist/tr/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/tr/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_bold.png
index 173b45148021..173b45148021 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_bold.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_italic.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underline.png
index 3bc2b5fa8efd..3bc2b5fa8efd 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underline.png
diff --git a/default_images/res/commandimagelist/zh-CN/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underlinedouble.png
index f27304864369..f27304864369 100644
--- a/default_images/res/commandimagelist/zh-CN/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_bold.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_italic.png
index f28583757725..f28583757725 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_italic.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underline.png
index c243963a1e73..c243963a1e73 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underline.png
diff --git a/default_images/res/commandimagelist/zh-CN/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/zh-CN/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-CN/sc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_bold.png
index 01b82d00ce44..01b82d00ce44 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_bold.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_italic.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_italic.png
index 0387f58cb164..0387f58cb164 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_italic.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_italic.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underline.png
index 4833f557b0cd..4833f557b0cd 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underline.png
diff --git a/default_images/res/commandimagelist/zh-TW/lch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underlinedouble.png
index 3b58602819bb..3b58602819bb 100644
--- a/default_images/res/commandimagelist/zh-TW/lch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/lc_underlinedouble.png
diff --git a/default_images/res/commandimagelist/zh-TW/sch_bold.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_bold.png
index d4c74e2d467e..d4c74e2d467e 100644
--- a/default_images/res/commandimagelist/zh-TW/sch_bold.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_bold.png
diff --git a/default_images/res/commandimagelist/zh-TW/sch_underline.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underline.png
index 34038e4e8759..34038e4e8759 100644
--- a/default_images/res/commandimagelist/zh-TW/sch_underline.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underline.png
diff --git a/default_images/res/commandimagelist/zh-TW/sch_underlinedouble.png b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underlinedouble.png
index aca967ec1cdc..aca967ec1cdc 100644
--- a/default_images/res/commandimagelist/zh-TW/sch_underlinedouble.png
+++ b/ooo_custom_images/hicontrast/res/commandimagelist/zh-TW/sc_underlinedouble.png
diff --git a/default_images/res/component_16_h.png b/ooo_custom_images/hicontrast/res/component_16.png
index 84fb17fbfdd6..84fb17fbfdd6 100644
--- a/default_images/res/component_16_h.png
+++ b/ooo_custom_images/hicontrast/res/component_16.png
diff --git a/default_images/res/cs/sch10008.png b/ooo_custom_images/hicontrast/res/cs/sc10008.png
index 3d9d71ddaca8..3d9d71ddaca8 100644
--- a/default_images/res/cs/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/cs/sc10008.png
diff --git a/default_images/res/dah01.png b/ooo_custom_images/hicontrast/res/da01.png
index 567b956e5f1a..567b956e5f1a 100644
--- a/default_images/res/dah01.png
+++ b/ooo_custom_images/hicontrast/res/da01.png
diff --git a/default_images/res/dah02.png b/ooo_custom_images/hicontrast/res/da02.png
index 567b956e5f1a..567b956e5f1a 100644
--- a/default_images/res/dah02.png
+++ b/ooo_custom_images/hicontrast/res/da02.png
diff --git a/default_images/res/dah03.png b/ooo_custom_images/hicontrast/res/da03.png
index 4d6d4137caea..4d6d4137caea 100644
--- a/default_images/res/dah03.png
+++ b/ooo_custom_images/hicontrast/res/da03.png
diff --git a/default_images/res/dah04.png b/ooo_custom_images/hicontrast/res/da04.png
index 43bd5d355013..43bd5d355013 100644
--- a/default_images/res/dah04.png
+++ b/ooo_custom_images/hicontrast/res/da04.png
diff --git a/default_images/res/dah05.png b/ooo_custom_images/hicontrast/res/da05.png
index 8d8cc9e603b9..8d8cc9e603b9 100644
--- a/default_images/res/dah05.png
+++ b/ooo_custom_images/hicontrast/res/da05.png
diff --git a/default_images/res/dah06.png b/ooo_custom_images/hicontrast/res/da06.png
index f930a39df9c8..f930a39df9c8 100644
--- a/default_images/res/dah06.png
+++ b/ooo_custom_images/hicontrast/res/da06.png
diff --git a/default_images/res/de/lch10014.png b/ooo_custom_images/hicontrast/res/de/lc10014.png
index d76dd6d48adb..d76dd6d48adb 100644
--- a/default_images/res/de/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/de/lc10014.png
diff --git a/default_images/res/de/sch10014.png b/ooo_custom_images/hicontrast/res/de/sc10014.png
index e0a90e44743c..e0a90e44743c 100644
--- a/default_images/res/de/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/de/sc10014.png
diff --git a/default_images/res/de/sch26648.png b/ooo_custom_images/hicontrast/res/de/sc26648.png
index 4c5e0590bc9f..4c5e0590bc9f 100644
--- a/default_images/res/de/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/de/sc26648.png
diff --git a/default_images/res/dialogfolder_16_h.png b/ooo_custom_images/hicontrast/res/dialogfolder_16.png
index 691b23bcc9a0..691b23bcc9a0 100644
--- a/default_images/res/dialogfolder_16_h.png
+++ b/ooo_custom_images/hicontrast/res/dialogfolder_16.png
diff --git a/default_images/res/dialogfoldernot_16_h.png b/ooo_custom_images/hicontrast/res/dialogfoldernot_16.png
index 1296a7a85667..1296a7a85667 100644
--- a/default_images/res/dialogfoldernot_16_h.png
+++ b/ooo_custom_images/hicontrast/res/dialogfoldernot_16.png
diff --git a/default_images/res/es/lch10008.png b/ooo_custom_images/hicontrast/res/es/lc10008.png
index 319395c32806..319395c32806 100644
--- a/default_images/res/es/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/es/lc10008.png
diff --git a/default_images/res/es/lch10009.png b/ooo_custom_images/hicontrast/res/es/lc10009.png
index 2fc3fcb763c5..2fc3fcb763c5 100644
--- a/default_images/res/es/lch10009.png
+++ b/ooo_custom_images/hicontrast/res/es/lc10009.png
diff --git a/default_images/res/es/lch10014.png b/ooo_custom_images/hicontrast/res/es/lc10014.png
index d4264c23f456..d4264c23f456 100644
--- a/default_images/res/es/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/es/lc10014.png
diff --git a/default_images/res/es/lch26648.png b/ooo_custom_images/hicontrast/res/es/lc26648.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/es/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/es/lc26648.png
diff --git a/default_images/res/es/sch10008.png b/ooo_custom_images/hicontrast/res/es/sc10008.png
index 80ecdcf55ba9..80ecdcf55ba9 100644
--- a/default_images/res/es/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/es/sc10008.png
diff --git a/default_images/res/es/sch10009.png b/ooo_custom_images/hicontrast/res/es/sc10009.png
index 66d0f0f8ed19..66d0f0f8ed19 100644
--- a/default_images/res/es/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/es/sc10009.png
diff --git a/default_images/res/es/sch10014.png b/ooo_custom_images/hicontrast/res/es/sc10014.png
index 8bf3248ef70f..8bf3248ef70f 100644
--- a/default_images/res/es/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/es/sc10014.png
diff --git a/default_images/res/es/sch26648.png b/ooo_custom_images/hicontrast/res/es/sc26648.png
index 6a83797bd970..6a83797bd970 100644
--- a/default_images/res/es/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/es/sc26648.png
diff --git a/default_images/res/fileopen_hc.png b/ooo_custom_images/hicontrast/res/fileopen.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/fileopen_hc.png
+++ b/ooo_custom_images/hicontrast/res/fileopen.png
diff --git a/default_images/res/foldercl_h.png b/ooo_custom_images/hicontrast/res/foldercl.png
index b1866960ed51..b1866960ed51 100644
--- a/default_images/res/foldercl_h.png
+++ b/ooo_custom_images/hicontrast/res/foldercl.png
diff --git a/default_images/res/folderop_h.png b/ooo_custom_images/hicontrast/res/folderop.png
index a91282f6f9fb..a91282f6f9fb 100644
--- a/default_images/res/folderop_h.png
+++ b/ooo_custom_images/hicontrast/res/folderop.png
diff --git a/default_images/res/fph010.png b/ooo_custom_images/hicontrast/res/fp010.png
index e8122b21845a..e8122b21845a 100644
--- a/default_images/res/fph010.png
+++ b/ooo_custom_images/hicontrast/res/fp010.png
diff --git a/default_images/res/fph015.png b/ooo_custom_images/hicontrast/res/fp015.png
index c17d1f867bb3..c17d1f867bb3 100644
--- a/default_images/res/fph015.png
+++ b/ooo_custom_images/hicontrast/res/fp015.png
diff --git a/default_images/res/fr/lch10008.png b/ooo_custom_images/hicontrast/res/fr/lc10008.png
index 83225eb94773..83225eb94773 100644
--- a/default_images/res/fr/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc10008.png
diff --git a/default_images/res/fr/lch10009.png b/ooo_custom_images/hicontrast/res/fr/lc10009.png
index 9c9c214e06b3..9c9c214e06b3 100644
--- a/default_images/res/fr/lch10009.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc10009.png
diff --git a/default_images/res/fr/lch10014.png b/ooo_custom_images/hicontrast/res/fr/lc10014.png
index d4264c23f456..d4264c23f456 100644
--- a/default_images/res/fr/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc10014.png
diff --git a/default_images/res/fr/lch26648.png b/ooo_custom_images/hicontrast/res/fr/lc26648.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/fr/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/fr/lc26648.png
diff --git a/default_images/res/fr/sch10008.png b/ooo_custom_images/hicontrast/res/fr/sc10008.png
index 3d9d71ddaca8..3d9d71ddaca8 100644
--- a/default_images/res/fr/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc10008.png
diff --git a/default_images/res/fr/sch10009.png b/ooo_custom_images/hicontrast/res/fr/sc10009.png
index 24462f319627..24462f319627 100644
--- a/default_images/res/fr/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc10009.png
diff --git a/default_images/res/fr/sch10014.png b/ooo_custom_images/hicontrast/res/fr/sc10014.png
index 8bf3248ef70f..8bf3248ef70f 100644
--- a/default_images/res/fr/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc10014.png
diff --git a/default_images/res/fr/sch26648.png b/ooo_custom_images/hicontrast/res/fr/sc26648.png
index 6a83797bd970..6a83797bd970 100644
--- a/default_images/res/fr/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/fr/sc26648.png
diff --git a/default_images/res/fwthcirc_h.png b/ooo_custom_images/hicontrast/res/fwthcirc.png
index 350e10100fd8..350e10100fd8 100644
--- a/default_images/res/fwthcirc_h.png
+++ b/ooo_custom_images/hicontrast/res/fwthcirc.png
diff --git a/default_images/res/grafikde_h.png b/ooo_custom_images/hicontrast/res/grafikde.png
index 6c8fd91df099..6c8fd91df099 100644
--- a/default_images/res/grafikde_h.png
+++ b/ooo_custom_images/hicontrast/res/grafikde.png
diff --git a/default_images/res/grafikei_h.png b/ooo_custom_images/hicontrast/res/grafikei.png
index 56ff7e946524..56ff7e946524 100644
--- a/default_images/res/grafikei_h.png
+++ b/ooo_custom_images/hicontrast/res/grafikei.png
diff --git a/default_images/res/harddisk_16_h.png b/ooo_custom_images/hicontrast/res/harddisk_16.png
index 324def54b850..324def54b850 100644
--- a/default_images/res/harddisk_16_h.png
+++ b/ooo_custom_images/hicontrast/res/harddisk_16.png
diff --git a/default_images/res/hldocntp_h.png b/ooo_custom_images/hicontrast/res/hldocntp.png
index 02cbad3ed0ee..02cbad3ed0ee 100644
--- a/default_images/res/hldocntp_h.png
+++ b/ooo_custom_images/hicontrast/res/hldocntp.png
diff --git a/default_images/res/hldoctp_h.png b/ooo_custom_images/hicontrast/res/hldoctp.png
index ba5800eb228f..ba5800eb228f 100644
--- a/default_images/res/hldoctp_h.png
+++ b/ooo_custom_images/hicontrast/res/hldoctp.png
diff --git a/default_images/res/hlinettp_h.png b/ooo_custom_images/hicontrast/res/hlinettp.png
index 51ddf38bc863..51ddf38bc863 100644
--- a/default_images/res/hlinettp_h.png
+++ b/ooo_custom_images/hicontrast/res/hlinettp.png
diff --git a/default_images/res/hlmailtp_h.png b/ooo_custom_images/hicontrast/res/hlmailtp.png
index e9887bc83647..e9887bc83647 100644
--- a/default_images/res/hlmailtp_h.png
+++ b/ooo_custom_images/hicontrast/res/hlmailtp.png
diff --git a/default_images/res/hu/lch10008.png b/ooo_custom_images/hicontrast/res/hu/lc10008.png
index 3d461523d619..3d461523d619 100644
--- a/default_images/res/hu/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc10008.png
diff --git a/default_images/res/hu/lch10009.png b/ooo_custom_images/hicontrast/res/hu/lc10009.png
index 8b069695f2b4..8b069695f2b4 100644
--- a/default_images/res/hu/lch10009.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc10009.png
diff --git a/default_images/res/hu/lch10014.png b/ooo_custom_images/hicontrast/res/hu/lc10014.png
index 1727ddc34e92..1727ddc34e92 100644
--- a/default_images/res/hu/lch10014.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc10014.png
diff --git a/default_images/res/hu/lch26648.png b/ooo_custom_images/hicontrast/res/hu/lc26648.png
index adc4e7dcc23e..adc4e7dcc23e 100644
--- a/default_images/res/hu/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/hu/lc26648.png
diff --git a/default_images/res/hu/sch10008.png b/ooo_custom_images/hicontrast/res/hu/sc10008.png
index 3629b30a528c..3629b30a528c 100644
--- a/default_images/res/hu/sch10008.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc10008.png
diff --git a/default_images/res/hu/sch10009.png b/ooo_custom_images/hicontrast/res/hu/sc10009.png
index dd4ba05d5b91..dd4ba05d5b91 100644
--- a/default_images/res/hu/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc10009.png
diff --git a/default_images/res/hu/sch10014.png b/ooo_custom_images/hicontrast/res/hu/sc10014.png
index 0a4b95614db5..0a4b95614db5 100644
--- a/default_images/res/hu/sch10014.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc10014.png
diff --git a/default_images/res/hu/sch26648.png b/ooo_custom_images/hicontrast/res/hu/sc26648.png
index c50dd9e3b76a..c50dd9e3b76a 100644
--- a/default_images/res/hu/sch26648.png
+++ b/ooo_custom_images/hicontrast/res/hu/sc26648.png
diff --git a/default_images/res/imh30820.png b/ooo_custom_images/hicontrast/res/im30820.png
index ce96781568d8..ce96781568d8 100644
--- a/default_images/res/imh30820.png
+++ b/ooo_custom_images/hicontrast/res/im30820.png
diff --git a/default_images/res/imh30821.png b/ooo_custom_images/hicontrast/res/im30821.png
index 6fafa72cae93..6fafa72cae93 100644
--- a/default_images/res/imh30821.png
+++ b/ooo_custom_images/hicontrast/res/im30821.png
diff --git a/default_images/res/imh30822.png b/ooo_custom_images/hicontrast/res/im30822.png
index 4ffd2159dd21..4ffd2159dd21 100644
--- a/default_images/res/imh30822.png
+++ b/ooo_custom_images/hicontrast/res/im30822.png
diff --git a/default_images/res/imh30823.png b/ooo_custom_images/hicontrast/res/im30823.png
index b3f308d4ab2c..b3f308d4ab2c 100644
--- a/default_images/res/imh30823.png
+++ b/ooo_custom_images/hicontrast/res/im30823.png
diff --git a/default_images/res/imh30826.png b/ooo_custom_images/hicontrast/res/im30826.png
index 7f8a03c6d57a..7f8a03c6d57a 100644
--- a/default_images/res/imh30826.png
+++ b/ooo_custom_images/hicontrast/res/im30826.png
diff --git a/default_images/res/imh30827.png b/ooo_custom_images/hicontrast/res/im30827.png
index 4eddb25e5edb..4eddb25e5edb 100644
--- a/default_images/res/imh30827.png
+++ b/ooo_custom_images/hicontrast/res/im30827.png
diff --git a/default_images/res/imh30838.png b/ooo_custom_images/hicontrast/res/im30838.png
index 4f2708f1c12e..4f2708f1c12e 100644
--- a/default_images/res/imh30838.png
+++ b/ooo_custom_images/hicontrast/res/im30838.png
diff --git a/default_images/res/imh30839.png b/ooo_custom_images/hicontrast/res/im30839.png
index e67129333610..e67129333610 100644
--- a/default_images/res/imh30839.png
+++ b/ooo_custom_images/hicontrast/res/im30839.png
diff --git a/default_images/res/imh30840.png b/ooo_custom_images/hicontrast/res/im30840.png
index 2bc1d2099cc4..2bc1d2099cc4 100644
--- a/default_images/res/imh30840.png
+++ b/ooo_custom_images/hicontrast/res/im30840.png
diff --git a/default_images/res/imh30841.png b/ooo_custom_images/hicontrast/res/im30841.png
index 349be5554584..349be5554584 100644
--- a/default_images/res/imh30841.png
+++ b/ooo_custom_images/hicontrast/res/im30841.png
diff --git a/default_images/res/it/lch10008.png b/ooo_custom_images/hicontrast/res/it/lc10008.png
index 319395c32806..319395c32806 100644
--- a/default_images/res/it/lch10008.png
+++ b/ooo_custom_images/hicontrast/res/it/lc10008.png
diff --git a/default_images/res/it/lch26648.png b/ooo_custom_images/hicontrast/res/it/lc26648.png
index 3d73d9ace800..3d73d9ace800 100644
--- a/default_images/res/it/lch26648.png
+++ b/ooo_custom_images/hicontrast/res/it/lc26648.png
diff --git a/default_images/res/it/sch10009.png b/ooo_custom_images/hicontrast/res/it/sc10009.png
index 24462f319627..24462f319627 100644
--- a/default_images/res/it/sch10009.png
+++ b/ooo_custom_images/hicontrast/res/it/sc10009.png
diff --git a/default_images/res/javacomponent_16_h.png b/ooo_custom_images/hicontrast/res/javacomponent_16.png
index d14413061603..d14413061603 100644
--- a/default_images/res/javacomponent_16_h.png
+++ b/ooo_custom_images/hicontrast/res/javacomponent_16.png
diff --git a/default_images/res/javalibrary_16_h.png b/ooo_custom_images/hicontrast/res/javalibrary_16.png
index f7919a0f58e4..f7919a0f58e4 100644
--- a/default_images/res/javalibrary_16_h.png
+++ b/ooo_custom_images/hicontrast/res/javalibrary_16.png
diff --git a/default_images/res/ko/lch10712.png b/ooo_custom_images/hicontrast/res/ko/lc10712.png
index 252928026cfa..252928026cfa 100644
--- a/default_images/res/ko/lch10712.png
+++ b/ooo_custom_images/hicontrast/res/ko/lc10712.png
diff --git a/default_images/res/ko/lch10713.png b/ooo_custom_images/hicontrast/res/ko/lc10713.png
index 47d84ef0a001..47d84ef0a001 100644
--- a/default_images/res/ko/lch10713.png
+++ b/ooo_custom_images/hicontrast/res/ko/lc10713.png
diff --git a/default_images/res/ko/sch10712.png b/ooo_custom_images/hicontrast/res/ko/sc10712.png
index 734833afa4b9..734833afa4b9 100644
--- a/default_images/res/ko/sch10712.png
+++ b/ooo_custom_images/hicontrast/res/ko/sc10712.png
diff --git a/default_images/res/ko/sch10713.png b/ooo_custom_images/hicontrast/res/ko/sc10713.png
index 0b868f65f371..0b868f65f371 100644
--- a/default_images/res/ko/sch10713.png
+++ b/ooo_custom_images/hicontrast/res/ko/sc10713.png
diff --git a/default_images/res/lch05504.png b/ooo_custom_images/hicontrast/res/lc05504.png
index 5b7721642a5f..5b7721642a5f 100644
--- a/default_images/res/lch05504.png
+++ b/ooo_custom_images/hicontrast/res/lc05504.png
diff --git a/default_images/res/lch05509.png b/ooo_custom_images/hicontrast/res/lc05509.png
index 21e2aa663dcf..21e2aa663dcf 100644
--- a/default_images/res/lch05509.png
+++ b/ooo_custom_images/hicontrast/res/lc05509.png
diff --git a/default_images/res/lch05678.png b/ooo_custom_images/hicontrast/res/lc05678.png
index 55bbffacd588..55bbffacd588 100644
--- a/default_images/res/lch05678.png
+++ b/ooo_custom_images/hicontrast/res/lc05678.png
diff --git a/default_images/res/lch05711.png b/ooo_custom_images/hicontrast/res/lc05711.png
index bc8d1125b7a9..bc8d1125b7a9 100644
--- a/default_images/res/lch05711.png
+++ b/ooo_custom_images/hicontrast/res/lc05711.png
diff --git a/default_images/res/lch05961.png b/ooo_custom_images/hicontrast/res/lc05961.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/lch05961.png
+++ b/ooo_custom_images/hicontrast/res/lc05961.png
diff --git a/default_images/res/lch06300.png b/ooo_custom_images/hicontrast/res/lc06300.png
index 629711fe1ba4..629711fe1ba4 100644
--- a/default_images/res/lch06300.png
+++ b/ooo_custom_images/hicontrast/res/lc06300.png
diff --git a/default_images/res/lch06301.png b/ooo_custom_images/hicontrast/res/lc06301.png
index 682a8d0391da..682a8d0391da 100644
--- a/default_images/res/lch06301.png
+++ b/ooo_custom_images/hicontrast/res/lc06301.png
diff --git a/default_images/res/lch06303.png b/ooo_custom_images/hicontrast/res/lc06303.png
index 06ac2bf427f1..06ac2bf427f1 100644
--- a/default_images/res/lch06303.png
+++ b/ooo_custom_images/hicontrast/res/lc06303.png
diff --git a/default_images/res/lch06308.png b/ooo_custom_images/hicontrast/res/lc06308.png
index 0ee9e2f1b66a..0ee9e2f1b66a 100644
--- a/default_images/res/lch06308.png
+++ b/ooo_custom_images/hicontrast/res/lc06308.png
diff --git a/default_images/res/lch10711.png b/ooo_custom_images/hicontrast/res/lc10711.png
index a973dad9a1aa..a973dad9a1aa 100644
--- a/default_images/res/lch10711.png
+++ b/ooo_custom_images/hicontrast/res/lc10711.png
diff --git a/default_images/res/lch10712.png b/ooo_custom_images/hicontrast/res/lc10712.png
index b7f9d0550f23..b7f9d0550f23 100644
--- a/default_images/res/lch10712.png
+++ b/ooo_custom_images/hicontrast/res/lc10712.png
diff --git a/default_images/res/lch10713.png b/ooo_custom_images/hicontrast/res/lc10713.png
index ff5c40c5d9bf..ff5c40c5d9bf 100644
--- a/default_images/res/lch10713.png
+++ b/ooo_custom_images/hicontrast/res/lc10713.png
diff --git a/default_images/res/lch10715.png b/ooo_custom_images/hicontrast/res/lc10715.png
index 125eabb6f10b..125eabb6f10b 100644
--- a/default_images/res/lch10715.png
+++ b/ooo_custom_images/hicontrast/res/lc10715.png
diff --git a/default_images/res/lch10716.png b/ooo_custom_images/hicontrast/res/lc10716.png
index 013be2e4af9d..013be2e4af9d 100644
--- a/default_images/res/lch10716.png
+++ b/ooo_custom_images/hicontrast/res/lc10716.png
diff --git a/default_images/res/lch10851.png b/ooo_custom_images/hicontrast/res/lc10851.png
index a2dccd7a1033..a2dccd7a1033 100644
--- a/default_images/res/lch10851.png
+++ b/ooo_custom_images/hicontrast/res/lc10851.png
diff --git a/default_images/res/lch10853.png b/ooo_custom_images/hicontrast/res/lc10853.png
index 6392a834ce94..6392a834ce94 100644
--- a/default_images/res/lch10853.png
+++ b/ooo_custom_images/hicontrast/res/lc10853.png
diff --git a/default_images/res/lch10854.png b/ooo_custom_images/hicontrast/res/lc10854.png
index 08d5ad00302e..08d5ad00302e 100644
--- a/default_images/res/lch10854.png
+++ b/ooo_custom_images/hicontrast/res/lc10854.png
diff --git a/default_images/res/library_16_h.png b/ooo_custom_images/hicontrast/res/library_16.png
index 0e5c2ba30500..0e5c2ba30500 100644
--- a/default_images/res/library_16_h.png
+++ b/ooo_custom_images/hicontrast/res/library_16.png
diff --git a/default_images/res/lock_hc.png b/ooo_custom_images/hicontrast/res/lock.png
index 5bbcb24e6f3c..5bbcb24e6f3c 100644
--- a/default_images/res/lock_hc.png
+++ b/ooo_custom_images/hicontrast/res/lock.png
diff --git a/default_images/res/lxh03123.png b/ooo_custom_images/hicontrast/res/lx03123.png
index 6e447ae9b2f9..6e447ae9b2f9 100644
--- a/default_images/res/lxh03123.png
+++ b/ooo_custom_images/hicontrast/res/lx03123.png
diff --git a/default_images/res/lxh03124.png b/ooo_custom_images/hicontrast/res/lx03124.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03124.png
+++ b/ooo_custom_images/hicontrast/res/lx03124.png
diff --git a/default_images/res/lxh03125.png b/ooo_custom_images/hicontrast/res/lx03125.png
index 6fc2c18a86ba..6fc2c18a86ba 100644
--- a/default_images/res/lxh03125.png
+++ b/ooo_custom_images/hicontrast/res/lx03125.png
diff --git a/default_images/res/lxh03126.png b/ooo_custom_images/hicontrast/res/lx03126.png
index 013ac0c1b60b..013ac0c1b60b 100644
--- a/default_images/res/lxh03126.png
+++ b/ooo_custom_images/hicontrast/res/lx03126.png
diff --git a/default_images/res/lxh03127.png b/ooo_custom_images/hicontrast/res/lx03127.png
index f304cc7b44b9..f304cc7b44b9 100644
--- a/default_images/res/lxh03127.png
+++ b/ooo_custom_images/hicontrast/res/lx03127.png
diff --git a/default_images/res/lxh03128.png b/ooo_custom_images/hicontrast/res/lx03128.png
index 0156d75247b3..0156d75247b3 100644
--- a/default_images/res/lxh03128.png
+++ b/ooo_custom_images/hicontrast/res/lx03128.png
diff --git a/default_images/res/lxh03129.png b/ooo_custom_images/hicontrast/res/lx03129.png
index 4d9bab9e2bd6..4d9bab9e2bd6 100644
--- a/default_images/res/lxh03129.png
+++ b/ooo_custom_images/hicontrast/res/lx03129.png
diff --git a/default_images/res/lxh03130.png b/ooo_custom_images/hicontrast/res/lx03130.png
index 0aca19a7730a..0aca19a7730a 100644
--- a/default_images/res/lxh03130.png
+++ b/ooo_custom_images/hicontrast/res/lx03130.png
diff --git a/default_images/res/lxh03131.png b/ooo_custom_images/hicontrast/res/lx03131.png
index 1ee0fd1f7c6d..1ee0fd1f7c6d 100644
--- a/default_images/res/lxh03131.png
+++ b/ooo_custom_images/hicontrast/res/lx03131.png
diff --git a/default_images/res/lxh03132.png b/ooo_custom_images/hicontrast/res/lx03132.png
index 099861730493..099861730493 100644
--- a/default_images/res/lxh03132.png
+++ b/ooo_custom_images/hicontrast/res/lx03132.png
diff --git a/default_images/res/lxh03134.png b/ooo_custom_images/hicontrast/res/lx03134.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03134.png
+++ b/ooo_custom_images/hicontrast/res/lx03134.png
diff --git a/default_images/res/lxh03135.png b/ooo_custom_images/hicontrast/res/lx03135.png
index b92f098467f3..b92f098467f3 100644
--- a/default_images/res/lxh03135.png
+++ b/ooo_custom_images/hicontrast/res/lx03135.png
diff --git a/default_images/res/lxh03136.png b/ooo_custom_images/hicontrast/res/lx03136.png
index 4e2afe040289..4e2afe040289 100644
--- a/default_images/res/lxh03136.png
+++ b/ooo_custom_images/hicontrast/res/lx03136.png
diff --git a/default_images/res/lxh03137.png b/ooo_custom_images/hicontrast/res/lx03137.png
index 710c902afc11..710c902afc11 100644
--- a/default_images/res/lxh03137.png
+++ b/ooo_custom_images/hicontrast/res/lx03137.png
diff --git a/default_images/res/lxh03138.png b/ooo_custom_images/hicontrast/res/lx03138.png
index 94b31b332beb..94b31b332beb 100644
--- a/default_images/res/lxh03138.png
+++ b/ooo_custom_images/hicontrast/res/lx03138.png
diff --git a/default_images/res/lxh03139.png b/ooo_custom_images/hicontrast/res/lx03139.png
index 6f3a85a9fea0..6f3a85a9fea0 100644
--- a/default_images/res/lxh03139.png
+++ b/ooo_custom_images/hicontrast/res/lx03139.png
diff --git a/default_images/res/lxh03140.png b/ooo_custom_images/hicontrast/res/lx03140.png
index 87bd8e8167b6..87bd8e8167b6 100644
--- a/default_images/res/lxh03140.png
+++ b/ooo_custom_images/hicontrast/res/lx03140.png
diff --git a/default_images/res/lxh03141.png b/ooo_custom_images/hicontrast/res/lx03141.png
index 2a1cb243e771..2a1cb243e771 100644
--- a/default_images/res/lxh03141.png
+++ b/ooo_custom_images/hicontrast/res/lx03141.png
diff --git a/default_images/res/lxh03142.png b/ooo_custom_images/hicontrast/res/lx03142.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03142.png
+++ b/ooo_custom_images/hicontrast/res/lx03142.png
diff --git a/default_images/res/lxh03144.png b/ooo_custom_images/hicontrast/res/lx03144.png
index 472997d46133..472997d46133 100644
--- a/default_images/res/lxh03144.png
+++ b/ooo_custom_images/hicontrast/res/lx03144.png
diff --git a/default_images/res/lxh03145.png b/ooo_custom_images/hicontrast/res/lx03145.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03145.png
+++ b/ooo_custom_images/hicontrast/res/lx03145.png
diff --git a/default_images/res/lxh03150.png b/ooo_custom_images/hicontrast/res/lx03150.png
index a2a72c2063ba..a2a72c2063ba 100644
--- a/default_images/res/lxh03150.png
+++ b/ooo_custom_images/hicontrast/res/lx03150.png
diff --git a/default_images/res/lxh03151.png b/ooo_custom_images/hicontrast/res/lx03151.png
index e27feb604c7d..e27feb604c7d 100644
--- a/default_images/res/lxh03151.png
+++ b/ooo_custom_images/hicontrast/res/lx03151.png
diff --git a/default_images/res/lxh03152.png b/ooo_custom_images/hicontrast/res/lx03152.png
index 7c3d40ebc846..7c3d40ebc846 100644
--- a/default_images/res/lxh03152.png
+++ b/ooo_custom_images/hicontrast/res/lx03152.png
diff --git a/default_images/res/lxh03153.png b/ooo_custom_images/hicontrast/res/lx03153.png
index 88680d02548a..88680d02548a 100644
--- a/default_images/res/lxh03153.png
+++ b/ooo_custom_images/hicontrast/res/lx03153.png
diff --git a/default_images/res/lxh03154.png b/ooo_custom_images/hicontrast/res/lx03154.png
index 73ea21014d4a..73ea21014d4a 100644
--- a/default_images/res/lxh03154.png
+++ b/ooo_custom_images/hicontrast/res/lx03154.png
diff --git a/default_images/res/lxh03155.png b/ooo_custom_images/hicontrast/res/lx03155.png
index 8a8f666177f0..8a8f666177f0 100644
--- a/default_images/res/lxh03155.png
+++ b/ooo_custom_images/hicontrast/res/lx03155.png
diff --git a/default_images/res/lxh03156.png b/ooo_custom_images/hicontrast/res/lx03156.png
index d5319b80b17a..d5319b80b17a 100644
--- a/default_images/res/lxh03156.png
+++ b/ooo_custom_images/hicontrast/res/lx03156.png
diff --git a/default_images/res/lxh03157.png b/ooo_custom_images/hicontrast/res/lx03157.png
index c7dc53d444dc..c7dc53d444dc 100644
--- a/default_images/res/lxh03157.png
+++ b/ooo_custom_images/hicontrast/res/lx03157.png
diff --git a/default_images/res/lxh03158.png b/ooo_custom_images/hicontrast/res/lx03158.png
index bfdcebc5616d..bfdcebc5616d 100644
--- a/default_images/res/lxh03158.png
+++ b/ooo_custom_images/hicontrast/res/lx03158.png
diff --git a/default_images/res/lxh03159.png b/ooo_custom_images/hicontrast/res/lx03159.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03159.png
+++ b/ooo_custom_images/hicontrast/res/lx03159.png
diff --git a/default_images/res/lxh03160.png b/ooo_custom_images/hicontrast/res/lx03160.png
index 2991a9e05d87..2991a9e05d87 100644
--- a/default_images/res/lxh03160.png
+++ b/ooo_custom_images/hicontrast/res/lx03160.png
diff --git a/default_images/res/lxh03161.png b/ooo_custom_images/hicontrast/res/lx03161.png
index 68cb092efdb8..68cb092efdb8 100644
--- a/default_images/res/lxh03161.png
+++ b/ooo_custom_images/hicontrast/res/lx03161.png
diff --git a/default_images/res/lxh03162.png b/ooo_custom_images/hicontrast/res/lx03162.png
index 99f927c6f4db..99f927c6f4db 100644
--- a/default_images/res/lxh03162.png
+++ b/ooo_custom_images/hicontrast/res/lx03162.png
diff --git a/default_images/res/lxh03163.png b/ooo_custom_images/hicontrast/res/lx03163.png
index 9442e1ce7980..9442e1ce7980 100644
--- a/default_images/res/lxh03163.png
+++ b/ooo_custom_images/hicontrast/res/lx03163.png
diff --git a/default_images/res/lxh03164.png b/ooo_custom_images/hicontrast/res/lx03164.png
index e35d77ad5a60..e35d77ad5a60 100644
--- a/default_images/res/lxh03164.png
+++ b/ooo_custom_images/hicontrast/res/lx03164.png
diff --git a/default_images/res/lxh03165.png b/ooo_custom_images/hicontrast/res/lx03165.png
index 8631b5d69439..8631b5d69439 100644
--- a/default_images/res/lxh03165.png
+++ b/ooo_custom_images/hicontrast/res/lx03165.png
diff --git a/default_images/res/lxh03166.png b/ooo_custom_images/hicontrast/res/lx03166.png
index 994ef6704dbf..994ef6704dbf 100644
--- a/default_images/res/lxh03166.png
+++ b/ooo_custom_images/hicontrast/res/lx03166.png
diff --git a/default_images/res/lxh03167.png b/ooo_custom_images/hicontrast/res/lx03167.png
index db4c5cee0776..db4c5cee0776 100644
--- a/default_images/res/lxh03167.png
+++ b/ooo_custom_images/hicontrast/res/lx03167.png
diff --git a/default_images/res/lxh03168.png b/ooo_custom_images/hicontrast/res/lx03168.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03168.png
+++ b/ooo_custom_images/hicontrast/res/lx03168.png
diff --git a/default_images/res/lxh03187.png b/ooo_custom_images/hicontrast/res/lx03187.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03187.png
+++ b/ooo_custom_images/hicontrast/res/lx03187.png
diff --git a/default_images/res/lxh03188.png b/ooo_custom_images/hicontrast/res/lx03188.png
index c26ab88dcaa4..c26ab88dcaa4 100644
--- a/default_images/res/lxh03188.png
+++ b/ooo_custom_images/hicontrast/res/lx03188.png
diff --git a/default_images/res/lxh03189.png b/ooo_custom_images/hicontrast/res/lx03189.png
index fb1d21e46971..fb1d21e46971 100644
--- a/default_images/res/lxh03189.png
+++ b/ooo_custom_images/hicontrast/res/lx03189.png
diff --git a/default_images/res/lxh03190.png b/ooo_custom_images/hicontrast/res/lx03190.png
index 6ffc58a70172..6ffc58a70172 100644
--- a/default_images/res/lxh03190.png
+++ b/ooo_custom_images/hicontrast/res/lx03190.png
diff --git a/default_images/res/lxh03193.png b/ooo_custom_images/hicontrast/res/lx03193.png
index 6ffc58a70172..6ffc58a70172 100644
--- a/default_images/res/lxh03193.png
+++ b/ooo_custom_images/hicontrast/res/lx03193.png
diff --git a/default_images/res/lxh03198.png b/ooo_custom_images/hicontrast/res/lx03198.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03198.png
+++ b/ooo_custom_images/hicontrast/res/lx03198.png
diff --git a/default_images/res/lxh03201.png b/ooo_custom_images/hicontrast/res/lx03201.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03201.png
+++ b/ooo_custom_images/hicontrast/res/lx03201.png
diff --git a/default_images/res/lxh03202.png b/ooo_custom_images/hicontrast/res/lx03202.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03202.png
+++ b/ooo_custom_images/hicontrast/res/lx03202.png
diff --git a/default_images/res/lxh03203.png b/ooo_custom_images/hicontrast/res/lx03203.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03203.png
+++ b/ooo_custom_images/hicontrast/res/lx03203.png
diff --git a/default_images/res/lxh03204.png b/ooo_custom_images/hicontrast/res/lx03204.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03204.png
+++ b/ooo_custom_images/hicontrast/res/lx03204.png
diff --git a/default_images/res/lxh03205.png b/ooo_custom_images/hicontrast/res/lx03205.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03205.png
+++ b/ooo_custom_images/hicontrast/res/lx03205.png
diff --git a/default_images/res/lxh03206.png b/ooo_custom_images/hicontrast/res/lx03206.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03206.png
+++ b/ooo_custom_images/hicontrast/res/lx03206.png
diff --git a/default_images/res/lxh03214.png b/ooo_custom_images/hicontrast/res/lx03214.png
index b794fd882004..b794fd882004 100644
--- a/default_images/res/lxh03214.png
+++ b/ooo_custom_images/hicontrast/res/lx03214.png
diff --git a/default_images/res/lxh03216.png b/ooo_custom_images/hicontrast/res/lx03216.png
index 58180abe41fe..58180abe41fe 100644
--- a/default_images/res/lxh03216.png
+++ b/ooo_custom_images/hicontrast/res/lx03216.png
diff --git a/default_images/res/lxh03217.png b/ooo_custom_images/hicontrast/res/lx03217.png
index 19dbaf313555..19dbaf313555 100644
--- a/default_images/res/lxh03217.png
+++ b/ooo_custom_images/hicontrast/res/lx03217.png
diff --git a/default_images/res/lxh03218.png b/ooo_custom_images/hicontrast/res/lx03218.png
index 7a942b953b16..7a942b953b16 100644
--- a/default_images/res/lxh03218.png
+++ b/ooo_custom_images/hicontrast/res/lx03218.png
diff --git a/default_images/res/lxh03219.png b/ooo_custom_images/hicontrast/res/lx03219.png
index 7919ac3c4c53..7919ac3c4c53 100644
--- a/default_images/res/lxh03219.png
+++ b/ooo_custom_images/hicontrast/res/lx03219.png
diff --git a/default_images/res/lxh03220.png b/ooo_custom_images/hicontrast/res/lx03220.png
index da28333e5367..da28333e5367 100644
--- a/default_images/res/lxh03220.png
+++ b/ooo_custom_images/hicontrast/res/lx03220.png
diff --git a/default_images/res/lxh03221.png b/ooo_custom_images/hicontrast/res/lx03221.png
index 99491b0d6c00..99491b0d6c00 100644
--- a/default_images/res/lxh03221.png
+++ b/ooo_custom_images/hicontrast/res/lx03221.png
diff --git a/default_images/res/lxh03222.png b/ooo_custom_images/hicontrast/res/lx03222.png
index dec73f475f8f..dec73f475f8f 100644
--- a/default_images/res/lxh03222.png
+++ b/ooo_custom_images/hicontrast/res/lx03222.png
diff --git a/default_images/res/lxh03226.png b/ooo_custom_images/hicontrast/res/lx03226.png
index db16956adf16..db16956adf16 100644
--- a/default_images/res/lxh03226.png
+++ b/ooo_custom_images/hicontrast/res/lx03226.png
diff --git a/default_images/res/lxh03227.png b/ooo_custom_images/hicontrast/res/lx03227.png
index f1498dc5d0d9..f1498dc5d0d9 100644
--- a/default_images/res/lxh03227.png
+++ b/ooo_custom_images/hicontrast/res/lx03227.png
diff --git a/default_images/res/lxh03228.png b/ooo_custom_images/hicontrast/res/lx03228.png
index 9238184268b4..9238184268b4 100644
--- a/default_images/res/lxh03228.png
+++ b/ooo_custom_images/hicontrast/res/lx03228.png
diff --git a/default_images/res/lxh03236.png b/ooo_custom_images/hicontrast/res/lx03236.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03236.png
+++ b/ooo_custom_images/hicontrast/res/lx03236.png
diff --git a/default_images/res/lxh03237.png b/ooo_custom_images/hicontrast/res/lx03237.png
index e96e85722c37..e96e85722c37 100644
--- a/default_images/res/lxh03237.png
+++ b/ooo_custom_images/hicontrast/res/lx03237.png
diff --git a/default_images/res/lxh03239.png b/ooo_custom_images/hicontrast/res/lx03239.png
index 5c4c415c44b9..5c4c415c44b9 100644
--- a/default_images/res/lxh03239.png
+++ b/ooo_custom_images/hicontrast/res/lx03239.png
diff --git a/default_images/res/lxh03241.png b/ooo_custom_images/hicontrast/res/lx03241.png
index 6795eee8dd0f..6795eee8dd0f 100644
--- a/default_images/res/lxh03241.png
+++ b/ooo_custom_images/hicontrast/res/lx03241.png
diff --git a/default_images/res/lxh03242.png b/ooo_custom_images/hicontrast/res/lx03242.png
index a6c8bb645ca6..a6c8bb645ca6 100644
--- a/default_images/res/lxh03242.png
+++ b/ooo_custom_images/hicontrast/res/lx03242.png
diff --git a/default_images/res/lxh03243.png b/ooo_custom_images/hicontrast/res/lx03243.png
index 6e447ae9b2f9..6e447ae9b2f9 100644
--- a/default_images/res/lxh03243.png
+++ b/ooo_custom_images/hicontrast/res/lx03243.png
diff --git a/default_images/res/lxh03244.png b/ooo_custom_images/hicontrast/res/lx03244.png
index 5b7625c855c7..5b7625c855c7 100644
--- a/default_images/res/lxh03244.png
+++ b/ooo_custom_images/hicontrast/res/lx03244.png
diff --git a/default_images/res/lxh03245.png b/ooo_custom_images/hicontrast/res/lx03245.png
index 8b58b0694dc8..8b58b0694dc8 100644
--- a/default_images/res/lxh03245.png
+++ b/ooo_custom_images/hicontrast/res/lx03245.png
diff --git a/default_images/res/lxh03246.png b/ooo_custom_images/hicontrast/res/lx03246.png
index a1c970d06c03..a1c970d06c03 100644
--- a/default_images/res/lxh03246.png
+++ b/ooo_custom_images/hicontrast/res/lx03246.png
diff --git a/default_images/res/lxh03247.png b/ooo_custom_images/hicontrast/res/lx03247.png
index 7ed24c92c6b9..7ed24c92c6b9 100644
--- a/default_images/res/lxh03247.png
+++ b/ooo_custom_images/hicontrast/res/lx03247.png
diff --git a/default_images/res/lxh03248.png b/ooo_custom_images/hicontrast/res/lx03248.png
index 094141626cb3..094141626cb3 100644
--- a/default_images/res/lxh03248.png
+++ b/ooo_custom_images/hicontrast/res/lx03248.png
diff --git a/default_images/res/lxh03249.png b/ooo_custom_images/hicontrast/res/lx03249.png
index 7b5b405da531..7b5b405da531 100644
--- a/default_images/res/lxh03249.png
+++ b/ooo_custom_images/hicontrast/res/lx03249.png
diff --git a/default_images/res/lxh03250.png b/ooo_custom_images/hicontrast/res/lx03250.png
index 51f8f41b02e8..51f8f41b02e8 100644
--- a/default_images/res/lxh03250.png
+++ b/ooo_custom_images/hicontrast/res/lx03250.png
diff --git a/default_images/res/lxh03251.png b/ooo_custom_images/hicontrast/res/lx03251.png
index d3172e389e9e..d3172e389e9e 100644
--- a/default_images/res/lxh03251.png
+++ b/ooo_custom_images/hicontrast/res/lx03251.png
diff --git a/default_images/res/lxh03252.png b/ooo_custom_images/hicontrast/res/lx03252.png
index b9a4537e6e38..b9a4537e6e38 100644
--- a/default_images/res/lxh03252.png
+++ b/ooo_custom_images/hicontrast/res/lx03252.png
diff --git a/default_images/res/lxh03253.png b/ooo_custom_images/hicontrast/res/lx03253.png
index ac03af3dcb75..ac03af3dcb75 100644
--- a/default_images/res/lxh03253.png
+++ b/ooo_custom_images/hicontrast/res/lx03253.png
diff --git a/default_images/res/lxh03254.png b/ooo_custom_images/hicontrast/res/lx03254.png
index b0b631430966..b0b631430966 100644
--- a/default_images/res/lxh03254.png
+++ b/ooo_custom_images/hicontrast/res/lx03254.png
diff --git a/default_images/res/lxh03255.png b/ooo_custom_images/hicontrast/res/lx03255.png
index 12313d75cf40..12313d75cf40 100644
--- a/default_images/res/lxh03255.png
+++ b/ooo_custom_images/hicontrast/res/lx03255.png
diff --git a/default_images/res/lxh03256.png b/ooo_custom_images/hicontrast/res/lx03256.png
index 9cc0dbd34631..9cc0dbd34631 100644
--- a/default_images/res/lxh03256.png
+++ b/ooo_custom_images/hicontrast/res/lx03256.png
diff --git a/default_images/res/mainapp_16_h.png b/ooo_custom_images/hicontrast/res/mainapp_16.png
index 5484fe9bf009..5484fe9bf009 100644
--- a/default_images/res/mainapp_16_h.png
+++ b/ooo_custom_images/hicontrast/res/mainapp_16.png
diff --git a/default_images/res/mainapp_32_h.png b/ooo_custom_images/hicontrast/res/mainapp_32.png
index 3dc3057f7d0c..3dc3057f7d0c 100644
--- a/default_images/res/mainapp_32_h.png
+++ b/ooo_custom_images/hicontrast/res/mainapp_32.png
diff --git a/default_images/res/minus_sch.png b/ooo_custom_images/hicontrast/res/minus.png
index a20fa183ab01..a20fa183ab01 100644
--- a/default_images/res/minus_sch.png
+++ b/ooo_custom_images/hicontrast/res/minus.png
diff --git a/default_images/res/newdoc_hc.png b/ooo_custom_images/hicontrast/res/newdoc.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/newdoc_hc.png
+++ b/ooo_custom_images/hicontrast/res/newdoc.png
diff --git a/default_images/res/odb_32_hc.png b/ooo_custom_images/hicontrast/res/odb_32.png
index 3877231f0df2..3877231f0df2 100644
--- a/default_images/res/odb_32_hc.png
+++ b/ooo_custom_images/hicontrast/res/odb_32.png
diff --git a/default_images/res/odf_32_hc.png b/ooo_custom_images/hicontrast/res/odf_32.png
index 54e97b0ea56e..54e97b0ea56e 100644
--- a/default_images/res/odf_32_hc.png
+++ b/ooo_custom_images/hicontrast/res/odf_32.png
diff --git a/default_images/res/odg_32_hc.png b/ooo_custom_images/hicontrast/res/odg_32.png
index 2679e6e07e23..2679e6e07e23 100644
--- a/default_images/res/odg_32_hc.png
+++ b/ooo_custom_images/hicontrast/res/odg_32.png
diff --git a/default_images/res/odp_32_hc.png b/ooo_custom_images/hicontrast/res/odp_32.png
index e7d63630d207..e7d63630d207 100644
--- a/default_images/res/odp_32_hc.png
+++ b/ooo_custom_images/hicontrast/res/odp_32.png
diff --git a/default_images/res/ods_32_hc.png b/ooo_custom_images/hicontrast/res/ods_32.png
index 0a3e2b848fb3..0a3e2b848fb3 100644
--- a/default_images/res/ods_32_hc.png
+++ b/ooo_custom_images/hicontrast/res/ods_32.png
diff --git a/default_images/res/odt_32_hc.png b/ooo_custom_images/hicontrast/res/odt_32.png
index 294314778c07..294314778c07 100644
--- a/default_images/res/odt_32_hc.png
+++ b/ooo_custom_images/hicontrast/res/odt_32.png
diff --git a/default_images/res/plus_sch.png b/ooo_custom_images/hicontrast/res/plus.png
index d4a66c91a2cc..d4a66c91a2cc 100644
--- a/default_images/res/plus_sch.png
+++ b/ooo_custom_images/hicontrast/res/plus.png
diff --git a/default_images/res/printeradmin_16_h.png b/ooo_custom_images/hicontrast/res/printeradmin_16.png
index 4d56118df34c..4d56118df34c 100644
--- a/default_images/res/printeradmin_16_h.png
+++ b/ooo_custom_images/hicontrast/res/printeradmin_16.png
diff --git a/default_images/res/printeradmin_32_h.png b/ooo_custom_images/hicontrast/res/printeradmin_32.png
index 101c035397ee..101c035397ee 100644
--- a/default_images/res/printeradmin_32_h.png
+++ b/ooo_custom_images/hicontrast/res/printeradmin_32.png
diff --git a/default_images/res/puzzlefolder_16_h.png b/ooo_custom_images/hicontrast/res/puzzlefolder_16.png
index bd3e94190d8c..bd3e94190d8c 100644
--- a/default_images/res/puzzlefolder_16_h.png
+++ b/ooo_custom_images/hicontrast/res/puzzlefolder_16.png
diff --git a/default_images/res/puzzleslice_16_h.png b/ooo_custom_images/hicontrast/res/puzzleslice_16.png
index 016e02b57e31..016e02b57e31 100644
--- a/default_images/res/puzzleslice_16_h.png
+++ b/ooo_custom_images/hicontrast/res/puzzleslice_16.png
diff --git a/default_images/res/sch05500.png b/ooo_custom_images/hicontrast/res/sc05500.png
index 5bfbfbab68a5..5bfbfbab68a5 100644
--- a/default_images/res/sch05500.png
+++ b/ooo_custom_images/hicontrast/res/sc05500.png
diff --git a/default_images/res/sch05501.png b/ooo_custom_images/hicontrast/res/sc05501.png
index 892919bfea2a..892919bfea2a 100644
--- a/default_images/res/sch05501.png
+++ b/ooo_custom_images/hicontrast/res/sc05501.png
diff --git a/default_images/res/sch05502.png b/ooo_custom_images/hicontrast/res/sc05502.png
index b8914b52f420..b8914b52f420 100644
--- a/default_images/res/sch05502.png
+++ b/ooo_custom_images/hicontrast/res/sc05502.png
diff --git a/default_images/res/sch05504.png b/ooo_custom_images/hicontrast/res/sc05504.png
index 5cce110f5b2d..5cce110f5b2d 100644
--- a/default_images/res/sch05504.png
+++ b/ooo_custom_images/hicontrast/res/sc05504.png
diff --git a/default_images/res/sch05509.png b/ooo_custom_images/hicontrast/res/sc05509.png
index b1f09113b22d..b1f09113b22d 100644
--- a/default_images/res/sch05509.png
+++ b/ooo_custom_images/hicontrast/res/sc05509.png
diff --git a/default_images/res/sch05554.png b/ooo_custom_images/hicontrast/res/sc05554.png
index a906bf051dfc..a906bf051dfc 100644
--- a/default_images/res/sch05554.png
+++ b/ooo_custom_images/hicontrast/res/sc05554.png
diff --git a/default_images/res/sch05555.png b/ooo_custom_images/hicontrast/res/sc05555.png
index abeee403b0e4..abeee403b0e4 100644
--- a/default_images/res/sch05555.png
+++ b/ooo_custom_images/hicontrast/res/sc05555.png
diff --git a/default_images/res/sch05556.png b/ooo_custom_images/hicontrast/res/sc05556.png
index f45b67dac599..f45b67dac599 100644
--- a/default_images/res/sch05556.png
+++ b/ooo_custom_images/hicontrast/res/sc05556.png
diff --git a/default_images/res/sch05678.png b/ooo_custom_images/hicontrast/res/sc05678.png
index 6fa73f9a1e4a..6fa73f9a1e4a 100644
--- a/default_images/res/sch05678.png
+++ b/ooo_custom_images/hicontrast/res/sc05678.png
diff --git a/default_images/res/sch05711.png b/ooo_custom_images/hicontrast/res/sc05711.png
index 82f4de6aff44..82f4de6aff44 100644
--- a/default_images/res/sch05711.png
+++ b/ooo_custom_images/hicontrast/res/sc05711.png
diff --git a/default_images/res/sch05961.png b/ooo_custom_images/hicontrast/res/sc05961.png
index c2fe0194c2c4..c2fe0194c2c4 100644
--- a/default_images/res/sch05961.png
+++ b/ooo_custom_images/hicontrast/res/sc05961.png
diff --git a/default_images/res/sch06300.png b/ooo_custom_images/hicontrast/res/sc06300.png
index 2aa913553c1d..2aa913553c1d 100644
--- a/default_images/res/sch06300.png
+++ b/ooo_custom_images/hicontrast/res/sc06300.png
diff --git a/default_images/res/sch06301.png b/ooo_custom_images/hicontrast/res/sc06301.png
index db2aa7073722..db2aa7073722 100644
--- a/default_images/res/sch06301.png
+++ b/ooo_custom_images/hicontrast/res/sc06301.png
diff --git a/default_images/res/sch06303.png b/ooo_custom_images/hicontrast/res/sc06303.png
index 5ca40188c7bf..5ca40188c7bf 100644
--- a/default_images/res/sch06303.png
+++ b/ooo_custom_images/hicontrast/res/sc06303.png
diff --git a/default_images/res/sch06308.png b/ooo_custom_images/hicontrast/res/sc06308.png
index dcedb85cce8f..dcedb85cce8f 100644
--- a/default_images/res/sch06308.png
+++ b/ooo_custom_images/hicontrast/res/sc06308.png
diff --git a/default_images/res/sch10243.png b/ooo_custom_images/hicontrast/res/sc10243.png
index fcec57ac8b23..fcec57ac8b23 100644
--- a/default_images/res/sch10243.png
+++ b/ooo_custom_images/hicontrast/res/sc10243.png
diff --git a/default_images/res/sch10711.png b/ooo_custom_images/hicontrast/res/sc10711.png
index 556ab0a797e5..556ab0a797e5 100644
--- a/default_images/res/sch10711.png
+++ b/ooo_custom_images/hicontrast/res/sc10711.png
diff --git a/default_images/res/sch10712.png b/ooo_custom_images/hicontrast/res/sc10712.png
index 073c0211776e..073c0211776e 100644
--- a/default_images/res/sch10712.png
+++ b/ooo_custom_images/hicontrast/res/sc10712.png
diff --git a/default_images/res/sch10713.png b/ooo_custom_images/hicontrast/res/sc10713.png
index a17572d8bbc2..a17572d8bbc2 100644
--- a/default_images/res/sch10713.png
+++ b/ooo_custom_images/hicontrast/res/sc10713.png
diff --git a/default_images/res/sch10715.png b/ooo_custom_images/hicontrast/res/sc10715.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/sch10715.png
+++ b/ooo_custom_images/hicontrast/res/sc10715.png
diff --git a/default_images/res/sch10716.png b/ooo_custom_images/hicontrast/res/sc10716.png
index 3ce7fb050f27..3ce7fb050f27 100644
--- a/default_images/res/sch10716.png
+++ b/ooo_custom_images/hicontrast/res/sc10716.png
diff --git a/default_images/res/sch10851.png b/ooo_custom_images/hicontrast/res/sc10851.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/res/sch10851.png
+++ b/ooo_custom_images/hicontrast/res/sc10851.png
diff --git a/default_images/res/sch10853.png b/ooo_custom_images/hicontrast/res/sc10853.png
index 0daef3676afb..0daef3676afb 100644
--- a/default_images/res/sch10853.png
+++ b/ooo_custom_images/hicontrast/res/sc10853.png
diff --git a/default_images/res/sch10854.png b/ooo_custom_images/hicontrast/res/sc10854.png
index af74230d313b..af74230d313b 100644
--- a/default_images/res/sch10854.png
+++ b/ooo_custom_images/hicontrast/res/sc10854.png
diff --git a/default_images/res/sch10863.png b/ooo_custom_images/hicontrast/res/sc10863.png
index 7ab7fae22af5..7ab7fae22af5 100644
--- a/default_images/res/sch10863.png
+++ b/ooo_custom_images/hicontrast/res/sc10863.png
diff --git a/default_images/res/sch10864.png b/ooo_custom_images/hicontrast/res/sc10864.png
index f5ba83f51d5b..f5ba83f51d5b 100644
--- a/default_images/res/sch10864.png
+++ b/ooo_custom_images/hicontrast/res/sc10864.png
diff --git a/default_images/res/sch10865.png b/ooo_custom_images/hicontrast/res/sc10865.png
index 9ce2ecd5ed18..9ce2ecd5ed18 100644
--- a/default_images/res/sch10865.png
+++ b/ooo_custom_images/hicontrast/res/sc10865.png
diff --git a/default_images/res/sch10866.png b/ooo_custom_images/hicontrast/res/sc10866.png
index f92832a860f0..f92832a860f0 100644
--- a/default_images/res/sch10866.png
+++ b/ooo_custom_images/hicontrast/res/sc10866.png
diff --git a/default_images/res/sch10867.png b/ooo_custom_images/hicontrast/res/sc10867.png
index f47fb44406b7..f47fb44406b7 100644
--- a/default_images/res/sch10867.png
+++ b/ooo_custom_images/hicontrast/res/sc10867.png
diff --git a/default_images/res/sch10868.png b/ooo_custom_images/hicontrast/res/sc10868.png
index 6963c334275c..6963c334275c 100644
--- a/default_images/res/sch10868.png
+++ b/ooo_custom_images/hicontrast/res/sc10868.png
diff --git a/default_images/res/sch10869.png b/ooo_custom_images/hicontrast/res/sc10869.png
index 838ac1be530b..838ac1be530b 100644
--- a/default_images/res/sch10869.png
+++ b/ooo_custom_images/hicontrast/res/sc10869.png
diff --git a/default_images/res/script_hc.png b/ooo_custom_images/hicontrast/res/script.png
index 8568c06a0c53..8568c06a0c53 100644
--- a/default_images/res/script_hc.png
+++ b/ooo_custom_images/hicontrast/res/script.png
diff --git a/default_images/res/sxh03123.png b/ooo_custom_images/hicontrast/res/sx03123.png
index 16da0e46ae28..16da0e46ae28 100644
--- a/default_images/res/sxh03123.png
+++ b/ooo_custom_images/hicontrast/res/sx03123.png
diff --git a/default_images/res/sxh03124.png b/ooo_custom_images/hicontrast/res/sx03124.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03124.png
+++ b/ooo_custom_images/hicontrast/res/sx03124.png
diff --git a/default_images/res/sxh03125.png b/ooo_custom_images/hicontrast/res/sx03125.png
index 7bc8dc757f24..7bc8dc757f24 100644
--- a/default_images/res/sxh03125.png
+++ b/ooo_custom_images/hicontrast/res/sx03125.png
diff --git a/default_images/res/sxh03126.png b/ooo_custom_images/hicontrast/res/sx03126.png
index a35bf77dd73b..a35bf77dd73b 100644
--- a/default_images/res/sxh03126.png
+++ b/ooo_custom_images/hicontrast/res/sx03126.png
diff --git a/default_images/res/sxh03127.png b/ooo_custom_images/hicontrast/res/sx03127.png
index 7f9e73b1a407..7f9e73b1a407 100644
--- a/default_images/res/sxh03127.png
+++ b/ooo_custom_images/hicontrast/res/sx03127.png
diff --git a/default_images/res/sxh03128.png b/ooo_custom_images/hicontrast/res/sx03128.png
index 7e6ecb41db6f..7e6ecb41db6f 100644
--- a/default_images/res/sxh03128.png
+++ b/ooo_custom_images/hicontrast/res/sx03128.png
diff --git a/default_images/res/sxh03129.png b/ooo_custom_images/hicontrast/res/sx03129.png
index 54bcfc3a5043..54bcfc3a5043 100644
--- a/default_images/res/sxh03129.png
+++ b/ooo_custom_images/hicontrast/res/sx03129.png
diff --git a/default_images/res/sxh03130.png b/ooo_custom_images/hicontrast/res/sx03130.png
index ec0da4bf920e..ec0da4bf920e 100644
--- a/default_images/res/sxh03130.png
+++ b/ooo_custom_images/hicontrast/res/sx03130.png
diff --git a/default_images/res/sxh03131.png b/ooo_custom_images/hicontrast/res/sx03131.png
index 7f9e73b1a407..7f9e73b1a407 100644
--- a/default_images/res/sxh03131.png
+++ b/ooo_custom_images/hicontrast/res/sx03131.png
diff --git a/default_images/res/sxh03132.png b/ooo_custom_images/hicontrast/res/sx03132.png
index 7f9e73b1a407..7f9e73b1a407 100644
--- a/default_images/res/sxh03132.png
+++ b/ooo_custom_images/hicontrast/res/sx03132.png
diff --git a/default_images/res/sxh03134.png b/ooo_custom_images/hicontrast/res/sx03134.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03134.png
+++ b/ooo_custom_images/hicontrast/res/sx03134.png
diff --git a/default_images/res/sxh03135.png b/ooo_custom_images/hicontrast/res/sx03135.png
index 08bac2452829..08bac2452829 100644
--- a/default_images/res/sxh03135.png
+++ b/ooo_custom_images/hicontrast/res/sx03135.png
diff --git a/default_images/res/sxh03136.png b/ooo_custom_images/hicontrast/res/sx03136.png
index 898f239854c7..898f239854c7 100644
--- a/default_images/res/sxh03136.png
+++ b/ooo_custom_images/hicontrast/res/sx03136.png
diff --git a/default_images/res/sxh03137.png b/ooo_custom_images/hicontrast/res/sx03137.png
index aadd7e1507c6..aadd7e1507c6 100644
--- a/default_images/res/sxh03137.png
+++ b/ooo_custom_images/hicontrast/res/sx03137.png
diff --git a/default_images/res/sxh03138.png b/ooo_custom_images/hicontrast/res/sx03138.png
index 2103c7b100f7..2103c7b100f7 100644
--- a/default_images/res/sxh03138.png
+++ b/ooo_custom_images/hicontrast/res/sx03138.png
diff --git a/default_images/res/sxh03139.png b/ooo_custom_images/hicontrast/res/sx03139.png
index e205d578eb87..e205d578eb87 100644
--- a/default_images/res/sxh03139.png
+++ b/ooo_custom_images/hicontrast/res/sx03139.png
diff --git a/default_images/res/sxh03140.png b/ooo_custom_images/hicontrast/res/sx03140.png
index 2d59aca65a81..2d59aca65a81 100644
--- a/default_images/res/sxh03140.png
+++ b/ooo_custom_images/hicontrast/res/sx03140.png
diff --git a/default_images/res/sxh03141.png b/ooo_custom_images/hicontrast/res/sx03141.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/sxh03141.png
+++ b/ooo_custom_images/hicontrast/res/sx03141.png
diff --git a/default_images/res/sxh03142.png b/ooo_custom_images/hicontrast/res/sx03142.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03142.png
+++ b/ooo_custom_images/hicontrast/res/sx03142.png
diff --git a/default_images/res/sxh03144.png b/ooo_custom_images/hicontrast/res/sx03144.png
index 06fd33d4a1a2..06fd33d4a1a2 100644
--- a/default_images/res/sxh03144.png
+++ b/ooo_custom_images/hicontrast/res/sx03144.png
diff --git a/default_images/res/sxh03145.png b/ooo_custom_images/hicontrast/res/sx03145.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03145.png
+++ b/ooo_custom_images/hicontrast/res/sx03145.png
diff --git a/default_images/res/sxh03150.png b/ooo_custom_images/hicontrast/res/sx03150.png
index 7e6ecb41db6f..7e6ecb41db6f 100644
--- a/default_images/res/sxh03150.png
+++ b/ooo_custom_images/hicontrast/res/sx03150.png
diff --git a/default_images/res/sxh03151.png b/ooo_custom_images/hicontrast/res/sx03151.png
index 91189012500c..91189012500c 100644
--- a/default_images/res/sxh03151.png
+++ b/ooo_custom_images/hicontrast/res/sx03151.png
diff --git a/default_images/res/sxh03152.png b/ooo_custom_images/hicontrast/res/sx03152.png
index abaa93fe64cf..abaa93fe64cf 100644
--- a/default_images/res/sxh03152.png
+++ b/ooo_custom_images/hicontrast/res/sx03152.png
diff --git a/default_images/res/sxh03153.png b/ooo_custom_images/hicontrast/res/sx03153.png
index f9a52c2fb1b7..f9a52c2fb1b7 100644
--- a/default_images/res/sxh03153.png
+++ b/ooo_custom_images/hicontrast/res/sx03153.png
diff --git a/default_images/res/sxh03154.png b/ooo_custom_images/hicontrast/res/sx03154.png
index 79c74739139b..79c74739139b 100644
--- a/default_images/res/sxh03154.png
+++ b/ooo_custom_images/hicontrast/res/sx03154.png
diff --git a/default_images/res/sxh03155.png b/ooo_custom_images/hicontrast/res/sx03155.png
index c5eb49696af6..c5eb49696af6 100644
--- a/default_images/res/sxh03155.png
+++ b/ooo_custom_images/hicontrast/res/sx03155.png
diff --git a/default_images/res/sxh03156.png b/ooo_custom_images/hicontrast/res/sx03156.png
index 8467c77eeef9..8467c77eeef9 100644
--- a/default_images/res/sxh03156.png
+++ b/ooo_custom_images/hicontrast/res/sx03156.png
diff --git a/default_images/res/sxh03157.png b/ooo_custom_images/hicontrast/res/sx03157.png
index 90cb102945e6..90cb102945e6 100644
--- a/default_images/res/sxh03157.png
+++ b/ooo_custom_images/hicontrast/res/sx03157.png
diff --git a/default_images/res/sxh03158.png b/ooo_custom_images/hicontrast/res/sx03158.png
index d82fba78f187..d82fba78f187 100644
--- a/default_images/res/sxh03158.png
+++ b/ooo_custom_images/hicontrast/res/sx03158.png
diff --git a/default_images/res/sxh03159.png b/ooo_custom_images/hicontrast/res/sx03159.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03159.png
+++ b/ooo_custom_images/hicontrast/res/sx03159.png
diff --git a/default_images/res/sxh03160.png b/ooo_custom_images/hicontrast/res/sx03160.png
index 3996bb6beeb3..3996bb6beeb3 100644
--- a/default_images/res/sxh03160.png
+++ b/ooo_custom_images/hicontrast/res/sx03160.png
diff --git a/default_images/res/sxh03161.png b/ooo_custom_images/hicontrast/res/sx03161.png
index 38c433e65845..38c433e65845 100644
--- a/default_images/res/sxh03161.png
+++ b/ooo_custom_images/hicontrast/res/sx03161.png
diff --git a/default_images/res/sxh03162.png b/ooo_custom_images/hicontrast/res/sx03162.png
index 148a3e35b9a1..148a3e35b9a1 100644
--- a/default_images/res/sxh03162.png
+++ b/ooo_custom_images/hicontrast/res/sx03162.png
diff --git a/default_images/res/sxh03163.png b/ooo_custom_images/hicontrast/res/sx03163.png
index 6685e61d0134..6685e61d0134 100644
--- a/default_images/res/sxh03163.png
+++ b/ooo_custom_images/hicontrast/res/sx03163.png
diff --git a/default_images/res/sxh03164.png b/ooo_custom_images/hicontrast/res/sx03164.png
index 324def54b850..324def54b850 100644
--- a/default_images/res/sxh03164.png
+++ b/ooo_custom_images/hicontrast/res/sx03164.png
diff --git a/default_images/res/sxh03165.png b/ooo_custom_images/hicontrast/res/sx03165.png
index 61ed67048848..61ed67048848 100644
--- a/default_images/res/sxh03165.png
+++ b/ooo_custom_images/hicontrast/res/sx03165.png
diff --git a/default_images/res/sxh03166.png b/ooo_custom_images/hicontrast/res/sx03166.png
index 5c4752a2c4c6..5c4752a2c4c6 100644
--- a/default_images/res/sxh03166.png
+++ b/ooo_custom_images/hicontrast/res/sx03166.png
diff --git a/default_images/res/sxh03167.png b/ooo_custom_images/hicontrast/res/sx03167.png
index 4e764ea901f7..4e764ea901f7 100644
--- a/default_images/res/sxh03167.png
+++ b/ooo_custom_images/hicontrast/res/sx03167.png
diff --git a/default_images/res/sxh03168.png b/ooo_custom_images/hicontrast/res/sx03168.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03168.png
+++ b/ooo_custom_images/hicontrast/res/sx03168.png
diff --git a/default_images/res/sxh03187.png b/ooo_custom_images/hicontrast/res/sx03187.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03187.png
+++ b/ooo_custom_images/hicontrast/res/sx03187.png
diff --git a/default_images/res/sxh03188.png b/ooo_custom_images/hicontrast/res/sx03188.png
index 251e01464227..251e01464227 100644
--- a/default_images/res/sxh03188.png
+++ b/ooo_custom_images/hicontrast/res/sx03188.png
diff --git a/default_images/res/sxh03189.png b/ooo_custom_images/hicontrast/res/sx03189.png
index e654592864c5..e654592864c5 100644
--- a/default_images/res/sxh03189.png
+++ b/ooo_custom_images/hicontrast/res/sx03189.png
diff --git a/default_images/res/sxh03190.png b/ooo_custom_images/hicontrast/res/sx03190.png
index 20f79134336e..20f79134336e 100644
--- a/default_images/res/sxh03190.png
+++ b/ooo_custom_images/hicontrast/res/sx03190.png
diff --git a/default_images/res/sxh03193.png b/ooo_custom_images/hicontrast/res/sx03193.png
index fb9cec699e3d..fb9cec699e3d 100644
--- a/default_images/res/sxh03193.png
+++ b/ooo_custom_images/hicontrast/res/sx03193.png
diff --git a/default_images/res/sxh03198.png b/ooo_custom_images/hicontrast/res/sx03198.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03198.png
+++ b/ooo_custom_images/hicontrast/res/sx03198.png
diff --git a/default_images/res/sxh03201.png b/ooo_custom_images/hicontrast/res/sx03201.png
index c0de7947d437..c0de7947d437 100644
--- a/default_images/res/sxh03201.png
+++ b/ooo_custom_images/hicontrast/res/sx03201.png
diff --git a/default_images/res/sxh03202.png b/ooo_custom_images/hicontrast/res/sx03202.png
index 136ea6088fb0..136ea6088fb0 100644
--- a/default_images/res/sxh03202.png
+++ b/ooo_custom_images/hicontrast/res/sx03202.png
diff --git a/default_images/res/sxh03203.png b/ooo_custom_images/hicontrast/res/sx03203.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03203.png
+++ b/ooo_custom_images/hicontrast/res/sx03203.png
diff --git a/default_images/res/sxh03204.png b/ooo_custom_images/hicontrast/res/sx03204.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03204.png
+++ b/ooo_custom_images/hicontrast/res/sx03204.png
diff --git a/default_images/res/sxh03205.png b/ooo_custom_images/hicontrast/res/sx03205.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03205.png
+++ b/ooo_custom_images/hicontrast/res/sx03205.png
diff --git a/default_images/res/sxh03206.png b/ooo_custom_images/hicontrast/res/sx03206.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03206.png
+++ b/ooo_custom_images/hicontrast/res/sx03206.png
diff --git a/default_images/res/sxh03214.png b/ooo_custom_images/hicontrast/res/sx03214.png
index d08470ac6c0e..d08470ac6c0e 100644
--- a/default_images/res/sxh03214.png
+++ b/ooo_custom_images/hicontrast/res/sx03214.png
diff --git a/default_images/res/sxh03216.png b/ooo_custom_images/hicontrast/res/sx03216.png
index 6a2689d03ff4..6a2689d03ff4 100644
--- a/default_images/res/sxh03216.png
+++ b/ooo_custom_images/hicontrast/res/sx03216.png
diff --git a/default_images/res/sxh03217.png b/ooo_custom_images/hicontrast/res/sx03217.png
index d961aa76b7ff..d961aa76b7ff 100644
--- a/default_images/res/sxh03217.png
+++ b/ooo_custom_images/hicontrast/res/sx03217.png
diff --git a/default_images/res/sxh03218.png b/ooo_custom_images/hicontrast/res/sx03218.png
index 52a74031a2f4..52a74031a2f4 100644
--- a/default_images/res/sxh03218.png
+++ b/ooo_custom_images/hicontrast/res/sx03218.png
diff --git a/default_images/res/sxh03219.png b/ooo_custom_images/hicontrast/res/sx03219.png
index ffcdb941afc4..ffcdb941afc4 100644
--- a/default_images/res/sxh03219.png
+++ b/ooo_custom_images/hicontrast/res/sx03219.png
diff --git a/default_images/res/sxh03220.png b/ooo_custom_images/hicontrast/res/sx03220.png
index 0c253d383b4e..0c253d383b4e 100644
--- a/default_images/res/sxh03220.png
+++ b/ooo_custom_images/hicontrast/res/sx03220.png
diff --git a/default_images/res/sxh03221.png b/ooo_custom_images/hicontrast/res/sx03221.png
index 52a74031a2f4..52a74031a2f4 100644
--- a/default_images/res/sxh03221.png
+++ b/ooo_custom_images/hicontrast/res/sx03221.png
diff --git a/default_images/res/sxh03222.png b/ooo_custom_images/hicontrast/res/sx03222.png
index 52a74031a2f4..52a74031a2f4 100644
--- a/default_images/res/sxh03222.png
+++ b/ooo_custom_images/hicontrast/res/sx03222.png
diff --git a/default_images/res/sxh03226.png b/ooo_custom_images/hicontrast/res/sx03226.png
index b1ccfd9f6d47..b1ccfd9f6d47 100644
--- a/default_images/res/sxh03226.png
+++ b/ooo_custom_images/hicontrast/res/sx03226.png
diff --git a/default_images/res/sxh03227.png b/ooo_custom_images/hicontrast/res/sx03227.png
index 4f1830cae959..4f1830cae959 100644
--- a/default_images/res/sxh03227.png
+++ b/ooo_custom_images/hicontrast/res/sx03227.png
diff --git a/default_images/res/sxh03228.png b/ooo_custom_images/hicontrast/res/sx03228.png
index 4a85093c8428..4a85093c8428 100644
--- a/default_images/res/sxh03228.png
+++ b/ooo_custom_images/hicontrast/res/sx03228.png
diff --git a/default_images/res/sxh03236.png b/ooo_custom_images/hicontrast/res/sx03236.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03236.png
+++ b/ooo_custom_images/hicontrast/res/sx03236.png
diff --git a/default_images/res/sxh03237.png b/ooo_custom_images/hicontrast/res/sx03237.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh03237.png
+++ b/ooo_custom_images/hicontrast/res/sx03237.png
diff --git a/default_images/res/sxh03239.png b/ooo_custom_images/hicontrast/res/sx03239.png
index 4ef2e585ec38..4ef2e585ec38 100644
--- a/default_images/res/sxh03239.png
+++ b/ooo_custom_images/hicontrast/res/sx03239.png
diff --git a/default_images/res/sxh03241.png b/ooo_custom_images/hicontrast/res/sx03241.png
index c32d26971bbc..c32d26971bbc 100644
--- a/default_images/res/sxh03241.png
+++ b/ooo_custom_images/hicontrast/res/sx03241.png
diff --git a/default_images/res/sxh03242.png b/ooo_custom_images/hicontrast/res/sx03242.png
index e39095e7c572..e39095e7c572 100644
--- a/default_images/res/sxh03242.png
+++ b/ooo_custom_images/hicontrast/res/sx03242.png
diff --git a/default_images/res/sxh03243.png b/ooo_custom_images/hicontrast/res/sx03243.png
index 40cb18e02e31..40cb18e02e31 100644
--- a/default_images/res/sxh03243.png
+++ b/ooo_custom_images/hicontrast/res/sx03243.png
diff --git a/default_images/res/sxh03244.png b/ooo_custom_images/hicontrast/res/sx03244.png
index ec0da4bf920e..ec0da4bf920e 100644
--- a/default_images/res/sxh03244.png
+++ b/ooo_custom_images/hicontrast/res/sx03244.png
diff --git a/default_images/res/sxh03245.png b/ooo_custom_images/hicontrast/res/sx03245.png
index 71891164e16a..71891164e16a 100644
--- a/default_images/res/sxh03245.png
+++ b/ooo_custom_images/hicontrast/res/sx03245.png
diff --git a/default_images/res/sxh03246.png b/ooo_custom_images/hicontrast/res/sx03246.png
index 301f66df8344..301f66df8344 100644
--- a/default_images/res/sxh03246.png
+++ b/ooo_custom_images/hicontrast/res/sx03246.png
diff --git a/default_images/res/sxh03247.png b/ooo_custom_images/hicontrast/res/sx03247.png
index e9ab1ae12d31..e9ab1ae12d31 100644
--- a/default_images/res/sxh03247.png
+++ b/ooo_custom_images/hicontrast/res/sx03247.png
diff --git a/default_images/res/sxh03248.png b/ooo_custom_images/hicontrast/res/sx03248.png
index 1d242c98b1b4..1d242c98b1b4 100644
--- a/default_images/res/sxh03248.png
+++ b/ooo_custom_images/hicontrast/res/sx03248.png
diff --git a/default_images/res/sxh03249.png b/ooo_custom_images/hicontrast/res/sx03249.png
index a52d19c0e0d7..a52d19c0e0d7 100644
--- a/default_images/res/sxh03249.png
+++ b/ooo_custom_images/hicontrast/res/sx03249.png
diff --git a/default_images/res/sxh03250.png b/ooo_custom_images/hicontrast/res/sx03250.png
index 43bc76a45334..43bc76a45334 100644
--- a/default_images/res/sxh03250.png
+++ b/ooo_custom_images/hicontrast/res/sx03250.png
diff --git a/default_images/res/sxh03251.png b/ooo_custom_images/hicontrast/res/sx03251.png
index da481549fb97..da481549fb97 100644
--- a/default_images/res/sxh03251.png
+++ b/ooo_custom_images/hicontrast/res/sx03251.png
diff --git a/default_images/res/sxh03252.png b/ooo_custom_images/hicontrast/res/sx03252.png
index 7ac05d5d894d..7ac05d5d894d 100644
--- a/default_images/res/sxh03252.png
+++ b/ooo_custom_images/hicontrast/res/sx03252.png
diff --git a/default_images/res/sxh03253.png b/ooo_custom_images/hicontrast/res/sx03253.png
index 046f224cea0f..046f224cea0f 100644
--- a/default_images/res/sxh03253.png
+++ b/ooo_custom_images/hicontrast/res/sx03253.png
diff --git a/default_images/res/sxh03254.png b/ooo_custom_images/hicontrast/res/sx03254.png
index abebaa1ba92c..abebaa1ba92c 100644
--- a/default_images/res/sxh03254.png
+++ b/ooo_custom_images/hicontrast/res/sx03254.png
diff --git a/default_images/res/sxh03255.png b/ooo_custom_images/hicontrast/res/sx03255.png
index 808603278c55..808603278c55 100644
--- a/default_images/res/sxh03255.png
+++ b/ooo_custom_images/hicontrast/res/sx03255.png
diff --git a/default_images/res/sxh03256.png b/ooo_custom_images/hicontrast/res/sx03256.png
index f3482407569b..f3482407569b 100644
--- a/default_images/res/sxh03256.png
+++ b/ooo_custom_images/hicontrast/res/sx03256.png
diff --git a/default_images/res/sxh10144.png b/ooo_custom_images/hicontrast/res/sx10144.png
index 3ebfee988b89..3ebfee988b89 100644
--- a/default_images/res/sxh10144.png
+++ b/ooo_custom_images/hicontrast/res/sx10144.png
diff --git a/default_images/res/sxh10593.png b/ooo_custom_images/hicontrast/res/sx10593.png
index e6715d0d98de..e6715d0d98de 100644
--- a/default_images/res/sxh10593.png
+++ b/ooo_custom_images/hicontrast/res/sx10593.png
diff --git a/default_images/res/sxh10594.png b/ooo_custom_images/hicontrast/res/sx10594.png
index aa4bbb676cb3..aa4bbb676cb3 100644
--- a/default_images/res/sxh10594.png
+++ b/ooo_custom_images/hicontrast/res/sx10594.png
diff --git a/default_images/res/sxh10595.png b/ooo_custom_images/hicontrast/res/sx10595.png
index 99f93e556a22..99f93e556a22 100644
--- a/default_images/res/sxh10595.png
+++ b/ooo_custom_images/hicontrast/res/sx10595.png
diff --git a/default_images/res/sxh10596.png b/ooo_custom_images/hicontrast/res/sx10596.png
index 01be728c42da..01be728c42da 100644
--- a/default_images/res/sxh10596.png
+++ b/ooo_custom_images/hicontrast/res/sx10596.png
diff --git a/default_images/res/sxh10597.png b/ooo_custom_images/hicontrast/res/sx10597.png
index c84f1dcebfc6..c84f1dcebfc6 100644
--- a/default_images/res/sxh10597.png
+++ b/ooo_custom_images/hicontrast/res/sx10597.png
diff --git a/default_images/res/sxh10598.png b/ooo_custom_images/hicontrast/res/sx10598.png
index d8ffe4b9fa09..d8ffe4b9fa09 100644
--- a/default_images/res/sxh10598.png
+++ b/ooo_custom_images/hicontrast/res/sx10598.png
diff --git a/default_images/res/sxh10599.png b/ooo_custom_images/hicontrast/res/sx10599.png
index 6245ac512b79..6245ac512b79 100644
--- a/default_images/res/sxh10599.png
+++ b/ooo_custom_images/hicontrast/res/sx10599.png
diff --git a/default_images/res/sxh10600.png b/ooo_custom_images/hicontrast/res/sx10600.png
index 452f4a37056e..452f4a37056e 100644
--- a/default_images/res/sxh10600.png
+++ b/ooo_custom_images/hicontrast/res/sx10600.png
diff --git a/default_images/res/sxh10601.png b/ooo_custom_images/hicontrast/res/sx10601.png
index c1e49973f383..c1e49973f383 100644
--- a/default_images/res/sxh10601.png
+++ b/ooo_custom_images/hicontrast/res/sx10601.png
diff --git a/default_images/res/sxh10602.png b/ooo_custom_images/hicontrast/res/sx10602.png
index 82c928be5251..82c928be5251 100644
--- a/default_images/res/sxh10602.png
+++ b/ooo_custom_images/hicontrast/res/sx10602.png
diff --git a/default_images/res/sxh10603.png b/ooo_custom_images/hicontrast/res/sx10603.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/res/sxh10603.png
+++ b/ooo_custom_images/hicontrast/res/sx10603.png
diff --git a/default_images/res/sxh10604.png b/ooo_custom_images/hicontrast/res/sx10604.png
index 916f303d262b..916f303d262b 100644
--- a/default_images/res/sxh10604.png
+++ b/ooo_custom_images/hicontrast/res/sx10604.png
diff --git a/default_images/res/sxh10605.png b/ooo_custom_images/hicontrast/res/sx10605.png
index 724eb1248921..724eb1248921 100644
--- a/default_images/res/sxh10605.png
+++ b/ooo_custom_images/hicontrast/res/sx10605.png
diff --git a/default_images/res/sxh10607.png b/ooo_custom_images/hicontrast/res/sx10607.png
index 1a1e3ae314e0..1a1e3ae314e0 100644
--- a/default_images/res/sxh10607.png
+++ b/ooo_custom_images/hicontrast/res/sx10607.png
diff --git a/default_images/res/sxh10704.png b/ooo_custom_images/hicontrast/res/sx10704.png
index 510472b26937..510472b26937 100644
--- a/default_images/res/sxh10704.png
+++ b/ooo_custom_images/hicontrast/res/sx10704.png
diff --git a/default_images/res/sxh10705.png b/ooo_custom_images/hicontrast/res/sx10705.png
index 708642e6d7aa..708642e6d7aa 100644
--- a/default_images/res/sxh10705.png
+++ b/ooo_custom_images/hicontrast/res/sx10705.png
diff --git a/default_images/res/sxh10706.png b/ooo_custom_images/hicontrast/res/sx10706.png
index 4384a6e50bc0..4384a6e50bc0 100644
--- a/default_images/res/sxh10706.png
+++ b/ooo_custom_images/hicontrast/res/sx10706.png
diff --git a/default_images/res/sxh10707.png b/ooo_custom_images/hicontrast/res/sx10707.png
index 2dba4e459cc2..2dba4e459cc2 100644
--- a/default_images/res/sxh10707.png
+++ b/ooo_custom_images/hicontrast/res/sx10707.png
diff --git a/default_images/res/sxh10708.png b/ooo_custom_images/hicontrast/res/sx10708.png
index 90da08b232d6..90da08b232d6 100644
--- a/default_images/res/sxh10708.png
+++ b/ooo_custom_images/hicontrast/res/sx10708.png
diff --git a/default_images/res/sxh10710.png b/ooo_custom_images/hicontrast/res/sx10710.png
index 2ff8d27e41d2..2ff8d27e41d2 100644
--- a/default_images/res/sxh10710.png
+++ b/ooo_custom_images/hicontrast/res/sx10710.png
diff --git a/default_images/res/sxh10715.png b/ooo_custom_images/hicontrast/res/sx10715.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/res/sxh10715.png
+++ b/ooo_custom_images/hicontrast/res/sx10715.png
diff --git a/default_images/res/sxh10728.png b/ooo_custom_images/hicontrast/res/sx10728.png
index d546a44014a7..d546a44014a7 100644
--- a/default_images/res/sxh10728.png
+++ b/ooo_custom_images/hicontrast/res/sx10728.png
diff --git a/default_images/res/sxh10757.png b/ooo_custom_images/hicontrast/res/sx10757.png
index c4fb367d3a96..c4fb367d3a96 100644
--- a/default_images/res/sxh10757.png
+++ b/ooo_custom_images/hicontrast/res/sx10757.png
diff --git a/default_images/res/sxh10768.png b/ooo_custom_images/hicontrast/res/sx10768.png
index 79b3148cfd1c..79b3148cfd1c 100644
--- a/default_images/res/sxh10768.png
+++ b/ooo_custom_images/hicontrast/res/sx10768.png
diff --git a/default_images/res/sxh10769.png b/ooo_custom_images/hicontrast/res/sx10769.png
index 0c66e0d5d9be..0c66e0d5d9be 100644
--- a/default_images/res/sxh10769.png
+++ b/ooo_custom_images/hicontrast/res/sx10769.png
diff --git a/default_images/res/sxh18002.png b/ooo_custom_images/hicontrast/res/sx18002.png
index 32f5af831e0c..32f5af831e0c 100644
--- a/default_images/res/sxh18002.png
+++ b/ooo_custom_images/hicontrast/res/sx18002.png
diff --git a/default_images/res/sxh18003.png b/ooo_custom_images/hicontrast/res/sx18003.png
index cf0a8dcdcd40..cf0a8dcdcd40 100644
--- a/default_images/res/sxh18003.png
+++ b/ooo_custom_images/hicontrast/res/sx18003.png
diff --git a/default_images/res/sxh18013.png b/ooo_custom_images/hicontrast/res/sx18013.png
index a5a568c92ead..a5a568c92ead 100644
--- a/default_images/res/sxh18013.png
+++ b/ooo_custom_images/hicontrast/res/sx18013.png
diff --git a/default_images/res/sxh18022.png b/ooo_custom_images/hicontrast/res/sx18022.png
index 67019acccd76..67019acccd76 100644
--- a/default_images/res/sxh18022.png
+++ b/ooo_custom_images/hicontrast/res/sx18022.png
diff --git a/default_images/res/sxh18027.png b/ooo_custom_images/hicontrast/res/sx18027.png
index 0e35d8cb2279..0e35d8cb2279 100644
--- a/default_images/res/sxh18027.png
+++ b/ooo_custom_images/hicontrast/res/sx18027.png
diff --git a/default_images/res/target_hc.png b/ooo_custom_images/hicontrast/res/target.png
index 969566ad443d..969566ad443d 100644
--- a/default_images/res/target_hc.png
+++ b/ooo_custom_images/hicontrast/res/target.png
diff --git a/default_images/res/tbh01.png b/ooo_custom_images/hicontrast/res/tb01.png
index 850bdbaf5340..850bdbaf5340 100644
--- a/default_images/res/tbh01.png
+++ b/ooo_custom_images/hicontrast/res/tb01.png
diff --git a/default_images/res/tbh02.png b/ooo_custom_images/hicontrast/res/tb02.png
index f4854f2693fa..f4854f2693fa 100644
--- a/default_images/res/tbh02.png
+++ b/ooo_custom_images/hicontrast/res/tb02.png
diff --git a/default_images/res/tbh03.png b/ooo_custom_images/hicontrast/res/tb03.png
index 6b552364e341..6b552364e341 100644
--- a/default_images/res/tbh03.png
+++ b/ooo_custom_images/hicontrast/res/tb03.png
diff --git a/default_images/res/tbh04.png b/ooo_custom_images/hicontrast/res/tb04.png
index 327d364aaec1..327d364aaec1 100644
--- a/default_images/res/tbh04.png
+++ b/ooo_custom_images/hicontrast/res/tb04.png
diff --git a/default_images/res/tbh05.png b/ooo_custom_images/hicontrast/res/tb05.png
index b1109af26294..b1109af26294 100644
--- a/default_images/res/tbh05.png
+++ b/ooo_custom_images/hicontrast/res/tb05.png
diff --git a/default_images/res/xml_16_h.png b/ooo_custom_images/hicontrast/res/xml_16.png
index a68095ea0930..a68095ea0930 100644
--- a/default_images/res/xml_16_h.png
+++ b/ooo_custom_images/hicontrast/res/xml_16.png
diff --git a/default_images/sc/res/date_h.png b/ooo_custom_images/hicontrast/sc/res/date.png
index 6ec777afb886..6ec777afb886 100644
--- a/default_images/sc/res/date_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/date.png
diff --git a/default_images/sc/res/dropcopy_h.png b/ooo_custom_images/hicontrast/sc/res/dropcopy.png
index fcb9996b7ab5..fcb9996b7ab5 100644
--- a/default_images/sc/res/dropcopy_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/dropcopy.png
diff --git a/default_images/sc/res/droplink_h.png b/ooo_custom_images/hicontrast/sc/res/droplink.png
index 936eba564fa3..936eba564fa3 100644
--- a/default_images/sc/res/droplink_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/droplink.png
diff --git a/default_images/sc/res/dropurl_h.png b/ooo_custom_images/hicontrast/sc/res/dropurl.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/sc/res/dropurl_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/dropurl.png
diff --git a/default_images/sc/res/file_h.png b/ooo_custom_images/hicontrast/sc/res/file.png
index a9449999cdc1..a9449999cdc1 100644
--- a/default_images/sc/res/file_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/file.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26047.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26047.png
index 66e77d2a86b3..66e77d2a86b3 100644
--- a/default_images/sc/res/imglst/apptbx/lch26047.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26047.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26048.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26048.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/default_images/sc/res/imglst/apptbx/lch26048.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26048.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26049.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26049.png
index fb7b27eccd59..fb7b27eccd59 100644
--- a/default_images/sc/res/imglst/apptbx/lch26049.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26049.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26050.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26050.png
index ebc30c863090..ebc30c863090 100644
--- a/default_images/sc/res/imglst/apptbx/lch26050.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26050.png
diff --git a/default_images/sc/res/imglst/apptbx/lch26051.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26051.png
index a92a0a378a41..a92a0a378a41 100644
--- a/default_images/sc/res/imglst/apptbx/lch26051.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/lc26051.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26047.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26047.png
index 290af7ffc8b0..290af7ffc8b0 100644
--- a/default_images/sc/res/imglst/apptbx/sch26047.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26047.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26048.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26048.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/default_images/sc/res/imglst/apptbx/sch26048.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26048.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26049.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26049.png
index 1532063a0d1b..1532063a0d1b 100644
--- a/default_images/sc/res/imglst/apptbx/sch26049.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26049.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26050.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26050.png
index 1f5682a2f133..1f5682a2f133 100644
--- a/default_images/sc/res/imglst/apptbx/sch26050.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26050.png
diff --git a/default_images/sc/res/imglst/apptbx/sch26051.png b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26051.png
index 7b42f0a62b9f..7b42f0a62b9f 100644
--- a/default_images/sc/res/imglst/apptbx/sch26051.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/apptbx/sc26051.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh01.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou01.png
index 828e0876d892..828e0876d892 100644
--- a/default_images/sc/res/imglst/dbgui/ouh01.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou01.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh010.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou010.png
index 2429662b75dc..2429662b75dc 100644
--- a/default_images/sc/res/imglst/dbgui/ouh010.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou010.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh011.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou011.png
index bb26e4ed4a30..bb26e4ed4a30 100644
--- a/default_images/sc/res/imglst/dbgui/ouh011.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou011.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh012.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou012.png
index bb1a4037f545..bb1a4037f545 100644
--- a/default_images/sc/res/imglst/dbgui/ouh012.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou012.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh02.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou02.png
index e090266bca9e..e090266bca9e 100644
--- a/default_images/sc/res/imglst/dbgui/ouh02.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou02.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh03.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou03.png
index 2e7742e26ed7..2e7742e26ed7 100644
--- a/default_images/sc/res/imglst/dbgui/ouh03.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou03.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh04.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou04.png
index af3e313feae3..af3e313feae3 100644
--- a/default_images/sc/res/imglst/dbgui/ouh04.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou04.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh05.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou05.png
index 52500c8293f8..52500c8293f8 100644
--- a/default_images/sc/res/imglst/dbgui/ouh05.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou05.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh06.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou06.png
index f1cd41a40a6b..f1cd41a40a6b 100644
--- a/default_images/sc/res/imglst/dbgui/ouh06.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou06.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh07.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou07.png
index d4f3de17bad3..d4f3de17bad3 100644
--- a/default_images/sc/res/imglst/dbgui/ouh07.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou07.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh08.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou08.png
index 565bf55de3b1..565bf55de3b1 100644
--- a/default_images/sc/res/imglst/dbgui/ouh08.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou08.png
diff --git a/default_images/sc/res/imglst/dbgui/ouh09.png b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou09.png
index fd5b7f2e1d5f..fd5b7f2e1d5f 100644
--- a/default_images/sc/res/imglst/dbgui/ouh09.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/dbgui/ou09.png
diff --git a/default_images/sc/res/imglst/navipi/nah010.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na010.png
index 39536c030f77..39536c030f77 100644
--- a/default_images/sc/res/imglst/navipi/nah010.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na010.png
diff --git a/default_images/sc/res/imglst/navipi/nah011.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na011.png
index beff20a9a2e4..beff20a9a2e4 100644
--- a/default_images/sc/res/imglst/navipi/nah011.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na011.png
diff --git a/default_images/sc/res/imglst/navipi/nah03.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na03.png
index 544fe41fbbfc..544fe41fbbfc 100644
--- a/default_images/sc/res/imglst/navipi/nah03.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na03.png
diff --git a/default_images/sc/res/imglst/navipi/nah05.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na05.png
index a3fd98dc2a86..a3fd98dc2a86 100644
--- a/default_images/sc/res/imglst/navipi/nah05.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na05.png
diff --git a/default_images/sc/res/imglst/navipi/nah06.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na06.png
index 56ed07db53e8..56ed07db53e8 100644
--- a/default_images/sc/res/imglst/navipi/nah06.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na06.png
diff --git a/default_images/sc/res/imglst/navipi/nah07.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na07.png
index b496203797a4..b496203797a4 100644
--- a/default_images/sc/res/imglst/navipi/nah07.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na07.png
diff --git a/default_images/sc/res/imglst/navipi/nah09.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na09.png
index 41467754f389..41467754f389 100644
--- a/default_images/sc/res/imglst/navipi/nah09.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/na09.png
diff --git a/default_images/sc/res/imglst/navipi/nch01.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc01.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/sc/res/imglst/navipi/nch01.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc01.png
diff --git a/default_images/sc/res/imglst/navipi/nch02.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc02.png
index 4b3d4555147d..4b3d4555147d 100644
--- a/default_images/sc/res/imglst/navipi/nch02.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc02.png
diff --git a/default_images/sc/res/imglst/navipi/nch03.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc03.png
index 262a2edd0aa8..262a2edd0aa8 100644
--- a/default_images/sc/res/imglst/navipi/nch03.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc03.png
diff --git a/default_images/sc/res/imglst/navipi/nch04.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc04.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sc/res/imglst/navipi/nch04.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc04.png
diff --git a/default_images/sc/res/imglst/navipi/nch05.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc05.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/sc/res/imglst/navipi/nch05.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc05.png
diff --git a/default_images/sc/res/imglst/navipi/nch06.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc06.png
index 75a0c8721d62..75a0c8721d62 100644
--- a/default_images/sc/res/imglst/navipi/nch06.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc06.png
diff --git a/default_images/sc/res/imglst/navipi/nch07.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc07.png
index 936eba564fa3..936eba564fa3 100644
--- a/default_images/sc/res/imglst/navipi/nch07.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc07.png
diff --git a/default_images/sc/res/imglst/navipi/nch08.png b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc08.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sc/res/imglst/navipi/nch08.png
+++ b/ooo_custom_images/hicontrast/sc/res/imglst/navipi/nc08.png
diff --git a/default_images/sc/res/lftrgt_h.png b/ooo_custom_images/hicontrast/sc/res/lftrgt.png
index 3ab5ccefbdeb..3ab5ccefbdeb 100644
--- a/default_images/sc/res/lftrgt_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/lftrgt.png
diff --git a/default_images/sc/res/page_h.png b/ooo_custom_images/hicontrast/sc/res/page.png
index a7813fae900f..a7813fae900f 100644
--- a/default_images/sc/res/page_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/page.png
diff --git a/default_images/sc/res/pages_h.png b/ooo_custom_images/hicontrast/sc/res/pages.png
index ac0a649c359f..ac0a649c359f 100644
--- a/default_images/sc/res/pages_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/pages.png
diff --git a/default_images/sc/res/sfh01.png b/ooo_custom_images/hicontrast/sc/res/sf01.png
index 96c007578caa..96c007578caa 100644
--- a/default_images/sc/res/sfh01.png
+++ b/ooo_custom_images/hicontrast/sc/res/sf01.png
diff --git a/default_images/sc/res/sfh02.png b/ooo_custom_images/hicontrast/sc/res/sf02.png
index ed255cd5e2b7..ed255cd5e2b7 100644
--- a/default_images/sc/res/sfh02.png
+++ b/ooo_custom_images/hicontrast/sc/res/sf02.png
diff --git a/default_images/sc/res/table_h.png b/ooo_custom_images/hicontrast/sc/res/table.png
index f68f7ec2ca33..f68f7ec2ca33 100644
--- a/default_images/sc/res/table_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/table.png
diff --git a/default_images/sc/res/text_h.png b/ooo_custom_images/hicontrast/sc/res/text.png
index e3f522f6f288..e3f522f6f288 100644
--- a/default_images/sc/res/text_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/text.png
diff --git a/default_images/sc/res/time_h.png b/ooo_custom_images/hicontrast/sc/res/time.png
index d77324af0da1..d77324af0da1 100644
--- a/default_images/sc/res/time_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/time.png
diff --git a/default_images/sc/res/topdown_h.png b/ooo_custom_images/hicontrast/sc/res/topdown.png
index 6fa91592d3a7..6fa91592d3a7 100644
--- a/default_images/sc/res/topdown_h.png
+++ b/ooo_custom_images/hicontrast/sc/res/topdown.png
diff --git a/default_images/sd/res/breakplayingblue_16_h.png b/ooo_custom_images/hicontrast/sd/res/breakplayingblue_16.png
index d69978151d69..d69978151d69 100644
--- a/default_images/sd/res/breakplayingblue_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/breakplayingblue_16.png
diff --git a/default_images/sd/res/chkpage0_h.png b/ooo_custom_images/hicontrast/sd/res/chkpage0.png
index 8710e4c60a50..8710e4c60a50 100644
--- a/default_images/sd/res/chkpage0_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/chkpage0.png
diff --git a/default_images/sd/res/chkpage1_h.png b/ooo_custom_images/hicontrast/sd/res/chkpage1.png
index 04a4ee904644..04a4ee904644 100644
--- a/default_images/sd/res/chkpage1_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/chkpage1.png
diff --git a/default_images/sd/res/click_16_h.png b/ooo_custom_images/hicontrast/sd/res/click_16.png
index 24d6e8ec0831..24d6e8ec0831 100644
--- a/default_images/sd/res/click_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/click_16.png
diff --git a/default_images/sd/res/comments_indicator_hc.png b/ooo_custom_images/hicontrast/sd/res/comments_indicator.png
index 0467d1a47929..0467d1a47929 100644
--- a/default_images/sd/res/comments_indicator_hc.png
+++ b/ooo_custom_images/hicontrast/sd/res/comments_indicator.png
diff --git a/default_images/sd/res/del1bmp_h.png b/ooo_custom_images/hicontrast/sd/res/del1bmp.png
index 9322c9c2aadd..9322c9c2aadd 100644
--- a/default_images/sd/res/del1bmp_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/del1bmp.png
diff --git a/default_images/sd/res/delall_h.png b/ooo_custom_images/hicontrast/sd/res/delall.png
index 098bca92b8c9..098bca92b8c9 100644
--- a/default_images/sd/res/delall_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/delall.png
diff --git a/default_images/sd/res/docclose_h.png b/ooo_custom_images/hicontrast/sd/res/docclose.png
index b27e52476d2d..b27e52476d2d 100644
--- a/default_images/sd/res/docclose_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/docclose.png
diff --git a/default_images/sd/res/docopen_h.png b/ooo_custom_images/hicontrast/sd/res/docopen.png
index 5ddd51ea08dd..5ddd51ea08dd 100644
--- a/default_images/sd/res/docopen_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/docopen.png
diff --git a/default_images/sd/res/doctext_h.png b/ooo_custom_images/hicontrast/sd/res/doctext.png
index d454ed1e6a2b..d454ed1e6a2b 100644
--- a/default_images/sd/res/doctext_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/doctext.png
diff --git a/default_images/sd/res/effect_16_h.png b/ooo_custom_images/hicontrast/sd/res/effect_16.png
index 06a2f74a6a48..06a2f74a6a48 100644
--- a/default_images/sd/res/effect_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effect_16.png
diff --git a/default_images/sd/res/effectfade_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectfade_16.png
index a3d0ec186f32..a3d0ec186f32 100644
--- a/default_images/sd/res/effectfade_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectfade_16.png
diff --git a/default_images/sd/res/effectole_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectole_16.png
index a8342fb3edcb..a8342fb3edcb 100644
--- a/default_images/sd/res/effectole_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectole_16.png
diff --git a/default_images/sd/res/effectpath_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectpath_16.png
index 8b51aeea337c..8b51aeea337c 100644
--- a/default_images/sd/res/effectpath_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectpath_16.png
diff --git a/default_images/sd/res/effectshape_16_h.png b/ooo_custom_images/hicontrast/sd/res/effectshape_16.png
index 22833a3c1c77..22833a3c1c77 100644
--- a/default_images/sd/res/effectshape_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/effectshape_16.png
diff --git a/default_images/sd/res/fade_effect_indicator_hc.png b/ooo_custom_images/hicontrast/sd/res/fade_effect_indicator.png
index 9e0ba4f8782b..9e0ba4f8782b 100644
--- a/default_images/sd/res/fade_effect_indicator_hc.png
+++ b/ooo_custom_images/hicontrast/sd/res/fade_effect_indicator.png
diff --git a/default_images/sd/res/foilh01_h.png b/ooo_custom_images/hicontrast/sd/res/foilh01.png
index ea5dcb9711ed..ea5dcb9711ed 100644
--- a/default_images/sd/res/foilh01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh01.png
diff --git a/default_images/sd/res/foilh02_h.png b/ooo_custom_images/hicontrast/sd/res/foilh02.png
index 7ba79b77a728..7ba79b77a728 100644
--- a/default_images/sd/res/foilh02_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh02.png
diff --git a/default_images/sd/res/foilh03_h.png b/ooo_custom_images/hicontrast/sd/res/foilh03.png
index a67facb7d463..a67facb7d463 100644
--- a/default_images/sd/res/foilh03_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh03.png
diff --git a/default_images/sd/res/foilh04_h.png b/ooo_custom_images/hicontrast/sd/res/foilh04.png
index a73665d3164a..a73665d3164a 100644
--- a/default_images/sd/res/foilh04_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh04.png
diff --git a/default_images/sd/res/foilh06_h.png b/ooo_custom_images/hicontrast/sd/res/foilh06.png
index be98eea737f4..be98eea737f4 100644
--- a/default_images/sd/res/foilh06_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh06.png
diff --git a/default_images/sd/res/foilh09_h.png b/ooo_custom_images/hicontrast/sd/res/foilh09.png
index 9aa769cbb217..9aa769cbb217 100644
--- a/default_images/sd/res/foilh09_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foilh09.png
diff --git a/default_images/sd/res/foiln01_h.png b/ooo_custom_images/hicontrast/sd/res/foiln01.png
index fbac3c40e737..fbac3c40e737 100644
--- a/default_images/sd/res/foiln01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/foiln01.png
diff --git a/default_images/sd/res/get1obj_h.png b/ooo_custom_images/hicontrast/sd/res/get1obj.png
index 5f917cb33848..5f917cb33848 100644
--- a/default_images/sd/res/get1obj_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/get1obj.png
diff --git a/default_images/sd/res/getallob_h.png b/ooo_custom_images/hicontrast/sd/res/getallob.png
index b487caad6d0a..b487caad6d0a 100644
--- a/default_images/sd/res/getallob_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/getallob.png
diff --git a/default_images/sd/res/graphic_h.png b/ooo_custom_images/hicontrast/sd/res/graphic.png
index c309b9f7c5b4..c309b9f7c5b4 100644
--- a/default_images/sd/res/graphic_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/graphic.png
diff --git a/default_images/sd/res/group_h.png b/ooo_custom_images/hicontrast/sd/res/group.png
index 98e4ccfb28ea..98e4ccfb28ea 100644
--- a/default_images/sd/res/group_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/group.png
diff --git a/default_images/sd/res/hlplhorz_h.png b/ooo_custom_images/hicontrast/sd/res/hlplhorz.png
index 36ca5c70377a..36ca5c70377a 100644
--- a/default_images/sd/res/hlplhorz_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/hlplhorz.png
diff --git a/default_images/sd/res/hlplvert_h.png b/ooo_custom_images/hicontrast/sd/res/hlplvert.png
index deb560864e32..deb560864e32 100644
--- a/default_images/sd/res/hlplvert_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/hlplvert.png
diff --git a/default_images/sd/res/hlppoint_h.png b/ooo_custom_images/hicontrast/sd/res/hlppoint.png
index 3574edb44ef9..3574edb44ef9 100644
--- a/default_images/sd/res/hlppoint_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/hlppoint.png
diff --git a/default_images/sd/res/imagelst/nvh010.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv010.png
index 16775078e3d2..16775078e3d2 100644
--- a/default_images/sd/res/imagelst/nvh010.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv010.png
diff --git a/default_images/sd/res/imagelst/nvh02.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv02.png
index 4ba5c9a0754a..4ba5c9a0754a 100644
--- a/default_images/sd/res/imagelst/nvh02.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv02.png
diff --git a/default_images/sd/res/imagelst/nvh03.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv03.png
index 238986ea95c1..238986ea95c1 100644
--- a/default_images/sd/res/imagelst/nvh03.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv03.png
diff --git a/default_images/sd/res/imagelst/nvh04.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv04.png
index c55713f35b30..c55713f35b30 100644
--- a/default_images/sd/res/imagelst/nvh04.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv04.png
diff --git a/default_images/sd/res/imagelst/nvh05.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv05.png
index 4ccbf095ce6a..4ccbf095ce6a 100644
--- a/default_images/sd/res/imagelst/nvh05.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv05.png
diff --git a/default_images/sd/res/imagelst/nvh06.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv06.png
index 8ac3ad2970f8..8ac3ad2970f8 100644
--- a/default_images/sd/res/imagelst/nvh06.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv06.png
diff --git a/default_images/sd/res/imagelst/nvh08.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv08.png
index bd5bfdbf6975..bd5bfdbf6975 100644
--- a/default_images/sd/res/imagelst/nvh08.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv08.png
diff --git a/default_images/sd/res/imagelst/nvh09.png b/ooo_custom_images/hicontrast/sd/res/imagelst/nv09.png
index 8b30eb75e4b6..8b30eb75e4b6 100644
--- a/default_images/sd/res/imagelst/nvh09.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/nv09.png
diff --git a/default_images/sd/res/imagelst/sfh01.png b/ooo_custom_images/hicontrast/sd/res/imagelst/sf01.png
index 3d3c180aef52..3d3c180aef52 100644
--- a/default_images/sd/res/imagelst/sfh01.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/sf01.png
diff --git a/default_images/sd/res/imagelst/sfh02.png b/ooo_custom_images/hicontrast/sd/res/imagelst/sf02.png
index 2c992a49ed2d..2c992a49ed2d 100644
--- a/default_images/sd/res/imagelst/sfh02.png
+++ b/ooo_custom_images/hicontrast/sd/res/imagelst/sf02.png
diff --git a/default_images/sd/res/layout_empty_h.png b/ooo_custom_images/hicontrast/sd/res/layout_empty.png
index 5d6202c56a28..5d6202c56a28 100644
--- a/default_images/sd/res/layout_empty_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_empty.png
diff --git a/default_images/sd/res/layout_head01_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head01.png
index 30c292eef9d4..30c292eef9d4 100644
--- a/default_images/sd/res/layout_head01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head01.png
diff --git a/default_images/sd/res/layout_head02_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head02.png
index b7ee7213434d..b7ee7213434d 100644
--- a/default_images/sd/res/layout_head02_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head02.png
diff --git a/default_images/sd/res/layout_head02a_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head02a.png
index e82e6801b28a..e82e6801b28a 100644
--- a/default_images/sd/res/layout_head02a_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head02a.png
diff --git a/default_images/sd/res/layout_head02b_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head02b.png
index 0e23f9f2f670..0e23f9f2f670 100644
--- a/default_images/sd/res/layout_head02b_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head02b.png
diff --git a/default_images/sd/res/layout_head03_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03.png
index 499024a03db6..499024a03db6 100644
--- a/default_images/sd/res/layout_head03_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03.png
diff --git a/default_images/sd/res/layout_head03a_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03a.png
index ec06628cc77e..ec06628cc77e 100644
--- a/default_images/sd/res/layout_head03a_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03a.png
diff --git a/default_images/sd/res/layout_head03b_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03b.png
index 43a410a89b3b..43a410a89b3b 100644
--- a/default_images/sd/res/layout_head03b_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03b.png
diff --git a/default_images/sd/res/layout_head03c_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head03c.png
index 275f437796be..275f437796be 100644
--- a/default_images/sd/res/layout_head03c_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head03c.png
diff --git a/default_images/sd/res/layout_head04_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head04.png
index fe619c15c8a4..fe619c15c8a4 100644
--- a/default_images/sd/res/layout_head04_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head04.png
diff --git a/default_images/sd/res/layout_head06_h.png b/ooo_custom_images/hicontrast/sd/res/layout_head06.png
index 59a241865ba3..59a241865ba3 100644
--- a/default_images/sd/res/layout_head06_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_head06.png
diff --git a/default_images/sd/res/layout_textonly_h.png b/ooo_custom_images/hicontrast/sd/res/layout_textonly.png
index 0e7a3e0f8639..0e7a3e0f8639 100644
--- a/default_images/sd/res/layout_textonly_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_textonly.png
diff --git a/default_images/sd/res/layout_vertical01_h.png b/ooo_custom_images/hicontrast/sd/res/layout_vertical01.png
index 4d137cf6b062..4d137cf6b062 100644
--- a/default_images/sd/res/layout_vertical01_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_vertical01.png
diff --git a/default_images/sd/res/layout_vertical02_h.png b/ooo_custom_images/hicontrast/sd/res/layout_vertical02.png
index cec7162e0441..cec7162e0441 100644
--- a/default_images/sd/res/layout_vertical02_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/layout_vertical02.png
diff --git a/default_images/sd/res/minus_h.png b/ooo_custom_images/hicontrast/sd/res/minus.png
index a20fa183ab01..a20fa183ab01 100644
--- a/default_images/sd/res/minus_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/minus.png
diff --git a/default_images/sd/res/mspgmode_h.png b/ooo_custom_images/hicontrast/sd/res/mspgmode.png
index 31d02183d688..31d02183d688 100644
--- a/default_images/sd/res/mspgmode_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/mspgmode.png
diff --git a/default_images/sd/res/objects_h.png b/ooo_custom_images/hicontrast/sd/res/objects.png
index 631a7ad209a8..631a7ad209a8 100644
--- a/default_images/sd/res/objects_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/objects.png
diff --git a/default_images/sd/res/objekt_h.png b/ooo_custom_images/hicontrast/sd/res/objekt.png
index bf067d7b77e2..bf067d7b77e2 100644
--- a/default_images/sd/res/objekt_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/objekt.png
diff --git a/default_images/sd/res/ole_h.png b/ooo_custom_images/hicontrast/sd/res/ole.png
index 1c16f8feb540..1c16f8feb540 100644
--- a/default_images/sd/res/ole_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/ole.png
diff --git a/default_images/sd/res/page_h.png b/ooo_custom_images/hicontrast/sd/res/page.png
index 9228c1b06eaa..9228c1b06eaa 100644
--- a/default_images/sd/res/page_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/page.png
diff --git a/default_images/sd/res/pageexcl_h.png b/ooo_custom_images/hicontrast/sd/res/pageexcl.png
index c7b60fd63f7f..c7b60fd63f7f 100644
--- a/default_images/sd/res/pageexcl_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pageexcl.png
diff --git a/default_images/sd/res/pagemode_h.png b/ooo_custom_images/hicontrast/sd/res/pagemode.png
index 3861c3853197..3861c3853197 100644
--- a/default_images/sd/res/pagemode_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pagemode.png
diff --git a/default_images/sd/res/pageobjs_h.png b/ooo_custom_images/hicontrast/sd/res/pageobjs.png
index 602fb34e4827..602fb34e4827 100644
--- a/default_images/sd/res/pageobjs_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pageobjs.png
diff --git a/default_images/sd/res/pagobjex_h.png b/ooo_custom_images/hicontrast/sd/res/pagobjex.png
index c2ffb41ae647..c2ffb41ae647 100644
--- a/default_images/sd/res/pagobjex_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pagobjex.png
diff --git a/default_images/sd/res/pipette_h.png b/ooo_custom_images/hicontrast/sd/res/pipette.png
index 40547fbbe12e..40547fbbe12e 100644
--- a/default_images/sd/res/pipette_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/pipette.png
diff --git a/default_images/sd/res/playblue_16_h.png b/ooo_custom_images/hicontrast/sd/res/playblue_16.png
index 4fb393863e7d..4fb393863e7d 100644
--- a/default_images/sd/res/playblue_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/playblue_16.png
diff --git a/default_images/sd/res/plus_h.png b/ooo_custom_images/hicontrast/sd/res/plus.png
index d4a66c91a2cc..d4a66c91a2cc 100644
--- a/default_images/sd/res/plus_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/plus.png
diff --git a/default_images/sd/res/stopplayingblue_16_h.png b/ooo_custom_images/hicontrast/sd/res/stopplayingblue_16.png
index 7d51cff77c01..7d51cff77c01 100644
--- a/default_images/sd/res/stopplayingblue_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/stopplayingblue_16.png
diff --git a/default_images/sd/res/time_16_h.png b/ooo_custom_images/hicontrast/sd/res/time_16.png
index 15768dd38fce..15768dd38fce 100644
--- a/default_images/sd/res/time_16_h.png
+++ b/ooo_custom_images/hicontrast/sd/res/time_16.png
diff --git a/default_images/sfx2/res/deleterow_h.png b/ooo_custom_images/hicontrast/sfx2/res/deleterow.png
index d1eab10294a7..d1eab10294a7 100644
--- a/default_images/sfx2/res/deleterow_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/deleterow.png
diff --git a/default_images/sfx2/res/doccl_h.png b/ooo_custom_images/hicontrast/sfx2/res/doccl.png
index 4f149f170543..4f149f170543 100644
--- a/default_images/sfx2/res/doccl_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/doccl.png
diff --git a/default_images/sfx2/res/favourite_h.png b/ooo_custom_images/hicontrast/sfx2/res/favourite.png
index 47219ed03831..47219ed03831 100644
--- a/default_images/sfx2/res/favourite_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/favourite.png
diff --git a/default_images/sfx2/res/favourite_big_h.png b/ooo_custom_images/hicontrast/sfx2/res/favourite_big.png
index e4c89dc90297..e4c89dc90297 100644
--- a/default_images/sfx2/res/favourite_big_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/favourite_big.png
diff --git a/default_images/sfx2/res/hlpbookclosed_h.png b/ooo_custom_images/hicontrast/sfx2/res/hlpbookclosed.png
index 5f761571321b..5f761571321b 100644
--- a/default_images/sfx2/res/hlpbookclosed_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/hlpbookclosed.png
diff --git a/default_images/sfx2/res/hlpbookopen_h.png b/ooo_custom_images/hicontrast/sfx2/res/hlpbookopen.png
index 5d04f6261460..5d04f6261460 100644
--- a/default_images/sfx2/res/hlpbookopen_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/hlpbookopen.png
diff --git a/default_images/sfx2/res/hlpdoc_h.png b/ooo_custom_images/hicontrast/sfx2/res/hlpdoc.png
index 879f149b1c6a..879f149b1c6a 100644
--- a/default_images/sfx2/res/hlpdoc_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/hlpdoc.png
diff --git a/default_images/sfx2/res/indexoff_big_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexoff_big.png
index a497fed45abf..a497fed45abf 100644
--- a/default_images/sfx2/res/indexoff_big_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexoff_big.png
diff --git a/default_images/sfx2/res/indexoff_small_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexoff_small.png
index 9e6487d873ed..9e6487d873ed 100644
--- a/default_images/sfx2/res/indexoff_small_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexoff_small.png
diff --git a/default_images/sfx2/res/indexon_big_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexon_big.png
index ab6c44d8eeaf..ab6c44d8eeaf 100644
--- a/default_images/sfx2/res/indexon_big_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexon_big.png
diff --git a/default_images/sfx2/res/indexon_small_h.png b/ooo_custom_images/hicontrast/sfx2/res/indexon_small.png
index c964f39b6def..c964f39b6def 100644
--- a/default_images/sfx2/res/indexon_small_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/indexon_small.png
diff --git a/default_images/sfx2/res/newex_h.png b/ooo_custom_images/hicontrast/sfx2/res/newex.png
index 244dda449db2..244dda449db2 100644
--- a/default_images/sfx2/res/newex_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/newex.png
diff --git a/default_images/sfx2/res/styfam1_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam1.png
index 4662b79b2f46..4662b79b2f46 100644
--- a/default_images/sfx2/res/styfam1_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam1.png
diff --git a/default_images/sfx2/res/styfam2_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam2.png
index e5bfb2d69f3a..e5bfb2d69f3a 100644
--- a/default_images/sfx2/res/styfam2_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam2.png
diff --git a/default_images/sfx2/res/styfam3_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam3.png
index 6c65b3646dd9..6c65b3646dd9 100644
--- a/default_images/sfx2/res/styfam3_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam3.png
diff --git a/default_images/sfx2/res/styfam4_h.png b/ooo_custom_images/hicontrast/sfx2/res/styfam4.png
index ed255cd5e2b7..ed255cd5e2b7 100644
--- a/default_images/sfx2/res/styfam4_h.png
+++ b/ooo_custom_images/hicontrast/sfx2/res/styfam4.png
diff --git a/default_images/starmath/res/alh21801.png b/ooo_custom_images/hicontrast/starmath/res/al21801.png
index ea176db9c2ff..ea176db9c2ff 100644
--- a/default_images/starmath/res/alh21801.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21801.png
diff --git a/default_images/starmath/res/alh21802.png b/ooo_custom_images/hicontrast/starmath/res/al21802.png
index 0b4f3b6319cd..0b4f3b6319cd 100644
--- a/default_images/starmath/res/alh21802.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21802.png
diff --git a/default_images/starmath/res/alh21803.png b/ooo_custom_images/hicontrast/starmath/res/al21803.png
index 25f2e6b0c41f..25f2e6b0c41f 100644
--- a/default_images/starmath/res/alh21803.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21803.png
diff --git a/default_images/starmath/res/alh21804.png b/ooo_custom_images/hicontrast/starmath/res/al21804.png
index 0c3ada7935f9..0c3ada7935f9 100644
--- a/default_images/starmath/res/alh21804.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21804.png
diff --git a/default_images/starmath/res/alh21805.png b/ooo_custom_images/hicontrast/starmath/res/al21805.png
index 7eadd4d22692..7eadd4d22692 100644
--- a/default_images/starmath/res/alh21805.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21805.png
diff --git a/default_images/starmath/res/alh21806.png b/ooo_custom_images/hicontrast/starmath/res/al21806.png
index ed9b53bc73b8..ed9b53bc73b8 100644
--- a/default_images/starmath/res/alh21806.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21806.png
diff --git a/default_images/starmath/res/alh21808.png b/ooo_custom_images/hicontrast/starmath/res/al21808.png
index d22a6e11f5ee..d22a6e11f5ee 100644
--- a/default_images/starmath/res/alh21808.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21808.png
diff --git a/default_images/starmath/res/alh21809.png b/ooo_custom_images/hicontrast/starmath/res/al21809.png
index 7b6b38e10887..7b6b38e10887 100644
--- a/default_images/starmath/res/alh21809.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21809.png
diff --git a/default_images/starmath/res/alh21810.png b/ooo_custom_images/hicontrast/starmath/res/al21810.png
index c82e4dd13899..c82e4dd13899 100644
--- a/default_images/starmath/res/alh21810.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21810.png
diff --git a/default_images/starmath/res/alh21811.png b/ooo_custom_images/hicontrast/starmath/res/al21811.png
index 74c1c89abbd4..74c1c89abbd4 100644
--- a/default_images/starmath/res/alh21811.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21811.png
diff --git a/default_images/starmath/res/alh21812.png b/ooo_custom_images/hicontrast/starmath/res/al21812.png
index 5b985dec49e4..5b985dec49e4 100644
--- a/default_images/starmath/res/alh21812.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21812.png
diff --git a/default_images/starmath/res/alh21813.png b/ooo_custom_images/hicontrast/starmath/res/al21813.png
index b6d01cfacf5c..b6d01cfacf5c 100644
--- a/default_images/starmath/res/alh21813.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21813.png
diff --git a/default_images/starmath/res/alh21814.png b/ooo_custom_images/hicontrast/starmath/res/al21814.png
index 78d81a32d8ad..78d81a32d8ad 100644
--- a/default_images/starmath/res/alh21814.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21814.png
diff --git a/default_images/starmath/res/alh21821.png b/ooo_custom_images/hicontrast/starmath/res/al21821.png
index 4496c1fd1b69..4496c1fd1b69 100644
--- a/default_images/starmath/res/alh21821.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21821.png
diff --git a/default_images/starmath/res/alh21822.png b/ooo_custom_images/hicontrast/starmath/res/al21822.png
index 587cbe7b4942..587cbe7b4942 100644
--- a/default_images/starmath/res/alh21822.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21822.png
diff --git a/default_images/starmath/res/alh21823.png b/ooo_custom_images/hicontrast/starmath/res/al21823.png
index 059d9494054f..059d9494054f 100644
--- a/default_images/starmath/res/alh21823.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21823.png
diff --git a/default_images/starmath/res/alh21824.png b/ooo_custom_images/hicontrast/starmath/res/al21824.png
index 6d6cc45213e4..6d6cc45213e4 100644
--- a/default_images/starmath/res/alh21824.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21824.png
diff --git a/default_images/starmath/res/alh21825.png b/ooo_custom_images/hicontrast/starmath/res/al21825.png
index 8793dbf0fd2b..8793dbf0fd2b 100644
--- a/default_images/starmath/res/alh21825.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21825.png
diff --git a/default_images/starmath/res/alh21826.png b/ooo_custom_images/hicontrast/starmath/res/al21826.png
index 8e7fd94c9a54..8e7fd94c9a54 100644
--- a/default_images/starmath/res/alh21826.png
+++ b/ooo_custom_images/hicontrast/starmath/res/al21826.png
diff --git a/default_images/starmath/res/ar_right_h.png b/ooo_custom_images/hicontrast/starmath/res/ar_right.png
index 6d8108c8e41b..6d8108c8e41b 100644
--- a/default_images/starmath/res/ar_right_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/ar_right.png
diff --git a/default_images/starmath/res/ath21701.png b/ooo_custom_images/hicontrast/starmath/res/at21701.png
index 35b9c5eff030..35b9c5eff030 100644
--- a/default_images/starmath/res/ath21701.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21701.png
diff --git a/default_images/starmath/res/ath21702.png b/ooo_custom_images/hicontrast/starmath/res/at21702.png
index a71bc93f400d..a71bc93f400d 100644
--- a/default_images/starmath/res/ath21702.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21702.png
diff --git a/default_images/starmath/res/ath21703.png b/ooo_custom_images/hicontrast/starmath/res/at21703.png
index ea10aa9b8401..ea10aa9b8401 100644
--- a/default_images/starmath/res/ath21703.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21703.png
diff --git a/default_images/starmath/res/ath21704.png b/ooo_custom_images/hicontrast/starmath/res/at21704.png
index 0992ca7717dc..0992ca7717dc 100644
--- a/default_images/starmath/res/ath21704.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21704.png
diff --git a/default_images/starmath/res/ath21705.png b/ooo_custom_images/hicontrast/starmath/res/at21705.png
index 75172cd425f1..75172cd425f1 100644
--- a/default_images/starmath/res/ath21705.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21705.png
diff --git a/default_images/starmath/res/ath21706.png b/ooo_custom_images/hicontrast/starmath/res/at21706.png
index 7c34b14211a2..7c34b14211a2 100644
--- a/default_images/starmath/res/ath21706.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21706.png
diff --git a/default_images/starmath/res/ath21707.png b/ooo_custom_images/hicontrast/starmath/res/at21707.png
index fd09899c5eb6..fd09899c5eb6 100644
--- a/default_images/starmath/res/ath21707.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21707.png
diff --git a/default_images/starmath/res/ath21708.png b/ooo_custom_images/hicontrast/starmath/res/at21708.png
index 72d5e2f49dde..72d5e2f49dde 100644
--- a/default_images/starmath/res/ath21708.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21708.png
diff --git a/default_images/starmath/res/ath21709.png b/ooo_custom_images/hicontrast/starmath/res/at21709.png
index 8ef171b66641..8ef171b66641 100644
--- a/default_images/starmath/res/ath21709.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21709.png
diff --git a/default_images/starmath/res/ath21710.png b/ooo_custom_images/hicontrast/starmath/res/at21710.png
index 7f42dd2e23bd..7f42dd2e23bd 100644
--- a/default_images/starmath/res/ath21710.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21710.png
diff --git a/default_images/starmath/res/ath21711.png b/ooo_custom_images/hicontrast/starmath/res/at21711.png
index 3224113a8adc..3224113a8adc 100644
--- a/default_images/starmath/res/ath21711.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21711.png
diff --git a/default_images/starmath/res/ath21712.png b/ooo_custom_images/hicontrast/starmath/res/at21712.png
index e2e40a6d70f9..e2e40a6d70f9 100644
--- a/default_images/starmath/res/ath21712.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21712.png
diff --git a/default_images/starmath/res/ath21713.png b/ooo_custom_images/hicontrast/starmath/res/at21713.png
index b7fcdc3563c0..b7fcdc3563c0 100644
--- a/default_images/starmath/res/ath21713.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21713.png
diff --git a/default_images/starmath/res/ath21714.png b/ooo_custom_images/hicontrast/starmath/res/at21714.png
index 8eebba9978b4..8eebba9978b4 100644
--- a/default_images/starmath/res/ath21714.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21714.png
diff --git a/default_images/starmath/res/ath21715.png b/ooo_custom_images/hicontrast/starmath/res/at21715.png
index d16fc953d19d..d16fc953d19d 100644
--- a/default_images/starmath/res/ath21715.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21715.png
diff --git a/default_images/starmath/res/ath21716.png b/ooo_custom_images/hicontrast/starmath/res/at21716.png
index 65063e7e848b..65063e7e848b 100644
--- a/default_images/starmath/res/ath21716.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21716.png
diff --git a/default_images/starmath/res/ath21717.png b/ooo_custom_images/hicontrast/starmath/res/at21717.png
index 1ef04cbcf99d..1ef04cbcf99d 100644
--- a/default_images/starmath/res/ath21717.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21717.png
diff --git a/default_images/starmath/res/ath21718.png b/ooo_custom_images/hicontrast/starmath/res/at21718.png
index f8ddfe8a7708..f8ddfe8a7708 100644
--- a/default_images/starmath/res/ath21718.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21718.png
diff --git a/default_images/starmath/res/ath21719.png b/ooo_custom_images/hicontrast/starmath/res/at21719.png
index b5950ec6c9fe..b5950ec6c9fe 100644
--- a/default_images/starmath/res/ath21719.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21719.png
diff --git a/default_images/starmath/res/ath21720.png b/ooo_custom_images/hicontrast/starmath/res/at21720.png
index c03633251938..c03633251938 100644
--- a/default_images/starmath/res/ath21720.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21720.png
diff --git a/default_images/starmath/res/ath21722.png b/ooo_custom_images/hicontrast/starmath/res/at21722.png
index f48935982726..f48935982726 100644
--- a/default_images/starmath/res/ath21722.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21722.png
diff --git a/default_images/starmath/res/ath21723.png b/ooo_custom_images/hicontrast/starmath/res/at21723.png
index e71114fecc88..e71114fecc88 100644
--- a/default_images/starmath/res/ath21723.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21723.png
diff --git a/default_images/starmath/res/ath21724.png b/ooo_custom_images/hicontrast/starmath/res/at21724.png
index 0dc5f9dba1ed..0dc5f9dba1ed 100644
--- a/default_images/starmath/res/ath21724.png
+++ b/ooo_custom_images/hicontrast/starmath/res/at21724.png
diff --git a/default_images/starmath/res/bih21301.png b/ooo_custom_images/hicontrast/starmath/res/bi21301.png
index dbc586873a2e..dbc586873a2e 100644
--- a/default_images/starmath/res/bih21301.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21301.png
diff --git a/default_images/starmath/res/bih21302.png b/ooo_custom_images/hicontrast/starmath/res/bi21302.png
index 1678126180b7..1678126180b7 100644
--- a/default_images/starmath/res/bih21302.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21302.png
diff --git a/default_images/starmath/res/bih21303.png b/ooo_custom_images/hicontrast/starmath/res/bi21303.png
index f05a0079f6f9..f05a0079f6f9 100644
--- a/default_images/starmath/res/bih21303.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21303.png
diff --git a/default_images/starmath/res/bih21304.png b/ooo_custom_images/hicontrast/starmath/res/bi21304.png
index 506da70d27e1..506da70d27e1 100644
--- a/default_images/starmath/res/bih21304.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21304.png
diff --git a/default_images/starmath/res/bih21305.png b/ooo_custom_images/hicontrast/starmath/res/bi21305.png
index 5b5ef6a6342d..5b5ef6a6342d 100644
--- a/default_images/starmath/res/bih21305.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21305.png
diff --git a/default_images/starmath/res/bih21306.png b/ooo_custom_images/hicontrast/starmath/res/bi21306.png
index 378afd090c9c..378afd090c9c 100644
--- a/default_images/starmath/res/bih21306.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21306.png
diff --git a/default_images/starmath/res/bih21307.png b/ooo_custom_images/hicontrast/starmath/res/bi21307.png
index 2b369f9f2e90..2b369f9f2e90 100644
--- a/default_images/starmath/res/bih21307.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21307.png
diff --git a/default_images/starmath/res/bih21308.png b/ooo_custom_images/hicontrast/starmath/res/bi21308.png
index 12a3c861337b..12a3c861337b 100644
--- a/default_images/starmath/res/bih21308.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21308.png
diff --git a/default_images/starmath/res/bih21309.png b/ooo_custom_images/hicontrast/starmath/res/bi21309.png
index 64bd8091005d..64bd8091005d 100644
--- a/default_images/starmath/res/bih21309.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21309.png
diff --git a/default_images/starmath/res/bih21310.png b/ooo_custom_images/hicontrast/starmath/res/bi21310.png
index aa2593aff11c..aa2593aff11c 100644
--- a/default_images/starmath/res/bih21310.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21310.png
diff --git a/default_images/starmath/res/bih21311.png b/ooo_custom_images/hicontrast/starmath/res/bi21311.png
index 70f7f790342b..70f7f790342b 100644
--- a/default_images/starmath/res/bih21311.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21311.png
diff --git a/default_images/starmath/res/bih21312.png b/ooo_custom_images/hicontrast/starmath/res/bi21312.png
index 6910f725f896..6910f725f896 100644
--- a/default_images/starmath/res/bih21312.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21312.png
diff --git a/default_images/starmath/res/bih21313.png b/ooo_custom_images/hicontrast/starmath/res/bi21313.png
index cdc24da80a42..cdc24da80a42 100644
--- a/default_images/starmath/res/bih21313.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21313.png
diff --git a/default_images/starmath/res/bih21314.png b/ooo_custom_images/hicontrast/starmath/res/bi21314.png
index a3d9c1934069..a3d9c1934069 100644
--- a/default_images/starmath/res/bih21314.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21314.png
diff --git a/default_images/starmath/res/bih21315.png b/ooo_custom_images/hicontrast/starmath/res/bi21315.png
index c2bb1619b4f3..c2bb1619b4f3 100644
--- a/default_images/starmath/res/bih21315.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21315.png
diff --git a/default_images/starmath/res/bih21316.png b/ooo_custom_images/hicontrast/starmath/res/bi21316.png
index 8d313f06c02c..8d313f06c02c 100644
--- a/default_images/starmath/res/bih21316.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21316.png
diff --git a/default_images/starmath/res/bih21322.png b/ooo_custom_images/hicontrast/starmath/res/bi21322.png
index d8c113d75f2a..d8c113d75f2a 100644
--- a/default_images/starmath/res/bih21322.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21322.png
diff --git a/default_images/starmath/res/bih21323.png b/ooo_custom_images/hicontrast/starmath/res/bi21323.png
index 66a94b922b72..66a94b922b72 100644
--- a/default_images/starmath/res/bih21323.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21323.png
diff --git a/default_images/starmath/res/bih21324.png b/ooo_custom_images/hicontrast/starmath/res/bi21324.png
index 94b1cc383e5c..94b1cc383e5c 100644
--- a/default_images/starmath/res/bih21324.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21324.png
diff --git a/default_images/starmath/res/bih21325.png b/ooo_custom_images/hicontrast/starmath/res/bi21325.png
index ac439d8d1115..ac439d8d1115 100644
--- a/default_images/starmath/res/bih21325.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21325.png
diff --git a/default_images/starmath/res/bih21326.png b/ooo_custom_images/hicontrast/starmath/res/bi21326.png
index 32fe2650ddd5..32fe2650ddd5 100644
--- a/default_images/starmath/res/bih21326.png
+++ b/ooo_custom_images/hicontrast/starmath/res/bi21326.png
diff --git a/default_images/starmath/res/coh21901.png b/ooo_custom_images/hicontrast/starmath/res/co21901.png
index eb76568f0df8..eb76568f0df8 100644
--- a/default_images/starmath/res/coh21901.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21901.png
diff --git a/default_images/starmath/res/coh21902.png b/ooo_custom_images/hicontrast/starmath/res/co21902.png
index d5a21eb0e57f..d5a21eb0e57f 100644
--- a/default_images/starmath/res/coh21902.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21902.png
diff --git a/default_images/starmath/res/coh21903.png b/ooo_custom_images/hicontrast/starmath/res/co21903.png
index b4fff99be88f..b4fff99be88f 100644
--- a/default_images/starmath/res/coh21903.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21903.png
diff --git a/default_images/starmath/res/coh21904.png b/ooo_custom_images/hicontrast/starmath/res/co21904.png
index 66193cc3139a..66193cc3139a 100644
--- a/default_images/starmath/res/coh21904.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21904.png
diff --git a/default_images/starmath/res/coh21905.png b/ooo_custom_images/hicontrast/starmath/res/co21905.png
index 320fe69337be..320fe69337be 100644
--- a/default_images/starmath/res/coh21905.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21905.png
diff --git a/default_images/starmath/res/coh21906.png b/ooo_custom_images/hicontrast/starmath/res/co21906.png
index 234e87baa8a4..234e87baa8a4 100644
--- a/default_images/starmath/res/coh21906.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21906.png
diff --git a/default_images/starmath/res/coh21907.png b/ooo_custom_images/hicontrast/starmath/res/co21907.png
index d377a5d90c8e..d377a5d90c8e 100644
--- a/default_images/starmath/res/coh21907.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21907.png
diff --git a/default_images/starmath/res/coh21908.png b/ooo_custom_images/hicontrast/starmath/res/co21908.png
index a60c4db87d6a..a60c4db87d6a 100644
--- a/default_images/starmath/res/coh21908.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21908.png
diff --git a/default_images/starmath/res/coh21909.png b/ooo_custom_images/hicontrast/starmath/res/co21909.png
index 5f727c0e5a13..5f727c0e5a13 100644
--- a/default_images/starmath/res/coh21909.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21909.png
diff --git a/default_images/starmath/res/coh21910.png b/ooo_custom_images/hicontrast/starmath/res/co21910.png
index 0e2c2421d463..0e2c2421d463 100644
--- a/default_images/starmath/res/coh21910.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21910.png
diff --git a/default_images/starmath/res/coh21911.png b/ooo_custom_images/hicontrast/starmath/res/co21911.png
index 4b0c7a1d5389..4b0c7a1d5389 100644
--- a/default_images/starmath/res/coh21911.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21911.png
diff --git a/default_images/starmath/res/coh21912.png b/ooo_custom_images/hicontrast/starmath/res/co21912.png
index c2b94059969a..c2b94059969a 100644
--- a/default_images/starmath/res/coh21912.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21912.png
diff --git a/default_images/starmath/res/coh21916.png b/ooo_custom_images/hicontrast/starmath/res/co21916.png
index 05ecf84cdbce..05ecf84cdbce 100644
--- a/default_images/starmath/res/coh21916.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21916.png
diff --git a/default_images/starmath/res/coh21917.png b/ooo_custom_images/hicontrast/starmath/res/co21917.png
index 33d515c97401..33d515c97401 100644
--- a/default_images/starmath/res/coh21917.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21917.png
diff --git a/default_images/starmath/res/coh21918.png b/ooo_custom_images/hicontrast/starmath/res/co21918.png
index 6133cab15a03..6133cab15a03 100644
--- a/default_images/starmath/res/coh21918.png
+++ b/ooo_custom_images/hicontrast/starmath/res/co21918.png
diff --git a/default_images/starmath/res/dist101_h.png b/ooo_custom_images/hicontrast/starmath/res/dist101.png
index f86ae2db334c..f86ae2db334c 100644
--- a/default_images/starmath/res/dist101_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist101.png
diff --git a/default_images/starmath/res/dist102_h.png b/ooo_custom_images/hicontrast/starmath/res/dist102.png
index b4a968b1d6cd..b4a968b1d6cd 100644
--- a/default_images/starmath/res/dist102_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist102.png
diff --git a/default_images/starmath/res/dist103_h.png b/ooo_custom_images/hicontrast/starmath/res/dist103.png
index 2b086c2727f4..2b086c2727f4 100644
--- a/default_images/starmath/res/dist103_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist103.png
diff --git a/default_images/starmath/res/dist104_h.png b/ooo_custom_images/hicontrast/starmath/res/dist104.png
index 29888e0e8c07..29888e0e8c07 100644
--- a/default_images/starmath/res/dist104_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist104.png
diff --git a/default_images/starmath/res/dist11_h.png b/ooo_custom_images/hicontrast/starmath/res/dist11.png
index 605875b076af..605875b076af 100644
--- a/default_images/starmath/res/dist11_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist11.png
diff --git a/default_images/starmath/res/dist12_h.png b/ooo_custom_images/hicontrast/starmath/res/dist12.png
index 661dd2f69513..661dd2f69513 100644
--- a/default_images/starmath/res/dist12_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist12.png
diff --git a/default_images/starmath/res/dist13_h.png b/ooo_custom_images/hicontrast/starmath/res/dist13.png
index 4f0253af5ae2..4f0253af5ae2 100644
--- a/default_images/starmath/res/dist13_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist13.png
diff --git a/default_images/starmath/res/dist21_h.png b/ooo_custom_images/hicontrast/starmath/res/dist21.png
index fb6d0ceaf3bd..fb6d0ceaf3bd 100644
--- a/default_images/starmath/res/dist21_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist21.png
diff --git a/default_images/starmath/res/dist22_h.png b/ooo_custom_images/hicontrast/starmath/res/dist22.png
index e1bc5cd1a7f0..e1bc5cd1a7f0 100644
--- a/default_images/starmath/res/dist22_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist22.png
diff --git a/default_images/starmath/res/dist31_h.png b/ooo_custom_images/hicontrast/starmath/res/dist31.png
index 54734095e24f..54734095e24f 100644
--- a/default_images/starmath/res/dist31_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist31.png
diff --git a/default_images/starmath/res/dist32_h.png b/ooo_custom_images/hicontrast/starmath/res/dist32.png
index 796ee2cc726a..796ee2cc726a 100644
--- a/default_images/starmath/res/dist32_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist32.png
diff --git a/default_images/starmath/res/dist41_h.png b/ooo_custom_images/hicontrast/starmath/res/dist41.png
index 248359be6959..248359be6959 100644
--- a/default_images/starmath/res/dist41_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist41.png
diff --git a/default_images/starmath/res/dist42_h.png b/ooo_custom_images/hicontrast/starmath/res/dist42.png
index 917651eabf59..917651eabf59 100644
--- a/default_images/starmath/res/dist42_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist42.png
diff --git a/default_images/starmath/res/dist51_h.png b/ooo_custom_images/hicontrast/starmath/res/dist51.png
index fea2e99bd85d..fea2e99bd85d 100644
--- a/default_images/starmath/res/dist51_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist51.png
diff --git a/default_images/starmath/res/dist52_h.png b/ooo_custom_images/hicontrast/starmath/res/dist52.png
index 90439997be22..90439997be22 100644
--- a/default_images/starmath/res/dist52_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist52.png
diff --git a/default_images/starmath/res/dist61_h.png b/ooo_custom_images/hicontrast/starmath/res/dist61.png
index a66a67fedebc..a66a67fedebc 100644
--- a/default_images/starmath/res/dist61_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist61.png
diff --git a/default_images/starmath/res/dist62_h.png b/ooo_custom_images/hicontrast/starmath/res/dist62.png
index 1ed1cc16c7ad..1ed1cc16c7ad 100644
--- a/default_images/starmath/res/dist62_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist62.png
diff --git a/default_images/starmath/res/dist71_h.png b/ooo_custom_images/hicontrast/starmath/res/dist71.png
index 00b46b814da1..00b46b814da1 100644
--- a/default_images/starmath/res/dist71_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist71.png
diff --git a/default_images/starmath/res/dist72_h.png b/ooo_custom_images/hicontrast/starmath/res/dist72.png
index 5f928ba3cfd7..5f928ba3cfd7 100644
--- a/default_images/starmath/res/dist72_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist72.png
diff --git a/default_images/starmath/res/dist81_h.png b/ooo_custom_images/hicontrast/starmath/res/dist81.png
index 70a8db262263..70a8db262263 100644
--- a/default_images/starmath/res/dist81_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist81.png
diff --git a/default_images/starmath/res/dist82_h.png b/ooo_custom_images/hicontrast/starmath/res/dist82.png
index a37f3e7c291b..a37f3e7c291b 100644
--- a/default_images/starmath/res/dist82_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist82.png
diff --git a/default_images/starmath/res/dist91_h.png b/ooo_custom_images/hicontrast/starmath/res/dist91.png
index 40793ab49835..40793ab49835 100644
--- a/default_images/starmath/res/dist91_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist91.png
diff --git a/default_images/starmath/res/dist92_h.png b/ooo_custom_images/hicontrast/starmath/res/dist92.png
index 9030118b607f..9030118b607f 100644
--- a/default_images/starmath/res/dist92_h.png
+++ b/ooo_custom_images/hicontrast/starmath/res/dist92.png
diff --git a/default_images/starmath/res/foh21601.png b/ooo_custom_images/hicontrast/starmath/res/fo21601.png
index 622e2bc5c606..622e2bc5c606 100644
--- a/default_images/starmath/res/foh21601.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21601.png
diff --git a/default_images/starmath/res/foh21602.png b/ooo_custom_images/hicontrast/starmath/res/fo21602.png
index 83a944524880..83a944524880 100644
--- a/default_images/starmath/res/foh21602.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21602.png
diff --git a/default_images/starmath/res/foh21603.png b/ooo_custom_images/hicontrast/starmath/res/fo21603.png
index 9b18dc1e24e5..9b18dc1e24e5 100644
--- a/default_images/starmath/res/foh21603.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21603.png
diff --git a/default_images/starmath/res/foh21604.png b/ooo_custom_images/hicontrast/starmath/res/fo21604.png
index 9ab934e90de6..9ab934e90de6 100644
--- a/default_images/starmath/res/foh21604.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21604.png
diff --git a/default_images/starmath/res/foh21605.png b/ooo_custom_images/hicontrast/starmath/res/fo21605.png
index 0bc82977b57a..0bc82977b57a 100644
--- a/default_images/starmath/res/foh21605.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21605.png
diff --git a/default_images/starmath/res/foh21606.png b/ooo_custom_images/hicontrast/starmath/res/fo21606.png
index 995f511b93af..995f511b93af 100644
--- a/default_images/starmath/res/foh21606.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21606.png
diff --git a/default_images/starmath/res/foh21607.png b/ooo_custom_images/hicontrast/starmath/res/fo21607.png
index 85534472e36e..85534472e36e 100644
--- a/default_images/starmath/res/foh21607.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21607.png
diff --git a/default_images/starmath/res/foh21609.png b/ooo_custom_images/hicontrast/starmath/res/fo21609.png
index ab0137310629..ab0137310629 100644
--- a/default_images/starmath/res/foh21609.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21609.png
diff --git a/default_images/starmath/res/foh21610.png b/ooo_custom_images/hicontrast/starmath/res/fo21610.png
index a9e8db779d99..a9e8db779d99 100644
--- a/default_images/starmath/res/foh21610.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21610.png
diff --git a/default_images/starmath/res/foh21611.png b/ooo_custom_images/hicontrast/starmath/res/fo21611.png
index b214a9f124a0..b214a9f124a0 100644
--- a/default_images/starmath/res/foh21611.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21611.png
diff --git a/default_images/starmath/res/foh21613.png b/ooo_custom_images/hicontrast/starmath/res/fo21613.png
index de4250096323..de4250096323 100644
--- a/default_images/starmath/res/foh21613.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21613.png
diff --git a/default_images/starmath/res/foh21614.png b/ooo_custom_images/hicontrast/starmath/res/fo21614.png
index c3505406f5ce..c3505406f5ce 100644
--- a/default_images/starmath/res/foh21614.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21614.png
diff --git a/default_images/starmath/res/foh21615.png b/ooo_custom_images/hicontrast/starmath/res/fo21615.png
index ea3ef08d8a7e..ea3ef08d8a7e 100644
--- a/default_images/starmath/res/foh21615.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fo21615.png
diff --git a/default_images/starmath/res/fuh21501.png b/ooo_custom_images/hicontrast/starmath/res/fu21501.png
index a6b99e49d686..a6b99e49d686 100644
--- a/default_images/starmath/res/fuh21501.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21501.png
diff --git a/default_images/starmath/res/fuh21502.png b/ooo_custom_images/hicontrast/starmath/res/fu21502.png
index 1434a96ebe18..1434a96ebe18 100644
--- a/default_images/starmath/res/fuh21502.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21502.png
diff --git a/default_images/starmath/res/fuh21503.png b/ooo_custom_images/hicontrast/starmath/res/fu21503.png
index 2da483801360..2da483801360 100644
--- a/default_images/starmath/res/fuh21503.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21503.png
diff --git a/default_images/starmath/res/fuh21504.png b/ooo_custom_images/hicontrast/starmath/res/fu21504.png
index e32098139dd0..e32098139dd0 100644
--- a/default_images/starmath/res/fuh21504.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21504.png
diff --git a/default_images/starmath/res/fuh21505.png b/ooo_custom_images/hicontrast/starmath/res/fu21505.png
index 15b17c32c38c..15b17c32c38c 100644
--- a/default_images/starmath/res/fuh21505.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21505.png
diff --git a/default_images/starmath/res/fuh21506.png b/ooo_custom_images/hicontrast/starmath/res/fu21506.png
index d23a835df017..d23a835df017 100644
--- a/default_images/starmath/res/fuh21506.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21506.png
diff --git a/default_images/starmath/res/fuh21507.png b/ooo_custom_images/hicontrast/starmath/res/fu21507.png
index bfe959cb8941..bfe959cb8941 100644
--- a/default_images/starmath/res/fuh21507.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21507.png
diff --git a/default_images/starmath/res/fuh21508.png b/ooo_custom_images/hicontrast/starmath/res/fu21508.png
index fca022a1ae6a..fca022a1ae6a 100644
--- a/default_images/starmath/res/fuh21508.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21508.png
diff --git a/default_images/starmath/res/fuh21509.png b/ooo_custom_images/hicontrast/starmath/res/fu21509.png
index deee40a15187..deee40a15187 100644
--- a/default_images/starmath/res/fuh21509.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21509.png
diff --git a/default_images/starmath/res/fuh21510.png b/ooo_custom_images/hicontrast/starmath/res/fu21510.png
index 01bc6c354bd1..01bc6c354bd1 100644
--- a/default_images/starmath/res/fuh21510.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21510.png
diff --git a/default_images/starmath/res/fuh21511.png b/ooo_custom_images/hicontrast/starmath/res/fu21511.png
index b5492980283b..b5492980283b 100644
--- a/default_images/starmath/res/fuh21511.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21511.png
diff --git a/default_images/starmath/res/fuh21512.png b/ooo_custom_images/hicontrast/starmath/res/fu21512.png
index 63894349d377..63894349d377 100644
--- a/default_images/starmath/res/fuh21512.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21512.png
diff --git a/default_images/starmath/res/fuh21513.png b/ooo_custom_images/hicontrast/starmath/res/fu21513.png
index 58273acd2251..58273acd2251 100644
--- a/default_images/starmath/res/fuh21513.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21513.png
diff --git a/default_images/starmath/res/fuh21514.png b/ooo_custom_images/hicontrast/starmath/res/fu21514.png
index 304bbd5795fe..304bbd5795fe 100644
--- a/default_images/starmath/res/fuh21514.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21514.png
diff --git a/default_images/starmath/res/fuh21515.png b/ooo_custom_images/hicontrast/starmath/res/fu21515.png
index f76eb82a72c1..f76eb82a72c1 100644
--- a/default_images/starmath/res/fuh21515.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21515.png
diff --git a/default_images/starmath/res/fuh21516.png b/ooo_custom_images/hicontrast/starmath/res/fu21516.png
index 19185804a239..19185804a239 100644
--- a/default_images/starmath/res/fuh21516.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21516.png
diff --git a/default_images/starmath/res/fuh21517.png b/ooo_custom_images/hicontrast/starmath/res/fu21517.png
index 35d07f68df57..35d07f68df57 100644
--- a/default_images/starmath/res/fuh21517.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21517.png
diff --git a/default_images/starmath/res/fuh21518.png b/ooo_custom_images/hicontrast/starmath/res/fu21518.png
index 4c2d617486e2..4c2d617486e2 100644
--- a/default_images/starmath/res/fuh21518.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21518.png
diff --git a/default_images/starmath/res/fuh21519.png b/ooo_custom_images/hicontrast/starmath/res/fu21519.png
index bc4b5b0560ed..bc4b5b0560ed 100644
--- a/default_images/starmath/res/fuh21519.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21519.png
diff --git a/default_images/starmath/res/fuh21520.png b/ooo_custom_images/hicontrast/starmath/res/fu21520.png
index 67f10fdc85a5..67f10fdc85a5 100644
--- a/default_images/starmath/res/fuh21520.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21520.png
diff --git a/default_images/starmath/res/fuh21521.png b/ooo_custom_images/hicontrast/starmath/res/fu21521.png
index 2caa306876c8..2caa306876c8 100644
--- a/default_images/starmath/res/fuh21521.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21521.png
diff --git a/default_images/starmath/res/fuh21522.png b/ooo_custom_images/hicontrast/starmath/res/fu21522.png
index fddbdd83d2d2..fddbdd83d2d2 100644
--- a/default_images/starmath/res/fuh21522.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21522.png
diff --git a/default_images/starmath/res/fuh21523.png b/ooo_custom_images/hicontrast/starmath/res/fu21523.png
index 94d8b2f00aee..94d8b2f00aee 100644
--- a/default_images/starmath/res/fuh21523.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21523.png
diff --git a/default_images/starmath/res/fuh21524.png b/ooo_custom_images/hicontrast/starmath/res/fu21524.png
index ede479111781..ede479111781 100644
--- a/default_images/starmath/res/fuh21524.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21524.png
diff --git a/default_images/starmath/res/fuh21908.png b/ooo_custom_images/hicontrast/starmath/res/fu21908.png
index 7d39725cd456..7d39725cd456 100644
--- a/default_images/starmath/res/fuh21908.png
+++ b/ooo_custom_images/hicontrast/starmath/res/fu21908.png
diff --git a/default_images/starmath/res/imh21101.png b/ooo_custom_images/hicontrast/starmath/res/im21101.png
index 74a08df0df6a..74a08df0df6a 100644
--- a/default_images/starmath/res/imh21101.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21101.png
diff --git a/default_images/starmath/res/imh21102.png b/ooo_custom_images/hicontrast/starmath/res/im21102.png
index 99678e665292..99678e665292 100644
--- a/default_images/starmath/res/imh21102.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21102.png
diff --git a/default_images/starmath/res/imh21103.png b/ooo_custom_images/hicontrast/starmath/res/im21103.png
index 0f1564d60059..0f1564d60059 100644
--- a/default_images/starmath/res/imh21103.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21103.png
diff --git a/default_images/starmath/res/imh21104.png b/ooo_custom_images/hicontrast/starmath/res/im21104.png
index 947f88b278a8..947f88b278a8 100644
--- a/default_images/starmath/res/imh21104.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21104.png
diff --git a/default_images/starmath/res/imh21105.png b/ooo_custom_images/hicontrast/starmath/res/im21105.png
index d30145b85995..d30145b85995 100644
--- a/default_images/starmath/res/imh21105.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21105.png
diff --git a/default_images/starmath/res/imh21106.png b/ooo_custom_images/hicontrast/starmath/res/im21106.png
index 7c34b14211a2..7c34b14211a2 100644
--- a/default_images/starmath/res/imh21106.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21106.png
diff --git a/default_images/starmath/res/imh21107.png b/ooo_custom_images/hicontrast/starmath/res/im21107.png
index fd604c46e2e1..fd604c46e2e1 100644
--- a/default_images/starmath/res/imh21107.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21107.png
diff --git a/default_images/starmath/res/imh21108.png b/ooo_custom_images/hicontrast/starmath/res/im21108.png
index 5955124b962e..5955124b962e 100644
--- a/default_images/starmath/res/imh21108.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21108.png
diff --git a/default_images/starmath/res/imh21117.png b/ooo_custom_images/hicontrast/starmath/res/im21117.png
index d420e9131250..d420e9131250 100644
--- a/default_images/starmath/res/imh21117.png
+++ b/ooo_custom_images/hicontrast/starmath/res/im21117.png
diff --git a/default_images/starmath/res/mih21608.png b/ooo_custom_images/hicontrast/starmath/res/mi21608.png
index b2b043f5faa1..b2b043f5faa1 100644
--- a/default_images/starmath/res/mih21608.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi21608.png
diff --git a/default_images/starmath/res/mih21612.png b/ooo_custom_images/hicontrast/starmath/res/mi21612.png
index 41cdc2a8a82e..41cdc2a8a82e 100644
--- a/default_images/starmath/res/mih21612.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi21612.png
diff --git a/default_images/starmath/res/mih22003.png b/ooo_custom_images/hicontrast/starmath/res/mi22003.png
index 47b65da1585a..47b65da1585a 100644
--- a/default_images/starmath/res/mih22003.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22003.png
diff --git a/default_images/starmath/res/mih22004.png b/ooo_custom_images/hicontrast/starmath/res/mi22004.png
index b5d5d5509640..b5d5d5509640 100644
--- a/default_images/starmath/res/mih22004.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22004.png
diff --git a/default_images/starmath/res/mih22005.png b/ooo_custom_images/hicontrast/starmath/res/mi22005.png
index c0a5ad41d9ba..c0a5ad41d9ba 100644
--- a/default_images/starmath/res/mih22005.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22005.png
diff --git a/default_images/starmath/res/mih22006.png b/ooo_custom_images/hicontrast/starmath/res/mi22006.png
index a4d5c4307597..a4d5c4307597 100644
--- a/default_images/starmath/res/mih22006.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22006.png
diff --git a/default_images/starmath/res/mih22007.png b/ooo_custom_images/hicontrast/starmath/res/mi22007.png
index 272052d71076..272052d71076 100644
--- a/default_images/starmath/res/mih22007.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22007.png
diff --git a/default_images/starmath/res/mih22008.png b/ooo_custom_images/hicontrast/starmath/res/mi22008.png
index 4cb547a81332..4cb547a81332 100644
--- a/default_images/starmath/res/mih22008.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22008.png
diff --git a/default_images/starmath/res/mih22009.png b/ooo_custom_images/hicontrast/starmath/res/mi22009.png
index 675ea273de3b..675ea273de3b 100644
--- a/default_images/starmath/res/mih22009.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22009.png
diff --git a/default_images/starmath/res/mih22010.png b/ooo_custom_images/hicontrast/starmath/res/mi22010.png
index a75163e93990..a75163e93990 100644
--- a/default_images/starmath/res/mih22010.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22010.png
diff --git a/default_images/starmath/res/mih22011.png b/ooo_custom_images/hicontrast/starmath/res/mi22011.png
index 9df7dfd25f1a..9df7dfd25f1a 100644
--- a/default_images/starmath/res/mih22011.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22011.png
diff --git a/default_images/starmath/res/mih22012.png b/ooo_custom_images/hicontrast/starmath/res/mi22012.png
index 664423456d18..664423456d18 100644
--- a/default_images/starmath/res/mih22012.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22012.png
diff --git a/default_images/starmath/res/mih22013.png b/ooo_custom_images/hicontrast/starmath/res/mi22013.png
index cdd01da1d3b1..cdd01da1d3b1 100644
--- a/default_images/starmath/res/mih22013.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22013.png
diff --git a/default_images/starmath/res/mih22014.png b/ooo_custom_images/hicontrast/starmath/res/mi22014.png
index bab8fc821f40..bab8fc821f40 100644
--- a/default_images/starmath/res/mih22014.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22014.png
diff --git a/default_images/starmath/res/mih22015.png b/ooo_custom_images/hicontrast/starmath/res/mi22015.png
index 1585851aa444..1585851aa444 100644
--- a/default_images/starmath/res/mih22015.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22015.png
diff --git a/default_images/starmath/res/mih22016.png b/ooo_custom_images/hicontrast/starmath/res/mi22016.png
index cdf84f639fd0..cdf84f639fd0 100644
--- a/default_images/starmath/res/mih22016.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22016.png
diff --git a/default_images/starmath/res/mih22017.png b/ooo_custom_images/hicontrast/starmath/res/mi22017.png
index fb69b5239d47..fb69b5239d47 100644
--- a/default_images/starmath/res/mih22017.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22017.png
diff --git a/default_images/starmath/res/mih22018.png b/ooo_custom_images/hicontrast/starmath/res/mi22018.png
index 06dc3ab86d45..06dc3ab86d45 100644
--- a/default_images/starmath/res/mih22018.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22018.png
diff --git a/default_images/starmath/res/mih22019.png b/ooo_custom_images/hicontrast/starmath/res/mi22019.png
index 66216d835712..66216d835712 100644
--- a/default_images/starmath/res/mih22019.png
+++ b/ooo_custom_images/hicontrast/starmath/res/mi22019.png
diff --git a/default_images/starmath/res/oph21401.png b/ooo_custom_images/hicontrast/starmath/res/op21401.png
index a0929500d3a9..a0929500d3a9 100644
--- a/default_images/starmath/res/oph21401.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21401.png
diff --git a/default_images/starmath/res/oph21402.png b/ooo_custom_images/hicontrast/starmath/res/op21402.png
index 55c81979844d..55c81979844d 100644
--- a/default_images/starmath/res/oph21402.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21402.png
diff --git a/default_images/starmath/res/oph21403.png b/ooo_custom_images/hicontrast/starmath/res/op21403.png
index 00296cbd35ee..00296cbd35ee 100644
--- a/default_images/starmath/res/oph21403.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21403.png
diff --git a/default_images/starmath/res/oph21405.png b/ooo_custom_images/hicontrast/starmath/res/op21405.png
index 60dbffd58dc6..60dbffd58dc6 100644
--- a/default_images/starmath/res/oph21405.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21405.png
diff --git a/default_images/starmath/res/oph21406.png b/ooo_custom_images/hicontrast/starmath/res/op21406.png
index 441f9814ccb4..441f9814ccb4 100644
--- a/default_images/starmath/res/oph21406.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21406.png
diff --git a/default_images/starmath/res/oph21407.png b/ooo_custom_images/hicontrast/starmath/res/op21407.png
index 579bce3eddbc..579bce3eddbc 100644
--- a/default_images/starmath/res/oph21407.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21407.png
diff --git a/default_images/starmath/res/oph21408.png b/ooo_custom_images/hicontrast/starmath/res/op21408.png
index 8be9d18f65bb..8be9d18f65bb 100644
--- a/default_images/starmath/res/oph21408.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21408.png
diff --git a/default_images/starmath/res/oph21409.png b/ooo_custom_images/hicontrast/starmath/res/op21409.png
index a0e399fbdfc8..a0e399fbdfc8 100644
--- a/default_images/starmath/res/oph21409.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21409.png
diff --git a/default_images/starmath/res/oph21410.png b/ooo_custom_images/hicontrast/starmath/res/op21410.png
index 3ad8e1854191..3ad8e1854191 100644
--- a/default_images/starmath/res/oph21410.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21410.png
diff --git a/default_images/starmath/res/oph21411.png b/ooo_custom_images/hicontrast/starmath/res/op21411.png
index 20bf2aab2a9e..20bf2aab2a9e 100644
--- a/default_images/starmath/res/oph21411.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21411.png
diff --git a/default_images/starmath/res/oph21412.png b/ooo_custom_images/hicontrast/starmath/res/op21412.png
index 983714677b70..983714677b70 100644
--- a/default_images/starmath/res/oph21412.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21412.png
diff --git a/default_images/starmath/res/oph21413.png b/ooo_custom_images/hicontrast/starmath/res/op21413.png
index 00ab5b2d41f4..00ab5b2d41f4 100644
--- a/default_images/starmath/res/oph21413.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21413.png
diff --git a/default_images/starmath/res/oph21414.png b/ooo_custom_images/hicontrast/starmath/res/op21414.png
index d7df2438922c..d7df2438922c 100644
--- a/default_images/starmath/res/oph21414.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21414.png
diff --git a/default_images/starmath/res/oph21415.png b/ooo_custom_images/hicontrast/starmath/res/op21415.png
index a8cce1b08977..a8cce1b08977 100644
--- a/default_images/starmath/res/oph21415.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21415.png
diff --git a/default_images/starmath/res/oph21416.png b/ooo_custom_images/hicontrast/starmath/res/op21416.png
index b7fd8d020274..b7fd8d020274 100644
--- a/default_images/starmath/res/oph21416.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21416.png
diff --git a/default_images/starmath/res/oph21417.png b/ooo_custom_images/hicontrast/starmath/res/op21417.png
index 995b8b4ff7fd..995b8b4ff7fd 100644
--- a/default_images/starmath/res/oph21417.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21417.png
diff --git a/default_images/starmath/res/oph21418.png b/ooo_custom_images/hicontrast/starmath/res/op21418.png
index a5d360a03558..a5d360a03558 100644
--- a/default_images/starmath/res/oph21418.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21418.png
diff --git a/default_images/starmath/res/oph21419.png b/ooo_custom_images/hicontrast/starmath/res/op21419.png
index 6493064c2b0d..6493064c2b0d 100644
--- a/default_images/starmath/res/oph21419.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21419.png
diff --git a/default_images/starmath/res/oph21420.png b/ooo_custom_images/hicontrast/starmath/res/op21420.png
index 732a752283b4..732a752283b4 100644
--- a/default_images/starmath/res/oph21420.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21420.png
diff --git a/default_images/starmath/res/oph21421.png b/ooo_custom_images/hicontrast/starmath/res/op21421.png
index d0cb1277a034..d0cb1277a034 100644
--- a/default_images/starmath/res/oph21421.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op21421.png
diff --git a/default_images/starmath/res/oph22001.png b/ooo_custom_images/hicontrast/starmath/res/op22001.png
index dc1023303e79..dc1023303e79 100644
--- a/default_images/starmath/res/oph22001.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op22001.png
diff --git a/default_images/starmath/res/oph22002.png b/ooo_custom_images/hicontrast/starmath/res/op22002.png
index 7cff9aeaf203..7cff9aeaf203 100644
--- a/default_images/starmath/res/oph22002.png
+++ b/ooo_custom_images/hicontrast/starmath/res/op22002.png
diff --git a/default_images/starmath/res/unh21201.png b/ooo_custom_images/hicontrast/starmath/res/un21201.png
index 57d2b4020c31..57d2b4020c31 100644
--- a/default_images/starmath/res/unh21201.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21201.png
diff --git a/default_images/starmath/res/unh21202.png b/ooo_custom_images/hicontrast/starmath/res/un21202.png
index 4c8458a573bf..4c8458a573bf 100644
--- a/default_images/starmath/res/unh21202.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21202.png
diff --git a/default_images/starmath/res/unh21203.png b/ooo_custom_images/hicontrast/starmath/res/un21203.png
index 0c8f8f1c87b6..0c8f8f1c87b6 100644
--- a/default_images/starmath/res/unh21203.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21203.png
diff --git a/default_images/starmath/res/unh21204.png b/ooo_custom_images/hicontrast/starmath/res/un21204.png
index 2bde9f41d240..2bde9f41d240 100644
--- a/default_images/starmath/res/unh21204.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21204.png
diff --git a/default_images/starmath/res/unh21205.png b/ooo_custom_images/hicontrast/starmath/res/un21205.png
index b05c286f4c4c..b05c286f4c4c 100644
--- a/default_images/starmath/res/unh21205.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21205.png
diff --git a/default_images/starmath/res/unh21206.png b/ooo_custom_images/hicontrast/starmath/res/un21206.png
index 1f2c52f34f56..1f2c52f34f56 100644
--- a/default_images/starmath/res/unh21206.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21206.png
diff --git a/default_images/starmath/res/unh21207.png b/ooo_custom_images/hicontrast/starmath/res/un21207.png
index a68224a46e50..a68224a46e50 100644
--- a/default_images/starmath/res/unh21207.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21207.png
diff --git a/default_images/starmath/res/unh21208.png b/ooo_custom_images/hicontrast/starmath/res/un21208.png
index c46742a87334..c46742a87334 100644
--- a/default_images/starmath/res/unh21208.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21208.png
diff --git a/default_images/starmath/res/unh21209.png b/ooo_custom_images/hicontrast/starmath/res/un21209.png
index de42599e8473..de42599e8473 100644
--- a/default_images/starmath/res/unh21209.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21209.png
diff --git a/default_images/starmath/res/unh21210.png b/ooo_custom_images/hicontrast/starmath/res/un21210.png
index 0f92b581d5da..0f92b581d5da 100644
--- a/default_images/starmath/res/unh21210.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21210.png
diff --git a/default_images/starmath/res/unh21211.png b/ooo_custom_images/hicontrast/starmath/res/un21211.png
index 685a776648a1..685a776648a1 100644
--- a/default_images/starmath/res/unh21211.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21211.png
diff --git a/default_images/starmath/res/unh21212.png b/ooo_custom_images/hicontrast/starmath/res/un21212.png
index e8d376a6a263..e8d376a6a263 100644
--- a/default_images/starmath/res/unh21212.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21212.png
diff --git a/default_images/starmath/res/unh21213.png b/ooo_custom_images/hicontrast/starmath/res/un21213.png
index 3170f692e841..3170f692e841 100644
--- a/default_images/starmath/res/unh21213.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21213.png
diff --git a/default_images/starmath/res/unh21214.png b/ooo_custom_images/hicontrast/starmath/res/un21214.png
index 23d3fd1ed28b..23d3fd1ed28b 100644
--- a/default_images/starmath/res/unh21214.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21214.png
diff --git a/default_images/starmath/res/unh21215.png b/ooo_custom_images/hicontrast/starmath/res/un21215.png
index b40a2be4f8a0..b40a2be4f8a0 100644
--- a/default_images/starmath/res/unh21215.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21215.png
diff --git a/default_images/starmath/res/unh21221.png b/ooo_custom_images/hicontrast/starmath/res/un21221.png
index 7f1ec5bb41c8..7f1ec5bb41c8 100644
--- a/default_images/starmath/res/unh21221.png
+++ b/ooo_custom_images/hicontrast/starmath/res/un21221.png
diff --git a/default_images/svtools/res/back_large_h.png b/ooo_custom_images/hicontrast/svtools/res/back_large.png
index 5c69fc639dd0..5c69fc639dd0 100644
--- a/default_images/svtools/res/back_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/back_large.png
diff --git a/default_images/svtools/res/back_small_h.png b/ooo_custom_images/hicontrast/svtools/res/back_small.png
index 3e27d96201a7..3e27d96201a7 100644
--- a/default_images/svtools/res/back_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/back_small.png
diff --git a/default_images/svtools/res/bmpfont_h.png b/ooo_custom_images/hicontrast/svtools/res/bmpfont.png
index 78287005afbd..78287005afbd 100644
--- a/default_images/svtools/res/bmpfont_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/bmpfont.png
diff --git a/default_images/svtools/res/collate_h.png b/ooo_custom_images/hicontrast/svtools/res/collate.png
index 38353b700f72..38353b700f72 100644
--- a/default_images/svtools/res/collate_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/collate.png
diff --git a/default_images/svtools/res/edh01.png b/ooo_custom_images/hicontrast/svtools/res/ed01.png
index be29f7be1a2d..be29f7be1a2d 100644
--- a/default_images/svtools/res/edh01.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed01.png
diff --git a/default_images/svtools/res/edh02.png b/ooo_custom_images/hicontrast/svtools/res/ed02.png
index 9e64e2d020bf..9e64e2d020bf 100644
--- a/default_images/svtools/res/edh02.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed02.png
diff --git a/default_images/svtools/res/edh03.png b/ooo_custom_images/hicontrast/svtools/res/ed03.png
index c6365aedfb82..c6365aedfb82 100644
--- a/default_images/svtools/res/edh03.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed03.png
diff --git a/default_images/svtools/res/edh04.png b/ooo_custom_images/hicontrast/svtools/res/ed04.png
index 8590438ff155..8590438ff155 100644
--- a/default_images/svtools/res/edh04.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed04.png
diff --git a/default_images/svtools/res/edh05.png b/ooo_custom_images/hicontrast/svtools/res/ed05.png
index e6f19d7e8d24..e6f19d7e8d24 100644
--- a/default_images/svtools/res/edh05.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed05.png
diff --git a/default_images/svtools/res/edh06.png b/ooo_custom_images/hicontrast/svtools/res/ed06.png
index 8b3f7c3866aa..8b3f7c3866aa 100644
--- a/default_images/svtools/res/edh06.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed06.png
diff --git a/default_images/svtools/res/edh07.png b/ooo_custom_images/hicontrast/svtools/res/ed07.png
index 6ac60ad722e5..6ac60ad722e5 100644
--- a/default_images/svtools/res/edh07.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed07.png
diff --git a/default_images/svtools/res/edh08.png b/ooo_custom_images/hicontrast/svtools/res/ed08.png
index 320980800c62..320980800c62 100644
--- a/default_images/svtools/res/edh08.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed08.png
diff --git a/default_images/svtools/res/edh09.png b/ooo_custom_images/hicontrast/svtools/res/ed09.png
index 1a5176043730..1a5176043730 100644
--- a/default_images/svtools/res/edh09.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ed09.png
diff --git a/default_images/svtools/res/info_large_h.png b/ooo_custom_images/hicontrast/svtools/res/info_large.png
index ef493d8b1d23..ef493d8b1d23 100644
--- a/default_images/svtools/res/info_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/info_large.png
diff --git a/default_images/svtools/res/info_small_h.png b/ooo_custom_images/hicontrast/svtools/res/info_small.png
index 0a01497b33e8..0a01497b33e8 100644
--- a/default_images/svtools/res/info_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/info_small.png
diff --git a/default_images/svtools/res/my_docs_h.png b/ooo_custom_images/hicontrast/svtools/res/my_docs.png
index 6b69a845d616..6b69a845d616 100644
--- a/default_images/svtools/res/my_docs_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/my_docs.png
diff --git a/default_images/svtools/res/ncollate_h.png b/ooo_custom_images/hicontrast/svtools/res/ncollate.png
index 91e066b9b09b..91e066b9b09b 100644
--- a/default_images/svtools/res/ncollate_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/ncollate.png
diff --git a/default_images/svtools/res/new_doc_h.png b/ooo_custom_images/hicontrast/svtools/res/new_doc.png
index de0e560247be..de0e560247be 100644
--- a/default_images/svtools/res/new_doc_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/new_doc.png
diff --git a/default_images/svtools/res/preview_large_h.png b/ooo_custom_images/hicontrast/svtools/res/preview_large.png
index a095c8ef0ddd..a095c8ef0ddd 100644
--- a/default_images/svtools/res/preview_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/preview_large.png
diff --git a/default_images/svtools/res/preview_small_h.png b/ooo_custom_images/hicontrast/svtools/res/preview_small.png
index c5653757d504..c5653757d504 100644
--- a/default_images/svtools/res/preview_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/preview_small.png
diff --git a/default_images/svtools/res/prnfont_h.png b/ooo_custom_images/hicontrast/svtools/res/prnfont.png
index 9f4e007ac9bc..9f4e007ac9bc 100644
--- a/default_images/svtools/res/prnfont_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/prnfont.png
diff --git a/default_images/svtools/res/samples_h.png b/ooo_custom_images/hicontrast/svtools/res/samples.png
index caa4efc20633..caa4efc20633 100644
--- a/default_images/svtools/res/samples_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/samples.png
diff --git a/default_images/svtools/res/scalfont_h.png b/ooo_custom_images/hicontrast/svtools/res/scalfont.png
index f316df53bebd..f316df53bebd 100644
--- a/default_images/svtools/res/scalfont_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/scalfont.png
diff --git a/default_images/svtools/res/template_h.png b/ooo_custom_images/hicontrast/svtools/res/template.png
index dd95c2900375..dd95c2900375 100644
--- a/default_images/svtools/res/template_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/template.png
diff --git a/default_images/svtools/res/triangle_down_hc.png b/ooo_custom_images/hicontrast/svtools/res/triangle_down.png
index 732a1e86b43c..732a1e86b43c 100644
--- a/default_images/svtools/res/triangle_down_hc.png
+++ b/ooo_custom_images/hicontrast/svtools/res/triangle_down.png
diff --git a/default_images/svtools/res/triangle_right_hc.png b/ooo_custom_images/hicontrast/svtools/res/triangle_right.png
index 33037a35fb55..33037a35fb55 100644
--- a/default_images/svtools/res/triangle_right_hc.png
+++ b/ooo_custom_images/hicontrast/svtools/res/triangle_right.png
diff --git a/default_images/svtools/res/up_large_h.png b/ooo_custom_images/hicontrast/svtools/res/up_large.png
index cc6ba7dce017..cc6ba7dce017 100644
--- a/default_images/svtools/res/up_large_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/up_large.png
diff --git a/default_images/svtools/res/up_small_h.png b/ooo_custom_images/hicontrast/svtools/res/up_small.png
index e8122b21845a..e8122b21845a 100644
--- a/default_images/svtools/res/up_small_h.png
+++ b/ooo_custom_images/hicontrast/svtools/res/up_small.png
diff --git a/default_images/svx/res/3dgeo_h.png b/ooo_custom_images/hicontrast/svx/res/3dgeo.png
index f21f22d3ac81..f21f22d3ac81 100644
--- a/default_images/svx/res/3dgeo_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3dgeo.png
diff --git a/default_images/svx/res/3dlight_h.png b/ooo_custom_images/hicontrast/svx/res/3dlight.png
index 877cfe5c57c1..877cfe5c57c1 100644
--- a/default_images/svx/res/3dlight_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3dlight.png
diff --git a/default_images/svx/res/3drepres_h.png b/ooo_custom_images/hicontrast/svx/res/3drepres.png
index 0cb9693c88f9..0cb9693c88f9 100644
--- a/default_images/svx/res/3drepres_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3drepres.png
diff --git a/default_images/svx/res/3dtextur_h.png b/ooo_custom_images/hicontrast/svx/res/3dtextur.png
index 2f96edb6a2a0..2f96edb6a2a0 100644
--- a/default_images/svx/res/3dtextur_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/3dtextur.png
diff --git a/default_images/svx/res/apply_h.png b/ooo_custom_images/hicontrast/svx/res/apply.png
index 1f7df9c5f169..1f7df9c5f169 100644
--- a/default_images/svx/res/apply_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/apply.png
diff --git a/default_images/svx/res/blend3d_h.png b/ooo_custom_images/hicontrast/svx/res/blend3d.png
index 763d7ee1f37f..763d7ee1f37f 100644
--- a/default_images/svx/res/blend3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/blend3d.png
diff --git a/default_images/svx/res/brightlit_16_h.png b/ooo_custom_images/hicontrast/svx/res/brightlit_16.png
index 02d20fcfdb7f..02d20fcfdb7f 100644
--- a/default_images/svx/res/brightlit_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/brightlit_16.png
diff --git a/default_images/svx/res/caution_11x16_h.png b/ooo_custom_images/hicontrast/svx/res/caution_11x16.png
index 96c92542bced..96c92542bced 100644
--- a/default_images/svx/res/caution_11x16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/caution_11x16.png
diff --git a/default_images/svx/res/cdh01.png b/ooo_custom_images/hicontrast/svx/res/cd01.png
index 84a2174a3935..84a2174a3935 100644
--- a/default_images/svx/res/cdh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd01.png
diff --git a/default_images/svx/res/cdh015.png b/ooo_custom_images/hicontrast/svx/res/cd015.png
index 1321c42544af..1321c42544af 100644
--- a/default_images/svx/res/cdh015.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd015.png
diff --git a/default_images/svx/res/cdh016.png b/ooo_custom_images/hicontrast/svx/res/cd016.png
index 2fdd4c14f534..2fdd4c14f534 100644
--- a/default_images/svx/res/cdh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd016.png
diff --git a/default_images/svx/res/cdh017.png b/ooo_custom_images/hicontrast/svx/res/cd017.png
index 35f86a1976ca..35f86a1976ca 100644
--- a/default_images/svx/res/cdh017.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd017.png
diff --git a/default_images/svx/res/cdh018.png b/ooo_custom_images/hicontrast/svx/res/cd018.png
index 5a10792da5ab..5a10792da5ab 100644
--- a/default_images/svx/res/cdh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd018.png
diff --git a/default_images/svx/res/cdh02.png b/ooo_custom_images/hicontrast/svx/res/cd02.png
index 27ba1b103236..27ba1b103236 100644
--- a/default_images/svx/res/cdh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd02.png
diff --git a/default_images/svx/res/cdh020.png b/ooo_custom_images/hicontrast/svx/res/cd020.png
index 01ad92a6beb8..01ad92a6beb8 100644
--- a/default_images/svx/res/cdh020.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd020.png
diff --git a/default_images/svx/res/cdh021.png b/ooo_custom_images/hicontrast/svx/res/cd021.png
index b615045b0893..b615045b0893 100644
--- a/default_images/svx/res/cdh021.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd021.png
diff --git a/default_images/svx/res/cdh025.png b/ooo_custom_images/hicontrast/svx/res/cd025.png
index 058e894bbe36..058e894bbe36 100644
--- a/default_images/svx/res/cdh025.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd025.png
diff --git a/default_images/svx/res/cdh026.png b/ooo_custom_images/hicontrast/svx/res/cd026.png
index 8df38965b87c..8df38965b87c 100644
--- a/default_images/svx/res/cdh026.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd026.png
diff --git a/default_images/svx/res/cdh05.png b/ooo_custom_images/hicontrast/svx/res/cd05.png
index fc0efe9e7806..fc0efe9e7806 100644
--- a/default_images/svx/res/cdh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd05.png
diff --git a/default_images/svx/res/cdh06.png b/ooo_custom_images/hicontrast/svx/res/cd06.png
index 05498575b823..05498575b823 100644
--- a/default_images/svx/res/cdh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd06.png
diff --git a/default_images/svx/res/cdh07.png b/ooo_custom_images/hicontrast/svx/res/cd07.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/svx/res/cdh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd07.png
diff --git a/default_images/svx/res/cdh08.png b/ooo_custom_images/hicontrast/svx/res/cd08.png
index 6208cdf370af..6208cdf370af 100644
--- a/default_images/svx/res/cdh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/cd08.png
diff --git a/default_images/svx/res/color_h.png b/ooo_custom_images/hicontrast/svx/res/color.png
index 170e7c17a3cd..170e7c17a3cd 100644
--- a/default_images/svx/res/color_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/color.png
diff --git a/default_images/svx/res/colordlg_h.png b/ooo_custom_images/hicontrast/svx/res/colordlg.png
index b2f5870e15f4..b2f5870e15f4 100644
--- a/default_images/svx/res/colordlg_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/colordlg.png
diff --git a/default_images/svx/res/convrt3d_h.png b/ooo_custom_images/hicontrast/svx/res/convrt3d.png
index a2a8852d04e2..a2a8852d04e2 100644
--- a/default_images/svx/res/convrt3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/convrt3d.png
diff --git a/default_images/svx/res/dimlit_16_h.png b/ooo_custom_images/hicontrast/svx/res/dimlit_16.png
index 14a444b1c428..14a444b1c428 100644
--- a/default_images/svx/res/dimlit_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dimlit_16.png
diff --git a/default_images/svx/res/directioneast_22_h.png b/ooo_custom_images/hicontrast/svx/res/directioneast_22.png
index a1d294ab85bc..a1d294ab85bc 100644
--- a/default_images/svx/res/directioneast_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directioneast_22.png
diff --git a/default_images/svx/res/directionnorth_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionnorth_22.png
index ef81b673c31d..ef81b673c31d 100644
--- a/default_images/svx/res/directionnorth_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionnorth_22.png
diff --git a/default_images/svx/res/directionnortheast_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionnortheast_22.png
index 1d553c5e30bc..1d553c5e30bc 100644
--- a/default_images/svx/res/directionnortheast_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionnortheast_22.png
diff --git a/default_images/svx/res/directionnorthwest_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionnorthwest_22.png
index 0af0c04418c3..0af0c04418c3 100644
--- a/default_images/svx/res/directionnorthwest_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionnorthwest_22.png
diff --git a/default_images/svx/res/directionsouth_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionsouth_22.png
index c938713f668f..c938713f668f 100644
--- a/default_images/svx/res/directionsouth_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionsouth_22.png
diff --git a/default_images/svx/res/directionsoutheast_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionsoutheast_22.png
index afa1c1025970..afa1c1025970 100644
--- a/default_images/svx/res/directionsoutheast_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionsoutheast_22.png
diff --git a/default_images/svx/res/directionsouthwest_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionsouthwest_22.png
index 36b93271b14d..36b93271b14d 100644
--- a/default_images/svx/res/directionsouthwest_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionsouthwest_22.png
diff --git a/default_images/svx/res/directionstraight_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionstraight_22.png
index 162d232e2311..162d232e2311 100644
--- a/default_images/svx/res/directionstraight_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionstraight_22.png
diff --git a/default_images/svx/res/directionwest_22_h.png b/ooo_custom_images/hicontrast/svx/res/directionwest_22.png
index 1be63ebe92ac..1be63ebe92ac 100644
--- a/default_images/svx/res/directionwest_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/directionwest_22.png
diff --git a/default_images/svx/res/doublesi_h.png b/ooo_custom_images/hicontrast/svx/res/doublesi.png
index 5e83b519ff55..5e83b519ff55 100644
--- a/default_images/svx/res/doublesi_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/doublesi.png
diff --git a/default_images/svx/res/dsth_cen_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_cen.png
index 566579e2ac03..566579e2ac03 100644
--- a/default_images/svx/res/dsth_cen_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_cen.png
diff --git a/default_images/svx/res/dsth_dst_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_dst.png
index 8fdefa61011e..8fdefa61011e 100644
--- a/default_images/svx/res/dsth_dst_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_dst.png
diff --git a/default_images/svx/res/dsth_hig_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_hig.png
index 7a95abba9c8d..7a95abba9c8d 100644
--- a/default_images/svx/res/dsth_hig_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_hig.png
diff --git a/default_images/svx/res/dsth_low_h.png b/ooo_custom_images/hicontrast/svx/res/dsth_low.png
index 4c48db45a817..4c48db45a817 100644
--- a/default_images/svx/res/dsth_low_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dsth_low.png
diff --git a/default_images/svx/res/dstv_cen_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_cen.png
index ec7e664d8b29..ec7e664d8b29 100644
--- a/default_images/svx/res/dstv_cen_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_cen.png
diff --git a/default_images/svx/res/dstv_dst_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_dst.png
index 92f2917f4999..92f2917f4999 100644
--- a/default_images/svx/res/dstv_dst_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_dst.png
diff --git a/default_images/svx/res/dstv_hig_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_hig.png
index 19f32b41a407..19f32b41a407 100644
--- a/default_images/svx/res/dstv_hig_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_hig.png
diff --git a/default_images/svx/res/dstv_low_h.png b/ooo_custom_images/hicontrast/svx/res/dstv_low.png
index 3abb40d926f0..3abb40d926f0 100644
--- a/default_images/svx/res/dstv_low_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/dstv_low.png
diff --git a/default_images/svx/res/extrusion05inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion05inch_16.png
index 24da4c7910a9..24da4c7910a9 100644
--- a/default_images/svx/res/extrusion05inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion05inch_16.png
diff --git a/default_images/svx/res/extrusion0inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion0inch_16.png
index 0ba962352ee2..0ba962352ee2 100644
--- a/default_images/svx/res/extrusion0inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion0inch_16.png
diff --git a/default_images/svx/res/extrusion1inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion1inch_16.png
index 32086aaa354c..32086aaa354c 100644
--- a/default_images/svx/res/extrusion1inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion1inch_16.png
diff --git a/default_images/svx/res/extrusion2inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion2inch_16.png
index 66063dfcbb22..66063dfcbb22 100644
--- a/default_images/svx/res/extrusion2inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion2inch_16.png
diff --git a/default_images/svx/res/extrusion4inch_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusion4inch_16.png
index 4e5c0bfde632..4e5c0bfde632 100644
--- a/default_images/svx/res/extrusion4inch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusion4inch_16.png
diff --git a/default_images/svx/res/extrusioninfinity_16_h.png b/ooo_custom_images/hicontrast/svx/res/extrusioninfinity_16.png
index 65b4c02f9685..65b4c02f9685 100644
--- a/default_images/svx/res/extrusioninfinity_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/extrusioninfinity_16.png
diff --git a/default_images/svx/res/filter3d_h.png b/ooo_custom_images/hicontrast/svx/res/filter3d.png
index c815bd93ae83..c815bd93ae83 100644
--- a/default_images/svx/res/filter3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/filter3d.png
diff --git a/default_images/svx/res/fontworkaligncentered_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_16.png
index 6cf6ba71cef7..6cf6ba71cef7 100644
--- a/default_images/svx/res/fontworkaligncentered_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_16.png
diff --git a/default_images/svx/res/fontworkaligncentered_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_26.png
index e80b3b532ce6..e80b3b532ce6 100644
--- a/default_images/svx/res/fontworkaligncentered_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkaligncentered_26.png
diff --git a/default_images/svx/res/fontworkalignjustified_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_16.png
index 503bddbbd10c..503bddbbd10c 100644
--- a/default_images/svx/res/fontworkalignjustified_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_16.png
diff --git a/default_images/svx/res/fontworkalignjustified_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_26.png
index b2e95db780c3..b2e95db780c3 100644
--- a/default_images/svx/res/fontworkalignjustified_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignjustified_26.png
diff --git a/default_images/svx/res/fontworkalignleft_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_16.png
index 32cbbf9f5d2b..32cbbf9f5d2b 100644
--- a/default_images/svx/res/fontworkalignleft_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_16.png
diff --git a/default_images/svx/res/fontworkalignleft_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_26.png
index 3255d27d9f5d..3255d27d9f5d 100644
--- a/default_images/svx/res/fontworkalignleft_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignleft_26.png
diff --git a/default_images/svx/res/fontworkalignright_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_16.png
index 89cdc084247b..89cdc084247b 100644
--- a/default_images/svx/res/fontworkalignright_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_16.png
diff --git a/default_images/svx/res/fontworkalignright_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_26.png
index 073da720a0c4..073da720a0c4 100644
--- a/default_images/svx/res/fontworkalignright_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignright_26.png
diff --git a/default_images/svx/res/fontworkalignstretch_16_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_16.png
index e670d0c3390b..e670d0c3390b 100644
--- a/default_images/svx/res/fontworkalignstretch_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_16.png
diff --git a/default_images/svx/res/fontworkalignstretch_26_h.png b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_26.png
index d31f5b90a064..d31f5b90a064 100644
--- a/default_images/svx/res/fontworkalignstretch_26_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fontworkalignstretch_26.png
diff --git a/default_images/svx/res/frh01.png b/ooo_custom_images/hicontrast/svx/res/fr01.png
index 6219cd704eee..6219cd704eee 100644
--- a/default_images/svx/res/frh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr01.png
diff --git a/default_images/svx/res/frh010.png b/ooo_custom_images/hicontrast/svx/res/fr010.png
index 3e82afa1f068..3e82afa1f068 100644
--- a/default_images/svx/res/frh010.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr010.png
diff --git a/default_images/svx/res/frh011.png b/ooo_custom_images/hicontrast/svx/res/fr011.png
index 4eb8dd02589f..4eb8dd02589f 100644
--- a/default_images/svx/res/frh011.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr011.png
diff --git a/default_images/svx/res/frh012.png b/ooo_custom_images/hicontrast/svx/res/fr012.png
index 0a358a228649..0a358a228649 100644
--- a/default_images/svx/res/frh012.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr012.png
diff --git a/default_images/svx/res/frh02.png b/ooo_custom_images/hicontrast/svx/res/fr02.png
index e22daed08de3..e22daed08de3 100644
--- a/default_images/svx/res/frh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr02.png
diff --git a/default_images/svx/res/frh03.png b/ooo_custom_images/hicontrast/svx/res/fr03.png
index cf2e5ff6cc92..cf2e5ff6cc92 100644
--- a/default_images/svx/res/frh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr03.png
diff --git a/default_images/svx/res/frh04.png b/ooo_custom_images/hicontrast/svx/res/fr04.png
index 678f886445e7..678f886445e7 100644
--- a/default_images/svx/res/frh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr04.png
diff --git a/default_images/svx/res/frh05.png b/ooo_custom_images/hicontrast/svx/res/fr05.png
index f606dd3d7b30..f606dd3d7b30 100644
--- a/default_images/svx/res/frh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr05.png
diff --git a/default_images/svx/res/frh06.png b/ooo_custom_images/hicontrast/svx/res/fr06.png
index a775d2969739..a775d2969739 100644
--- a/default_images/svx/res/frh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr06.png
diff --git a/default_images/svx/res/frh07.png b/ooo_custom_images/hicontrast/svx/res/fr07.png
index 277ef7493865..277ef7493865 100644
--- a/default_images/svx/res/frh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr07.png
diff --git a/default_images/svx/res/frh08.png b/ooo_custom_images/hicontrast/svx/res/fr08.png
index 9eac2c23b99f..9eac2c23b99f 100644
--- a/default_images/svx/res/frh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr08.png
diff --git a/default_images/svx/res/frh09.png b/ooo_custom_images/hicontrast/svx/res/fr09.png
index 3941b586a9f8..3941b586a9f8 100644
--- a/default_images/svx/res/frh09.png
+++ b/ooo_custom_images/hicontrast/svx/res/fr09.png
diff --git a/default_images/svx/res/fwh01.png b/ooo_custom_images/hicontrast/svx/res/fw01.png
index 2ce6b9ad5329..2ce6b9ad5329 100644
--- a/default_images/svx/res/fwh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw01.png
diff --git a/default_images/svx/res/fwh010.png b/ooo_custom_images/hicontrast/svx/res/fw010.png
index 2a8fd784ecce..2a8fd784ecce 100644
--- a/default_images/svx/res/fwh010.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw010.png
diff --git a/default_images/svx/res/fwh011.png b/ooo_custom_images/hicontrast/svx/res/fw011.png
index fdeaa4eae1d4..fdeaa4eae1d4 100644
--- a/default_images/svx/res/fwh011.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw011.png
diff --git a/default_images/svx/res/fwh012.png b/ooo_custom_images/hicontrast/svx/res/fw012.png
index a294ae9f51c6..a294ae9f51c6 100644
--- a/default_images/svx/res/fwh012.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw012.png
diff --git a/default_images/svx/res/fwh013.png b/ooo_custom_images/hicontrast/svx/res/fw013.png
index 67dfcbe9d7fa..67dfcbe9d7fa 100644
--- a/default_images/svx/res/fwh013.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw013.png
diff --git a/default_images/svx/res/fwh014.png b/ooo_custom_images/hicontrast/svx/res/fw014.png
index 45197a5a9f6f..45197a5a9f6f 100644
--- a/default_images/svx/res/fwh014.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw014.png
diff --git a/default_images/svx/res/fwh015.png b/ooo_custom_images/hicontrast/svx/res/fw015.png
index 2ec39a2a1892..2ec39a2a1892 100644
--- a/default_images/svx/res/fwh015.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw015.png
diff --git a/default_images/svx/res/fwh016.png b/ooo_custom_images/hicontrast/svx/res/fw016.png
index 276fefa5e6ba..276fefa5e6ba 100644
--- a/default_images/svx/res/fwh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw016.png
diff --git a/default_images/svx/res/fwh017.png b/ooo_custom_images/hicontrast/svx/res/fw017.png
index 6dcdd3750c4d..6dcdd3750c4d 100644
--- a/default_images/svx/res/fwh017.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw017.png
diff --git a/default_images/svx/res/fwh018.png b/ooo_custom_images/hicontrast/svx/res/fw018.png
index aa76e92dae8d..aa76e92dae8d 100644
--- a/default_images/svx/res/fwh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw018.png
diff --git a/default_images/svx/res/fwh019.png b/ooo_custom_images/hicontrast/svx/res/fw019.png
index b696e0b0fdc9..b696e0b0fdc9 100644
--- a/default_images/svx/res/fwh019.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw019.png
diff --git a/default_images/svx/res/fwh02.png b/ooo_custom_images/hicontrast/svx/res/fw02.png
index 447c15043952..447c15043952 100644
--- a/default_images/svx/res/fwh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw02.png
diff --git a/default_images/svx/res/fwh020.png b/ooo_custom_images/hicontrast/svx/res/fw020.png
index cddaefb1ccf7..cddaefb1ccf7 100644
--- a/default_images/svx/res/fwh020.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw020.png
diff --git a/default_images/svx/res/fwh021.png b/ooo_custom_images/hicontrast/svx/res/fw021.png
index ca54848c415a..ca54848c415a 100644
--- a/default_images/svx/res/fwh021.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw021.png
diff --git a/default_images/svx/res/fwh03.png b/ooo_custom_images/hicontrast/svx/res/fw03.png
index d0242472ba2d..d0242472ba2d 100644
--- a/default_images/svx/res/fwh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw03.png
diff --git a/default_images/svx/res/fwh04.png b/ooo_custom_images/hicontrast/svx/res/fw04.png
index b72fdb5afaab..b72fdb5afaab 100644
--- a/default_images/svx/res/fwh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw04.png
diff --git a/default_images/svx/res/fwh05.png b/ooo_custom_images/hicontrast/svx/res/fw05.png
index 71d5a76bae4b..71d5a76bae4b 100644
--- a/default_images/svx/res/fwh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw05.png
diff --git a/default_images/svx/res/fwh06.png b/ooo_custom_images/hicontrast/svx/res/fw06.png
index ff9da0da3b53..ff9da0da3b53 100644
--- a/default_images/svx/res/fwh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw06.png
diff --git a/default_images/svx/res/fwh07.png b/ooo_custom_images/hicontrast/svx/res/fw07.png
index 5a08dda34bec..5a08dda34bec 100644
--- a/default_images/svx/res/fwh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw07.png
diff --git a/default_images/svx/res/fwh08.png b/ooo_custom_images/hicontrast/svx/res/fw08.png
index 43d3b35925c1..43d3b35925c1 100644
--- a/default_images/svx/res/fwh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw08.png
diff --git a/default_images/svx/res/fwh09.png b/ooo_custom_images/hicontrast/svx/res/fw09.png
index 7cac299dde81..7cac299dde81 100644
--- a/default_images/svx/res/fwh09.png
+++ b/ooo_custom_images/hicontrast/svx/res/fw09.png
diff --git a/default_images/svx/res/fwbhcirc_h.png b/ooo_custom_images/hicontrast/svx/res/fwbhcirc.png
index be02c6745c6c..be02c6745c6c 100644
--- a/default_images/svx/res/fwbhcirc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbhcirc.png
diff --git a/default_images/svx/res/fwbotarc_h.png b/ooo_custom_images/hicontrast/svx/res/fwbotarc.png
index 7e1adaa8ab3e..7e1adaa8ab3e 100644
--- a/default_images/svx/res/fwbotarc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbotarc.png
diff --git a/default_images/svx/res/fwbuttn1_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn1.png
index 009a9ea192e4..009a9ea192e4 100644
--- a/default_images/svx/res/fwbuttn1_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn1.png
diff --git a/default_images/svx/res/fwbuttn2_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn2.png
index 265716121c31..265716121c31 100644
--- a/default_images/svx/res/fwbuttn2_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn2.png
diff --git a/default_images/svx/res/fwbuttn3_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn3.png
index de1b25a6f8a4..de1b25a6f8a4 100644
--- a/default_images/svx/res/fwbuttn3_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn3.png
diff --git a/default_images/svx/res/fwbuttn4_h.png b/ooo_custom_images/hicontrast/svx/res/fwbuttn4.png
index 4cb545a5a7b2..4cb545a5a7b2 100644
--- a/default_images/svx/res/fwbuttn4_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwbuttn4.png
diff --git a/default_images/svx/res/fwlftarc_h.png b/ooo_custom_images/hicontrast/svx/res/fwlftarc.png
index e41ae4cf0bbe..e41ae4cf0bbe 100644
--- a/default_images/svx/res/fwlftarc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwlftarc.png
diff --git a/default_images/svx/res/fwlhcirc_h.png b/ooo_custom_images/hicontrast/svx/res/fwlhcirc.png
index fee3758dd326..fee3758dd326 100644
--- a/default_images/svx/res/fwlhcirc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwlhcirc.png
diff --git a/default_images/svx/res/fwrgtarc_h.png b/ooo_custom_images/hicontrast/svx/res/fwrgtarc.png
index 6109b1f8f8c9..6109b1f8f8c9 100644
--- a/default_images/svx/res/fwrgtarc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwrgtarc.png
diff --git a/default_images/svx/res/fwrhcirc_h.png b/ooo_custom_images/hicontrast/svx/res/fwrhcirc.png
index c0cac6a936da..c0cac6a936da 100644
--- a/default_images/svx/res/fwrhcirc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwrhcirc.png
diff --git a/default_images/svx/res/fwtoparc_h.png b/ooo_custom_images/hicontrast/svx/res/fwtoparc.png
index 77c4d6760e96..77c4d6760e96 100644
--- a/default_images/svx/res/fwtoparc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/fwtoparc.png
diff --git a/default_images/svx/res/galicon_h.png b/ooo_custom_images/hicontrast/svx/res/galicon.png
index 82a6196cb54e..82a6196cb54e 100644
--- a/default_images/svx/res/galicon_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/galicon.png
diff --git a/default_images/svx/res/gallist_h.png b/ooo_custom_images/hicontrast/svx/res/gallist.png
index 1ed927c3a420..1ed927c3a420 100644
--- a/default_images/svx/res/gallist_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/gallist.png
diff --git a/default_images/svx/res/idh01.png b/ooo_custom_images/hicontrast/svx/res/id01.png
index 8e8349020a11..8e8349020a11 100644
--- a/default_images/svx/res/idh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/id01.png
diff --git a/default_images/svx/res/idh016.png b/ooo_custom_images/hicontrast/svx/res/id016.png
index 1f1649abaf61..1f1649abaf61 100644
--- a/default_images/svx/res/idh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/id016.png
diff --git a/default_images/svx/res/idh018.png b/ooo_custom_images/hicontrast/svx/res/id018.png
index 6017e465ef49..6017e465ef49 100644
--- a/default_images/svx/res/idh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/id018.png
diff --git a/default_images/svx/res/idh019.png b/ooo_custom_images/hicontrast/svx/res/id019.png
index 5fb1890f3a27..5fb1890f3a27 100644
--- a/default_images/svx/res/idh019.png
+++ b/ooo_custom_images/hicontrast/svx/res/id019.png
diff --git a/default_images/svx/res/idh02.png b/ooo_custom_images/hicontrast/svx/res/id02.png
index 892919bfea2a..892919bfea2a 100644
--- a/default_images/svx/res/idh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/id02.png
diff --git a/default_images/svx/res/idh03.png b/ooo_custom_images/hicontrast/svx/res/id03.png
index b8914b52f420..b8914b52f420 100644
--- a/default_images/svx/res/idh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/id03.png
diff --git a/default_images/svx/res/idh030.png b/ooo_custom_images/hicontrast/svx/res/id030.png
index 7c66ef255c96..7c66ef255c96 100644
--- a/default_images/svx/res/idh030.png
+++ b/ooo_custom_images/hicontrast/svx/res/id030.png
diff --git a/default_images/svx/res/idh031.png b/ooo_custom_images/hicontrast/svx/res/id031.png
index d238cf2a1528..d238cf2a1528 100644
--- a/default_images/svx/res/idh031.png
+++ b/ooo_custom_images/hicontrast/svx/res/id031.png
diff --git a/default_images/svx/res/idh032.png b/ooo_custom_images/hicontrast/svx/res/id032.png
index 8a4899be66f7..8a4899be66f7 100644
--- a/default_images/svx/res/idh032.png
+++ b/ooo_custom_images/hicontrast/svx/res/id032.png
diff --git a/default_images/svx/res/idh033.png b/ooo_custom_images/hicontrast/svx/res/id033.png
index 5a10792da5ab..5a10792da5ab 100644
--- a/default_images/svx/res/idh033.png
+++ b/ooo_custom_images/hicontrast/svx/res/id033.png
diff --git a/default_images/svx/res/idh04.png b/ooo_custom_images/hicontrast/svx/res/id04.png
index f8d2ff0a175e..f8d2ff0a175e 100644
--- a/default_images/svx/res/idh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/id04.png
diff --git a/default_images/svx/res/idh040.png b/ooo_custom_images/hicontrast/svx/res/id040.png
index 01ad92a6beb8..01ad92a6beb8 100644
--- a/default_images/svx/res/idh040.png
+++ b/ooo_custom_images/hicontrast/svx/res/id040.png
diff --git a/default_images/svx/res/idh041.png b/ooo_custom_images/hicontrast/svx/res/id041.png
index b615045b0893..b615045b0893 100644
--- a/default_images/svx/res/idh041.png
+++ b/ooo_custom_images/hicontrast/svx/res/id041.png
diff --git a/default_images/svx/res/idh05.png b/ooo_custom_images/hicontrast/svx/res/id05.png
index 05498575b823..05498575b823 100644
--- a/default_images/svx/res/idh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/id05.png
diff --git a/default_images/svx/res/idh06.png b/ooo_custom_images/hicontrast/svx/res/id06.png
index 9184f1ab3493..9184f1ab3493 100644
--- a/default_images/svx/res/idh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/id06.png
diff --git a/default_images/svx/res/idh07.png b/ooo_custom_images/hicontrast/svx/res/id07.png
index 6fd579d69242..6fd579d69242 100644
--- a/default_images/svx/res/idh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/id07.png
diff --git a/default_images/svx/res/idh08.png b/ooo_custom_images/hicontrast/svx/res/id08.png
index 257bdd3d0e4f..257bdd3d0e4f 100644
--- a/default_images/svx/res/idh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/id08.png
diff --git a/default_images/svx/res/invert3d_h.png b/ooo_custom_images/hicontrast/svx/res/invert3d.png
index e6c21d9e17c5..e6c21d9e17c5 100644
--- a/default_images/svx/res/invert3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/invert3d.png
diff --git a/default_images/svx/res/legtyp1_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp1.png
index 34a38d466330..34a38d466330 100644
--- a/default_images/svx/res/legtyp1_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp1.png
diff --git a/default_images/svx/res/legtyp2_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp2.png
index 661509380615..661509380615 100644
--- a/default_images/svx/res/legtyp2_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp2.png
diff --git a/default_images/svx/res/legtyp3_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp3.png
index 9c1f28617ba3..9c1f28617ba3 100644
--- a/default_images/svx/res/legtyp3_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp3.png
diff --git a/default_images/svx/res/legtyp4_hc.png b/ooo_custom_images/hicontrast/svx/res/legtyp4.png
index e5b736f13995..e5b736f13995 100644
--- a/default_images/svx/res/legtyp4_hc.png
+++ b/ooo_custom_images/hicontrast/svx/res/legtyp4.png
diff --git a/default_images/svx/res/lght2sid_h.png b/ooo_custom_images/hicontrast/svx/res/lght2sid.png
index ad6a4bc467d4..ad6a4bc467d4 100644
--- a/default_images/svx/res/lght2sid_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lght2sid.png
diff --git a/default_images/svx/res/light_h.png b/ooo_custom_images/hicontrast/svx/res/light.png
index ea435a2467b3..ea435a2467b3 100644
--- a/default_images/svx/res/light_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/light.png
diff --git a/default_images/svx/res/lightfrombottom_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfrombottom_22.png
index 4cf6656ba22d..4cf6656ba22d 100644
--- a/default_images/svx/res/lightfrombottom_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfrombottom_22.png
diff --git a/default_images/svx/res/lightfrombottomleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfrombottomleft_22.png
index 3e7d1426aaa6..3e7d1426aaa6 100644
--- a/default_images/svx/res/lightfrombottomleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfrombottomleft_22.png
diff --git a/default_images/svx/res/lightfrombottomright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfrombottomright_22.png
index 96830b0b4030..96830b0b4030 100644
--- a/default_images/svx/res/lightfrombottomright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfrombottomright_22.png
diff --git a/default_images/svx/res/lightfromfront_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromfront_22.png
index 565886e450a0..565886e450a0 100644
--- a/default_images/svx/res/lightfromfront_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromfront_22.png
diff --git a/default_images/svx/res/lightfromleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromleft_22.png
index cb2f451435ac..cb2f451435ac 100644
--- a/default_images/svx/res/lightfromleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromleft_22.png
diff --git a/default_images/svx/res/lightfromright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromright_22.png
index cffaf73854f2..cffaf73854f2 100644
--- a/default_images/svx/res/lightfromright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromright_22.png
diff --git a/default_images/svx/res/lightfromtop_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromtop_22.png
index 5f5a6c18588a..5f5a6c18588a 100644
--- a/default_images/svx/res/lightfromtop_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromtop_22.png
diff --git a/default_images/svx/res/lightfromtopleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromtopleft_22.png
index e1de1e7697a9..e1de1e7697a9 100644
--- a/default_images/svx/res/lightfromtopleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromtopleft_22.png
diff --git a/default_images/svx/res/lightfromtopright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightfromtopright_22.png
index 14e0ee993a0c..14e0ee993a0c 100644
--- a/default_images/svx/res/lightfromtopright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightfromtopright_22.png
diff --git a/default_images/svx/res/lightofffrombottom_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffrombottom_22.png
index 1173a24e8cfb..1173a24e8cfb 100644
--- a/default_images/svx/res/lightofffrombottom_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffrombottom_22.png
diff --git a/default_images/svx/res/lightofffrombottomleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomleft_22.png
index 3640bad7e098..3640bad7e098 100644
--- a/default_images/svx/res/lightofffrombottomleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomleft_22.png
diff --git a/default_images/svx/res/lightofffrombottomright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomright_22.png
index ea12a1de497f..ea12a1de497f 100644
--- a/default_images/svx/res/lightofffrombottomright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffrombottomright_22.png
diff --git a/default_images/svx/res/lightofffromleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromleft_22.png
index 259556796bf9..259556796bf9 100644
--- a/default_images/svx/res/lightofffromleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromleft_22.png
diff --git a/default_images/svx/res/lightofffromright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromright_22.png
index 42976c0df495..42976c0df495 100644
--- a/default_images/svx/res/lightofffromright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromright_22.png
diff --git a/default_images/svx/res/lightofffromtop_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromtop_22.png
index 2fc8f20bd7b9..2fc8f20bd7b9 100644
--- a/default_images/svx/res/lightofffromtop_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromtop_22.png
diff --git a/default_images/svx/res/lightofffromtopleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromtopleft_22.png
index a1b4460c3498..a1b4460c3498 100644
--- a/default_images/svx/res/lightofffromtopleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromtopleft_22.png
diff --git a/default_images/svx/res/lightofffromtopright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightofffromtopright_22.png
index 26664aff67a7..26664aff67a7 100644
--- a/default_images/svx/res/lightofffromtopright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightofffromtopright_22.png
diff --git a/default_images/svx/res/lighton_h.png b/ooo_custom_images/hicontrast/svx/res/lighton.png
index cf44426be78e..cf44426be78e 100644
--- a/default_images/svx/res/lighton_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lighton.png
diff --git a/default_images/svx/res/lightonfrombottom_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfrombottom_22.png
index 184797cc51cd..184797cc51cd 100644
--- a/default_images/svx/res/lightonfrombottom_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfrombottom_22.png
diff --git a/default_images/svx/res/lightonfrombottomleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomleft_22.png
index 248b865b7687..248b865b7687 100644
--- a/default_images/svx/res/lightonfrombottomleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomleft_22.png
diff --git a/default_images/svx/res/lightonfrombottomright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomright_22.png
index 08951bc4f73e..08951bc4f73e 100644
--- a/default_images/svx/res/lightonfrombottomright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfrombottomright_22.png
diff --git a/default_images/svx/res/lightonfromleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromleft_22.png
index 7b3af7158f6a..7b3af7158f6a 100644
--- a/default_images/svx/res/lightonfromleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromleft_22.png
diff --git a/default_images/svx/res/lightonfromright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromright_22.png
index b450fe8408e8..b450fe8408e8 100644
--- a/default_images/svx/res/lightonfromright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromright_22.png
diff --git a/default_images/svx/res/lightonfromtop_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromtop_22.png
index f75958c4d6f1..f75958c4d6f1 100644
--- a/default_images/svx/res/lightonfromtop_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromtop_22.png
diff --git a/default_images/svx/res/lightonfromtopleft_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromtopleft_22.png
index d36b1e49290e..d36b1e49290e 100644
--- a/default_images/svx/res/lightonfromtopleft_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromtopleft_22.png
diff --git a/default_images/svx/res/lightonfromtopright_22_h.png b/ooo_custom_images/hicontrast/svx/res/lightonfromtopright_22.png
index 702161c3610c..702161c3610c 100644
--- a/default_images/svx/res/lightonfromtopright_22_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lightonfromtopright_22.png
diff --git a/default_images/svx/res/lngcheck_h.png b/ooo_custom_images/hicontrast/svx/res/lngcheck.png
index 0b24a24d7fcc..0b24a24d7fcc 100644
--- a/default_images/svx/res/lngcheck_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/lngcheck.png
diff --git a/default_images/svx/res/loh01.png b/ooo_custom_images/hicontrast/svx/res/lo01.png
index 8a307f49d100..8a307f49d100 100644
--- a/default_images/svx/res/loh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/lo01.png
diff --git a/default_images/svx/res/loh02.png b/ooo_custom_images/hicontrast/svx/res/lo02.png
index f68ef5a0c2cc..f68ef5a0c2cc 100644
--- a/default_images/svx/res/loh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/lo02.png
diff --git a/default_images/svx/res/loh03.png b/ooo_custom_images/hicontrast/svx/res/lo03.png
index 3f1e0d88e682..3f1e0d88e682 100644
--- a/default_images/svx/res/loh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/lo03.png
diff --git a/default_images/svx/res/luminanc_h.png b/ooo_custom_images/hicontrast/svx/res/luminanc.png
index 4376c3b52e3a..4376c3b52e3a 100644
--- a/default_images/svx/res/luminanc_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/luminanc.png
diff --git a/default_images/svx/res/material_h.png b/ooo_custom_images/hicontrast/svx/res/material.png
index 426d553d7551..426d553d7551 100644
--- a/default_images/svx/res/material_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/material.png
diff --git a/default_images/svx/res/matte_16_h.png b/ooo_custom_images/hicontrast/svx/res/matte_16.png
index 4fd39727f499..4fd39727f499 100644
--- a/default_images/svx/res/matte_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/matte_16.png
diff --git a/default_images/svx/res/metal_16_h.png b/ooo_custom_images/hicontrast/svx/res/metal_16.png
index 1c527189b747..1c527189b747 100644
--- a/default_images/svx/res/metal_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/metal_16.png
diff --git a/default_images/svx/res/minus_h.png b/ooo_custom_images/hicontrast/svx/res/minus.png
index a20fa183ab01..a20fa183ab01 100644
--- a/default_images/svx/res/minus_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/minus.png
diff --git a/default_images/svx/res/modula3d_h.png b/ooo_custom_images/hicontrast/svx/res/modula3d.png
index 4226bf1d784b..4226bf1d784b 100644
--- a/default_images/svx/res/modula3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/modula3d.png
diff --git a/default_images/svx/res/navigationball_10_h.png b/ooo_custom_images/hicontrast/svx/res/navigationball_10.png
index ccb8a537ed82..ccb8a537ed82 100644
--- a/default_images/svx/res/navigationball_10_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/navigationball_10.png
diff --git a/default_images/svx/res/normallit_16_h.png b/ooo_custom_images/hicontrast/svx/res/normallit_16.png
index dfee759b1180..dfee759b1180 100644
--- a/default_images/svx/res/normallit_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normallit_16.png
diff --git a/default_images/svx/res/normflat_h.png b/ooo_custom_images/hicontrast/svx/res/normflat.png
index 1893a8f122fa..1893a8f122fa 100644
--- a/default_images/svx/res/normflat_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normflat.png
diff --git a/default_images/svx/res/normobjs_h.png b/ooo_custom_images/hicontrast/svx/res/normobjs.png
index 3d7cf65ac2ee..3d7cf65ac2ee 100644
--- a/default_images/svx/res/normobjs_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normobjs.png
diff --git a/default_images/svx/res/normsphe_h.png b/ooo_custom_images/hicontrast/svx/res/normsphe.png
index 8ff9f34c7ba2..8ff9f34c7ba2 100644
--- a/default_images/svx/res/normsphe_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/normsphe.png
diff --git a/default_images/svx/res/notcertificate_16_h.png b/ooo_custom_images/hicontrast/svx/res/notcertificate_16.png
index 1312a39df82f..1312a39df82f 100644
--- a/default_images/svx/res/notcertificate_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/notcertificate_16.png
diff --git a/default_images/svx/res/nuh01.png b/ooo_custom_images/hicontrast/svx/res/nu01.png
index 6a3fc1144739..6a3fc1144739 100644
--- a/default_images/svx/res/nuh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu01.png
diff --git a/default_images/svx/res/nuh02.png b/ooo_custom_images/hicontrast/svx/res/nu02.png
index 7dee70d951b0..7dee70d951b0 100644
--- a/default_images/svx/res/nuh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu02.png
diff --git a/default_images/svx/res/nuh03.png b/ooo_custom_images/hicontrast/svx/res/nu03.png
index e284986fec4d..e284986fec4d 100644
--- a/default_images/svx/res/nuh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu03.png
diff --git a/default_images/svx/res/nuh04.png b/ooo_custom_images/hicontrast/svx/res/nu04.png
index 3f562c91166c..3f562c91166c 100644
--- a/default_images/svx/res/nuh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/nu04.png
diff --git a/default_images/svx/res/objspc3d_h.png b/ooo_custom_images/hicontrast/svx/res/objspc3d.png
index b7d17157aede..b7d17157aede 100644
--- a/default_images/svx/res/objspc3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/objspc3d.png
diff --git a/default_images/svx/res/odfwarning_h.png b/ooo_custom_images/hicontrast/svx/res/odfwarning.png
index e0c029a84836..e0c029a84836 100644
--- a/default_images/svx/res/odfwarning_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/odfwarning.png
diff --git a/default_images/svx/res/parallel_h.png b/ooo_custom_images/hicontrast/svx/res/parallel.png
index 1532063a0d1b..1532063a0d1b 100644
--- a/default_images/svx/res/parallel_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/parallel.png
diff --git a/default_images/svx/res/parallel_16_h.png b/ooo_custom_images/hicontrast/svx/res/parallel_16.png
index fbbcc0e46a04..fbbcc0e46a04 100644
--- a/default_images/svx/res/parallel_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/parallel_16.png
diff --git a/default_images/svx/res/persp3d_h.png b/ooo_custom_images/hicontrast/svx/res/persp3d.png
index 8da70a0e20a4..8da70a0e20a4 100644
--- a/default_images/svx/res/persp3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/persp3d.png
diff --git a/default_images/svx/res/perspective_16_h.png b/ooo_custom_images/hicontrast/svx/res/perspective_16.png
index 3d80155f01ae..3d80155f01ae 100644
--- a/default_images/svx/res/perspective_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/perspective_16.png
diff --git a/default_images/svx/res/plastic_16_h.png b/ooo_custom_images/hicontrast/svx/res/plastic_16.png
index 7b712bb31752..7b712bb31752 100644
--- a/default_images/svx/res/plastic_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/plastic_16.png
diff --git a/default_images/svx/res/plus_h.png b/ooo_custom_images/hicontrast/svx/res/plus.png
index d4a66c91a2cc..d4a66c91a2cc 100644
--- a/default_images/svx/res/plus_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/plus.png
diff --git a/default_images/svx/res/prh01.png b/ooo_custom_images/hicontrast/svx/res/pr01.png
index 18121b2b9541..18121b2b9541 100644
--- a/default_images/svx/res/prh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr01.png
diff --git a/default_images/svx/res/prh010.png b/ooo_custom_images/hicontrast/svx/res/pr010.png
index f95c7cf53aa6..f95c7cf53aa6 100644
--- a/default_images/svx/res/prh010.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr010.png
diff --git a/default_images/svx/res/prh011.png b/ooo_custom_images/hicontrast/svx/res/pr011.png
index fef4c3a77495..fef4c3a77495 100644
--- a/default_images/svx/res/prh011.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr011.png
diff --git a/default_images/svx/res/prh012.png b/ooo_custom_images/hicontrast/svx/res/pr012.png
index bb1389b39272..bb1389b39272 100644
--- a/default_images/svx/res/prh012.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr012.png
diff --git a/default_images/svx/res/prh013.png b/ooo_custom_images/hicontrast/svx/res/pr013.png
index 36f627c86360..36f627c86360 100644
--- a/default_images/svx/res/prh013.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr013.png
diff --git a/default_images/svx/res/prh014.png b/ooo_custom_images/hicontrast/svx/res/pr014.png
index ab6f46b80f8b..ab6f46b80f8b 100644
--- a/default_images/svx/res/prh014.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr014.png
diff --git a/default_images/svx/res/prh015.png b/ooo_custom_images/hicontrast/svx/res/pr015.png
index 9abe5417e3ae..9abe5417e3ae 100644
--- a/default_images/svx/res/prh015.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr015.png
diff --git a/default_images/svx/res/prh016.png b/ooo_custom_images/hicontrast/svx/res/pr016.png
index d337ac7afd7e..d337ac7afd7e 100644
--- a/default_images/svx/res/prh016.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr016.png
diff --git a/default_images/svx/res/prh017.png b/ooo_custom_images/hicontrast/svx/res/pr017.png
index 326e0086a4f5..326e0086a4f5 100644
--- a/default_images/svx/res/prh017.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr017.png
diff --git a/default_images/svx/res/prh018.png b/ooo_custom_images/hicontrast/svx/res/pr018.png
index cbfdf8515351..cbfdf8515351 100644
--- a/default_images/svx/res/prh018.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr018.png
diff --git a/default_images/svx/res/prh019.png b/ooo_custom_images/hicontrast/svx/res/pr019.png
index 8ebb5c25dffc..8ebb5c25dffc 100644
--- a/default_images/svx/res/prh019.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr019.png
diff --git a/default_images/svx/res/prh02.png b/ooo_custom_images/hicontrast/svx/res/pr02.png
index f9cf727c897e..f9cf727c897e 100644
--- a/default_images/svx/res/prh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr02.png
diff --git a/default_images/svx/res/prh020.png b/ooo_custom_images/hicontrast/svx/res/pr020.png
index 11e031854ff5..11e031854ff5 100644
--- a/default_images/svx/res/prh020.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr020.png
diff --git a/default_images/svx/res/prh021.png b/ooo_custom_images/hicontrast/svx/res/pr021.png
index d5e757a1166a..d5e757a1166a 100644
--- a/default_images/svx/res/prh021.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr021.png
diff --git a/default_images/svx/res/prh03.png b/ooo_custom_images/hicontrast/svx/res/pr03.png
index 637217f5291e..637217f5291e 100644
--- a/default_images/svx/res/prh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr03.png
diff --git a/default_images/svx/res/prh04.png b/ooo_custom_images/hicontrast/svx/res/pr04.png
index 128f1aba0dda..128f1aba0dda 100644
--- a/default_images/svx/res/prh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr04.png
diff --git a/default_images/svx/res/prh05.png b/ooo_custom_images/hicontrast/svx/res/pr05.png
index 19eda99915e6..19eda99915e6 100644
--- a/default_images/svx/res/prh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr05.png
diff --git a/default_images/svx/res/prh06.png b/ooo_custom_images/hicontrast/svx/res/pr06.png
index 06221a78c14d..06221a78c14d 100644
--- a/default_images/svx/res/prh06.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr06.png
diff --git a/default_images/svx/res/prh07.png b/ooo_custom_images/hicontrast/svx/res/pr07.png
index 17f0889b21b7..17f0889b21b7 100644
--- a/default_images/svx/res/prh07.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr07.png
diff --git a/default_images/svx/res/prh08.png b/ooo_custom_images/hicontrast/svx/res/pr08.png
index bcd501a1059f..bcd501a1059f 100644
--- a/default_images/svx/res/prh08.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr08.png
diff --git a/default_images/svx/res/prh09.png b/ooo_custom_images/hicontrast/svx/res/pr09.png
index 22e7b5a3f0bd..22e7b5a3f0bd 100644
--- a/default_images/svx/res/prh09.png
+++ b/ooo_custom_images/hicontrast/svx/res/pr09.png
diff --git a/default_images/svx/res/replac3d_h.png b/ooo_custom_images/hicontrast/svx/res/replac3d.png
index e682e178de49..e682e178de49 100644
--- a/default_images/svx/res/replac3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/replac3d.png
diff --git a/default_images/svx/res/rotate3d_h.png b/ooo_custom_images/hicontrast/svx/res/rotate3d.png
index 0e4857f74f75..0e4857f74f75 100644
--- a/default_images/svx/res/rotate3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/rotate3d.png
diff --git a/default_images/svx/res/sc10350_h.png b/ooo_custom_images/hicontrast/svx/res/sc10350.png
index 21623ab7ba59..21623ab7ba59 100644
--- a/default_images/svx/res/sc10350_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/sc10350.png
diff --git a/default_images/svx/res/shh01.png b/ooo_custom_images/hicontrast/svx/res/sh01.png
index a9ce630a0feb..a9ce630a0feb 100644
--- a/default_images/svx/res/shh01.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh01.png
diff --git a/default_images/svx/res/shh02.png b/ooo_custom_images/hicontrast/svx/res/sh02.png
index c7f383a340a5..c7f383a340a5 100644
--- a/default_images/svx/res/shh02.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh02.png
diff --git a/default_images/svx/res/shh03.png b/ooo_custom_images/hicontrast/svx/res/sh03.png
index 783370fc3baa..783370fc3baa 100644
--- a/default_images/svx/res/shh03.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh03.png
diff --git a/default_images/svx/res/shh04.png b/ooo_custom_images/hicontrast/svx/res/sh04.png
index f32ae3a84d8a..f32ae3a84d8a 100644
--- a/default_images/svx/res/shh04.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh04.png
diff --git a/default_images/svx/res/shh05.png b/ooo_custom_images/hicontrast/svx/res/sh05.png
index 80edcf5bd3a3..80edcf5bd3a3 100644
--- a/default_images/svx/res/shh05.png
+++ b/ooo_custom_images/hicontrast/svx/res/sh05.png
diff --git a/default_images/svx/res/shadow3d_h.png b/ooo_custom_images/hicontrast/svx/res/shadow3d.png
index f3e07c6f23ef..f3e07c6f23ef 100644
--- a/default_images/svx/res/shadow3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/shadow3d.png
diff --git a/default_images/svx/res/signet_11x16_h.png b/ooo_custom_images/hicontrast/svx/res/signet_11x16.png
index 677056800182..677056800182 100644
--- a/default_images/svx/res/signet_11x16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/signet_11x16.png
diff --git a/default_images/svx/res/slidezoomin_11_h.png b/ooo_custom_images/hicontrast/svx/res/slidezoomin_11.png
index 67a0bf12ffbe..67a0bf12ffbe 100644
--- a/default_images/svx/res/slidezoomin_11_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/slidezoomin_11.png
diff --git a/default_images/svx/res/slidezoomout_11_h.png b/ooo_custom_images/hicontrast/svx/res/slidezoomout_11.png
index b2dabbd9f2da..b2dabbd9f2da 100644
--- a/default_images/svx/res/slidezoomout_11_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/slidezoomout_11.png
diff --git a/default_images/svx/res/sphere3d_h.png b/ooo_custom_images/hicontrast/svx/res/sphere3d.png
index abe92eba9e9b..abe92eba9e9b 100644
--- a/default_images/svx/res/sphere3d_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/sphere3d.png
diff --git a/default_images/svx/res/time_h.png b/ooo_custom_images/hicontrast/svx/res/time.png
index 960272d313d6..960272d313d6 100644
--- a/default_images/svx/res/time_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/time.png
diff --git a/default_images/svx/res/trh10416.png b/ooo_custom_images/hicontrast/svx/res/tr10416.png
index 6d989683148d..6d989683148d 100644
--- a/default_images/svx/res/trh10416.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10416.png
diff --git a/default_images/svx/res/trh10432.png b/ooo_custom_images/hicontrast/svx/res/tr10432.png
index 29d6a16bd9b3..29d6a16bd9b3 100644
--- a/default_images/svx/res/trh10432.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10432.png
diff --git a/default_images/svx/res/trh10433.png b/ooo_custom_images/hicontrast/svx/res/tr10433.png
index 998e40ad5b4c..998e40ad5b4c 100644
--- a/default_images/svx/res/trh10433.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10433.png
diff --git a/default_images/svx/res/trh10434.png b/ooo_custom_images/hicontrast/svx/res/tr10434.png
index cd4cda358eea..cd4cda358eea 100644
--- a/default_images/svx/res/trh10434.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10434.png
diff --git a/default_images/svx/res/trh10435.png b/ooo_custom_images/hicontrast/svx/res/tr10435.png
index 7069197fb774..7069197fb774 100644
--- a/default_images/svx/res/trh10435.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10435.png
diff --git a/default_images/svx/res/trh10436.png b/ooo_custom_images/hicontrast/svx/res/tr10436.png
index 5d8010cc97e4..5d8010cc97e4 100644
--- a/default_images/svx/res/trh10436.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10436.png
diff --git a/default_images/svx/res/trh10437.png b/ooo_custom_images/hicontrast/svx/res/tr10437.png
index d88c4bdea292..d88c4bdea292 100644
--- a/default_images/svx/res/trh10437.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10437.png
diff --git a/default_images/svx/res/trh10439.png b/ooo_custom_images/hicontrast/svx/res/tr10439.png
index 945b3bffb616..945b3bffb616 100644
--- a/default_images/svx/res/trh10439.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10439.png
diff --git a/default_images/svx/res/trh10447.png b/ooo_custom_images/hicontrast/svx/res/tr10447.png
index c5fc94271f0f..c5fc94271f0f 100644
--- a/default_images/svx/res/trh10447.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10447.png
diff --git a/default_images/svx/res/trh10450.png b/ooo_custom_images/hicontrast/svx/res/tr10450.png
index 2aa3544ddc49..2aa3544ddc49 100644
--- a/default_images/svx/res/trh10450.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10450.png
diff --git a/default_images/svx/res/trh10452.png b/ooo_custom_images/hicontrast/svx/res/tr10452.png
index 6137a17e93c4..6137a17e93c4 100644
--- a/default_images/svx/res/trh10452.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10452.png
diff --git a/default_images/svx/res/trh10921.png b/ooo_custom_images/hicontrast/svx/res/tr10921.png
index 764a8422cbc2..764a8422cbc2 100644
--- a/default_images/svx/res/trh10921.png
+++ b/ooo_custom_images/hicontrast/svx/res/tr10921.png
diff --git a/default_images/svx/res/wireframe_16_h.png b/ooo_custom_images/hicontrast/svx/res/wireframe_16.png
index 2ae2ab181897..2ae2ab181897 100644
--- a/default_images/svx/res/wireframe_16_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/wireframe_16.png
diff --git a/default_images/svx/res/zetlhor2_h.png b/ooo_custom_images/hicontrast/svx/res/zetlhor2.png
index 8d1de8b31c80..8d1de8b31c80 100644
--- a/default_images/svx/res/zetlhor2_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/zetlhor2.png
diff --git a/default_images/svx/res/zetlver2_h.png b/ooo_custom_images/hicontrast/svx/res/zetlver2.png
index 8ede037a99b8..8ede037a99b8 100644
--- a/default_images/svx/res/zetlver2_h.png
+++ b/ooo_custom_images/hicontrast/svx/res/zetlver2.png
diff --git a/default_images/sw/imglst/lch20556.png b/ooo_custom_images/hicontrast/sw/imglst/lc20556.png
index 39cfeac7f396..39cfeac7f396 100644
--- a/default_images/sw/imglst/lch20556.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/lc20556.png
diff --git a/default_images/sw/imglst/lch20557.png b/ooo_custom_images/hicontrast/sw/imglst/lc20557.png
index ed3d8f3b68e3..ed3d8f3b68e3 100644
--- a/default_images/sw/imglst/lch20557.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/lc20557.png
diff --git a/default_images/sw/imglst/lch20558.png b/ooo_custom_images/hicontrast/sw/imglst/lc20558.png
index ac65e8fea6fa..ac65e8fea6fa 100644
--- a/default_images/sw/imglst/lch20558.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/lc20558.png
diff --git a/default_images/sw/imglst/nch20000.png b/ooo_custom_images/hicontrast/sw/imglst/nc20000.png
index 415cb797b8e3..415cb797b8e3 100644
--- a/default_images/sw/imglst/nch20000.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20000.png
diff --git a/default_images/sw/imglst/nch20001.png b/ooo_custom_images/hicontrast/sw/imglst/nc20001.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/sw/imglst/nch20001.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20001.png
diff --git a/default_images/sw/imglst/nch20002.png b/ooo_custom_images/hicontrast/sw/imglst/nc20002.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/sw/imglst/nch20002.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20002.png
diff --git a/default_images/sw/imglst/nch20003.png b/ooo_custom_images/hicontrast/sw/imglst/nc20003.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sw/imglst/nch20003.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20003.png
diff --git a/default_images/sw/imglst/nch20004.png b/ooo_custom_images/hicontrast/sw/imglst/nc20004.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/sw/imglst/nch20004.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20004.png
diff --git a/default_images/sw/imglst/nch20005.png b/ooo_custom_images/hicontrast/sw/imglst/nc20005.png
index bc6ad71bdb1c..bc6ad71bdb1c 100644
--- a/default_images/sw/imglst/nch20005.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20005.png
diff --git a/default_images/sw/imglst/nch20006.png b/ooo_custom_images/hicontrast/sw/imglst/nc20006.png
index 42fbf06419fb..42fbf06419fb 100644
--- a/default_images/sw/imglst/nch20006.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20006.png
diff --git a/default_images/sw/imglst/nch20007.png b/ooo_custom_images/hicontrast/sw/imglst/nc20007.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/sw/imglst/nch20007.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20007.png
diff --git a/default_images/sw/imglst/nch20008.png b/ooo_custom_images/hicontrast/sw/imglst/nc20008.png
index 168902609742..168902609742 100644
--- a/default_images/sw/imglst/nch20008.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20008.png
diff --git a/default_images/sw/imglst/nch20009.png b/ooo_custom_images/hicontrast/sw/imglst/nc20009.png
index 4392542b80b7..4392542b80b7 100644
--- a/default_images/sw/imglst/nch20009.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20009.png
diff --git a/default_images/sw/imglst/nch20010.png b/ooo_custom_images/hicontrast/sw/imglst/nc20010.png
index 7909511db015..7909511db015 100644
--- a/default_images/sw/imglst/nch20010.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20010.png
diff --git a/default_images/sw/imglst/nch20011.png b/ooo_custom_images/hicontrast/sw/imglst/nc20011.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sw/imglst/nch20011.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/nc20011.png
diff --git a/default_images/sw/imglst/reh01.png b/ooo_custom_images/hicontrast/sw/imglst/re01.png
index c20474b9c461..c20474b9c461 100644
--- a/default_images/sw/imglst/reh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re01.png
diff --git a/default_images/sw/imglst/reh02.png b/ooo_custom_images/hicontrast/sw/imglst/re02.png
index 2768589189a5..2768589189a5 100644
--- a/default_images/sw/imglst/reh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re02.png
diff --git a/default_images/sw/imglst/reh03.png b/ooo_custom_images/hicontrast/sw/imglst/re03.png
index c85daadc7007..c85daadc7007 100644
--- a/default_images/sw/imglst/reh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re03.png
diff --git a/default_images/sw/imglst/reh04.png b/ooo_custom_images/hicontrast/sw/imglst/re04.png
index f660803b40f2..f660803b40f2 100644
--- a/default_images/sw/imglst/reh04.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/re04.png
diff --git a/default_images/sw/imglst/sch20171.png b/ooo_custom_images/hicontrast/sw/imglst/sc20171.png
index 0e5bf90dab40..0e5bf90dab40 100644
--- a/default_images/sw/imglst/sch20171.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20171.png
diff --git a/default_images/sw/imglst/sch20172.png b/ooo_custom_images/hicontrast/sw/imglst/sc20172.png
index 8f2948b39bf5..8f2948b39bf5 100644
--- a/default_images/sw/imglst/sch20172.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20172.png
diff --git a/default_images/sw/imglst/sch20173.png b/ooo_custom_images/hicontrast/sw/imglst/sc20173.png
index 03b54589fcb5..03b54589fcb5 100644
--- a/default_images/sw/imglst/sch20173.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20173.png
diff --git a/default_images/sw/imglst/sch20174.png b/ooo_custom_images/hicontrast/sw/imglst/sc20174.png
index c12a2177e95b..c12a2177e95b 100644
--- a/default_images/sw/imglst/sch20174.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20174.png
diff --git a/default_images/sw/imglst/sch20175.png b/ooo_custom_images/hicontrast/sw/imglst/sc20175.png
index 56ed07db53e8..56ed07db53e8 100644
--- a/default_images/sw/imglst/sch20175.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20175.png
diff --git a/default_images/sw/imglst/sch20177.png b/ooo_custom_images/hicontrast/sw/imglst/sc20177.png
index d1371fdf51ae..d1371fdf51ae 100644
--- a/default_images/sw/imglst/sch20177.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20177.png
diff --git a/default_images/sw/imglst/sch20179.png b/ooo_custom_images/hicontrast/sw/imglst/sc20179.png
index 499f7eb9104e..499f7eb9104e 100644
--- a/default_images/sw/imglst/sch20179.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20179.png
diff --git a/default_images/sw/imglst/sch20182.png b/ooo_custom_images/hicontrast/sw/imglst/sc20182.png
index 833d8615d47e..833d8615d47e 100644
--- a/default_images/sw/imglst/sch20182.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20182.png
diff --git a/default_images/sw/imglst/sch20183.png b/ooo_custom_images/hicontrast/sw/imglst/sc20183.png
index 041070719639..041070719639 100644
--- a/default_images/sw/imglst/sch20183.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20183.png
diff --git a/default_images/sw/imglst/sch20186.png b/ooo_custom_images/hicontrast/sw/imglst/sc20186.png
index a3fd98dc2a86..a3fd98dc2a86 100644
--- a/default_images/sw/imglst/sch20186.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20186.png
diff --git a/default_images/sw/imglst/sch20233.png b/ooo_custom_images/hicontrast/sw/imglst/sc20233.png
index fb5de140e8ef..fb5de140e8ef 100644
--- a/default_images/sw/imglst/sch20233.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20233.png
diff --git a/default_images/sw/imglst/sch20234.png b/ooo_custom_images/hicontrast/sw/imglst/sc20234.png
index c944b9b42818..c944b9b42818 100644
--- a/default_images/sw/imglst/sch20234.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20234.png
diff --git a/default_images/sw/imglst/sch20235.png b/ooo_custom_images/hicontrast/sw/imglst/sc20235.png
index 09cb8575c291..09cb8575c291 100644
--- a/default_images/sw/imglst/sch20235.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20235.png
diff --git a/default_images/sw/imglst/sch20236.png b/ooo_custom_images/hicontrast/sw/imglst/sc20236.png
index 7e1517564b1b..7e1517564b1b 100644
--- a/default_images/sw/imglst/sch20236.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20236.png
diff --git a/default_images/sw/imglst/sch20238.png b/ooo_custom_images/hicontrast/sw/imglst/sc20238.png
index 936eba564fa3..936eba564fa3 100644
--- a/default_images/sw/imglst/sch20238.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20238.png
diff --git a/default_images/sw/imglst/sch20239.png b/ooo_custom_images/hicontrast/sw/imglst/sc20239.png
index 9839e588ad64..9839e588ad64 100644
--- a/default_images/sw/imglst/sch20239.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20239.png
diff --git a/default_images/sw/imglst/sch20244.png b/ooo_custom_images/hicontrast/sw/imglst/sc20244.png
index d71d9ad342d2..d71d9ad342d2 100644
--- a/default_images/sw/imglst/sch20244.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20244.png
diff --git a/default_images/sw/imglst/sch20245.png b/ooo_custom_images/hicontrast/sw/imglst/sc20245.png
index d9a739c5360e..d9a739c5360e 100644
--- a/default_images/sw/imglst/sch20245.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20245.png
diff --git a/default_images/sw/imglst/sch20246.png b/ooo_custom_images/hicontrast/sw/imglst/sc20246.png
index 9090e7c24f75..9090e7c24f75 100644
--- a/default_images/sw/imglst/sch20246.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20246.png
diff --git a/default_images/sw/imglst/sch20247.png b/ooo_custom_images/hicontrast/sw/imglst/sc20247.png
index 11cfa90f9574..11cfa90f9574 100644
--- a/default_images/sw/imglst/sch20247.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20247.png
diff --git a/default_images/sw/imglst/sch20248.png b/ooo_custom_images/hicontrast/sw/imglst/sc20248.png
index 8be24fc61949..8be24fc61949 100644
--- a/default_images/sw/imglst/sch20248.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20248.png
diff --git a/default_images/sw/imglst/sch20249.png b/ooo_custom_images/hicontrast/sw/imglst/sc20249.png
index f72a20ec8ff8..f72a20ec8ff8 100644
--- a/default_images/sw/imglst/sch20249.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20249.png
diff --git a/default_images/sw/imglst/sch20556.png b/ooo_custom_images/hicontrast/sw/imglst/sc20556.png
index bedf5a1cb1ab..bedf5a1cb1ab 100644
--- a/default_images/sw/imglst/sch20556.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20556.png
diff --git a/default_images/sw/imglst/sch20557.png b/ooo_custom_images/hicontrast/sw/imglst/sc20557.png
index aacdc837bdf2..aacdc837bdf2 100644
--- a/default_images/sw/imglst/sch20557.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20557.png
diff --git a/default_images/sw/imglst/sch20558.png b/ooo_custom_images/hicontrast/sw/imglst/sc20558.png
index 9d9c0489e4d7..9d9c0489e4d7 100644
--- a/default_images/sw/imglst/sch20558.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sc20558.png
diff --git a/default_images/sw/imglst/sfh01.png b/ooo_custom_images/hicontrast/sw/imglst/sf01.png
index 8de0d14439b2..8de0d14439b2 100644
--- a/default_images/sw/imglst/sfh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf01.png
diff --git a/default_images/sw/imglst/sfh02.png b/ooo_custom_images/hicontrast/sw/imglst/sf02.png
index 478ab3ff08e4..478ab3ff08e4 100644
--- a/default_images/sw/imglst/sfh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf02.png
diff --git a/default_images/sw/imglst/sfh03.png b/ooo_custom_images/hicontrast/sw/imglst/sf03.png
index 400d0c15ef4a..400d0c15ef4a 100644
--- a/default_images/sw/imglst/sfh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf03.png
diff --git a/default_images/sw/imglst/sfh04.png b/ooo_custom_images/hicontrast/sw/imglst/sf04.png
index ed255cd5e2b7..ed255cd5e2b7 100644
--- a/default_images/sw/imglst/sfh04.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf04.png
diff --git a/default_images/sw/imglst/sfh05.png b/ooo_custom_images/hicontrast/sw/imglst/sf05.png
index 81b682a01ab5..81b682a01ab5 100644
--- a/default_images/sw/imglst/sfh05.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sf05.png
diff --git a/default_images/sw/imglst/srh20000.png b/ooo_custom_images/hicontrast/sw/imglst/sr20000.png
index 13f7cb2e82a3..13f7cb2e82a3 100644
--- a/default_images/sw/imglst/srh20000.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20000.png
diff --git a/default_images/sw/imglst/srh20001.png b/ooo_custom_images/hicontrast/sw/imglst/sr20001.png
index 5dd99279b1c8..5dd99279b1c8 100644
--- a/default_images/sw/imglst/srh20001.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20001.png
diff --git a/default_images/sw/imglst/srh20002.png b/ooo_custom_images/hicontrast/sw/imglst/sr20002.png
index d8955c4c2341..d8955c4c2341 100644
--- a/default_images/sw/imglst/srh20002.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20002.png
diff --git a/default_images/sw/imglst/srh20003.png b/ooo_custom_images/hicontrast/sw/imglst/sr20003.png
index f273c9b73788..f273c9b73788 100644
--- a/default_images/sw/imglst/srh20003.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20003.png
diff --git a/default_images/sw/imglst/srh20004.png b/ooo_custom_images/hicontrast/sw/imglst/sr20004.png
index 7e6ecb41db6f..7e6ecb41db6f 100644
--- a/default_images/sw/imglst/srh20004.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20004.png
diff --git a/default_images/sw/imglst/srh20005.png b/ooo_custom_images/hicontrast/sw/imglst/sr20005.png
index 7d52ac28948f..7d52ac28948f 100644
--- a/default_images/sw/imglst/srh20005.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20005.png
diff --git a/default_images/sw/imglst/srh20006.png b/ooo_custom_images/hicontrast/sw/imglst/sr20006.png
index 3ebfee988b89..3ebfee988b89 100644
--- a/default_images/sw/imglst/srh20006.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20006.png
diff --git a/default_images/sw/imglst/srh20007.png b/ooo_custom_images/hicontrast/sw/imglst/sr20007.png
index 42fbf06419fb..42fbf06419fb 100644
--- a/default_images/sw/imglst/srh20007.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20007.png
diff --git a/default_images/sw/imglst/srh20008.png b/ooo_custom_images/hicontrast/sw/imglst/sr20008.png
index 4c3b276352ce..4c3b276352ce 100644
--- a/default_images/sw/imglst/srh20008.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20008.png
diff --git a/default_images/sw/imglst/srh20009.png b/ooo_custom_images/hicontrast/sw/imglst/sr20009.png
index 0c8a02a306dd..0c8a02a306dd 100644
--- a/default_images/sw/imglst/srh20009.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20009.png
diff --git a/default_images/sw/imglst/srh20010.png b/ooo_custom_images/hicontrast/sw/imglst/sr20010.png
index 2169a8e39ad6..2169a8e39ad6 100644
--- a/default_images/sw/imglst/srh20010.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20010.png
diff --git a/default_images/sw/imglst/srh20011.png b/ooo_custom_images/hicontrast/sw/imglst/sr20011.png
index 415cb797b8e3..415cb797b8e3 100644
--- a/default_images/sw/imglst/srh20011.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20011.png
diff --git a/default_images/sw/imglst/srh20012.png b/ooo_custom_images/hicontrast/sw/imglst/sr20012.png
index 99754baceefe..99754baceefe 100644
--- a/default_images/sw/imglst/srh20012.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20012.png
diff --git a/default_images/sw/imglst/srh20013.png b/ooo_custom_images/hicontrast/sw/imglst/sr20013.png
index d56cfa888ab8..d56cfa888ab8 100644
--- a/default_images/sw/imglst/srh20013.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20013.png
diff --git a/default_images/sw/imglst/srh20014.png b/ooo_custom_images/hicontrast/sw/imglst/sr20014.png
index d61a47303556..d61a47303556 100644
--- a/default_images/sw/imglst/srh20014.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20014.png
diff --git a/default_images/sw/imglst/srh20015.png b/ooo_custom_images/hicontrast/sw/imglst/sr20015.png
index e284986fec4d..e284986fec4d 100644
--- a/default_images/sw/imglst/srh20015.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20015.png
diff --git a/default_images/sw/imglst/srh20016.png b/ooo_custom_images/hicontrast/sw/imglst/sr20016.png
index abce025ee9dc..abce025ee9dc 100644
--- a/default_images/sw/imglst/srh20016.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20016.png
diff --git a/default_images/sw/imglst/srh20017.png b/ooo_custom_images/hicontrast/sw/imglst/sr20017.png
index 5ef6ccf10ac7..5ef6ccf10ac7 100644
--- a/default_images/sw/imglst/srh20017.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20017.png
diff --git a/default_images/sw/imglst/srh20018.png b/ooo_custom_images/hicontrast/sw/imglst/sr20018.png
index 77081f508b3c..77081f508b3c 100644
--- a/default_images/sw/imglst/srh20018.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20018.png
diff --git a/default_images/sw/imglst/srh20019.png b/ooo_custom_images/hicontrast/sw/imglst/sr20019.png
index 0f1a1bdf1bce..0f1a1bdf1bce 100644
--- a/default_images/sw/imglst/srh20019.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sr20019.png
diff --git a/default_images/sw/imglst/sxh01.png b/ooo_custom_images/hicontrast/sw/imglst/sx01.png
index cb6c503d6db6..cb6c503d6db6 100644
--- a/default_images/sw/imglst/sxh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sx01.png
diff --git a/default_images/sw/imglst/sxh02.png b/ooo_custom_images/hicontrast/sw/imglst/sx02.png
index a2be5faaee2f..a2be5faaee2f 100644
--- a/default_images/sw/imglst/sxh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sx02.png
diff --git a/default_images/sw/imglst/sxh03.png b/ooo_custom_images/hicontrast/sw/imglst/sx03.png
index 7479fc2b8d9c..7479fc2b8d9c 100644
--- a/default_images/sw/imglst/sxh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/sx03.png
diff --git a/default_images/sw/imglst/wrh01.png b/ooo_custom_images/hicontrast/sw/imglst/wr01.png
index af3f3911c680..af3f3911c680 100644
--- a/default_images/sw/imglst/wrh01.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr01.png
diff --git a/default_images/sw/imglst/wrh010.png b/ooo_custom_images/hicontrast/sw/imglst/wr010.png
index e10258a230c0..e10258a230c0 100644
--- a/default_images/sw/imglst/wrh010.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr010.png
diff --git a/default_images/sw/imglst/wrh011.png b/ooo_custom_images/hicontrast/sw/imglst/wr011.png
index 8d07989e471f..8d07989e471f 100644
--- a/default_images/sw/imglst/wrh011.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr011.png
diff --git a/default_images/sw/imglst/wrh02.png b/ooo_custom_images/hicontrast/sw/imglst/wr02.png
index 110895b0f5e8..110895b0f5e8 100644
--- a/default_images/sw/imglst/wrh02.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr02.png
diff --git a/default_images/sw/imglst/wrh03.png b/ooo_custom_images/hicontrast/sw/imglst/wr03.png
index 0e8e05b9ecfe..0e8e05b9ecfe 100644
--- a/default_images/sw/imglst/wrh03.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr03.png
diff --git a/default_images/sw/imglst/wrh04.png b/ooo_custom_images/hicontrast/sw/imglst/wr04.png
index f949fe2ad0f9..f949fe2ad0f9 100644
--- a/default_images/sw/imglst/wrh04.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr04.png
diff --git a/default_images/sw/imglst/wrh05.png b/ooo_custom_images/hicontrast/sw/imglst/wr05.png
index 5bf95009a078..5bf95009a078 100644
--- a/default_images/sw/imglst/wrh05.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr05.png
diff --git a/default_images/sw/imglst/wrh06.png b/ooo_custom_images/hicontrast/sw/imglst/wr06.png
index c9fac9af824e..c9fac9af824e 100644
--- a/default_images/sw/imglst/wrh06.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr06.png
diff --git a/default_images/sw/imglst/wrh07.png b/ooo_custom_images/hicontrast/sw/imglst/wr07.png
index fa5a07cd9a9c..fa5a07cd9a9c 100644
--- a/default_images/sw/imglst/wrh07.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr07.png
diff --git a/default_images/sw/imglst/wrh08.png b/ooo_custom_images/hicontrast/sw/imglst/wr08.png
index 8edd985d54f1..8edd985d54f1 100644
--- a/default_images/sw/imglst/wrh08.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr08.png
diff --git a/default_images/sw/imglst/wrh09.png b/ooo_custom_images/hicontrast/sw/imglst/wr09.png
index 261379978ba4..261379978ba4 100644
--- a/default_images/sw/imglst/wrh09.png
+++ b/ooo_custom_images/hicontrast/sw/imglst/wr09.png
diff --git a/default_images/sw/res/all_left_h.png b/ooo_custom_images/hicontrast/sw/res/all_left.png
index 434c8e78cfaf..434c8e78cfaf 100644
--- a/default_images/sw/res/all_left_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/all_left.png
diff --git a/default_images/sw/res/all_right_h.png b/ooo_custom_images/hicontrast/sw/res/all_right.png
index 96cc16ea0296..96cc16ea0296 100644
--- a/default_images/sw/res/all_right_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/all_right.png
diff --git a/default_images/sw/res/dog_h.png b/ooo_custom_images/hicontrast/sw/res/dog.png
index a6aaed866e5d..a6aaed866e5d 100644
--- a/default_images/sw/res/dog_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/dog.png
diff --git a/default_images/sw/res/doublepage_11x23_h.png b/ooo_custom_images/hicontrast/sw/res/doublepage_11x23.png
index f3a4954fb51c..f3a4954fb51c 100644
--- a/default_images/sw/res/doublepage_11x23_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/doublepage_11x23.png
diff --git a/default_images/sw/res/doublepage_a_11x23_h.png b/ooo_custom_images/hicontrast/sw/res/doublepage_a_11x23.png
index c4816f86b2fe..c4816f86b2fe 100644
--- a/default_images/sw/res/doublepage_a_11x23_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/doublepage_a_11x23.png
diff --git a/default_images/sw/res/emptypage_11x15_h.png b/ooo_custom_images/hicontrast/sw/res/emptypage_11x15.png
index 6ef313ce7252..6ef313ce7252 100644
--- a/default_images/sw/res/emptypage_11x15_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/emptypage_11x15.png
diff --git a/default_images/sw/res/emptypage_a_11x15_h.png b/ooo_custom_images/hicontrast/sw/res/emptypage_a_11x15.png
index 167eed35dab0..167eed35dab0 100644
--- a/default_images/sw/res/emptypage_a_11x15_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/emptypage_a_11x15.png
diff --git a/default_images/sw/res/envhc_l_h.png b/ooo_custom_images/hicontrast/sw/res/envhc_l.png
index 9f54500a7840..9f54500a7840 100644
--- a/default_images/sw/res/envhc_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhc_l.png
diff --git a/default_images/sw/res/envhc_u_h.png b/ooo_custom_images/hicontrast/sw/res/envhc_u.png
index c74d235d2abb..c74d235d2abb 100644
--- a/default_images/sw/res/envhc_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhc_u.png
diff --git a/default_images/sw/res/envhl_l_h.png b/ooo_custom_images/hicontrast/sw/res/envhl_l.png
index 1ac3caf8ade5..1ac3caf8ade5 100644
--- a/default_images/sw/res/envhl_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhl_l.png
diff --git a/default_images/sw/res/envhl_u_h.png b/ooo_custom_images/hicontrast/sw/res/envhl_u.png
index 4851b1a1914b..4851b1a1914b 100644
--- a/default_images/sw/res/envhl_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhl_u.png
diff --git a/default_images/sw/res/envhr_l_h.png b/ooo_custom_images/hicontrast/sw/res/envhr_l.png
index cebfa8603104..cebfa8603104 100644
--- a/default_images/sw/res/envhr_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhr_l.png
diff --git a/default_images/sw/res/envhr_u_h.png b/ooo_custom_images/hicontrast/sw/res/envhr_u.png
index a85ae4d7588c..a85ae4d7588c 100644
--- a/default_images/sw/res/envhr_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envhr_u.png
diff --git a/default_images/sw/res/envvc_l_h.png b/ooo_custom_images/hicontrast/sw/res/envvc_l.png
index 80c61f8e4ca6..80c61f8e4ca6 100644
--- a/default_images/sw/res/envvc_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvc_l.png
diff --git a/default_images/sw/res/envvc_u_h.png b/ooo_custom_images/hicontrast/sw/res/envvc_u.png
index a5a972744aaa..a5a972744aaa 100644
--- a/default_images/sw/res/envvc_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvc_u.png
diff --git a/default_images/sw/res/envvl_l_h.png b/ooo_custom_images/hicontrast/sw/res/envvl_l.png
index a12e51f6bfde..a12e51f6bfde 100644
--- a/default_images/sw/res/envvl_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvl_l.png
diff --git a/default_images/sw/res/envvl_u_h.png b/ooo_custom_images/hicontrast/sw/res/envvl_u.png
index 6cc52a2d19cb..6cc52a2d19cb 100644
--- a/default_images/sw/res/envvl_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvl_u.png
diff --git a/default_images/sw/res/envvr_l_h.png b/ooo_custom_images/hicontrast/sw/res/envvr_l.png
index cc1d1df0677e..cc1d1df0677e 100644
--- a/default_images/sw/res/envvr_l_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvr_l.png
diff --git a/default_images/sw/res/envvr_u_h.png b/ooo_custom_images/hicontrast/sw/res/envvr_u.png
index 5679a75ddb11..5679a75ddb11 100644
--- a/default_images/sw/res/envvr_u_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/envvr_u.png
diff --git a/default_images/sw/res/one_left_h.png b/ooo_custom_images/hicontrast/sw/res/one_left.png
index 9438a2056498..9438a2056498 100644
--- a/default_images/sw/res/one_left_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/one_left.png
diff --git a/default_images/sw/res/one_right_h.png b/ooo_custom_images/hicontrast/sw/res/one_right.png
index 0fd15a34441e..0fd15a34441e 100644
--- a/default_images/sw/res/one_right_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/one_right.png
diff --git a/default_images/sw/res/punkt_h.png b/ooo_custom_images/hicontrast/sw/res/punkt.png
index ccb8a537ed82..ccb8a537ed82 100644
--- a/default_images/sw/res/punkt_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/punkt.png
diff --git a/default_images/sw/res/styfamnu_h.png b/ooo_custom_images/hicontrast/sw/res/styfamnu.png
index 81b682a01ab5..81b682a01ab5 100644
--- a/default_images/sw/res/styfamnu_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/styfamnu.png
diff --git a/default_images/sw/res/twopages_11x25_h.png b/ooo_custom_images/hicontrast/sw/res/twopages_11x25.png
index a139e36f0dd3..a139e36f0dd3 100644
--- a/default_images/sw/res/twopages_11x25_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/twopages_11x25.png
diff --git a/default_images/sw/res/twopages_a_11x25_h.png b/ooo_custom_images/hicontrast/sw/res/twopages_a_11x25.png
index 29d19e412fb8..29d19e412fb8 100644
--- a/default_images/sw/res/twopages_a_11x25_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/twopages_a_11x25.png
diff --git a/default_images/sw/res/zetlhor2_h.png b/ooo_custom_images/hicontrast/sw/res/zetlhor2.png
index cdc81ff0e02e..cdc81ff0e02e 100644
--- a/default_images/sw/res/zetlhor2_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/zetlhor2.png
diff --git a/default_images/sw/res/zetlver2_h.png b/ooo_custom_images/hicontrast/sw/res/zetlver2.png
index 690d2a23c68a..690d2a23c68a 100644
--- a/default_images/sw/res/zetlver2_h.png
+++ b/ooo_custom_images/hicontrast/sw/res/zetlver2.png
diff --git a/default_images/vcl/source/src/collate_h.png b/ooo_custom_images/hicontrast/vcl/source/src/collate.png
index 407e56cd9bce..407e56cd9bce 100644
--- a/default_images/vcl/source/src/collate_h.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/collate.png
diff --git a/default_images/vcl/source/src/msgbox_hc.png b/ooo_custom_images/hicontrast/vcl/source/src/msgbox.png
index ba6d3b395794..ba6d3b395794 100644
--- a/default_images/vcl/source/src/msgbox_hc.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/msgbox.png
diff --git a/default_images/vcl/source/src/ncollate_h.png b/ooo_custom_images/hicontrast/vcl/source/src/ncollate.png
index 10ba6bca1aa7..10ba6bca1aa7 100644
--- a/default_images/vcl/source/src/ncollate_h.png
+++ b/ooo_custom_images/hicontrast/vcl/source/src/ncollate.png
diff --git a/default_images/wizards/res/diagonal_h.png b/ooo_custom_images/hicontrast/wizards/res/diagonal.png
index 3fe729dcf0b1..3fe729dcf0b1 100644
--- a/default_images/wizards/res/diagonal_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/diagonal.png
diff --git a/default_images/wizards/res/formarrangefree_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangefree_42.png
index c6fe16c73e00..c6fe16c73e00 100644
--- a/default_images/wizards/res/formarrangefree_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangefree_42.png
diff --git a/default_images/wizards/res/formarrangelistside_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangelistside_42.png
index f23085130277..f23085130277 100644
--- a/default_images/wizards/res/formarrangelistside_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangelistside_42.png
diff --git a/default_images/wizards/res/formarrangelisttop_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangelisttop_42.png
index 37eac460a0e7..37eac460a0e7 100644
--- a/default_images/wizards/res/formarrangelisttop_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangelisttop_42.png
diff --git a/default_images/wizards/res/formarrangetable_42_h.png b/ooo_custom_images/hicontrast/wizards/res/formarrangetable_42.png
index e82f5c9534bc..e82f5c9534bc 100644
--- a/default_images/wizards/res/formarrangetable_42_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/formarrangetable_42.png
diff --git a/default_images/wizards/res/frame_bottom_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_bottom.png
index 3c2a55817d82..3c2a55817d82 100644
--- a/default_images/wizards/res/frame_bottom_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_bottom.png
diff --git a/default_images/wizards/res/frame_left_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_left.png
index a850ce4cb1f9..a850ce4cb1f9 100644
--- a/default_images/wizards/res/frame_left_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_left.png
diff --git a/default_images/wizards/res/frame_right_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_right.png
index 63781e8a3725..63781e8a3725 100644
--- a/default_images/wizards/res/frame_right_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_right.png
diff --git a/default_images/wizards/res/frame_top_h.png b/ooo_custom_images/hicontrast/wizards/res/frame_top.png
index c3f6dfb79e79..c3f6dfb79e79 100644
--- a/default_images/wizards/res/frame_top_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/frame_top.png
diff --git a/default_images/wizards/res/landscape_32_h.png b/ooo_custom_images/hicontrast/wizards/res/landscape_32.png
index c750f2ffc65c..c750f2ffc65c 100644
--- a/default_images/wizards/res/landscape_32_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/landscape_32.png
diff --git a/default_images/wizards/res/portrait_32_h.png b/ooo_custom_images/hicontrast/wizards/res/portrait_32.png
index a2a72c2063ba..a2a72c2063ba 100644
--- a/default_images/wizards/res/portrait_32_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/portrait_32.png
diff --git a/default_images/wizards/res/simple_h.png b/ooo_custom_images/hicontrast/wizards/res/simple.png
index 9be9316a62a6..9be9316a62a6 100644
--- a/default_images/wizards/res/simple_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/simple.png
diff --git a/default_images/wizards/res/table_2_h.png b/ooo_custom_images/hicontrast/wizards/res/table_2.png
index 1cb205b4353f..1cb205b4353f 100644
--- a/default_images/wizards/res/table_2_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/table_2.png
diff --git a/default_images/wizards/res/table_3_h.png b/ooo_custom_images/hicontrast/wizards/res/table_3.png
index 36268a742e95..36268a742e95 100644
--- a/default_images/wizards/res/table_3_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/table_3.png
diff --git a/default_images/wizards/res/zigzag_h.png b/ooo_custom_images/hicontrast/wizards/res/zigzag.png
index 30e3c518b696..30e3c518b696 100644
--- a/default_images/wizards/res/zigzag_h.png
+++ b/ooo_custom_images/hicontrast/wizards/res/zigzag.png
diff --git a/default_images/xmlsecurity/res/caution_11x16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/caution_11x16.png
index 8f16def12b54..8f16def12b54 100644
--- a/default_images/xmlsecurity/res/caution_11x16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/caution_11x16.png
diff --git a/default_images/xmlsecurity/res/certificate_16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_16.png
index 75edc326d401..75edc326d401 100644
--- a/default_images/xmlsecurity/res/certificate_16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_16.png
diff --git a/default_images/xmlsecurity/res/certificate_40x56_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_40x56.png
index 14ce004eec82..14ce004eec82 100644
--- a/default_images/xmlsecurity/res/certificate_40x56_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/certificate_40x56.png
diff --git a/default_images/xmlsecurity/res/key_12_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/key_12.png
index ad95bebbba68..ad95bebbba68 100644
--- a/default_images/xmlsecurity/res/key_12_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/key_12.png
diff --git a/default_images/xmlsecurity/res/notcertificate_16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_16.png
index 79c7dbff1a97..79c7dbff1a97 100644
--- a/default_images/xmlsecurity/res/notcertificate_16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_16.png
diff --git a/default_images/xmlsecurity/res/notcertificate_40x56_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_40x56.png
index 859ec6f13cd4..859ec6f13cd4 100644
--- a/default_images/xmlsecurity/res/notcertificate_40x56_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/notcertificate_40x56.png
diff --git a/default_images/xmlsecurity/res/signet_11x16_h.png b/ooo_custom_images/hicontrast/xmlsecurity/res/signet_11x16.png
index b8ca0f52107f..b8ca0f52107f 100644
--- a/default_images/xmlsecurity/res/signet_11x16_h.png
+++ b/ooo_custom_images/hicontrast/xmlsecurity/res/signet_11x16.png