Colibre icon theme css support

Change-Id: I957980739ba667574a07ea94655bf7d2220571db
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/106343
Tested-by: Jenkins
Reviewed-by: Andreas Kainz <kainz.a@gmail.com>

34 files changed, 447 insertions, 796 deletions

diff --git a/icon-themes/colibre_svg/cmd/lc_adddirect.svg b/icon-themes/colibre_svg/cmd/lc_adddirect.svg
index 2996eb0cdab9..e98ef6613cc2 100644
--- a/icon-themes/colibre_svg/cmd/lc_adddirect.svg
+++ b/icon-themes/colibre_svg/cmd/lc_adddirect.svg
@@ -1,19 +1,13 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_addfield.svg b/icon-themes/colibre_svg/cmd/lc_addfield.svg
index c591238f457e..ef0c81dd515e 100644
--- a/icon-themes/colibre_svg/cmd/lc_addfield.svg
+++ b/icon-themes/colibre_svg/cmd/lc_addfield.svg
@@ -1,43 +1,24 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color-line"  
-     d="M 15.5,17.5 H 16 c 0.8,0 1.5,-0.6 1.5,-1.5 v -4 c 0,-0.7 -0.65,-1.5 -1.5,-1.5 h -0.5"
-     fill="none" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color-line"  
-     d="M 8.5,17.5 H 8 C 7.2,17.5 6.5,16.87 6.5,16 v -4 c 0,-0.73 0.65,-1.5 1.5,-1.5 h 0.5"
      fill="none" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 8.5,14.5 h 7 v -1 h -7 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+      >
+      <path d="M 15.5,17.5 H 16 c 0.8,0 1.5,-0.6 1.5,-1.5 v -4 c 0,-0.7 -0.65,-1.5 -1.5,-1.5 h -0.5" />
+      <path d="M 8.5,17.5 H 8 C 7.2,17.5 6.5,16.87 6.5,16 v -4 c 0,-0.73 0.65,-1.5 1.5,-1.5 h 0.5" />
+      <path d="m 8.5,14.5 h 7 v -1 h -7 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_addressbooksource.svg b/icon-themes/colibre_svg/cmd/lc_addressbooksource.svg
index aa444531f85b..cb646447a839 100644
--- a/icon-themes/colibre_svg/cmd/lc_addressbooksource.svg
+++ b/icon-themes/colibre_svg/cmd/lc_addressbooksource.svg
@@ -1,27 +1,14 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 5.5,21.5 h 14 v -19 h -14 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,4.5 h -2 v 4 h 2 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,15.5 h -2 v 4 h 2 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 5.5,21.5 h 14 v -19 h -14 z" />
+      <path d="m 5.5,4.5 h -2 v 4 h 2 z" />
+      <path d="m 5.5,15.5 h -2 v 4 h 2 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_attributepagesize.svg b/icon-themes/colibre_svg/cmd/lc_attributepagesize.svg
index 1eb6d53056c0..7bb4ba8d7162 100644
--- a/icon-themes/colibre_svg/cmd/lc_attributepagesize.svg
+++ b/icon-themes/colibre_svg/cmd/lc_attributepagesize.svg
@@ -1,67 +1,27 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 6.5,19.5 h 13 V 7 L 15,2.5 H 6.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 6.5,23.5 v -2"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 6.5,22.5 h 13"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 19.5,23.5 v -2"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 2.5,19.5 h 2"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 2.5,2.5 h 2"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 6.5,19.5 h 13 V 7 L 15,2.5 H 6.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color"  
-     d="M 3.5,19.5 V 2.5"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 6.5,23.5 v -2" />
+      <path d="m 6.5,22.5 h 13" />
+      <path d="m 19.5,23.5 v -2" />
+      <path d="m 2.5,19.5 h 2" />
+      <path d="m 2.5,2.5 h 2" />
+      <path d="M 3.5,19.5 V 2.5" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_bibliographycomponent.svg b/icon-themes/colibre_svg/cmd/lc_bibliographycomponent.svg
index 19af302d3f0b..e4465523c31f 100644
--- a/icon-themes/colibre_svg/cmd/lc_bibliographycomponent.svg
+++ b/icon-themes/colibre_svg/cmd/lc_bibliographycomponent.svg
@@ -1,51 +1,33 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 5.5,21.5 h 14 v -19 h -14 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,4.5 h -2 v 4 h 2 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,15.5 h -2 v 4 h 2 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="m 8.5,12.5 h 8 v 1 h -8 z"
-     fill="#f8db8f" 
-     stroke="#ed8733" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 5.5,21.5 h 14 v -19 h -14 z" />
+      <path d="m 5.5,4.5 h -2 v 4 h 2 z" />
+      <path d="m 5.5,15.5 h -2 v 4 h 2 z" />
+  </g>
+  <g id="symbol"
      class="icn icn--highlight-color-2"
-	 d="m 9.5,15.5 c 0.25,0 6,0 6,0"
      fill="#f8db8f" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
-  <path
+      >
+      <path d="m 8.5,12.5 h 8 v 1 h -8 z" />
+      <path d="m 9.5,15.5 c 0.25,0 6,0 6,0" />
+  </g>
+  <g id="symbol2"
 	 class="icn icn--highlight-color"  
-     d="m 8.5,2.5 v 6 l 1.5,-2 1.5,2 v -6 z"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 8.5,2.5 v 6 l 1.5,-2 1.5,2 v -6 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_copyobjects.svg b/icon-themes/colibre_svg/cmd/lc_copyobjects.svg
index f6b957f800cf..9eb957bb676e 100644
--- a/icon-themes/colibre_svg/cmd/lc_copyobjects.svg
+++ b/icon-themes/colibre_svg/cmd/lc_copyobjects.svg
@@ -1,27 +1,14 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 10.5,17.5 h 11 v -14 h -11 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 6.5,19.5 h 11 v -14 h -11 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 2.5,21.5 h 11 v -14 h -11 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 10.5,17.5 h 11 v -14 h -11 z" />
+      <path d="m 6.5,19.5 h 11 v -14 h -11 z" />
+      <path d="m 2.5,21.5 h 11 v -14 h -11 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_dataimport.svg b/icon-themes/colibre_svg/cmd/lc_dataimport.svg
index 6dd85d6ea428..17b83b8b5d8f 100644
--- a/icon-themes/colibre_svg/cmd/lc_dataimport.svg
+++ b/icon-themes/colibre_svg/cmd/lc_dataimport.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color-line"  
-     d="m 15.5,11.5 -4,4 4,4"
-     fill="none" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color-line"  
-     d="m 22.5,15.5 h -11"
      fill="none" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 15.5,11.5 -4,4 4,4" />
+      <path d="m 22.5,15.5 h -11" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_editannotation.svg b/icon-themes/colibre_svg/cmd/lc_editannotation.svg
index bce03793767e..a2e74aa7a5a3 100644
--- a/icon-themes/colibre_svg/cmd/lc_editannotation.svg
+++ b/icon-themes/colibre_svg/cmd/lc_editannotation.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 3.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 12 c 5.52e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 9 c 0.5,-5.5e-5 1,-0.5 1,-1 v -12 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z"
      fill="#fafafa"
      stroke="#3a3a38" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
-  <path
+     >
+      <path d="m 3.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 12 c 5.52e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 9 c 0.5,-5.5e-5 1,-0.5 1,-1 v -12 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color"  
-     d="m 10.5,22.5 5,-2 -3,-3 z"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 15.5,20.5 5,-5 -3,-3 -5,5 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 22.5,13.5 -2,2 -3,-3 2,-2 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 10.5,22.5 5,-2 -3,-3 z" />
+      <path d="m 15.5,20.5 5,-5 -3,-3 -5,5 z" />
+      <path d="m 22.5,13.5 -2,2 -3,-3 2,-2 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_editcurindex.svg b/icon-themes/colibre_svg/cmd/lc_editcurindex.svg
index 99346d7969d8..59b5273121e7 100644
--- a/icon-themes/colibre_svg/cmd/lc_editcurindex.svg
+++ b/icon-themes/colibre_svg/cmd/lc_editcurindex.svg
@@ -1,51 +1,33 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 l -4.5,-4.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 v -0.5 l -4.5,-4.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 10.5,22.5 5,-2 -3,-3 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 15.5,20.5 5,-5 -3,-3 -5,5 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color"  
-     d="m 22.5,13.5 -2,2 -3,-3 2,-2 z"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
-  <path
+      >
+      <path d="m 10.5,22.5 5,-2 -3,-3 z" />
+      <path d="m 15.5,20.5 5,-5 -3,-3 -5,5 z" />
+      <path d="m 22.5,13.5 -2,2 -3,-3 2,-2 z" />
+  </g>
+  <g id="symbol2"
 	 class="icn icn--highlight-color"  
-     d="M 6.5 5.5 L 6.5 6.5 L 12.5 6.5 L 12.5 5.5 L 6.5 5.5 z M 6.5 9.5 L 13.5 9.5 L 6.5 9.5 z M 16.5 9.5 L 17.5 9.5 L 16.5 9.5 z M 6.5 12.5 L 13.5 12.5 L 6.5 12.5 z M 16.5 12.5 L 17.5 12.5 L 16.5 12.5 z M 6.5 15.5 L 11.5 15.5 L 6.5 15.5 z M 6.5 18.5 L 10.5 18.5 L 6.5 18.5 z "
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="M 6.5 5.5 L 6.5 6.5 L 12.5 6.5 L 12.5 5.5 L 6.5 5.5 z M 6.5 9.5 L 13.5 9.5 L 6.5 9.5 z M 16.5 9.5 L 17.5 9.5 L 16.5 9.5 z M 6.5 12.5 L 13.5 12.5 L 6.5 12.5 z M 16.5 12.5 L 17.5 12.5 L 16.5 12.5 z M 6.5 15.5 L 11.5 15.5 L 6.5 15.5 z M 6.5 18.5 L 10.5 18.5 L 6.5 18.5 z " />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_editdoc.svg b/icon-themes/colibre_svg/cmd/lc_editdoc.svg
index 56c081925f4e..200fedb0808a 100644
--- a/icon-themes/colibre_svg/cmd/lc_editdoc.svg
+++ b/icon-themes/colibre_svg/cmd/lc_editdoc.svg
@@ -1,43 +1,24 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 10.5,22.5 5,-2 -3,-3 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 15.5,20.5 5,-5 -3,-3 -5,5 z"
-     fill="#83beec" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color"  
-     d="m 22.5,13.5 -2,2 -3,-3 2,-2 z"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 10.5,22.5 5,-2 -3,-3 z" />
+      <path d="m 15.5,20.5 5,-5 -3,-3 -5,5 z" />
+      <path d="m 22.5,13.5 -2,2 -3,-3 2,-2 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_editheaderandfooter.svg b/icon-themes/colibre_svg/cmd/lc_editheaderandfooter.svg
index 7b3759ea293d..ca6f6e3564b0 100644
--- a/icon-themes/colibre_svg/cmd/lc_editheaderandfooter.svg
+++ b/icon-themes/colibre_svg/cmd/lc_editheaderandfooter.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="m 6.5,4.5 h 6 v 2 h -6 z"
-     fill="#f8db8f" 
-     stroke="#ed8733" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="m 6.5,17.5 h 10 v 2 h -10 z"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-2"
      fill="#f8db8f" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 6.5,4.5 h 6 v 2 h -6 z" />
+      <path d="m 6.5,17.5 h 10 v 2 h -10 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_exportdirecttoepub.svg b/icon-themes/colibre_svg/cmd/lc_exportdirecttoepub.svg
index fd84b2faf6f8..22f7fd369548 100644
--- a/icon-themes/colibre_svg/cmd/lc_exportdirecttoepub.svg
+++ b/icon-themes/colibre_svg/cmd/lc_exportdirecttoepub.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2-line"
-	 d="m 20.5,15.5 -5,5 -5,-5 5,-5 3,3 -3,3"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-2-line"
      fill="none" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 20.5,15.5 -5,5 -5,-5 5,-5 3,3 -3,3" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_exportdirecttopdf.svg b/icon-themes/colibre_svg/cmd/lc_exportdirecttopdf.svg
index dadeb1f2dcf7..4c32e01f31c0 100644
--- a/icon-themes/colibre_svg/cmd/lc_exportdirecttopdf.svg
+++ b/icon-themes/colibre_svg/cmd/lc_exportdirecttopdf.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
      class="icn icn--negative-color-line"
-	 d="m 11.5,22.5 c 5.2,-4.4 4.8,-7.7 4.6,-11.0 -0.75,5.4 2.0,7.3 6.4,7.7 -3.3,-1.0 -6.8,-0.98 -11.0,3.6 z"
      fill="none" 
      stroke="#da4453" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 11.5,22.5 c 5.2,-4.4 4.8,-7.7 4.6,-11.0 -0.75,5.4 2.0,7.3 6.4,7.7 -3.3,-1.0 -6.8,-0.98 -11.0,3.6 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_exportto.svg b/icon-themes/colibre_svg/cmd/lc_exportto.svg
index a783fc1dcd24..f333f6d96b2a 100644
--- a/icon-themes/colibre_svg/cmd/lc_exportto.svg
+++ b/icon-themes/colibre_svg/cmd/lc_exportto.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color-line"  
-     d="m 8.5,11.5 4,4 -4,4"
-     fill="none" 
-     stroke="#1e8bcd" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color-line"  
-     d="M 12.5,15.5 H 1.5"
      fill="none" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 8.5,11.5 4,4 -4,4" />
+      <path d="M 12.5,15.5 H 1.5" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_insertfooter.svg b/icon-themes/colibre_svg/cmd/lc_insertfooter.svg
index 80ae0fb15f17..3ef841350ee7 100644
--- a/icon-themes/colibre_svg/cmd/lc_insertfooter.svg
+++ b/icon-themes/colibre_svg/cmd/lc_insertfooter.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="m 6.5,17.5 h 10 v 2 h -10 z"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-2"
      fill="#f8db8f" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 6.5,17.5 h 10 v 2 h -10 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_insertheader.svg b/icon-themes/colibre_svg/cmd/lc_insertheader.svg
index 93a69c43da7c..607e8064f2b8 100644
--- a/icon-themes/colibre_svg/cmd/lc_insertheader.svg
+++ b/icon-themes/colibre_svg/cmd/lc_insertheader.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>

 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">

-  <path

+  <g id="background"

      class="icn icn--area-color"

-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"

      fill="#fafafa"

-     stroke="#3a3a38" 

-	 stroke-linecap="round" 

-	 stroke-linejoin="round"

-     />

-  <path

-     class="icn icn--area-color"

-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"

-     fill="#fafafa"

-     stroke="#3a3a38" 

-	 stroke-linecap="round" 

-	 stroke-linejoin="round"

-     />

-  <path

-     class="icn icn--highlight-color-2"

-	 d="m 6.5,4.5 h 6 v 2 h -6 z"

+     stroke="#3a3a38"

+     stroke-linecap="round"

+     stroke-linejoin="round"

+     >

+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />

+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />

+  </g>

+  <g id="symbol"

+	 class="icn icn--highlight-color-2"

      fill="#f8db8f" 

      stroke="#ed8733" 

 	 stroke-linecap="round" 

 	 stroke-linejoin="round"

-     />

+      >

+      <path d="m 6.5,4.5 h 6 v 2 h -6 z" />

+  </g>

 </svg>

diff --git a/icon-themes/colibre_svg/cmd/lc_inserttitlefield.svg b/icon-themes/colibre_svg/cmd/lc_inserttitlefield.svg
index c79fc51b5c26..bc6414a4ea8f 100644
--- a/icon-themes/colibre_svg/cmd/lc_inserttitlefield.svg
+++ b/icon-themes/colibre_svg/cmd/lc_inserttitlefield.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 9.5,10.5 v 1 h 5 v -1 z m -2,4 h 9 z"
-     fill="#83beec" 
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-line"  
+     fill="none" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 9.5,10.5 v 1 h 5 v -1 z m -2,4 h 9 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_label.svg b/icon-themes/colibre_svg/cmd/lc_label.svg
index c122b9fe5a10..4d5c05dde1ba 100644
--- a/icon-themes/colibre_svg/cmd/lc_label.svg
+++ b/icon-themes/colibre_svg/cmd/lc_label.svg
@@ -1,19 +1,13 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 2.5,13.5 11,-10 h 8 v 8 l -11,10 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--area-color"
-     d="M 18.5,8 A 1.5,1.5 0 0 1 17,9.5 1.5,1.5 0 0 1 15.5,8 1.5,1.5 0 0 1 17,6.5 1.5,1.5 0 0 1 18.5,8 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 2.5,13.5 11,-10 h 8 v 8 l -11,10 z" />
+      <path d="M 18.5,8 A 1.5,1.5 0 0 1 17,9.5 1.5,1.5 0 0 1 15.5,8 1.5,1.5 0 0 1 17,6.5 1.5,1.5 0 0 1 18.5,8 Z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_newdoc.svg b/icon-themes/colibre_svg/cmd/lc_newdoc.svg
index 2996eb0cdab9..e98ef6613cc2 100644
--- a/icon-themes/colibre_svg/cmd/lc_newdoc.svg
+++ b/icon-themes/colibre_svg/cmd/lc_newdoc.svg
@@ -1,19 +1,13 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_numberformattime.svg b/icon-themes/colibre_svg/cmd/lc_numberformattime.svg
index 634df1448f67..cb367fab863b 100644
--- a/icon-themes/colibre_svg/cmd/lc_numberformattime.svg
+++ b/icon-themes/colibre_svg/cmd/lc_numberformattime.svg
@@ -1,19 +1,13 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="M 21.5,12 A 9.5,9.5 0 0 1 12,21.5 9.5,9.5 0 0 1 2.5,12 9.5,9.5 0 0 1 12,2.5 9.5,9.5 0 0 1 21.5,12 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 18.5,12.5 h -7 v -7"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="M 21.5,12 A 9.5,9.5 0 0 1 12,21.5 9.5,9.5 0 0 1 2.5,12 9.5,9.5 0 0 1 12,2.5 9.5,9.5 0 0 1 21.5,12 Z" />
+      <path d="m 18.5,12.5 h -7 v -7" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_recentfilelist.svg b/icon-themes/colibre_svg/cmd/lc_recentfilelist.svg
index 7d4552cebbe2..76c1b0b85655 100644
--- a/icon-themes/colibre_svg/cmd/lc_recentfilelist.svg
+++ b/icon-themes/colibre_svg/cmd/lc_recentfilelist.svg
@@ -1,19 +1,21 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="M 21.5,12 A 9.5,9.5 0 0 1 12,21.5 9.5,9.5 0 0 1 2.5,12 9.5,9.5 0 0 1 12,2.5 9.5,9.5 0 0 1 21.5,12 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-line" 
-	 d="m 18.5,12.5 h -7 v -7"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="M 21.5,12 A 9.5,9.5 0 0 1 12,21.5 9.5,9.5 0 0 1 2.5,12 9.5,9.5 0 0 1 12,2.5 9.5,9.5 0 0 1 21.5,12 Z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-line"  
      fill="none" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 18.5,12.5 h -7 v -7" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_rehearsetimings.svg b/icon-themes/colibre_svg/cmd/lc_rehearsetimings.svg
index da8485778347..51c000c3a1bb 100644
--- a/icon-themes/colibre_svg/cmd/lc_rehearsetimings.svg
+++ b/icon-themes/colibre_svg/cmd/lc_rehearsetimings.svg
@@ -1,51 +1,26 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 20.5,13.5 c 0,4.936261 -4.063739,9 -9,9 -4.9362614,0 -9,-4.063739 -9,-9 -10e-8,-4.9362615 4.0637385,-9 9,-9 4.936262,0 9,4.0637385 9,9 z"
      fill="#fafafa"
      stroke="#3a3a38" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 11.5,8.5 v 4 z m 0,6 v 2 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 21.5,8.5 -5,-5"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="M 18,7 19,6"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 9.5,4.5 v -2 h 4 v 2 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--area-color"
-     d="m 12.5,13.5 a 1,1 0 0 1 -1,1 1,1 0 0 1 -1,-1 1,1 0 0 1 1,-1 1,1 0 0 1 1,1 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
+     >
+      <path d="m 20.5,13.5 c 0,4.9 -4,9 -9,9 -4.9,0 -9,-4 -9,-9 -10e-8,-4.9 4,-9 9,-9 4.9,0 9,4 9,9 z" />
+      <path d="m 11.5,8.5 v 4 z m 0,6 v 2 z" />
+      <path d="m 21.5,8.5 -5,-5" />
+      <path d="m 9.5,4.5 v -2 h 4 v 2 z" />
+      <path d="M 18,7 19,6" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color"  
+     fill="#83beec" 
+     stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 12.5,13.5 a 1,1 0 0 1 -1,1 1,1 0 0 1 -1,-1 1,1 0 0 1 1,-1 1,1 0 0 1 1,1 z" />
+      <path d="m 11.5,8.5 v 4 z m 0,6 v 2 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_replycomment.svg b/icon-themes/colibre_svg/cmd/lc_replycomment.svg
index a71ab3aecb15..b3ba0d122a66 100644
--- a/icon-themes/colibre_svg/cmd/lc_replycomment.svg
+++ b/icon-themes/colibre_svg/cmd/lc_replycomment.svg
@@ -1,19 +1,21 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 3.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 12 c 5.52e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 9 c 0.5,-5.5e-5 1,-0.5 1,-1 v -12 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color"  
-     d="m 13.5,13.5 v 6 h 2 v 3 l 3,-3 h 4 v -6 z"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 3.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 12 c 5.52e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 9 c 0.5,-5.5e-5 1,-0.5 1,-1 v -12 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 13.5,13.5 v 6 h 2 v 3 l 3,-3 h 4 v -6 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_setdocumentproperties.svg b/icon-themes/colibre_svg/cmd/lc_setdocumentproperties.svg
index b4df00d2e0c8..25ba9b2cff64 100644
--- a/icon-themes/colibre_svg/cmd/lc_setdocumentproperties.svg
+++ b/icon-themes/colibre_svg/cmd/lc_setdocumentproperties.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-	 class="icn icn--highlight-color" 
-     d="M 17.4 13.5 L 17 15.6 L 15.24 14.4 L 14.4 15.24 L 15.6 17 L 13.5 17.4 L 13.5 18.6 L 15.6 19.0 L 14.4 20.76 L 15.24 21.6 L 17 20.4 L 17.4 22.5 L 18.6 22.5 L 19.0 20.4 L 20.76 21.6 L 21.6 20.76 L 20.4 19.0 L 22.5 18.6 L 22.5 17.4 L 20.4 17 L 21.6 15.24 L 20.76 14.4 L 19.0 15.6 L 18.6 13.5 L 17.4 13.5 z M 18 16.5 A 1.5 1.5 0 0 1 19.5 18 A 1.5 1.5 0 0 1 18 19.5 A 1.5 1.5 0 0 1 16.5 18 A 1.5 1.5 0 0 1 18 16.5 z "
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color"  
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="M 17.4 13.5 L 17 15.6 L 15.24 14.4 L 14.4 15.24 L 15.6 17 L 13.5 17.4 L 13.5 18.6 L 15.6 19.0 L 14.4 20.76 L 15.24 21.6 L 17 20.4 L 17.4 22.5 L 18.6 22.5 L 19.0 20.4 L 20.76 21.6 L 21.6 20.76 L 20.4 19.0 L 22.5 18.6 L 22.5 17.4 L 20.4 17 L 21.6 15.24 L 20.76 14.4 L 19.0 15.6 L 18.6 13.5 L 17.4 13.5 z M 18 16.5 A 1.5 1.5 0 0 1 19.5 18 A 1.5 1.5 0 0 1 18 19.5 A 1.5 1.5 0 0 1 16.5 18 A 1.5 1.5 0 0 1 18 16.5 z " />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_sharedocument.svg b/icon-themes/colibre_svg/cmd/lc_sharedocument.svg
index aa4f7b47a7b1..196f67a6e73d 100644
--- a/icon-themes/colibre_svg/cmd/lc_sharedocument.svg
+++ b/icon-themes/colibre_svg/cmd/lc_sharedocument.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
 	 class="icn icn--highlight-color"  
-     d="m 14.5,9.5 c -0.5,0 -1,0.4 -1,1 0,0.5 0.4,1 1,1 0.5,0 1,-0.4 1,-1 0,-0.5 -0.4,-1 -1,-1 z m -3.5,2 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 0.3,0 0.5,-0.2 0.5,-0.5 0,-0.3 -0.2,-0.5 -0.5,-0.5 z m -3.5,2 c -0.5,0 -1,0.4 -1,1 0,0.5 0.43,1 1,1 0.5,0 1,-0.4 1,-1 0,-0.5 -0.43,-1 -1,-1 z m 3.5,3 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 0.3,0 0.5,-0.2 0.5,-0.5 0,-0.3 -0.2,-0.5 -0.5,-0.5 z m 3.5,1 c -0.5,0 -1,0.4 -1,1 0,0.5 0.4,1 1,1 0.5,0 1,-0.4 1,-1 0,-0.5 -0.4,-1 -1,-1 z"
      fill="#83beec" 
      stroke="#1e8bcd" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 14.5,9.5 c -0.5,0 -1,0.4 -1,1 0,0.5 0.4,1 1,1 0.5,0 1,-0.4 1,-1 0,-0.5 -0.4,-1 -1,-1 z m -3.5,2 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 0.3,0 0.5,-0.2 0.5,-0.5 0,-0.3 -0.2,-0.5 -0.5,-0.5 z m -3.5,2 c -0.5,0 -1,0.4 -1,1 0,0.5 0.43,1 1,1 0.5,0 1,-0.4 1,-1 0,-0.5 -0.43,-1 -1,-1 z m 3.5,3 c -0.3,0 -0.5,0.2 -0.5,0.5 0,0.3 0.2,0.5 0.5,0.5 0.3,0 0.5,-0.2 0.5,-0.5 0,-0.3 -0.2,-0.5 -0.5,-0.5 z m 3.5,1 c -0.5,0 -1,0.4 -1,1 0,0.5 0.4,1 1,1 0.5,0 1,-0.4 1,-1 0,-0.5 -0.4,-1 -1,-1 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_showannotations.svg b/icon-themes/colibre_svg/cmd/lc_showannotations.svg
index cfa0f79372c1..765d34b8bf74 100644
--- a/icon-themes/colibre_svg/cmd/lc_showannotations.svg
+++ b/icon-themes/colibre_svg/cmd/lc_showannotations.svg
@@ -1,19 +1,13 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 6.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 9 c 5.4e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.5 c 0,0.5 0.6,0.3 0.5,0.3 0.33,0 0.6,-0.3 1.2,-0.7 l 4.8,-4.5 h 5.5 c 0.5,-5.5e-5 1,-0.5 1,-1 V 3.5 C 21.5,3 21,2.5 20.5,2.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 3.5,5.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 9 c 5.5e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 5.5 c 0.5,-5.5e-5 1,-0.5 1,-1 v -9 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 6.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 9 c 5.4e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.5 c 0,0.5 0.6,0.3 0.5,0.3 0.33,0 0.6,-0.3 1.2,-0.7 l 4.8,-4.5 h 5.5 c 0.5,-5.5e-5 1,-0.5 1,-1 V 3.5 C 21.5,3 21,2.5 20.5,2.5 Z" />
+      <path d="m 3.5,5.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 9 c 5.5e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 5.5 c 0.5,-5.5e-5 1,-0.5 1,-1 v -9 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_showbookview.svg b/icon-themes/colibre_svg/cmd/lc_showbookview.svg
index d0c3ff6ab500..988a166625a4 100644
--- a/icon-themes/colibre_svg/cmd/lc_showbookview.svg
+++ b/icon-themes/colibre_svg/cmd/lc_showbookview.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 12.5,21.5 h 10 V 7 L 18,2.5 h -5.5 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 12.5,21.5 h 10 V 7 L 18,2.5 h -5.5 z" />
+      <path d="m 17.5,7.5 h 5 V 7 L 18,2.5 h -0.5 z" />
+  </g>
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 17.5,7.5 h 5 V 7 L 18,2.5 h -0.5 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="M 11.5,21.5 H 1.5 V 7 L 6,2.5 h 5.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 6.5,7.5 h -5 V 7 L 6,2.5 h 0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="M 11.5,21.5 H 1.5 V 7 L 6,2.5 h 5.5 z" />
+      <path d="m 6.5,7.5 h -5 V 7 L 6,2.5 h 0.5 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_showmultiplepages.svg b/icon-themes/colibre_svg/cmd/lc_showmultiplepages.svg
index 87bb5eb3f191..ec739d6e16ad 100644
--- a/icon-themes/colibre_svg/cmd/lc_showmultiplepages.svg
+++ b/icon-themes/colibre_svg/cmd/lc_showmultiplepages.svg
@@ -1,67 +1,43 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
-     class="icn icn--area-color"
-	 d="m 13.5,10.5 h 10 V 5 L 19,0.5 h -5.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 18.5,5.5 h 5 V 5 L 19,0.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 0.5,10.5 h 10 V 5 L 6,0.5 H 0.5 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,5.5 h 5 V 5 L 6,0.5 H 5.5 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 13.5,23.5 h 10 V 18 L 19,13.5 h -5.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 18.5,18.5 h 5 V 18 L 19,13.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 0.5,23.5 h 10 V 18 L 6,13.5 H 0.5 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,18.5 h 5 V 18 L 6,13.5 H 5.5 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+  <g id="background"
+     class="icn icn--area-color"
+     fill="#fafafa"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 13.5,10.5 h 10 V 5 L 19,0.5 h -5.5 z" />
+      <path d="m 18.5,5.5 h 5 V 5 L 19,0.5 h -0.5 z" />
+  </g>
+  <g id="background"
+     class="icn icn--area-color"
+     fill="#fafafa"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 0.5,10.5 h 10 V 5 L 6,0.5 H 0.5 Z" />
+      <path d="m 5.5,5.5 h 5 V 5 L 6,0.5 H 5.5 Z" />
+  </g>
+  <g id="background"
+     class="icn icn--area-color"
+     fill="#fafafa"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 13.5,23.5 h 10 V 18 L 19,13.5 h -5.5 z" />
+      <path d="m 18.5,18.5 h 5 V 18 L 19,13.5 h -0.5 z" />
+  </g>
+  <g id="background"
+     class="icn icn--area-color"
+     fill="#fafafa"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 0.5,23.5 h 10 V 18 L 6,13.5 H 0.5 Z" />
+      <path d="m 5.5,18.5 h 5 V 18 L 6,13.5 H 5.5 Z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_shownote.svg b/icon-themes/colibre_svg/cmd/lc_shownote.svg
index ee03b0f55b2e..37e1ddb61ef6 100644
--- a/icon-themes/colibre_svg/cmd/lc_shownote.svg
+++ b/icon-themes/colibre_svg/cmd/lc_shownote.svg
@@ -1,11 +1,12 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 3.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 12 c 5.52e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 9 c 0.5,-5.5e-5 1,-0.5 1,-1 v -12 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 3.5,2.5 c -0.5,5.52e-5 -1,0.5 -1,1 v 12 c 5.52e-5,0.5 0.5,1 1,1 h 2 v 3.5 1.45 c 0,0.58 0.6,0.35 0.5,0.35 0.33,0 0.6,-0.25 1.17,-0.75 L 12,16.5 h 9 c 0.5,-5.5e-5 1,-0.5 1,-1 v -12 c -5.5e-5,-0.5 -0.45,-1 -1,-1 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_showsinglepage.svg b/icon-themes/colibre_svg/cmd/lc_showsinglepage.svg
index 2996eb0cdab9..e98ef6613cc2 100644
--- a/icon-themes/colibre_svg/cmd/lc_showsinglepage.svg
+++ b/icon-themes/colibre_svg/cmd/lc_showsinglepage.svg
@@ -1,19 +1,13 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_showtwopages.svg b/icon-themes/colibre_svg/cmd/lc_showtwopages.svg
index 6e562c3f7eae..804461f521ef 100644
--- a/icon-themes/colibre_svg/cmd/lc_showtwopages.svg
+++ b/icon-themes/colibre_svg/cmd/lc_showtwopages.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 13.5,21.5 h 10 V 7 L 19,2.5 h -5.5 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 13.5,21.5 h 10 V 7 L 19,2.5 h -5.5 z" />
+      <path d="m 18.5,7.5 h 5 V 7 L 19,2.5 h -0.5 z" />
+  </g>
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 18.5,7.5 h 5 V 7 L 19,2.5 h -0.5 z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 0.5,21.5 h 10 V 7 L 6,2.5 H 0.5 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 5.5,7.5 h 5 V 7 L 6,2.5 H 5.5 Z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 0.5,21.5 h 10 V 7 L 6,2.5 H 0.5 Z" />
+      <path d="m 5.5,7.5 h 5 V 7 L 6,2.5 H 5.5 Z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_templatemanager.svg b/icon-themes/colibre_svg/cmd/lc_templatemanager.svg
index da224b81dcc8..47d24de52089 100644
--- a/icon-themes/colibre_svg/cmd/lc_templatemanager.svg
+++ b/icon-themes/colibre_svg/cmd/lc_templatemanager.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="M 21.5,10.5 10.5,21.5 h 11 z m -2,5 v 4 h -4 z"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-2"
      fill="#f8db8f" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="M 21.5,10.5 10.5,21.5 h 11 z m -2,5 v 4 h -4 z" />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_vruler.svg b/icon-themes/colibre_svg/cmd/lc_vruler.svg
index 916b9caf092d..4af5a1521549 100644
--- a/icon-themes/colibre_svg/cmd/lc_vruler.svg
+++ b/icon-themes/colibre_svg/cmd/lc_vruler.svg
@@ -1,35 +1,23 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="m 6.5,21.5 h 3 v -19 h -3 z"
-     fill="#f8db8f" 
-     stroke="#ed8733" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2"
-	 d="M 6.5 6.5 L 7.5 6.5 L 6.5 6.5 z M 6.5 9.5 L 7.5 9.5 L 6.5 9.5 z M 6.5 12.5 L 7.5 12.5 L 6.5 12.5 z M 6.5 15.5 L 7.5 15.5 L 6.5 15.5 z M 6.5 18.5 L 7.5 18.5 L 6.5 18.5 z "
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-2"
      fill="#f8db8f" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 6.5,21.5 h 3 v -19 h -3 z" />
+      <path d="M 6.5 6.5 L 7.5 6.5 L 6.5 6.5 z M 6.5 9.5 L 7.5 9.5 L 6.5 9.5 z M 6.5 12.5 L 7.5 12.5 L 6.5 12.5 z M 6.5 15.5 L 7.5 15.5 L 6.5 15.5 z M 6.5 18.5 L 7.5 18.5 L 6.5 18.5 z " />
+  </g>
 </svg>
diff --git a/icon-themes/colibre_svg/cmd/lc_watermark.svg b/icon-themes/colibre_svg/cmd/lc_watermark.svg
index 0cb9f15809e7..28b735b085f7 100644
--- a/icon-themes/colibre_svg/cmd/lc_watermark.svg
+++ b/icon-themes/colibre_svg/cmd/lc_watermark.svg
@@ -1,27 +1,22 @@
 <?xml-stylesheet type="text/css" href="icons.css" ?>
 <svg viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg">
-  <path
+  <g id="background"
      class="icn icn--area-color"
-	 d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z"
      fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--area-color"
-	 d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z"
-     fill="#fafafa"
-     stroke="#3a3a38" 
-	 stroke-linecap="round" 
-	 stroke-linejoin="round"
-     />
-  <path
-     class="icn icn--highlight-color-2-line"
-	 d="m 7,10.5 2.2418004,8 L 12,10.5 14.741898,18.5 17,10.5"
-	 fill="none"
+     stroke="#3a3a38"
+     stroke-linecap="round"
+     stroke-linejoin="round"
+     >
+      <path d="m 4.5,21.5 h 15 V 7 L 15,2.5 H 4.5 Z" />
+      <path d="m 14.5,7.5 h 5 V 7 L 15,2.5 h -0.5 z" />
+  </g>
+  <g id="symbol"
+	 class="icn icn--highlight-color-2-line"
+     fill="none" 
      stroke="#ed8733" 
 	 stroke-linecap="round" 
 	 stroke-linejoin="round"
-     />
+      >
+      <path d="m 7,10.5 2.25,8 L 12,10.5 14.75,18.5 17,10.5" />
+  </g>
 </svg>