tdf#134887 NewToolbarController: Use different icons for extra large

Changes from master:

- Resolved merge conflicts caused by the fact we're not backporting
  the other commit of tdf#134887.

- Added a simple workaround for tdf#135369.

Conflicts:
	framework/source/uielement/popuptoolbarcontroller.cxx

Change-Id: I30621ab2e98c2387f3de67b2871516e5e25da761
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99565
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>
(cherry picked from commit 789f67940af461c18b0a2ffbc6313b91fb08f26a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100224

9 files changed, 18 insertions, 9 deletions

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index b03aeef95f97..b30c7504714b 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -2071,7 +2071,8 @@ res/library_16.png cmd/sc_viewdatasourcebrowser.png
 res/lx03131.png res/lx03126.png
 res/lx03135.png svx/res/galnorl.png
 res/lx03137.png res/lx03125.png
-res/lx03139.png cmd/32/newhtmldoc.png
+res/lx03139.png cmd/lc_newhtmldoc.png
+res/lx03139_32.png cmd/32/newhtmldoc.png
 res/lx03140.png res/lx03125.png
 res/lx03144.png res/odf_32_8.png
 res/lx03145.png res/otf_32_8.png
@@ -2100,17 +2101,25 @@ res/lx03228.png res/otg_32_8.png
 res/lx03239.png cmd/32/dbrelationdesign.png
 res/lx03242.png res/mainapp_32_8.png
 res/lx03243.png res/lx03123.png
-res/lx03245.png res/odb_32_8.png
-res/lx03246.png res/odg_32_8.png
-res/lx03247.png res/odf_32_8.png
-res/lx03248.png res/odm_32_8.png
-res/lx03249.png res/odp_32_8.png
-res/lx03250.png res/ods_32_8.png
-res/lx03251.png res/odt_32_8.png
+res/lx03245.png res/odb_24_8.png
+res/lx03245_32.png res/odb_32_8.png
+res/lx03246.png res/odg_24_8.png
+res/lx03246_32.png res/odg_32_8.png
+res/lx03247.png res/odf_24_8.png
+res/lx03247_32.png res/odf_32_8.png
+res/lx03248.png res/odm_24_8.png
+res/lx03248_32.png res/odm_32_8.png
+res/lx03249.png res/odp_24_8.png
+res/lx03249_32.png res/odp_32_8.png
+res/lx03250.png res/ods_24_8.png
+res/lx03250_32.png res/ods_32_8.png
+res/lx03251.png res/odt_24_8.png
+res/lx03251_32.png res/odt_32_8.png
 res/lx03252.png res/otg_32_8.png
 res/lx03253.png res/otp_32_8.png
 res/lx03254.png res/ots_32_8.png
-res/lx03255.png res/ott_32_8.png
+res/lx03255.png res/ott_24_8.png
+res/lx03255_32.png res/ott_32_8.png
 res/lx03256.png cmd/lc_insertplugin.png
 res/mainapp_32.png res/mainapp_32_8.png
 res/newdoc.png svtools/res/folder.png
diff --git a/icon-themes/colibre/res/odb_24_8.png b/icon-themes/colibre/res/odb_24_8.png
new file mode 100644
index 000000000000..c525f1be8cf5
--- /dev/null
+++ b/icon-themes/colibre/res/odb_24_8.png
diff --git a/icon-themes/colibre/res/odf_24_8.png b/icon-themes/colibre/res/odf_24_8.png
new file mode 100644
index 000000000000..58d542d739ab
--- /dev/null
+++ b/icon-themes/colibre/res/odf_24_8.png
diff --git a/icon-themes/colibre/res/odg_24_8.png b/icon-themes/colibre/res/odg_24_8.png
new file mode 100644
index 000000000000..43d4fda7646d
--- /dev/null
+++ b/icon-themes/colibre/res/odg_24_8.png
diff --git a/icon-themes/colibre/res/odm_24_8.png b/icon-themes/colibre/res/odm_24_8.png
new file mode 100644
index 000000000000..e0c9862b90a2
--- /dev/null
+++ b/icon-themes/colibre/res/odm_24_8.png
diff --git a/icon-themes/colibre/res/odp_24_8.png b/icon-themes/colibre/res/odp_24_8.png
new file mode 100644
index 000000000000..037d68b4de7f
--- /dev/null
+++ b/icon-themes/colibre/res/odp_24_8.png
diff --git a/icon-themes/colibre/res/ods_24_8.png b/icon-themes/colibre/res/ods_24_8.png
new file mode 100644
index 000000000000..9b88046ca54c
--- /dev/null
+++ b/icon-themes/colibre/res/ods_24_8.png
diff --git a/icon-themes/colibre/res/odt_24_8.png b/icon-themes/colibre/res/odt_24_8.png
new file mode 100644
index 000000000000..e01a9ab638f8
--- /dev/null
+++ b/icon-themes/colibre/res/odt_24_8.png
diff --git a/icon-themes/colibre/res/ott_24_8.png b/icon-themes/colibre/res/ott_24_8.png
new file mode 100644
index 000000000000..124a93885b55
--- /dev/null
+++ b/icon-themes/colibre/res/ott_24_8.png