diff --git a/.gitignore b/.gitignore
index a504685..c526c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,4 @@ gmon.out
 core
 *.safe
 *.sav*
+.directory
diff --git a/glabels/Icons.h b/glabels/Icons.h
index 9c9d995..194c444 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -40,7 +40,8 @@ namespace glabels
 			Arrow()
 			{
 				addFile( ":icons/16x16/actions/glabels-arrow.png" );
-				addFile( ":icons/24x24/actions/glabels-arrow.png" );
+				addFile( ":icons/22x22/actions/glabels-arrow.svg" );
+				addFile( ":icons/24x24/actions/glabels-arrow.svg" );
 			}
 		};
 
@@ -51,7 +52,8 @@ namespace glabels
 			Barcode()
 			{
 				addFile( ":icons/16x16/actions/glabels-barcode.png" );
-				addFile( ":icons/24x24/actions/glabels-barcode.png" );
+				addFile( ":icons/22x22/actions/glabels-barcode.svg" );
+				addFile( ":icons/24x24/actions/glabels-barcode.svg" );
 			}
 		};
 
@@ -62,7 +64,8 @@ namespace glabels
 			Box()
 			{
 				addFile( ":icons/16x16/actions/glabels-box.png" );
-				addFile( ":icons/24x24/actions/glabels-box.png" );
+				addFile( ":icons/22x22/actions/glabels-box.svg" );
+				addFile( ":icons/24x24/actions/glabels-box.svg" );
 			}
 		};
 
@@ -73,7 +76,8 @@ namespace glabels
 			Ellipse()
 			{
 				addFile( ":icons/16x16/actions/glabels-ellipse.png" );
-				addFile( ":icons/24x24/actions/glabels-ellipse.png" );
+				addFile( ":icons/22x22/actions/glabels-ellipse.svg" );
+				addFile( ":icons/24x24/actions/glabels-ellipse.svg" );
 			}
 		};
 
@@ -84,7 +88,8 @@ namespace glabels
 			Image()
 			{
 				addFile( ":icons/16x16/actions/glabels-image.png" );
-				addFile( ":icons/24x24/actions/glabels-image.png" );
+				addFile( ":icons/22x22/actions/glabels-image.svg" );
+				addFile( ":icons/24x24/actions/glabels-image.svg" );
 			}
 		};
 
@@ -95,7 +100,8 @@ namespace glabels
 			Line()
 			{
 				addFile( ":icons/16x16/actions/glabels-line.png" );
-				addFile( ":icons/24x24/actions/glabels-line.png" );
+				addFile( ":icons/22x22/actions/glabels-line.svg" );
+				addFile( ":icons/24x24/actions/glabels-line.svg" );
 			}
 		};
 
@@ -106,7 +112,8 @@ namespace glabels
 			Text()
 			{
 				addFile( ":icons/16x16/actions/glabels-text.png" );
-				addFile( ":icons/24x24/actions/glabels-text.png" );
+				addFile( ":icons/22x22/actions/glabels-text.svg" );
+				addFile( ":icons/24x24/actions/glabels-text.svg" );
 			}
 		};
 
diff --git a/glabels/ObjectEditor.cpp b/glabels/ObjectEditor.cpp
index dbc569f..ae3eff4 100644
--- a/glabels/ObjectEditor.cpp
+++ b/glabels/ObjectEditor.cpp
@@ -313,7 +313,7 @@ namespace glabels
 
 				if ( dynamic_cast<LabelModelBoxObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-box.svg") );
 					titleLabel->setText( tr("Box object properties") );
 
 					notebook->addTab( lineFillPage, "line/fill" );
@@ -334,7 +334,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelEllipseObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-ellipse.svg") );
 					titleLabel->setText( tr("Ellipse object properties") );
 
 					notebook->addTab( lineFillPage, "line/fill" );
@@ -355,7 +355,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelImageObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-image.svg") );
 					titleLabel->setText( tr("Image object properties") );
 
 					notebook->addTab( imagePage, "image" );
@@ -375,7 +375,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelLineObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-line.svg") );
 					titleLabel->setText( tr("Line object properties") );
 
 					notebook->addTab( lineFillPage, "line/fill" );
@@ -396,7 +396,7 @@ namespace glabels
 				}
 				else if ( dynamic_cast<LabelModelTextObject*>(mObject) )
 				{
-					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.png") );
+					titleImageLabel->setPixmap( QPixmap(":icons/24x24/actions/glabels-text.svg") );
 					titleLabel->setText( tr("Text object properties") );
 
 					notebook->addTab( textPage, "text" );
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index 8729ca3..b1e0494 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -2,6 +2,7 @@
 
 <RCC version="1.0">
 <qresource>
+
 	<file>icons/16x16/actions/edit-clear.png</file>
 	<file>icons/16x16/actions/edit-find.png</file>
 	<file>icons/16x16/actions/glabels-align-bottom.png</file>
@@ -30,25 +31,34 @@
 	<file>icons/16x16/actions/glabels-rotate-right.png</file>
 	<file>icons/16x16/actions/glabels-text.png</file>
 	<file>icons/16x16/apps/glabels.png</file>
+	
+	<file>icons/22x22/actions/glabels-arrow.svg</file>
+	<file>icons/22x22/actions/glabels-barcode.svg</file>
+	<file>icons/22x22/actions/glabels-box.svg</file>
+	<file>icons/22x22/actions/glabels-ellipse.svg</file>
+	<file>icons/22x22/actions/glabels-image.svg</file>
+	<file>icons/22x22/actions/glabels-line.svg</file>
+	<file>icons/22x22/actions/glabels-text.svg</file>
+	
 	<file>icons/24x24/actions/edit-clear.png</file>
 	<file>icons/24x24/actions/edit-find.png</file>
 	<file>icons/24x24/actions/glabels-align-text-center.png</file>
 	<file>icons/24x24/actions/glabels-align-text-left.png</file>
 	<file>icons/24x24/actions/glabels-align-text-right.png</file>
-	<file>icons/24x24/actions/glabels-arrow.png</file>
-	<file>icons/24x24/actions/glabels-barcode.png</file>
-	<file>icons/24x24/actions/glabels-box.png</file>
+	<file>icons/24x24/actions/glabels-arrow.svg</file>
+	<file>icons/24x24/actions/glabels-barcode.svg</file>
+	<file>icons/24x24/actions/glabels-box.svg</file>
 	<file>icons/24x24/actions/glabels-bucket-fill.png</file>
-	<file>icons/24x24/actions/glabels-ellipse.png</file>
+	<file>icons/24x24/actions/glabels-ellipse.svg</file>
 	<file>icons/24x24/actions/glabels-format-text-bold.png</file>
 	<file>icons/24x24/actions/glabels-format-text-italic.png</file>
 	<file>icons/24x24/actions/glabels-format-text-underline.png</file>
-	<file>icons/24x24/actions/glabels-image.png</file>
-	<file>icons/24x24/actions/glabels-line.png</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-pencil.png</file>
-	<file>icons/24x24/actions/glabels-text.png</file>
+	<file>icons/24x24/actions/glabels-text.svg</file>
 	<file>icons/24x24/actions/glabels-valign-text-bottom.png</file>
 	<file>icons/24x24/actions/glabels-valign-text-middle.png</file>
 	<file>icons/24x24/actions/glabels-valign-text-top.png</file>
@@ -65,12 +75,16 @@
 	<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>
 	<file>icons/32x32/actions/file-print.png</file>
 	<file>icons/32x32/actions/horizontal-orientation.png</file>
 	<file>icons/32x32/actions/select-product.png</file>
 	<file>icons/32x32/actions/vertical-orientation.png</file>
+
 	<file>icons/48x48/apps/glabels.png</file>
+
 	<file>icons/scalable/apps/glabels.svg</file>
+
 </qresource>
 </RCC>
diff --git a/glabels/icons/22x22/actions/glabels-arrow.svg b/glabels/icons/22x22/actions/glabels-arrow.svg
new file mode 100644
index 0000000..5432256
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-arrow.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 7,5 7,17 11,13 17,13 Z" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-barcode.svg b/glabels/icons/22x22/actions/glabels-barcode.svg
new file mode 100644
index 0000000..b6bc783
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-barcode.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="3" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="5" y="4" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="8" y="4" width="3" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="12" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="14" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="16" y="4" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="19" y="4" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-box.svg b/glabels/icons/22x22/actions/glabels-box.svg
new file mode 100644
index 0000000..4f64e21
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-box.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="15" height="15" x="3.5" y="3.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-ellipse.svg b/glabels/icons/22x22/actions/glabels-ellipse.svg
new file mode 100644
index 0000000..1c83912
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-ellipse.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <circle
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="8" cx="10.5" cy="10.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-image.svg b/glabels/icons/22x22/actions/glabels-image.svg
new file mode 100644
index 0000000..8d16202
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-image.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="2.5" y="2.5" width="17" height="17"
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1" />
+
+  <path d="M 9,8 4,18 9,18 18,18 14,11 12,14 Z "
+     style="fill:#65a9f2;fill-opacity:1;stroke:none" />
+
+  <circle r="2" cx="14" cy="7"
+     style="fill:#fc8200;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-line.svg b/glabels/icons/22x22/actions/glabels-line.svg
new file mode 100644
index 0000000..090f9de
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-line.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <line
+     style="stroke:#333333;stroke-width:1.5;stroke-opacity:1"
+     x1="2.5" y1="19.5" x2="19.5" y2="2.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-text.svg b/glabels/icons/22x22/actions/glabels-text.svg
new file mode 100644
index 0000000..da58f45
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-text.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="22" width="22" >
+
+  <path
+       style="fill:#333333;fill-opacity:1"
+       d="M 8,19 8,18 10,18 10,4 6,4 5,7 4,7 4,3 19,3 19,7 18,7 17,4 13,4 13,18 15,18 15,19 9,19 z" />
+  
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-arrow.png b/glabels/icons/24x24/actions/glabels-arrow.png
deleted file mode 100644
index 6e0e26a..0000000
Binary files a/glabels/icons/24x24/actions/glabels-arrow.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-arrow.svg b/glabels/icons/24x24/actions/glabels-arrow.svg
new file mode 100644
index 0000000..09f54e9
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-arrow.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+    <path
+       style="fill:#333333;fill-opacity:1;stroke:none"
+       d="M 8,6 8,18 12,14 18,14 Z" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-barcode.png b/glabels/icons/24x24/actions/glabels-barcode.png
deleted file mode 100644
index 9699c8d..0000000
Binary files a/glabels/icons/24x24/actions/glabels-barcode.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-barcode.svg b/glabels/icons/24x24/actions/glabels-barcode.svg
new file mode 100644
index 0000000..3c81f82
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-barcode.svg
@@ -0,0 +1,24 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect x="4" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="6" y="5" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="9" y="5" width="3" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="13" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="15" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="17" y="5" width="2" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="20" y="5" width="1" height="14"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-box.png b/glabels/icons/24x24/actions/glabels-box.png
deleted file mode 100644
index 9f8e06f..0000000
Binary files a/glabels/icons/24x24/actions/glabels-box.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-box.svg b/glabels/icons/24x24/actions/glabels-box.svg
new file mode 100644
index 0000000..e3ea92c
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-box.svg
@@ -0,0 +1,7 @@
+<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="4.5" y="4.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-ellipse.png b/glabels/icons/24x24/actions/glabels-ellipse.png
deleted file mode 100644
index 12f0468..0000000
Binary files a/glabels/icons/24x24/actions/glabels-ellipse.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-ellipse.svg b/glabels/icons/24x24/actions/glabels-ellipse.svg
new file mode 100644
index 0000000..c52539d
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-ellipse.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <circle
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="8" cx="11.5" cy="11.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-image.png b/glabels/icons/24x24/actions/glabels-image.png
deleted file mode 100644
index 093c8ad..0000000
Binary files a/glabels/icons/24x24/actions/glabels-image.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-image.svg b/glabels/icons/24x24/actions/glabels-image.svg
new file mode 100644
index 0000000..3a372c9
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-image.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect x="3.5" y="3.5" width="17" height="17"
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1" />
+
+  <path d="M 10,9 5,19 10,19 19,19 15,12 13,15 Z "
+     style="fill:#65a9f2;fill-opacity:1;stroke:none" />
+
+  <circle r="2" cx="15" cy="8"
+     style="fill:#fc8200;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-line.png b/glabels/icons/24x24/actions/glabels-line.png
deleted file mode 100644
index 7bb6523..0000000
Binary files a/glabels/icons/24x24/actions/glabels-line.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-line.svg b/glabels/icons/24x24/actions/glabels-line.svg
new file mode 100644
index 0000000..83c9285
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-line.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <line
+     style="stroke:#333333;stroke-width:1.5;stroke-opacity:1"
+     x1="3.5" y1="20.5" x2="20.5" y2="3.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-text.png b/glabels/icons/24x24/actions/glabels-text.png
deleted file mode 100644
index b9e5511..0000000
Binary files a/glabels/icons/24x24/actions/glabels-text.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-text.svg b/glabels/icons/24x24/actions/glabels-text.svg
new file mode 100644
index 0000000..5420118
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-text.svg
@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" height="24" width="24" >
+
+  <path
+       style="fill:#333333;fill-opacity:1"
+       d="M 9,20 9,19 11,19 11,5 7,5 6,8 5,8 5,4 20,4 20,8 19,8 18,5 14,5 14,19 16,19 16,20 10,20 z" />
+  
+</svg>