tdf#120108 Wrong wrap optimal icon

Change-Id: I7ebed364ca32c6a46387c56dfa750c8ad2c31eb1
Reviewed-on: https://gerrit.libreoffice.org/65902
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>

51 files changed, 214 insertions, 284 deletions

diff --git a/icon-themes/breeze/cmd/32/wrapideal.png b/icon-themes/breeze/cmd/32/wrapideal.png
index 66bc2d84a65d..838ea1418ea3 100644
--- a/icon-themes/breeze/cmd/32/wrapideal.png
+++ b/icon-themes/breeze/cmd/32/wrapideal.png
diff --git a/icon-themes/breeze/cmd/lc_contourdialog.png b/icon-themes/breeze/cmd/lc_contourdialog.png
new file mode 100644
index 000000000000..5c12d06e639a
--- /dev/null
+++ b/icon-themes/breeze/cmd/lc_contourdialog.png
diff --git a/icon-themes/breeze/cmd/lc_wrapideal.png b/icon-themes/breeze/cmd/lc_wrapideal.png
index 53abe7851f5f..67ee03e3f813 100644
--- a/icon-themes/breeze/cmd/lc_wrapideal.png
+++ b/icon-themes/breeze/cmd/lc_wrapideal.png
diff --git a/icon-themes/breeze/cmd/lc_wrapthrough.png b/icon-themes/breeze/cmd/lc_wrapthrough.png
index 729ef11a4ce7..dae71a070564 100644
--- a/icon-themes/breeze/cmd/lc_wrapthrough.png
+++ b/icon-themes/breeze/cmd/lc_wrapthrough.png
diff --git a/icon-themes/breeze/cmd/sc_contourdialog.png b/icon-themes/breeze/cmd/sc_contourdialog.png
new file mode 100644
index 000000000000..062ac6c2b9e8
--- /dev/null
+++ b/icon-themes/breeze/cmd/sc_contourdialog.png
diff --git a/icon-themes/breeze/cmd/sc_wrapideal.png b/icon-themes/breeze/cmd/sc_wrapideal.png
index 8976376f98d1..4d6adec7a4cb 100644
--- a/icon-themes/breeze/cmd/sc_wrapideal.png
+++ b/icon-themes/breeze/cmd/sc_wrapideal.png
diff --git a/icon-themes/breeze/cmd/sc_wrapthrough.png b/icon-themes/breeze/cmd/sc_wrapthrough.png
index 3ff18c183e5f..36d24163c9d9 100644
--- a/icon-themes/breeze/cmd/sc_wrapthrough.png
+++ b/icon-themes/breeze/cmd/sc_wrapthrough.png
diff --git a/icon-themes/breeze/sw/res/wr011.png b/icon-themes/breeze/sw/res/wr011.png
index 6a3ec0ce44e4..9a6722ec0a5a 100644
--- a/icon-themes/breeze/sw/res/wr011.png
+++ b/icon-themes/breeze/sw/res/wr011.png
diff --git a/icon-themes/breeze/sw/res/wr06.png b/icon-themes/breeze/sw/res/wr06.png
index 0585d510f47a..9a6722ec0a5a 100644
--- a/icon-themes/breeze/sw/res/wr06.png
+++ b/icon-themes/breeze/sw/res/wr06.png
diff --git a/icon-themes/breeze_dark/cmd/32/wrapideal.png b/icon-themes/breeze_dark/cmd/32/wrapideal.png
index 6dda338e5520..06c3766a2ba6 100644
--- a/icon-themes/breeze_dark/cmd/32/wrapideal.png
+++ b/icon-themes/breeze_dark/cmd/32/wrapideal.png
diff --git a/icon-themes/breeze_dark/cmd/lc_contourdialog.png b/icon-themes/breeze_dark/cmd/lc_contourdialog.png
new file mode 100644
index 000000000000..cf61014047c0
--- /dev/null
+++ b/icon-themes/breeze_dark/cmd/lc_contourdialog.png
diff --git a/icon-themes/breeze_dark/cmd/lc_wrapideal.png b/icon-themes/breeze_dark/cmd/lc_wrapideal.png
index 2d2118fd365e..9726bf08b565 100644
--- a/icon-themes/breeze_dark/cmd/lc_wrapideal.png
+++ b/icon-themes/breeze_dark/cmd/lc_wrapideal.png
diff --git a/icon-themes/breeze_dark/cmd/lc_wrapthrough.png b/icon-themes/breeze_dark/cmd/lc_wrapthrough.png
index 51f04738536c..0926a875c298 100644
--- a/icon-themes/breeze_dark/cmd/lc_wrapthrough.png
+++ b/icon-themes/breeze_dark/cmd/lc_wrapthrough.png
diff --git a/icon-themes/breeze_dark/cmd/sc_contourdialog.png b/icon-themes/breeze_dark/cmd/sc_contourdialog.png
new file mode 100644
index 000000000000..e9a3d6eb7dfb
--- /dev/null
+++ b/icon-themes/breeze_dark/cmd/sc_contourdialog.png
diff --git a/icon-themes/breeze_dark/cmd/sc_wrapideal.png b/icon-themes/breeze_dark/cmd/sc_wrapideal.png
index ed67984ca92f..5887fb2a07ae 100644
--- a/icon-themes/breeze_dark/cmd/sc_wrapideal.png
+++ b/icon-themes/breeze_dark/cmd/sc_wrapideal.png
diff --git a/icon-themes/breeze_dark/cmd/sc_wrapthrough.png b/icon-themes/breeze_dark/cmd/sc_wrapthrough.png
index f0ad88c36266..08b798fe4e98 100644
--- a/icon-themes/breeze_dark/cmd/sc_wrapthrough.png
+++ b/icon-themes/breeze_dark/cmd/sc_wrapthrough.png
diff --git a/icon-themes/breeze_dark/sw/res/wr011.png b/icon-themes/breeze_dark/sw/res/wr011.png
index 82c306a5063b..5f62f14dbacf 100644
--- a/icon-themes/breeze_dark/sw/res/wr011.png
+++ b/icon-themes/breeze_dark/sw/res/wr011.png
diff --git a/icon-themes/breeze_dark/sw/res/wr06.png b/icon-themes/breeze_dark/sw/res/wr06.png
index 682c39bbb5e1..5f62f14dbacf 100644
--- a/icon-themes/breeze_dark/sw/res/wr06.png
+++ b/icon-themes/breeze_dark/sw/res/wr06.png
diff --git a/icon-themes/breeze_svg/cmd/32/wrapideal.svg b/icon-themes/breeze_svg/cmd/32/wrapideal.svg
index 9833909d93bb..90c6f77b9216 100644
--- a/icon-themes/breeze_svg/cmd/32/wrapideal.svg
+++ b/icon-themes/breeze_svg/cmd/32/wrapideal.svg
@@ -1,10 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 32 32">
- <path 
-     style="fill:#4d4d4d" 
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#f47750"
+     d="M 8 8 L 8 24 L 24 24 L 24 8 L 8 8 z M 9 9 L 23 9 L 23 23 L 9 23 L 9 9 z "
+     />
+  <path
+     style="fill:#4d4d4d"
      d="M 4 5 L 4 6 L 28 6 L 28 5 L 4 5 z M 4 9 L 4 10 L 7 10 L 7 9 L 4 9 z M 25 9 L 25 10 L 28 10 L 28 9 L 25 9 z M 4 13 L 4 14 L 7 14 L 7 13 L 4 13 z M 25 13 L 25 14 L 28 14 L 28 13 L 25 13 z M 4 18 L 4 19 L 7 19 L 7 18 L 4 18 z M 25 18 L 25 19 L 28 19 L 28 18 L 25 18 z M 4 22 L 4 23 L 7 23 L 7 22 L 4 22 z M 25 22 L 25 23 L 28 23 L 28 22 L 25 22 z M 4 26 L 4 27 L 28 27 L 28 26 L 4 26 z "
      />
- <path 
-     style="fill:#2ecc71" 
+  <path
+     style="fill:#1d99f3"
      d="M 9 9 L 9 23 L 23 23 L 23 9 L 9 9 z "
      />
 </svg>
diff --git a/icon-themes/breeze_svg/cmd/lc_contourdialog.svg b/icon-themes/breeze_svg/cmd/lc_contourdialog.svg
new file mode 100644
index 000000000000..9ef988195bee
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/lc_contourdialog.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#4d4d4d"
+     d="M 4,4 V 5 H 20 V 4 Z m 12,3 v 1 h 4 V 7 Z m 0,3 v 1 h 4 v -1 z m 0,3 v 1 h 4 v -1 z m 0,3 v 1 h 4 V 16 Z M 4,19 v 1 h 5 v -1 z"
+     />
+  <path
+     style="fill:#1d99f3"
+     d="M 4 7 L 4 17 L 14 17 L 14 7 L 4 7 z "
+     />
+  <path
+     style="fill:#f47750"
+     d="m 11,18 c -0.5523,0 -1,0.4477 -1,1 0,0.5523 0.4477,1 1,1 0.5523,0 1,-0.4477 1,-1 0,-0.5523 -0.4477,-1 -1,-1 z m 4,0 c -0.5523,0 -1,0.4477 -1,1 0,0.5523 0.4477,1 1,1 0.5523,0 1,-0.4477 1,-1 0,-0.5523 -0.4477,-1 -1,-1 z m 4,0 c -0.5523,0 -1,0.4477 -1,1 0,0.5523 0.4477,1 1,1 0.5523,0 1,-0.4477 1,-1 0,-0.5523 -0.4477,-1 -1,-1 z"
+     />
+</svg>
diff --git a/icon-themes/breeze_svg/cmd/lc_wrapideal.svg b/icon-themes/breeze_svg/cmd/lc_wrapideal.svg
index f3afb51307ba..4d6ffa80466a 100644
--- a/icon-themes/breeze_svg/cmd/lc_wrapideal.svg
+++ b/icon-themes/breeze_svg/cmd/lc_wrapideal.svg
@@ -1,10 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
- <path 
-     style="fill:#27ae60" 
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#f47750"
+     d="M 6 6 L 6 18 L 18 18 L 18 6 L 6 6 z M 7 7 L 17 7 L 17 17 L 7 17 L 7 7 z "
+     />
+  <path
+     style="fill:#4d82b8"
      d="M 7 7 L 7 17 L 17 17 L 17 7 L 7 7 z "
      />
- <path 
-     style="fill:#4d4d4d" 
+  <path
+     style="fill:#4d4d4d"
      d="M 4 4 L 4 5 L 20 5 L 20 4 L 4 4 z M 4 7 L 4 8 L 6 8 L 6 7 L 4 7 z M 18 7 L 18 8 L 20 8 L 20 7 L 18 7 z M 4 10 L 4 11 L 6 11 L 6 10 L 4 10 z M 18 10 L 18 11 L 20 11 L 20 10 L 18 10 z M 4 13 L 4 14 L 6 14 L 6 13 L 4 13 z M 18 13 L 18 14 L 20 14 L 20 13 L 18 13 z M 4 16 L 4 17 L 6 17 L 6 16 L 4 16 z M 18 16 L 18 17 L 20 17 L 20 16 L 18 16 z M 4 19 L 4 20 L 20 20 L 20 19 L 4 19 z "
      />
- </svg>
+</svg>
diff --git a/icon-themes/breeze_svg/cmd/sc_contourdialog.svg b/icon-themes/breeze_svg/cmd/sc_contourdialog.svg
new file mode 100644
index 000000000000..e00adcad313f
--- /dev/null
+++ b/icon-themes/breeze_svg/cmd/sc_contourdialog.svg
@@ -0,0 +1,14 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#4d4d4d"
+     d="M 2,2 V 3 H 14 V 2 Z m 9,3 v 1 h 2 1 V 5 h -1 z m 0,2.5 v 1 h 2 1 v -1 h -1 z m 0,2.5 v 1 h 2 1 v -1 h -1 z m -9,3 v 1 h 3 v -1 z"
+     />
+  <path
+     style="fill:#1d99f3"
+     d="m 2,4 v 7 h 8 V 4 Z"
+     />
+  <path
+     style="fill:#f47750"
+     d="m 7,12 c -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 z m 3,0 c -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 z m 3,0 c -0.55228,0 -1,0.44772 -1,1 0,0.55228 0.44772,1 1,1 0.55228,0 1,-0.44772 1,-1 0,-0.55228 -0.44772,-1 -1,-1 z"
+     />
+</svg>
diff --git a/icon-themes/breeze_svg/cmd/sc_wrapideal.svg b/icon-themes/breeze_svg/cmd/sc_wrapideal.svg
index e3b037171222..79fecb2acf52 100644
--- a/icon-themes/breeze_svg/cmd/sc_wrapideal.svg
+++ b/icon-themes/breeze_svg/cmd/sc_wrapideal.svg
@@ -1,10 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
- <path 
-     style="fill:#27ae60" 
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#f47750"
+     d="M 3 3 L 3 13 L 13 13 L 13 3 L 3 3 z M 4 4 L 12 4 L 12 12 L 4 12 L 4 4 z "
+     />
+  <path
+     style="fill:#4d82b8"
      d="M 4 4 L 4 12 L 12 12 L 12 4 L 4 4 z "
      />
- <path 
-     style="fill:#4d4d4d" 
+  <path
+     style="fill:#4d4d4d"
      d="M 2 2 L 2 3 L 14 3 L 14 2 L 2 2 z M 2 5 L 2 6 L 3 6 L 3 5 L 2 5 z M 13 5 L 13 6 L 14 6 L 14 5 L 13 5 z M 2 7.5 L 2 8.5 L 3 8.5 L 3 7.5 L 2 7.5 z M 13 7.5 L 13 8.5 L 14 8.5 L 14 7.5 L 13 7.5 z M 2 10 L 2 11 L 3 11 L 3 10 L 2 10 z M 13 10 L 13 11 L 14 11 L 14 10 L 13 10 z M 2 13 L 2 14 L 14 14 L 14 13 L 2 13 z "
      />
- </svg>
+</svg>
diff --git a/icon-themes/breeze_svg/cmd/sc_wrapthrough.svg b/icon-themes/breeze_svg/cmd/sc_wrapthrough.svg
index 5c1318055b8c..eca64515991b 100644
--- a/icon-themes/breeze_svg/cmd/sc_wrapthrough.svg
+++ b/icon-themes/breeze_svg/cmd/sc_wrapthrough.svg
@@ -1,10 +1,10 @@
 <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
- <path 
-     style="fill:#4d4d4d" 
-     d="M 2 2 L 2 3 L 14 3 L 14 2 L 2 2 z M 2 5 L 2 6 L 3 6 L 13 6 L 14 6 L 14 5 L 13 5 L 3 5 L 2 5 z M 2 7.5 L 2 8.5 L 3 8.5 L 13 8.5 L 14 8.5 L 14 7.5 L 13 7.5 L 3 7.5 L 2 7.5 z M 2 10 L 2 11 L 3 11 L 13 11 L 14 11 L 14 10 L 13 10 L 3 10 L 2 10 z M 2 13 L 2 14 L 14 14 L 14 13 L 2 13 z "
-     />
- <path 
-     style="fill:#1d99f3" 
+ <path
+     style="fill:#1d99f3"
      d="M 4 4 L 4 12 L 12 12 L 12 4 L 4 4 z "
      />
+ <path
+     style="fill:#4d4d4d"
+     d="M 2 2 L 2 3 L 14 3 L 14 2 L 2 2 z M 2 5 L 2 6 L 3 6 L 13 6 L 14 6 L 14 5 L 13 5 L 3 5 L 2 5 z M 2 7.5 L 2 8.5 L 3 8.5 L 13 8.5 L 14 8.5 L 14 7.5 L 13 7.5 L 3 7.5 L 2 7.5 z M 2 10 L 2 11 L 3 11 L 13 11 L 14 11 L 14 10 L 13 10 L 3 10 L 2 10 z M 2 13 L 2 14 L 14 14 L 14 13 L 2 13 z "
+     />
  </svg>
diff --git a/icon-themes/breeze_svg/sw/res/wr011.svg b/icon-themes/breeze_svg/sw/res/wr011.svg
index 4878db4b07c8..dab64bbdbcfe 100644
--- a/icon-themes/breeze_svg/sw/res/wr011.svg
+++ b/icon-themes/breeze_svg/sw/res/wr011.svg
@@ -1,10 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16">
- <path 
-     style="fill:#1d99f3" 
-     d="M 6 4 L 2 8 L 6 12 L 10 8 L 6 4 z "
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#f47750"
+     d="M 8,7 V 23 H 24 V 7 Z M 9,8 H 23 V 22 H 9 Z"
      />
- <path 
-     style="fill:#4d4d4d" 
-     d="M 2 2 L 2 3 L 14 3 L 14 2 L 2 2 z M 10 5 L 10 6 L 14 6 L 14 5 L 10 5 z M 12 7.5 L 12 8.5 L 14 8.5 L 14 7.5 L 12 7.5 z M 10 10 L 10 11 L 14 11 L 14 10 L 10 10 z M 2 13 L 2 14 L 14 14 L 14 13 L 2 13 z "
+  <path
+     style="fill:#4d4d4d"
+     d="M 4,4 V 5 H 28 V 4 Z M 4,8 V 9 H 7 V 8 Z m 21,0 v 1 h 3 V 8 Z M 4,12 v 1 h 3 v -1 z m 21,0 v 1 h 3 V 12 Z M 4,17 v 1 h 3 v -1 z m 21,0 v 1 h 3 V 17 Z M 4,21 v 1 h 3 v -1 z m 21,0 v 1 h 3 V 21 Z M 4,25 v 1 h 24 v -1 z"
+     />
+  <path
+     style="fill:#1d99f3"
+     d="M 9,8 V 22 H 23 V 8 Z"
      />
 </svg>
diff --git a/icon-themes/breeze_svg/sw/res/wr06.svg b/icon-themes/breeze_svg/sw/res/wr06.svg
index 35b3d3c0cb98..dab64bbdbcfe 100644
--- a/icon-themes/breeze_svg/sw/res/wr06.svg
+++ b/icon-themes/breeze_svg/sw/res/wr06.svg
@@ -1,10 +1,14 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 31 31">
- <path 
-     style="fill:#2ecc71" 
-     d="M 8 8 L 8 23 L 23 23 L 23 8 L 8 8 z "
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#f47750"
+     d="M 8,7 V 23 H 24 V 7 Z M 9,8 H 23 V 22 H 9 Z"
      />
- <path 
-     style="fill:#4d4d4d" 
-     d="M 4 4 L 4 5 L 27 5 L 27 4 L 4 4 z M 4 8 L 4 9 L 27 9 L 27 8 L 4 8 z M 4 12 L 4 13 L 27 13 L 27 12 L 4 12 z M 4 18 L 4 19 L 27 19 L 27 18 L 4 18 z M 4 22 L 4 23 L 27 23 L 27 22 L 4 22 z M 4 26 L 4 27 L 27 27 L 27 26 L 4 26 z "
+  <path
+     style="fill:#4d4d4d"
+     d="M 4,4 V 5 H 28 V 4 Z M 4,8 V 9 H 7 V 8 Z m 21,0 v 1 h 3 V 8 Z M 4,12 v 1 h 3 v -1 z m 21,0 v 1 h 3 V 12 Z M 4,17 v 1 h 3 v -1 z m 21,0 v 1 h 3 V 17 Z M 4,21 v 1 h 3 v -1 z m 21,0 v 1 h 3 V 21 Z M 4,25 v 1 h 24 v -1 z"
+     />
+  <path
+     style="fill:#1d99f3"
+     d="M 9,8 V 22 H 23 V 8 Z"
      />
 </svg>
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
diff --git a/icon-themes/colibre_svg/cmd/32/wrapideal.svg b/icon-themes/colibre_svg/cmd/32/wrapideal.svg
index 0bc7b2ad8e1e..d5cfed03b49b 100644
--- a/icon-themes/colibre_svg/cmd/32/wrapideal.svg
+++ b/icon-themes/colibre_svg/cmd/32/wrapideal.svg
@@ -1 +1,15 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m5 2c-.554 0-1 .446-1 1v26c0 .554.446 1 1 1h22c .554 0 1-.446 1-1v-26c0-.554-.446-1-1-1zm0 1h22v26h-22z" fill="#808080"/><path d="m5 3v26h22v-26z" fill="#fff"/><rect fill="#808080" height="1" ry=".446068" width="20" x="6" y="7"/><rect fill="#76a797" height="9" ry="1" width="10" x="11" y="12"/><g fill="#808080"><rect height="1" ry=".446068" width="20" x="6" y="10"/><rect height="1" ry=".446068" width="20" x="6" y="25"/><rect height="1" ry=".410114" width="4" x="6" y="19"/><rect height="1" ry=".446068" width="4" x="6" y="16"/><rect height="1" ry=".446068" width="4" x="6" y="13"/><rect height="1" ry=".410114" width="4" x="22" y="19"/><rect height="1" ry=".446068" width="4" x="22" y="16"/><rect height="1" ry=".446068" width="4" x="22" y="13"/><rect height="1" ry=".29661" width="20" x="6" y="22"/></g></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path
+     d="M 5 3 L 5 29 L 27 29 L 27 3 L 5 3 z "
+     style="fill:#ffffff" />
+  <path
+     style="fill:#eac282"
+     d="M 12 11 C 10.892 11 10 11.892 10 13 L 10 20 C 10 21.108 10.892 22 12 22 L 20 22 C 21.108 22 22 21.108 22 20 L 22 13 C 22 11.892 21.108 11 20 11 L 12 11 z M 12 12 L 20 12 C 20.554 12 21 12.446 21 13 L 21 20 C 21 20.554 20.554 21 20 21 L 12 21 C 11.446 21 11 20.554 11 20 L 11 13 C 11 12.446 11.446 12 12 12 z "
+     />
+  <path
+     d="M 12 12 C 11.446 12 11 12.446 11 13 L 11 20 C 11 20.554 11.446 21 12 21 L 20 21 C 20.554 21 21 20.554 21 20 L 21 13 C 21 12.446 20.554 12 20 12 L 12 12 z "
+     style="fill:#4d82b8" />
+  <path
+     d="M 5 2 C 4.446 2 4 2.446 4 3 L 4 29 C 4 29.554 4.446 30 5 30 L 27 30 C 27.554 30 28 29.554 28 29 L 28 3 C 28 2.446 27.554 2 27 2 L 5 2 z M 5 3 L 27 3 L 27 29 L 5 29 L 5 3 z M 6.4453125 7 C 6.1981908 7 6 7.1981908 6 7.4453125 L 6 7.5546875 C 6 7.8018092 6.1981908 8 6.4453125 8 L 25.554688 8 C 25.801809 8 26 7.8018092 26 7.5546875 L 26 7.4453125 C 26 7.1981908 25.801809 7 25.554688 7 L 6.4453125 7 z M 6.4453125 10 C 6.1981908 10 6 10.198191 6 10.445312 L 6 10.554688 C 6 10.801809 6.1981908 11 6.4453125 11 L 25.554688 11 C 25.801809 11 26 10.801809 26 10.554688 L 26 10.445312 C 26 10.198191 25.801809 10 25.554688 10 L 6.4453125 10 z M 6.4453125 13 C 6.1981908 13 6 13.198191 6 13.445312 L 6 13.554688 C 6 13.801809 6.1981908 14 6.4453125 14 L 9.5546875 14 C 9.8018092 14 10 13.801809 10 13.554688 L 10 13.445312 C 10 13.198191 9.8018092 13 9.5546875 13 L 6.4453125 13 z M 22.445312 13 C 22.198191 13 22 13.198191 22 13.445312 L 22 13.554688 C 22 13.801809 22.198191 14 22.445312 14 L 25.554688 14 C 25.801809 14 26 13.801809 26 13.554688 L 26 13.445312 C 26 13.198191 25.801809 13 25.554688 13 L 22.445312 13 z M 6.4453125 16 C 6.1981908 16 6 16.198191 6 16.445312 L 6 16.554688 C 6 16.801809 6.1981908 17 6.4453125 17 L 9.5546875 17 C 9.8018092 17 10 16.801809 10 16.554688 L 10 16.445312 C 10 16.198191 9.8018092 16 9.5546875 16 L 6.4453125 16 z M 22.445312 16 C 22.198191 16 22 16.198191 22 16.445312 L 22 16.554688 C 22 16.801809 22.198191 17 22.445312 17 L 25.554688 17 C 25.801809 17 26 16.801809 26 16.554688 L 26 16.445312 C 26 16.198191 25.801809 16 25.554688 16 L 22.445312 16 z M 6.4101562 19 C 6.1829531 19 6 19.182953 6 19.410156 L 6 19.589844 C 6 19.817047 6.1829531 20 6.4101562 20 L 9.5898438 20 C 9.8170469 20 10 19.817047 10 19.589844 L 10 19.410156 C 10 19.182953 9.8170469 19 9.5898438 19 L 6.4101562 19 z M 22.410156 19 C 22.182953 19 22 19.182953 22 19.410156 L 22 19.589844 C 22 19.817047 22.182953 20 22.410156 20 L 25.589844 20 C 25.817047 20 26 19.817047 26 19.589844 L 26 19.410156 C 26 19.182953 25.817047 19 25.589844 19 L 22.410156 19 z M 6.296875 22 C 6.1325531 22 6 22.132553 6 22.296875 L 6 22.703125 C 6 22.867447 6.1325531 23 6.296875 23 L 25.703125 23 C 25.867447 23 26 22.867447 26 22.703125 L 26 22.296875 C 26 22.132553 25.867447 22 25.703125 22 L 6.296875 22 z M 6.4453125 25 C 6.1981908 25 6 25.198191 6 25.445312 L 6 25.554688 C 6 25.801809 6.1981908 26 6.4453125 26 L 25.554688 26 C 25.801809 26 26 25.801809 26 25.554688 L 26 25.445312 C 26 25.198191 25.801809 25 25.554688 25 L 6.4453125 25 z "
+     style="fill:#808080" />
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_contourdialog.svg b/icon-themes/colibre_svg/cmd/lc_contourdialog.svg
new file mode 100644
index 000000000000..0c9463454168
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/lc_contourdialog.svg
@@ -0,0 +1,19 @@
+<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#808080"
+     d="M 9 3 L 9 4 L 21.554688 4 C 21.801809 4 22 3.8018092 22 3.5546875 L 22 3.4453125 C 22 3.1981908 21.801809 3 21.554688 3 L 9 3 z M 9 6 L 9 7 L 21.554688 7 C 21.801809 7 22 6.8018092 22 6.5546875 L 22 6.4453125 C 22 6.1981908 21.801809 6 21.554688 6 L 9 6 z M 2.4199219 9 C 2.1877389 9 2 9.1877394 2 9.4199219 L 2 9.5800781 C 2 9.8122606 2.1877389 10 2.4199219 10 L 9.5800781 10 C 9.8122611 10 10 9.8122606 10 9.5800781 L 10 9.4199219 C 10 9.1877394 9.8122611 9 9.5800781 9 L 8 9 L 2.4199219 9 z M 2.4453125 12 C 2.1981915 12 2 12.198192 2 12.445312 L 2 12.554688 C 2 12.801808 2.1981915 13 2.4453125 13 L 9.5546875 13 C 9.8018085 13 10 12.801809 10 12.554688 L 10 12.445312 C 10 12.198192 9.8018085 12 9.5546875 12 L 2.4453125 12 z M 2.4101562 15 C 2.1829533 15 2 15.182953 2 15.410156 L 2 15.589844 C 2 15.817047 2.1829532 16 2.4101562 16 L 9.5898438 16 C 9.8170468 16 10 15.817047 10 15.589844 L 10 15.410156 C 10 15.182953 9.8170428 15 9.5898438 15 L 2.4101562 15 z M 2.4101562 18 C 2.1829533 18 2 18.182953 2 18.410156 L 2 18.589844 C 2 18.817047 2.1829532 19 2.4101562 19 L 21.589844 19 C 21.817047 19 22 18.817047 22 18.589844 L 22 18.410156 C 22 18.182953 21.817047 18 21.589844 18 L 2.4101562 18 z M 2.4453125 21 C 2.1981915 21 2 21.198192 2 21.445312 L 2 21.554688 C 2 21.801808 2.1981915 22 2.4453125 22 L 21.554688 22 C 21.801809 22 22 21.801808 22 21.554688 L 22 21.445312 C 22 21.198192 21.801813 21 21.554688 21 L 2.4453125 21 z "
+     id="rect2" />
+  <rect
+     style="fill:#4d82b8"
+     height="9"
+     ry="1"
+     width="10"
+     x="-22"
+     y="8"
+     id="rect4"
+     transform="scale(-1,1)" />
+  <path
+     style="fill:#eac282"
+     d="M 1.5 1 C 1.223 1 1 1.223 1 1.5 L 1 6.5 C 1 6.777 1.223 7 1.5 7 C 1.777 7 2 6.777 2 6.5 L 2 2 L 6.5 2 C 6.777 2 7 1.777 7 1.5 C 7 1.223 6.777 1 6.5 1 L 1.5 1 z M 7.484375 2 C 7.357211 2.00407 7.2363784 2.05645 7.1464844 2.1464844 L 2.1464844 7.1464844 C 1.8317216 7.4614847 2.0546902 7.9998123 2.5 8 L 7.5 8 C 7.7761296 7.9999691 7.9999691 7.7761296 8 7.5 L 8 2.5 C 8.0001053 2.2176526 7.7665856 1.9912092 7.484375 2 z "
+     id="rect12-6" />
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_wrapideal.svg b/icon-themes/colibre_svg/cmd/lc_wrapideal.svg
index 3b8ee8812995..86c657c9982b 100644
--- a/icon-themes/colibre_svg/cmd/lc_wrapideal.svg
+++ b/icon-themes/colibre_svg/cmd/lc_wrapideal.svg
@@ -1 +1,17 @@
-<svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg"><rect fill="#808080" height="1" ry=".446068" width="20" x="2" y="3"/><rect fill="#76a797" height="9" ry="1" width="10" x="7" y="8"/><g fill="#808080"><rect height="1" ry=".446068" width="20" x="2" y="6"/><rect height="1" ry=".446068" width="20" x="2" y="21"/><rect height="1" ry=".410114" width="4" x="2" y="15"/><rect height="1" ry=".446068" width="4" x="2" y="12"/><rect height="1" ry=".446068" width="4" x="2" y="9"/><rect height="1" ry=".410114" width="4" x="18" y="15"/><rect height="1" ry=".446068" width="4" x="18" y="12"/><rect height="1" ry=".446068" width="4" x="18" y="9"/><rect height="1" ry=".29661" width="20" x="2" y="18"/></g></svg>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8" standalone="no"?><svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#eac282"
+     d="M 8 7 C 6.892 7 6 7.892 6 9 L 6 16 C 6 17.108 6.892 18 8 18 L 16 18 C 17.108 18 18 17.108 18 16 L 18 9 C 18 7.892 17.108 7 16 7 L 8 7 z M 8 8 L 16 8 C 16.554 8 17 8.446 17 9 L 17 16 C 17 16.554 16.554 17 16 17 L 8 17 C 7.446 17 7 16.554 7 16 L 7 9 C 7 8.446 7.446 8 8 8 z "
+     />
+  <path
+     d="M 2.4453125 3 C 2.1981908 3 2 3.1981908 2 3.4453125 L 2 3.5546875 C 2 3.8018092 2.1981908 4 2.4453125 4 L 21.554688 4 C 21.801809 4 22 3.8018092 22 3.5546875 L 22 3.4453125 C 22 3.1981908 21.801809 3 21.554688 3 L 2.4453125 3 z M 2.4453125 6 C 2.1981908 6 2 6.1981908 2 6.4453125 L 2 6.5546875 C 2 6.8018092 2.1981908 7 2.4453125 7 L 21.554688 7 C 21.801809 7 22 6.8018092 22 6.5546875 L 22 6.4453125 C 22 6.1981908 21.801809 6 21.554688 6 L 2.4453125 6 z M 2.4453125 9 C 2.1981908 9 2 9.1981908 2 9.4453125 L 2 9.5546875 C 2 9.8018092 2.1981908 10 2.4453125 10 L 5.5546875 10 C 5.8018092 10 6 9.8018092 6 9.5546875 L 6 9.4453125 C 6 9.1981908 5.8018092 9 5.5546875 9 L 2.4453125 9 z M 18.445312 9 C 18.198191 9 18 9.1981908 18 9.4453125 L 18 9.5546875 C 18 9.8018092 18.198191 10 18.445312 10 L 21.554688 10 C 21.801809 10 22 9.8018092 22 9.5546875 L 22 9.4453125 C 22 9.1981908 21.801809 9 21.554688 9 L 18.445312 9 z M 2.4453125 12 C 2.1981908 12 2 12.198191 2 12.445312 L 2 12.554688 C 2 12.801809 2.1981908 13 2.4453125 13 L 5.5546875 13 C 5.8018092 13 6 12.801809 6 12.554688 L 6 12.445312 C 6 12.198191 5.8018092 12 5.5546875 12 L 2.4453125 12 z M 18.445312 12 C 18.198191 12 18 12.198191 18 12.445312 L 18 12.554688 C 18 12.801809 18.198191 13 18.445312 13 L 21.554688 13 C 21.801809 13 22 12.801809 22 12.554688 L 22 12.445312 C 22 12.198191 21.801809 12 21.554688 12 L 18.445312 12 z M 2.4101562 15 C 2.1829531 15 2 15.182953 2 15.410156 L 2 15.589844 C 2 15.817047 2.1829531 16 2.4101562 16 L 5.5898438 16 C 5.8170469 16 6 15.817047 6 15.589844 L 6 15.410156 C 6 15.182953 5.8170469 15 5.5898438 15 L 2.4101562 15 z M 18.410156 15 C 18.182953 15 18 15.182953 18 15.410156 L 18 15.589844 C 18 15.817047 18.182953 16 18.410156 16 L 21.589844 16 C 21.817047 16 22 15.817047 22 15.589844 L 22 15.410156 C 22 15.182953 21.817047 15 21.589844 15 L 18.410156 15 z M 2.296875 18 C 2.1325531 18 2 18.132553 2 18.296875 L 2 18.703125 C 2 18.867447 2.1325531 19 2.296875 19 L 21.703125 19 C 21.867447 19 22 18.867447 22 18.703125 L 22 18.296875 C 22 18.132553 21.867447 18 21.703125 18 L 2.296875 18 z M 2.4453125 21 C 2.1981908 21 2 21.198191 2 21.445312 L 2 21.554688 C 2 21.801809 2.1981908 22 2.4453125 22 L 21.554688 22 C 21.801809 22 22 21.801809 22 21.554688 L 22 21.445312 C 22 21.198191 21.801809 21 21.554688 21 L 2.4453125 21 z "
+     style="fill:#808080" />
+  <rect
+     fill="#76a797"
+     height="9"
+     ry="1"
+     width="10"
+     x="7"
+     y="8"
+     style="fill:#4d82b8" />
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/sc_contourdialog.svg b/icon-themes/colibre_svg/cmd/sc_contourdialog.svg
new file mode 100644
index 000000000000..1fa08b97aeb8
--- /dev/null
+++ b/icon-themes/colibre_svg/cmd/sc_contourdialog.svg
@@ -0,0 +1,36 @@
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#808080"
+     d="M 6 1 L 6 2 L 14.5 2 C 14.777 2 15 1.777 15 1.5 C 15 1.223 14.777 1 14.5 1 L 6 1 z M 1.5 7 C 1.223 7 1 7.223 1 7.5 C 1 7.777 1.223 8 1.5 8 L 5.5 8 C 5.777 8 6 7.777 6 7.5 C 6 7.223 5.777 7 5.5 7 L 1.5 7 z M 1.5 10 C 1.223 10 1 10.223 1 10.5 C 1 10.777 1.223 11 1.5 11 L 5.5 11 C 5.777 11 6 10.777 6 10.5 C 6 10.223 5.777 10 5.5 10 L 1.5 10 z M 1.5 14 C 1.223 14 1 14.223 1 14.5 C 1 14.777 1.223 15 1.5 15 L 14.5 15 C 14.777 15 15 14.777 15 14.5 C 15 14.223 14.777 14 14.5 14 L 1.5 14 z "
+     id="rect2" />
+  <g
+     style="fill:#eac282"
+     >
+    <path
+       style="fill-rule:evenodd;stroke:#eac282;stroke-linecap:round;stroke-linejoin:round"
+       d="m 0.4999293,4.5000003 4,-3.99999998 V 4.5000003 Z"
+       />
+    <rect
+       y="0"
+       x="0"
+       height="1"
+       ry="0.5"
+       width="3"
+       id="rect10-3" />
+    <rect
+       y="0"
+       x="0"
+       height="3"
+       rx="0.5"
+       width="1"
+       id="rect12" />
+  </g>
+  <rect
+     style="fill:#4d82b8"
+     height="10"
+     ry="1"
+     width="8"
+     x="7"
+     y="3"
+     id="rect14" />
+</svg>
diff --git a/icon-themes/colibre_svg/cmd/sc_wrapideal.svg b/icon-themes/colibre_svg/cmd/sc_wrapideal.svg
index 2c5778334920..a06e33cb3a8d 100644
--- a/icon-themes/colibre_svg/cmd/sc_wrapideal.svg
+++ b/icon-themes/colibre_svg/cmd/sc_wrapideal.svg
@@ -1 +1,14 @@
-<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><g fill="#808080"><rect height="1" ry=".5" width="14" x="1" y="1"/><rect height="1" ry=".47603" width="3" x="1" y="10"/><rect height="1" ry=".5" width="14" x="1" y="14"/><rect height="1" ry=".464045" width="3" x="1" y="4"/><rect height="1" ry=".344197" width="3" x="1" y="7"/></g><rect fill="#76a797" height="10" ry="1" width="6" x="5" y="3"/><rect fill="#808080" height="1" ry=".47603" width="3" x="12" y="10"/><rect fill="#808080" height="1" ry=".464045" width="3" x="12" y="4"/><rect fill="#808080" height="1" ry=".344197" width="3" x="12" y="7"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#eac282"
+     d="M 6 2 C 4.892 2 4 2.892 4 4 L 4 12 C 4 13.108 4.892 14 6 14 L 10 14 C 11.108 14 12 13.108 12 12 L 12 4 C 12 2.892 11.108 2 10 2 L 6 2 z M 6 3 L 10 3 C 10.554 3 11 3.446 11 4 L 11 12 C 11 12.554 10.554 13 10 13 L 6 13 C 5.446 13 5 12.554 5 12 L 5 4 C 5 3.446 5.446 3 6 3 z "
+     />
+  <path
+     style="fill:#808080"
+     d="M 1.5 1 C 1.223 1 1 1.223 1 1.5 C 1 1.777 1.223 2 1.5 2 L 14.5 2 C 14.777 2 15 1.777 15 1.5 C 15 1.223 14.777 1 14.5 1 L 1.5 1 z M 1.4648438 4 C 1.2077628 4 1 4.2077628 1 4.4648438 L 1 4.5351562 C 1 4.7922372 1.2077627 5 1.4648438 5 L 3.5351562 5 C 3.7922373 5 4 4.7922372 4 4.5351562 L 4 4.4648438 C 4 4.2077628 3.7922373 4 3.5351562 4 L 1.4648438 4 z M 12.464844 4 C 12.207763 4 12 4.2077628 12 4.4648438 L 12 4.5351562 C 12 4.7922372 12.207763 5 12.464844 5 L 14.535156 5 C 14.792237 5 15 4.7922372 15 4.5351562 L 15 4.4648438 C 15 4.2077628 14.792237 4 14.535156 4 L 12.464844 4 z M 1.34375 7 C 1.1530649 7 1 7.1530649 1 7.34375 L 1 7.65625 C 1 7.8469351 1.1530649 8 1.34375 8 L 3.65625 8 C 3.8469351 8 4 7.8469351 4 7.65625 L 4 7.34375 C 4 7.1530649 3.8469351 7 3.65625 7 L 1.34375 7 z M 12.34375 7 C 12.153065 7 12 7.1530649 12 7.34375 L 12 7.65625 C 12 7.8469351 12.153065 8 12.34375 8 L 14.65625 8 C 14.846935 8 15 7.8469351 15 7.65625 L 15 7.34375 C 15 7.1530649 14.846935 7 14.65625 7 L 12.34375 7 z M 1.4765625 10 C 1.2128419 10 1 10.212843 1 10.476562 L 1 10.523438 C 1 10.787157 1.2128419 11 1.4765625 11 L 3.5234375 11 C 3.7871581 11 4 10.787157 4 10.523438 L 4 10.476562 C 4 10.212843 3.7871581 10 3.5234375 10 L 1.4765625 10 z M 12.476562 10 C 12.212842 10 12 10.212842 12 10.476562 L 12 10.523438 C 12 10.787158 12.212842 11 12.476562 11 L 14.523438 11 C 14.787158 11 15 10.787158 15 10.523438 L 15 10.476562 C 15 10.212842 14.787158 10 14.523438 10 L 12.476562 10 z M 1.5 14 C 1.223 14 1 14.223 1 14.5 C 1 14.777 1.223 15 1.5 15 L 14.5 15 C 14.777 15 15 14.777 15 14.5 C 15 14.223 14.777 14 14.5 14 L 1.5 14 z "
+     />
+  <path
+     style="fill:#4d82b8"
+     d="M 6 3 C 5.446 3 5 3.446 5 4 L 5 12 C 5 12.554 5.446 13 6 13 L 10 13 C 10.554 13 11 12.554 11 12 L 11 4 C 11 3.446 10.554 3 10 3 L 6 3 z "
+     />
+</svg>
diff --git a/icon-themes/colibre_svg/sw/res/wr011.svg b/icon-themes/colibre_svg/sw/res/wr011.svg
index e05f3c7ab9e5..63a6c60d9c95 100644
--- a/icon-themes/colibre_svg/sw/res/wr011.svg
+++ b/icon-themes/colibre_svg/sw/res/wr011.svg
@@ -1 +1,14 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><path d="m9.5 16.5 7-9.0000004 7 9.0000004-7 9.000026z" fill="#4d82b8" fill-rule="evenodd" opacity=".5"/><g fill="#808080"><rect height="1" ry=".5" width="27" x="3" y="4"/><rect height="1" ry=".5" width="27" x="3" y="28"/><rect height="1" ry=".428091" width="6" x="24" y="20"/><rect height="1" ry=".488015" width="4" x="26" y="16"/><rect height="1" ry=".47603" width="8" x="22" y="24"/><rect height="1" ry=".5" width="8" x="22" y="8"/><rect height="1" ry=".5" width="6" x="24" y="12"/></g><path d="m9.5 16.5 7-9 7 9-7 9.000026z" fill="none" stroke="#4d82b8" stroke-linecap="round" stroke-linejoin="round"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#808080"
+     d="M 3.5 4 C 3.223 4 3 4.223 3 4.5 C 3 4.777 3.223 5 3.5 5 L 28.5 5 C 28.777 5 29 4.777 29 4.5 C 29 4.223 28.777 4 28.5 4 L 3.5 4 z M 3.5 8 C 3.223 8 3 8.223 3 8.5 C 3 8.777 3.223 9 3.5 9 L 7.5 9 C 7.777 9 8 8.777 8 8.5 C 8 8.223 7.777 8 7.5 8 L 3.5 8 z M 24.5 8 C 24.223 8 24 8.223 24 8.5 C 24 8.777 24.223 9 24.5 9 L 28.5 9 C 28.777 9 29 8.777 29 8.5 C 29 8.223 28.777 8 28.5 8 L 24.5 8 z M 3.5 12 C 3.223 12 3 12.223 3 12.5 C 3 12.777 3.223 13 3.5 13 L 7.5 13 C 7.777 13 8 12.777 8 12.5 C 8 12.223 7.777 12 7.5 12 L 3.5 12 z M 24.5 12 C 24.223 12 24 12.223 24 12.5 C 24 12.777 24.223 13 24.5 13 L 28.5 13 C 28.777 13 29 12.777 29 12.5 C 29 12.223 28.777 12 28.5 12 L 24.5 12 z M 3.5 16 C 3.223 16 3 16.223 3 16.5 C 3 16.777 3.223 17 3.5 17 L 7.5 17 C 7.777 17 8 16.777 8 16.5 C 8 16.223 7.777 16 7.5 16 L 3.5 16 z M 24.5 16 C 24.223 16 24 16.223 24 16.5 C 24 16.777 24.223 17 24.5 17 L 28.5 17 C 28.777 17 29 16.777 29 16.5 C 29 16.223 28.777 16 28.5 16 L 24.5 16 z M 3.5 20 C 3.223 20 3 20.223 3 20.5 C 3 20.777 3.223 21 3.5 21 L 7.5 21 C 7.777 21 8 20.777 8 20.5 C 8 20.223 7.777 20 7.5 20 L 3.5 20 z M 24.5 20 C 24.223 20 24 20.223 24 20.5 C 24 20.777 24.223 21 24.5 21 L 28.5 21 C 28.777 21 29 20.777 29 20.5 C 29 20.223 28.777 20 28.5 20 L 24.5 20 z M 3.5 24 C 3.223 24 3 24.223 3 24.5 C 3 24.777 3.223 25 3.5 25 L 7.5 25 C 7.777 25 8 24.777 8 24.5 C 8 24.223 7.777 24 7.5 24 L 3.5 24 z M 24.5 24 C 24.223 24 24 24.223 24 24.5 C 24 24.777 24.223 25 24.5 25 L 28.5 25 C 28.777 25 29 24.777 29 24.5 C 29 24.223 28.777 24 28.5 24 L 24.5 24 z M 3.5 28 C 3.223 28 3 28.223 3 28.5 C 3 28.777 3.223 29 3.5 29 L 28.5 29 C 28.777 29 29 28.777 29 28.5 C 29 28.223 28.777 28 28.5 28 L 3.5 28 z "
+     />
+  <path
+     style="fill:#eac282"
+     d="M 10.966797,8 C 10.430917,8 10,8.430917 10,8.966797 V 24.033203 C 10,24.569083 10.430917,25 10.966797,25 H 21.033203 C 21.569083,25 22,24.569083 22,24.033203 V 8.966797 C 22,8.430917 21.569083,8 21.033203,8 Z m 0.0332,1 h 10 v 15 h -10 z"
+     />
+  <path
+     style="opacity:0.5;fill:#4d82b8"
+     d="M 11,9 V 24 H 21 V 9 Z"
+     />
+</svg>
diff --git a/icon-themes/colibre_svg/sw/res/wr06.svg b/icon-themes/colibre_svg/sw/res/wr06.svg
index f14de521201f..63a6c60d9c95 100644
--- a/icon-themes/colibre_svg/sw/res/wr06.svg
+++ b/icon-themes/colibre_svg/sw/res/wr06.svg
@@ -1 +1,14 @@
-<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg"><rect fill="#808080" height="1" ry=".5" width="26" x="3" y="4"/><path d="m3.9667969 8c-.53588 0-.9667969.430917-.9667969.966797v15.066406c0 .53588.4309169.966797.9667969.966797h11.0664061c.53588 0 .966797-.430917.966797-.966797v-15.066406c0-.53588-.430917-.966797-.966797-.966797zm.0332031 1h11v15h-11z" fill="#4d82b8"/><g fill="#808080"><rect height="1" ry=".5" width="26" x="3" y="28"/><rect height="1" ry=".381356" width="11" x="18" y="20"/><rect height="1" ry=".466102" width="11" x="18" y="16"/><rect height="1" ry=".5" width="11" x="18" y="24"/></g><path d="m4 9v15h11v-15z" fill="#4d82b8" opacity=".5"/><rect fill="#808080" height="1" ry=".5" width="11" x="18" y="8"/><rect fill="#808080" height="1" ry=".5" width="11" x="18" y="12"/></svg>
\ No newline at end of file
+<svg viewBox="0 0 32 32" xmlns="http://www.w3.org/2000/svg">
+  <path
+     style="fill:#808080"
+     d="M 3.5 4 C 3.223 4 3 4.223 3 4.5 C 3 4.777 3.223 5 3.5 5 L 28.5 5 C 28.777 5 29 4.777 29 4.5 C 29 4.223 28.777 4 28.5 4 L 3.5 4 z M 3.5 8 C 3.223 8 3 8.223 3 8.5 C 3 8.777 3.223 9 3.5 9 L 7.5 9 C 7.777 9 8 8.777 8 8.5 C 8 8.223 7.777 8 7.5 8 L 3.5 8 z M 24.5 8 C 24.223 8 24 8.223 24 8.5 C 24 8.777 24.223 9 24.5 9 L 28.5 9 C 28.777 9 29 8.777 29 8.5 C 29 8.223 28.777 8 28.5 8 L 24.5 8 z M 3.5 12 C 3.223 12 3 12.223 3 12.5 C 3 12.777 3.223 13 3.5 13 L 7.5 13 C 7.777 13 8 12.777 8 12.5 C 8 12.223 7.777 12 7.5 12 L 3.5 12 z M 24.5 12 C 24.223 12 24 12.223 24 12.5 C 24 12.777 24.223 13 24.5 13 L 28.5 13 C 28.777 13 29 12.777 29 12.5 C 29 12.223 28.777 12 28.5 12 L 24.5 12 z M 3.5 16 C 3.223 16 3 16.223 3 16.5 C 3 16.777 3.223 17 3.5 17 L 7.5 17 C 7.777 17 8 16.777 8 16.5 C 8 16.223 7.777 16 7.5 16 L 3.5 16 z M 24.5 16 C 24.223 16 24 16.223 24 16.5 C 24 16.777 24.223 17 24.5 17 L 28.5 17 C 28.777 17 29 16.777 29 16.5 C 29 16.223 28.777 16 28.5 16 L 24.5 16 z M 3.5 20 C 3.223 20 3 20.223 3 20.5 C 3 20.777 3.223 21 3.5 21 L 7.5 21 C 7.777 21 8 20.777 8 20.5 C 8 20.223 7.777 20 7.5 20 L 3.5 20 z M 24.5 20 C 24.223 20 24 20.223 24 20.5 C 24 20.777 24.223 21 24.5 21 L 28.5 21 C 28.777 21 29 20.777 29 20.5 C 29 20.223 28.777 20 28.5 20 L 24.5 20 z M 3.5 24 C 3.223 24 3 24.223 3 24.5 C 3 24.777 3.223 25 3.5 25 L 7.5 25 C 7.777 25 8 24.777 8 24.5 C 8 24.223 7.777 24 7.5 24 L 3.5 24 z M 24.5 24 C 24.223 24 24 24.223 24 24.5 C 24 24.777 24.223 25 24.5 25 L 28.5 25 C 28.777 25 29 24.777 29 24.5 C 29 24.223 28.777 24 28.5 24 L 24.5 24 z M 3.5 28 C 3.223 28 3 28.223 3 28.5 C 3 28.777 3.223 29 3.5 29 L 28.5 29 C 28.777 29 29 28.777 29 28.5 C 29 28.223 28.777 28 28.5 28 L 3.5 28 z "
+     />
+  <path
+     style="fill:#eac282"
+     d="M 10.966797,8 C 10.430917,8 10,8.430917 10,8.966797 V 24.033203 C 10,24.569083 10.430917,25 10.966797,25 H 21.033203 C 21.569083,25 22,24.569083 22,24.033203 V 8.966797 C 22,8.430917 21.569083,8 21.033203,8 Z m 0.0332,1 h 10 v 15 h -10 z"
+     />
+  <path
+     style="opacity:0.5;fill:#4d82b8"
+     d="M 11,9 V 24 H 21 V 9 Z"
+     />
+</svg>