diff --git a/build_num b/build_num
index 4bda6eee9..1dba3f6b1 100644
--- a/build_num
+++ b/build_num
@@ -1 +1 @@
-#define BUILD_NUM 1521
+#define BUILD_NUM 1522
diff --git a/src/gui/FWBMainWindow_q.ui b/src/gui/FWBMainWindow_q.ui
index 5462bfd15..af74f0e51 100644
--- a/src/gui/FWBMainWindow_q.ui
+++ b/src/gui/FWBMainWindow_q.ui
@@ -1,10 +1,11 @@
-<ui version="4.0" >
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
  <class>FWBMainWindow_q</class>
- <widget class="QMainWindow" name="FWBMainWindow_q" >
-  <property name="enabled" >
+ <widget class="QMainWindow" name="FWBMainWindow_q">
+  <property name="enabled">
    <bool>true</bool>
   </property>
-  <property name="geometry" >
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
@@ -12,734 +13,734 @@
     <height>719</height>
    </rect>
   </property>
-  <property name="sizePolicy" >
-   <sizepolicy vsizetype="Preferred" hsizetype="Expanding" >
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
     <horstretch>0</horstretch>
     <verstretch>0</verstretch>
    </sizepolicy>
   </property>
-  <property name="minimumSize" >
+  <property name="minimumSize">
    <size>
     <width>0</width>
     <height>0</height>
    </size>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string>Firewall Builder</string>
   </property>
-  <property name="windowIcon" >
-   <iconset resource="MainRes.qrc" >
+  <property name="windowIcon">
+   <iconset resource="MainRes.qrc">
     <normaloff>:/Images/fwbuilder3.png</normaloff>:/Images/fwbuilder3.png</iconset>
   </property>
-  <widget class="QWidget" name="widget" >
-   <layout class="QGridLayout" >
-    <property name="margin" >
+  <widget class="QWidget" name="widget">
+   <layout class="QGridLayout">
+    <property name="margin">
      <number>0</number>
     </property>
-    <property name="spacing" >
+    <property name="spacing">
      <number>0</number>
     </property>
    </layout>
   </widget>
-  <widget class="QToolBar" name="toolBar" >
-   <property name="orientation" >
+  <widget class="QToolBar" name="toolBar">
+   <property name="orientation">
     <enum>Qt::Horizontal</enum>
    </property>
-   <attribute name="toolBarArea" >
+   <attribute name="toolBarArea">
     <enum>TopToolBarArea</enum>
    </attribute>
-   <attribute name="toolBarBreak" >
+   <attribute name="toolBarBreak">
     <bool>false</bool>
    </attribute>
-   <addaction name="toolbarFileOpen" />
-   <addaction name="toolbarFileSave" />
-   <addaction name="separator" />
-   <addaction name="findAction" />
-   <addaction name="separator" />
-   <addaction name="compileAction" />
-   <addaction name="installAction" />
+   <addaction name="toolbarFileOpen"/>
+   <addaction name="toolbarFileSave"/>
+   <addaction name="separator"/>
+   <addaction name="findAction"/>
+   <addaction name="separator"/>
+   <addaction name="compileAction"/>
+   <addaction name="installAction"/>
   </widget>
-  <widget class="QMenuBar" name="MenuBar" >
-   <property name="geometry" >
+  <widget class="QMenuBar" name="MenuBar">
+   <property name="geometry">
     <rect>
      <x>0</x>
      <y>0</y>
      <width>741</width>
-     <height>22</height>
+     <height>26</height>
     </rect>
    </property>
-   <widget class="QMenu" name="editMenu" >
-    <property name="title" >
+   <widget class="QMenu" name="editMenu">
+    <property name="title">
      <string>&amp;Edit</string>
     </property>
-    <addaction name="editUndoAction" />
-    <addaction name="editRedoAction" />
-    <addaction name="separator" />
-    <addaction name="editCutAction" />
-    <addaction name="editCopyAction" />
-    <addaction name="editPasteAction" />
-    <addaction name="separator" />
-    <addaction name="editDeleteAction" />
-    <addaction name="separator" />
-    <addaction name="editPrefsAction" />
+    <addaction name="editUndoAction"/>
+    <addaction name="editRedoAction"/>
+    <addaction name="separator"/>
+    <addaction name="editCutAction"/>
+    <addaction name="editCopyAction"/>
+    <addaction name="editPasteAction"/>
+    <addaction name="separator"/>
+    <addaction name="editDeleteAction"/>
+    <addaction name="separator"/>
+    <addaction name="editPrefsAction"/>
    </widget>
-   <widget class="QMenu" name="ObjectMenu" >
-    <property name="title" >
+   <widget class="QMenu" name="ObjectMenu">
+    <property name="title">
      <string>Object</string>
     </property>
-    <addaction name="newObjectAction" />
-    <addaction name="findAction" />
-    <addaction name="separator" />
-    <addaction name="ObjectLockAction" />
-    <addaction name="ObjectUnlockAction" />
+    <addaction name="newObjectAction"/>
+    <addaction name="findAction"/>
+    <addaction name="separator"/>
+    <addaction name="ObjectLockAction"/>
+    <addaction name="ObjectUnlockAction"/>
    </widget>
-   <widget class="QMenu" name="toolsMenu" >
-    <property name="title" >
+   <widget class="QMenu" name="toolsMenu">
+    <property name="title">
      <string>Tools</string>
     </property>
-    <addaction name="fileCompareAction" />
-    <addaction name="DiscoveryDruidAction" />
+    <addaction name="fileCompareAction"/>
+    <addaction name="DiscoveryDruidAction"/>
    </widget>
-   <widget class="QMenu" name="helpMenu" >
-    <property name="title" >
+   <widget class="QMenu" name="helpMenu">
+    <property name="title">
      <string>&amp;Help</string>
     </property>
-    <addaction name="helpAboutAction" />
-    <addaction name="debugAction" />
-    <addaction name="helpAction" />
-    <addaction name="release_Notes_Action" />
+    <addaction name="helpAboutAction"/>
+    <addaction name="debugAction"/>
+    <addaction name="helpAction"/>
+    <addaction name="release_Notes_Action"/>
    </widget>
-   <widget class="QMenu" name="RulesMenu" >
-    <property name="title" >
+   <widget class="QMenu" name="RulesMenu">
+    <property name="title">
      <string>Rules</string>
     </property>
-    <addaction name="insertRuleAction" />
-    <addaction name="addRuleAfterCurrentAction" />
-    <addaction name="removeRuleAction" />
-    <addaction name="moveRuleAction" />
-    <addaction name="separator" />
-    <addaction name="copyRuleAction" />
-    <addaction name="cutRuleAction" />
-    <addaction name="pasteRuleAboveAction" />
-    <addaction name="pasteRuleBelowAction" />
-    <addaction name="separator" />
-    <addaction name="compileAction" />
-    <addaction name="installAction" />
+    <addaction name="insertRuleAction"/>
+    <addaction name="addRuleAfterCurrentAction"/>
+    <addaction name="removeRuleAction"/>
+    <addaction name="moveRuleAction"/>
+    <addaction name="separator"/>
+    <addaction name="copyRuleAction"/>
+    <addaction name="cutRuleAction"/>
+    <addaction name="pasteRuleAboveAction"/>
+    <addaction name="pasteRuleBelowAction"/>
+    <addaction name="separator"/>
+    <addaction name="compileAction"/>
+    <addaction name="installAction"/>
    </widget>
-   <widget class="QMenu" name="fileMenu" >
-    <property name="title" >
+   <widget class="QMenu" name="fileMenu">
+    <property name="title">
      <string>&amp;File</string>
     </property>
-    <widget class="QMenu" name="menuOpen_Recent" >
-     <property name="title" >
+    <widget class="QMenu" name="menuOpen_Recent">
+     <property name="title">
       <string>Open Recent</string>
      </property>
     </widget>
-    <addaction name="fileNewAction" />
-    <addaction name="fileOpenAction" />
-    <addaction name="menuOpen_Recent" />
-    <addaction name="separator" />
-    <addaction name="fileSaveAction" />
-    <addaction name="fileSaveAsAction" />
-    <addaction name="fileCloseAction" />
-    <addaction name="filePropAction" />
-    <addaction name="separator" />
-    <addaction name="addToRCSAction" />
-    <addaction name="fileCommitAction" />
-    <addaction name="fileDiscardAction" />
-    <addaction name="separator" />
-    <addaction name="policyImportAction" />
-    <addaction name="separator" />
-    <addaction name="libImportAction" />
-    <addaction name="libExportAction" />
-    <addaction name="separator" />
-    <addaction name="filePrintAction" />
-    <addaction name="separator" />
-    <addaction name="fileExitAction" />
+    <addaction name="fileNewAction"/>
+    <addaction name="fileOpenAction"/>
+    <addaction name="menuOpen_Recent"/>
+    <addaction name="separator"/>
+    <addaction name="fileSaveAction"/>
+    <addaction name="fileSaveAsAction"/>
+    <addaction name="fileCloseAction"/>
+    <addaction name="filePropAction"/>
+    <addaction name="separator"/>
+    <addaction name="addToRCSAction"/>
+    <addaction name="fileCommitAction"/>
+    <addaction name="fileDiscardAction"/>
+    <addaction name="separator"/>
+    <addaction name="policyImportAction"/>
+    <addaction name="separator"/>
+    <addaction name="libImportAction"/>
+    <addaction name="libExportAction"/>
+    <addaction name="separator"/>
+    <addaction name="filePrintAction"/>
+    <addaction name="separator"/>
+    <addaction name="fileExitAction"/>
    </widget>
-   <widget class="QMenu" name="menuWindow" >
-    <property name="title" >
+   <widget class="QMenu" name="menuWindow">
+    <property name="title">
      <string>Window</string>
     </property>
    </widget>
-   <addaction name="fileMenu" />
-   <addaction name="editMenu" />
-   <addaction name="ObjectMenu" />
-   <addaction name="RulesMenu" />
-   <addaction name="toolsMenu" />
-   <addaction name="menuWindow" />
-   <addaction name="helpMenu" />
+   <addaction name="fileMenu"/>
+   <addaction name="editMenu"/>
+   <addaction name="ObjectMenu"/>
+   <addaction name="RulesMenu"/>
+   <addaction name="toolsMenu"/>
+   <addaction name="menuWindow"/>
+   <addaction name="helpMenu"/>
   </widget>
-  <action name="fileNewAction" >
-   <property name="enabled" >
+  <action name="fileNewAction">
+   <property name="enabled">
     <bool>true</bool>
    </property>
-   <property name="icon" >
+   <property name="icon">
     <iconset>
      <normaloff/>
     </iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;New Object File</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>New Object File</string>
    </property>
   </action>
-  <action name="fileOpenAction" >
-   <property name="icon" >
+  <action name="fileOpenAction">
+   <property name="icon">
     <iconset>
      <normaloff/>
     </iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Open...</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Open</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+O</string>
    </property>
   </action>
-  <action name="fileSaveAction" >
-   <property name="icon" >
+  <action name="fileSaveAction">
+   <property name="icon">
     <iconset>
      <normaloff/>
     </iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Save</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Save</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+S</string>
    </property>
   </action>
-  <action name="fileSaveAsAction" >
-   <property name="text" >
+  <action name="fileSaveAsAction">
+   <property name="text">
     <string>Save &amp;As...</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Save As</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string/>
    </property>
   </action>
-  <action name="filePrintAction" >
-   <property name="enabled" >
+  <action name="filePrintAction">
+   <property name="enabled">
     <bool>true</bool>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Print...</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Print</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+P</string>
    </property>
   </action>
-  <action name="fileExitAction" >
-   <property name="text" >
+  <action name="fileExitAction">
+   <property name="text">
     <string>E&amp;xit</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Exit</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string/>
    </property>
   </action>
-  <action name="editUndoAction" >
-   <property name="enabled" >
+  <action name="editUndoAction">
+   <property name="enabled">
     <bool>false</bool>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Undo</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Undo</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Z</string>
    </property>
   </action>
-  <action name="editRedoAction" >
-   <property name="enabled" >
+  <action name="editRedoAction">
+   <property name="enabled">
     <bool>false</bool>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Redo</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Redo</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Y</string>
    </property>
   </action>
-  <action name="editCutAction" >
-   <property name="text" >
+  <action name="editCutAction">
+   <property name="text">
     <string>&amp;Cut</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Cut</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+X</string>
    </property>
   </action>
-  <action name="editCopyAction" >
-   <property name="checkable" >
+  <action name="editCopyAction">
+   <property name="checkable">
     <bool>false</bool>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>C&amp;opy</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Copy</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+C</string>
    </property>
   </action>
-  <action name="editPasteAction" >
-   <property name="text" >
+  <action name="editPasteAction">
+   <property name="text">
     <string>&amp;Paste</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Paste</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+V</string>
    </property>
   </action>
-  <action name="editFindAction" >
-   <property name="text" >
+  <action name="editFindAction">
+   <property name="text">
     <string/>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string/>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+F</string>
    </property>
   </action>
-  <action name="helpContentsAction" >
-   <property name="text" >
+  <action name="helpContentsAction">
+   <property name="text">
     <string>&amp;Contents...</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Contents</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string/>
    </property>
   </action>
-  <action name="helpIndexAction" >
-   <property name="text" >
+  <action name="helpIndexAction">
+   <property name="text">
     <string>&amp;Index...</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Index</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string/>
    </property>
   </action>
-  <action name="helpAboutAction" >
-   <property name="text" >
+  <action name="helpAboutAction">
+   <property name="text">
     <string>&amp;About</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>About</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string/>
    </property>
   </action>
-  <action name="toolbarFileNew" >
-   <property name="icon" >
+  <action name="toolbarFileNew">
+   <property name="icon">
     <iconset>
      <normaloff>newfile_25.png</normaloff>newfile_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>New</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>New</string>
    </property>
   </action>
-  <action name="toolbarFileOpen" >
-   <property name="icon" >
-    <iconset resource="MainRes.qrc" >
+  <action name="toolbarFileOpen">
+   <property name="icon">
+    <iconset resource="MainRes.qrc">
      <normaloff>:/Icons/openfile_25.png</normaloff>:/Icons/openfile_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Open</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Open</string>
    </property>
   </action>
-  <action name="toolbarFileSave" >
-   <property name="icon" >
-    <iconset resource="MainRes.qrc" >
+  <action name="toolbarFileSave">
+   <property name="icon">
+    <iconset resource="MainRes.qrc">
      <normaloff>:/Icons/save_25.png</normaloff>:/Icons/save_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Save</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Save</string>
    </property>
   </action>
-  <action name="fileCloseAction" >
-   <property name="text" >
+  <action name="fileCloseAction">
+   <property name="text">
     <string>&amp;Close</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Close</string>
    </property>
   </action>
-  <action name="compileAction" >
-   <property name="icon" >
-    <iconset resource="MainRes.qrc" >
+  <action name="compileAction">
+   <property name="icon">
+    <iconset resource="MainRes.qrc">
      <normaloff>:/Icons/compile_25.png</normaloff>:/Icons/compile_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Compile</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Compile</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Compile rules</string>
    </property>
   </action>
-  <action name="installAction" >
-   <property name="icon" >
-    <iconset resource="MainRes.qrc" >
+  <action name="installAction">
+   <property name="icon">
+    <iconset resource="MainRes.qrc">
      <normaloff>:/Icons/install_25.png</normaloff>:/Icons/install_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Install</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Install</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Install firewall policy</string>
    </property>
   </action>
-  <action name="backAction" >
-   <property name="enabled" >
+  <action name="backAction">
+   <property name="enabled">
     <bool>false</bool>
    </property>
-   <property name="icon" >
+   <property name="icon">
     <iconset>
      <normaloff>back_25.png</normaloff>back_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Back</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Back</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Move back to the previous object</string>
    </property>
-   <property name="statusTip" >
+   <property name="statusTip">
     <string>Move back to the previous object</string>
    </property>
   </action>
-  <action name="newObjectAction" >
-   <property name="icon" >
+  <action name="newObjectAction">
+   <property name="icon">
     <iconset>
      <normaloff/>
     </iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;New Object</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>New Object</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Create New Object</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+N</string>
    </property>
   </action>
-  <action name="findAction" >
-   <property name="icon" >
-    <iconset resource="MainRes.qrc" >
+  <action name="findAction">
+   <property name="icon">
+    <iconset resource="MainRes.qrc">
      <normaloff>:/Icons/search_25.png</normaloff>:/Icons/search_25.png</iconset>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>&amp;Find Object</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Find Object</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Find object in the tree</string>
    </property>
-   <property name="statusTip" >
+   <property name="statusTip">
     <string>Find object in the tree</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+F</string>
    </property>
   </action>
-  <action name="editPrefsAction" >
-   <property name="text" >
+  <action name="editPrefsAction">
+   <property name="text">
     <string>P&amp;references...</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Preferences...</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Edit Preferences</string>
    </property>
   </action>
-  <action name="insertRuleAction" >
-   <property name="text" >
+  <action name="insertRuleAction">
+   <property name="text">
     <string>Insert Rule</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Insert Rule</string>
    </property>
   </action>
-  <action name="moveRuleUpAction" >
-   <property name="text" >
+  <action name="moveRuleUpAction">
+   <property name="text">
     <string>Move Rule Up</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Move Rule Up</string>
    </property>
   </action>
-  <action name="moveRuleDownAction" >
-   <property name="text" >
+  <action name="moveRuleDownAction">
+   <property name="text">
     <string>Move Rule Down</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Move Rule Down</string>
    </property>
   </action>
-  <action name="addRuleAfterCurrentAction" >
-   <property name="text" >
+  <action name="addRuleAfterCurrentAction">
+   <property name="text">
     <string>Add Rule Below</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Add Rule Below</string>
    </property>
   </action>
-  <action name="removeRuleAction" >
-   <property name="text" >
+  <action name="removeRuleAction">
+   <property name="text">
     <string>Remove Rule</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Remove Rule</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+Del</string>
    </property>
   </action>
-  <action name="copyRuleAction" >
-   <property name="text" >
+  <action name="copyRuleAction">
+   <property name="text">
     <string>Copy Rule</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Copy Rule</string>
    </property>
   </action>
-  <action name="cutRuleAction" >
-   <property name="text" >
+  <action name="cutRuleAction">
+   <property name="text">
     <string>Cut Rule</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Cut Rule</string>
    </property>
   </action>
-  <action name="pasteRuleAboveAction" >
-   <property name="text" >
+  <action name="pasteRuleAboveAction">
+   <property name="text">
     <string>Paste Rule Above</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Paste Rule Above</string>
    </property>
   </action>
-  <action name="pasteRuleBelowAction" >
-   <property name="text" >
+  <action name="pasteRuleBelowAction">
+   <property name="text">
     <string>Paste Rule Below</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Paste Rule Below</string>
    </property>
   </action>
-  <action name="addToRCSAction" >
-   <property name="text" >
+  <action name="addToRCSAction">
+   <property name="text">
     <string>Add File to &amp;RCS</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Add File to RCS</string>
    </property>
   </action>
-  <action name="editDeleteAction" >
-   <property name="text" >
+  <action name="editDeleteAction">
+   <property name="text">
     <string>Delete</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Delete</string>
    </property>
   </action>
-  <action name="libExportAction" >
-   <property name="text" >
+  <action name="libExportAction">
+   <property name="text">
     <string>&amp;Export Library</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Export Library To a File</string>
    </property>
   </action>
-  <action name="libImportAction" >
-   <property name="text" >
+  <action name="libImportAction">
+   <property name="text">
     <string>Import &amp;Library</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Import Library From a File</string>
    </property>
   </action>
-  <action name="debugAction" >
-   <property name="text" >
+  <action name="debugAction">
+   <property name="text">
     <string>&amp;Debug</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Debug</string>
    </property>
   </action>
-  <action name="filePropAction" >
-   <property name="text" >
+  <action name="filePropAction">
+   <property name="text">
     <string>Propert&amp;ies</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Propert&amp;ies</string>
    </property>
-   <property name="statusTip" >
+   <property name="statusTip">
     <string>Show File Properties</string>
    </property>
-   <property name="shortcut" >
+   <property name="shortcut">
     <string>Ctrl+I</string>
    </property>
   </action>
-  <action name="moveRuleAction" >
-   <property name="text" >
+  <action name="moveRuleAction">
+   <property name="text">
     <string>Move Selected Rules</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Move Selected Rules</string>
    </property>
   </action>
-  <action name="fileDiscardAction" >
-   <property name="text" >
+  <action name="fileDiscardAction">
+   <property name="text">
     <string>&amp;Discard</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Discard</string>
    </property>
-   <property name="toolTip" >
+   <property name="toolTip">
     <string>Discard Changes and Overwrite With Clean Copy Of The Head Revision From RCS</string>
    </property>
   </action>
-  <action name="fileCommitAction" >
-   <property name="text" >
+  <action name="fileCommitAction">
+   <property name="text">
     <string>Co&amp;mmit</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Commit</string>
    </property>
-   <property name="statusTip" >
+   <property name="statusTip">
     <string>Commit Opened File to RCS and Continue Editing</string>
    </property>
   </action>
-  <action name="ObjectLockAction" >
-   <property name="text" >
+  <action name="ObjectLockAction">
+   <property name="text">
     <string>Lock</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Lock</string>
    </property>
   </action>
-  <action name="ObjectUnlockAction" >
-   <property name="text" >
+  <action name="ObjectUnlockAction">
+   <property name="text">
     <string>Unlock</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Unlock</string>
    </property>
   </action>
-  <action name="DiscoveryDruidAction" >
-   <property name="text" >
+  <action name="DiscoveryDruidAction">
+   <property name="text">
     <string>Discovery Druid</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Discovery Druid</string>
    </property>
   </action>
-  <action name="new_itemAction" >
-   <property name="text" >
+  <action name="new_itemAction">
+   <property name="text">
     <string>new item</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>new item</string>
    </property>
   </action>
-  <action name="fileCompareAction" >
-   <property name="text" >
+  <action name="fileCompareAction">
+   <property name="text">
     <string>Find Conflicting Objects in Two Files</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Find Conflicting Objects in Two Files</string>
    </property>
   </action>
-  <action name="policyImportAction" >
-   <property name="text" >
+  <action name="policyImportAction">
+   <property name="text">
     <string>Import Po&amp;licy</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>Import Policy</string>
    </property>
   </action>
-  <action name="helpAction" >
-   <property name="text" >
+  <action name="helpAction">
+   <property name="text">
     <string>Firewall Builder Help</string>
    </property>
   </action>
-  <action name="actionClearRecentFiles" >
-   <property name="enabled" >
+  <action name="actionClearRecentFiles">
+   <property name="enabled">
     <bool>true</bool>
    </property>
-   <property name="text" >
+   <property name="text">
     <string>Clear Menu</string>
    </property>
-   <property name="iconText" >
+   <property name="iconText">
     <string>New Object File</string>
    </property>
   </action>
-  <action name="release_Notes_Action" >
-   <property name="text" >
+  <action name="release_Notes_Action">
+   <property name="text">
     <string>Release Notes</string>
    </property>
   </action>
  </widget>
- <layoutdefault spacing="0" margin="11" />
+ <layoutdefault spacing="0" margin="11"/>
  <resources>
-  <include location="MainRes.qrc" />
+  <include location="MainRes.qrc"/>
  </resources>
  <connections>
   <connection>
@@ -748,11 +749,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>addRuleAfterCurrent()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -764,11 +765,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileAddToRCS()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -780,11 +781,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>compile()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -796,11 +797,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>copyRule()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -812,11 +813,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>cutRule()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -828,11 +829,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>debug()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -844,11 +845,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>toolsDiscoveryDruid()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -860,11 +861,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editCopy()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -876,11 +877,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editCut()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -892,11 +893,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editDelete()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -908,11 +909,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editFind()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -924,11 +925,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editPaste()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -940,11 +941,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editPrefs()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -956,11 +957,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editRedo()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -972,11 +973,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>editUndo()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -988,11 +989,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileClose()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1004,11 +1005,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileCommit()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1020,11 +1021,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileCompare()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1036,11 +1037,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileDiscard()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1052,11 +1053,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileExit()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1068,11 +1069,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileNew()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1084,11 +1085,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileOpen()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1100,11 +1101,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>filePrint()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1116,11 +1117,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileProp()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1132,11 +1133,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileSave()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1148,11 +1149,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileSaveAs()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1164,11 +1165,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>helpAbout()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1180,11 +1181,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>helpContents()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1196,11 +1197,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>helpIndex()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1212,11 +1213,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>insertRule()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1228,11 +1229,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>install()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1244,11 +1245,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileExport()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1260,11 +1261,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileImport()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1276,11 +1277,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>moveRule()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1292,11 +1293,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>moveRuleUp()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1308,11 +1309,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>newObject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1324,11 +1325,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>lockObject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1340,11 +1341,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>unlockObject()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1356,11 +1357,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>pasteRuleAbove()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1372,11 +1373,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>pasteRuleBelow()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1388,11 +1389,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>removeRule()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1404,11 +1405,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileNew()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1420,11 +1421,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileOpen()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1436,11 +1437,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>fileSave()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1452,11 +1453,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>importPolicy()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>20</x>
      <y>20</y>
     </hint>
@@ -1468,11 +1469,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>help()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>370</x>
      <y>359</y>
     </hint>
@@ -1484,11 +1485,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>clearRecentFilesMenu()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>370</x>
      <y>359</y>
     </hint>
@@ -1500,11 +1501,11 @@
    <receiver>FWBMainWindow_q</receiver>
    <slot>showReleaseNotes()</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>-1</x>
      <y>-1</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>370</x>
      <y>359</y>
     </hint>
diff --git a/src/gui/MainRes.qrc b/src/gui/MainRes.qrc
index 789cdca43..5bb86af3d 100644
--- a/src/gui/MainRes.qrc
+++ b/src/gui/MainRes.qrc
@@ -1,238 +1,238 @@
 <RCC>
-    <qresource prefix="/" >
-        <file alias="Icons/Routing/icon" >Icons/routing_25.png</file>
-        <file alias="Icons/Routing/icon-tree" >Icons/routing_16.png</file>
-        <file alias="Icons/FailoverClusterGroup/icon-neg-tree" >Icons/failover-cluster-group-neg_16.png</file>
-        <file alias="Icons/FailoverClusterGroup/icon-neg" >Icons/failover-cluster-group-neg_25.png</file>
-        <file alias="Icons/FailoverClusterGroup/icon-ref" >Icons/failover-cluster-group-ref_25.png</file>
-        <file alias="Icons/FailoverClusterGroup/icon-tree" >Icons/failover-cluster-group_16.png</file>
-        <file alias="Icons/FailoverClusterGroup/icon" >Icons/failover-cluster-group_25.png</file>
-        <file alias="Icons/StateSyncClusterGroup/icon-neg-tree" >Icons/state-sync-cluster-group-neg_16.png</file>
-        <file alias="Icons/StateSyncClusterGroup/icon-neg" >Icons/state-sync-cluster-group-neg_25.png</file>
-        <file alias="Icons/StateSyncClusterGroup/icon-ref" >Icons/state-sync-cluster-group-ref_25.png</file>
-        <file alias="Icons/StateSyncClusterGroup/icon-tree" >Icons/state-sync-cluster-group_16.png</file>
-        <file alias="Icons/StateSyncClusterGroup/icon" >Icons/state-sync-cluster-group_25.png</file>
-        <file>Images/fwbuilder3-128x128.png</file>
-        <file alias="Icons/Routing/icon-tree" >Icons/route_16.png</file>
-        <file alias="Icons/Accept-tree" >Icons/accept_16.png</file>
-        <file alias="Icons/Accept" >Icons/accept_25.png</file>
-        <file alias="Icons/Accounting-tree" >Icons/accounting_16.png</file>
-        <file alias="Icons/Accounting" >Icons/accounting_25.png</file>
-        <file alias="Icons/IPv4/icon-neg-tree" >Icons/address-neg_16.png</file>
-        <file alias="Icons/IPv4/icon-neg" >Icons/address-neg_25.png</file>
-        <file alias="Icons/IPv4/icon-ref" >Icons/address-ref_25.png</file>
-        <file alias="Icons/IPv6/icon-neg-tree" >Icons/address6-neg_16.png</file>
-        <file alias="Icons/IPv6/icon-neg" >Icons/address6-neg_25.png</file>
-        <file alias="Icons/IPv6/icon-ref" >Icons/address6-ref_25.png</file>
-        <file alias="Icons/IPv6/icon-tree" >Icons/address6_16.png</file>
-        <file alias="Icons/IPv6/icon" >Icons/address6_25.png</file>
-        <file alias="Icons/IPv4/icon-tree" >Icons/address_16.png</file>
-        <file alias="Icons/IPv4/icon" >Icons/address_25.png</file>
-        <file alias="Icons/AddressTable/icon-neg-tree" >Icons/addresstable-neg_16.png</file>
-        <file alias="Icons/AddressTable/icon-neg" >Icons/addresstable-neg_25.png</file>
-        <file alias="Icons/AddressTable/icon-ref" >Icons/addresstable-ref_25.png</file>
-        <file alias="Icons/AddressTable/icon-tree" >Icons/addresstable_16.png</file>
-        <file alias="Icons/AddressTable/icon" >Icons/addresstable_25.png</file>
-        <file>Icons/apply.png</file>
-        <file alias="Icons/Return" >Icons/back_25.png</file>
-        <file>Icons/back_32.png</file>
-        <file>Icons/big-down-arrow.png</file>
-        <file>Icons/big-left-arrow.png</file>
-        <file>Icons/big-right-arrow.png</file>
-        <file>Icons/big-up-arrow.png</file>
-        <file alias="Icons/Blank" >Icons/blank.png</file>
-        <file>Icons/blank_2x16.png</file>
-        <file>Icons/books1.png</file>
-        <file alias="Icons/Both" >Icons/both_25.png</file>
-        <file alias="Icons/Both-tree" >Icons/both_16.png</file>
-        <file alias="Icons/Branch-tree" >Icons/branch_16.png</file>
-        <file alias="Icons/Branch" >Icons/branch_25.png</file>
-        <file>Icons/cancel.png</file>
-        <file alias="Icons/Classify-tree" >Icons/classify_16.png</file>
-        <file alias="Icons/Classify" >Icons/classify_25.png</file>
-        <file alias="Icons/IntervalGroup/icon-neg-tree" >Icons/clock-group-neg_16.png</file>
-        <file alias="Icons/IntervalGroup/icon-neg" >Icons/clock-group-neg_25.png</file>
-        <file alias="Icons/IntervalGroup/icon-ref" >Icons/clock-group-ref_25.png</file>
-        <file alias="Icons/IntervalGroup/icon-tree" >Icons/clock-group_16.png</file>
-        <file alias="Icons/IntervalGroup/icon" >Icons/clock-group_25.png</file>
-        <file alias="Icons/Interval/icon-neg" >Icons/clock-neg_25.png</file>
-        <file alias="Icons/Interval/icon-ref" >Icons/clock-ref_25.png</file>
-        <file alias="Icons/Interval/icon-tree" >Icons/clock_16.png</file>
-        <file alias="Icons/Interval/icon" >Icons/clock_25.png</file>
-        <file>Icons/close.png</file>
-        <file>Icons/compile_25.png</file>
-        <file alias="Icons/Continue-tree" >Icons/continue_16.png</file>
-        <file alias="Icons/Continue" >Icons/continue_25.png</file>
-        <file alias="Icons/Custom-tree" >Icons/custom_16.png</file>
-        <file alias="Icons/Custom" >Icons/custom_25.png</file>
-        <file alias="Icons/Deny-tree" >Icons/deny_16.png</file>
-        <file alias="Icons/Deny" >Icons/deny_25.png</file>
-        <file alias="Icons/DNSName/icon-neg-tree" >Icons/domainname-neg_16.png</file>
-        <file alias="Icons/DNSName/icon-neg" >Icons/domainname-neg_25.png</file>
-        <file alias="Icons/DNSName/icon-ref" >Icons/domainname-ref_25.png</file>
-        <file alias="Icons/DNSName/icon-tree" >Icons/domainname_16.png</file>
-        <file alias="Icons/DNSName/icon" >Icons/domainname_25.png</file>
-        <file>Icons/down-arrow.png</file>
-        <file>Icons/drag_object.png</file>
-        <file>Icons/error.png</file>
-        <file alias="Icons/Firewall/icon-neg-tree" >Icons/firewall-neg_16.png</file>
-        <file alias="Icons/Firewall/icon-neg" >Icons/firewall-neg_25.png</file>
-        <file alias="Icons/Firewall/icon-ref" >Icons/firewall-ref_25.png</file>
-        <file alias="Icons/Firewall/icon-tree" >Icons/firewall_16.png</file>
-        <file alias="Icons/Firewall/icon" >Icons/firewall_25.png</file>
-        <file>Icons/firewall_64.png</file>
-        <file>Icons/firewall_64.xpm</file>
-        <file>Icons/floppy.png</file>
-        <file>Icons/generic.png</file>
-        <file alias="Icons/SystemGroup/icon-tree" >Icons/folder_16.png</file>
-        <file alias="Icons/SystemGroup/icon" >Icons/folder_25.png</file>
-        <file>Icons/folder1.png</file>
-        <file alias="Icons/Host/icon-neg-tree" >Icons/host-neg_16.png</file>
-        <file alias="Icons/Host/icon-neg" >Icons/host-neg_25.png</file>
-        <file alias="Icons/Host/icon-ref" >Icons/host-ref_25.png</file>
-        <file alias="Icons/Host/icon-tree" >Icons/host_16.png</file>
-        <file alias="Icons/Host/icon" >Icons/host_25.png</file>
-        <file>Icons/host_64.png</file>
-        <file>Icons/host_64.xpm</file>
-        <file alias="Icons/Inbound" >Icons/inbound_25.png</file>
-        <file alias="Icons/Inbound-tree" >Icons/inbound_16.png</file>
-        <file>Icons/info_25.png</file>
-        <file>Icons/install_25.png</file>
-        <file alias="Icons/Interface/icon-neg-tree" >Icons/interface-neg_16.png</file>
-        <file alias="Icons/Interface/icon-neg" >Icons/interface-neg_25.png</file>
-        <file alias="Icons/Interface/icon-ref" >Icons/interface-ref_25.png</file>
-        <file alias="Icons/Interface/icon-tree" >Icons/interface_16.png</file>
-        <file alias="Icons/Interface/icon" >Icons/interface_25.png</file>
-        <file>Icons/key.png</file>
-        <file>Icons/left-arrow.png</file>
-        <file alias="Icons/Library/icon-tree" >Icons/library_16.png</file>
-        <file alias="Icons/Library/icon" >Icons/library_25.png</file>
-        <file>Icons/lock.png</file>
-        <file>Icons/log.png</file>
-        <file alias="Icons/Log-tree" >Icons/log_16.png</file>
-        <file alias="Icons/Log" >Icons/log_25.png</file>
-        <file alias="Icons/NAT/icon-tree" >Icons/nat_16.png</file>
-        <file alias="Icons/NAT/icon" >Icons/nat_25.png</file>
-        <file alias="Icons/neg" >Icons/neg.png</file>
-        <file alias="Icons/Network/icon-neg-tree" >Icons/network-neg_16.png</file>
-        <file alias="Icons/Network/icon-neg" >Icons/network-neg_25.png</file>
-        <file alias="Icons/Network/icon-ref" >Icons/network-ref_25.png</file>
-        <file alias="Icons/NetworkIPv6/icon-neg-tree" >Icons/network6-neg_16.png</file>
-        <file alias="Icons/NetworkIPv6/icon-neg" >Icons/network6-neg_25.png</file>
-        <file alias="Icons/NetworkIPv6/icon-ref" >Icons/network6-ref_25.png</file>
-        <file alias="Icons/NetworkIPv6/icon-tree" >Icons/network6_16.png</file>
-        <file alias="Icons/NetworkIPv6/icon" >Icons/network6_25.png</file>
-        <file alias="Icons/Network/icon-tree" >Icons/network_16.png</file>
-        <file alias="Icons/Network/icon" >Icons/network_25.png</file>
-        <file>Icons/newfile_25.png</file>
-        <file>Icons/newobject_25.png</file>
-        <file>Icons/newobject_32.png</file>
-        <file>Icons/no.png</file>
-        <file alias="Icons/ObjectGroup/icon-neg-tree" >Icons/object-group-neg_16.png</file>
-        <file alias="Icons/ObjectGroup/icon-neg" >Icons/object-group-neg_25.png</file>
-        <file alias="Icons/ObjectGroup/icon-ref" >Icons/object-group-ref_25.png</file>
-        <file alias="Icons/ObjectGroup/icon-tree" >Icons/object-group_16.png</file>
-        <file alias="Icons/ObjectGroup/icon" >Icons/object-group_25.png</file>
-        <file alias="Icons/Cluster/icon-neg-tree" >Icons/cluster-neg_16.png</file>
-        <file alias="Icons/Cluster/icon-neg" >Icons/cluster-neg_25.png</file>
-        <file alias="Icons/Cluster/icon-ref" >Icons/cluster-ref_25.png</file>
-        <file alias="Icons/Cluster/icon-tree" >Icons/cluster_16.png</file>
-        <file alias="Icons/Cluster/icon" >Icons/cluster_25.png</file>
-        <file alias="Icons/ClusterGroup/icon-neg" >Icons/user-neg_25.png</file>
-        <file alias="Icons/ClusterGroup/icon-ref" >Icons/user-ref_25.png</file>
-        <file alias="Icons/ClusterGroup/icon-tree" >Icons/user_16.png</file>
-        <file alias="Icons/ClusterGroup/icon" >Icons/user_25.png</file>
-        <file>Icons/ok.png</file>
-        <file>Icons/openfile_25.png</file>
-        <file alias="Icons/Options-tree" >Icons/options_16.png</file>
-        <file alias="Icons/Options" >Icons/options_25.png</file>
-        <file alias="Icons/Outbound" >Icons/outbound_25.png</file>
-        <file alias="Icons/Outbound-tree" >Icons/outbound_16.png</file>
-        <file alias="Icons/physAddress/icon-neg" >Icons/physaddress-neg_25.png</file>
-        <file alias="Icons/physAddress/icon-ref" >Icons/physaddress-ref_25.png</file>
-        <file alias="Icons/physAddress/icon-tree" >Icons/physaddress_16.png</file>
-        <file alias="Icons/physAddress/icon" >Icons/physaddress_25.png</file>
-        <file alias="Icons/Pipe-tree" >Icons/pipe_16.png</file>
-        <file alias="Icons/Pipe" >Icons/pipe_25.png</file>
-        <file>Icons/protect_host.png</file>
-        <file>Icons/protect_net.png</file>
-        <file>Icons/protect_net_and_dmz.png</file>
-        <file>Icons/question.png</file>
-        <file alias="Icons/AddressRange/icon-neg-tree" >Icons/rangeaddress-neg_16.png</file>
-        <file alias="Icons/AddressRange/icon-neg" >Icons/rangeaddress-neg_25.png</file>
-        <file alias="Icons/AddressRange/icon-ref" >Icons/rangeaddress-ref_25.png</file>
-        <file alias="Icons/AddressRange/icon-tree" >Icons/rangeaddress_16.png</file>
-        <file alias="Icons/AddressRange/icon" >Icons/rangeaddress_25.png</file>
-        <file>Icons/redo.png</file>
-        <file>Icons/ref.png</file>
-        <file alias="Icons/Reject-tree" >Icons/reject_16.png</file>
-        <file alias="Icons/Reject" >Icons/reject_25.png</file>
-        <file>Icons/right-arrow.png</file>
-        <file alias="Icons/Route-tree" >Icons/route_16.png</file>
-        <file alias="Icons/Route" >Icons/route_25.png</file>
-        <file>Icons/rules_druid_logo.png</file>
-        <file alias="Icons/Policy/icon-tree" >Icons/ruleset_16.png</file>
-        <file alias="Icons/Policy/icon" >Icons/ruleset_25.png</file>
-        <file>Icons/save_25.png</file>
-        <file>Icons/search_25.png</file>
-        <file alias="Icons/CustomService/icon-neg-tree" >Icons/service-custom-neg_16.png</file>
-        <file alias="Icons/CustomService/icon-neg" >Icons/service-custom-neg_25.png</file>
-        <file alias="Icons/CustomService/icon-ref" >Icons/service-custom-ref_25.png</file>
-        <file alias="Icons/CustomService/icon-tree" >Icons/service-custom_16.png</file>
-        <file alias="Icons/CustomService/icon" >Icons/service-custom_25.png</file>
-        <file alias="Icons/ServiceGroup/icon-neg-tree" >Icons/service-group-neg_16.png</file>
-        <file alias="Icons/ServiceGroup/icon-neg" >Icons/service-group-neg_25.png</file>
-        <file alias="Icons/ServiceGroup/icon-ref" >Icons/service-group-ref_25.png</file>
-        <file alias="Icons/ServiceGroup/icon-tree" >Icons/service-group_16.png</file>
-        <file alias="Icons/ServiceGroup/icon" >Icons/service-group_25.png</file>
-        <file alias="Icons/ICMPService/icon-neg-tree" >Icons/service-icmp-neg_16.png</file>
-        <file alias="Icons/ICMPService/icon-neg" >Icons/service-icmp-neg_25.png</file>
-        <file alias="Icons/ICMPService/icon-ref" >Icons/service-icmp-ref_25.png</file>
-        <file alias="Icons/ICMP6Service/icon-neg-tree" >Icons/service-icmp6-neg_16.png</file>
-        <file alias="Icons/ICMP6Service/icon-neg" >Icons/service-icmp6-neg_25.png</file>
-        <file alias="Icons/ICMP6Service/icon-ref" >Icons/service-icmp6-ref_25.png</file>
-        <file alias="Icons/ICMP6Service/icon-tree" >Icons/service-icmp6_16.png</file>
-        <file alias="Icons/ICMP6Service/icon" >Icons/service-icmp6_25.png</file>
-        <file alias="Icons/ICMPService/icon-tree" >Icons/service-icmp_16.png</file>
-        <file alias="Icons/ICMPService/icon" >Icons/service-icmp_25.png</file>
-        <file alias="Icons/IPService/icon-neg-tree" >Icons/service-ip-neg_16.png</file>
-        <file alias="Icons/IPService/icon-neg" >Icons/service-ip-neg_25.png</file>
-        <file alias="Icons/IPService/icon-ref" >Icons/service-ip-ref_25.png</file>
-        <file alias="Icons/IPService/icon-tree" >Icons/service-ip_16.png</file>
-        <file alias="Icons/IPService/icon" >Icons/service-ip_25.png</file>
-        <file alias="Icons/TagService/icon-neg-tree" >Icons/service-tag-neg_16.png</file>
-        <file alias="Icons/TagService/icon-neg" >Icons/service-tag-neg_25.png</file>
-        <file alias="Icons/TagService/icon-ref" >Icons/service-tag-ref_25.png</file>
-        <file alias="Icons/TagService/icon-tree" >Icons/service-tag_16.png</file>
-        <file alias="Icons/TagService/icon" >Icons/service-tag_25.png</file>
-        <file alias="Icons/TCPService/icon-neg-tree" >Icons/service-tcp-neg_16.png</file>
-        <file alias="Icons/TCPService/icon-neg" >Icons/service-tcp-neg_25.png</file>
-        <file alias="Icons/TCPService/icon-ref" >Icons/service-tcp-ref_25.png</file>
-        <file alias="Icons/TCPService/icon-tree" >Icons/service-tcp_16.png</file>
-        <file alias="Icons/TCPService/icon" >Icons/service-tcp_25.png</file>
-        <file alias="Icons/UDPService/icon-neg-tree" >Icons/service-udp-neg_16.png</file>
-        <file alias="Icons/UDPService/icon-neg" >Icons/service-udp-neg_25.png</file>
-        <file alias="Icons/UDPService/icon-ref" >Icons/service-udp-ref_25.png</file>
-        <file alias="Icons/UDPService/icon-tree" >Icons/service-udp_16.png</file>
-        <file alias="Icons/UDPService/icon" >Icons/service-udp_25.png</file>
-        <file>Icons/stop.png</file>
-        <file>Icons/uncheck.png</file>
-        <file>Icons/undo.png</file>
-        <file>Icons/up-arrow.png</file>
-        <file alias="Icons/UserService/icon-neg-tree" >Icons/user-neg_16.png</file>
-        <file alias="Icons/UserService/icon-neg" >Icons/user-neg_25.png</file>
-        <file alias="Icons/UserService/icon-ref" >Icons/user-ref_25.png</file>
-        <file alias="Icons/UserService/icon-tree" >Icons/user_16.png</file>
-        <file alias="Icons/UserService/icon" >Icons/user_25.png</file>
-        <file>Icons/warning.png</file>
-        <file>Icons/yes.png</file>
-        <file>Images/fwbuilder3.png</file>
-        <file alias="Icons/Tag-tree" >Icons/tag_16.png</file>
-        <file alias="Icons/Tag" >Icons/tag_25.png</file>
-        <file alias="Icons/Interval/icon-neg-tree" >Icons/clock-neg_16.png</file>
-        <file alias="Icons/Library/icon-neg-tree" >Icons/library-neg_16.png</file>
-        <file alias="Icons/Library/icon-neg" >Icons/library-neg_25.png</file>
-        <file alias="Icons/Library/icon-ref" >Icons/library-ref_25.png</file>
-        <file>Icons/info_16.png</file>
-    </qresource>
+  <qresource prefix="/" >
+    <file alias="Icons/Routing/icon" >Icons/routing_25.png</file>
+    <file alias="Icons/Routing/icon-tree" >Icons/routing_16.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-neg-tree" >Icons/failover-cluster-group-neg_16.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-neg" >Icons/failover-cluster-group-neg_25.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-ref" >Icons/failover-cluster-group-ref_25.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-tree" >Icons/failover-cluster-group_16.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon" >Icons/failover-cluster-group_25.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-neg-tree" >Icons/state-sync-cluster-group-neg_16.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-neg" >Icons/state-sync-cluster-group-neg_25.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-ref" >Icons/state-sync-cluster-group-ref_25.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-tree" >Icons/state-sync-cluster-group_16.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon" >Icons/state-sync-cluster-group_25.png</file>
+    <file>Images/fwbuilder3-128x128.png</file>
+    <file alias="Icons/Routing/icon-tree" >Icons/route_16.png</file>
+    <file alias="Icons/Accept-tree" >Icons/accept_16.png</file>
+    <file alias="Icons/Accept" >Icons/accept_25.png</file>
+    <file alias="Icons/Accounting-tree" >Icons/accounting_16.png</file>
+    <file alias="Icons/Accounting" >Icons/accounting_25.png</file>
+    <file alias="Icons/IPv4/icon-neg-tree" >Icons/address-neg_16.png</file>
+    <file alias="Icons/IPv4/icon-neg" >Icons/address-neg_25.png</file>
+    <file alias="Icons/IPv4/icon-ref" >Icons/address-ref_25.png</file>
+    <file alias="Icons/IPv6/icon-neg-tree" >Icons/address6-neg_16.png</file>
+    <file alias="Icons/IPv6/icon-neg" >Icons/address6-neg_25.png</file>
+    <file alias="Icons/IPv6/icon-ref" >Icons/address6-ref_25.png</file>
+    <file alias="Icons/IPv6/icon-tree" >Icons/address6_16.png</file>
+    <file alias="Icons/IPv6/icon" >Icons/address6_25.png</file>
+    <file alias="Icons/IPv4/icon-tree" >Icons/address_16.png</file>
+    <file alias="Icons/IPv4/icon" >Icons/address_25.png</file>
+    <file alias="Icons/AddressTable/icon-neg-tree" >Icons/addresstable-neg_16.png</file>
+    <file alias="Icons/AddressTable/icon-neg" >Icons/addresstable-neg_25.png</file>
+    <file alias="Icons/AddressTable/icon-ref" >Icons/addresstable-ref_25.png</file>
+    <file alias="Icons/AddressTable/icon-tree" >Icons/addresstable_16.png</file>
+    <file alias="Icons/AddressTable/icon" >Icons/addresstable_25.png</file>
+    <file>Icons/apply.png</file>
+    <file alias="Icons/Return" >Icons/back_25.png</file>
+    <file>Icons/back_32.png</file>
+    <file>Icons/big-down-arrow.png</file>
+    <file>Icons/big-left-arrow.png</file>
+    <file>Icons/big-right-arrow.png</file>
+    <file>Icons/big-up-arrow.png</file>
+    <file alias="Icons/Blank" >Icons/blank.png</file>
+    <file>Icons/blank_2x16.png</file>
+    <file>Icons/books1.png</file>
+    <file alias="Icons/Both" >Icons/both_25.png</file>
+    <file alias="Icons/Both-tree" >Icons/both_16.png</file>
+    <file alias="Icons/Branch-tree" >Icons/branch_16.png</file>
+    <file alias="Icons/Branch" >Icons/branch_25.png</file>
+    <file>Icons/cancel.png</file>
+    <file alias="Icons/Classify-tree" >Icons/classify_16.png</file>
+    <file alias="Icons/Classify" >Icons/classify_25.png</file>
+    <file alias="Icons/IntervalGroup/icon-neg-tree" >Icons/clock-group-neg_16.png</file>
+    <file alias="Icons/IntervalGroup/icon-neg" >Icons/clock-group-neg_25.png</file>
+    <file alias="Icons/IntervalGroup/icon-ref" >Icons/clock-group-ref_25.png</file>
+    <file alias="Icons/IntervalGroup/icon-tree" >Icons/clock-group_16.png</file>
+    <file alias="Icons/IntervalGroup/icon" >Icons/clock-group_25.png</file>
+    <file alias="Icons/Interval/icon-neg" >Icons/clock-neg_25.png</file>
+    <file alias="Icons/Interval/icon-ref" >Icons/clock-ref_25.png</file>
+    <file alias="Icons/Interval/icon-tree" >Icons/clock_16.png</file>
+    <file alias="Icons/Interval/icon" >Icons/clock_25.png</file>
+    <file>Icons/close.png</file>
+    <file>Icons/compile_25.png</file>
+    <file alias="Icons/Continue-tree" >Icons/continue_16.png</file>
+    <file alias="Icons/Continue" >Icons/continue_25.png</file>
+    <file alias="Icons/Custom-tree" >Icons/custom_16.png</file>
+    <file alias="Icons/Custom" >Icons/custom_25.png</file>
+    <file alias="Icons/Deny-tree" >Icons/deny_16.png</file>
+    <file alias="Icons/Deny" >Icons/deny_25.png</file>
+    <file alias="Icons/DNSName/icon-neg-tree" >Icons/domainname-neg_16.png</file>
+    <file alias="Icons/DNSName/icon-neg" >Icons/domainname-neg_25.png</file>
+    <file alias="Icons/DNSName/icon-ref" >Icons/domainname-ref_25.png</file>
+    <file alias="Icons/DNSName/icon-tree" >Icons/domainname_16.png</file>
+    <file alias="Icons/DNSName/icon" >Icons/domainname_25.png</file>
+    <file>Icons/down-arrow.png</file>
+    <file>Icons/drag_object.png</file>
+    <file>Icons/error.png</file>
+    <file alias="Icons/Firewall/icon-neg-tree" >Icons/firewall-neg_16.png</file>
+    <file alias="Icons/Firewall/icon-neg" >Icons/firewall-neg_25.png</file>
+    <file alias="Icons/Firewall/icon-ref" >Icons/firewall-ref_25.png</file>
+    <file alias="Icons/Firewall/icon-tree" >Icons/firewall_16.png</file>
+    <file alias="Icons/Firewall/icon" >Icons/firewall_25.png</file>
+    <file>Icons/firewall_64.png</file>
+    <file>Icons/firewall_64.xpm</file>
+    <file>Icons/floppy.png</file>
+    <file>Icons/generic.png</file>
+    <file alias="Icons/SystemGroup/icon-tree" >Icons/folder_16.png</file>
+    <file alias="Icons/SystemGroup/icon" >Icons/folder_25.png</file>
+    <file>Icons/folder1.png</file>
+    <file alias="Icons/Host/icon-neg-tree" >Icons/host-neg_16.png</file>
+    <file alias="Icons/Host/icon-neg" >Icons/host-neg_25.png</file>
+    <file alias="Icons/Host/icon-ref" >Icons/host-ref_25.png</file>
+    <file alias="Icons/Host/icon-tree" >Icons/host_16.png</file>
+    <file alias="Icons/Host/icon" >Icons/host_25.png</file>
+    <file>Icons/host_64.png</file>
+    <file>Icons/host_64.xpm</file>
+    <file alias="Icons/Inbound" >Icons/inbound_25.png</file>
+    <file alias="Icons/Inbound-tree" >Icons/inbound_16.png</file>
+    <file>Icons/info_25.png</file>
+    <file>Icons/install_25.png</file>
+    <file alias="Icons/Interface/icon-neg-tree" >Icons/interface-neg_16.png</file>
+    <file alias="Icons/Interface/icon-neg" >Icons/interface-neg_25.png</file>
+    <file alias="Icons/Interface/icon-ref" >Icons/interface-ref_25.png</file>
+    <file alias="Icons/Interface/icon-tree" >Icons/interface_16.png</file>
+    <file alias="Icons/Interface/icon" >Icons/interface_25.png</file>
+    <file>Icons/key.png</file>
+    <file>Icons/left-arrow.png</file>
+    <file alias="Icons/Library/icon-tree" >Icons/library_16.png</file>
+    <file alias="Icons/Library/icon" >Icons/library_25.png</file>
+    <file alias="Icons/lock" >Icons/lock.png</file>
+    <file>Icons/log.png</file>
+    <file alias="Icons/Log-tree" >Icons/log_16.png</file>
+    <file alias="Icons/Log" >Icons/log_25.png</file>
+    <file alias="Icons/NAT/icon-tree" >Icons/nat_16.png</file>
+    <file alias="Icons/NAT/icon" >Icons/nat_25.png</file>
+    <file alias="Icons/neg" >Icons/neg.png</file>
+    <file alias="Icons/Network/icon-neg-tree" >Icons/network-neg_16.png</file>
+    <file alias="Icons/Network/icon-neg" >Icons/network-neg_25.png</file>
+    <file alias="Icons/Network/icon-ref" >Icons/network-ref_25.png</file>
+    <file alias="Icons/NetworkIPv6/icon-neg-tree" >Icons/network6-neg_16.png</file>
+    <file alias="Icons/NetworkIPv6/icon-neg" >Icons/network6-neg_25.png</file>
+    <file alias="Icons/NetworkIPv6/icon-ref" >Icons/network6-ref_25.png</file>
+    <file alias="Icons/NetworkIPv6/icon-tree" >Icons/network6_16.png</file>
+    <file alias="Icons/NetworkIPv6/icon" >Icons/network6_25.png</file>
+    <file alias="Icons/Network/icon-tree" >Icons/network_16.png</file>
+    <file alias="Icons/Network/icon" >Icons/network_25.png</file>
+    <file>Icons/newfile_25.png</file>
+    <file>Icons/newobject_25.png</file>
+    <file>Icons/newobject_32.png</file>
+    <file>Icons/no.png</file>
+    <file alias="Icons/ObjectGroup/icon-neg-tree" >Icons/object-group-neg_16.png</file>
+    <file alias="Icons/ObjectGroup/icon-neg" >Icons/object-group-neg_25.png</file>
+    <file alias="Icons/ObjectGroup/icon-ref" >Icons/object-group-ref_25.png</file>
+    <file alias="Icons/ObjectGroup/icon-tree" >Icons/object-group_16.png</file>
+    <file alias="Icons/ObjectGroup/icon" >Icons/object-group_25.png</file>
+    <file alias="Icons/Cluster/icon-neg-tree" >Icons/cluster-neg_16.png</file>
+    <file alias="Icons/Cluster/icon-neg" >Icons/cluster-neg_25.png</file>
+    <file alias="Icons/Cluster/icon-ref" >Icons/cluster-ref_25.png</file>
+    <file alias="Icons/Cluster/icon-tree" >Icons/cluster_16.png</file>
+    <file alias="Icons/Cluster/icon" >Icons/cluster_25.png</file>
+    <file alias="Icons/ClusterGroup/icon-neg" >Icons/user-neg_25.png</file>
+    <file alias="Icons/ClusterGroup/icon-ref" >Icons/user-ref_25.png</file>
+    <file alias="Icons/ClusterGroup/icon-tree" >Icons/user_16.png</file>
+    <file alias="Icons/ClusterGroup/icon" >Icons/user_25.png</file>
+    <file>Icons/ok.png</file>
+    <file>Icons/openfile_25.png</file>
+    <file alias="Icons/Options-tree" >Icons/options_16.png</file>
+    <file alias="Icons/Options" >Icons/options_25.png</file>
+    <file alias="Icons/Outbound" >Icons/outbound_25.png</file>
+    <file alias="Icons/Outbound-tree" >Icons/outbound_16.png</file>
+    <file alias="Icons/physAddress/icon-neg" >Icons/physaddress-neg_25.png</file>
+    <file alias="Icons/physAddress/icon-ref" >Icons/physaddress-ref_25.png</file>
+    <file alias="Icons/physAddress/icon-tree" >Icons/physaddress_16.png</file>
+    <file alias="Icons/physAddress/icon" >Icons/physaddress_25.png</file>
+    <file alias="Icons/Pipe-tree" >Icons/pipe_16.png</file>
+    <file alias="Icons/Pipe" >Icons/pipe_25.png</file>
+    <file>Icons/protect_host.png</file>
+    <file>Icons/protect_net.png</file>
+    <file>Icons/protect_net_and_dmz.png</file>
+    <file>Icons/question.png</file>
+    <file alias="Icons/AddressRange/icon-neg-tree" >Icons/rangeaddress-neg_16.png</file>
+    <file alias="Icons/AddressRange/icon-neg" >Icons/rangeaddress-neg_25.png</file>
+    <file alias="Icons/AddressRange/icon-ref" >Icons/rangeaddress-ref_25.png</file>
+    <file alias="Icons/AddressRange/icon-tree" >Icons/rangeaddress_16.png</file>
+    <file alias="Icons/AddressRange/icon" >Icons/rangeaddress_25.png</file>
+    <file>Icons/redo.png</file>
+    <file>Icons/ref.png</file>
+    <file alias="Icons/Reject-tree" >Icons/reject_16.png</file>
+    <file alias="Icons/Reject" >Icons/reject_25.png</file>
+    <file>Icons/right-arrow.png</file>
+    <file alias="Icons/Route-tree" >Icons/route_16.png</file>
+    <file alias="Icons/Route" >Icons/route_25.png</file>
+    <file>Icons/rules_druid_logo.png</file>
+    <file alias="Icons/Policy/icon-tree" >Icons/ruleset_16.png</file>
+    <file alias="Icons/Policy/icon" >Icons/ruleset_25.png</file>
+    <file>Icons/save_25.png</file>
+    <file>Icons/search_25.png</file>
+    <file alias="Icons/CustomService/icon-neg-tree" >Icons/service-custom-neg_16.png</file>
+    <file alias="Icons/CustomService/icon-neg" >Icons/service-custom-neg_25.png</file>
+    <file alias="Icons/CustomService/icon-ref" >Icons/service-custom-ref_25.png</file>
+    <file alias="Icons/CustomService/icon-tree" >Icons/service-custom_16.png</file>
+    <file alias="Icons/CustomService/icon" >Icons/service-custom_25.png</file>
+    <file alias="Icons/ServiceGroup/icon-neg-tree" >Icons/service-group-neg_16.png</file>
+    <file alias="Icons/ServiceGroup/icon-neg" >Icons/service-group-neg_25.png</file>
+    <file alias="Icons/ServiceGroup/icon-ref" >Icons/service-group-ref_25.png</file>
+    <file alias="Icons/ServiceGroup/icon-tree" >Icons/service-group_16.png</file>
+    <file alias="Icons/ServiceGroup/icon" >Icons/service-group_25.png</file>
+    <file alias="Icons/ICMPService/icon-neg-tree" >Icons/service-icmp-neg_16.png</file>
+    <file alias="Icons/ICMPService/icon-neg" >Icons/service-icmp-neg_25.png</file>
+    <file alias="Icons/ICMPService/icon-ref" >Icons/service-icmp-ref_25.png</file>
+    <file alias="Icons/ICMP6Service/icon-neg-tree" >Icons/service-icmp6-neg_16.png</file>
+    <file alias="Icons/ICMP6Service/icon-neg" >Icons/service-icmp6-neg_25.png</file>
+    <file alias="Icons/ICMP6Service/icon-ref" >Icons/service-icmp6-ref_25.png</file>
+    <file alias="Icons/ICMP6Service/icon-tree" >Icons/service-icmp6_16.png</file>
+    <file alias="Icons/ICMP6Service/icon" >Icons/service-icmp6_25.png</file>
+    <file alias="Icons/ICMPService/icon-tree" >Icons/service-icmp_16.png</file>
+    <file alias="Icons/ICMPService/icon" >Icons/service-icmp_25.png</file>
+    <file alias="Icons/IPService/icon-neg-tree" >Icons/service-ip-neg_16.png</file>
+    <file alias="Icons/IPService/icon-neg" >Icons/service-ip-neg_25.png</file>
+    <file alias="Icons/IPService/icon-ref" >Icons/service-ip-ref_25.png</file>
+    <file alias="Icons/IPService/icon-tree" >Icons/service-ip_16.png</file>
+    <file alias="Icons/IPService/icon" >Icons/service-ip_25.png</file>
+    <file alias="Icons/TagService/icon-neg-tree" >Icons/service-tag-neg_16.png</file>
+    <file alias="Icons/TagService/icon-neg" >Icons/service-tag-neg_25.png</file>
+    <file alias="Icons/TagService/icon-ref" >Icons/service-tag-ref_25.png</file>
+    <file alias="Icons/TagService/icon-tree" >Icons/service-tag_16.png</file>
+    <file alias="Icons/TagService/icon" >Icons/service-tag_25.png</file>
+    <file alias="Icons/TCPService/icon-neg-tree" >Icons/service-tcp-neg_16.png</file>
+    <file alias="Icons/TCPService/icon-neg" >Icons/service-tcp-neg_25.png</file>
+    <file alias="Icons/TCPService/icon-ref" >Icons/service-tcp-ref_25.png</file>
+    <file alias="Icons/TCPService/icon-tree" >Icons/service-tcp_16.png</file>
+    <file alias="Icons/TCPService/icon" >Icons/service-tcp_25.png</file>
+    <file alias="Icons/UDPService/icon-neg-tree" >Icons/service-udp-neg_16.png</file>
+    <file alias="Icons/UDPService/icon-neg" >Icons/service-udp-neg_25.png</file>
+    <file alias="Icons/UDPService/icon-ref" >Icons/service-udp-ref_25.png</file>
+    <file alias="Icons/UDPService/icon-tree" >Icons/service-udp_16.png</file>
+    <file alias="Icons/UDPService/icon" >Icons/service-udp_25.png</file>
+    <file>Icons/stop.png</file>
+    <file>Icons/uncheck.png</file>
+    <file>Icons/undo.png</file>
+    <file>Icons/up-arrow.png</file>
+    <file alias="Icons/UserService/icon-neg-tree" >Icons/user-neg_16.png</file>
+    <file alias="Icons/UserService/icon-neg" >Icons/user-neg_25.png</file>
+    <file alias="Icons/UserService/icon-ref" >Icons/user-ref_25.png</file>
+    <file alias="Icons/UserService/icon-tree" >Icons/user_16.png</file>
+    <file alias="Icons/UserService/icon" >Icons/user_25.png</file>
+    <file>Icons/warning.png</file>
+    <file>Icons/yes.png</file>
+    <file>Images/fwbuilder3.png</file>
+    <file alias="Icons/Tag-tree" >Icons/tag_16.png</file>
+    <file alias="Icons/Tag" >Icons/tag_25.png</file>
+    <file alias="Icons/Interval/icon-neg-tree" >Icons/clock-neg_16.png</file>
+    <file alias="Icons/Library/icon-neg-tree" >Icons/library-neg_16.png</file>
+    <file alias="Icons/Library/icon-neg" >Icons/library-neg_25.png</file>
+    <file alias="Icons/Library/icon-ref" >Icons/library-ref_25.png</file>
+    <file>Icons/info_16.png</file>
+  </qresource>
 </RCC>
diff --git a/src/gui/ObjectManipulator.cpp b/src/gui/ObjectManipulator.cpp
index ad94dff62..8e5dc2b57 100644
--- a/src/gui/ObjectManipulator.cpp
+++ b/src/gui/ObjectManipulator.cpp
@@ -349,14 +349,6 @@ ObjectTreeViewItem* ObjectManipulator::insertObject(ObjectTreeViewItem *itm,
     if (Resources::global_res->getObjResourceBool(obj,"hidden") ) return NULL;
 
     ObjectTreeViewItem *nitm = NULL;
-    QString icn_filename;
-
-    if (FWBTree().isStandardFolder(obj))
-        icn_filename = ":/Icons/SystemGroup/icon-tree";
-    else
-        icn_filename = (":/Icons/" + obj->getTypeName() + "/icon-tree").c_str();
-
-    if (obj->getRO()) icn_filename = ":/Icons/lock.png";
 
     if (Resources::global_res->getResourceBool(
             string("/FWBuilderResources/Type/") +
@@ -366,12 +358,10 @@ ObjectTreeViewItem* ObjectManipulator::insertObject(ObjectTreeViewItem *itm,
 
     nitm->setLib("");
     nitm->setText( 0, getTreeLabel(obj) );
+
     QPixmap pm;
-    if ( ! QPixmapCache::find( icn_filename, pm) )
-    {
-        pm.load( icn_filename );
-        QPixmapCache::insert( icn_filename, pm);
-    }
+    setObjectIcon(obj, &pm);
+
     nitm->setIcon( 0, QIcon(pm) );
     nitm->setIcon( 1, QIcon(pm) );
     nitm->setFlags(nitm->flags() | Qt::ItemIsDragEnabled);
@@ -971,27 +961,11 @@ void ObjectManipulator::addTreePage( FWObject *lib)
 
     itm1->setFlags(itm1->flags() | Qt::ItemIsDragEnabled);
 
-    itm1->setText( 0, getTreeLabel( lib ) );
-    if (lib->isReadOnly())
-    {
-        QPixmap pm;
-        if ( ! QPixmapCache::find( ":/Icons/lock.png", pm) )
-        {
-            pm.load( ":/Icons/lock.png" );
-            QPixmapCache::insert( ":/Icons/lock.png", pm);
-        }
-        itm1->setIcon(0, pm );
-    } else
-    {
-        string icn = ":/Icons/" + lib->getTypeName() + "/icon-tree";
-        QPixmap pm;
-        if (!QPixmapCache::find( icn.c_str(), pm))
-        {
-            pm.load( icn.c_str() );
-            QPixmapCache::insert( icn.c_str(), pm);
-        }
-        itm1->setIcon( 0, pm);
-    }
+    itm1->setText(0, getTreeLabel(lib));
+
+    QPixmap pm;
+    setObjectIcon(lib, &pm);
+    itm1->setIcon( 0, pm);
 
     itm1->setProperty("type", lib->getTypeName().c_str() );
     itm1->setFWObject( lib );
@@ -2318,7 +2292,10 @@ void ObjectManipulator::lockObject()
         // lock objects inside because they won't be able to unlock them.
         if (lib->getId()!=FWObjectDatabase::STANDARD_LIB_ID &&
             lib->getId()!=FWObjectDatabase::TEMPLATE_LIB_ID)
+        {
             obj->setReadOnly(true);
+            updateObjectInTree(obj, false);
+        }
     }
     getCurrentObjectTree()->setLockFlags();
 
@@ -2345,7 +2322,10 @@ void ObjectManipulator::unlockObject()
         FWObject *lib = obj->getLibrary();
         if (lib->getId()!=FWObjectDatabase::STANDARD_LIB_ID &&
             lib->getId()!=FWObjectDatabase::TEMPLATE_LIB_ID)
+        {
             obj->setReadOnly(false);
+            updateObjectInTree(obj, false);
+        }
     }
     getCurrentObjectTree()->setLockFlags();
 
@@ -4095,4 +4075,25 @@ void ObjectManipulator::guessSubInterfaceTypeAndAttributes(Interface *intf)
     delete int_prop;
 }
 
+void ObjectManipulator::setObjectIcon(FWObject *obj, QPixmap *pm)
+{
+    QString icn_alias;
+
+    if (obj->getRO())
+        icn_alias = ":/Icons/lock";
+    else
+    {
+        if (FWBTree().isStandardFolder(obj))
+            icn_alias = ":/Icons/SystemGroup/icon-tree";
+        else
+            icn_alias = QString(":/Icons/") + obj->getTypeName().c_str() + "/icon-tree";
+    }
+
+    if ( ! QPixmapCache::find(icn_alias, *pm) )
+    {
+        pm->load(icn_alias );
+        QPixmapCache::insert(icn_alias, *pm);
+    }
+}
+
 
diff --git a/src/gui/ObjectManipulator.h b/src/gui/ObjectManipulator.h
index f441f188d..31807a9a9 100644
--- a/src/gui/ObjectManipulator.h
+++ b/src/gui/ObjectManipulator.h
@@ -49,8 +49,11 @@ class ObjectTreeView;
 class ObjectTreeViewItem;
 class QComboBox;
 class QMenu;
+class QPixmap;
+
 class ProjectPanel;
 
+
 namespace libfwbuilder 
 {
     class Firewall;
@@ -58,6 +61,7 @@ namespace libfwbuilder
     class Library;
 }
 
+
 class HistoryItem {
     ObjectTreeViewItem *itm;
     int                 objId;
@@ -69,18 +73,9 @@ class HistoryItem {
     int  id()   { return objId; }
 };
 
-/*class ObjToolTip : public QToolTip {
-
-    ObjectTreeView *otv;
- public:
-    ObjToolTip(ObjectTreeView *widget);
-    virtual ~ObjToolTip() {}
-    virtual void maybeTip(const QPoint &p);
-};*/
-
-class ObjectManipulator : public QWidget/*ObjectManipulator_q*/ {
-
-    Q_OBJECT
+class ObjectManipulator : public QWidget
+{
+    Q_OBJECT;
 
     std::vector<libfwbuilder::FWObject*>          idxToLibs;
     std::vector<QTreeWidget*>                     idxToTrees;
@@ -116,6 +111,8 @@ class ObjectManipulator : public QWidget/*ObjectManipulator_q*/ {
     void addTreePage(libfwbuilder::FWObject *lib);
     void showObjectInTree(ObjectTreeViewItem *otvi);
 
+    void setObjectIcon(libfwbuilder::FWObject *obj, QPixmap *pm);
+    
     int  getIdxForLib(libfwbuilder::FWObject*);
     void addLib( libfwbuilder::FWObject *lib, QTreeWidget* otv=NULL);
     void removeLib(libfwbuilder::FWObject*);
diff --git a/src/gui/ObjectTreeView.cpp b/src/gui/ObjectTreeView.cpp
index ea4375282..42c512bfd 100644
--- a/src/gui/ObjectTreeView.cpp
+++ b/src/gui/ObjectTreeView.cpp
@@ -292,10 +292,10 @@ void ObjectTreeView::updateTreeIcons()
     QString icn;
 
     QPixmap pm_lock;
-    if ( ! QPixmapCache::find( ":/Icons/lock.png", pm_lock) )
+    if ( ! QPixmapCache::find( ":/Icons/lock", pm_lock) )
     {
-        pm_lock.load( ":/Icons/lock.png" );
-        QPixmapCache::insert( ":/Icons/lock.png", pm_lock);
+        pm_lock.load( ":/Icons/lock" );
+        QPixmapCache::insert( ":/Icons/lock", pm_lock);
     }
 
     while ( *it )