diff --git a/glabels/Icons.h b/glabels/Icons.h
index 194c444..a162738 100644
--- a/glabels/Icons.h
+++ b/glabels/Icons.h
@@ -146,6 +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" );
 			}
 		};
 
@@ -280,12 +282,46 @@ namespace glabels
 		};
 
 
+		class AlignTextLeft : public QIcon
+		{
+		public:
+			AlignTextLeft()
+			{
+				addFile( ":icons/22x22/actions/glabels-align-text-left.svg" );
+				addFile( ":icons/24x24/actions/glabels-align-text-left.svg" );
+			}
+		};
+
+
+		class AlignTextCenter : public QIcon
+		{
+		public:
+			AlignTextCenter()
+			{
+				addFile( ":icons/22x22/actions/glabels-align-text-center.svg" );
+				addFile( ":icons/24x24/actions/glabels-align-text-center.svg" );
+			}
+		};
+
+
+		class AlignTextRight : public QIcon
+		{
+		public:
+			AlignTextRight()
+			{
+				addFile( ":icons/22x22/actions/glabels-align-text-right.svg" );
+				addFile( ":icons/24x24/actions/glabels-align-text-right.svg" );
+			}
+		};
+
+
 		class AlignTextBottom : public QIcon
 		{
 		public:
 			AlignTextBottom()
 			{
-				addFile( ":icons/24x24/actions/glabels-align-text-bottom.png" );
+				addFile( ":icons/22x22/actions/glabels-valign-text-bottom.svg" );
+				addFile( ":icons/24x24/actions/glabels-valign-text-bottom.svg" );
 			}
 		};
 
@@ -295,7 +331,8 @@ namespace glabels
 		public:
 			AlignTextMiddle()
 			{
-				addFile( ":icons/24x24/actions/glabels-align-text-middle.png" );
+				addFile( ":icons/22x22/actions/glabels-valign-text-middle.svg" );
+				addFile( ":icons/24x24/actions/glabels-valign-text-middle.svg" );
 			}
 		};
 
@@ -305,7 +342,8 @@ namespace glabels
 		public:
 			AlignTextTop()
 			{
-				addFile( ":icons/24x24/actions/glabels-align-text-top.png" );
+				addFile( ":icons/22x22/actions/glabels-valign-text-top.svg" );
+				addFile( ":icons/24x24/actions/glabels-valign-text-top.svg" );
 			}
 		};
 
diff --git a/glabels/icons.qrc b/glabels/icons.qrc
index b1e0494..1f6ec84 100644
--- a/glabels/icons.qrc
+++ b/glabels/icons.qrc
@@ -32,6 +32,9 @@
 	<file>icons/16x16/actions/glabels-text.png</file>
 	<file>icons/16x16/apps/glabels.png</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>
 	<file>icons/22x22/actions/glabels-arrow.svg</file>
 	<file>icons/22x22/actions/glabels-barcode.svg</file>
 	<file>icons/22x22/actions/glabels-box.svg</file>
@@ -39,12 +42,15 @@
 	<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/22x22/actions/glabels-valign-text-bottom.svg</file>
+	<file>icons/22x22/actions/glabels-valign-text-middle.svg</file>
+	<file>icons/22x22/actions/glabels-valign-text-top.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-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>
 	<file>icons/24x24/actions/glabels-arrow.svg</file>
 	<file>icons/24x24/actions/glabels-barcode.svg</file>
 	<file>icons/24x24/actions/glabels-box.svg</file>
@@ -59,9 +65,9 @@
 	<file>icons/24x24/actions/glabels-object-properties.png</file>
 	<file>icons/24x24/actions/glabels-pencil.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>
+	<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>
diff --git a/glabels/icons/22x22/actions/glabels-align-text-center.svg b/glabels/icons/22x22/actions/glabels-align-text-center.svg
new file mode 100644
index 0000000..3b86295
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-align-text-center.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="4" y="4" width="14" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="1" y="8" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="2" y="12" width="17" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="5" y="16" width="11" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-align-text-left.svg b/glabels/icons/22x22/actions/glabels-align-text-left.svg
new file mode 100644
index 0000000..8e095c4
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-align-text-left.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="1" y="4" width="15" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="1" y="8" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="1" y="12" width="17" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="1" y="16" width="12" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-align-text-right.svg b/glabels/icons/22x22/actions/glabels-align-text-right.svg
new file mode 100644
index 0000000..5da13fa
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-align-text-right.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="6" y="4" width="15" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="1" y="8" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="4" y="12" width="17" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="9" y="16" width="12" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-valign-text-bottom.svg b/glabels/icons/22x22/actions/glabels-valign-text-bottom.svg
new file mode 100644
index 0000000..0e01e1b
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-valign-text-bottom.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="1" y="12" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="1" y="16" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 10.5,11 9,9 10,9 10,2 11,2 11,9 12,9 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-valign-text-middle.svg b/glabels/icons/22x22/actions/glabels-valign-text-middle.svg
new file mode 100644
index 0000000..6be55af
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-valign-text-middle.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="1" y="8" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="1" y="12" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 10.5,7 9,5 10,5 10,2 11,2 11,5 12,5 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 10.5,15 9,17 10,17 10,20 11,20 11,17 12,17 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/22x22/actions/glabels-valign-text-top.svg b/glabels/icons/22x22/actions/glabels-valign-text-top.svg
new file mode 100644
index 0000000..0f0e13e
--- /dev/null
+++ b/glabels/icons/22x22/actions/glabels-valign-text-top.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="1" y="4" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="1" y="8" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 10.5,11 9,13 10,13 10,20 11,20 11,13 12,13 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-align-text-center.png b/glabels/icons/24x24/actions/glabels-align-text-center.png
deleted file mode 100644
index 2125816..0000000
Binary files a/glabels/icons/24x24/actions/glabels-align-text-center.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-align-text-center.svg b/glabels/icons/24x24/actions/glabels-align-text-center.svg
new file mode 100644
index 0000000..f212a47
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-align-text-center.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="5" y="5" width="14" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="2" y="9" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="3" y="13" width="17" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="6" y="17" width="11" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-align-text-left.png b/glabels/icons/24x24/actions/glabels-align-text-left.png
deleted file mode 100644
index e38b02f..0000000
Binary files a/glabels/icons/24x24/actions/glabels-align-text-left.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-align-text-left.svg b/glabels/icons/24x24/actions/glabels-align-text-left.svg
new file mode 100644
index 0000000..8ab86cf
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-align-text-left.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="2" y="5" width="15" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="2" y="9" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="2" y="13" width="17" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="2" y="17" width="12" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-align-text-right.png b/glabels/icons/24x24/actions/glabels-align-text-right.png
deleted file mode 100644
index a740a6a..0000000
Binary files a/glabels/icons/24x24/actions/glabels-align-text-right.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-align-text-right.svg b/glabels/icons/24x24/actions/glabels-align-text-right.svg
new file mode 100644
index 0000000..4d18059
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-align-text-right.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="7" y="5" width="15" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="2" y="9" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="5" y="13" width="17" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <rect x="10" y="17" width="12" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-valign-text-bottom.png b/glabels/icons/24x24/actions/glabels-valign-text-bottom.png
deleted file mode 100644
index 5dbc037..0000000
Binary files a/glabels/icons/24x24/actions/glabels-valign-text-bottom.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-valign-text-bottom.svg b/glabels/icons/24x24/actions/glabels-valign-text-bottom.svg
new file mode 100644
index 0000000..494a529
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-valign-text-bottom.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="2" y="13" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="2" y="17" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 11.5,12 10,10 11,10 11,3 12,3 12,10 13,10 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-valign-text-middle.png b/glabels/icons/24x24/actions/glabels-valign-text-middle.png
deleted file mode 100644
index 33220ca..0000000
Binary files a/glabels/icons/24x24/actions/glabels-valign-text-middle.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-valign-text-middle.svg b/glabels/icons/24x24/actions/glabels-valign-text-middle.svg
new file mode 100644
index 0000000..c6b5452
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-valign-text-middle.svg
@@ -0,0 +1,15 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="2" y="9" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="2" y="13" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 11.5,8 10,6 11,6 11,3 12,3 12,6 13,6 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 11.5,16 10,18 11,18 11,21 12,21 12,18 13,18 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/icons/24x24/actions/glabels-valign-text-top.png b/glabels/icons/24x24/actions/glabels-valign-text-top.png
deleted file mode 100644
index 2ece60d..0000000
Binary files a/glabels/icons/24x24/actions/glabels-valign-text-top.png and /dev/null differ
diff --git a/glabels/icons/24x24/actions/glabels-valign-text-top.svg b/glabels/icons/24x24/actions/glabels-valign-text-top.svg
new file mode 100644
index 0000000..8dda634
--- /dev/null
+++ b/glabels/icons/24x24/actions/glabels-valign-text-top.svg
@@ -0,0 +1,12 @@
+<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="22" height="22" >
+
+  <rect x="2" y="5" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+  
+  <rect x="2" y="9" width="20" height="2"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+  <path d="M 11.5,12 10,14 11,14 11,21 12,21 12,14 13,14 Z"
+     style="fill:#333333;fill-opacity:1;stroke:none" />
+
+</svg>
diff --git a/glabels/ui/ObjectEditor.ui b/glabels/ui/ObjectEditor.ui
index bfd74fa..ca3e11a 100644
--- a/glabels/ui/ObjectEditor.ui
+++ b/glabels/ui/ObjectEditor.ui
@@ -35,7 +35,7 @@
    <item row="1" column="0">
     <widget class="QTabWidget" name="notebook">
      <property name="currentIndex">
-      <number>5</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="textPage">
       <attribute name="title">
@@ -66,7 +66,13 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-align-text-left.png</normaloff>:/icons/24x24/actions/glabels-align-text-left.png</iconset>
+                  <normaloff>:/icons/22x22/actions/glabels-align-text-left.svg</normaloff>:/icons/22x22/actions/glabels-align-text-left.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -86,7 +92,13 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-align-text-center.png</normaloff>:/icons/24x24/actions/glabels-align-text-center.png</iconset>
+                  <normaloff>:/icons/22x22/actions/glabels-align-text-center.svg</normaloff>:/icons/22x22/actions/glabels-align-text-center.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -103,7 +115,13 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-align-text-right.png</normaloff>:/icons/24x24/actions/glabels-align-text-right.png</iconset>
+                  <normaloff>:/icons/22x22/actions/glabels-align-text-right.svg</normaloff>:/icons/22x22/actions/glabels-align-text-right.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -131,7 +149,13 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-valign-text-top.png</normaloff>:/icons/24x24/actions/glabels-valign-text-top.png</iconset>
+                  <normaloff>:/icons/22x22/actions/glabels-valign-text-top.svg</normaloff>:/icons/22x22/actions/glabels-valign-text-top.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -151,7 +175,13 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-valign-text-middle.png</normaloff>:/icons/24x24/actions/glabels-valign-text-middle.png</iconset>
+                  <normaloff>:/icons/22x22/actions/glabels-valign-text-middle.svg</normaloff>:/icons/22x22/actions/glabels-valign-text-middle.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -168,7 +198,13 @@
                 </property>
                 <property name="icon">
                  <iconset resource="../icons.qrc">
-                  <normaloff>:/icons/24x24/actions/glabels-valign-text-bottom.png</normaloff>:/icons/24x24/actions/glabels-valign-text-bottom.png</iconset>
+                  <normaloff>:/icons/22x22/actions/glabels-valign-text-bottom.svg</normaloff>:/icons/22x22/actions/glabels-valign-text-bottom.svg</iconset>
+                </property>
+                <property name="iconSize">
+                 <size>
+                  <width>22</width>
+                  <height>22</height>
+                 </size>
                 </property>
                 <property name="checkable">
                  <bool>true</bool>
@@ -1199,16 +1235,7 @@
              <property name="spacing">
               <number>15</number>
              </property>
-             <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>
              <item>