Colibre: Fix for tdf#122924, tdf#126044

- Clean unecessary extra outline
- Update Gallery, Paste, EPUB, language
- Sync extra large AutoFormat
- Update table formula in Writer's Navigator
- Update DB Form, Query, Report, Table
- Update Draw/Impress master, Handout, Outline, Notes, Master Notes

Change-Id: I1faabab504010c584f7a480ed6c521c47584df38
Writer: Re-enable some icons in menubar
Reviewed-on: https://gerrit.libreoffice.org/74591
Tested-by: Jenkins
Reviewed-by: Rizal Muttaqin <riz_17_oke@yahoo.co.id>

215 files changed, 122 insertions, 100 deletions

diff --git a/icon-themes/colibre/cmd/32/assignlayout.png b/icon-themes/colibre/cmd/32/assignlayout.png
index 4fc41a6b2eec..3d1fe296b5af 100644
--- a/icon-themes/colibre/cmd/32/assignlayout.png
+++ b/icon-themes/colibre/cmd/32/assignlayout.png
diff --git a/icon-themes/colibre/cmd/32/autoformat.png b/icon-themes/colibre/cmd/32/autoformat.png
index 1115edb054c7..7b94c8c7ee62 100644
--- a/icon-themes/colibre/cmd/32/autoformat.png
+++ b/icon-themes/colibre/cmd/32/autoformat.png
diff --git a/icon-themes/colibre/cmd/32/autopilotmenu.png b/icon-themes/colibre/cmd/32/autopilotmenu.png
new file mode 100644
index 000000000000..d0c369cec726
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/autopilotmenu.png
diff --git a/icon-themes/colibre/cmd/32/autosum.png b/icon-themes/colibre/cmd/32/autosum.png
index d6005ede8a8d..b9e8eba70a97 100644
--- a/icon-themes/colibre/cmd/32/autosum.png
+++ b/icon-themes/colibre/cmd/32/autosum.png
diff --git a/icon-themes/colibre/cmd/32/choosecontrols.png b/icon-themes/colibre/cmd/32/choosecontrols.png
new file mode 100644
index 000000000000..70d1622ffd4c
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/choosecontrols.png
diff --git a/icon-themes/colibre/cmd/32/choosedesign.png b/icon-themes/colibre/cmd/32/choosedesign.png
index 4a5b4e2840a4..d443ec86034d 100644
--- a/icon-themes/colibre/cmd/32/choosedesign.png
+++ b/icon-themes/colibre/cmd/32/choosedesign.png
diff --git a/icon-themes/colibre/cmd/32/closemasterview.png b/icon-themes/colibre/cmd/32/closemasterview.png
index 5ffd8acb4101..812dbd851321 100644
--- a/icon-themes/colibre/cmd/32/closemasterview.png
+++ b/icon-themes/colibre/cmd/32/closemasterview.png
diff --git a/icon-themes/colibre/cmd/32/dbclearquery.png b/icon-themes/colibre/cmd/32/dbclearquery.png
new file mode 100644
index 000000000000..1d23bedeb38c
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbclearquery.png
diff --git a/icon-themes/colibre/cmd/32/dbformdelete.png b/icon-themes/colibre/cmd/32/dbformdelete.png
new file mode 100644
index 000000000000..de6ff1ee21f6
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbformdelete.png
diff --git a/icon-themes/colibre/cmd/32/dbformedit.png b/icon-themes/colibre/cmd/32/dbformedit.png
index a502df4a88ca..1502cf95d9e5 100644
--- a/icon-themes/colibre/cmd/32/dbformedit.png
+++ b/icon-themes/colibre/cmd/32/dbformedit.png
diff --git a/icon-themes/colibre/cmd/32/dbformrename.png b/icon-themes/colibre/cmd/32/dbformrename.png
new file mode 100644
index 000000000000..21f95d0e3d14
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbformrename.png
diff --git a/icon-themes/colibre/cmd/32/dbnewform.png b/icon-themes/colibre/cmd/32/dbnewform.png
index 5a9d5853167d..e64b4b3567ff 100644
--- a/icon-themes/colibre/cmd/32/dbnewform.png
+++ b/icon-themes/colibre/cmd/32/dbnewform.png
diff --git a/icon-themes/colibre/cmd/32/dbnewquery.png b/icon-themes/colibre/cmd/32/dbnewquery.png
index f8d3a04befa4..855c56bfa3c3 100644
--- a/icon-themes/colibre/cmd/32/dbnewquery.png
+++ b/icon-themes/colibre/cmd/32/dbnewquery.png
diff --git a/icon-themes/colibre/cmd/32/dbnewtable.png b/icon-themes/colibre/cmd/32/dbnewtable.png
new file mode 100644
index 000000000000..afaff6023dd5
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbnewtable.png
diff --git a/icon-themes/colibre/cmd/32/dbquerydelete.png b/icon-themes/colibre/cmd/32/dbquerydelete.png
new file mode 100644
index 000000000000..62dd71e0d070
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbquerydelete.png
diff --git a/icon-themes/colibre/cmd/32/dbqueryedit.png b/icon-themes/colibre/cmd/32/dbqueryedit.png
index c32e62e5af4a..64b4e17b7227 100644
--- a/icon-themes/colibre/cmd/32/dbqueryedit.png
+++ b/icon-themes/colibre/cmd/32/dbqueryedit.png
diff --git a/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png b/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png
new file mode 100644
index 000000000000..90ed6257140d
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbquerypropertiesdialog.png
diff --git a/icon-themes/colibre/cmd/32/dbqueryrename.png b/icon-themes/colibre/cmd/32/dbqueryrename.png
new file mode 100644
index 000000000000..b06e4e736a83
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbqueryrename.png
diff --git a/icon-themes/colibre/cmd/32/dbreportdelete.png b/icon-themes/colibre/cmd/32/dbreportdelete.png
new file mode 100644
index 000000000000..8a241c7ab9eb
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbreportdelete.png
diff --git a/icon-themes/colibre/cmd/32/dbreportedit.png b/icon-themes/colibre/cmd/32/dbreportedit.png
index db8e123a6f4d..22876d4f63ea 100644
--- a/icon-themes/colibre/cmd/32/dbreportedit.png
+++ b/icon-themes/colibre/cmd/32/dbreportedit.png
diff --git a/icon-themes/colibre/cmd/32/dbreportrename.png b/icon-themes/colibre/cmd/32/dbreportrename.png
new file mode 100644
index 000000000000..16487a213a72
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbreportrename.png
diff --git a/icon-themes/colibre/cmd/32/dbtabledelete.png b/icon-themes/colibre/cmd/32/dbtabledelete.png
new file mode 100644
index 000000000000..19b55aee546b
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbtabledelete.png
diff --git a/icon-themes/colibre/cmd/32/dbtableedit.png b/icon-themes/colibre/cmd/32/dbtableedit.png
new file mode 100644
index 000000000000..8b3a51f67bf0
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbtableedit.png
diff --git a/icon-themes/colibre/cmd/32/dbtablerename.png b/icon-themes/colibre/cmd/32/dbtablerename.png
new file mode 100644
index 000000000000..32e8f44c757d
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbtablerename.png
diff --git a/icon-themes/colibre/cmd/32/dbviewaliases.png b/icon-themes/colibre/cmd/32/dbviewaliases.png
index 569e532e77b7..35d18c023bc3 100644
--- a/icon-themes/colibre/cmd/32/dbviewaliases.png
+++ b/icon-themes/colibre/cmd/32/dbviewaliases.png
diff --git a/icon-themes/colibre/cmd/32/dbviewforms.png b/icon-themes/colibre/cmd/32/dbviewforms.png
new file mode 100644
index 000000000000..a98e08323603
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbviewforms.png
diff --git a/icon-themes/colibre/cmd/32/dbviewqueries.png b/icon-themes/colibre/cmd/32/dbviewqueries.png
new file mode 100644
index 000000000000..d38ad7e9f590
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbviewqueries.png
diff --git a/icon-themes/colibre/cmd/32/dbviewreports.png b/icon-themes/colibre/cmd/32/dbviewreports.png
new file mode 100644
index 000000000000..5b300ac3f699
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbviewreports.png
diff --git a/icon-themes/colibre/cmd/32/dbviewtablenames.png b/icon-themes/colibre/cmd/32/dbviewtablenames.png
index 1c16774e49cc..62b36328ddb5 100644
--- a/icon-themes/colibre/cmd/32/dbviewtablenames.png
+++ b/icon-themes/colibre/cmd/32/dbviewtablenames.png
diff --git a/icon-themes/colibre/cmd/32/dbviewtables.png b/icon-themes/colibre/cmd/32/dbviewtables.png
new file mode 100644
index 000000000000..1c16774e49cc
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/dbviewtables.png
diff --git a/icon-themes/colibre/cmd/32/deletemasterpage.png b/icon-themes/colibre/cmd/32/deletemasterpage.png
index 69e31887980b..be182798988a 100644
--- a/icon-themes/colibre/cmd/32/deletemasterpage.png
+++ b/icon-themes/colibre/cmd/32/deletemasterpage.png
diff --git a/icon-themes/colibre/cmd/32/deletetable.png b/icon-themes/colibre/cmd/32/deletetable.png
index d184c275da4a..30995d6410f1 100644
--- a/icon-themes/colibre/cmd/32/deletetable.png
+++ b/icon-themes/colibre/cmd/32/deletetable.png
diff --git a/icon-themes/colibre/cmd/32/diamode.png b/icon-themes/colibre/cmd/32/diamode.png
index cc108858a59a..91df667eb920 100644
--- a/icon-themes/colibre/cmd/32/diamode.png
+++ b/icon-themes/colibre/cmd/32/diamode.png
diff --git a/icon-themes/colibre/cmd/32/displaymasterobjects.png b/icon-themes/colibre/cmd/32/displaymasterobjects.png
index 9044507490c0..90817bef45cc 100644
--- a/icon-themes/colibre/cmd/32/displaymasterobjects.png
+++ b/icon-themes/colibre/cmd/32/displaymasterobjects.png
diff --git a/icon-themes/colibre/cmd/32/displaymode.png b/icon-themes/colibre/cmd/32/displaymode.png
index 20b434cfebfa..eb0ff7e678ca 100644
--- a/icon-themes/colibre/cmd/32/displaymode.png
+++ b/icon-themes/colibre/cmd/32/displaymode.png
diff --git a/icon-themes/colibre/cmd/32/downsearch.png b/icon-themes/colibre/cmd/32/downsearch.png
index e232ee726326..89718bec6edc 100644
--- a/icon-themes/colibre/cmd/32/downsearch.png
+++ b/icon-themes/colibre/cmd/32/downsearch.png
diff --git a/icon-themes/colibre/cmd/32/edit.png b/icon-themes/colibre/cmd/32/edit.png
index 39cd806ee381..2185c4af3e57 100644
--- a/icon-themes/colibre/cmd/32/edit.png
+++ b/icon-themes/colibre/cmd/32/edit.png
diff --git a/icon-themes/colibre/cmd/32/executereport.png b/icon-themes/colibre/cmd/32/executereport.png
index 5b300ac3f699..feb4b1bcc40d 100644
--- a/icon-themes/colibre/cmd/32/executereport.png
+++ b/icon-themes/colibre/cmd/32/executereport.png
diff --git a/icon-themes/colibre/cmd/32/exportdirecttoepub.png b/icon-themes/colibre/cmd/32/exportdirecttoepub.png
index aa1fe4ffbc63..0d3755e1f73a 100644
--- a/icon-themes/colibre/cmd/32/exportdirecttoepub.png
+++ b/icon-themes/colibre/cmd/32/exportdirecttoepub.png
diff --git a/icon-themes/colibre/cmd/32/filecontrol.png b/icon-themes/colibre/cmd/32/filecontrol.png
new file mode 100644
index 000000000000..70bff6cef894
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/filecontrol.png
diff --git a/icon-themes/colibre/cmd/32/filefield.png b/icon-themes/colibre/cmd/32/filefield.png
new file mode 100644
index 000000000000..772c4afbd491
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/filefield.png
diff --git a/icon-themes/colibre/cmd/32/firstpage.png b/icon-themes/colibre/cmd/32/firstpage.png
index 97381c6916ed..bd40507d8b36 100644
--- a/icon-themes/colibre/cmd/32/firstpage.png
+++ b/icon-themes/colibre/cmd/32/firstpage.png
diff --git a/icon-themes/colibre/cmd/32/firstrecord.png b/icon-themes/colibre/cmd/32/firstrecord.png
index b28bf2aded92..bd40507d8b36 100644
--- a/icon-themes/colibre/cmd/32/firstrecord.png
+++ b/icon-themes/colibre/cmd/32/firstrecord.png
diff --git a/icon-themes/colibre/cmd/32/formdesigntools.png b/icon-themes/colibre/cmd/32/formdesigntools.png
index a43a2ae26822..f0676a54f6ca 100644
--- a/icon-themes/colibre/cmd/32/formdesigntools.png
+++ b/icon-themes/colibre/cmd/32/formdesigntools.png
diff --git a/icon-themes/colibre/cmd/32/gallery.png b/icon-themes/colibre/cmd/32/gallery.png
index bee6df59d044..2e88593162d9 100644
--- a/icon-themes/colibre/cmd/32/gallery.png
+++ b/icon-themes/colibre/cmd/32/gallery.png
diff --git a/icon-themes/colibre/cmd/32/handoutmode.png b/icon-themes/colibre/cmd/32/handoutmode.png
index 4ba9aae00cf3..7e62ba323303 100644
--- a/icon-themes/colibre/cmd/32/handoutmode.png
+++ b/icon-themes/colibre/cmd/32/handoutmode.png
diff --git a/icon-themes/colibre/cmd/32/incrementindent.png b/icon-themes/colibre/cmd/32/incrementindent.png
index 7823f883942d..e51aeb382584 100644
--- a/icon-themes/colibre/cmd/32/incrementindent.png
+++ b/icon-themes/colibre/cmd/32/incrementindent.png
diff --git a/icon-themes/colibre/cmd/32/insertcaptiondialog.png b/icon-themes/colibre/cmd/32/insertcaptiondialog.png
index a968a76b04cd..146bf01301f0 100644
--- a/icon-themes/colibre/cmd/32/insertcaptiondialog.png
+++ b/icon-themes/colibre/cmd/32/insertcaptiondialog.png
diff --git a/icon-themes/colibre/cmd/32/insertmasterpage.png b/icon-themes/colibre/cmd/32/insertmasterpage.png
index 2835987c0ca6..6a19cc8d34f6 100644
--- a/icon-themes/colibre/cmd/32/insertmasterpage.png
+++ b/icon-themes/colibre/cmd/32/insertmasterpage.png
diff --git a/icon-themes/colibre/cmd/32/lastrecord.png b/icon-themes/colibre/cmd/32/lastrecord.png
index 4d07715072d4..2808afdebba1 100644
--- a/icon-themes/colibre/cmd/32/lastrecord.png
+++ b/icon-themes/colibre/cmd/32/lastrecord.png
diff --git a/icon-themes/colibre/cmd/32/linestyle.png b/icon-themes/colibre/cmd/32/linestyle.png
index a37fb6bb71a3..8a4fffb0bc37 100644
--- a/icon-themes/colibre/cmd/32/linestyle.png
+++ b/icon-themes/colibre/cmd/32/linestyle.png
diff --git a/icon-themes/colibre/cmd/32/managelanguage.png b/icon-themes/colibre/cmd/32/managelanguage.png
index 73c2d99be62b..ecf4c12278e5 100644
--- a/icon-themes/colibre/cmd/32/managelanguage.png
+++ b/icon-themes/colibre/cmd/32/managelanguage.png
diff --git a/icon-themes/colibre/cmd/32/masterlayouts.png b/icon-themes/colibre/cmd/32/masterlayouts.png
index 1479ceb9a519..e02e93d9a630 100644
--- a/icon-themes/colibre/cmd/32/masterlayouts.png
+++ b/icon-themes/colibre/cmd/32/masterlayouts.png
diff --git a/icon-themes/colibre/cmd/32/masterpage.png b/icon-themes/colibre/cmd/32/masterpage.png
index fe5c93a3edc5..a3d0f058b4c2 100644
--- a/icon-themes/colibre/cmd/32/masterpage.png
+++ b/icon-themes/colibre/cmd/32/masterpage.png
diff --git a/icon-themes/colibre/cmd/32/movepagedown.png b/icon-themes/colibre/cmd/32/movepagedown.png
index 82da8547b1c4..84bbd5e61ae9 100644
--- a/icon-themes/colibre/cmd/32/movepagedown.png
+++ b/icon-themes/colibre/cmd/32/movepagedown.png
diff --git a/icon-themes/colibre/cmd/32/movepagefirst.png b/icon-themes/colibre/cmd/32/movepagefirst.png
index 7dd040e9a94a..b3fc62682d71 100644
--- a/icon-themes/colibre/cmd/32/movepagefirst.png
+++ b/icon-themes/colibre/cmd/32/movepagefirst.png
diff --git a/icon-themes/colibre/cmd/32/movepagelast.png b/icon-themes/colibre/cmd/32/movepagelast.png
index 55a162b60003..bc12652e87b7 100644
--- a/icon-themes/colibre/cmd/32/movepagelast.png
+++ b/icon-themes/colibre/cmd/32/movepagelast.png
diff --git a/icon-themes/colibre/cmd/32/movepageup.png b/icon-themes/colibre/cmd/32/movepageup.png
index 82da8547b1c4..84bbd5e61ae9 100644
--- a/icon-themes/colibre/cmd/32/movepageup.png
+++ b/icon-themes/colibre/cmd/32/movepageup.png
diff --git a/icon-themes/colibre/cmd/32/nextrecord.png b/icon-themes/colibre/cmd/32/nextrecord.png
index 878b5e4d44e4..c59dbe760787 100644
--- a/icon-themes/colibre/cmd/32/nextrecord.png
+++ b/icon-themes/colibre/cmd/32/nextrecord.png
diff --git a/icon-themes/colibre/cmd/32/normalmultipanegui.png b/icon-themes/colibre/cmd/32/normalmultipanegui.png
index ccce486032f5..6511e1bcbb54 100644
--- a/icon-themes/colibre/cmd/32/normalmultipanegui.png
+++ b/icon-themes/colibre/cmd/32/normalmultipanegui.png
diff --git a/icon-themes/colibre/cmd/32/notesmasterpage.png b/icon-themes/colibre/cmd/32/notesmasterpage.png
index 9c902c34eb5d..9b8f991cb37e 100644
--- a/icon-themes/colibre/cmd/32/notesmasterpage.png
+++ b/icon-themes/colibre/cmd/32/notesmasterpage.png
diff --git a/icon-themes/colibre/cmd/32/notesmode.png b/icon-themes/colibre/cmd/32/notesmode.png
index 4ba9aae00cf3..9973866a547c 100644
--- a/icon-themes/colibre/cmd/32/notesmode.png
+++ b/icon-themes/colibre/cmd/32/notesmode.png
diff --git a/icon-themes/colibre/cmd/32/objectcatalog.png b/icon-themes/colibre/cmd/32/objectcatalog.png
new file mode 100644
index 000000000000..ddb6c28a76e0
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/objectcatalog.png
diff --git a/icon-themes/colibre/cmd/32/outlinemode.png b/icon-themes/colibre/cmd/32/outlinemode.png
index c1658ab3d637..61ef60e48b7b 100644
--- a/icon-themes/colibre/cmd/32/outlinemode.png
+++ b/icon-themes/colibre/cmd/32/outlinemode.png
diff --git a/icon-themes/colibre/cmd/32/pagemode.png b/icon-themes/colibre/cmd/32/pagemode.png
new file mode 100644
index 000000000000..a98bb45de3f6
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/pagemode.png
diff --git a/icon-themes/colibre/cmd/32/paragraphdialog.png b/icon-themes/colibre/cmd/32/paragraphdialog.png
index a44a8d864d84..338915f474d5 100644
--- a/icon-themes/colibre/cmd/32/paragraphdialog.png
+++ b/icon-themes/colibre/cmd/32/paragraphdialog.png
diff --git a/icon-themes/colibre/cmd/32/paralefttoright.png b/icon-themes/colibre/cmd/32/paralefttoright.png
index 8557baa2f446..365d773102bf 100644
--- a/icon-themes/colibre/cmd/32/paralefttoright.png
+++ b/icon-themes/colibre/cmd/32/paralefttoright.png
diff --git a/icon-themes/colibre/cmd/32/pararighttoleft.png b/icon-themes/colibre/cmd/32/pararighttoleft.png
index e2d4666e6b86..83211519a3e9 100644
--- a/icon-themes/colibre/cmd/32/pararighttoleft.png
+++ b/icon-themes/colibre/cmd/32/pararighttoleft.png
diff --git a/icon-themes/colibre/cmd/32/paste.png b/icon-themes/colibre/cmd/32/paste.png
index 806810966626..8a5782a18e2b 100644
--- a/icon-themes/colibre/cmd/32/paste.png
+++ b/icon-themes/colibre/cmd/32/paste.png
diff --git a/icon-themes/colibre/cmd/32/photoalbumdialog.png b/icon-themes/colibre/cmd/32/photoalbumdialog.png
new file mode 100644
index 000000000000..b7d3a2ce9127
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/photoalbumdialog.png
diff --git a/icon-themes/colibre/cmd/32/presentationlayout.png b/icon-themes/colibre/cmd/32/presentationlayout.png
index b84c72917f96..64f0fe86820d 100644
--- a/icon-themes/colibre/cmd/32/presentationlayout.png
+++ b/icon-themes/colibre/cmd/32/presentationlayout.png
diff --git a/icon-themes/colibre/cmd/32/prevrecord.png b/icon-themes/colibre/cmd/32/prevrecord.png
index ada6ec82cf8c..9371825c7d8e 100644
--- a/icon-themes/colibre/cmd/32/prevrecord.png
+++ b/icon-themes/colibre/cmd/32/prevrecord.png
diff --git a/icon-themes/colibre/cmd/32/renameobject.png b/icon-themes/colibre/cmd/32/renameobject.png
new file mode 100644
index 000000000000..770f215a5064
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/renameobject.png
diff --git a/icon-themes/colibre/cmd/32/renameslide.png b/icon-themes/colibre/cmd/32/renameslide.png
new file mode 100644
index 000000000000..90a746992d45
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/renameslide.png
diff --git a/icon-themes/colibre/cmd/32/renametable.png b/icon-themes/colibre/cmd/32/renametable.png
new file mode 100644
index 000000000000..3ee3f00a2816
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/renametable.png
diff --git a/icon-themes/colibre/cmd/32/savebackground.png b/icon-themes/colibre/cmd/32/savebackground.png
new file mode 100644
index 000000000000..7eaead608d94
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/savebackground.png
diff --git a/icon-themes/colibre/cmd/32/selectbackground.png b/icon-themes/colibre/cmd/32/selectbackground.png
new file mode 100644
index 000000000000..c1a013046a03
--- /dev/null
+++ b/icon-themes/colibre/cmd/32/selectbackground.png
diff --git a/icon-themes/colibre/cmd/32/slidemasterpage.png b/icon-themes/colibre/cmd/32/slidemasterpage.png
index f69bf2274f73..d4ff07ef8628 100644
--- a/icon-themes/colibre/cmd/32/slidemasterpage.png
+++ b/icon-themes/colibre/cmd/32/slidemasterpage.png
diff --git a/icon-themes/colibre/cmd/32/switchxformsdesignmode.png b/icon-themes/colibre/cmd/32/switchxformsdesignmode.png
index b02aa37142e6..e9fb21970884 100644
--- a/icon-themes/colibre/cmd/32/switchxformsdesignmode.png
+++ b/icon-themes/colibre/cmd/32/switchxformsdesignmode.png
diff --git a/icon-themes/colibre/cmd/32/symbolshapes.quad-bevel.png b/icon-themes/colibre/cmd/32/symbolshapes.quad-bevel.png
index 0b03ede51945..889f32128170 100644
--- a/icon-themes/colibre/cmd/32/symbolshapes.quad-bevel.png
+++ b/icon-themes/colibre/cmd/32/symbolshapes.quad-bevel.png
diff --git a/icon-themes/colibre/cmd/32/thesaurus.png b/icon-themes/colibre/cmd/32/thesaurus.png
index 13c5a31b9cf5..0dde2b4d51fc 100644
--- a/icon-themes/colibre/cmd/32/thesaurus.png
+++ b/icon-themes/colibre/cmd/32/thesaurus.png
diff --git a/icon-themes/colibre/cmd/32/thesaurusdialog.png b/icon-themes/colibre/cmd/32/thesaurusdialog.png
index b2b238303ed3..20a9f34aa4c6 100644
--- a/icon-themes/colibre/cmd/32/thesaurusdialog.png
+++ b/icon-themes/colibre/cmd/32/thesaurusdialog.png
diff --git a/icon-themes/colibre/cmd/32/upsearch.png b/icon-themes/colibre/cmd/32/upsearch.png
index 82da8547b1c4..84bbd5e61ae9 100644
--- a/icon-themes/colibre/cmd/32/upsearch.png
+++ b/icon-themes/colibre/cmd/32/upsearch.png
diff --git a/icon-themes/colibre/cmd/lc_assignlayout.png b/icon-themes/colibre/cmd/lc_assignlayout.png
index a825292a7927..b8c4ca8e901f 100644
--- a/icon-themes/colibre/cmd/lc_assignlayout.png
+++ b/icon-themes/colibre/cmd/lc_assignlayout.png
diff --git a/icon-themes/colibre/cmd/lc_choosecontrols.png b/icon-themes/colibre/cmd/lc_choosecontrols.png
new file mode 100644
index 000000000000..c4e4062dce5a
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_choosecontrols.png
diff --git a/icon-themes/colibre/cmd/lc_choosedesign.png b/icon-themes/colibre/cmd/lc_choosedesign.png
index 8aa23b05bf3e..b63b79f03f91 100644
--- a/icon-themes/colibre/cmd/lc_choosedesign.png
+++ b/icon-themes/colibre/cmd/lc_choosedesign.png
diff --git a/icon-themes/colibre/cmd/lc_closemasterview.png b/icon-themes/colibre/cmd/lc_closemasterview.png
index 1e50c6c7ea87..b3149653ce35 100644
--- a/icon-themes/colibre/cmd/lc_closemasterview.png
+++ b/icon-themes/colibre/cmd/lc_closemasterview.png
diff --git a/icon-themes/colibre/cmd/lc_dbchangedesignmode.png b/icon-themes/colibre/cmd/lc_dbchangedesignmode.png
index e4f3800263d6..4c61b1e9fc40 100644
--- a/icon-themes/colibre/cmd/lc_dbchangedesignmode.png
+++ b/icon-themes/colibre/cmd/lc_dbchangedesignmode.png
diff --git a/icon-themes/colibre/cmd/lc_dbclearquery.png b/icon-themes/colibre/cmd/lc_dbclearquery.png
new file mode 100644
index 000000000000..7a7c5195afbe
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbclearquery.png
diff --git a/icon-themes/colibre/cmd/lc_dbformdelete.png b/icon-themes/colibre/cmd/lc_dbformdelete.png
new file mode 100644
index 000000000000..03fbda86f2e5
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbformdelete.png
diff --git a/icon-themes/colibre/cmd/lc_dbformedit.png b/icon-themes/colibre/cmd/lc_dbformedit.png
index 647fad228849..219acdc0a752 100644
--- a/icon-themes/colibre/cmd/lc_dbformedit.png
+++ b/icon-themes/colibre/cmd/lc_dbformedit.png
diff --git a/icon-themes/colibre/cmd/lc_dbformrename.png b/icon-themes/colibre/cmd/lc_dbformrename.png
new file mode 100644
index 000000000000..c794aacc6881
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbformrename.png
diff --git a/icon-themes/colibre/cmd/lc_dbindexdesign.png b/icon-themes/colibre/cmd/lc_dbindexdesign.png
index 18f16940ae07..b04c4709100c 100644
--- a/icon-themes/colibre/cmd/lc_dbindexdesign.png
+++ b/icon-themes/colibre/cmd/lc_dbindexdesign.png
diff --git a/icon-themes/colibre/cmd/lc_dbnewform.png b/icon-themes/colibre/cmd/lc_dbnewform.png
index 93b0a8f81ddb..075b5577961c 100644
--- a/icon-themes/colibre/cmd/lc_dbnewform.png
+++ b/icon-themes/colibre/cmd/lc_dbnewform.png
diff --git a/icon-themes/colibre/cmd/lc_dbnewtable.png b/icon-themes/colibre/cmd/lc_dbnewtable.png
new file mode 100644
index 000000000000..4dde142682d5
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbnewtable.png
diff --git a/icon-themes/colibre/cmd/lc_dbquerydelete.png b/icon-themes/colibre/cmd/lc_dbquerydelete.png
new file mode 100644
index 000000000000..78bd4acb697f
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbquerydelete.png
diff --git a/icon-themes/colibre/cmd/lc_dbqueryedit.png b/icon-themes/colibre/cmd/lc_dbqueryedit.png
index 8050ac25ad12..f40e7021dec8 100644
--- a/icon-themes/colibre/cmd/lc_dbqueryedit.png
+++ b/icon-themes/colibre/cmd/lc_dbqueryedit.png
diff --git a/icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png b/icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png
new file mode 100644
index 000000000000..9bc2400bf7b6
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbquerypropertiesdialog.png
diff --git a/icon-themes/colibre/cmd/lc_dbqueryrename.png b/icon-themes/colibre/cmd/lc_dbqueryrename.png
new file mode 100644
index 000000000000..a39098f007fb
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbqueryrename.png
diff --git a/icon-themes/colibre/cmd/lc_dbreportdelete.png b/icon-themes/colibre/cmd/lc_dbreportdelete.png
new file mode 100644
index 000000000000..2f18de1c0dbd
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbreportdelete.png
diff --git a/icon-themes/colibre/cmd/lc_dbreportedit.png b/icon-themes/colibre/cmd/lc_dbreportedit.png
index 15f6e1c34dc9..0b0e02065078 100644
--- a/icon-themes/colibre/cmd/lc_dbreportedit.png
+++ b/icon-themes/colibre/cmd/lc_dbreportedit.png
diff --git a/icon-themes/colibre/cmd/lc_dbreportrename.png b/icon-themes/colibre/cmd/lc_dbreportrename.png
new file mode 100644
index 000000000000..7761c3f1ee36
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbreportrename.png
diff --git a/icon-themes/colibre/cmd/lc_dbtabledelete.png b/icon-themes/colibre/cmd/lc_dbtabledelete.png
new file mode 100644
index 000000000000..909cee0e63ab
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbtabledelete.png
diff --git a/icon-themes/colibre/cmd/lc_dbtableedit.png b/icon-themes/colibre/cmd/lc_dbtableedit.png
new file mode 100644
index 000000000000..8cc9023f46d5
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbtableedit.png
diff --git a/icon-themes/colibre/cmd/lc_dbtablerename.png b/icon-themes/colibre/cmd/lc_dbtablerename.png
new file mode 100644
index 000000000000..4146897fdae8
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbtablerename.png
diff --git a/icon-themes/colibre/cmd/lc_dbviewforms.png b/icon-themes/colibre/cmd/lc_dbviewforms.png
new file mode 100644
index 000000000000..13b1b9dce4e6
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbviewforms.png
diff --git a/icon-themes/colibre/cmd/lc_dbviewqueries.png b/icon-themes/colibre/cmd/lc_dbviewqueries.png
new file mode 100644
index 000000000000..e05067e5d08b
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbviewqueries.png
diff --git a/icon-themes/colibre/cmd/lc_dbviewreports.png b/icon-themes/colibre/cmd/lc_dbviewreports.png
new file mode 100644
index 000000000000..1f0f3d2ba79e
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbviewreports.png
diff --git a/icon-themes/colibre/cmd/lc_dbviewtablenames.png b/icon-themes/colibre/cmd/lc_dbviewtablenames.png
index 57894edc889c..680d54307b3b 100644
--- a/icon-themes/colibre/cmd/lc_dbviewtablenames.png
+++ b/icon-themes/colibre/cmd/lc_dbviewtablenames.png
diff --git a/icon-themes/colibre/cmd/lc_dbviewtables.png b/icon-themes/colibre/cmd/lc_dbviewtables.png
new file mode 100644
index 000000000000..57894edc889c
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_dbviewtables.png
diff --git a/icon-themes/colibre/cmd/lc_deletemasterpage.png b/icon-themes/colibre/cmd/lc_deletemasterpage.png
index 95279d51721a..ae7647cd00f1 100644
--- a/icon-themes/colibre/cmd/lc_deletemasterpage.png
+++ b/icon-themes/colibre/cmd/lc_deletemasterpage.png
diff --git a/icon-themes/colibre/cmd/lc_deletetable.png b/icon-themes/colibre/cmd/lc_deletetable.png
index de4c1bbb0bd4..83fdfc63fa99 100644
--- a/icon-themes/colibre/cmd/lc_deletetable.png
+++ b/icon-themes/colibre/cmd/lc_deletetable.png
diff --git a/icon-themes/colibre/cmd/lc_diamode.png b/icon-themes/colibre/cmd/lc_diamode.png
index fb6857955405..d254829273e7 100644
--- a/icon-themes/colibre/cmd/lc_diamode.png
+++ b/icon-themes/colibre/cmd/lc_diamode.png
diff --git a/icon-themes/colibre/cmd/lc_displaymasterobjects.png b/icon-themes/colibre/cmd/lc_displaymasterobjects.png
index 65a3ebd4e1bf..5f027a72b4ee 100644
--- a/icon-themes/colibre/cmd/lc_displaymasterobjects.png
+++ b/icon-themes/colibre/cmd/lc_displaymasterobjects.png
diff --git a/icon-themes/colibre/cmd/lc_displaymode.png b/icon-themes/colibre/cmd/lc_displaymode.png
index bc341cf2c869..73f8cc123c54 100644
--- a/icon-themes/colibre/cmd/lc_displaymode.png
+++ b/icon-themes/colibre/cmd/lc_displaymode.png
diff --git a/icon-themes/colibre/cmd/lc_edit.png b/icon-themes/colibre/cmd/lc_edit.png
index ced861fe7b8d..3875ea785399 100644
--- a/icon-themes/colibre/cmd/lc_edit.png
+++ b/icon-themes/colibre/cmd/lc_edit.png
diff --git a/icon-themes/colibre/cmd/lc_executereport.png b/icon-themes/colibre/cmd/lc_executereport.png
index 1f0f3d2ba79e..85627a4e14e0 100644
--- a/icon-themes/colibre/cmd/lc_executereport.png
+++ b/icon-themes/colibre/cmd/lc_executereport.png
diff --git a/icon-themes/colibre/cmd/lc_exportdirecttoepub.png b/icon-themes/colibre/cmd/lc_exportdirecttoepub.png
index 2ba0fb75babc..2f0ecf94f17e 100644
--- a/icon-themes/colibre/cmd/lc_exportdirecttoepub.png
+++ b/icon-themes/colibre/cmd/lc_exportdirecttoepub.png
diff --git a/icon-themes/colibre/cmd/lc_filecontrol.png b/icon-themes/colibre/cmd/lc_filecontrol.png
new file mode 100644
index 000000000000..a7b654ec5250
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_filecontrol.png
diff --git a/icon-themes/colibre/cmd/lc_filefield.png b/icon-themes/colibre/cmd/lc_filefield.png
new file mode 100644
index 000000000000..4ce5ba06bf3d
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_filefield.png
diff --git a/icon-themes/colibre/cmd/lc_formdesigntools.png b/icon-themes/colibre/cmd/lc_formdesigntools.png
index d83f0ab7f479..5653144acd6e 100644
--- a/icon-themes/colibre/cmd/lc_formdesigntools.png
+++ b/icon-themes/colibre/cmd/lc_formdesigntools.png
diff --git a/icon-themes/colibre/cmd/lc_gallery.png b/icon-themes/colibre/cmd/lc_gallery.png
index 9e49acfccbe5..4d469c0a2364 100644
--- a/icon-themes/colibre/cmd/lc_gallery.png
+++ b/icon-themes/colibre/cmd/lc_gallery.png
diff --git a/icon-themes/colibre/cmd/lc_handoutmode.png b/icon-themes/colibre/cmd/lc_handoutmode.png
index c8121c0fd232..ccff84fce99e 100644
--- a/icon-themes/colibre/cmd/lc_handoutmode.png
+++ b/icon-themes/colibre/cmd/lc_handoutmode.png
diff --git a/icon-themes/colibre/cmd/lc_insertmasterpage.png b/icon-themes/colibre/cmd/lc_insertmasterpage.png
index ae5e25b93ed8..8b35249249bb 100644
--- a/icon-themes/colibre/cmd/lc_insertmasterpage.png
+++ b/icon-themes/colibre/cmd/lc_insertmasterpage.png
diff --git a/icon-themes/colibre/cmd/lc_managelanguage.png b/icon-themes/colibre/cmd/lc_managelanguage.png
index 314c6e027308..9a70283c5b37 100644
--- a/icon-themes/colibre/cmd/lc_managelanguage.png
+++ b/icon-themes/colibre/cmd/lc_managelanguage.png
diff --git a/icon-themes/colibre/cmd/lc_masterlayouts.png b/icon-themes/colibre/cmd/lc_masterlayouts.png
index 2738333d24e2..e7631ca53b84 100644
--- a/icon-themes/colibre/cmd/lc_masterlayouts.png
+++ b/icon-themes/colibre/cmd/lc_masterlayouts.png
diff --git a/icon-themes/colibre/cmd/lc_masterpage.png b/icon-themes/colibre/cmd/lc_masterpage.png
index c34fd1952ed0..84497b9fcfdb 100644
--- a/icon-themes/colibre/cmd/lc_masterpage.png
+++ b/icon-themes/colibre/cmd/lc_masterpage.png
diff --git a/icon-themes/colibre/cmd/lc_normalmultipanegui.png b/icon-themes/colibre/cmd/lc_normalmultipanegui.png
index 508eef6645ab..e3bb9dfb4067 100644
--- a/icon-themes/colibre/cmd/lc_normalmultipanegui.png
+++ b/icon-themes/colibre/cmd/lc_normalmultipanegui.png
diff --git a/icon-themes/colibre/cmd/lc_notesmasterpage.png b/icon-themes/colibre/cmd/lc_notesmasterpage.png
index 36117d71fb38..25259e5c4700 100644
--- a/icon-themes/colibre/cmd/lc_notesmasterpage.png
+++ b/icon-themes/colibre/cmd/lc_notesmasterpage.png
diff --git a/icon-themes/colibre/cmd/lc_notesmode.png b/icon-themes/colibre/cmd/lc_notesmode.png
index c8121c0fd232..6acdc7eafdaf 100644
--- a/icon-themes/colibre/cmd/lc_notesmode.png
+++ b/icon-themes/colibre/cmd/lc_notesmode.png
diff --git a/icon-themes/colibre/cmd/lc_objectcatalog.png b/icon-themes/colibre/cmd/lc_objectcatalog.png
new file mode 100644
index 000000000000..3f9d815df152
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_objectcatalog.png
diff --git a/icon-themes/colibre/cmd/lc_outlinemode.png b/icon-themes/colibre/cmd/lc_outlinemode.png
index e783707e0336..39301592ffba 100644
--- a/icon-themes/colibre/cmd/lc_outlinemode.png
+++ b/icon-themes/colibre/cmd/lc_outlinemode.png
diff --git a/icon-themes/colibre/cmd/lc_pagemode.png b/icon-themes/colibre/cmd/lc_pagemode.png
new file mode 100644
index 000000000000..ca24c3d8742f
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_pagemode.png
diff --git a/icon-themes/colibre/cmd/lc_paste.png b/icon-themes/colibre/cmd/lc_paste.png
index b7686d18ab62..7e93f0fdf4a8 100644
--- a/icon-themes/colibre/cmd/lc_paste.png
+++ b/icon-themes/colibre/cmd/lc_paste.png
diff --git a/icon-themes/colibre/cmd/lc_presentationlayout.png b/icon-themes/colibre/cmd/lc_presentationlayout.png
index c8f42dc3efc8..f8008f371760 100644
--- a/icon-themes/colibre/cmd/lc_presentationlayout.png
+++ b/icon-themes/colibre/cmd/lc_presentationlayout.png
diff --git a/icon-themes/colibre/cmd/lc_renametable.png b/icon-themes/colibre/cmd/lc_renametable.png
index 93759c596232..9dfca678834d 100644
--- a/icon-themes/colibre/cmd/lc_renametable.png
+++ b/icon-themes/colibre/cmd/lc_renametable.png
diff --git a/icon-themes/colibre/cmd/lc_slidemasterpage.png b/icon-themes/colibre/cmd/lc_slidemasterpage.png
index f7927af22a27..443ee9370f65 100644
--- a/icon-themes/colibre/cmd/lc_slidemasterpage.png
+++ b/icon-themes/colibre/cmd/lc_slidemasterpage.png
diff --git a/icon-themes/colibre/cmd/lc_switchxformsdesignmode.png b/icon-themes/colibre/cmd/lc_switchxformsdesignmode.png
index 1154a977142f..ff4a1472f770 100644
--- a/icon-themes/colibre/cmd/lc_switchxformsdesignmode.png
+++ b/icon-themes/colibre/cmd/lc_switchxformsdesignmode.png
diff --git a/icon-themes/colibre/cmd/lc_tabledesign.png b/icon-themes/colibre/cmd/lc_tabledesign.png
index 054c016bb5fc..e8e9b2ab3452 100644
--- a/icon-themes/colibre/cmd/lc_tabledesign.png
+++ b/icon-themes/colibre/cmd/lc_tabledesign.png
diff --git a/icon-themes/colibre/cmd/sc_assignlayout.png b/icon-themes/colibre/cmd/sc_assignlayout.png
index a8d27798c9a9..387843a2fe0a 100644
--- a/icon-themes/colibre/cmd/sc_assignlayout.png
+++ b/icon-themes/colibre/cmd/sc_assignlayout.png
diff --git a/icon-themes/colibre/cmd/sc_choosecontrols.png b/icon-themes/colibre/cmd/sc_choosecontrols.png
new file mode 100644
index 000000000000..97b24c31ee75
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_choosecontrols.png
diff --git a/icon-themes/colibre/cmd/sc_choosedesign.png b/icon-themes/colibre/cmd/sc_choosedesign.png
index 5b7e84d1ea7a..b1e34d8c1f83 100644
--- a/icon-themes/colibre/cmd/sc_choosedesign.png
+++ b/icon-themes/colibre/cmd/sc_choosedesign.png
diff --git a/icon-themes/colibre/cmd/sc_closemasterview.png b/icon-themes/colibre/cmd/sc_closemasterview.png
index 679f628904d7..e550c2b21814 100644
--- a/icon-themes/colibre/cmd/sc_closemasterview.png
+++ b/icon-themes/colibre/cmd/sc_closemasterview.png
diff --git a/icon-themes/colibre/cmd/sc_dbchangedesignmode.png b/icon-themes/colibre/cmd/sc_dbchangedesignmode.png
index 55713e87056b..9d75de9f4377 100644
--- a/icon-themes/colibre/cmd/sc_dbchangedesignmode.png
+++ b/icon-themes/colibre/cmd/sc_dbchangedesignmode.png
diff --git a/icon-themes/colibre/cmd/sc_dbclearquery.png b/icon-themes/colibre/cmd/sc_dbclearquery.png
new file mode 100644
index 000000000000..bf1ca71b4fa4
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbclearquery.png
diff --git a/icon-themes/colibre/cmd/sc_dbdistinctvalues.png b/icon-themes/colibre/cmd/sc_dbdistinctvalues.png
index 90b212566141..bb9d8221280f 100644
--- a/icon-themes/colibre/cmd/sc_dbdistinctvalues.png
+++ b/icon-themes/colibre/cmd/sc_dbdistinctvalues.png
diff --git a/icon-themes/colibre/cmd/sc_dbformdelete.png b/icon-themes/colibre/cmd/sc_dbformdelete.png
new file mode 100644
index 000000000000..7eb6de8440b8
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbformdelete.png
diff --git a/icon-themes/colibre/cmd/sc_dbformedit.png b/icon-themes/colibre/cmd/sc_dbformedit.png
index b8ca7d8a1349..8ea7d64a2338 100644
--- a/icon-themes/colibre/cmd/sc_dbformedit.png
+++ b/icon-themes/colibre/cmd/sc_dbformedit.png
diff --git a/icon-themes/colibre/cmd/sc_dbformrename.png b/icon-themes/colibre/cmd/sc_dbformrename.png
new file mode 100644
index 000000000000..75929090e714
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbformrename.png
diff --git a/icon-themes/colibre/cmd/sc_dbindexdesign.png b/icon-themes/colibre/cmd/sc_dbindexdesign.png
index 3ea44fa6def8..7e34837068fc 100644
--- a/icon-themes/colibre/cmd/sc_dbindexdesign.png
+++ b/icon-themes/colibre/cmd/sc_dbindexdesign.png
diff --git a/icon-themes/colibre/cmd/sc_dbnewform.png b/icon-themes/colibre/cmd/sc_dbnewform.png
index 75990c994de0..030fc7ac1904 100644
--- a/icon-themes/colibre/cmd/sc_dbnewform.png
+++ b/icon-themes/colibre/cmd/sc_dbnewform.png
diff --git a/icon-themes/colibre/cmd/sc_dbnewtable.png b/icon-themes/colibre/cmd/sc_dbnewtable.png
new file mode 100644
index 000000000000..6690733f8c67
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbnewtable.png
diff --git a/icon-themes/colibre/cmd/sc_dbquerydelete.png b/icon-themes/colibre/cmd/sc_dbquerydelete.png
new file mode 100644
index 000000000000..72e92feea608
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbquerydelete.png
diff --git a/icon-themes/colibre/cmd/sc_dbqueryedit.png b/icon-themes/colibre/cmd/sc_dbqueryedit.png
index ef2aeb782e5c..8c6ba38c1ef0 100644
--- a/icon-themes/colibre/cmd/sc_dbqueryedit.png
+++ b/icon-themes/colibre/cmd/sc_dbqueryedit.png
diff --git a/icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png b/icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png
new file mode 100644
index 000000000000..4f9857dd8cb0
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbquerypropertiesdialog.png
diff --git a/icon-themes/colibre/cmd/sc_dbqueryrename.png b/icon-themes/colibre/cmd/sc_dbqueryrename.png
new file mode 100644
index 000000000000..1b9de88a78f5
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbqueryrename.png
diff --git a/icon-themes/colibre/cmd/sc_dbreportdelete.png b/icon-themes/colibre/cmd/sc_dbreportdelete.png
new file mode 100644
index 000000000000..7bdcfc20e038
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbreportdelete.png
diff --git a/icon-themes/colibre/cmd/sc_dbreportedit.png b/icon-themes/colibre/cmd/sc_dbreportedit.png
index e23cecf705e2..43b9010c557f 100644
--- a/icon-themes/colibre/cmd/sc_dbreportedit.png
+++ b/icon-themes/colibre/cmd/sc_dbreportedit.png
diff --git a/icon-themes/colibre/cmd/sc_dbreportrename.png b/icon-themes/colibre/cmd/sc_dbreportrename.png
new file mode 100644
index 000000000000..a45d678a771f
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbreportrename.png
diff --git a/icon-themes/colibre/cmd/sc_dbtabledelete.png b/icon-themes/colibre/cmd/sc_dbtabledelete.png
new file mode 100644
index 000000000000..e938c3862c36
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbtabledelete.png
diff --git a/icon-themes/colibre/cmd/sc_dbtableedit.png b/icon-themes/colibre/cmd/sc_dbtableedit.png
new file mode 100644
index 000000000000..6328302bdc0c
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbtableedit.png
diff --git a/icon-themes/colibre/cmd/sc_dbtablerename.png b/icon-themes/colibre/cmd/sc_dbtablerename.png
new file mode 100644
index 000000000000..8eae47362053
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbtablerename.png
diff --git a/icon-themes/colibre/cmd/sc_dbviewforms.png b/icon-themes/colibre/cmd/sc_dbviewforms.png
new file mode 100644
index 000000000000..51b22ccfd2fe
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbviewforms.png
diff --git a/icon-themes/colibre/cmd/sc_dbviewqueries.png b/icon-themes/colibre/cmd/sc_dbviewqueries.png
new file mode 100644
index 000000000000..a05c57c6c796
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbviewqueries.png
diff --git a/icon-themes/colibre/cmd/sc_dbviewreports.png b/icon-themes/colibre/cmd/sc_dbviewreports.png
new file mode 100644
index 000000000000..e4ba7849ae55
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbviewreports.png
diff --git a/icon-themes/colibre/cmd/sc_dbviewtablenames.png b/icon-themes/colibre/cmd/sc_dbviewtablenames.png
index 446206dcae3b..0f085a1910fd 100644
--- a/icon-themes/colibre/cmd/sc_dbviewtablenames.png
+++ b/icon-themes/colibre/cmd/sc_dbviewtablenames.png
diff --git a/icon-themes/colibre/cmd/sc_dbviewtables.png b/icon-themes/colibre/cmd/sc_dbviewtables.png
new file mode 100644
index 000000000000..446206dcae3b
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_dbviewtables.png
diff --git a/icon-themes/colibre/cmd/sc_deletemasterpage.png b/icon-themes/colibre/cmd/sc_deletemasterpage.png
index ee66f7a8d7eb..eb942af66d3a 100644
--- a/icon-themes/colibre/cmd/sc_deletemasterpage.png
+++ b/icon-themes/colibre/cmd/sc_deletemasterpage.png
diff --git a/icon-themes/colibre/cmd/sc_deletetable.png b/icon-themes/colibre/cmd/sc_deletetable.png
index 25c77521380d..b0b653dada48 100644
--- a/icon-themes/colibre/cmd/sc_deletetable.png
+++ b/icon-themes/colibre/cmd/sc_deletetable.png
diff --git a/icon-themes/colibre/cmd/sc_diamode.png b/icon-themes/colibre/cmd/sc_diamode.png
index fdacdf71eab8..3d70c9739b35 100644
--- a/icon-themes/colibre/cmd/sc_diamode.png
+++ b/icon-themes/colibre/cmd/sc_diamode.png
diff --git a/icon-themes/colibre/cmd/sc_displaymasterobjects.png b/icon-themes/colibre/cmd/sc_displaymasterobjects.png
index baf15243549c..b3781bf1c23e 100644
--- a/icon-themes/colibre/cmd/sc_displaymasterobjects.png
+++ b/icon-themes/colibre/cmd/sc_displaymasterobjects.png
diff --git a/icon-themes/colibre/cmd/sc_displaymode.png b/icon-themes/colibre/cmd/sc_displaymode.png
index 89fc68609c09..9f302e6cda88 100644
--- a/icon-themes/colibre/cmd/sc_displaymode.png
+++ b/icon-themes/colibre/cmd/sc_displaymode.png
diff --git a/icon-themes/colibre/cmd/sc_edit.png b/icon-themes/colibre/cmd/sc_edit.png
new file mode 100644
index 000000000000..202c50a80523
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_edit.png
diff --git a/icon-themes/colibre/cmd/sc_executereport.png b/icon-themes/colibre/cmd/sc_executereport.png
index e4ba7849ae55..8e8cd1de5b4f 100644
--- a/icon-themes/colibre/cmd/sc_executereport.png
+++ b/icon-themes/colibre/cmd/sc_executereport.png
diff --git a/icon-themes/colibre/cmd/sc_filecontrol.png b/icon-themes/colibre/cmd/sc_filecontrol.png
new file mode 100644
index 000000000000..3fc416e36a24
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_filecontrol.png
diff --git a/icon-themes/colibre/cmd/sc_filefield.png b/icon-themes/colibre/cmd/sc_filefield.png
new file mode 100644
index 000000000000..572e16e54bc9
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_filefield.png
diff --git a/icon-themes/colibre/cmd/sc_formdesigntools.png b/icon-themes/colibre/cmd/sc_formdesigntools.png
index 481ca8262963..d6185881a07f 100644
--- a/icon-themes/colibre/cmd/sc_formdesigntools.png
+++ b/icon-themes/colibre/cmd/sc_formdesigntools.png
diff --git a/icon-themes/colibre/cmd/sc_gallery.png b/icon-themes/colibre/cmd/sc_gallery.png
index ae069774b09e..f8e5ff59bc1e 100644
--- a/icon-themes/colibre/cmd/sc_gallery.png
+++ b/icon-themes/colibre/cmd/sc_gallery.png
diff --git a/icon-themes/colibre/cmd/sc_glueeditmode.png b/icon-themes/colibre/cmd/sc_glueeditmode.png
index a1831a0f2f32..833f967c867f 100644
--- a/icon-themes/colibre/cmd/sc_glueeditmode.png
+++ b/icon-themes/colibre/cmd/sc_glueeditmode.png
diff --git a/icon-themes/colibre/cmd/sc_handoutmode.png b/icon-themes/colibre/cmd/sc_handoutmode.png
index 8eb08d11f1c7..420cadb51663 100644
--- a/icon-themes/colibre/cmd/sc_handoutmode.png
+++ b/icon-themes/colibre/cmd/sc_handoutmode.png
diff --git a/icon-themes/colibre/cmd/sc_insertmasterpage.png b/icon-themes/colibre/cmd/sc_insertmasterpage.png
index 2b2ec9e9255e..7235b3cb569c 100644
--- a/icon-themes/colibre/cmd/sc_insertmasterpage.png
+++ b/icon-themes/colibre/cmd/sc_insertmasterpage.png
diff --git a/icon-themes/colibre/cmd/sc_managelanguage.png b/icon-themes/colibre/cmd/sc_managelanguage.png
index 1393f837ef0b..746234d3f92b 100644
--- a/icon-themes/colibre/cmd/sc_managelanguage.png
+++ b/icon-themes/colibre/cmd/sc_managelanguage.png
diff --git a/icon-themes/colibre/cmd/sc_masterlayouts.png b/icon-themes/colibre/cmd/sc_masterlayouts.png
index 7169368785f9..aada8d4fec54 100644
--- a/icon-themes/colibre/cmd/sc_masterlayouts.png
+++ b/icon-themes/colibre/cmd/sc_masterlayouts.png
diff --git a/icon-themes/colibre/cmd/sc_masterpage.png b/icon-themes/colibre/cmd/sc_masterpage.png
new file mode 100644
index 000000000000..61ed80680e9c
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_masterpage.png
diff --git a/icon-themes/colibre/cmd/sc_normalmultipanegui.png b/icon-themes/colibre/cmd/sc_normalmultipanegui.png
index 225638ae8eac..755fff362ce3 100644
--- a/icon-themes/colibre/cmd/sc_normalmultipanegui.png
+++ b/icon-themes/colibre/cmd/sc_normalmultipanegui.png
diff --git a/icon-themes/colibre/cmd/sc_notesmasterpage.png b/icon-themes/colibre/cmd/sc_notesmasterpage.png
index 1c9d7ed5ac4f..08724694ff8b 100644
--- a/icon-themes/colibre/cmd/sc_notesmasterpage.png
+++ b/icon-themes/colibre/cmd/sc_notesmasterpage.png
diff --git a/icon-themes/colibre/cmd/sc_notesmode.png b/icon-themes/colibre/cmd/sc_notesmode.png
index 8eb08d11f1c7..b7cf8347cc52 100644
--- a/icon-themes/colibre/cmd/sc_notesmode.png
+++ b/icon-themes/colibre/cmd/sc_notesmode.png
diff --git a/icon-themes/colibre/cmd/sc_objectcatalog.png b/icon-themes/colibre/cmd/sc_objectcatalog.png
new file mode 100644
index 000000000000..1ea6bafa46f0
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_objectcatalog.png
diff --git a/icon-themes/colibre/cmd/sc_outlinemode.png b/icon-themes/colibre/cmd/sc_outlinemode.png
index 954efed407e8..9b685c628d96 100644
--- a/icon-themes/colibre/cmd/sc_outlinemode.png
+++ b/icon-themes/colibre/cmd/sc_outlinemode.png
diff --git a/icon-themes/colibre/cmd/sc_pagemode.png b/icon-themes/colibre/cmd/sc_pagemode.png
new file mode 100644
index 000000000000..c1e98ac46a8a
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_pagemode.png
diff --git a/icon-themes/colibre/cmd/sc_paste.png b/icon-themes/colibre/cmd/sc_paste.png
index f4cebd26ee76..154563e97881 100644
--- a/icon-themes/colibre/cmd/sc_paste.png
+++ b/icon-themes/colibre/cmd/sc_paste.png
diff --git a/icon-themes/colibre/cmd/sc_presentationlayout.png b/icon-themes/colibre/cmd/sc_presentationlayout.png
index 6c6ab49c418f..b30fa11c750d 100644
--- a/icon-themes/colibre/cmd/sc_presentationlayout.png
+++ b/icon-themes/colibre/cmd/sc_presentationlayout.png
diff --git a/icon-themes/colibre/cmd/sc_renametable.png b/icon-themes/colibre/cmd/sc_renametable.png
index dbf00276ac2b..79b725f744fb 100644
--- a/icon-themes/colibre/cmd/sc_renametable.png
+++ b/icon-themes/colibre/cmd/sc_renametable.png
diff --git a/icon-themes/colibre/cmd/sc_slidemasterpage.png b/icon-themes/colibre/cmd/sc_slidemasterpage.png
index 66d60f966a75..0d68e9055d4b 100644
--- a/icon-themes/colibre/cmd/sc_slidemasterpage.png
+++ b/icon-themes/colibre/cmd/sc_slidemasterpage.png
diff --git a/icon-themes/colibre/cmd/sc_switchxformsdesignmode.png b/icon-themes/colibre/cmd/sc_switchxformsdesignmode.png
index e7e4af22fa73..3943689f2b73 100644
--- a/icon-themes/colibre/cmd/sc_switchxformsdesignmode.png
+++ b/icon-themes/colibre/cmd/sc_switchxformsdesignmode.png
diff --git a/icon-themes/colibre/cmd/sc_tabledesign.png b/icon-themes/colibre/cmd/sc_tabledesign.png
index 2ac153ed7f66..3a7766ed122d 100644
--- a/icon-themes/colibre/cmd/sc_tabledesign.png
+++ b/icon-themes/colibre/cmd/sc_tabledesign.png
diff --git a/icon-themes/colibre/dbaccess/res/forms_32.png b/icon-themes/colibre/dbaccess/res/forms_32.png
deleted file mode 100644
index d46d1adbc90d..000000000000
--- a/icon-themes/colibre/dbaccess/res/forms_32.png
+++ /dev/null
diff --git a/icon-themes/colibre/dbaccess/res/queries_32.png b/icon-themes/colibre/dbaccess/res/queries_32.png
deleted file mode 100644
index ec5a4199a8dc..000000000000
--- a/icon-themes/colibre/dbaccess/res/queries_32.png
+++ /dev/null
diff --git a/icon-themes/colibre/dbaccess/res/reports_32.png b/icon-themes/colibre/dbaccess/res/reports_32.png
deleted file mode 100644
index e21d4520de5f..000000000000
--- a/icon-themes/colibre/dbaccess/res/reports_32.png
+++ /dev/null
diff --git a/icon-themes/colibre/dbaccess/res/tables_32.png b/icon-themes/colibre/dbaccess/res/tables_32.png
deleted file mode 100644
index 2281a264812e..000000000000
--- a/icon-themes/colibre/dbaccess/res/tables_32.png
+++ /dev/null
diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index f5207843ba2b..de698208f08e 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -48,17 +48,26 @@ cmd/sc_diagramgridmenu.png cmd/sc_togglegridhorizontal.png
 cmd/lc_adddatefield.png cmd/lc_datefield.png
 cmd/lc_addons.png cmd/lc_insertplugin.png
 cmd/lc_addprintarea.png cmd/lc_inserttable.png
-cmd/lc_addtable.png cmd/lc_inserttable.png
+cmd/lc_addtable.png cmd/lc_dbnewtable.png
 cmd/sc_adddatefield.png cmd/sc_datefield.png
 cmd/sc_addons.png cmd/sc_insertplugin.png
 cmd/sc_addprintarea.png cmd/sc_inserttable.png
-cmd/sc_addtable.png cmd/sc_inserttable.png
+cmd/sc_addtable.png cmd/sc_dbnewtable.png
 
 # tooltips
+cmd/lc_autoformatmenu.png cmd/lc_autocorrectdlg.png
 cmd/lc_showinlinetooltips.png cmd/lc_editannotation.png
+cmd/lc_updatemenu.png cmd/lc_reload.png
+
+cmd/sc_autoformatmenu.png cmd/sc_autocorrectdlg.png
 cmd/sc_showinlinetooltips.png cmd/sc_editannotation.png
+cmd/sc_updatemenu.png cmd/sc_reload.png
 
 # Insert
+cmd/lc_changesmenu.png cmd/lc_trackchanges.png
+cmd/lc_charactermenu.png cmd/lc_fontdialog.png
+cmd/lc_fieldmenu.png cmd/lc_addfield.png
+cmd/lc_graphicmenu.png cmd/lc_avmediaplayer.png
 cmd/lc_insobjctrl.png cmd/lc_newdoc.png
 cmd/lc_insert.png cmd/lc_insertspreadsheet.png
 cmd/lc_insertavmedia.png cmd/lc_avmediaplayer.png
@@ -68,11 +77,13 @@ cmd/lc_insertauthorfield.png cmd/lc_dbviewaliases.png
 cmd/lc_insertedit.png cmd/lc_edit.png
 cmd/lc_insertfield.png cmd/lc_addfield.png
 cmd/lc_insertctrl.png cmd/lc_inserttable.png
-cmd/lc_insertfilecontrol.png cmd/lc_open.png
+cmd/lc_insertfilecontrol.png cmd/lc_filecontrol.png
+cmd/lc_insertfilefield.png cmd/lc_filefield.png
 cmd/lc_insertformattedfield.png cmd/lc_formattedfield.png
 cmd/lc_insertformcheck.png cmd/lc_checkbox.png
 cmd/lc_insertformcombo.png cmd/lc_combobox.png
 cmd/lc_insertformlist.png cmd/lc_listbox.png
+cmd/lc_insertformmenu.png cmd/lc_choosecontrols.png
 cmd/lc_insertformradio.png cmd/lc_radiobutton.png
 cmd/lc_insertformspin.png cmd/lc_spinbutton.png
 cmd/lc_insertformula.png cmd/lc_dbviewfunctions.png
@@ -90,22 +101,34 @@ cmd/lc_insertpatternfield.png cmd/lc_patternfield.png
 cmd/lc_insertpushbutton.png cmd/lc_pushbutton.png
 cmd/lc_insertrowbreak.png cmd/lc_insertpagebreak.png
 cmd/lc_inserttimefield.png cmd/lc_timefield.png
+cmd/lc_numberingmenu.png cmd/lc_outlinebullet.png
+cmd/lc_numericfield.png cmd/lc_numberformatstandard.png
+cmd/lc_paragraphmenu.png cmd/lc_paragraphdialog.png
+cmd/lc_shapesmenu.png cmd/lc_insertdraw.png
+cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
+cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
+cmd/lc_viewtrackchanges.png cmd/lc_addwatch.png
 
+cmd/sc_changesmenu.png cmd/sc_trackchanges.png
+cmd/sc_charactermenu.png cmd/sc_fontdialog.png
+cmd/sc_fieldmenu.png cmd/sc_addfield.png
+cmd/sc_graphicmenu.png cmd/sc_avmediaplayer.png
 cmd/sc_insobjctrl.png cmd/sc_newdoc.png
 cmd/sc_insert.png cmd/sc_insertspreadsheet.png
 cmd/sc_insertavmedia.png cmd/sc_avmediaplayer.png
 cmd/sc_insertcurrencyfield.png cmd/sc_formattedfield.png
 cmd/sc_insertdatefield.png cmd/sc_datefield.png
 cmd/sc_insertauthorfield.png cmd/sc_dbviewaliases.png
-cmd/sc_insertedit.png cmd/sc_text.png
-cmd/sc_edit.png cmd/sc_text.png
+cmd/sc_insertedit.png cmd/sc_edit.png
 cmd/sc_insertfield.png cmd/sc_addfield.png
 cmd/sc_insertctrl.png cmd/sc_inserttable.png
-cmd/sc_insertfilecontrol.png cmd/sc_open.png
+cmd/sc_insertfilecontrol.png cmd/sc_filecontrol.png
+cmd/sc_insertfilefield.png cmd/sc_filefield.png
 cmd/sc_insertformattedfield.png cmd/sc_formattedfield.png
 cmd/sc_insertformcheck.png cmd/sc_checkbox.png
 cmd/sc_insertformcombo.png cmd/sc_combobox.png
 cmd/sc_insertformlist.png cmd/sc_listbox.png
+cmd/sc_insertformmenu.png cmd/sc_choosecontrols.png
 cmd/sc_insertformradio.png cmd/sc_radiobutton.png
 cmd/sc_insertformspin.png cmd/sc_spinbutton.png
 cmd/sc_insertformula.png cmd/sc_dbviewfunctions.png
@@ -115,7 +138,6 @@ cmd/sc_insertframeinteractnocolumns.png cmd/sc_insertframe.png
 cmd/sc_insertimagecontrol.png cmd/sc_insertgraphic.png
 cmd/sc_insertobjectchart.png cmd/sc_drawchart.png
 cmd/sc_insertnumericfield.png cmd/sc_numberformatstandard.png
-cmd/sc_numericfield.png cmd/sc_numberformatstandard.png
 cmd/sc_insertlistbox.png cmd/sc_listbox.png
 cmd/sc_insertobjectfloatingframe.png cmd/sc_insertframe.png
 cmd/sc_inserttextframe.png cmd/sc_insertframe.png
@@ -124,15 +146,13 @@ cmd/sc_insertpatternfield.png cmd/sc_patternfield.png
 cmd/sc_insertpushbutton.png cmd/sc_pushbutton.png
 cmd/sc_insertrowbreak.png cmd/sc_insertpagebreak.png
 cmd/sc_inserttimefield.png cmd/sc_timefield.png
+cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
+cmd/sc_numericfield.png cmd/sc_numberformatstandard.png
+cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
+cmd/sc_shapesmenu.png cmd/sc_insertdraw.png
 cmd/sc_showtrackedchanges.png cmd/sc_addwatch.png
-cmd/sc_viewtrackchanges.png cmd/sc_addwatch.png
-cmd/sc_changesmenu.png cmd/sc_trackchanges.png
-cmd/lc_showtrackedchanges.png cmd/lc_addwatch.png
 cmd/sc_tracechangemode.png cmd/sc_trackchanges.png
-cmd/lc_tracechangemode.png cmd/lc_trackchanges.png
-cmd/sc_charactermenu.png cmd/sc_fontdialog.png
-cmd/sc_paragraphmenu.png cmd/sc_paragraphdialog.png
-cmd/sc_numberingmenu.png cmd/sc_outlinebullet.png
+cmd/sc_viewtrackchanges.png cmd/sc_addwatch.png
 
 # Zoom
 cmd/lc_previewzoom.png cmd/lc_zoomprevious.png
@@ -174,10 +194,6 @@ cmd/sc_doubleclicktextedit.png cmd/sc_pickthrough.png
 cmd/sc_fontworkcharacterspacingfloater.png cmd/sc_spacing.png
 cmd/sc_fontheight.png cmd/sc_scaletext.png
 
-# Object
-cmd/lc_objectcatalog.png cmd/lc_dbnewform.png
-cmd/sc_objectcatalog.png cmd/sc_dbnewform.png
-
 # 3d
 cmd/lc_view3d.png cmd/lc_cube.png
 cmd/lc_objects3dtoolbox.png cmd/lc_cube.png
@@ -187,8 +203,6 @@ cmd/sc_objects3dtoolbox.png cmd/sc_cube.png
 cmd/sc_convertinto3dlathefast.png cmd/sc_convertinto3dlathe.png
 
 # Control
-cmd/lc_choosecontrols.png cmd/lc_controlproperties.png
-cmd/sc_choosecontrols.png cmd/sc_controlproperties.png
 cmd/lc_optionstreedialog.png cmd/lc_controlproperties.png
 cmd/sc_optionstreedialog.png cmd/sc_controlproperties.png
 
@@ -200,7 +214,7 @@ cmd/sc_formattextmenu.png cmd/sc_color.png
 cmd/sc_formatspacingmenu.png cmd/sc_spacepara15.png
 cmd/sc_textalign.png cmd/sc_alignblock.png
 cmd/sc_formatbulletsmenu.png cmd/sc_defaultbullet.png
-cmd/sc_formatimagemenu.png cmd/sc_gallery.png
+cmd/sc_formatimagemenu.png cmd/sc_graphicdialog.png
 cmd/sc_formatframemenu.png cmd/sc_formatline.png
 
 # Url
@@ -215,6 +229,11 @@ cmd/sc_vscrollbar.png cmd/sc_scrollbar.png
 cmd/lc_hscrollbar.png cmd/lc_insertformhscroll.png
 cmd/sc_hscrollbar.png cmd/sc_insertformhscroll.png
 
+# Tools
+cmd/lc_languagemenu.png cmd/lc_managelanguage.png
+cmd/sc_languagemenu.png cmd/sc_managelanguage.png
+
+
 # Annotations
 cmd/sc_insertannotation.png cmd/sc_shownote.png
 cmd/lc_insertannotation.png cmd/lc_shownote.png
@@ -261,20 +280,21 @@ cmd/sc_sectionalignbottom.png cmd/sc_aligndown.png
 cmd/sc_alignhorizontalceter.png cmd/sc_alignhorizontalcenter.png
 
 # Graphic
-cmd/lc_grafgamma.png cmd/lc_graphicfilterinvert.png
 cmd/lc_colorsettings.png cmd/lc_graphicfiltersmooth.png
-cmd/lc_graphicfilterposter.png cmd/lc_graphicdialog.png
+cmd/lc_colorview.png cmd/lc_graphicfilterinvert.png
+cmd/lc_grafgamma.png cmd/lc_graphicfilterinvert.png
 cmd/lc_grafmode.png cmd/lc_graphicdialog.png
 cmd/lc_grafinvert.png cmd/lc_graphicfilterinvert.png
-cmd/lc_colorview.png cmd/lc_graphicfilterinvert.png
-cmd/sc_grafgamma.png cmd/sc_graphicfilterinvert.png
+cmd/lc_graphicfilterposter.png cmd/lc_graphicdialog.png
+cmd/lc_objecttitledescription.png cmd/lc_insertcaptiondialog.png
+
 cmd/sc_colorsettings.png cmd/sc_graphicfiltersmooth.png
-cmd/sc_graphicfilterposter.png cmd/sc_graphicdialog.png
+cmd/sc_colorview.png cmd/sc_graphicfilterinvert.png
+cmd/sc_grafgamma.png cmd/sc_graphicfilterinvert.png
 cmd/sc_grafmode.png cmd/sc_graphicdialog.png
 cmd/sc_grafinvert.png cmd/sc_graphicfilterinvert.png
-cmd/sc_colorview.png cmd/sc_graphicfilterinvert.png
+cmd/sc_graphicfilterposter.png cmd/sc_graphicdialog.png
 cmd/sc_objecttitledescription.png cmd/sc_insertcaptiondialog.png
-cmd/lc_objecttitledescription.png cmd/lc_insertcaptiondialog.png
 
 # shapes
 cmd/lc_fontworkshapetype.fontwork-circle-pour.png cmd/lc_basicshapes.ring.png
@@ -293,7 +313,7 @@ cmd/lc_basicshapes.circle-pie.png cmd/lc_pie.png
 cmd/lc_flowchartshapes.flowchart-merge.png cmd/lc_fontworkshapetype.fontwork-triangle-down.png
 cmd/lc_fontworkshapetype.fontwork-fade-down.png cmd/lc_basicshapes.trapezoid.png
 cmd/lc_flowchartshapes.flowchart-magnetic-disk.png cmd/lc_basicshapes.can.png
-cmd/sc_flowchartshapes.png cmd/lc_flowchartshapes.flowchart-document.png
+cmd/sc_flowchartshapes.png cmd/sc_flowchartshapes.flowchart-document.png
 
 cmd/lc_measureattributes.png cmd/lc_measureline.png
 cmd/sc_measureattributes.png cmd/sc_measureline.png
@@ -321,10 +341,8 @@ cmd/sc_flowchartshapes.flowchart-magnetic-disk.png cmd/sc_basicshapes.can.png
 # Open
 cmd/lc_openfromwriter.png cmd/lc_open.png
 cmd/lc_openfromcalc.png cmd/lc_open.png
-cmd/lc_filecontrol.png cmd/lc_open.png
 cmd/sc_openfromwriter.png cmd/sc_open.png
 cmd/sc_openfromcalc.png cmd/sc_open.png
-cmd/sc_filecontrol.png cmd/sc_open.png
 
 # Merge
 cmd/lc_mergedocument.png cmd/lc_mergedocuments.png
@@ -350,18 +368,8 @@ cmd/sc_editprintarea.png cmd/sc_editdoc.png
 cmd/lc_deleteprintarea.png cmd/lc_delete.png
 cmd/lc_deleteprintarea.png cmd/lc_delete.png
 cmd/lc_deleterecord.png cmd/lc_delete.png
-cmd/lc_dbtabledelete.png cmd/lc_delete.png
-cmd/lc_dbreportdelete.png cmd/lc_delete.png
-cmd/lc_dbquerydelete.png cmd/lc_delete.png
-cmd/lc_dbformdelete.png cmd/lc_delete.png
-cmd/lc_dbclearquery.png cmd/lc_delete.png
 cmd/sc_deleteprintarea.png cmd/sc_delete.png
 cmd/sc_deleterecord.png cmd/sc_delete.png
-cmd/sc_dbtabledelete.png cmd/sc_delete.png
-cmd/sc_dbreportdelete.png cmd/sc_delete.png
-cmd/sc_dbquerydelete.png cmd/sc_delete.png
-cmd/sc_dbformdelete.png cmd/sc_delete.png
-cmd/sc_dbclearquery.png cmd/sc_delete.png
 
 # Folder
 cmd/lc_dbtableopen.png cmd/lc_open.png
@@ -446,15 +454,9 @@ cmd/sc_clickchangerotation.png cmd/sc_toggleobjectrotatemode.png
 
 # AddField
 cmd/lc_fieldnames.png cmd/lc_addfield.png
-cmd/lc_dbtablerename.png cmd/lc_addfield.png
-cmd/lc_dbreportrename.png cmd/lc_addfield.png
-cmd/lc_dbqueryrename.png cmd/lc_addfield.png
-cmd/lc_dbformrename.png cmd/lc_addfield.png
+
 cmd/sc_fieldnames.png cmd/sc_addfield.png
-cmd/sc_dbtablerename.png cmd/sc_addfield.png
-cmd/sc_dbreportrename.png cmd/sc_addfield.png
-cmd/sc_dbqueryrename.png cmd/sc_addfield.png
-cmd/sc_dbformrename.png cmd/sc_addfield.png
+
 
 # Edit
 cmd/lc_quickedit.png cmd/lc_editdoc.png
@@ -564,13 +566,15 @@ cmd/sc_spellingandgrammardialog.png cmd/sc_spelling.png
 cmd/sc_spelldialog.png cmd/sc_spelling.png
 
 # Color
+cmd/lc_backgroundpatterncontroller.png cmd/lc_backgroundcolor.png
+cmd/lc_characterbackgroundpattern.png cmd/lc_backcolor.png
 cmd/lc_fontcolor.png cmd/lc_color.png
-cmd/sc_fontcolor.png cmd/sc_color.png
+cmd/lc_tablecellbackgroundcolor.png cmd/lc_backgroundcolor.png
+
+cmd/sc_backgroundpatterncontroller.png cmd/sc_backgroundcolor.png
 cmd/sc_characterbackgroundpattern.png cmd/sc_backcolor.png
-cmd/lc_characterbackgroundpattern.png cmd/lc_backcolor.png
-cmd/lc_backgroundpatterncontroller.png cmd/lc_backgroundcolor.png
+cmd/sc_fontcolor.png cmd/sc_color.png
 cmd/sc_tablecellbackgroundcolor.png cmd/sc_backgroundcolor.png
-cmd/lc_tablecellbackgroundcolor.png cmd/lc_backgroundcolor.png
 
 # Paragraph Alignment
 cmd/lc_leftpara.png cmd/lc_alignleft.png
@@ -892,17 +896,16 @@ cmd/lc_reportnavigator.png cmd/lc_navigator.png
 cmd/sc_reportnavigator.png cmd/sc_navigator.png
 
 # Database
-cmd/sc_diagramdata.png cmd/sc_viewdatasourcebrowser.png
+cmd/lc_dbdtableedit.png cmd/lc_dbtableedit.png
 cmd/lc_dbnewquerysql.png cmd/lc_sbanativesql.png
-cmd/sc_dbnewquerysql.png cmd/sc_sbanativesql.png
-cmd/lc_dbtableedit.png cmd/lc_tabledialog.png
-cmd/sc_dbtableedit.png cmd/sc_tabledialog.png
-cmd/lc_dbdtableedit.png cmd/lc_tabledialog.png
-cmd/sc_dbdtableedit.png cmd/sc_tabledialog.png
-cmd/lc_dbquerypropertiesdialog.png cmd/lc_dbqueryedit.png
-cmd/sc_dbquerypropertiesdialog.png cmd/sc_dbqueryedit.png
 cmd/lc_dbnewview.png cmd/lc_dbchangedesignmode.png
+cmd/lc_dbrelationdesign.png cmd/lc_dbaddrelation.png
+
+cmd/sc_dbdtableedit.png cmd/sc_dbtableedit.png
+cmd/sc_dbnewquerysql.png cmd/sc_sbanativesql.png
 cmd/sc_dbnewview.png cmd/sc_dbchangedesignmode.png
+cmd/sc_dbrelationdesign.png cmd/sc_dbaddrelation.png
+cmd/sc_diagramdata.png cmd/sc_viewdatasourcebrowser.png
 
 # Browse
 cmd/lc_browsebackward cmd/lc_prevrecord.png
@@ -928,15 +931,27 @@ cmd/lc_pluginsactive.png cmd/lc_insertplugin.png
 cmd/sc_pluginsactive.png cmd/sc_insertplugin.png
 
 # Table
-cmd/lc_dbnewtable.png cmd/lc_inserttable.png
-cmd/sc_dbnewtable.png cmd/sc_inserttable.png
 cmd/lc_inscellsctrl.png cmd/lc_inserttable.png
-cmd/sc_inscellsctrl.png cmd/sc_inserttable.png
 cmd/lc_setoptimalcolumnwidthdirect.png cmd/lc_setoptimalcolumnwidth.png
-cmd/sc_setoptimalcolumnwidthdirect.png cmd/sc_setoptimalcolumnwidth.png
 cmd/lc_starchartdialog.png cmd/lc_insertobjectdialog.png
+cmd/lc_tableautofitmenu.png cmd/lc_setoptimalrowheight.png
+cmd/lc_tabledeletemenu.png cmd/lc_deletetable.png
+cmd/lc_tablemenu.png cmd/lc_inserttable.png
+cmd/lc_tableinsertmenu.png cmd/lc_insertrowsafter.png
+cmd/lc_tableselectall.png cmd/lc_selecttable.png
+cmd/lc_tableselectmenu.png cmd/lc_selecttable.png
+
+cmd/sc_inscellsctrl.png cmd/sc_inserttable.png
+cmd/sc_setoptimalcolumnwidthdirect.png cmd/sc_setoptimalcolumnwidth.png
 cmd/sc_starchartdialog.png cmd/sc_insertobjectdialog.png
+cmd/sc_tableautofitmenu.png cmd/sc_setoptimalrowheight.png
+cmd/sc_tabledeletemenu.png cmd/sc_deletetable.png
 cmd/sc_tablemenu.png cmd/sc_inserttable.png
+cmd/sc_tableinsertmenu.png cmd/sc_insertrowsafter.png
+cmd/sc_tableselectall.png cmd/sc_selecttable.png
+cmd/sc_tableselectmenu.png cmd/sc_selecttable.png
+
+
 
 # Help
 cmd/lc_absoluterecord.png cmd/lc_helpindex.png
@@ -1058,7 +1073,6 @@ cmd/sc_insertslidefield.png cmd/sc_insertpagenumberfield.png
 cmd/sc_insertslidesfield.png cmd/sc_insertpagecountfield.png
 cmd/sc_insertslidetitlefield.png cmd/sc_inserttitlefield.png
 cmd/sc_insertpagetitlefield.png cmd/sc_inserttitlefield.png
-cmd/sc_insertfilefield.png cmd/sc_open.png
 cmd/sc_insertdatefieldfix.png cmd/sc_datefield.png
 cmd/sc_insertdatefieldvar.png cmd/sc_datefield.png
 cmd/sc_inserttimefieldfix.png cmd/sc_timefield.png
@@ -1076,8 +1090,9 @@ dbaccess/res/db.png cmd/sc_viewdatasourcebrowser.png
 dbaccess/res/exerror.png cmd/sc_cancel.png
 dbaccess/res/exinfo.png cmd/sc_helpindex.png
 
-dbaccess/res/form_16.png cmd/sc_dbnewform.png
+dbaccess/res/form_16.png cmd/sc_dbviewforms.png
 dbaccess/res/forms_16.png res/dialogfolder_16.png
+dbaccess/res/forms_32.png cmd/32/dbviewforms.png
 
 dbaccess/res/lc036.png cmd/lc_dbnewreport.png
 dbaccess/res/lc037.png cmd/lc_delete.png
@@ -1090,14 +1105,17 @@ dbaccess/res/nu08.png cmd/sc_cancel.png
 
 dbaccess/res/one_left.png cmd/sc_prevrecord.png
 dbaccess/res/one_right.png cmd/sc_nextrecord.png
+dbaccess/res/queries_32.png cmd/32/dbviewqueries.png
+dbaccess/res/reports_32.png cmd/32/dbviewreports.png
+dbaccess/res/tables_32.png cmd/32/dbviewtables.png
 dbaccess/res/jo01.png dbaccess/res/pkey.png
-res/queries_32.png dbaccess/res/queries_32.png
+res/queries_32.png cmd/32/dbviewqueries.png
 
+dbaccess/res/report_16.png cmd/sc_dbviewreports.png
 dbaccess/res/reports_16.png res/sx18013.png
-dbaccess/res/report_16.png cmd/sc_executereport.png
-res/reports_32.png dbaccess/res/reports_32.png
+res/reports_32.png cmd/32/dbviewreports.png
 
-dbaccess/res/sc036.png cmd/sc_executereport.png
+dbaccess/res/sc036.png cmd/sc_dbnewreport.png
 dbaccess/res/sc037.png cmd/sc_delete.png
 dbaccess/res/sc038.png cmd/sc_editdoc.png
 dbaccess/res/sc039.png cmd/sc_save.png
@@ -1105,7 +1123,7 @@ dbaccess/res/sc040.png cmd/sc_reload.png
 
 dbaccess/res/sortdown.png cmd/sc_downsearch.png
 dbaccess/res/sortup.png cmd/sc_upsearch.png
-res/tables_32.png dbaccess/res/tables_32.png
+res/tables_32.png cmd/32/dbviewtables.png
 
 # desktop
 # ==============================================
@@ -1143,7 +1161,7 @@ framework/res/addtemplate_32.png cmd/32/newdoc.png
 
 # reportdesign
 # ==============================================
-reportdesign/res/report_16.png cmd/sc_executereport.png
+reportdesign/res/report_16.png cmd/sc_dbviewreports.png
 reportdesign/res/sc20557.png cmd/sc_cancel.png
 reportdesign/res/sc30768.png cmd/sc_upsearch.png
 reportdesign/res/sc30769.png cmd/sc_downsearch.png
@@ -1154,7 +1172,7 @@ reportdesign/res/sx11047.png cmd/sc_basicshapes.diamond.png
 reportdesign/res/sx12452.png cmd/sc_config.png
 reportdesign/res/sx12453.png cmd/sc_config.png
 reportdesign/res/sx12454.png cmd/sc_alignright.png
-reportdesign/res/sx12464.png cmd/sc_executereport.png
+reportdesign/res/sx12464.png cmd/sc_dbviewreports.png
 reportdesign/res/sx12594.png cmd/sc_dbviewfunctions.png
 
 # res
@@ -1270,7 +1288,7 @@ res/sc05502.png cmd/sc_saveas.png
 res/sc05504.png cmd/sc_print.png
 res/sc05509.png cmd/sc_print.png
 
-res/sc05554.png cmd/sc_formatpaintbrush.png
+res/sc05554.png cmd/sc_backgroundcolor.png
 res/sc05711.png cmd/sc_copy.png
 res/sc05961.png cmd/sc_recsearch.png
 res/sc06300.png cmd/sc_nextrecord.png
@@ -1308,7 +1326,7 @@ res/sx10600.png cmd/sc_listbox.png
 res/sx10601.png cmd/sc_combobox.png
 res/sx10603.png cmd/sc_insertspreadsheet.png
 res/sx10604.png cmd/sc_imagebutton.png
-res/sx10605.png cmd/sc_open.png
+res/sx10605.png cmd/sc_filecontrol.png
 res/sx10607.png cmd/sc_navigationbar.png
 res/sx10704.png cmd/sc_datefield.png
 res/sx10705.png cmd/sc_timefield.png
@@ -1334,16 +1352,16 @@ 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/res/na09.png cmd/sc_animationeffects.png
-sc/res/na010.png cmd/sc_selectobject.png
+sc/res/na010.png cmd/sc_datafilterstandardfilter.png
 sc/res/na011.png cmd/lc_ok.png
 sc/res/nc01.png cmd/sc_dbviewtablenames.png
 sc/res/nc02.png cmd/sc_dataranges.png
 sc/res/nc03.png cmd/sc_viewdatasourcebrowser.png
-sc/res/nc04.png cmd/sc_gallery.png
+sc/res/nc04.png cmd/sc_insertgraphic.png
 sc/res/nc05.png cmd/sc_insertobject.png
 sc/res/nc06.png cmd/sc_shownote.png
 sc/res/nc07.png cmd/sc_insertbookmark.png
-sc/res/nc08.png cmd/sc_gallery.png
+sc/res/nc08.png cmd/sc_insertgraphic.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
@@ -1381,6 +1399,12 @@ cmd/sc_insertanchor.png cmd/sc_insertbookmark.png
 
 # sd
 # ==============================================
+sd/res/displaymode_handoutmaster.png cmd/32/handoutmode.png
+sd/res/displaymode_notes.png cmd/32/notesmode.png
+sd/res/displaymode_notesmaster.png cmd/32/notesmasterpage.png
+sd/res/displaymode_slide.png cmd/32/normalmultipanegui.png
+sd/res/displaymode_slidemaster.png cmd/32/slidemasterpage.png
+sd/res/displaymode_slidesorter.png cmd/32/diamode.png
 sd/res/nv02.png cmd/sc_freeline_unfilled.png
 sd/res/nv03.png cmd/sc_firstrecord.png
 sd/res/nv04.png cmd/sc_prevrecord.png
@@ -1389,7 +1413,7 @@ sd/res/nv06.png cmd/sc_lastrecord.png
 sd/res/nv08.png cmd/sc_copy.png
 sd/res/nv09.png cmd/sc_insertbookmark.png
 sd/res/nv010.png cmd/sc_inserthyperlink.png
-sd/res/graphic.png cmd/sc_graphic.png
+sd/res/graphic.png cmd/sc_insertgraphic.png
 
 sd/res/breakplayingblue_16.png cmd/sc_mediapause.png
 sd/res/comments_indicator.png cmd/sc_shownote.png
@@ -1455,8 +1479,8 @@ sfx2/res/symphony/sidebar-navigator-large.png cmd/lc_navigator.png
 sfx2/res/symphony/sidebar-navigator-small.png cmd/sc_navigator.png
 sfx2/res/symphony/sidebar-property-large.png cmd/lc_formproperties.png
 sfx2/res/symphony/sidebar-property-small.png cmd/sc_formproperties.png
-sfx2/res/symphony/sidebar-style-large.png cmd/lc_formdesigntools.png
-sfx2/res/symphony/sidebar-style-small.png cmd/sc_formdesigntools.png
+sfx2/res/symphony/sidebar-style-large.png cmd/lc_designerdialog.png
+sfx2/res/symphony/sidebar-style-small.png cmd/sc_designerdialog.png
 sfx2/res/symphony/sidebar-template-large.png cmd/lc_slidemasterpage.png
 sfx2/res/symphony/sidebar-template-small.png cmd/sc_slidemasterpage.png
 
@@ -1605,14 +1629,11 @@ svx/res/symphony/AdjustColorBlue_16x16.png cmd/sc_grafblue.png
 svx/res/symphony/AdjustColorGamma_16x16.png cmd/sc_graphicfilterinvert.png
 svx/res/symphony/AdjustColorGreen_16x16.png cmd/sc_grafgreen.png
 svx/res/symphony/AdjustColorRed_16x16.png cmd/sc_grafred.png
-svx/res/symphony/fill_color.png cmd/sc_backgroundpatterncontroller.png
-svx/res/symphony/last_custom_common.png sw/res/sidebar/pageproppanel/last_custom_common.png
-svx/res/symphony/last_custom_common_grey.png sw/res/sidebar/pageproppanel/last_custom_common_grey.png
+svx/res/symphony/fill_color.png cmd/sc_backgroundcolor.png
 svx/res/symphony/rotate_left.png cmd/sc_rotateleft.png
 svx/res/symphony/rotate_right.png cmd/sc_rotateright.png
 svx/res/symphony/sch_backgroundcolor.png cmd/sc_backgroundcolor.png
 svx/res/symphony/spacing3.png cmd/sc_spacepara1.png
-svx/res/symphony/last_custom_common.png cmd/last_custom_common.png
 
 # sw
 # ==============================================
@@ -1622,7 +1643,7 @@ sw/res/lc20557.png cmd/lc_cancel.png
 sw/res/lc20558.png cmd/lc_ok.png
 sw/res/nc20001.png cmd/sc_inserttable.png
 sw/res/nc20002.png cmd/sc_insertframe.png
-sw/res/nc20003.png cmd/sc_gallery.png
+sw/res/nc20003.png cmd/sc_insertgraphic.png
 sw/res/nc20004.png cmd/sc_insertobject.png
 sw/res/nc20005.png cmd/sc_insertbookmark.png
 sw/res/nc20006.png cmd/sc_insertsection.png
@@ -1648,7 +1669,7 @@ sw/res/sc20175.png cmd/sc_nextrecord.png
 sw/res/sc20182.png cmd/sc_anchormenu.png
 sw/res/sc20186.png cmd/sc_prevrecord.png
 sw/res/sc20233.png cmd/sc_ok.png
-sw/res/sc20235.png cmd/sc_editdoc.png
+sw/res/sc20235.png cmd/sc_inserthyperlinkcontrol.png
 sw/res/sc20238.png cmd/sc_insertbookmark.png
 sw/res/sc20239.png cmd/sc_copy.png
 sw/res/sc20245.png cmd/sc_editdoc.png
@@ -1659,7 +1680,6 @@ sw/res/sc20556.png cmd/sc_dbviewfunctions.png
 sw/res/sc20557.png cmd/sc_cancel.png
 sw/res/sc20558.png cmd/sc_ok.png
 
-sw/res/sc_datainrows.png cmd/sc_datainrows.png
 sw/res/sc20247.png cmd/sc_dataimport.png
 
 sw/res/sf01.png cmd/sc_controlcodes.png
@@ -1669,12 +1689,16 @@ sw/res/sf04.png cmd/sc_showsinglepage.png
 sw/res/sf05.png cmd/sc_defaultbullet.png
 sw/res/sf06.png cmd/sc_inserttable.png
 
+sw/res/sidebar/pageproppanel/last_custom_common.png svx/res/symphony/last_custom_common.png
+sw/res/sidebar/pageproppanel/last_custom_common_grey.png svx/res/symphony/last_custom_common_grey.png
+
 sw/res/sr20000.png cmd/sc_downsearch.png
 sw/res/sr20001.png cmd/sc_upsearch.png
 sw/res/sr20002.png cmd/sc_inserttable.png
 sw/res/sr20003.png cmd/sc_insertframe.png
 sw/res/sr20004.png cmd/sc_showsinglepage.png
-sw/res/sr20005.png cmd/sc_editdoc.png
+sw/res/sr20005.png cmd/sc_insertdraw.png
+sw/res/sr20006.png cmd/sc_choosecontrols.png
 sw/res/sr20007.png cmd/sc_insertsection.png
 sw/res/sr20008.png cmd/sc_insertbookmark.png
 sw/res/sr20009.png cmd/sc_toggleobjectbeziermode.png
@@ -1686,12 +1710,10 @@ sw/res/sr20014.png dbaccess/res/exwarning.png
 sw/res/sr20015.png cmd/sc_shownote.png
 sw/res/sr20016.png cmd/sc_recsearch.png
 sw/res/sr20017.png cmd/sc_insertindexesentry.png
-sw/res/sr20018.png cmd/sc_inserttable.png
-sw/res/sr20019.png cmd/sc_remove.png
 
-sw/res/sx01.png cmd/sc_dbqueryedit.png
+sw/res/sx01.png cmd/sc_changedatabasefield.png
 sw/res/sx02.png cmd/sc_freezepanesfirstrow.png
-sw/res/sx03.png cmd/sc_dbqueryedit.png
+sw/res/sx03.png cmd/sc_dbviewqueries.png
 svx/res/reload.png cmd/sc_reload.png
 svx/res/time.png cmd/sc_timefield.png
 
@@ -1785,12 +1807,6 @@ cmd/lc_addtextbox.png cmd/lc_insertfixedtext.png
 
 # draw
 # ===============================================
-cmd/sc_masterpage.png cmd/sc_slidemasterpage.png
-cmd/lc_masterpage.png cmd/lc_slidemasterpage.png
-
-cmd/sc_pagemode.png cmd/sc_normalmultipanegui.png
-cmd/lc_pagemode.png cmd/lc_normalmultipanegui.png
-
 # Sheet
 cmd/32/sheetlefttoright.png cmd/32/paralefttoright.png
 cmd/32/sheetrighttoleft.png cmd/32/pararighttoleft.png
@@ -1829,6 +1845,12 @@ cmd/sc_com.sun.star.deployment.ui.packagemanagerdialog.png cmd/sc_insertplugin.p
 cmd/sc_formatobjectmenu.png cmd/sc_text.png
 cmd/sc_textattributes.png cmd/sc_text.png
 
+# Edit menu
+cmd/lc_editpastespecialmenu.png cmd/lc_pastespecial.png
+cmd/lc_pastespecialmenu.png cmd/lc_pastespecial.png
+cmd/sc_editpastespecialmenu.png cmd/sc_pastespecial.png
+cmd/sc_pastespecialmenu.png cmd/sc_pastespecial.png
+
 # calc styles
 cmd/sc_badcellstyles.png cmd/sc_badcellstyle.png
 cmd/sc_goodcellstyles.png cmd/sc_goodcellstyle.png
diff --git a/icon-themes/colibre/sd/res/displaymode_handoutmaster.png b/icon-themes/colibre/sd/res/displaymode_handoutmaster.png
deleted file mode 100644
index 483321fbd5a8..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_handoutmaster.png
+++ /dev/null
diff --git a/icon-themes/colibre/sd/res/displaymode_notes.png b/icon-themes/colibre/sd/res/displaymode_notes.png
deleted file mode 100644
index 87a3abe84828..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_notes.png
+++ /dev/null
diff --git a/icon-themes/colibre/sd/res/displaymode_notesmaster.png b/icon-themes/colibre/sd/res/displaymode_notesmaster.png
deleted file mode 100644
index dc0bb4f6d570..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_notesmaster.png
+++ /dev/null
diff --git a/icon-themes/colibre/sd/res/displaymode_outline.png b/icon-themes/colibre/sd/res/displaymode_outline.png
deleted file mode 100644
index d25918ece28c..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_outline.png
+++ /dev/null
diff --git a/icon-themes/colibre/sd/res/displaymode_slide.png b/icon-themes/colibre/sd/res/displaymode_slide.png
deleted file mode 100644
index bc341cf2c869..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_slide.png
+++ /dev/null
diff --git a/icon-themes/colibre/sd/res/displaymode_slidemaster.png b/icon-themes/colibre/sd/res/displaymode_slidemaster.png
deleted file mode 100644
index 8522bc57fd83..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_slidemaster.png
+++ /dev/null
diff --git a/icon-themes/colibre/sd/res/displaymode_slidesorter.png b/icon-themes/colibre/sd/res/displaymode_slidesorter.png
deleted file mode 100644
index 33f01a3afc3b..000000000000
--- a/icon-themes/colibre/sd/res/displaymode_slidesorter.png
+++ /dev/null
diff --git a/icon-themes/colibre/svx/res/symphony/last_custom_common.png b/icon-themes/colibre/svx/res/symphony/last_custom_common.png
new file mode 100644
index 000000000000..02cade625e0e
--- /dev/null
+++ b/icon-themes/colibre/svx/res/symphony/last_custom_common.png
diff --git a/icon-themes/colibre/svx/res/symphony/last_custom_common_grey.png b/icon-themes/colibre/svx/res/symphony/last_custom_common_grey.png
new file mode 100644
index 000000000000..dc196ffbbb3e
--- /dev/null
+++ b/icon-themes/colibre/svx/res/symphony/last_custom_common_grey.png
diff --git a/icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common.png b/icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common.png
deleted file mode 100644
index 0085e87e3ceb..000000000000
--- a/icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common.png
+++ /dev/null
diff --git a/icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common_grey.png b/icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
deleted file mode 100644
index 6cdedfea5a3b..000000000000
--- a/icon-themes/colibre/sw/res/sidebar/pageproppanel/last_custom_common_grey.png
+++ /dev/null
diff --git a/icon-themes/colibre/sw/res/sr20006.png b/icon-themes/colibre/sw/res/sr20006.png
deleted file mode 100644
index a574a7ab61b7..000000000000
--- a/icon-themes/colibre/sw/res/sr20006.png
+++ /dev/null
diff --git a/icon-themes/colibre/sw/res/sr20018.png b/icon-themes/colibre/sw/res/sr20018.png
new file mode 100644
index 000000000000..08e38d4e2741
--- /dev/null
+++ b/icon-themes/colibre/sw/res/sr20018.png
diff --git a/icon-themes/colibre/sw/res/sr20019.png b/icon-themes/colibre/sw/res/sr20019.png
new file mode 100644
index 000000000000..bc819956aa49
--- /dev/null
+++ b/icon-themes/colibre/sw/res/sr20019.png