18 files changed, 0 insertions, 242 deletions
diff --git a/icon-themes/colibre/cmd/32/wrapideal.png b/icon-themes/colibre/cmd/32/wrapideal.png
index b67473274af2..a595053eefac 100644
--- a/icon-themes/colibre/cmd/32/wrapideal.png
+++ b/icon-themes/colibre/cmd/32/wrapideal.png
diff --git a/icon-themes/colibre/cmd/lc_addressbooksource.svg b/icon-themes/colibre/cmd/lc_addressbooksource.svg
deleted file mode 100644
index 6183b6998f42..000000000000
--- a/icon-themes/colibre/cmd/lc_addressbooksource.svg
+++ /dev/null
@@ -1,10 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 6,3 H 19 V 21 H 6 Z"
-     />
-  <path
-     style="fill:#808080"
-     d="M 5.5,2 C 5.223,2 5,2.777 5,2.5 V 4 H 4.5 C 4.223,4 4,4.223 4,4.5 v 3 C 4,7.777 4.2620333,8 4.5,8 H 5 v 6 H 4.5 C 4.223,14 4,14.223 4,14.5 v 3 C 4,17.777 4.223,18 4.5,18 H 5 v 3.5 C 5,21.777 5.223,22 5.5,22 h 14 C 19.777,22 20,21.777 20,21.5 V 2.5 C 20,2.223 19.777,2 19.5,2 Z M 6,3 H 19 V 21 H 6 v -3.5 -3 -7 -3 z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/lc_contourdialog.png b/icon-themes/colibre/cmd/lc_contourdialog.png
new file mode 100644
index 000000000000..c8f8c23771a6
--- /dev/null
+++ b/icon-themes/colibre/cmd/lc_contourdialog.png
diff --git a/icon-themes/colibre/cmd/lc_mailmergecreatedocuments.svg b/icon-themes/colibre/cmd/lc_mailmergecreatedocuments.svg
deleted file mode 100644
index 430d1f1a3ef2..000000000000
--- a/icon-themes/colibre/cmd/lc_mailmergecreatedocuments.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 3 3 L 3 19 L 4 19 L 4 5 C 4 4.446 4.446 4 5 4 L 15 4 L 15 3 L 3 3 z M 5 5 L 5 21 L 10.462891 21 L 11.046875 18.625 C 13.032812 16.641104 15.015571 14.665467 17 12.691406 L 17 5 L 5 5 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 3 2 C 2.446 2 2 2.446 2 3 L 2 19 C 2 19.554 2.446 20 3 20 L 4 20 L 4 21 C 4 21.554 4.446 22 5 22 L 10.216797 22 L 10.462891 21 L 5 21 L 5 20 L 5 19 L 5 9 L 5 5 L 17 5 L 17 12.691406 C 17.333238 12.359909 17.666556 12.026195 18 11.695312 L 18 5 C 18 4.446 17.554 4 17 4 L 16 4 L 16 3 C 16 2.446 15.554 2 15 2 L 3 2 z M 3 3 L 15 3 L 15 4 L 5 4 C 4.446 4 4 4.446 4 5 L 4 19 L 3 19 L 3 3 z "
-     />
-  <path
-     style="fill:#eac282"
-     d="M 20.419922 11 C 20.23036 11 20.041738 11.07172 19.896484 11.216797 L 18.222656 12.886719 L 21.070312 15.736328 L 22.78125 14.097656 C 23.071756 13.807529 23.071756 13.340909 22.78125 13.050781 L 20.945312 11.216797 C 20.800058 11.071733 20.609484 11 20.419922 11 z M 17.480469 13.611328 L 11.951172 19.134766 L 11 23 L 14.806641 21.988281 L 20.316406 16.443359 L 17.480469 13.611328 z "
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/lc_mailmergeemaildocuments.svg b/icon-themes/colibre/cmd/lc_mailmergeemaildocuments.svg
deleted file mode 100644
index de6ef5423c36..000000000000
--- a/icon-themes/colibre/cmd/lc_mailmergeemaildocuments.svg
+++ /dev/null
@@ -1,35 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 3 3 L 3 19 L 4 19 L 4 18 L 4 14 L 4 5 C 4 4.446 4.446 4 5 4 L 15 4 L 15 3 L 3 3 z "
-     />
-  <path
-     style="fill:#ffffff"
-     d="m 8,10 h 14 v 8 H 8 Z"
-     />
-  <g
-     style="fill:#4d82b8"
-     >
-    <path
-       d="m 18,11 h 3 v 3 h -3 z"
-       />
-    <path
-       d="m 9,14 h 7 v 1 H 9 Z"
-       />
-    <path
-       d="m 10,16 h 5 v 1 h -5 z"
-       />
-  </g>
-  <path
-     style="fill:#ffffff"
-     d="M 5 5 L 5 21 L 17 21 L 17 20 L 7 20 C 6.446 20 6 19.554 6 19 L 6 9 C 6 8.446 6.446 8 7 8 L 17 8 L 17 5 L 5 5 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 3 2 C 2.446 2 2 2.446 2 3 L 2 19 C 2 19.554 2.446 20 3 20 L 4 20 L 4 21 C 4 21.554 4.446 22 5 22 L 17 22 C 17.554 22 18 21.554 18 21 L 18 20 L 17 20 L 17 21 L 5 21 L 5 9 L 5 5 L 17 5 L 17 8 L 18 8 L 18 5 C 18 4.446 17.554 4 17 4 L 16 4 L 16 3 C 16 2.446 15.554 2 15 2 L 3 2 z M 3 3 L 15 3 L 15 4 L 5 4 C 4.446 4 4 4.446 4 5 L 4 19 L 3 19 L 3 3 z "
-     />
-  <path
-     style="fill:#4d82b8"
-     d="M 8,9 C 7.446,9 7,9.446 7,10 v 8 c 0,0.554 0.446,1 1,1 h 14 c 0.554,0 1,-0.446 1,-1 V 10 C 23,9.446 22.554,9 22,9 Z m 0,1 h 14 v 8 H 8 Z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/lc_mailmergeexcludeentry.svg b/icon-themes/colibre/cmd/lc_mailmergeexcludeentry.svg
deleted file mode 100644
index 6ff9e46d4d6f..000000000000
--- a/icon-themes/colibre/cmd/lc_mailmergeexcludeentry.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 3 3 L 3 19 L 4 19 L 4 5 C 4 4.446 4.446 4 5 4 L 15 4 L 15 3 L 3 3 z M 5 5 L 5 21 L 13.128906 21 C 13.466944 19.565282 14.500368 18.402247 15.853516 17.708984 C 15.344773 17.100756 15 16.347865 15 15.5 C 15 14.116848 15.824694 12.9223 17 12.355469 L 17 5 L 5 5 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 3 2 C 2.446 2 2 2.446 2 3 L 2 19 C 2 19.554 2.446 20 3 20 L 4 20 L 4 21 C 4 21.554 4.446 22 5 22 L 13 22 C 13 21.652291 13.053059 21.321915 13.128906 21 L 5 21 L 5 20 L 5 19 L 5 9 L 5 5 L 17 5 L 17 12.355469 C 17.311665 12.205158 17.646742 12.102635 18 12.050781 L 18 5 C 18 4.446 17.554 4 17 4 L 16 4 L 16 3 C 16 2.446 15.554 2 15 2 L 3 2 z M 3 3 L 15 3 L 15 4 L 5 4 C 4.446 4 4 4.446 4 5 L 4 19 L 3 19 L 3 3 z "
-     />
-  <circle
-     style="fill:#4d82b8"
-     cx="18.5"
-     cy="15.5"
-     r="2.5"
-     />
-  <path
-     style="fill:#4d82b8"
-     d="M 18.5,18 A 4.5,4 0 0 0 14,22 h 1 a 3.5,3 0 0 1 3.5,-3 3.5,3 0 0 1 3.5,3 h 1 a 4.5,4 0 0 0 -4.5,-4 z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/lc_mailmergeprintdocuments.svg b/icon-themes/colibre/cmd/lc_mailmergeprintdocuments.svg
deleted file mode 100644
index 1248a6b9d77d..000000000000
--- a/icon-themes/colibre/cmd/lc_mailmergeprintdocuments.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 3 3 L 3 19 L 4 19 L 4 5 C 4 4.446 4.446 4 5 4 L 15 4 L 15 3 L 3 3 z M 5 5 L 5 21 L 10 21 L 10 15 C 10 14.446 10.446 14 11 14 L 12 14 L 12 13 C 12 12.446 12.446 12 13 12 L 17 12 L 17 5 L 5 5 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 3,2 C 2.446,2 2,2.446 2,3 v 16 c 0,0.554 0.446,1 1,1 h 1 v 1 c 0,0.554 0.446,1 1,1 h 5 V 21 H 5 V 20 19 9 5 h 12 v 7 h 1 V 5 C 18,4.446 17.554,4 17,4 H 16 V 3 C 16,2.446 15.554,2 15,2 Z M 3,3 H 15 V 4 H 5 C 4.446,4 4,4.446 4,5 V 19 H 3 Z"
-     />
-  <path
-     style="fill:#4d82b8"
-     d="M 13.933594,13 C 13.416315,13 13,13.416315 13,13.933594 V 15 h -1 c -0.554,0 -1,0.446 -1,1 v 4 c 0,0.554 0.446,1 1,1 h 2 v 1 c 0,0.554 0.446,1 1,1 h 4 c 0.554,0 1,-0.446 1,-1 v -1 h 2 c 0.554,0 1,-0.446 1,-1 v -4 c 0,-0.554 -0.446,-1 -1,-1 H 21 V 13.933594 C 21,13.416315 20.583685,13 20.066406,13 Z"
-     />
-  <path
-     style="fill:#ffffff"
-     d="m 12,16 v 4 h 10 v -4 z m 7.5,1 h 1 c 0.277,0 0.5,0.223 0.5,0.5 0,0.277 -0.223,0.5 -0.5,0.5 h -1 C 19.223,18 19,17.777 19,17.5 19,17.223 19.223,17 19.5,17 Z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/lc_mailmergesavedocuments.svg b/icon-themes/colibre/cmd/lc_mailmergesavedocuments.svg
deleted file mode 100644
index 8a2a7770286a..000000000000
--- a/icon-themes/colibre/cmd/lc_mailmergesavedocuments.svg
+++ /dev/null
@@ -1,30 +0,0 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 3 3 L 3 19 L 4 19 L 4 5 C 4 4.446 4.446 4 5 4 L 15 4 L 15 3 L 3 3 z M 5 5 L 5 21 L 12 21 L 12 15 L 12 13 C 12 12.446 12.446 12 13 12 L 15 12 L 17 12 L 17 5 L 5 5 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 3 2 C 2.446 2 2 2.446 2 3 L 2 19 C 2 19.554 2.446 20 3 20 L 4 20 L 4 21 C 4 21.554 4.446 22 5 22 L 12 22 L 12 21 L 5 21 L 5 20 L 5 19 L 5 9 L 5 5 L 17 5 L 17 12 L 18 12 L 18 5 C 18 4.446 17.554 4 17 4 L 16 4 L 16 3 C 16 2.446 15.554 2 15 2 L 3 2 z M 3 3 L 15 3 L 15 4 L 5 4 C 4.446 4 4 4.446 4 5 L 4 19 L 3 19 L 3 3 z "
-     />
-  <rect
-     style="fill:#8959ab"
-     y="13"
-     x="13"
-     height="8"
-     rx="0"
-     ry="0.5"
-     width="8"
-     />
-  <rect
-     style="fill:#ffffff"
-     y="14"
-     x="14"
-     width="6"
-     height="3"
-     />
-  <path
-     style="fill:#ffffff"
-     d="m 15,18 c -0.554,0 -1,0.446 -1,1 v 1 c 0,0.554 0.446,1 1,1 v -2 h 1 v 2 h 2 c 0.554,0 1,-0.446 1,-1 v -1 c 0,-0.554 -0.446,-1 -1,-1 z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/lc_wrapideal.png b/icon-themes/colibre/cmd/lc_wrapideal.png
index efa4413da73d..7127ef2bd456 100644
--- a/icon-themes/colibre/cmd/lc_wrapideal.png
+++ b/icon-themes/colibre/cmd/lc_wrapideal.png
diff --git a/icon-themes/colibre/cmd/sc_contourdialog.png b/icon-themes/colibre/cmd/sc_contourdialog.png
new file mode 100644
index 000000000000..660bcd00598c
--- /dev/null
+++ b/icon-themes/colibre/cmd/sc_contourdialog.png
diff --git a/icon-themes/colibre/cmd/sc_mailmergecreatedocuments.svg b/icon-themes/colibre/cmd/sc_mailmergecreatedocuments.svg
deleted file mode 100644
index 2b18a24e6f1c..000000000000
--- a/icon-themes/colibre/cmd/sc_mailmergecreatedocuments.svg
+++ /dev/null
@@ -1,14 +0,0 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 1 1 L 1 15 L 6.2167969 15 L 6.8105469 12.591797 C 8.2081945 11.195406 9.603995 9.8062504 11 8.4160156 L 11 1 L 1 1 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 1 0 C 0.446 0 0 0.446 0 1 L 0 15 C 0 15.554 0.446 16 1 16 L 5.9707031 16 L 6.2167969 15 L 1 15 L 1 1 L 11 1 L 11 8.4160156 C 11.333437 8.0839566 11.666563 7.7490932 12 7.4179688 L 12 1 C 12 0.446 11.554 0 11 0 L 1 0 z "
-     />
-  <path
-     style="fill:#eac282"
-     d="M 14.066406 7 C 13.924235 7 13.782768 7.0533017 13.673828 7.1621094 L 12.417969 8.4160156 L 14.552734 10.552734 L 15.835938 9.3222656 C 16.053818 9.1046704 16.053818 8.7547054 15.835938 8.5371094 L 14.458984 7.1621094 C 14.350043 7.0533114 14.208578 7 14.066406 7 z M 11.861328 8.9589844 L 7.7148438 13.101562 L 7 16 L 9.8554688 15.242188 L 13.988281 11.082031 L 11.861328 8.9589844 z "
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/sc_mailmergeemaildocuments.svg b/icon-themes/colibre/cmd/sc_mailmergeemaildocuments.svg
deleted file mode 100644
index e1369c25126f..000000000000
--- a/icon-themes/colibre/cmd/sc_mailmergeemaildocuments.svg
+++ /dev/null
@@ -1,34 +0,0 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#808080"
-     d="M 1 0 C 0.446 0 0 0.446 0 1 L 0 15 C 0 15.554 0.446 16 1 16 L 11 16 C 11.554 16 12 15.554 12 15 L 11 15 L 2 15 L 1 15 L 1 14 L 1 4 L 1 1 L 11 1 L 11 3 L 12 3 L 12 1 C 12 0.446 11.554 0 11 0 L 1 0 z "
-     />
-  <path
-     style="fill:#ffffff"
-     d="M 1 1 L 1 4 C 1 3.446 1.446 3 2 3 L 11 3 L 11 1 L 1 1 z "
-     />
-  <path
-     style="fill:#ffffff"
-     d="m 3,5 h 12 v 8 H 3 Z"
-     />
-  <path
-     style="fill:#ffffff"
-     d="M 6,5 C 6,5.554 5.554,6 5,6 H 3 v 7 H 15 V 5 Z"
-     />
-  <g
-     style="fill:#4d82b8"
-     >
-    <path
-       d="m 11,6 h 3 v 3 h -3 z"
-       />
-    <path
-       d="m 4,9 h 6 v 1 H 4 Z"
-       />
-    <path
-       d="m 5,11 h 4 v 1 H 5 Z"
-       />
-    <path
-       d="M 3,4 C 2.446,4 2,4.446 2,5 v 8 c 0,0.554 0.446,1 1,1 h 12 c 0.554,0 1,-0.446 1,-1 V 5 C 16,4.446 15.554,4 15,4 Z m 0,1 h 12 v 8 H 3 Z"
-       />
-  </g>
-</svg>
diff --git a/icon-themes/colibre/cmd/sc_mailmergeexcludeentry.svg b/icon-themes/colibre/cmd/sc_mailmergeexcludeentry.svg
deleted file mode 100644
index fe2093aad069..000000000000
--- a/icon-themes/colibre/cmd/sc_mailmergeexcludeentry.svg
+++ /dev/null
@@ -1,20 +0,0 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 1 1 L 1 15 L 6.1289062 15 C 6.4669438 13.565282 7.5003681 12.402247 8.8535156 11.708984 C 8.3447729 11.100756 8 10.347865 8 9.5 C 8 7.7500665 9.3145894 6.2981765 11 6.0507812 L 11 1 L 1 1 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 1 0 C 0.446 0 0 0.446 0 1 L 0 15 C 0 15.554 0.446 16 1 16 L 5.9707031 16 L 6.0136719 15.824219 C 6.0250554 15.540072 6.0661741 15.266252 6.1289062 15 L 1 15 L 1 1 L 11 1 L 11 6.0507812 C 11.164905 6.0265754 11.328781 6 11.5 6 C 11.671219 6 11.835095 6.0265754 12 6.0507812 L 12 1 C 12 0.446 11.554 0 11 0 L 1 0 z "
-     />
-  <circle
-     style="fill:#e68497"
-     cx="11.5"
-     cy="9.5"
-     r="2.5"
-     />
-  <path
-     style="fill:#e68497"
-     d="M 11.5,12 A 4.5,4 0 0 0 7,16 h 1 a 3.5,3 0 0 1 3.5,-3 3.5,3 0 0 1 3.5,3 h 1 a 4.5,4 0 0 0 -4.5,-4 z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/sc_mailmergeprintdocuments.svg b/icon-themes/colibre/cmd/sc_mailmergeprintdocuments.svg
deleted file mode 100644
index af4c1ef6bb25..000000000000
--- a/icon-themes/colibre/cmd/sc_mailmergeprintdocuments.svg
+++ /dev/null
@@ -1,18 +0,0 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 1 1 L 1 15 L 6 15 L 6 10 C 6 9.446 6.446 9 7 9 L 8 9 L 8 8 L 11 8 L 11 1 L 1 1 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 1 0 C 0.446 0 0 0.446 0 1 L 0 15 C 0 15.554 0.446 16 1 16 L 7 16 C 6.446 16 6 15.554 6 15 L 1 15 L 1 1 L 11 1 L 11 8 L 12 8 L 12 1 C 12 0.446 11.554 0 11 0 L 1 0 z "
-     />
-  <path
-     style="fill:#ffffff"
-     d="m 8,11 h 7 v 3 H 8 Z"
-     />
-  <path
-     style="fill:#4d82b8"
-     d="m 9,9 v 1 H 8 c -0.554,0 -1,0.446 -1,1 v 3 c 0,0.554 0.446,1 1,1 h 1 v 1 h 1 3 1 v -1 h 1 c 0.554,0 1,-0.446 1,-1 v -3 c 0,-0.554 -0.446,-1 -1,-1 H 14 V 9 Z m -1,2 h 1 5 1 v 3 H 8 Z m 4.476562,1 C 12.212843,12 12,12.212843 12,12.476562 v 0.04688 C 12,12.787157 12.212843,13 12.476562,13 h 1.046876 C 13.787157,13 14,12.787157 14,12.523438 v -0.04688 C 14,12.212843 13.787157,12 13.523438,12 Z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/sc_mailmergesavedocuments.svg b/icon-themes/colibre/cmd/sc_mailmergesavedocuments.svg
deleted file mode 100644
index 24a78b936408..000000000000
--- a/icon-themes/colibre/cmd/sc_mailmergesavedocuments.svg
+++ /dev/null
@@ -1,29 +0,0 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
-  <path
-     style="fill:#ffffff"
-     d="M 1 1 L 1 15 L 7 15 L 7 8 C 7 7.446 7.446 7 8 7 L 11 7 L 11 1 L 1 1 z "
-     />
-  <path
-     style="fill:#808080"
-     d="M 1 0 C 0.446 0 0 0.446 0 1 L 0 15 C 0 15.554 0.446 16 1 16 L 7 16 L 7 15 L 1 15 L 1 1 L 11 1 L 11 7 L 12 7 L 12 1 C 12 0.446 11.554 0 11 0 L 1 0 z "
-     />
-  <rect
-     style="fill:#8959ab"
-     width="8"
-     height="8"
-     x="8"
-     y="8"
-     ry="1" />
-  <rect
-     style="fill:#ffffff"
-     y="9"
-     x="9"
-     width="6"
-     height="3"
-     rx="0.5"
-     />
-  <path
-     style="fill:#ffffff"
-     d="m 10,12.999999 c -0.554,0 -1,0.446 -1,1 v 1 c 0,0.554 0.446,1 1,1 v -2 h 1 v 2 h 2 c 0.554,0 1,-0.446 1,-1 v -1 c 0,-0.554 -0.446,-1 -1,-1 z"
-     />
-</svg>
diff --git a/icon-themes/colibre/cmd/sc_wrapideal.png b/icon-themes/colibre/cmd/sc_wrapideal.png
index 021fdb114518..9f15bd5873bd 100644
--- a/icon-themes/colibre/cmd/sc_wrapideal.png
+++ b/icon-themes/colibre/cmd/sc_wrapideal.png
diff --git a/icon-themes/colibre/sw/res/wr011.png b/icon-themes/colibre/sw/res/wr011.png
index b525f7569927..04d879672231 100644
--- a/icon-themes/colibre/sw/res/wr011.png
+++ b/icon-themes/colibre/sw/res/wr011.png
diff --git a/icon-themes/colibre/sw/res/wr06.png b/icon-themes/colibre/sw/res/wr06.png
index d80caf64ae27..04d879672231 100644
--- a/icon-themes/colibre/sw/res/wr06.png
+++ b/icon-themes/colibre/sw/res/wr06.png