69 files changed, 76 insertions, 91 deletions

diff --git a/icon-themes/breeze/links.txt b/icon-themes/breeze/links.txt
index 5ccccfbad7be..136964223b0b 100644
--- a/icon-themes/breeze/links.txt
+++ b/icon-themes/breeze/links.txt
@@ -1043,10 +1043,10 @@ res/sx18003.png res/minus.png
 
 # sc
 # ==============================================
-sc/imglst/lc26047.png cmd/lc_dbviewfunctions.png
-sc/imglst/lc26048.png cmd/lc_autosum.png
-sc/imglst/lc26050.png cmd/lc_cancel.png
-sc/imglst/lc26051.png cmd/lc_ok.png
+sc/res/lc26047.png cmd/lc_dbviewfunctions.png
+sc/res/lc26048.png cmd/lc_autosum.png
+sc/res/lc26050.png cmd/lc_cancel.png
+sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na010.png cmd/sc_selectobject.png
 sc/imglst/na011.png cmd/lc_ok.png
 sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
@@ -1055,10 +1055,10 @@ sc/imglst/nc05.png cmd/sc_insertobject.png
 sc/imglst/nc06.png cmd/sc_showannotations.png
 sc/imglst/nc07.png sc/res/droplink.png
 sc/imglst/nc08.png cmd/sc_gallery.png
-sc/imglst/sc26047.png cmd/sc_dbviewfunctions.png
-sc/imglst/sc26048.png cmd/sc_autosum.png
-sc/imglst/sc26050.png cmd/sc_cancel.png
-sc/imglst/sc26051.png cmd/sc_ok.png
+sc/res/sc26047.png cmd/sc_dbviewfunctions.png
+sc/res/sc26048.png cmd/sc_autosum.png
+sc/res/sc26050.png cmd/sc_cancel.png
+sc/res/sc26051.png cmd/sc_ok.png
 
 sc/res/date.png cmd/sc_datefield.png
 sc/res/dropcopy.png cmd/sc_copy.png
diff --git a/icon-themes/breeze/sc/imglst/lc26049.png b/icon-themes/breeze/sc/res/lc26049.png
index 47b79bbf17e1..47b79bbf17e1 100644
--- a/icon-themes/breeze/sc/imglst/lc26049.png
+++ b/icon-themes/breeze/sc/res/lc26049.png
diff --git a/icon-themes/breeze/sc/imglst/sc26049.png b/icon-themes/breeze/sc/res/sc26049.png
index e992d1d2b05a..e992d1d2b05a 100644
--- a/icon-themes/breeze/sc/imglst/sc26049.png
+++ b/icon-themes/breeze/sc/res/sc26049.png
diff --git a/icon-themes/breeze_dark/links.txt b/icon-themes/breeze_dark/links.txt
index 4b779458659d..5cfdd0af8d5f 100644
--- a/icon-themes/breeze_dark/links.txt
+++ b/icon-themes/breeze_dark/links.txt
@@ -1039,10 +1039,10 @@ res/sx18003.png res/minus.png
 
 # sc
 # ==============================================
-sc/imglst/lc26047.png cmd/lc_dbviewfunctions.png
-sc/imglst/lc26048.png cmd/lc_autosum.png
-sc/imglst/lc26050.png cmd/lc_cancel.png
-sc/imglst/lc26051.png cmd/lc_ok.png
+sc/res/lc26047.png cmd/lc_dbviewfunctions.png
+sc/res/lc26048.png cmd/lc_autosum.png
+sc/res/lc26050.png cmd/lc_cancel.png
+sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na010.png cmd/sc_selectobject.png
 sc/imglst/na011.png cmd/lc_ok.png
 sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
@@ -1051,10 +1051,10 @@ sc/imglst/nc05.png cmd/sc_insertobject.png
 sc/imglst/nc06.png cmd/sc_showannotations.png
 sc/imglst/nc07.png sc/res/droplink.png
 sc/imglst/nc08.png cmd/sc_gallery.png
-sc/imglst/sc26047.png cmd/sc_dbviewfunctions.png
-sc/imglst/sc26048.png cmd/sc_autosum.png
-sc/imglst/sc26050.png cmd/sc_cancel.png
-sc/imglst/sc26051.png cmd/sc_ok.png
+sc/res/sc26047.png cmd/sc_dbviewfunctions.png
+sc/res/sc26048.png cmd/sc_autosum.png
+sc/res/sc26050.png cmd/sc_cancel.png
+sc/res/sc26051.png cmd/sc_ok.png
 
 sc/res/date.png cmd/sc_datefield.png
 sc/res/dropcopy.png cmd/sc_copy.png
diff --git a/icon-themes/breeze_dark/sc/imglst/lc26049.png b/icon-themes/breeze_dark/sc/res/lc26049.png
index ded007edf584..ded007edf584 100644
--- a/icon-themes/breeze_dark/sc/imglst/lc26049.png
+++ b/icon-themes/breeze_dark/sc/res/lc26049.png
diff --git a/icon-themes/breeze_dark/sc/imglst/sc26049.png b/icon-themes/breeze_dark/sc/res/sc26049.png
index a8856f9135e9..a8856f9135e9 100644
--- a/icon-themes/breeze_dark/sc/imglst/sc26049.png
+++ b/icon-themes/breeze_dark/sc/res/sc26049.png
diff --git a/icon-themes/breeze_svg/links.txt b/icon-themes/breeze_svg/links.txt
index 36ca6fe9f852..44d75884b0b5 100644
--- a/icon-themes/breeze_svg/links.txt
+++ b/icon-themes/breeze_svg/links.txt
@@ -1005,10 +1005,10 @@ res/sx18003.png res/minus.png
 
 # sc
 # ==============================================
-sc/imglst/lc26047.png cmd/lc_dbviewfunctions.png
-sc/imglst/lc26048.png cmd/lc_autosum.png
-sc/imglst/lc26050.png cmd/lc_cancel.png
-sc/imglst/lc26051.png cmd/lc_ok.png
+sc/res/lc26047.png cmd/lc_dbviewfunctions.png
+sc/res/lc26048.png cmd/lc_autosum.png
+sc/res/lc26050.png cmd/lc_cancel.png
+sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na010.png cmd/sc_selectobject.png
 sc/imglst/na011.png cmd/lc_ok.png
 sc/imglst/nc03.png cmd/sc_viewdatasourcebrowser.png
@@ -1017,10 +1017,10 @@ sc/imglst/nc05.png cmd/sc_insertobject.png
 sc/imglst/nc06.png cmd/sc_showannotations.png
 sc/imglst/nc07.png sc/res/droplink.png
 sc/imglst/nc08.png cmd/sc_gallery.png
-sc/imglst/sc26047.png cmd/sc_dbviewfunctions.png
-sc/imglst/sc26048.png cmd/sc_autosum.png
-sc/imglst/sc26050.png cmd/sc_cancel.png
-sc/imglst/sc26051.png cmd/sc_ok.png
+sc/res/sc26047.png cmd/sc_dbviewfunctions.png
+sc/res/sc26048.png cmd/sc_autosum.png
+sc/res/sc26050.png cmd/sc_cancel.png
+sc/res/sc26051.png cmd/sc_ok.png
 
 sc/res/date.png cmd/sc_datefield.png
 sc/res/dropcopy.png cmd/sc_copy.png
diff --git a/icon-themes/breeze_svg/sc/imglst/lc26049.svg b/icon-themes/breeze_svg/sc/res/lc26049.svg
index 5ad985e77714..5ad985e77714 100644
--- a/icon-themes/breeze_svg/sc/imglst/lc26049.svg
+++ b/icon-themes/breeze_svg/sc/res/lc26049.svg
diff --git a/icon-themes/breeze_svg/sc/imglst/sc26049.svg b/icon-themes/breeze_svg/sc/res/sc26049.svg
index 5d95395cc81e..5d95395cc81e 100644
--- a/icon-themes/breeze_svg/sc/imglst/sc26049.svg
+++ b/icon-themes/breeze_svg/sc/res/sc26049.svg
diff --git a/icon-themes/crystal/sc/imglst/lc26047.png b/icon-themes/crystal/sc/res/lc26047.png
index fd0d4ac33d25..fd0d4ac33d25 100644
--- a/icon-themes/crystal/sc/imglst/lc26047.png
+++ b/icon-themes/crystal/sc/res/lc26047.png
diff --git a/icon-themes/crystal/sc/imglst/lc26048.png b/icon-themes/crystal/sc/res/lc26048.png
index b83c72578255..b83c72578255 100644
--- a/icon-themes/crystal/sc/imglst/lc26048.png
+++ b/icon-themes/crystal/sc/res/lc26048.png
diff --git a/icon-themes/crystal/sc/imglst/lc26049.png b/icon-themes/crystal/sc/res/lc26049.png
index 09b5d59395ee..09b5d59395ee 100644
--- a/icon-themes/crystal/sc/imglst/lc26049.png
+++ b/icon-themes/crystal/sc/res/lc26049.png
diff --git a/icon-themes/crystal/sc/imglst/lc26050.png b/icon-themes/crystal/sc/res/lc26050.png
index 695df610b5ae..695df610b5ae 100644
--- a/icon-themes/crystal/sc/imglst/lc26050.png
+++ b/icon-themes/crystal/sc/res/lc26050.png
diff --git a/icon-themes/crystal/sc/imglst/lc26051.png b/icon-themes/crystal/sc/res/lc26051.png
index 56c10d1038a5..56c10d1038a5 100644
--- a/icon-themes/crystal/sc/imglst/lc26051.png
+++ b/icon-themes/crystal/sc/res/lc26051.png
diff --git a/icon-themes/crystal/sc/imglst/sc26047.png b/icon-themes/crystal/sc/res/sc26047.png
index 1ef6c4acb896..1ef6c4acb896 100644
--- a/icon-themes/crystal/sc/imglst/sc26047.png
+++ b/icon-themes/crystal/sc/res/sc26047.png
diff --git a/icon-themes/crystal/sc/imglst/sc26048.png b/icon-themes/crystal/sc/res/sc26048.png
index 9aeb02efdf16..9aeb02efdf16 100644
--- a/icon-themes/crystal/sc/imglst/sc26048.png
+++ b/icon-themes/crystal/sc/res/sc26048.png
diff --git a/icon-themes/crystal/sc/imglst/sc26049.png b/icon-themes/crystal/sc/res/sc26049.png
index 1d6afd5ef31a..1d6afd5ef31a 100644
--- a/icon-themes/crystal/sc/imglst/sc26049.png
+++ b/icon-themes/crystal/sc/res/sc26049.png
diff --git a/icon-themes/crystal/sc/imglst/sc26050.png b/icon-themes/crystal/sc/res/sc26050.png
index 5f7a162e72b6..5f7a162e72b6 100644
--- a/icon-themes/crystal/sc/imglst/sc26050.png
+++ b/icon-themes/crystal/sc/res/sc26050.png
diff --git a/icon-themes/crystal/sc/imglst/sc26051.png b/icon-themes/crystal/sc/res/sc26051.png
index 38db62bac905..38db62bac905 100644
--- a/icon-themes/crystal/sc/imglst/sc26051.png
+++ b/icon-themes/crystal/sc/res/sc26051.png
diff --git a/icon-themes/elementary/links.txt b/icon-themes/elementary/links.txt
index 048936028092..30db7cd3b88e 100644
--- a/icon-themes/elementary/links.txt
+++ b/icon-themes/elementary/links.txt
@@ -457,10 +457,10 @@ res/sx03248.png res/odm_16_8.png
 res/sx03249.png res/odp_16_8.png
 res/sx03250.png res/ods_16_8.png
 res/sx03256.png cmd/sc_addons.png
-sc/imglst/lc26047.png cmd/lc_insertformula.png
-sc/imglst/lc26048.png cmd/lc_autosum.png
-sc/imglst/lc26050.png cmd/lc_cancel.png
-sc/imglst/lc26051.png cmd/lc_ok.png
+sc/res/lc26047.png cmd/lc_insertformula.png
+sc/res/lc26048.png cmd/lc_autosum.png
+sc/res/lc26050.png cmd/lc_cancel.png
+sc/res/lc26051.png cmd/lc_ok.png
 sc/imglst/na05.png cmd/sc_upsearch.png
 sc/imglst/na06.png cmd/sc_downsearch.png
 sc/imglst/nc01.png cmd/sc_inserttable.png
@@ -468,10 +468,10 @@ sc/imglst/nc04.png cmd/sc_insertgraphic.png
 sc/imglst/nc05.png cmd/sc_drawchart.png
 sc/imglst/nc06.png cmd/sc_insertannotation.png
 sc/imglst/nc08.png cmd/sc_insertdraw.png
-sc/imglst/sc26047.png cmd/sc_insertformula.png
-sc/imglst/sc26048.png cmd/sc_autosum.png
-sc/imglst/sc26050.png cmd/sc_cancel.png
-sc/imglst/sc26051.png cmd/sc_ok.png
+sc/res/sc26047.png cmd/sc_insertformula.png
+sc/res/sc26048.png cmd/sc_autosum.png
+sc/res/sc26050.png cmd/sc_cancel.png
+sc/res/sc26051.png cmd/sc_ok.png
 sc/res/date.png cmd/sc_datefield.png
 sc/res/dropcopy.png cmd/sc_copy.png
 sc/res/dropurl.png cmd/sc_inserthyperlink.png
diff --git a/icon-themes/elementary/sc/imglst/lc26049.png b/icon-themes/elementary/sc/res/lc26049.png
index cfa70ca4dee1..cfa70ca4dee1 100644
--- a/icon-themes/elementary/sc/imglst/lc26049.png
+++ b/icon-themes/elementary/sc/res/lc26049.png
diff --git a/icon-themes/elementary/sc/imglst/sc26049.png b/icon-themes/elementary/sc/res/sc26049.png
index edb27e27d770..edb27e27d770 100644
--- a/icon-themes/elementary/sc/imglst/sc26049.png
+++ b/icon-themes/elementary/sc/res/sc26049.png
diff --git a/icon-themes/galaxy/sc/imglst/lc26047.png b/icon-themes/galaxy/sc/res/lc26047.png
index b7787937277f..b7787937277f 100644
--- a/icon-themes/galaxy/sc/imglst/lc26047.png
+++ b/icon-themes/galaxy/sc/res/lc26047.png
diff --git a/icon-themes/galaxy/sc/imglst/lc26048.png b/icon-themes/galaxy/sc/res/lc26048.png
index 419a2f6741b8..419a2f6741b8 100644
--- a/icon-themes/galaxy/sc/imglst/lc26048.png
+++ b/icon-themes/galaxy/sc/res/lc26048.png
diff --git a/icon-themes/galaxy/sc/imglst/lc26049.png b/icon-themes/galaxy/sc/res/lc26049.png
index 7f384d353595..7f384d353595 100644
--- a/icon-themes/galaxy/sc/imglst/lc26049.png
+++ b/icon-themes/galaxy/sc/res/lc26049.png
diff --git a/icon-themes/galaxy/sc/imglst/lc26050.png b/icon-themes/galaxy/sc/res/lc26050.png
index 9d0a13dc7c28..9d0a13dc7c28 100644
--- a/icon-themes/galaxy/sc/imglst/lc26050.png
+++ b/icon-themes/galaxy/sc/res/lc26050.png
diff --git a/icon-themes/galaxy/sc/imglst/lc26051.png b/icon-themes/galaxy/sc/res/lc26051.png
index 41986f1d233c..41986f1d233c 100644
--- a/icon-themes/galaxy/sc/imglst/lc26051.png
+++ b/icon-themes/galaxy/sc/res/lc26051.png
diff --git a/icon-themes/galaxy/sc/imglst/sc26047.png b/icon-themes/galaxy/sc/res/sc26047.png
index 68e51a725563..68e51a725563 100644
--- a/icon-themes/galaxy/sc/imglst/sc26047.png
+++ b/icon-themes/galaxy/sc/res/sc26047.png
diff --git a/icon-themes/galaxy/sc/imglst/sc26048.png b/icon-themes/galaxy/sc/res/sc26048.png
index 6770e6300b71..6770e6300b71 100644
--- a/icon-themes/galaxy/sc/imglst/sc26048.png
+++ b/icon-themes/galaxy/sc/res/sc26048.png
diff --git a/icon-themes/galaxy/sc/imglst/sc26049.png b/icon-themes/galaxy/sc/res/sc26049.png
index 0f2c54014c27..0f2c54014c27 100644
--- a/icon-themes/galaxy/sc/imglst/sc26049.png
+++ b/icon-themes/galaxy/sc/res/sc26049.png
diff --git a/icon-themes/galaxy/sc/imglst/sc26050.png b/icon-themes/galaxy/sc/res/sc26050.png
index 00302086bfcb..00302086bfcb 100644
--- a/icon-themes/galaxy/sc/imglst/sc26050.png
+++ b/icon-themes/galaxy/sc/res/sc26050.png
diff --git a/icon-themes/galaxy/sc/imglst/sc26051.png b/icon-themes/galaxy/sc/res/sc26051.png
index 9c7dba06e981..9c7dba06e981 100644
--- a/icon-themes/galaxy/sc/imglst/sc26051.png
+++ b/icon-themes/galaxy/sc/res/sc26051.png
diff --git a/icon-themes/hicontrast/sc/imglst/lc26047.png b/icon-themes/hicontrast/sc/res/lc26047.png
index 7bb477839609..7bb477839609 100644
--- a/icon-themes/hicontrast/sc/imglst/lc26047.png
+++ b/icon-themes/hicontrast/sc/res/lc26047.png
diff --git a/icon-themes/hicontrast/sc/imglst/lc26048.png b/icon-themes/hicontrast/sc/res/lc26048.png
index 8221b0fe5c10..8221b0fe5c10 100644
--- a/icon-themes/hicontrast/sc/imglst/lc26048.png
+++ b/icon-themes/hicontrast/sc/res/lc26048.png
diff --git a/icon-themes/hicontrast/sc/imglst/lc26049.png b/icon-themes/hicontrast/sc/res/lc26049.png
index 997ac32d1eda..997ac32d1eda 100644
--- a/icon-themes/hicontrast/sc/imglst/lc26049.png
+++ b/icon-themes/hicontrast/sc/res/lc26049.png
diff --git a/icon-themes/hicontrast/sc/imglst/lc26050.png b/icon-themes/hicontrast/sc/res/lc26050.png
index ebc30c863090..ebc30c863090 100644
--- a/icon-themes/hicontrast/sc/imglst/lc26050.png
+++ b/icon-themes/hicontrast/sc/res/lc26050.png
diff --git a/icon-themes/hicontrast/sc/imglst/lc26051.png b/icon-themes/hicontrast/sc/res/lc26051.png
index a92a0a378a41..a92a0a378a41 100644
--- a/icon-themes/hicontrast/sc/imglst/lc26051.png
+++ b/icon-themes/hicontrast/sc/res/lc26051.png
diff --git a/icon-themes/hicontrast/sc/imglst/sc26047.png b/icon-themes/hicontrast/sc/res/sc26047.png
index 290af7ffc8b0..290af7ffc8b0 100644
--- a/icon-themes/hicontrast/sc/imglst/sc26047.png
+++ b/icon-themes/hicontrast/sc/res/sc26047.png
diff --git a/icon-themes/hicontrast/sc/imglst/sc26048.png b/icon-themes/hicontrast/sc/res/sc26048.png
index c0f6360cdc8c..c0f6360cdc8c 100644
--- a/icon-themes/hicontrast/sc/imglst/sc26048.png
+++ b/icon-themes/hicontrast/sc/res/sc26048.png
diff --git a/icon-themes/hicontrast/sc/imglst/sc26049.png b/icon-themes/hicontrast/sc/res/sc26049.png
index a2d0d3da77c6..a2d0d3da77c6 100644
--- a/icon-themes/hicontrast/sc/imglst/sc26049.png
+++ b/icon-themes/hicontrast/sc/res/sc26049.png
diff --git a/icon-themes/hicontrast/sc/imglst/sc26050.png b/icon-themes/hicontrast/sc/res/sc26050.png
index 1f5682a2f133..1f5682a2f133 100644
--- a/icon-themes/hicontrast/sc/imglst/sc26050.png
+++ b/icon-themes/hicontrast/sc/res/sc26050.png
diff --git a/icon-themes/hicontrast/sc/imglst/sc26051.png b/icon-themes/hicontrast/sc/res/sc26051.png
index 7b42f0a62b9f..7b42f0a62b9f 100644
--- a/icon-themes/hicontrast/sc/imglst/sc26051.png
+++ b/icon-themes/hicontrast/sc/res/sc26051.png
diff --git a/icon-themes/oxygen/sc/imglst/lc26047.png b/icon-themes/oxygen/sc/res/lc26047.png
index fd0d4ac33d25..fd0d4ac33d25 100644
--- a/icon-themes/oxygen/sc/imglst/lc26047.png
+++ b/icon-themes/oxygen/sc/res/lc26047.png
diff --git a/icon-themes/oxygen/sc/imglst/lc26048.png b/icon-themes/oxygen/sc/res/lc26048.png
index dedaa7e54a4d..dedaa7e54a4d 100644
--- a/icon-themes/oxygen/sc/imglst/lc26048.png
+++ b/icon-themes/oxygen/sc/res/lc26048.png
diff --git a/icon-themes/oxygen/sc/imglst/lc26049.png b/icon-themes/oxygen/sc/res/lc26049.png
index ed183707a52d..ed183707a52d 100644
--- a/icon-themes/oxygen/sc/imglst/lc26049.png
+++ b/icon-themes/oxygen/sc/res/lc26049.png
diff --git a/icon-themes/oxygen/sc/imglst/lc26050.png b/icon-themes/oxygen/sc/res/lc26050.png
index 695df610b5ae..695df610b5ae 100644
--- a/icon-themes/oxygen/sc/imglst/lc26050.png
+++ b/icon-themes/oxygen/sc/res/lc26050.png
diff --git a/icon-themes/oxygen/sc/imglst/lc26051.png b/icon-themes/oxygen/sc/res/lc26051.png
index 56c10d1038a5..56c10d1038a5 100644
--- a/icon-themes/oxygen/sc/imglst/lc26051.png
+++ b/icon-themes/oxygen/sc/res/lc26051.png
diff --git a/icon-themes/oxygen/sc/imglst/sc26047.png b/icon-themes/oxygen/sc/res/sc26047.png
index 1ef6c4acb896..1ef6c4acb896 100644
--- a/icon-themes/oxygen/sc/imglst/sc26047.png
+++ b/icon-themes/oxygen/sc/res/sc26047.png
diff --git a/icon-themes/oxygen/sc/imglst/sc26048.png b/icon-themes/oxygen/sc/res/sc26048.png
index 563c4f42f107..563c4f42f107 100644
--- a/icon-themes/oxygen/sc/imglst/sc26048.png
+++ b/icon-themes/oxygen/sc/res/sc26048.png
diff --git a/icon-themes/oxygen/sc/imglst/sc26049.png b/icon-themes/oxygen/sc/res/sc26049.png
index d3093182dfb1..d3093182dfb1 100644
--- a/icon-themes/oxygen/sc/imglst/sc26049.png
+++ b/icon-themes/oxygen/sc/res/sc26049.png
diff --git a/icon-themes/oxygen/sc/imglst/sc26050.png b/icon-themes/oxygen/sc/res/sc26050.png
index 5f7a162e72b6..5f7a162e72b6 100644
--- a/icon-themes/oxygen/sc/imglst/sc26050.png
+++ b/icon-themes/oxygen/sc/res/sc26050.png
diff --git a/icon-themes/oxygen/sc/imglst/sc26051.png b/icon-themes/oxygen/sc/res/sc26051.png
index 38db62bac905..38db62bac905 100644
--- a/icon-themes/oxygen/sc/imglst/sc26051.png
+++ b/icon-themes/oxygen/sc/res/sc26051.png
diff --git a/icon-themes/sifr/sc/imglst/lc26047.png b/icon-themes/sifr/sc/res/lc26047.png
index c4d818815882..c4d818815882 100644
--- a/icon-themes/sifr/sc/imglst/lc26047.png
+++ b/icon-themes/sifr/sc/res/lc26047.png
diff --git a/icon-themes/sifr/sc/imglst/lc26048.png b/icon-themes/sifr/sc/res/lc26048.png
index bddc620bb489..bddc620bb489 100644
--- a/icon-themes/sifr/sc/imglst/lc26048.png
+++ b/icon-themes/sifr/sc/res/lc26048.png
diff --git a/icon-themes/sifr/sc/imglst/lc26049.png b/icon-themes/sifr/sc/res/lc26049.png
index ec5081df41d2..ec5081df41d2 100644
--- a/icon-themes/sifr/sc/imglst/lc26049.png
+++ b/icon-themes/sifr/sc/res/lc26049.png
diff --git a/icon-themes/sifr/sc/imglst/lc26050.png b/icon-themes/sifr/sc/res/lc26050.png
index 91b4ecf26ed0..91b4ecf26ed0 100644
--- a/icon-themes/sifr/sc/imglst/lc26050.png
+++ b/icon-themes/sifr/sc/res/lc26050.png
diff --git a/icon-themes/sifr/sc/imglst/lc26051.png b/icon-themes/sifr/sc/res/lc26051.png
index f2213b333a36..f2213b333a36 100644
--- a/icon-themes/sifr/sc/imglst/lc26051.png
+++ b/icon-themes/sifr/sc/res/lc26051.png
diff --git a/icon-themes/sifr/sc/imglst/sc26047.png b/icon-themes/sifr/sc/res/sc26047.png
index 8d0c2a589b1f..8d0c2a589b1f 100644
--- a/icon-themes/sifr/sc/imglst/sc26047.png
+++ b/icon-themes/sifr/sc/res/sc26047.png
diff --git a/icon-themes/sifr/sc/imglst/sc26048.png b/icon-themes/sifr/sc/res/sc26048.png
index 056a6bbb6f25..056a6bbb6f25 100644
--- a/icon-themes/sifr/sc/imglst/sc26048.png
+++ b/icon-themes/sifr/sc/res/sc26048.png
diff --git a/icon-themes/sifr/sc/imglst/sc26049.png b/icon-themes/sifr/sc/res/sc26049.png
index 2b72e2444eb7..2b72e2444eb7 100644
--- a/icon-themes/sifr/sc/imglst/sc26049.png
+++ b/icon-themes/sifr/sc/res/sc26049.png
diff --git a/icon-themes/sifr/sc/imglst/sc26050.png b/icon-themes/sifr/sc/res/sc26050.pngD
index f7f644629101..f7f644629101 100644
--- a/icon-themes/sifr/sc/imglst/sc26050.png
+++ b/icon-themes/sifr/sc/res/sc26050.pngD
diff --git a/icon-themes/sifr/sc/imglst/sc26051.png b/icon-themes/sifr/sc/res/sc26051.png
index 2055c37e40d2..2055c37e40d2 100644
--- a/icon-themes/sifr/sc/imglst/sc26051.png
+++ b/icon-themes/sifr/sc/res/sc26051.png
diff --git a/icon-themes/tango/links.txt b/icon-themes/tango/links.txt
index 0e34098f1e8c..e77da0ea3ae3 100644
--- a/icon-themes/tango/links.txt
+++ b/icon-themes/tango/links.txt
@@ -18,9 +18,9 @@ cmd/lc_advancedmode.png cmd/lc_toggleobjectrotatemode.png
 res/lc05539.png cmd/lc_designerdialog.png
 cmd/sc_savebasicas.png cmd/sc_saveas.png
 res/lc05711.png cmd/lc_copy.png
-sc/imglst/lc26050.png cmd/lc_cancel.png
+sc/res/lc26050.png cmd/lc_cancel.png
 sw/imglst/lc20557.png cmd/lc_cancel.png
-sc/imglst/sc26050.png cmd/sc_cancel.png
+sc/res/sc26050.png cmd/sc_cancel.png
 sw/imglst/sc20557.png cmd/sc_cancel.png
 res/sc10853.png cmd/sc_recsearch.png
 res/sc05961.png cmd/sc_recsearch.png
@@ -92,10 +92,10 @@ fpicker/res/fp014.png res/newdoc.png
 sd/res/playblue_16.png avmedia/res/av02049.png
 sd/res/breakplayingblue_16.png avmedia/res/av02050.png
 avmedia/res/avl02053.png cmd/lc_ok.png
-sc/imglst/lc26051.png cmd/lc_ok.png
+sc/res/lc26051.png cmd/lc_ok.png
 sw/imglst/lc20558.png cmd/lc_ok.png
 avmedia/res/av02053.png cmd/sc_ok.png
-sc/imglst/sc26051.png cmd/sc_ok.png
+sc/res/sc26051.png cmd/sc_ok.png
 sw/imglst/sc20558.png cmd/sc_ok.png
 avmedia/res/avl02048.png cmd/lc_open.png
 avmedia/res/av02048.png cmd/sc_open.png
@@ -207,8 +207,8 @@ sfx2/res/symphony/sidebar-transition-small.png cmd/sc_dia.png
 sfx2/res/symphony/sidebar-animation-small.png cmd/sc_customanimation.png
 sw/imglst/lc20556.png cmd/lc_insertformula.png
 sw/imglst/sc20556.png cmd/sc_insertformula.png
-sc/imglst/lc26047.png cmd/lc_insertformula.png
-sc/imglst/sc26047.png cmd/sc_insertformula.png
+sc/res/lc26047.png cmd/lc_insertformula.png
+sc/res/sc26047.png cmd/sc_insertformula.png
 cmd/lc_exitsearch.png cmd/lc_closedoc.png
 cmd/sc_exitsearch.png cmd/sc_closedoc.png
 cmd/lc_leftpara.png cmd/lc_alignleft.png
@@ -252,8 +252,8 @@ cmd/lc_openfromwriter.png cmd/lc_open.png
 cmd/lc_openfromcalc.png cmd/lc_open.png
 cmd/sc_openfromwriter.png cmd/sc_open.png
 cmd/sc_openfromcalc.png cmd/sc_open.png
-sc/imglst/lc26048.png cmd/lc_autosum.png
-sc/imglst/sc26048.png cmd/sc_autosum.png
+sc/res/lc26048.png cmd/lc_autosum.png
+sc/res/sc26048.png cmd/sc_autosum.png
 cmd/lc_fontcolor.png cmd/lc_color.png
 cmd/sc_fontcolor.png cmd/sc_color.png
 cmd/lc_circle.png cmd/lc_basicshapes.circle.png
diff --git a/icon-themes/tango/sc/imglst/lc26049.png b/icon-themes/tango/sc/res/lc26049.png
index 8144e5e99bf2..8144e5e99bf2 100644
--- a/icon-themes/tango/sc/imglst/lc26049.png
+++ b/icon-themes/tango/sc/res/lc26049.png
diff --git a/icon-themes/tango/sc/imglst/sc26049.png b/icon-themes/tango/sc/res/sc26049.png
index d61b5af47d9c..d61b5af47d9c 100644
--- a/icon-themes/tango/sc/imglst/sc26049.png
+++ b/icon-themes/tango/sc/res/sc26049.png
diff --git a/icon-themes/tango_testing/sc/imglst/lc26048.png b/icon-themes/tango_testing/sc/res/lc26048.png
index 01fbe2926afc..01fbe2926afc 100644
--- a/icon-themes/tango_testing/sc/imglst/lc26048.png
+++ b/icon-themes/tango_testing/sc/res/lc26048.png
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index edc90dc1dbf3..3f3300eeacf4 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1026,6 +1026,11 @@
 #define RID_BMP_MINUS           (BMP_START + 32)
 #define RID_BMP_NOTPRESSED      (BMP_START + 33)
 #define RID_BMP_PRESSED         (BMP_START + 34)
+#define RID_BMP_INPUT_FUNCTION  (BMP_START + 35)
+#define RID_BMP_INPUT_SUM       (BMP_START + 36)
+#define RID_BMP_INPUT_EQUAL     (BMP_START + 37)
+#define RID_BMP_INPUT_CANCEL    (BMP_START + 38)
+#define RID_BMP_INPUT_OK        (BMP_START + 39)
 
 #define BMP_END                 (BMP_START + 100)
 
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 0b88697d62ee..3801cefffe86 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -140,8 +140,6 @@ SfxChildWinInfo ScInputWindowWrapper::GetInfo() const
     return aInfo;
 }
 
-#define IMAGE(id) pImgMgr->SeekImage(id)
-
 //  class ScInputWindow
 
 static VclPtr<ScTextWndBase> lcl_chooseRuntimeImpl( vcl::Window* pParent, SfxBindings* pBind )
@@ -173,9 +171,6 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
         bIsOkCancelMode ( false ),
         bInResize       ( false )
 {
-    ScModule*        pScMod  = SC_MOD();
-    SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
-
     // #i73615# don't rely on SfxViewShell::Current while constructing the input line
     // (also for GetInputHdl below)
     ScTabViewShell* pViewSh = nullptr;
@@ -191,9 +186,9 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
     // Position window, 3 buttons, input window
     InsertWindow    (1, aWndPos.get(), ToolBoxItemBits::NONE, 0);
     InsertSeparator (1);
-    InsertItem      (SID_INPUT_FUNCTION, IMAGE(SID_INPUT_FUNCTION), ToolBoxItemBits::NONE, 2);
-    InsertItem      (SID_INPUT_SUM,      IMAGE(SID_INPUT_SUM), ToolBoxItemBits::NONE, 3);
-    InsertItem      (SID_INPUT_EQUAL,    IMAGE(SID_INPUT_EQUAL), ToolBoxItemBits::NONE, 4);
+    InsertItem      (SID_INPUT_FUNCTION, Image(BitmapEx(ScResId(RID_BMP_INPUT_FUNCTION))), ToolBoxItemBits::NONE, 2);
+    InsertItem      (SID_INPUT_SUM,      Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))), ToolBoxItemBits::NONE, 3);
+    InsertItem      (SID_INPUT_EQUAL,    Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))), ToolBoxItemBits::NONE, 4);
     InsertSeparator (5);
     InsertWindow    (7, &aTextWindow, ToolBoxItemBits::NONE, 6);
 
@@ -240,7 +235,6 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
     else if (pViewSh)
         pViewSh->UpdateInputHandler(true); // Absolutely necessary update
 
-    pImgMgr->RegisterToolBox(this);
     SetAccessibleName(ScResId(STR_ACC_TOOLBAR_FORMULA));
 }
 
@@ -272,8 +266,6 @@ void ScInputWindow::dispose()
         }
     }
 
-    SfxImageManager::GetImageManager( *SC_MOD() )->ReleaseToolBox( this );
-
     pRuntimeWindow.disposeAndClear();
     aWndPos.disposeAndClear();
 
@@ -509,14 +501,12 @@ void ScInputWindow::SetOkCancelMode()
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
     EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
 
-    ScModule* pScMod = SC_MOD();
-    SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
     if (!bIsOkCancelMode)
     {
         RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL
         RemoveItem( 3 );
-        InsertItem( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ), ToolBoxItemBits::NONE, 3 );
-        InsertItem( SID_INPUT_OK,     IMAGE( SID_INPUT_OK ),     ToolBoxItemBits::NONE, 4 );
+        InsertItem( SID_INPUT_CANCEL, Image(BitmapEx(ScResId(RID_BMP_INPUT_CANCEL))), ToolBoxItemBits::NONE, 3 );
+        InsertItem( SID_INPUT_OK,     Image(BitmapEx(ScResId(RID_BMP_INPUT_OK))),     ToolBoxItemBits::NONE, 4 );
         SetItemText ( SID_INPUT_CANCEL, aTextCancel );
         SetHelpId   ( SID_INPUT_CANCEL, HID_INSWIN_CANCEL );
         SetItemText ( SID_INPUT_OK,     aTextOk );
@@ -531,15 +521,13 @@ void ScInputWindow::SetSumAssignMode()
     SfxViewFrame* pViewFrm = SfxViewFrame::Current();
     EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
 
-    ScModule* pScMod = SC_MOD();
-    SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
     if (bIsOkCancelMode)
     {
         // Remove SID_INPUT_CANCEL, and SID_INPUT_OK
         RemoveItem( 3 );
         RemoveItem( 3 );
-        InsertItem( SID_INPUT_SUM,   IMAGE( SID_INPUT_SUM ),   ToolBoxItemBits::NONE, 3 );
-        InsertItem( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ), ToolBoxItemBits::NONE, 4 );
+        InsertItem( SID_INPUT_SUM,   Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))),   ToolBoxItemBits::NONE, 3 );
+        InsertItem( SID_INPUT_EQUAL, Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))), ToolBoxItemBits::NONE, 4 );
         SetItemText ( SID_INPUT_SUM,   aTextSum );
         SetHelpId   ( SID_INPUT_SUM,   HID_INSWIN_SUMME );
         SetItemText ( SID_INPUT_EQUAL, aTextEqual );
@@ -634,20 +622,16 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
     if ( rDCEvt.GetType() == DataChangedEventType::SETTINGS && (rDCEvt.GetFlags() & AllSettingsFlags::STYLE) )
     {
         //  update item images
-        ScModule*        pScMod  = SC_MOD();
-        SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
-
-        // IMAGE macro uses pScMod, pImgMg
-        SetItemImage( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ) );
+        SetItemImage(SID_INPUT_FUNCTION, Image(BitmapEx(ScResId(RID_BMP_INPUT_FUNCTION))));
         if ( bIsOkCancelMode )
         {
-            SetItemImage( SID_INPUT_CANCEL, IMAGE( SID_INPUT_CANCEL ) );
-            SetItemImage( SID_INPUT_OK,     IMAGE( SID_INPUT_OK ) );
+            SetItemImage(SID_INPUT_CANCEL, Image(BitmapEx(ScResId(RID_BMP_INPUT_CANCEL))));
+            SetItemImage(SID_INPUT_OK,     Image(BitmapEx(ScResId(RID_BMP_INPUT_OK))));
         }
         else
         {
-            SetItemImage( SID_INPUT_SUM,   IMAGE( SID_INPUT_SUM ) );
-            SetItemImage( SID_INPUT_EQUAL, IMAGE( SID_INPUT_EQUAL ) );
+            SetItemImage(SID_INPUT_SUM,   Image(BitmapEx(ScResId(RID_BMP_INPUT_SUM))));
+            SetItemImage(SID_INPUT_EQUAL, Image(BitmapEx(ScResId(RID_BMP_INPUT_EQUAL))));
         }
     }
 
diff --git a/sc/source/ui/src/toolbox.src b/sc/source/ui/src/toolbox.src
index b0955c09c884..6d3d2322eb4b 100644
--- a/sc/source/ui/src/toolbox.src
+++ b/sc/source/ui/src/toolbox.src
@@ -64,33 +64,29 @@ String SCSTR_QHELP_COLLAPSE_FORMULA
     Text [ en-US ] = "Collapse Formula Bar" ;
 };
 
-// Don't use this image list for normal toolbar images. We have now our commandimagelist
-// folder in icon-themes/(name of theme)/cmd. This list is now only used for special
-//toolboxes that are used in floating windows.
-
-#define DEFAULT_IDLIST \
-    IdList = {                                          \
-        /* Eingabezeile */                              \
-        SID_INPUT_FUNCTION;             /* 26047 */     \
-        SID_INPUT_SUM;                  /* 26048 */     \
-        SID_INPUT_EQUAL;                /* 26049 */     \
-        SID_INPUT_CANCEL;               /* 26050 */     \
-        SID_INPUT_OK;                   /* 26051 */     \
-    };                                                  \
-    IdCount = {                                         \
-        5;                                              \
-    };
-
-ImageList RID_DEFAULTIMAGELIST_SC
+Bitmap RID_BMP_INPUT_FUNCTION
 {
-    Prefix = "sc";
-    DEFAULT_IDLIST
+    File = "sc26047.png";
 };
 
-ImageList RID_DEFAULTIMAGELIST_LC
+Bitmap RID_BMP_INPUT_SUM
 {
-    Prefix = "lc";
-    DEFAULT_IDLIST
+    File = "sc26048.png";
+};
+
+Bitmap RID_BMP_INPUT_EQUAL
+{
+    File = "sc26049.png";
+};
+
+Bitmap RID_BMP_INPUT_CANCEL
+{
+    File = "sc26050.png";
+};
+
+Bitmap RID_BMP_INPUT_OK
+{
+    File = "sc26051.png";
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */