diff --git a/src/gui/addressrangedialog_q.ui b/src/gui/addressrangedialog_q.ui
index 0e22c02d0..fd3722b2b 100644
--- a/src/gui/addressrangedialog_q.ui
+++ b/src/gui/addressrangedialog_q.ui
@@ -65,9 +65,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -115,6 +182,16 @@
           </property>
          </widget>
         </item>
+        <item>
+         <widget class="QLabel" name="label" >
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/AddressRange/icon</pixmap>
+          </property>
+         </widget>
+        </item>
         <item>
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
@@ -328,7 +405,9 @@
   <tabstop>rangeEnd</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/addresstabledialog_q.ui b/src/gui/addresstabledialog_q.ui
index 4a529e9fa..dfc35a4e6 100644
--- a/src/gui/addresstabledialog_q.ui
+++ b/src/gui/addresstabledialog_q.ui
@@ -65,9 +65,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -93,7 +160,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -128,6 +195,25 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="autoFillBackground" >
+           <bool>false</bool>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/AddressTable/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -362,7 +448,9 @@
   <tabstop>previewButton</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>comment</sender>
diff --git a/src/gui/customservicedialog_q.ui b/src/gui/customservicedialog_q.ui
index ca70ed1e2..b4c9a314a 100644
--- a/src/gui/customservicedialog_q.ui
+++ b/src/gui/customservicedialog_q.ui
@@ -62,9 +62,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -90,7 +157,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -125,6 +192,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/CustomService/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -329,7 +412,9 @@
   <tabstop>code</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/dnsnamedialog_q.ui b/src/gui/dnsnamedialog_q.ui
index 5f3aa7c18..5f585dab6 100644
--- a/src/gui/dnsnamedialog_q.ui
+++ b/src/gui/dnsnamedialog_q.ui
@@ -59,9 +59,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -87,7 +154,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -122,6 +189,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/DNSName/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -289,7 +372,9 @@
   <tabstop>r_runtime</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/firewalldialog_q.ui b/src/gui/firewalldialog_q.ui
index 83b3382f3..2db8099d2 100644
--- a/src/gui/firewalldialog_q.ui
+++ b/src/gui/firewalldialog_q.ui
@@ -68,6 +68,73 @@
          <height>20</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -93,7 +160,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -128,6 +195,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/Firewall/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -507,7 +590,9 @@
   <tabstop>inactive</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>fwAdvanced</sender>
diff --git a/src/gui/groupobjectdialog_q.ui b/src/gui/groupobjectdialog_q.ui
index a3bbbe292..bc61751f1 100644
--- a/src/gui/groupobjectdialog_q.ui
+++ b/src/gui/groupobjectdialog_q.ui
@@ -68,9 +68,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -96,7 +163,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -131,6 +198,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/ObjectGroup/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -408,7 +491,9 @@
  <includes>
   <include location="local" >ObjectListView.h</include>
  </includes>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/hostdialog_q.ui b/src/gui/hostdialog_q.ui
index 5c5ef4d48..d6a4fc7b7 100644
--- a/src/gui/hostdialog_q.ui
+++ b/src/gui/hostdialog_q.ui
@@ -50,9 +50,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -78,7 +145,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -119,6 +186,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/Host/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -270,7 +353,9 @@
   <tabstop>MACmatching</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/icmpservicedialog_q.ui b/src/gui/icmpservicedialog_q.ui
index cb8aeeb56..fd40c8646 100644
--- a/src/gui/icmpservicedialog_q.ui
+++ b/src/gui/icmpservicedialog_q.ui
@@ -68,9 +68,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -96,7 +163,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -131,6 +198,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/ICMPService/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -360,7 +443,9 @@
   <tabstop>icmpCode</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/interfacedialog_q.ui b/src/gui/interfacedialog_q.ui
index 76aae519f..2f4ed427f 100644
--- a/src/gui/interfacedialog_q.ui
+++ b/src/gui/interfacedialog_q.ui
@@ -56,9 +56,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -84,7 +151,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -125,6 +192,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label_2" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/Interface/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
diff --git a/src/gui/ipservicedialog_q.ui b/src/gui/ipservicedialog_q.ui
index 41d36a09f..287936fee 100644
--- a/src/gui/ipservicedialog_q.ui
+++ b/src/gui/ipservicedialog_q.ui
@@ -68,9 +68,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -96,7 +163,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -131,6 +198,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/IPService/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -408,7 +491,9 @@
   <tabstop>short_fragments</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/ipv4dialog_q.ui b/src/gui/ipv4dialog_q.ui
index 51c6c66d6..50a964c54 100644
--- a/src/gui/ipv4dialog_q.ui
+++ b/src/gui/ipv4dialog_q.ui
@@ -62,9 +62,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -73,24 +140,24 @@
        </property>
        <layout class="QGridLayout" >
         <property name="leftMargin" >
-         <number>2</number>
+         <number>0</number>
         </property>
         <property name="topMargin" >
          <number>2</number>
         </property>
         <property name="rightMargin" >
-         <number>2</number>
+         <number>0</number>
         </property>
         <property name="bottomMargin" >
-         <number>2</number>
+         <number>0</number>
         </property>
         <property name="horizontalSpacing" >
-         <number>2</number>
+         <number>0</number>
         </property>
         <property name="verticalSpacing" >
-         <number>2</number>
+         <number>0</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -140,6 +207,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/IPv4/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -340,7 +423,9 @@
   <tabstop>dnsLookup</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>comment</sender>
diff --git a/src/gui/ipv6dialog_q.ui b/src/gui/ipv6dialog_q.ui
index 9077770b5..e0c64bf8d 100644
--- a/src/gui/ipv6dialog_q.ui
+++ b/src/gui/ipv6dialog_q.ui
@@ -62,9 +62,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -90,7 +157,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -114,7 +181,7 @@
            <number>0</number>
           </property>
           <property name="text" >
-           <string>Address</string>
+           <string>Address IPv6</string>
           </property>
           <property name="wordWrap" >
            <bool>false</bool>
@@ -140,6 +207,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/IPv6/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -366,7 +449,9 @@
   <tabstop>address</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>comment</sender>
diff --git a/src/gui/librarydialog_q.ui b/src/gui/librarydialog_q.ui
index 165a4295f..3b6afad92 100644
--- a/src/gui/librarydialog_q.ui
+++ b/src/gui/librarydialog_q.ui
@@ -62,9 +62,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -90,7 +157,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -131,6 +198,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/Library/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -314,7 +397,9 @@
   <tabstop>colorButton</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>colorButton</sender>
diff --git a/src/gui/networkdialog_q.ui b/src/gui/networkdialog_q.ui
index 78f7c470e..faeb18f1b 100644
--- a/src/gui/networkdialog_q.ui
+++ b/src/gui/networkdialog_q.ui
@@ -68,9 +68,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -96,7 +163,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -143,6 +210,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/Network/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -334,7 +417,9 @@
   <tabstop>netmask</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/networkdialogipv6_q.ui b/src/gui/networkdialogipv6_q.ui
index a9618305a..c8121008f 100644
--- a/src/gui/networkdialogipv6_q.ui
+++ b/src/gui/networkdialogipv6_q.ui
@@ -68,9 +68,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -96,7 +163,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -143,6 +210,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/IPv6/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -378,7 +461,9 @@
   <tabstop>address</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/physaddressdialog_q.ui b/src/gui/physaddressdialog_q.ui
index a8b3ac4a5..340e2049c 100644
--- a/src/gui/physaddressdialog_q.ui
+++ b/src/gui/physaddressdialog_q.ui
@@ -62,9 +62,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -90,7 +157,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -131,6 +198,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/physAddress/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -295,7 +378,9 @@
   <tabstop>pAddress</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/tagservicedialog_q.ui b/src/gui/tagservicedialog_q.ui
index 384e17a0f..f253782be 100644
--- a/src/gui/tagservicedialog_q.ui
+++ b/src/gui/tagservicedialog_q.ui
@@ -59,9 +59,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -87,7 +154,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -122,6 +189,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/Tag</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -280,7 +363,9 @@
   <tabstop>tagcode</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/tcpservicedialog_q.ui b/src/gui/tcpservicedialog_q.ui
index b91ce753f..81f2bbed6 100644
--- a/src/gui/tcpservicedialog_q.ui
+++ b/src/gui/tcpservicedialog_q.ui
@@ -65,9 +65,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -93,7 +160,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -128,6 +195,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/TCPService/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -833,7 +916,9 @@ by the target firewall platform</string>
   <tabstop>fin_s</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>
diff --git a/src/gui/timedialog_q.ui b/src/gui/timedialog_q.ui
index d6014a3d7..ffd06cdfb 100644
--- a/src/gui/timedialog_q.ui
+++ b/src/gui/timedialog_q.ui
@@ -59,9 +59,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>30</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -87,7 +154,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="font" >
            <font>
@@ -122,6 +189,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label_3" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/clock_25.png</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
diff --git a/src/gui/userdialog_q.ui b/src/gui/userdialog_q.ui
index 6530a87f8..edb023e58 100644
--- a/src/gui/userdialog_q.ui
+++ b/src/gui/userdialog_q.ui
@@ -68,9 +68,76 @@
        <property name="minimumSize" >
         <size>
          <width>16</width>
-         <height>20</height>
+         <height>35</height>
         </size>
        </property>
+       <property name="palette" >
+        <palette>
+         <active>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </active>
+         <inactive>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>255</green>
+             <blue>255</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </inactive>
+         <disabled>
+          <colorrole role="Base" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+          <colorrole role="Window" >
+           <brush brushstyle="SolidPattern" >
+            <color alpha="255" >
+             <red>255</red>
+             <green>254</green>
+             <blue>253</blue>
+            </color>
+           </brush>
+          </colorrole>
+         </disabled>
+        </palette>
+       </property>
+       <property name="autoFillBackground" >
+        <bool>true</bool>
+       </property>
        <property name="frameShape" >
         <enum>QFrame::Box</enum>
        </property>
@@ -96,7 +163,7 @@
         <property name="verticalSpacing" >
          <number>2</number>
         </property>
-        <item row="0" column="1" >
+        <item row="0" column="2" >
          <widget class="QLabel" name="editorTitle" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Fixed" hsizetype="Preferred" >
@@ -143,6 +210,22 @@
           </property>
          </widget>
         </item>
+        <item row="0" column="1" >
+         <widget class="QLabel" name="label" >
+          <property name="sizePolicy" >
+           <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
+            <horstretch>0</horstretch>
+            <verstretch>0</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="text" >
+           <string/>
+          </property>
+          <property name="pixmap" >
+           <pixmap resource="MainRes.qrc" >:/Icons/UserService/icon</pixmap>
+          </property>
+         </widget>
+        </item>
        </layout>
       </widget>
      </item>
@@ -313,7 +396,9 @@
   <tabstop>userid</tabstop>
   <tabstop>comment</tabstop>
  </tabstops>
- <resources/>
+ <resources>
+  <include location="MainRes.qrc" />
+ </resources>
  <connections>
   <connection>
    <sender>obj_name</sender>