diff --git a/glabels/Icons.h b/glabels/Icons.h
index a162738..1d9209f 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -39,9 +39,9 @@ namespace glabels
 		public:
 			Arrow()
 			{
-				addFile( ":icons/16x16/actions/glabels-arrow.png" );
-				addFile( ":icons/22x22/actions/glabels-arrow.svg" );
-				addFile( ":icons/24x24/actions/glabels-arrow.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-arrow.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-arrow.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-arrow.svg" ) );
 			}
 		};
 
@@ -51,9 +51,9 @@ namespace glabels
 		public:
 			Barcode()
 			{
-				addFile( ":icons/16x16/actions/glabels-barcode.png" );
-				addFile( ":icons/22x22/actions/glabels-barcode.svg" );
-				addFile( ":icons/24x24/actions/glabels-barcode.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-barcode.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-barcode.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-barcode.svg" ) );
 			}
 		};
 
@@ -63,9 +63,9 @@ namespace glabels
 		public:
 			Box()
 			{
-				addFile( ":icons/16x16/actions/glabels-box.png" );
-				addFile( ":icons/22x22/actions/glabels-box.svg" );
-				addFile( ":icons/24x24/actions/glabels-box.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-box.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-box.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-box.svg" ) );
 			}
 		};
 
@@ -75,9 +75,9 @@ namespace glabels
 		public:
 			Ellipse()
 			{
-				addFile( ":icons/16x16/actions/glabels-ellipse.png" );
-				addFile( ":icons/22x22/actions/glabels-ellipse.svg" );
-				addFile( ":icons/24x24/actions/glabels-ellipse.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-ellipse.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-ellipse.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-ellipse.svg" ) );
 			}
 		};
 
@@ -87,9 +87,9 @@ namespace glabels
 		public:
 			Image()
 			{
-				addFile( ":icons/16x16/actions/glabels-image.png" );
-				addFile( ":icons/22x22/actions/glabels-image.svg" );
-				addFile( ":icons/24x24/actions/glabels-image.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-image.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-image.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-image.svg" ) );
 			}
 		};
 
@@ -99,9 +99,9 @@ namespace glabels
 		public:
 			Line()
 			{
-				addFile( ":icons/16x16/actions/glabels-line.png" );
-				addFile( ":icons/22x22/actions/glabels-line.svg" );
-				addFile( ":icons/24x24/actions/glabels-line.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-line.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-line.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-line.svg" ) );
 			}
 		};
 
@@ -111,9 +111,9 @@ namespace glabels
 		public:
 			Text()
 			{
-				addFile( ":icons/16x16/actions/glabels-text.png" );
-				addFile( ":icons/22x22/actions/glabels-text.svg" );
-				addFile( ":icons/24x24/actions/glabels-text.svg" );
+				addPixmap( QPixmap( ":icons/16x16/actions/glabels-text.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-text.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-text.svg" ) );
 			}
 		};
 
@@ -146,8 +146,8 @@ namespace glabels
 			AlignLeft()
 			{
 				addFile( ":icons/16x16/actions/glabels-align-left.png" );
-				addFile( ":icons/22x22/actions/glabels-align-left.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-left.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-left.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-left.svg" ) );
 			}
 		};
 
@@ -287,8 +287,8 @@ namespace glabels
 		public:
 			AlignTextLeft()
 			{
-				addFile( ":icons/22x22/actions/glabels-align-text-left.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-text-left.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-left.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-left.svg" ) );
 			}
 		};
 
@@ -298,8 +298,8 @@ namespace glabels
 		public:
 			AlignTextCenter()
 			{
-				addFile( ":icons/22x22/actions/glabels-align-text-center.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-text-center.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-center.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-center.svg" ) );
 			}
 		};
 
@@ -309,8 +309,8 @@ namespace glabels
 		public:
 			AlignTextRight()
 			{
-				addFile( ":icons/22x22/actions/glabels-align-text-right.svg" );
-				addFile( ":icons/24x24/actions/glabels-align-text-right.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-align-text-right.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-align-text-right.svg" ) );
 			}
 		};
 
@@ -320,8 +320,8 @@ namespace glabels
 		public:
 			AlignTextBottom()
 			{
-				addFile( ":icons/22x22/actions/glabels-valign-text-bottom.svg" );
-				addFile( ":icons/24x24/actions/glabels-valign-text-bottom.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-bottom.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-bottom.svg" ) );
 			}
 		};
 
@@ -331,8 +331,8 @@ namespace glabels
 		public:
 			AlignTextMiddle()
 			{
-				addFile( ":icons/22x22/actions/glabels-valign-text-middle.svg" );
-				addFile( ":icons/24x24/actions/glabels-valign-text-middle.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-middle.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-middle.svg" ) );
 			}
 		};
 
@@ -342,8 +342,8 @@ namespace glabels
 		public:
 			AlignTextTop()
 			{
-				addFile( ":icons/22x22/actions/glabels-valign-text-top.svg" );
-				addFile( ":icons/24x24/actions/glabels-valign-text-top.svg" );
+				addPixmap( QPixmap( ":icons/22x22/actions/glabels-valign-text-top.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/glabels-valign-text-top.svg" ) );
 			}
 		};
 
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index 78790e6..38c18c5 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -11,17 +11,17 @@
 	<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/glabels-arrow.png</file>
-	<file>icons/16x16/actions/glabels-barcode.png</file>
-	<file>icons/16x16/actions/glabels-box.png</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-bucket-fill.png</file>
 	<file>icons/16x16/actions/glabels-center-horiz.png</file>
 	<file>icons/16x16/actions/glabels-center-vert.png</file>
-	<file>icons/16x16/actions/glabels-ellipse.png</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-image.png</file>
-	<file>icons/16x16/actions/glabels-line.png</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>
@@ -29,7 +29,7 @@
 	<file>icons/16x16/actions/glabels-pencil.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-text.png</file>
+	<file>icons/16x16/actions/glabels-text.svg</file>
 	<file>icons/16x16/apps/glabels.png</file>
 	
 	<file>icons/22x22/actions/glabels-align-text-center.svg</file>
diff --git a/glabels/icons/16x16/actions/glabels-arrow.png b/glabels/icons/16x16/actions/glabels-arrow.png
deleted file mode 100644
index 0ae5f36..0000000
Binary files a/glabels/icons/16x16/actions/glabels-arrow.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-barcode.png b/glabels/icons/16x16/actions/glabels-barcode.png
deleted file mode 100644
index 6e0e289..0000000
Binary files a/glabels/icons/16x16/actions/glabels-barcode.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-box.png b/glabels/icons/16x16/actions/glabels-box.png
deleted file mode 100644
index c141c9d..0000000
Binary files a/glabels/icons/16x16/actions/glabels-box.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-ellipse.png b/glabels/icons/16x16/actions/glabels-ellipse.png
deleted file mode 100644
index 9652562..0000000
Binary files a/glabels/icons/16x16/actions/glabels-ellipse.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-image.png b/glabels/icons/16x16/actions/glabels-image.png
deleted file mode 100644
index ee9ed3d..0000000
Binary files a/glabels/icons/16x16/actions/glabels-image.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-line.png b/glabels/icons/16x16/actions/glabels-line.png
deleted file mode 100644
index cf0e040..0000000
Binary files a/glabels/icons/16x16/actions/glabels-line.png and /dev/null differ
diff --git a/glabels/icons/16x16/actions/glabels-text.png b/glabels/icons/16x16/actions/glabels-text.png
deleted file mode 100644
index c539bf1..0000000
Binary files a/glabels/icons/16x16/actions/glabels-text.png and /dev/null differ
diff --git a/glabels/icons/22x22/actions/glabels-ellipse.svg b/glabels/icons/22x22/actions/glabels-ellipse.svg
index 1c83912..a948295 100644
--- a/glabels/icons/22x22/actions/glabels-ellipse.svg
+++ b/glabels/icons/22x22/actions/glabels-ellipse.svg
@@ -2,6 +2,6 @@
 
   <circle
      style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
-     r="8" cx="10.5" cy="10.5" />
+     r="8" cx="11" cy="11" />
 
 </svg>
diff --git a/glabels/icons/24x24/actions/glabels-ellipse.svg b/glabels/icons/24x24/actions/glabels-ellipse.svg
index c52539d..95da070 100644
--- a/glabels/icons/24x24/actions/glabels-ellipse.svg
+++ b/glabels/icons/24x24/actions/glabels-ellipse.svg
@@ -2,6 +2,6 @@
 
   <circle
      style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
-     r="8" cx="11.5" cy="11.5" />
+     r="8" cx="12" cy="12" />
 
 </svg>