From db6a36a6500dbd647876a2af37b0663b69c98e30 Mon Sep 17 00:00:00 2001
From: Jim Evins <evins@snaught.com>
Date: Sat, 28 Jan 2017 00:16:24 -0500
Subject: [PATCH] Updated text alignment icons.

---
 glabels/Icons.h                               |  44 ++++++++++++-
 glabels/icons.qrc                             |  18 ++++--
 .../actions/glabels-align-text-center.svg     |  15 +++++
 .../22x22/actions/glabels-align-text-left.svg |  15 +++++
 .../actions/glabels-align-text-right.svg      |  15 +++++
 .../actions/glabels-valign-text-bottom.svg    |  12 ++++
 .../actions/glabels-valign-text-middle.svg    |  15 +++++
 .../22x22/actions/glabels-valign-text-top.svg |  12 ++++
 .../actions/glabels-align-text-center.png     | Bin 384 -> 0 bytes
 .../actions/glabels-align-text-center.svg     |  15 +++++
 .../24x24/actions/glabels-align-text-left.png | Bin 398 -> 0 bytes
 .../24x24/actions/glabels-align-text-left.svg |  15 +++++
 .../actions/glabels-align-text-right.png      | Bin 375 -> 0 bytes
 .../actions/glabels-align-text-right.svg      |  15 +++++
 .../actions/glabels-valign-text-bottom.png    | Bin 481 -> 0 bytes
 .../actions/glabels-valign-text-bottom.svg    |  12 ++++
 .../actions/glabels-valign-text-middle.png    | Bin 639 -> 0 bytes
 .../actions/glabels-valign-text-middle.svg    |  15 +++++
 .../24x24/actions/glabels-valign-text-top.png | Bin 398 -> 0 bytes
 .../24x24/actions/glabels-valign-text-top.svg |  12 ++++
 glabels/ui/ObjectEditor.ui                    |  61 +++++++++++++-----
 21 files changed, 265 insertions(+), 26 deletions(-)
 create mode 100644 glabels/icons/22x22/actions/glabels-align-text-center.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-align-text-left.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-align-text-right.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-valign-text-bottom.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-valign-text-middle.svg
 create mode 100644 glabels/icons/22x22/actions/glabels-valign-text-top.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-align-text-center.png
 create mode 100644 glabels/icons/24x24/actions/glabels-align-text-center.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-align-text-left.png
 create mode 100644 glabels/icons/24x24/actions/glabels-align-text-left.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-align-text-right.png
 create mode 100644 glabels/icons/24x24/actions/glabels-align-text-right.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-valign-text-bottom.png
 create mode 100644 glabels/icons/24x24/actions/glabels-valign-text-bottom.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-valign-text-middle.png
 create mode 100644 glabels/icons/24x24/actions/glabels-valign-text-middle.svg
 delete mode 100644 glabels/icons/24x24/actions/glabels-valign-text-top.png
 create mode 100644 glabels/icons/24x24/actions/glabels-valign-text-top.svg

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 21258160bdfef3eac3f5b43d7cadb2b27e2ba273..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 384
zcmV-`0e}99P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003;Nkl<ZcmeH|
z+e!ja7=?R^gcxb?RjStrA}Xwgu`T12hdh{v98)wkEmN7CM6LcZFzDr0wQr;tXr>{?
z3oq8?=7VqXue}7|Uo)qG1t4^y&{0r^ov@%xmI3P<YoN&(kIy3v#(n5U7wv8fjn*Y9
zwGy;a9+`X^iBt^Xm<px@@b$(rz~>Xm<5`BCc)bF-+riAc^8}bgKLOnP^!*iYpP5Vv
zPcI`39}M&dJ#_RNwAu~St|};1G@NT$q_YW}CL%bFD7*tn-p8JQ2V2{l-}*53?l6L|
zLhju`NDb1T-J9Hk=?&Zu?|5{hgWKLUn(aFGU#=EWDCTgMOCg?$A{<qrs0=cb;6K>q
z?tcY{ybI^<-5)z8#K`^*SqAVf`1aJBRlYwL<pT0r2I*`P@#M_E6gcGWZ39Gcm8`oL
eXz`=XFW>{1!39GB+F(Qg0000<MNUMnLSTYXGpmsR

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 e38b02f5285ffcd97d4c5f3564dfab8165f9242d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00041Nkl<Zc-rli
z?@Gc@7{<GbgqTd`rBt^OL_`$Hma<kUY5vcdqN!=FX=`dT?O4(Zi^3~=((|D&1}YjF
z_~H3@_`&--@AEDJ_|q%^a|Do%MRMTcF>aiqKt=+rt*_#%`;O0U2X7xQXqyDhRvonm
z9a^OXrBpz!aEVkV0XY#xC>p@2&yD`OkpOl(M=X|Qj2kO!CG+9n@W;XA5u6V4s{^ys
z#%nLnCc)!V9Y&)9y;g>*6;V)f$Xun6NXa;t!w7_Z)WMNk?2Cqj-^0%CHa535sFwi%
z$JwZZX@p@`$P64vu8AB7E}jhCg9f=rvt^*(tfFe%L93{^DPJS6Wa<2q={REX2!atm
zynYW(JQ76735T#hun$vrz%UG%?H-8K!DRh2)WNN;(%va)O22#P-_PdLw0|y=F+}AM
s&VpV#@38?k8#}TCw%0$4i}rs2-|V~vIGA+kg8%>k07*qoM6N<$g8UD(-~a#s

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 a740a6a53747db96333d44155880bad578ce1956..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 375
zcmV--0f_#IP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003#Nkl<ZcmeIx
z?MlK>90u^NA|VWiw^H3hgoydl(p>6nu6#+|YHE|k%B<DWwHi@GhYAe3xhL)8B05S%
z13x?;4-Y)Q|Cs^stC<%3^MZnyC%JqE<0i{<gsNb1X#qF4SFoKv%)WuHaSXkqLDibr
zZ_21i6%;EXwnQGAxipd+ETZuUM(?N!f<cD(e6tuge*YZ#dxOG`Fwx%B2BX~uZ!dTq
z=6OKy_;ioE2WMztp=V#fFuUlS>d<r*EmeW6)UaDCVY?)N7qZ|oDX_@|R%2n80ma@P
zFrdHx$qn51f9+VXogOZ&bDWtcANwC3wQ<mHV6P#eDwR<zix5N}8J<Hb%_6=QMK}`r
z{vR+5Lp)|ck-U&4KV|Txi_(%ID|J-suKl@nB-j`t(J)p*%byKs5(vx_ZyHPs-T?t|
V`R~5|F|+^x002ovPDHLkV1iXpqCNls

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 5dbc037ff28917f5d85c9d948565c04a3a172a4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 481
zcmV<70UrK|P)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS_
z6e&6L<K(6Q00Ci1L_t(Y$L&?kN&-<7{;ogOE+oi}o6zTpnTK$#WtvzUXBmmn)`ysR
ziK2zMsRxJ=7q*B94LxV@w9rxWC+B7nffo*(dpU>m^L-x|*qr}%L^mPy+Z}BR{C$Cl
zNN{2(rJxfJ04hj=Qfe+pMAVP1$g-@$)b(-ZzCt-7fy}b3Jb;ICxt#Ogj&hl>Z`oWX
zv?wod0TDquoj%lw7m*1D#Ztj0B14xYDx{psMb%u&BHy{MH;l9MA_M|r1`~mZK}=v`
z5D|z7%)Za)_j<U!xibQ>D3wauolZx4f~}ox$9;0mwP?DQ(0u2#RIvFQ7%XPyz^PWQ
z%})gy^@eer&q4uU&x6Md9@!8R9`B#0vEd;eW6Y?JrrR>+R+LO0*xl~?mlL$x&xptO
zS56R(Mx17|Woij+q=T5Q4kj2BPr#nHw5!<eUaD5BxrsyquWv8@b9m}6mFnfyU^edq
XD588t#0E3F00000NkvXXu0mjf5~a+x

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 33220caca9151f64979d6b538fd2cd763fd43565..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 639
zcmV-_0)YLAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv00001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iyS_
z6cQk-I-_0y00I9=L_t(Y$K_Q^Z&FbZ{)WET*~X-7SV(UD1N{x^(p=U?U6C|yisd1x
zhJ?FB3C1lu{{XD58>2QZ>eWO|x8&ZCNEgN!C@^#AaX~Mo0_EPKD^D`XoRgW%<NIa~
z@V^}$)FJe*Gg{Qze^Nw*Aoc)2ejJEs%t&iZf2~E9Wo1XMU;ntzKuv33Vp&!Oz?VXy
zkn-LhrnVP6Nv5_#ll*)K&{`vrNZbx$ueCnIAh(;XGP4<!B^07ssaTFrWs#?RJh08j
zPjb-EU=av2m<22hVF5FPnIYoof?l_a{r4YCUo6_#FsiLqD{uwN;gy<Gcj9x=bgn`3
zlt;VSs$2qt$;>>dl}j(;=K|OVwz-o@f&hq8P$H018DJvA{>vyfGQeYq8Ta5i4RfqT
zh7qf_+sCsiumNn&s$gkpvF5ssc%VVM>>Qk7kV`|9nwr(xm8+RbrE)JCjb8ux>qqJI
zd0}La>+-YbCsSE;^VSV)JxG9v(C_!5R3AzSL=+m%_e?&YFOKY@mwoV450`F_aro^J
zd#_$kr>SAY&~6`3%)Z$?8sl;#vQFpwz6{rO=bHl}(tg+U*c@bYX{ZY@@Xk&;2?`NP
z#d5F!pX|@Ld;iW515cDv1Cc@S)wNZ;ee*8(j~0tvL#NZZ(74$=+Kfcj?QnPn^}6FL
Zz;8p+<PW}kX)OQ%002ovPDHLkV1nTTAUgm6

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 2ece60dde80168ff71d84e2624b9a6cb9f401b1b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|*pj^6T^Rm@
z;DWu&Cj&(|3p^r=85p>QL70(Y)*O%l>?NMQuIzUhMMZdI0z@7FO=INqba4#vIR19B
zqt{^vk+%Owu2u1P=09*uDe71g%^TRAHz{|aNY#WVLS5aneEk=!oTo7LTm8Ypi%T@L
z3UxwT{(N|FmglqF|C;=U|9Y#v&apfC1WAf-Ses%Zvpat7_Ek^vX01BCnmZ#SfW@gv
zB!FXKgNldKl2fd!p9+~@-~K9^Z&$4PxzBfQ9Q@~~e)661_xF->c$*^X4m>c<{5z?~
zUHH3fbIGh#mlyDJH;Axu33^Cot8J>RuRQH`&BpA^4ySJ)R@hk-%sE`Kv0`2E1SX4B
z#TW9nPx|@i<ecv3mB+1{MO_0K62#gT#=o8WWA9$AUv=m2ZQG%j9JcQ4vK4s-+jeA|
oH7*l>6I;J!nd9XJ7xiC=eiWMCah}~x4j5Prp00i_>zopr0CrHMDgXcg

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>