diff --git a/src/qgssisydialog.cpp b/src/qgssisydialog.cpp
index a274d40e7a3..572df2fee56 100644
--- a/src/qgssisydialog.cpp
+++ b/src/qgssisydialog.cpp
@@ -31,7 +31,7 @@
 #include <qlineedit.h>
 #include <qtoolbutton.h>
 #include <qlabel.h>
-#include <qgroupbox.h>
+#include <qbuttongroup.h>
 
 QgsSiSyDialog::QgsSiSyDialog():QgsSiSyDialogBase(), mVectorLayer(0)
 {
diff --git a/src/qgssisydialogbase.ui b/src/qgssisydialogbase.ui
index 0c25d85d65b..072ecbef424 100644
--- a/src/qgssisydialogbase.ui
+++ b/src/qgssisydialogbase.ui
@@ -8,8 +8,8 @@
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>361</width>
-            <height>492</height>
+            <width>358</width>
+            <height>490</height>
         </rect>
     </property>
     <property name="caption">
@@ -27,7 +27,7 @@
                 <string>Label:</string>
             </property>
         </widget>
-        <spacer row="7" column="1">
+        <spacer row="6" column="1">
             <property name="name">
                 <cstring>spacer18</cstring>
             </property>
@@ -44,7 +44,7 @@
                 </size>
             </property>
         </spacer>
-        <spacer row="4" column="2">
+        <spacer row="3" column="2">
             <property name="name">
                 <cstring>spacer9_2_2</cstring>
             </property>
@@ -61,7 +61,7 @@
                 </size>
             </property>
         </spacer>
-        <spacer row="5" column="2">
+        <spacer row="4" column="2">
             <property name="name">
                 <cstring>spacer9_2_3</cstring>
             </property>
@@ -78,7 +78,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="2" column="0" rowspan="2" colspan="1">
+        <widget class="QLabel" row="2" column="0">
             <property name="name">
                 <cstring>outlinestylelabel</cstring>
             </property>
@@ -94,7 +94,7 @@
                 <string>Outline Style:</string>
             </property>
         </widget>
-        <widget class="QLabel" row="4" column="0">
+        <widget class="QLabel" row="3" column="0">
             <property name="name">
                 <cstring>outlinewidthlabel</cstring>
             </property>
@@ -102,7 +102,7 @@
                 <string>Outline Width:</string>
             </property>
         </widget>
-        <spacer row="3" column="2">
+        <spacer row="2" column="2">
             <property name="name">
                 <cstring>spacer9_2</cstring>
             </property>
@@ -119,7 +119,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="5" column="0">
+        <widget class="QLabel" row="4" column="0">
             <property name="name">
                 <cstring>fillcolorlabel</cstring>
             </property>
@@ -127,7 +127,7 @@
                 <string>Fill Color:</string>
             </property>
         </widget>
-        <widget class="QToolButton" row="5" column="4">
+        <widget class="QToolButton" row="4" column="4">
             <property name="name">
                 <cstring>btnFillColor</cstring>
             </property>
@@ -155,7 +155,7 @@
                 <string>...</string>
             </property>
         </widget>
-        <widget class="QLabel" row="1" column="3" rowspan="2" colspan="1">
+        <widget class="QLabel" row="1" column="3">
             <property name="name">
                 <cstring>lblOutlineColor</cstring>
             </property>
@@ -189,7 +189,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QToolButton" row="1" column="4" rowspan="2" colspan="1">
+        <widget class="QToolButton" row="1" column="4">
             <property name="name">
                 <cstring>btnOutlineColor</cstring>
             </property>
@@ -234,7 +234,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="QLabel" row="5" column="3">
+        <widget class="QLabel" row="4" column="3">
             <property name="name">
                 <cstring>lblFillColor</cstring>
             </property>
@@ -268,7 +268,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QPushButton" row="3" column="3" rowspan="1" colspan="2">
+        <widget class="QPushButton" row="2" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>stylebutton</cstring>
             </property>
@@ -290,7 +290,7 @@
                 <string></string>
             </property>
         </widget>
-        <widget class="QSpinBox" row="4" column="3" rowspan="1" colspan="2">
+        <widget class="QSpinBox" row="3" column="3" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>outlinewidthspinbox</cstring>
             </property>
@@ -317,17 +317,74 @@
                 <cstring>mLabelEdit</cstring>
             </property>
         </widget>
-        <widget class="QGroupBox" row="6" column="0" rowspan="1" colspan="5">
+        <widget class="QButtonGroup" row="5" column="0" rowspan="1" colspan="5">
             <property name="name">
                 <cstring>grpPattern</cstring>
             </property>
             <property name="title">
                 <string>Fill Pattern:</string>
             </property>
+            <property name="exclusive">
+                <bool>true</bool>
+            </property>
             <grid>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
+                <widget class="QPushButton" row="2" column="1">
+                    <property name="name">
+                        <cstring>dense1</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string></string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QPushButton" row="2" column="2">
+                    <property name="name">
+                        <cstring>dense6</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string></string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QPushButton" row="0" column="1">
+                    <property name="name">
+                        <cstring>fdiag</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string></string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
                 <widget class="QPushButton" row="0" column="0">
                     <property name="name">
                         <cstring>solid</cstring>
@@ -352,9 +409,9 @@
                         <bool>false</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="2">
+                <widget class="QPushButton" row="1" column="1">
                     <property name="name">
-                        <cstring>dense5</cstring>
+                        <cstring>diagcross</cstring>
                     </property>
                     <property name="paletteBackgroundColor">
                         <color>
@@ -406,6 +463,78 @@
                         <bool>true</bool>
                     </property>
                 </widget>
+                <widget class="QPushButton" row="1" column="2">
+                    <property name="name">
+                        <cstring>dense5</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string></string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QPushButton" row="4" column="1">
+                    <property name="name">
+                        <cstring>dense3</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string></string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QPushButton" row="3" column="2">
+                    <property name="name">
+                        <cstring>dense7</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string></string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
+                <widget class="QPushButton" row="4" column="2">
+                    <property name="name">
+                        <cstring>nopen</cstring>
+                    </property>
+                    <property name="paletteBackgroundColor">
+                        <color>
+                            <red>255</red>
+                            <green>255</green>
+                            <blue>255</blue>
+                        </color>
+                    </property>
+                    <property name="text">
+                        <string>Clear</string>
+                    </property>
+                    <property name="toggleButton">
+                        <bool>true</bool>
+                    </property>
+                </widget>
                 <widget class="QPushButton" row="2" column="0">
                     <property name="name">
                         <cstring>vertical</cstring>
@@ -460,60 +589,6 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="0" column="1">
-                    <property name="name">
-                        <cstring>fdiag</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="1" column="1">
-                    <property name="name">
-                        <cstring>diagcross</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="1">
-                    <property name="name">
-                        <cstring>dense1</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
                 <widget class="QPushButton" row="3" column="1">
                     <property name="name">
                         <cstring>dense2</cstring>
@@ -532,78 +607,6 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="4" column="1">
-                    <property name="name">
-                        <cstring>dense3</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="2" column="2">
-                    <property name="name">
-                        <cstring>dense6</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="4" column="2">
-                    <property name="name">
-                        <cstring>nopen</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
-                <widget class="QPushButton" row="3" column="2">
-                    <property name="name">
-                        <cstring>dense7</cstring>
-                    </property>
-                    <property name="paletteBackgroundColor">
-                        <color>
-                            <red>255</red>
-                            <green>255</green>
-                            <blue>255</blue>
-                        </color>
-                    </property>
-                    <property name="text">
-                        <string></string>
-                    </property>
-                    <property name="toggleButton">
-                        <bool>true</bool>
-                    </property>
-                </widget>
             </grid>
         </widget>
     </grid>