diff --git a/glabels/Icons.h b/glabels/Icons.h
index 70bad62..0a956ba 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -363,7 +363,9 @@ namespace glabels
 		public:
 			EditCopy()
 			{
-				addFile( ":icons/24x24/actions/edit-copy.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/edit-copy.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/edit-copy.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/edit-copy.svg" ) );
 			}
 		};
 
@@ -373,7 +375,9 @@ namespace glabels
 		public:
 			EditCut()
 			{
-				addFile( ":icons/24x24/actions/edit-cut.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/edit-cut.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/edit-cut.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/edit-cut.svg" ) );
 			}
 		};
 
@@ -383,7 +387,9 @@ namespace glabels
 		public:
 			EditPaste()
 			{
-				addFile( ":icons/24x24/actions/edit-paste.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/edit-paste.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/edit-paste.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/edit-paste.svg" ) );
 			}
 		};
 
@@ -393,7 +399,9 @@ namespace glabels
 		public:
 			FileNew()
 			{
-				addFile( ":icons/24x24/actions/file-new.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/file-new.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/file-new.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/file-new.svg" ) );
 			}
 		};
 
@@ -403,7 +411,9 @@ namespace glabels
 		public:
 			FileOpen()
 			{
-				addFile( ":icons/24x24/actions/file-open.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/file-open.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/file-open.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/file-open.svg" ) );
 			}
 		};
 
@@ -413,7 +423,6 @@ namespace glabels
 		public:
 			FilePrint()
 			{
-				addFile( ":icons/24x24/actions/file-print.png" );
 				addFile( ":icons/32x32/actions/file-print.png" );
 			}
 		};
@@ -424,7 +433,9 @@ namespace glabels
 		public:
 			FileSave()
 			{
-				addFile( ":icons/24x24/actions/file-save.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/file-save.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/file-save.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/file-save.svg" ) );
 			}
 		};
 
@@ -434,7 +445,9 @@ namespace glabels
 		public:
 			FileSaveAs()
 			{
-				addFile( ":icons/24x24/actions/file-save-as.png" );
+				addPixmap( QPixmap( ":icons/16x16/actions/file-save-as.svg" ) );
+				addPixmap( QPixmap( ":icons/22x22/actions/file-save-as.svg" ) );
+				addPixmap( QPixmap( ":icons/24x24/actions/file-save-as.svg" ) );
 			}
 		};
 
diff --git a/glabels/MainWindow.cpp b/glabels/MainWindow.cpp
index b47ef4d..0f9a666 100644
--- a/glabels/MainWindow.cpp
+++ b/glabels/MainWindow.cpp
@@ -230,25 +230,25 @@ namespace glabels
 	{
 		/* File actions */
 		fileNewAction = new QAction( tr("&New..."), this );
-		fileNewAction->setIcon( QIcon::fromTheme( "document-new", Icons::FileNew() ) );
+		fileNewAction->setIcon( Icons::FileNew() );
 		fileNewAction->setShortcut( QKeySequence::New );
 		fileNewAction->setStatusTip( tr("Create a new gLabels project") );
 		connect( fileNewAction, SIGNAL(triggered()), this, SLOT(fileNew()) );
 
 		fileOpenAction = new QAction( tr("&Open..."), this );
-		fileOpenAction->setIcon( QIcon::fromTheme( "document-open", Icons::FileOpen() ) );
+		fileOpenAction->setIcon( Icons::FileOpen() );
 		fileOpenAction->setShortcut( QKeySequence::Open );
 		fileOpenAction->setStatusTip( tr("Open an existing gLabels project") );
 		connect( fileOpenAction, SIGNAL(triggered()), this, SLOT(fileOpen()) );
 
 		fileSaveAction = new QAction( tr("&Save"), this );
-		fileSaveAction->setIcon( QIcon::fromTheme( "document-save", Icons::FileSave() ) );
+		fileSaveAction->setIcon( Icons::FileSave() );
 		fileSaveAction->setShortcut( QKeySequence::Save );
 		fileSaveAction->setStatusTip( tr("Save current gLabels project") );
 		connect( fileSaveAction, SIGNAL(triggered()), this, SLOT(fileSave()) );
 
 		fileSaveAsAction = new QAction( tr("Save &As..."), this );
-		fileSaveAsAction->setIcon( QIcon::fromTheme( "document-save-as", Icons::FileSaveAs() ) );
+		fileSaveAsAction->setIcon( Icons::FileSaveAs() );
 		fileSaveAsAction->setShortcut( QKeySequence::SaveAs );
 		fileSaveAsAction->setStatusTip( tr("Save current gLabels project to a different name") );
 		connect( fileSaveAsAction, SIGNAL(triggered()), this, SLOT(fileSaveAs()) );
@@ -284,19 +284,19 @@ namespace glabels
 		connect( editRedoAction, SIGNAL(triggered()), this, SLOT(editRedo()) );
 
 		editCutAction = new QAction( tr("Cut"), this );
-		editCutAction->setIcon( QIcon::fromTheme( "edit-cut", Icons::EditCut() ) );
+		editCutAction->setIcon( Icons::EditCut() );
 		editCutAction->setShortcut( QKeySequence::Cut );
 		editCutAction->setStatusTip( tr("Cut the selection") );
 		connect( editCutAction, SIGNAL(triggered()), this, SLOT(editCut()) );
 
 		editCopyAction = new QAction( tr("&Copy"), this );
-		editCopyAction->setIcon( QIcon::fromTheme( "edit-copy", Icons::EditCopy() ) );
+		editCopyAction->setIcon( Icons::EditCopy() );
 		editCopyAction->setShortcut( QKeySequence::Copy );
 		editCopyAction->setStatusTip( tr("Copy the selection") );
 		connect( editCopyAction, SIGNAL(triggered()), this, SLOT(editCopy()) );
 
 		editPasteAction = new QAction( tr("&Paste"), this );
-		editPasteAction->setIcon( QIcon::fromTheme( "edit-paste", Icons::EditPaste() ) );
+		editPasteAction->setIcon( Icons::EditPaste() );
 		editPasteAction->setShortcut( QKeySequence::Paste );
 		editPasteAction->setStatusTip( tr("Paste the clipboard") );
 		connect( editPasteAction, SIGNAL(triggered()), this, SLOT(editPaste()) );
@@ -492,17 +492,17 @@ namespace glabels
 
 		/* Context menu version of edit actions */
 		contextCutAction = new QAction( tr("Cut"), this );
-		contextCutAction->setIcon( QIcon::fromTheme( "edit-cut", Icons::EditCut() ) );
+		contextCutAction->setIcon( Icons::EditCut() );
 		contextCutAction->setStatusTip( tr("Cut the selection") );
 		connect( contextCutAction, SIGNAL(triggered()), this, SLOT(editCut()) );
 
 		contextCopyAction = new QAction( tr("&Copy"), this );
-		contextCopyAction->setIcon( QIcon::fromTheme( "edit-copy", Icons::EditCopy() ) );
+		contextCopyAction->setIcon( Icons::EditCopy() );
 		contextCopyAction->setStatusTip( tr("Copy the selection") );
 		connect( contextCopyAction, SIGNAL(triggered()), this, SLOT(editCopy()) );
 
 		contextPasteAction = new QAction( tr("&Paste"), this );
-		contextPasteAction->setIcon( QIcon::fromTheme( "edit-paste", Icons::EditPaste() ) );
+		contextPasteAction->setIcon( Icons::EditPaste() );
 		contextPasteAction->setStatusTip( tr("Paste the clipboard") );
 		connect( contextPasteAction, SIGNAL(triggered()), this, SLOT(editPaste()) );
 
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index e3074d0..aa55898 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -4,6 +4,13 @@
 <qresource>
 
 	<file>icons/16x16/actions/edit-clear.svg</file>
+	<file>icons/16x16/actions/edit-copy.svg</file>
+	<file>icons/16x16/actions/edit-cut.svg</file>
+	<file>icons/16x16/actions/edit-paste.svg</file>
+	<file>icons/16x16/actions/file-new.svg</file>
+	<file>icons/16x16/actions/file-open.svg</file>
+	<file>icons/16x16/actions/file-save.svg</file>
+	<file>icons/16x16/actions/file-save-as.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>
@@ -31,6 +38,13 @@
 	<file>icons/16x16/actions/glabels-zoom-to-fit.svg</file>
 	<file>icons/16x16/apps/glabels.png</file>
 	
+	<file>icons/22x22/actions/edit-copy.svg</file>
+	<file>icons/22x22/actions/edit-cut.svg</file>
+	<file>icons/22x22/actions/edit-paste.svg</file>
+	<file>icons/22x22/actions/file-new.svg</file>
+	<file>icons/22x22/actions/file-open.svg</file>
+	<file>icons/22x22/actions/file-save.svg</file>
+	<file>icons/22x22/actions/file-save-as.svg</file>
 	<file>icons/22x22/actions/glabels-align-text-center.svg</file>
 	<file>icons/22x22/actions/glabels-align-text-left.svg</file>
 	<file>icons/22x22/actions/glabels-align-text-right.svg</file>
@@ -52,6 +66,13 @@
 	<file>icons/22x22/actions/glabels-zoom-out.svg</file>
 	<file>icons/22x22/actions/glabels-zoom-to-fit.svg</file>
 	
+	<file>icons/24x24/actions/edit-copy.svg</file>
+	<file>icons/24x24/actions/edit-cut.svg</file>
+	<file>icons/24x24/actions/edit-paste.svg</file>
+	<file>icons/24x24/actions/file-new.svg</file>
+	<file>icons/24x24/actions/file-open.svg</file>
+	<file>icons/24x24/actions/file-save.svg</file>
+	<file>icons/24x24/actions/file-save-as.svg</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>
@@ -69,21 +90,13 @@
 	<file>icons/24x24/actions/glabels-valign-text-bottom.svg</file>
 	<file>icons/24x24/actions/glabels-valign-text-middle.svg</file>
 	<file>icons/24x24/actions/glabels-valign-text-top.svg</file>
-	<file>icons/24x24/actions/edit-copy.png</file>
-	<file>icons/24x24/actions/edit-cut.png</file>
-	<file>icons/24x24/actions/edit-paste.png</file>
-	<file>icons/24x24/actions/file-new.png</file>
-	<file>icons/24x24/actions/file-open.png</file>
-	<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/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/32x32/apps/glabels.png</file>
 
 	<file>icons/48x48/apps/glabels.png</file>
 
diff --git a/glabels/icons/16x16/actions/edit-copy.svg b/glabels/icons/16x16/actions/edit-copy.svg
new file mode 100644
index 0000000..38e38d5
--- /dev/null
+++ b/glabels/icons/16x16/actions/edit-copy.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+  <rect
+     style="fill:#f8f8f8;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="9" height="9" x="6.5" y="6.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="8.5" y1="8.5" x2="12.5" y2="8.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="8.5" y1="10.5" x2="12.5" y2="10.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="8.5" y1="12.5" x2="10.5" y2="12.5" />
+
+  <rect
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="9" height="9" x="0.5" y="0.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="2.5" y1="2.5" x2="7.5" y2="2.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="2.5" y1="4.5" x2="7.5" y2="4.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="2.5" y1="6.5" x2="5.5" y2="6.5" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/edit-cut.svg b/glabels/icons/16x16/actions/edit-cut.svg
new file mode 100644
index 0000000..b4a0ae2
--- /dev/null
+++ b/glabels/icons/16x16/actions/edit-cut.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+  <circle
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="2" cx="5" cy="12" />
+
+  <circle
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="2" cx="12" cy="12" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 10,10 4,1 4,2 9,12 Z" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 7,10 12,1 12,2 7,12 Z" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/edit-paste.svg b/glabels/icons/16x16/actions/edit-paste.svg
new file mode 100644
index 0000000..af18dae
--- /dev/null
+++ b/glabels/icons/16x16/actions/edit-paste.svg
@@ -0,0 +1,27 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="11" height="12" x="1.5" y="1.5" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 4,0 4,3 3,3 3,4 11,4 11,3 10,3 10,0 Z" />
+
+  <rect
+     style="fill:#f8f8f8;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="9" height="9" x="6.5" y="6.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="8.5" y1="8.5" x2="12.5" y2="8.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="8.5" y1="10.5" x2="12.5" y2="10.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="8.5" y1="12.5" x2="10.5" y2="12.5" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/file-new.svg b/glabels/icons/16x16/actions/file-new.svg
new file mode 100644
index 0000000..3ec7ab7
--- /dev/null
+++ b/glabels/icons/16x16/actions/file-new.svg
@@ -0,0 +1,35 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="16" height="16" >
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 3.5,1.5 3.5,14.5 13.5,14.5 13.5,4.5 10.5,1.5 Z" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="2" width="3" x="5" y="4" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="2" width="3" x="5" y="7" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="2" width="3" x="5" y="10" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="2" width="1" x="9" y="4" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="2" width="3" x="9" y="7" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="2" width="3" x="9" y="10" />
+
+  <path
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1;stroke-linejoin:bevel"
+     d="M 13.5,4.5 10.5,1.5 10.5,4.5 Z" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/file-open.svg b/glabels/icons/16x16/actions/file-open.svg
new file mode 100644
index 0000000..f943a0e
--- /dev/null
+++ b/glabels/icons/16x16/actions/file-open.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,1 1,15 15,15 15,3 8,3 7,1 Z" />
+
+  <path
+     style="fill:#efde99;fill-opacity:1;stroke:none"
+     d="M 2,9 2,14 14,14 14,8 7,8 6,9 Z" />
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="M 3,5 3,8 6,8 7,7 13,7 13,5 Z" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/file-save-as.svg b/glabels/icons/16x16/actions/file-save-as.svg
new file mode 100644
index 0000000..40b468c
--- /dev/null
+++ b/glabels/icons/16x16/actions/file-save-as.svg
@@ -0,0 +1,23 @@
+<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 2,2 2,12 4,14 14,14 14,2 Z" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="5" width="8" x="4" y="3" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="4" width="5" x="5" y="9" />
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="2" width="1" x="6" y="10" />
+
+  <path
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 10,1 6,5 6,6 7,6 11,2 Z" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/file-save.svg b/glabels/icons/16x16/actions/file-save.svg
new file mode 100644
index 0000000..cb7d0a1
--- /dev/null
+++ b/glabels/icons/16x16/actions/file-save.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 2,2 2,12 4,14 14,14 14,2 Z" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="5" width="8" x="4" y="3" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="4" width="5" x="5" y="9" />
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="2" width="1" x="6" y="10" />
+
+</svg>
diff --git a/glabels/icons/16x16/actions/glabels-object-properties.png b/glabels/icons/16x16/actions/glabels-object-properties.png
deleted file mode 100644
index ab42b19..0000000
Binary files a/glabels/icons/16x16/actions/glabels-object-properties.png and /dev/null differ
diff --git a/glabels/icons/22x22/actions/edit-copy.svg b/glabels/icons/22x22/actions/edit-copy.svg
new file mode 100644
index 0000000..c0bd77f
--- /dev/null
+++ b/glabels/icons/22x22/actions/edit-copy.svg
@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect
+     style="fill:#f8f8f8;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="12" height="12" x="8.5" y="8.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="11.5" x2="17.5" y2="11.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="13.5" x2="17.5" y2="13.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="15.5" x2="17.5" y2="15.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="17.5" x2="14.5" y2="17.5" />
+
+  <rect
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="12" height="12" x="1.5" y="1.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="3.5" y1="3.5" x2="10.5" y2="3.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="3.5" y1="5.5" x2="10.5" y2="5.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="3.5" y1="7.5" x2="10.5" y2="7.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="3.5" y1="9.5" x2="7.5" y2="9.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/edit-cut.svg b/glabels/icons/22x22/actions/edit-cut.svg
new file mode 100644
index 0000000..41dd057
--- /dev/null
+++ b/glabels/icons/22x22/actions/edit-cut.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <circle
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="3" cx="7" cy="17" />
+
+  <circle
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="3" cx="16" cy="17" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 14,14 6,1 6,3 13,17 Z" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 9,14 17,1 17,3 10,17 Z" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/edit-paste.svg b/glabels/icons/22x22/actions/edit-paste.svg
new file mode 100644
index 0000000..b60fe81
--- /dev/null
+++ b/glabels/icons/22x22/actions/edit-paste.svg
@@ -0,0 +1,31 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="16" height="17" x="2.5" y="2.5" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 7,0 7,3 5,4 5,6 16,6 16,4 14,3 14,0 Z" />
+
+  <rect
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="12" height="12" x="8.5" y="8.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="11.5" x2="17.5" y2="11.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="13.5" x2="17.5" y2="13.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="15.5" x2="17.5" y2="15.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="11.5" y1="17.5" x2="14.5" y2="17.5" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/file-new.svg b/glabels/icons/22x22/actions/file-new.svg
new file mode 100644
index 0000000..9f4dab2
--- /dev/null
+++ b/glabels/icons/22x22/actions/file-new.svg
@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 4.5,1.5 4.5,19.5 18.5,19.5 18.5,6.5 13.5,1.5 Z" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="6" y="3" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="6" y="7" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="6" y="11" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="6" y="15" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="3" x="12" y="3" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="12" y="7" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="12" y="11" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="12" y="15" />
+
+  <path
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1;stroke-linejoin:bevel"
+     d="M 18.5,6.5 13.5,1.5 13.5,6.5 Z" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/file-open.svg b/glabels/icons/22x22/actions/file-open.svg
new file mode 100644
index 0000000..cac5151
--- /dev/null
+++ b/glabels/icons/22x22/actions/file-open.svg
@@ -0,0 +1,15 @@
+<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 2,2 2,20 20,20 20,4 11,4 9,2 Z" />
+
+  <path
+     style="fill:#efde99;fill-opacity:1;stroke:none"
+     d="M 3,13 3,19 19,19 19,11 10,11 8,13 Z" />
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="M 5,7 5,12 8,12 10,10 17,10 17,7 Z" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/file-save-as.svg b/glabels/icons/22x22/actions/file-save-as.svg
new file mode 100644
index 0000000..4b8eed2
--- /dev/null
+++ b/glabels/icons/22x22/actions/file-save-as.svg
@@ -0,0 +1,23 @@
+<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 3,3 3,17 5,19 19,19 19,3 Z" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="7" width="12" x="5" y="4" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="5" width="7" x="7" y="13" />
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="3" width="2" x="9" y="14" />
+
+  <path
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 13,1 8,7 8,9 10,9 15,3 Z" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/file-save.svg b/glabels/icons/22x22/actions/file-save.svg
new file mode 100644
index 0000000..7f157cd
--- /dev/null
+++ b/glabels/icons/22x22/actions/file-save.svg
@@ -0,0 +1,19 @@
+<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 3,3 3,17 5,19 19,19 19,3 Z" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="7" width="12" x="5" y="4" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="5" width="7" x="7" y="13" />
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="3" width="2" x="9" y="14" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/edit-copy.png b/glabels/icons/24x24/actions/edit-copy.png
deleted file mode 100644
index 1075bfe..0000000
Binary files a/glabels/icons/24x24/actions/edit-copy.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/edit-copy.svg b/glabels/icons/24x24/actions/edit-copy.svg
new file mode 100644
index 0000000..2147337
--- /dev/null
+++ b/glabels/icons/24x24/actions/edit-copy.svg
@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect
+     style="fill:#f8f8f8;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="12" height="12" x="9.5" y="9.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="12.5" x2="18.5" y2="12.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="14.5" x2="18.5" y2="14.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="16.5" x2="18.5" y2="16.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="18.5" x2="15.5" y2="18.5" />
+
+  <rect
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="12" height="12" x="2.5" y="2.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="4.5" y1="4.5" x2="11.5" y2="4.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="4.5" y1="6.5" x2="11.5" y2="6.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="4.5" y1="8.5" x2="11.5" y2="8.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="4.5" y1="10.5" x2="8.5" y2="10.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/edit-cut.png b/glabels/icons/24x24/actions/edit-cut.png
deleted file mode 100644
index 406636a..0000000
Binary files a/glabels/icons/24x24/actions/edit-cut.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/edit-cut.svg b/glabels/icons/24x24/actions/edit-cut.svg
new file mode 100644
index 0000000..1f3d4fe
--- /dev/null
+++ b/glabels/icons/24x24/actions/edit-cut.svg
@@ -0,0 +1,19 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <circle
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="3" cx="8" cy="18" />
+
+  <circle
+     style="fill:none;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     r="3" cx="17" cy="18" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 15,15 7,2 7,4 14,18 Z" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 10,15 18,2 18,4 11,18 Z" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/edit-paste.png b/glabels/icons/24x24/actions/edit-paste.png
deleted file mode 100644
index 910861c..0000000
Binary files a/glabels/icons/24x24/actions/edit-paste.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/edit-paste.svg b/glabels/icons/24x24/actions/edit-paste.svg
new file mode 100644
index 0000000..2379227
--- /dev/null
+++ b/glabels/icons/24x24/actions/edit-paste.svg
@@ -0,0 +1,31 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="16" height="17" x="3.5" y="3.5" />
+
+  <path
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     d="M 8,1 8,4 6,5 6,7 17,7 17,5 15,4 15,1 Z" />
+
+  <rect
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     width="12" height="12" x="9.5" y="9.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="12.5" x2="18.5" y2="12.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="14.5" x2="18.5" y2="14.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="16.5" x2="18.5" y2="16.5" />
+
+  <line
+     style="stroke:#333333;stroke-width:1;stroke-opacity:1"
+     x1="12.5" y1="18.5" x2="15.5" y2="18.5" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/file-new.png b/glabels/icons/24x24/actions/file-new.png
deleted file mode 100644
index 85651cb..0000000
Binary files a/glabels/icons/24x24/actions/file-new.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/file-new.svg b/glabels/icons/24x24/actions/file-new.svg
new file mode 100644
index 0000000..f69edb7
--- /dev/null
+++ b/glabels/icons/24x24/actions/file-new.svg
@@ -0,0 +1,43 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="24" height="24" >
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 5.5,2.5 5.5,20.5 19.5,20.5 19.5,7.5 14.5,2.5 Z" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="7" y="4" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="7" y="8" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="7" y="12" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="7" y="16" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="3" x="13" y="4" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="13" y="8" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="13" y="12" />
+
+  <rect
+     style="fill:#eeeeee;fill-opacity:1;stroke:none"
+     height="3" width="5" x="13" y="16" />
+
+  <path
+     style="fill:#fcfcfc;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1;stroke-linejoin:bevel"
+     d="M 19.5,7.5 14.5,2.5 14.5,7.5 Z" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/file-open.png b/glabels/icons/24x24/actions/file-open.png
deleted file mode 100644
index 53c5ee8..0000000
Binary files a/glabels/icons/24x24/actions/file-open.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/file-open.svg b/glabels/icons/24x24/actions/file-open.svg
new file mode 100644
index 0000000..09322e9
--- /dev/null
+++ b/glabels/icons/24x24/actions/file-open.svg
@@ -0,0 +1,15 @@
+<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 3,3 3,21 21,21 21,5 12,5 10,3 Z" />
+
+  <path
+     style="fill:#efde99;fill-opacity:1;stroke:none"
+     d="M 4,14 4,20 20,20 20,12 11,12 9,14 Z" />
+
+  <path
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     d="M 6,8 6,13 9,13 11,11 18,11 18,8 Z" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/file-print.png b/glabels/icons/24x24/actions/file-print.png
deleted file mode 100644
index eb47921..0000000
Binary files a/glabels/icons/24x24/actions/file-print.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/file-save-as.png b/glabels/icons/24x24/actions/file-save-as.png
deleted file mode 100644
index e2f6b72..0000000
Binary files a/glabels/icons/24x24/actions/file-save-as.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/file-save-as.svg b/glabels/icons/24x24/actions/file-save-as.svg
new file mode 100644
index 0000000..42f8d71
--- /dev/null
+++ b/glabels/icons/24x24/actions/file-save-as.svg
@@ -0,0 +1,23 @@
+<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 4,4 4,18 6,20 20,20 20,4 Z" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="7" width="12" x="6" y="5" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="5" width="7" x="8" y="14" />
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="3" width="2" x="10" y="15" />
+
+  <path
+     style="fill:#f6e04a;fill-opacity:1;stroke:#333333;stroke-width:1;stroke-opacity:1"
+     d="M 14,2 9,8 9,10 11,10 16,4 Z" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/file-save.png b/glabels/icons/24x24/actions/file-save.png
deleted file mode 100644
index 1d5a858..0000000
Binary files a/glabels/icons/24x24/actions/file-save.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/file-save.svg b/glabels/icons/24x24/actions/file-save.svg
new file mode 100644
index 0000000..a998862
--- /dev/null
+++ b/glabels/icons/24x24/actions/file-save.svg
@@ -0,0 +1,19 @@
+<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 4,4 4,18 6,20 20,20 20,4 Z" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="7" width="12" x="6" y="5" />
+
+  <rect
+     style="fill:#ffffff;fill-opacity:1;stroke:none"
+     height="5" width="7" x="8" y="14" />
+
+  <rect
+     style="fill:#333333;fill-opacity:1;stroke:none"
+     height="3" width="2" x="10" y="15" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-format-text-bold.png b/glabels/icons/24x24/actions/glabels-format-text-bold.png
deleted file mode 100644
index fef9444..0000000
Binary files a/glabels/icons/24x24/actions/glabels-format-text-bold.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-format-text-italic.png b/glabels/icons/24x24/actions/glabels-format-text-italic.png
deleted file mode 100644
index 027220f..0000000
Binary files a/glabels/icons/24x24/actions/glabels-format-text-italic.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-format-text-underline.png b/glabels/icons/24x24/actions/glabels-format-text-underline.png
deleted file mode 100644
index 836acf2..0000000
Binary files a/glabels/icons/24x24/actions/glabels-format-text-underline.png and /dev/null differ
diff --git a/glabels/ui/StartupView.ui b/glabels/ui/StartupView.ui
index 4eb2846..58fc3f7 100644
--- a/glabels/ui/StartupView.ui
+++ b/glabels/ui/StartupView.ui
@@ -140,7 +140,7 @@
           </property>
           <property name="icon">
            <iconset resource="../icons.qrc">
-            <normaloff>:/icons/24x24/actions/file-new.png</normaloff>:/icons/24x24/actions/file-new.png</iconset>
+            <normaloff>:/icons/24x24/actions/file-new.svg</normaloff>:/icons/24x24/actions/file-new.svg</iconset>
           </property>
           <property name="iconSize">
            <size>
@@ -172,7 +172,7 @@
           </property>
           <property name="icon">
            <iconset resource="../icons.qrc">
-            <normaloff>:/icons/24x24/actions/file-open.png</normaloff>:/icons/24x24/actions/file-open.png</iconset>
+            <normaloff>:/icons/24x24/actions/file-open.svg</normaloff>:/icons/24x24/actions/file-open.svg</iconset>
           </property>
           <property name="iconSize">
            <size>