diff --git a/glabels/Icons.h b/glabels/Icons.h
index 16c1fb3..70bad62 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -123,7 +123,6 @@ namespace glabels
 		public:
 			Merge()
 			{
-				addFile( ":icons/16x16/actions/glabels-merge.png" );
 				addFile( ":icons/24x24/actions/glabels-merge.png" );
 			}
 		};
@@ -134,8 +133,7 @@ namespace glabels
 		public:
 			ObjectProperties()
 			{
-				addFile( ":icons/16x16/actions/glabels-object-properties.png" );
-				addFile( ":icons/24x24/actions/glabels-object-properties.png" );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-object-properties.svg" ) );
 			}
 		};
 
@@ -145,9 +143,7 @@ namespace glabels
 		public:
 			AlignLeft()
 			{
-				addFile( ":icons/16x16/actions/glabels-align-left.png" );
-				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-left.svg" ) );
-				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-left.svg" ) );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-left.svg" ) );
 			}
 		};
 
@@ -157,7 +153,7 @@ namespace glabels
 		public:
 			AlignHCenter()
 			{
-				addFile( ":icons/16x16/actions/glabels-align-hcenter.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-hcenter.svg" ) );
 			}
 		};
 
@@ -167,7 +163,7 @@ namespace glabels
 		public:
 			AlignRight()
 			{
-				addFile( ":icons/16x16/actions/glabels-align-right.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-right.svg" ) );
 			}
 		};
 
@@ -177,7 +173,7 @@ namespace glabels
 		public:
 			AlignBottom()
 			{
-				addFile( ":icons/16x16/actions/glabels-align-bottom.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-bottom.svg" ) );
 			}
 		};
 
@@ -187,7 +183,7 @@ namespace glabels
 		public:
 			AlignVCenter()
 			{
-				addFile( ":icons/16x16/actions/glabels-align-vcenter.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-vcenter.svg" ) );
 			}
 		};
 
@@ -197,7 +193,7 @@ namespace glabels
 		public:
 			AlignTop()
 			{
-				addFile( ":icons/16x16/actions/glabels-align-top.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-align-top.svg" ) );
 			}
 		};
 
@@ -207,7 +203,7 @@ namespace glabels
 		public:
 			CenterHoriz()
 			{
-				addFile( ":icons/16x16/actions/glabels-center-horiz.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-center-horiz.svg" ) );
 			}
 		};
 
@@ -217,7 +213,7 @@ namespace glabels
 		public:
 			CenterVert()
 			{
-				addFile( ":icons/16x16/actions/glabels-center-vert.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-center-vert.svg" ) );
 			}
 		};
 
@@ -227,7 +223,7 @@ namespace glabels
 		public:
 			FlipHoriz()
 			{
-				addFile( ":icons/16x16/actions/glabels-flip-horiz.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-flip-horiz.svg" ) );
 			}
 		};
 
@@ -237,7 +233,7 @@ namespace glabels
 		public:
 			FlipVert()
 			{
-				addFile( ":icons/16x16/actions/glabels-flip-vert.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-flip-vert.svg" ) );
 			}
 		};
 
@@ -247,7 +243,7 @@ namespace glabels
 		public:
 			RotateLeft()
 			{
-				addFile( ":icons/16x16/actions/glabels-rotate-left.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-rotate-left.svg" ) );
 			}
 		};
 
@@ -257,7 +253,7 @@ namespace glabels
 		public:
 			RotateRight()
 			{
-				addFile( ":icons/16x16/actions/glabels-rotate-right.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-rotate-right.svg" ) );
 			}
 		};
 
@@ -267,7 +263,7 @@ namespace glabels
 		public:
 			OrderBottom()
 			{
-				addFile( ":icons/16x16/actions/glabels-order-bottom.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-order-bottom.svg" ) );
 			}
 		};
 
@@ -277,7 +273,7 @@ namespace glabels
 		public:
 			OrderTop()
 			{
-				addFile( ":icons/16x16/actions/glabels-order-top.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-order-top.svg" ) );
 			}
 		};
 
diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index ae3eff4..b44189b 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -426,7 +426,7 @@ namespace glabels
 			{
 				mObject = 0;
 
-				titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-object-properties.png") );
+				titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-object-properties.svg") );
 				titleLabel->setText( "Object properties" );
 				setEnabled( false );
 			}
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index f2721a1..e3074d0 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -3,29 +3,27 @@
 <RCC version="1.0">
 <qresource>
 
-	<file>icons/16x16/actions/edit-clear.png</file>
-	<file>icons/16x16/actions/glabels-align-bottom.png</file>
-	<file>icons/16x16/actions/glabels-align-hcenter.png</file>
-	<file>icons/16x16/actions/glabels-align-left.png</file>
-	<file>icons/16x16/actions/glabels-align-right.png</file>
-	<file>icons/16x16/actions/glabels-align-top.png</file>
-	<file>icons/16x16/actions/glabels-align-vcenter.png</file>
+	<file>icons/16x16/actions/edit-clear.svg</file>
+	<file>icons/16x16/actions/glabels-align-bottom.svg</file>
+	<file>icons/16x16/actions/glabels-align-hcenter.svg</file>
+	<file>icons/16x16/actions/glabels-align-left.svg</file>
+	<file>icons/16x16/actions/glabels-align-right.svg</file>
+	<file>icons/16x16/actions/glabels-align-top.svg</file>
+	<file>icons/16x16/actions/glabels-align-vcenter.svg</file>
 	<file>icons/16x16/actions/glabels-arrow.svg</file>
 	<file>icons/16x16/actions/glabels-barcode.svg</file>
 	<file>icons/16x16/actions/glabels-box.svg</file>
-	<file>icons/16x16/actions/glabels-center-horiz.png</file>
-	<file>icons/16x16/actions/glabels-center-vert.png</file>
+	<file>icons/16x16/actions/glabels-center-horiz.svg</file>
+	<file>icons/16x16/actions/glabels-center-vert.svg</file>
 	<file>icons/16x16/actions/glabels-ellipse.svg</file>
-	<file>icons/16x16/actions/glabels-flip-horiz.png</file>
-	<file>icons/16x16/actions/glabels-flip-vert.png</file>
+	<file>icons/16x16/actions/glabels-flip-horiz.svg</file>
+	<file>icons/16x16/actions/glabels-flip-vert.svg</file>
 	<file>icons/16x16/actions/glabels-image.svg</file>
 	<file>icons/16x16/actions/glabels-line.svg</file>
-	<file>icons/16x16/actions/glabels-merge.png</file>
-	<file>icons/16x16/actions/glabels-object-properties.png</file>
-	<file>icons/16x16/actions/glabels-order-bottom.png</file>
-	<file>icons/16x16/actions/glabels-order-top.png</file>
-	<file>icons/16x16/actions/glabels-rotate-left.png</file>
-	<file>icons/16x16/actions/glabels-rotate-right.png</file>
+	<file>icons/16x16/actions/glabels-order-bottom.svg</file>
+	<file>icons/16x16/actions/glabels-order-top.svg</file>
+	<file>icons/16x16/actions/glabels-rotate-left.svg</file>
+	<file>icons/16x16/actions/glabels-rotate-right.svg</file>
 	<file>icons/16x16/actions/glabels-text.svg</file>
 	<file>icons/16x16/actions/glabels-zoom-in.svg</file>
 	<file>icons/16x16/actions/glabels-zoom-one-to-one.svg</file>
@@ -54,7 +52,6 @@
 	<file>icons/22x22/actions/glabels-zoom-out.svg</file>
 	<file>icons/22x22/actions/glabels-zoom-to-fit.svg</file>
 	
-	<file>icons/24x24/actions/edit-clear.png</file>
 	<file>icons/24x24/actions/glabels-align-text-center.svg</file>
 	<file>icons/24x24/actions/glabels-align-text-left.svg</file>
 	<file>icons/24x24/actions/glabels-align-text-right.svg</file>
@@ -67,8 +64,7 @@
 	<file>icons/24x24/actions/glabels-format-text-underline.svg</file>
 	<file>icons/24x24/actions/glabels-image.svg</file>
 	<file>icons/24x24/actions/glabels-line.svg</file>
-	<file>icons/24x24/actions/glabels-merge.png</file>
-	<file>icons/24x24/actions/glabels-object-properties.png</file>
+	<file>icons/24x24/actions/glabels-object-properties.svg</file>
 	<file>icons/24x24/actions/glabels-text.svg</file>
 	<file>icons/24x24/actions/glabels-valign-text-bottom.svg</file>
 	<file>icons/24x24/actions/glabels-valign-text-middle.svg</file>
@@ -81,10 +77,6 @@
 	<file>icons/24x24/actions/file-print.png</file>
 	<file>icons/24x24/actions/file-save-as.png</file>
 	<file>icons/24x24/actions/file-save.png</file>
-	<file>icons/24x24/actions/zoom-best-fit.png</file>
-	<file>icons/24x24/actions/zoom-in.png</file>
-	<file>icons/24x24/actions/zoom-original.png</file>
-	<file>icons/24x24/actions/zoom-out.png</file>
 	<file>icons/24x24/apps/glabels.png</file>
 
 	<file>icons/32x32/apps/glabels.png</file>
diff --git a/glabels/icons/16x16/actions/edit-clear.png b/glabels/icons/16x16/actions/edit-clear.png
deleted file mode 100644
index b88491c..0000000
Binary files a/glabels/icons/16x16/actions/edit-clear.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/edit-clear.svg b/glabels/icons/16x16/actions/edit-clear.svg
new file mode 100644
index 0000000..8af8719
--- /dev/null
+++ b/glabels/icons/16x16/actions/edit-clear.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 1,8 6,3 15,3 15,13 6,13 Z" />
+    
+    <line
+	style="fill:none;stroke:#ffffff;stroke-opacity:1;stroke-width:1.25"
+	x1="7.5" y1="5.5" x2="12.5" y2="10.5" />
+
+    <line
+	style="fill:none;stroke:#ffffff;stroke-opacity:1;stroke-width:1.25"
+	x1="12.5" y1="5.5" x2="7.5" y2="10.5" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-align-bottom.png b/glabels/icons/16x16/actions/glabels-align-bottom.png
deleted file mode 100644
index da901bc..0000000
Binary files a/glabels/icons/16x16/actions/glabels-align-bottom.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-align-bottom.svg b/glabels/icons/16x16/actions/glabels-align-bottom.svg
new file mode 100644
index 0000000..31b2d64
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-align-bottom.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="14.5" x2="15" y2="14.5" />
+
+    <rect
+	style="fill:#fce94f;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="5.5" width="3" height="7" />
+    
+    <rect
+	style="fill:#729fcf;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="6.5" y="1.5" width="3" height="11" />
+    
+    <rect
+	style="fill:#fcaf3e;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="11.5" y="7.5" width="3" height="5" />
+    
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-align-hcenter.png b/glabels/icons/16x16/actions/glabels-align-hcenter.png
deleted file mode 100644
index 684c125..0000000
Binary files a/glabels/icons/16x16/actions/glabels-align-hcenter.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-align-hcenter.svg b/glabels/icons/16x16/actions/glabels-align-hcenter.svg
new file mode 100644
index 0000000..8b5514d
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-align-hcenter.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <rect
+	style="fill:#fce94f;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="3.5" y="1.5" width="8" height="3" />
+    
+    <rect
+	style="fill:#729fcf;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="6.5" width="12" height="3" />
+    
+    <rect
+	style="fill:#fcaf3e;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="4.5" y="11.5" width="6" height="3" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="7.5" y1="1" x2="7.5" y2="15" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-align-left.png b/glabels/icons/16x16/actions/glabels-align-left.png
deleted file mode 100644
index 1cdcf9b..0000000
Binary files a/glabels/icons/16x16/actions/glabels-align-left.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-align-left.svg b/glabels/icons/16x16/actions/glabels-align-left.svg
new file mode 100644
index 0000000..3e56986
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-align-left.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <rect
+	style="fill:#fce94f;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="3.5" y="1.5" width="7" height="3" />
+    
+    <rect
+	style="fill:#729fcf;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="3.5" y="6.5" width="11" height="3" />
+    
+    <rect
+	style="fill:#fcaf3e;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="3.5" y="11.5" width="5" height="3" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1.5" y1="1" x2="1.5" y2="15" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-align-right.png b/glabels/icons/16x16/actions/glabels-align-right.png
deleted file mode 100644
index 2b4872b..0000000
Binary files a/glabels/icons/16x16/actions/glabels-align-right.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-align-right.svg b/glabels/icons/16x16/actions/glabels-align-right.svg
new file mode 100644
index 0000000..117db76
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-align-right.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <rect
+	style="fill:#fce94f;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="5.5" y="1.5" width="7" height="3" />
+    
+    <rect
+	style="fill:#729fcf;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="6.5" width="11" height="3" />
+    
+    <rect
+	style="fill:#fcaf3e;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="7.5" y="11.5" width="5" height="3" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="14.5" y1="1" x2="14.5" y2="15" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-align-top.png b/glabels/icons/16x16/actions/glabels-align-top.png
deleted file mode 100644
index 5bda931..0000000
Binary files a/glabels/icons/16x16/actions/glabels-align-top.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-align-top.svg b/glabels/icons/16x16/actions/glabels-align-top.svg
new file mode 100644
index 0000000..c99aff4
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-align-top.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="1.5" x2="15" y2="1.5" />
+
+    <rect
+	style="fill:#fce94f;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="3.5" width="3" height="7" />
+    
+    <rect
+	style="fill:#729fcf;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="6.5" y="3.5" width="3" height="11" />
+    
+    <rect
+	style="fill:#fcaf3e;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="11.5" y="3.5" width="3" height="5" />
+    
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-align-vcenter.png b/glabels/icons/16x16/actions/glabels-align-vcenter.png
deleted file mode 100644
index a51293f..0000000
Binary files a/glabels/icons/16x16/actions/glabels-align-vcenter.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-align-vcenter.svg b/glabels/icons/16x16/actions/glabels-align-vcenter.svg
new file mode 100644
index 0000000..fe9d2da
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-align-vcenter.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <rect
+	style="fill:#fce94f;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="4.5" width="3" height="8" />
+    
+    <rect
+	style="fill:#729fcf;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="6.5" y="2.5" width="3" height="12" />
+    
+    <rect
+	style="fill:#fcaf3e;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="11.5" y="5.5" width="3" height="6" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="8.5" x2="15" y2="8.5" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-center-horiz.png b/glabels/icons/16x16/actions/glabels-center-horiz.png
deleted file mode 100644
index fce3e90..0000000
Binary files a/glabels/icons/16x16/actions/glabels-center-horiz.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-center-horiz.svg b/glabels/icons/16x16/actions/glabels-center-horiz.svg
new file mode 100644
index 0000000..e9e8df2
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-center-horiz.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="7.5" y1="1" x2="7.5" y2="14" />
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7,7.5 4,5 4,10 Z" />
+    
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 8,7.5 11,5 11,10 Z" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="7.5" x2="6" y2="7.5" />
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="9" y1="7.5" x2="14" y2="7.5" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-center-vert.png b/glabels/icons/16x16/actions/glabels-center-vert.png
deleted file mode 100644
index 08b19af..0000000
Binary files a/glabels/icons/16x16/actions/glabels-center-vert.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-center-vert.svg b/glabels/icons/16x16/actions/glabels-center-vert.svg
new file mode 100644
index 0000000..4c6fa1b
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-center-vert.svg
@@ -0,0 +1,23 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="7.5" x2="14" y2="7.5" />
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7.5,7 5,4 10,4 Z" />
+    
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7.5,8 5,11 10,11 Z" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="7.5" y1="1" x2="7.5" y2="6" />
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="7.5" y1="9" x2="7.5" y2="14" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-flip-horiz.png b/glabels/icons/16x16/actions/glabels-flip-horiz.png
deleted file mode 100644
index e477068..0000000
Binary files a/glabels/icons/16x16/actions/glabels-flip-horiz.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-flip-horiz.svg b/glabels/icons/16x16/actions/glabels-flip-horiz.svg
new file mode 100644
index 0000000..9fe84f7
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-flip-horiz.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 1.5,7.5 4.5,4.5 4.5,10.5 Z" />
+    
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 14.5,7.5 11.5,4.5 11.5,10.5 Z" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="4" y1="6.5" x2="12" y2="6.5" />
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="4" y1="8.5" x2="12" y2="8.5" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-flip-vert.png b/glabels/icons/16x16/actions/glabels-flip-vert.png
deleted file mode 100644
index 93027c9..0000000
Binary files a/glabels/icons/16x16/actions/glabels-flip-vert.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-flip-vert.svg b/glabels/icons/16x16/actions/glabels-flip-vert.svg
new file mode 100644
index 0000000..318c919
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-flip-vert.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7.5,1.5 4.5,4.5 10.5,4.5 Z" />
+    
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7.5,14.5 4.5,11.5 10.5,11.5 Z" />
+    
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="6.5" y1="4" x2="6.5" y2="12" />
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="8.5" y1="4" x2="8.5" y2="12" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-merge.png b/glabels/icons/16x16/actions/glabels-merge.png
deleted file mode 100644
index 2a3bfe8..0000000
Binary files a/glabels/icons/16x16/actions/glabels-merge.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-order-bottom.png b/glabels/icons/16x16/actions/glabels-order-bottom.png
deleted file mode 100644
index f6ed2d0..0000000
Binary files a/glabels/icons/16x16/actions/glabels-order-bottom.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-order-bottom.svg b/glabels/icons/16x16/actions/glabels-order-bottom.svg
new file mode 100644
index 0000000..5d93a24
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-order-bottom.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <rect
+	style="fill:#8ae234;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="3.5" width="9" height="9" />
+    
+    <rect
+	style="fill:#999999;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="7.5" y="1.5" width="7" height="7" />
+    
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-order-top.png b/glabels/icons/16x16/actions/glabels-order-top.png
deleted file mode 100644
index 0884bc1..0000000
Binary files a/glabels/icons/16x16/actions/glabels-order-top.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-order-top.svg b/glabels/icons/16x16/actions/glabels-order-top.svg
new file mode 100644
index 0000000..d61089c
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-order-top.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <rect
+	style="fill:#999999;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="1.5" y="7.5" width="7" height="7" />
+    
+    <rect
+	style="fill:#8ae234;fill-opacity:1;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x="5.5" y="1.5" width="9" height="9" />
+    
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-rotate-left.png b/glabels/icons/16x16/actions/glabels-rotate-left.png
deleted file mode 100644
index 157884e..0000000
Binary files a/glabels/icons/16x16/actions/glabels-rotate-left.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-rotate-left.svg b/glabels/icons/16x16/actions/glabels-rotate-left.svg
new file mode 100644
index 0000000..0a88ecb
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-rotate-left.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="3.5" y1="1" x2="3.5" y2="15" />
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="12.5" x2="15" y2="12.5" />
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 4,3.5 7,1 7,6 Z" />
+    
+    <path
+       style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+       d="M 12.5,12.5 A 9,9 0 0,0 5.5,3.5" />
+    
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-rotate-right.png b/glabels/icons/16x16/actions/glabels-rotate-right.png
deleted file mode 100644
index cc5dc49..0000000
Binary files a/glabels/icons/16x16/actions/glabels-rotate-right.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-rotate-right.svg b/glabels/icons/16x16/actions/glabels-rotate-right.svg
new file mode 100644
index 0000000..af9f6ab
--- /dev/null
+++ b/glabels/icons/16x16/actions/glabels-rotate-right.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="12.5" y1="1" x2="12.5" y2="15" />
+
+    <line
+	style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+	x1="1" y1="12.5" x2="15" y2="12.5" />
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 12,3.5 9,1 9,6 Z" />
+    
+    <path
+       style="fill:none;stroke:#333333;stroke-opacity:1;stroke-width:1"
+       d="M 11.5,3.5 A 9,9 0 0,0 3.5,12.5" />
+    
+</svg>
diff --git a/glabels/icons/24x24/actions/edit-clear.png b/glabels/icons/24x24/actions/edit-clear.png
deleted file mode 100644
index b85fa29..0000000
Binary files a/glabels/icons/24x24/actions/edit-clear.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-merge.png b/glabels/icons/24x24/actions/glabels-merge.png
deleted file mode 100644
index af61200..0000000
Binary files a/glabels/icons/24x24/actions/glabels-merge.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-object-properties.png b/glabels/icons/24x24/actions/glabels-object-properties.png
deleted file mode 100644
index f592606..0000000
Binary files a/glabels/icons/24x24/actions/glabels-object-properties.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-object-properties.svg b/glabels/icons/24x24/actions/glabels-object-properties.svg
new file mode 100644
index 0000000..85353be
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-object-properties.svg
@@ -0,0 +1,11 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="15" height="15" x="5.5" y="2.5" />
+
+  <path
+     style="fill:#eeeeee;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+      d="M 6.5,5.5 5.5,5.5 3.5,7.5 3.5,9.5 5.5,11.5 5.5,16.5 3.5,18.5 3.5,20.5 5.5,22.5 6.5,22.5 6.5,19.5 9.5,19.5 9.5,22.5 10.5,22.5 12.5,20.5 12.5,18.5 10.5,16.5 10.5,11.5 12.5,9.5 12.5,7.5 10.5,5.5 9.5,5.5 9.5,8.5 6.5,8.5 Z" />
+  
+</svg>
diff --git a/glabels/icons/24x24/actions/zoom-best-fit.png b/glabels/icons/24x24/actions/zoom-best-fit.png
deleted file mode 100644
index 6bb5257..0000000
Binary files a/glabels/icons/24x24/actions/zoom-best-fit.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/zoom-in.png b/glabels/icons/24x24/actions/zoom-in.png
deleted file mode 100644
index 18bc5f4..0000000
Binary files a/glabels/icons/24x24/actions/zoom-in.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/zoom-original.png b/glabels/icons/24x24/actions/zoom-original.png
deleted file mode 100644
index 9761f7a..0000000
Binary files a/glabels/icons/24x24/actions/zoom-original.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/zoom-out.png b/glabels/icons/24x24/actions/zoom-out.png
deleted file mode 100644
index bcd3599..0000000
Binary files a/glabels/icons/24x24/actions/zoom-out.png and /dev/null differ
diff --git a/glabels/ui/SelectProductDialog.ui b/glabels/ui/SelectProductDialog.ui
index bd1379b..7da79b3 100644
--- a/glabels/ui/SelectProductDialog.ui
+++ b/glabels/ui/SelectProductDialog.ui
@@ -70,7 +70,7 @@
                  </property>
                  <property name="icon">
                   <iconset resource="../icons.qrc">
-                   <normaloff>:/icons/16x16/actions/edit-clear.png</normaloff>:/icons/16x16/actions/edit-clear.png</iconset>
+                   <normaloff>:/icons/16x16/actions/edit-clear.svg</normaloff>:/icons/16x16/actions/edit-clear.svg</iconset>
                  </property>
                  <property name="iconSize">
                   <size>
@@ -170,16 +170,7 @@
                 <item>
                  <widget class="QWidget" name="categoriesCheckContainer" native="true">
                   <layout class="QGridLayout" name="gridLayout">
-                   <property name="leftMargin">
-                    <number>0</number>
-                   </property>
-                   <property name="topMargin">
-                    <number>0</number>
-                   </property>
-                   <property name="rightMargin">
-                    <number>0</number>
-                   </property>
-                   <property name="bottomMargin">
+                   <property name="margin">
                     <number>0</number>
                    </property>
                    <property name="spacing">