diff --git a/doc/ChangeLog b/doc/ChangeLog
index a10c7c942..c006d622b 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,5 +1,10 @@
 2011-06-20  Vadim Kurland  <vadim@netcitadel.com>
 
+	* ObjectManipulator_slots.cpp (forward): see #2493 implemented
+	"forward" function in addition to the "back" function, added
+	a button to the roolbar, using new icons for Back and Forward
+	buttons.
+
 	* src.pro (SUBDIRS): see #2477 removed transfer agent
 	code.
 
diff --git a/src/libgui/FWBMainWindow_q.ui b/src/libgui/FWBMainWindow_q.ui
index 8e5cb010e..49b0e9027 100644
--- a/src/libgui/FWBMainWindow_q.ui
+++ b/src/libgui/FWBMainWindow_q.ui
@@ -65,16 +65,7 @@
       </property>
       <widget class="QWidget" name="dockWidgetContents">
        <layout class="QGridLayout" name="gridLayout">
-        <property name="leftMargin">
-         <number>2</number>
-        </property>
-        <property name="topMargin">
-         <number>2</number>
-        </property>
-        <property name="rightMargin">
-         <number>2</number>
-        </property>
-        <property name="bottomMargin">
+        <property name="margin">
          <number>2</number>
         </property>
         <item row="0" column="0">
@@ -720,6 +711,8 @@
    <addaction name="toolbarFileSave"/>
    <addaction name="separator"/>
    <addaction name="backAction"/>
+   <addaction name="forwardAction"/>
+   <addaction name="separator"/>
    <addaction name="newObjectAction"/>
    <addaction name="findAction"/>
    <addaction name="separator"/>
@@ -732,7 +725,7 @@
      <x>0</x>
      <y>0</y>
      <width>1124</width>
-     <height>25</height>
+     <height>20</height>
     </rect>
    </property>
    <widget class="QMenu" name="editMenu">
@@ -1111,7 +1104,7 @@
    </property>
    <property name="icon">
     <iconset resource="MainRes.qrc">
-     <normaloff>:/Icons/back_32.png</normaloff>:/Icons/back_32.png</iconset>
+     <normaloff>:/Icons/back_25.png</normaloff>:/Icons/back_25.png</iconset>
    </property>
    <property name="text">
     <string>Back</string>
@@ -1375,6 +1368,18 @@
     <string>Discover networks and hosts using SNMP</string>
    </property>
   </action>
+  <action name="forwardAction">
+   <property name="icon">
+    <iconset resource="MainRes.qrc">
+     <normaloff>:/Icons/forward_25.png</normaloff>:/Icons/forward_25.png</iconset>
+   </property>
+   <property name="text">
+    <string>Forward</string>
+   </property>
+   <property name="toolTip">
+    <string>Move forward to the next object</string>
+   </property>
+  </action>
  </widget>
  <layoutdefault spacing="0" margin="11"/>
  <customwidgets>
@@ -2302,6 +2307,22 @@
     </hint>
    </hints>
   </connection>
+  <connection>
+   <sender>forwardAction</sender>
+   <signal>triggered()</signal>
+   <receiver>FWBMainWindow_q</receiver>
+   <slot>forward()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>-1</x>
+     <y>-1</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>561</x>
+     <y>422</y>
+    </hint>
+   </hints>
+  </connection>
  </connections>
  <slots>
   <slot>clearRecentFilesMenu()</slot>
@@ -2318,5 +2339,6 @@
   <slot>toolsImportAddressesFromFile()</slot>
   <slot>toolsSNMPDiscovery()</slot>
   <slot>back()</slot>
+  <slot>forward()</slot>
  </slots>
 </ui>
diff --git a/src/libgui/FWWindow.cpp b/src/libgui/FWWindow.cpp
index ba2f5e274..b87ca62a8 100644
--- a/src/libgui/FWWindow.cpp
+++ b/src/libgui/FWWindow.cpp
@@ -259,12 +259,6 @@ FWWindow::FWWindow() : QMainWindow(),   // QMainWindow(NULL, Qt::Desktop),
     connect(current_version_http_getter, SIGNAL(done(const QString&)),
             this, SLOT(checkForUpgrade(const QString&)));
 
-    // connect( m_mainWindow->newObjectAction, SIGNAL( triggered() ),
-    //          this, SLOT(newObject() ) );
-
-    // connect( m_mainWindow->backAction, SIGNAL( triggered() ),
-    //          this, SLOT(back() ) );
-
     connect( m_mainWindow->findAction, SIGNAL( triggered() ),
              this, SLOT(search()) );
 
diff --git a/src/libgui/FWWindow.h b/src/libgui/FWWindow.h
index b702aa217..e8045627d 100644
--- a/src/libgui/FWWindow.h
+++ b/src/libgui/FWWindow.h
@@ -151,7 +151,8 @@ public slots:
     void editorPanelTabChanged(int);
     
     void back();
-
+    void forward();
+    
     void minimize();
     void maximize();
 
diff --git a/src/libgui/FWWindow_wrappers.cpp b/src/libgui/FWWindow_wrappers.cpp
index fb6fe9835..98e4744a3 100644
--- a/src/libgui/FWWindow_wrappers.cpp
+++ b/src/libgui/FWWindow_wrappers.cpp
@@ -385,6 +385,11 @@ void FWWindow::back()
     if (activeProject()) activeProject()->back();
 }
 
+void FWWindow::forward()
+{
+    if (activeProject()) activeProject()->forward();
+}
+
 void FWWindow::newObject()
 {
     if (activeProject())
diff --git a/src/libgui/Icons/back_25.png b/src/libgui/Icons/back_25.png
index d1f3273f4..59654246c 100644
Binary files a/src/libgui/Icons/back_25.png and b/src/libgui/Icons/back_25.png differ
diff --git a/src/libgui/Icons/forward_25.png b/src/libgui/Icons/forward_25.png
new file mode 100644
index 000000000..dc84a4de5
Binary files /dev/null and b/src/libgui/Icons/forward_25.png differ
diff --git a/src/libgui/MainRes.qrc b/src/libgui/MainRes.qrc
index a05e86a47..cb3594f7a 100644
--- a/src/libgui/MainRes.qrc
+++ b/src/libgui/MainRes.qrc
@@ -1,268 +1,268 @@
 <RCC>
-  <qresource prefix="/" >
+  <qresource prefix="/">
+    <file>Icons/back_25.png</file>
+    <file>Icons/forward_25.png</file>
     <file>Images/fwbuilder3-256x256-fade.png</file>
     <file>Images/fwbuilder3-256x256.png</file>
     <file>Images/fwbuilder3-72x72.png</file>
     <file>Images/network_zone_dialog.png</file>
     <file>Images/logo1.png</file>
     <file>Images/library_switch_screenshot.png</file>
-    <file alias="Icons/Import-big" >Icons/import_64_1.png</file>
-    <file alias="Icons/Inspect" >Icons/inspect.png</file>
-    <file alias="Icons/Tutorial" >Icons/tutorial_64.png</file>
+    <file alias="Icons/Import-big">Icons/import_64_1.png</file>
+    <file alias="Icons/Inspect">Icons/inspect.png</file>
+    <file alias="Icons/Tutorial">Icons/tutorial_64.png</file>
     <file>Icons/tutorial_64_1.png</file>
-    <file alias="Icons/Accept/icon" >Icons/accept_25.png</file>
-    <file alias="Icons/Accept/icon-big" >Icons/accept_64.png</file>
-    <file alias="Icons/Accept/icon-tree" >Icons/accept_16.png</file>
-    <file alias="Icons/Accounting/icon" >Icons/accounting_25.png</file>
-    <file alias="Icons/Accounting/icon-big" >Icons/accounting_64.png</file>
-    <file alias="Icons/Accounting/icon-tree" >Icons/accounting_16.png</file>
-    <file alias="Icons/AddressRange/icon" >Icons/rangeaddress_25.png</file>
-    <file alias="Icons/AddressRange/icon-big" >Icons/rangeaddress_64.png</file>
-    <file alias="Icons/AddressRange/icon-neg" >Icons/rangeaddress-neg_25.png</file>
-    <file alias="Icons/AddressRange/icon-neg-tree" >Icons/rangeaddress-neg_16.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/AddressTable/icon" >Icons/addresstable_25.png</file>
-    <file alias="Icons/AddressTable/icon-big" >Icons/addresstable_64.png</file>
-    <file alias="Icons/AddressTable/icon-neg" >Icons/addresstable-neg_25.png</file>
-    <file alias="Icons/AddressTable/icon-neg-tree" >Icons/addresstable-neg_16.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/AttachedNetworks/icon" >Icons/network_25.png</file>
-    <file alias="Icons/AttachedNetworks/icon-big" >Icons/network_64.png</file>
-    <file alias="Icons/AttachedNetworks/icon-neg" >Icons/network-neg_25.png</file>
-    <file alias="Icons/AttachedNetworks/icon-neg-tree" >Icons/network-neg_16.png</file>
-    <file alias="Icons/AttachedNetworks/icon-ref" >Icons/network-ref_25.png</file>
-    <file alias="Icons/AttachedNetworks/icon-tree" >Icons/network_16.png</file>
-    <file alias="Icons/Blank/icon" >Icons/blank.png</file>
-    <file alias="Icons/Blank/icon-big" >Icons/blank.png</file>
-    <file alias="Icons/Both/icon" >Icons/both_25.png</file>
-    <file alias="Icons/Both/icon-big" >Icons/both_64.png</file>
-    <file alias="Icons/Both/icon-tree" >Icons/both_16.png</file>
-    <file alias="Icons/Branch/icon" >Icons/branch_25.png</file>
-    <file alias="Icons/Branch/icon-big" >Icons/branch_64.png</file>
-    <file alias="Icons/Branch/icon-tree" >Icons/branch_16.png</file>
-    <file alias="Icons/Classify/icon" >Icons/classify_25.png</file>
-    <file alias="Icons/Classify/icon-big" >Icons/classify_64.png</file>
-    <file alias="Icons/Classify/icon-tree" >Icons/classify_16.png</file>
-    <file alias="Icons/Cluster/icon" >Icons/cluster_25.png</file>
-    <file alias="Icons/Cluster/icon-big" >Icons/cluster_64.png</file>
-    <file alias="Icons/Cluster/icon-neg" >Icons/cluster-neg_25.png</file>
-    <file alias="Icons/Cluster/icon-neg-tree" >Icons/cluster-neg_16.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/ClusterGroup/icon" >Icons/user_25.png</file>
-    <file alias="Icons/ClusterGroup/icon-big" >Icons/user_64.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/Compile" >Icons/compile_25.png</file>
-    <file alias="Icons/Continue/icon" >Icons/continue_25.png</file>
-    <file alias="Icons/Continue/icon-big" >Icons/continue_64.png</file>
-    <file alias="Icons/Continue/icon-tree" >Icons/continue_16.png</file>
-    <file alias="Icons/Custom/icon" >Icons/custom_25.png</file>
-    <file alias="Icons/Custom/icon-big" >Icons/custom_64.png</file>
-    <file alias="Icons/Custom/icon-tree" >Icons/custom_16.png</file>
-    <file alias="Icons/CustomService/icon" >Icons/service-custom_25.png</file>
-    <file alias="Icons/CustomService/icon-big" >Icons/service-custom_64.png</file>
-    <file alias="Icons/CustomService/icon-neg" >Icons/service-custom-neg_25.png</file>
-    <file alias="Icons/CustomService/icon-neg-tree" >Icons/service-custom-neg_16.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/DNSName/icon" >Icons/domainname_25.png</file>
-    <file alias="Icons/DNSName/icon-big" >Icons/domainname_64.png</file>
-    <file alias="Icons/DNSName/icon-neg" >Icons/domainname-neg_25.png</file>
-    <file alias="Icons/DNSName/icon-neg-tree" >Icons/domainname-neg_16.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/Deny/icon" >Icons/deny_25.png</file>
-    <file alias="Icons/Deny/icon-big" >Icons/deny_64.png</file>
-    <file alias="Icons/Deny/icon-tree" >Icons/deny_16.png</file>
-    <file alias="Icons/FailoverClusterGroup/icon" >Icons/failover-cluster-group_25.png</file>
-    <file alias="Icons/FailoverClusterGroup/icon-big" >Icons/failover-cluster-group_64.png</file>
-    <file alias="Icons/FailoverClusterGroup/icon-neg" >Icons/failover-cluster-group-neg_25.png</file>
-    <file alias="Icons/FailoverClusterGroup/icon-neg-tree" >Icons/failover-cluster-group-neg_16.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/Firewall/icon" >Icons/firewall_25.png</file>
-    <file alias="Icons/Firewall/icon-big" >Icons/firewall_64.png</file>
-    <file alias="Icons/Firewall/icon-neg" >Icons/firewall-neg_25.png</file>
-    <file alias="Icons/Firewall/icon-neg-tree" >Icons/firewall-neg_16.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/Host/icon" >Icons/host_25.png</file>
-    <file alias="Icons/Host/icon-big" >Icons/host_64.png</file>
-    <file alias="Icons/Host/icon-neg" >Icons/host-neg_25.png</file>
-    <file alias="Icons/Host/icon-neg-tree" >Icons/host-neg_16.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/ICMP6Service/icon" >Icons/service-icmp6_25.png</file>
-    <file alias="Icons/ICMP6Service/icon-big" >Icons/service-icmp6_64.png</file>
-    <file alias="Icons/ICMP6Service/icon-neg" >Icons/service-icmp6-neg_25.png</file>
-    <file alias="Icons/ICMP6Service/icon-neg-tree" >Icons/service-icmp6-neg_16.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/ICMPService/icon" >Icons/service-icmp_25.png</file>
-    <file alias="Icons/ICMPService/icon-big" >Icons/service-icmp_64.png</file>
-    <file alias="Icons/ICMPService/icon-neg" >Icons/service-icmp-neg_25.png</file>
-    <file alias="Icons/ICMPService/icon-neg-tree" >Icons/service-icmp-neg_16.png</file>
-    <file alias="Icons/ICMPService/icon-ref" >Icons/service-icmp-ref_25.png</file>
-    <file alias="Icons/ICMPService/icon-tree" >Icons/service-icmp_16.png</file>
-    <file alias="Icons/IPService/icon" >Icons/service-ip_25.png</file>
-    <file alias="Icons/IPService/icon-big" >Icons/service-ip_64.png</file>
-    <file alias="Icons/IPService/icon-neg" >Icons/service-ip-neg_25.png</file>
-    <file alias="Icons/IPService/icon-neg-tree" >Icons/service-ip-neg_16.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/IPv4/icon" >Icons/address_25.png</file>
-    <file alias="Icons/IPv4/icon-big" >Icons/address_64.png</file>
-    <file alias="Icons/IPv4/icon-neg" >Icons/address-neg_25.png</file>
-    <file alias="Icons/IPv4/icon-neg-tree" >Icons/address-neg_16.png</file>
-    <file alias="Icons/IPv4/icon-ref" >Icons/address-ref_25.png</file>
-    <file alias="Icons/IPv4/icon-tree" >Icons/address_16.png</file>
-    <file alias="Icons/IPv6/icon" >Icons/address6_25.png</file>
-    <file alias="Icons/IPv6/icon-big" >Icons/address6_64.png</file>
-    <file alias="Icons/IPv6/icon-neg" >Icons/address6-neg_25.png</file>
-    <file alias="Icons/IPv6/icon-neg-tree" >Icons/address6-neg_16.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/Inbound/icon" >Icons/inbound_25.png</file>
-    <file alias="Icons/Inbound/icon-big" >Icons/inbound_64.png</file>
-    <file alias="Icons/Inbound/icon-tree" >Icons/inbound_16.png</file>
-    <file alias="Icons/Install" >Icons/install_25.png</file>
-    <file alias="Icons/Interface/icon" >Icons/interface_25.png</file>
-    <file alias="Icons/Interface/icon-big" >Icons/interface_64.png</file>
-    <file alias="Icons/Interface/icon-neg" >Icons/interface-neg_25.png</file>
-    <file alias="Icons/Interface/icon-neg-tree" >Icons/interface-neg_16.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/Interval/icon" >Icons/clock_25.png</file>
-    <file alias="Icons/Interval/icon-big" >Icons/clock_64.png</file>
-    <file alias="Icons/Interval/icon-neg" >Icons/clock-neg_25.png</file>
-    <file alias="Icons/Interval/icon-neg-tree" >Icons/clock-neg_16.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/IntervalGroup/icon" >Icons/clock-group_25.png</file>
-    <file alias="Icons/IntervalGroup/icon-big" >Icons/clock-group_64.png</file>
-    <file alias="Icons/IntervalGroup/icon-neg" >Icons/clock-group-neg_25.png</file>
-    <file alias="Icons/IntervalGroup/icon-neg-tree" >Icons/clock-group-neg_16.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/Library/icon" >Icons/library_25.png</file>
-    <file alias="Icons/Library/icon-big" >Icons/library_64.png</file>
-    <file alias="Icons/Library/icon-neg" >Icons/library-neg_25.png</file>
-    <file alias="Icons/Library/icon-neg-tree" >Icons/library-neg_16.png</file>
-    <file alias="Icons/Library/icon-ref" >Icons/library-ref_25.png</file>
-    <file alias="Icons/Library/icon-tree" >Icons/library_16.png</file>
-    <file alias="Icons/Log/icon" >Icons/log_25.png</file>
-    <file alias="Icons/Log/icon-big" >Icons/log_64.png</file>
-    <file alias="Icons/Log/icon-tree" >Icons/log_16.png</file>
-    <file alias="Icons/NAT/icon" >Icons/nat_25.png</file>
-    <file alias="Icons/NAT/icon-big" >Icons/nat_64.png</file>
-    <file alias="Icons/NAT/icon-tree" >Icons/nat_16.png</file>
-    <file alias="Icons/NATBranch/icon" >Icons/branch_25.png</file>
-    <file alias="Icons/NATBranch/icon-big" >Icons/branch_64.png</file>
-    <file alias="Icons/NATBranch/icon-tree" >Icons/branch_16.png</file>
-    <file alias="Icons/Network/icon" >Icons/network_25.png</file>
-    <file alias="Icons/Network/icon-big" >Icons/network_64.png</file>
-    <file alias="Icons/Network/icon-neg" >Icons/network-neg_25.png</file>
-    <file alias="Icons/Network/icon-neg-tree" >Icons/network-neg_16.png</file>
-    <file alias="Icons/Network/icon-ref" >Icons/network-ref_25.png</file>
-    <file alias="Icons/Network/icon-tree" >Icons/network_16.png</file>
-    <file alias="Icons/NetworkIPv6/icon" >Icons/network6_25.png</file>
-    <file alias="Icons/NetworkIPv6/icon-big" >Icons/network6_64.png</file>
-    <file alias="Icons/NetworkIPv6/icon-neg" >Icons/network6-neg_25.png</file>
-    <file alias="Icons/NetworkIPv6/icon-neg-tree" >Icons/network6-neg_16.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/ObjectGroup/icon" >Icons/object-group_25.png</file>
-    <file alias="Icons/ObjectGroup/icon-big" >Icons/object-group_64.png</file>
-    <file alias="Icons/ObjectGroup/icon-neg" >Icons/object-group-neg_25.png</file>
-    <file alias="Icons/ObjectGroup/icon-neg-tree" >Icons/object-group-neg_16.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/DynamicGroup/icon" >Icons/object-group_25.png</file>
-    <file alias="Icons/DynamicGroup/icon-big" >Icons/object-group_64.png</file>
-    <file alias="Icons/DynamicGroup/icon-neg" >Icons/object-group-neg_25.png</file>
-    <file alias="Icons/DynamicGroup/icon-neg-tree" >Icons/object-group-neg_16.png</file>
-    <file alias="Icons/DynamicGroup/icon-ref" >Icons/object-group-ref_25.png</file>
-    <file alias="Icons/DynamicGroup/icon-tree" >Icons/object-group_16.png</file>
-
-    <file alias="Icons/Options/icon" >Icons/options_25.png</file>
-    <file alias="Icons/Options/icon-big" >Icons/options_64.png</file>
-    <file alias="Icons/Options/icon-tree" >Icons/options_16.png</file>
-    <file alias="Icons/Outbound/icon" >Icons/outbound_25.png</file>
-    <file alias="Icons/Outbound/icon-big" >Icons/outbound_64.png</file>
-    <file alias="Icons/Outbound/icon-tree" >Icons/outbound_16.png</file>
-    <file alias="Icons/Pipe/icon" >Icons/pipe_25.png</file>
-    <file alias="Icons/Pipe/icon-big" >Icons/pipe_64.png</file>
-    <file alias="Icons/Pipe/icon-tree" >Icons/pipe_16.png</file>
-    <file alias="Icons/Policy/icon" >Icons/ruleset_25.png</file>
-    <file alias="Icons/Policy/icon-big" >Icons/ruleset_64.png</file>
-    <file alias="Icons/Policy/icon-tree" >Icons/ruleset_16.png</file>
-    <file alias="Icons/Reject/icon" >Icons/reject_25.png</file>
-    <file alias="Icons/Reject/icon-big" >Icons/reject_64.png</file>
-    <file alias="Icons/Reject/icon-tree" >Icons/reject_16.png</file>
-    <file alias="Icons/Return/icon" >Icons/back_25.png</file>
-    <file alias="Icons/Route/icon" >Icons/route_25.png</file>
-    <file alias="Icons/Route/icon-big" >Icons/route_64.png</file>
-    <file alias="Icons/Route/icon-tree" >Icons/route_16.png</file>
-    <file alias="Icons/Routing/icon" >Icons/routing_25.png</file>
-    <file alias="Icons/Routing/icon-big" >Icons/routing_64.png</file>
-    <file alias="Icons/Routing/icon-tree" >Icons/routing_16.png</file>
-    <file alias="Icons/ServiceGroup/icon" >Icons/service-group_25.png</file>
-    <file alias="Icons/ServiceGroup/icon-big" >Icons/service-group_64.png</file>
-    <file alias="Icons/ServiceGroup/icon-neg" >Icons/service-group-neg_25.png</file>
-    <file alias="Icons/ServiceGroup/icon-neg-tree" >Icons/service-group-neg_16.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/StateSyncClusterGroup/icon" >Icons/state-sync-cluster-group_25.png</file>
-    <file alias="Icons/StateSyncClusterGroup/icon-big" >Icons/state-sync-cluster-group_64.png</file>
-    <file alias="Icons/StateSyncClusterGroup/icon-neg" >Icons/state-sync-cluster-group-neg_25.png</file>
-    <file alias="Icons/StateSyncClusterGroup/icon-neg-tree" >Icons/state-sync-cluster-group-neg_16.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/SystemGroup/icon" >Icons/folder_25.png</file>
-    <file alias="Icons/SystemGroup/icon-big" >Icons/folder_64.png</file>
-    <file alias="Icons/SystemGroup/icon-tree" >Icons/folder_16.png</file>
-    <file alias="Icons/TCPService/icon" >Icons/service-tcp_25.png</file>
-    <file alias="Icons/TCPService/icon-big" >Icons/service-tcp_64.png</file>
-    <file alias="Icons/TCPService/icon-neg" >Icons/service-tcp-neg_25.png</file>
-    <file alias="Icons/TCPService/icon-neg-tree" >Icons/service-tcp-neg_16.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/Tag/icon" >Icons/tag_25.png</file>
-    <file alias="Icons/Tag/icon-big" >Icons/tag_64.png</file>
-    <file alias="Icons/Tag/icon-tree" >Icons/tag_16.png</file>
-    <file alias="Icons/TagService/icon" >Icons/service-tag_25.png</file>
-    <file alias="Icons/TagService/icon-big" >Icons/service-tag_64.png</file>
-    <file alias="Icons/TagService/icon-neg" >Icons/service-tag-neg_25.png</file>
-    <file alias="Icons/TagService/icon-neg-tree" >Icons/service-tag-neg_16.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/Translate/icon" >Icons/translate_25.png</file>
-    <file alias="Icons/Translate/icon-tree" >Icons/translate_16.png</file>
-    <file alias="Icons/UDPService/icon" >Icons/service-udp_25.png</file>
-    <file alias="Icons/UDPService/icon-big" >Icons/service-udp_64.png</file>
-    <file alias="Icons/UDPService/icon-neg" >Icons/service-udp-neg_25.png</file>
-    <file alias="Icons/UDPService/icon-neg-tree" >Icons/service-udp-neg_16.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/UserService/icon" >Icons/user_25.png</file>
-    <file alias="Icons/UserService/icon-big" >Icons/user_64.png</file>
-    <file alias="Icons/UserService/icon-neg" >Icons/user-neg_25.png</file>
-    <file alias="Icons/UserService/icon-neg-tree" >Icons/user-neg_16.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/lock" >Icons/lock.png</file>
-    <file alias="Icons/neg" >Icons/neg.png</file>
-    <file alias="Icons/neg2" >Icons/neg2.png</file>
-    <file alias="Icons/physAddress/icon" >Icons/physaddress_25.png</file>
-    <file alias="Icons/physAddress/icon-big" >Icons/physaddress_64.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/Accept/icon">Icons/accept_25.png</file>
+    <file alias="Icons/Accept/icon-big">Icons/accept_64.png</file>
+    <file alias="Icons/Accept/icon-tree">Icons/accept_16.png</file>
+    <file alias="Icons/Accounting/icon">Icons/accounting_25.png</file>
+    <file alias="Icons/Accounting/icon-big">Icons/accounting_64.png</file>
+    <file alias="Icons/Accounting/icon-tree">Icons/accounting_16.png</file>
+    <file alias="Icons/AddressRange/icon">Icons/rangeaddress_25.png</file>
+    <file alias="Icons/AddressRange/icon-big">Icons/rangeaddress_64.png</file>
+    <file alias="Icons/AddressRange/icon-neg">Icons/rangeaddress-neg_25.png</file>
+    <file alias="Icons/AddressRange/icon-neg-tree">Icons/rangeaddress-neg_16.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/AddressTable/icon">Icons/addresstable_25.png</file>
+    <file alias="Icons/AddressTable/icon-big">Icons/addresstable_64.png</file>
+    <file alias="Icons/AddressTable/icon-neg">Icons/addresstable-neg_25.png</file>
+    <file alias="Icons/AddressTable/icon-neg-tree">Icons/addresstable-neg_16.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/AttachedNetworks/icon">Icons/network_25.png</file>
+    <file alias="Icons/AttachedNetworks/icon-big">Icons/network_64.png</file>
+    <file alias="Icons/AttachedNetworks/icon-neg">Icons/network-neg_25.png</file>
+    <file alias="Icons/AttachedNetworks/icon-neg-tree">Icons/network-neg_16.png</file>
+    <file alias="Icons/AttachedNetworks/icon-ref">Icons/network-ref_25.png</file>
+    <file alias="Icons/AttachedNetworks/icon-tree">Icons/network_16.png</file>
+    <file alias="Icons/Blank/icon">Icons/blank.png</file>
+    <file alias="Icons/Blank/icon-big">Icons/blank.png</file>
+    <file alias="Icons/Both/icon">Icons/both_25.png</file>
+    <file alias="Icons/Both/icon-big">Icons/both_64.png</file>
+    <file alias="Icons/Both/icon-tree">Icons/both_16.png</file>
+    <file alias="Icons/Branch/icon">Icons/branch_25.png</file>
+    <file alias="Icons/Branch/icon-big">Icons/branch_64.png</file>
+    <file alias="Icons/Branch/icon-tree">Icons/branch_16.png</file>
+    <file alias="Icons/Classify/icon">Icons/classify_25.png</file>
+    <file alias="Icons/Classify/icon-big">Icons/classify_64.png</file>
+    <file alias="Icons/Classify/icon-tree">Icons/classify_16.png</file>
+    <file alias="Icons/Cluster/icon">Icons/cluster_25.png</file>
+    <file alias="Icons/Cluster/icon-big">Icons/cluster_64.png</file>
+    <file alias="Icons/Cluster/icon-neg">Icons/cluster-neg_25.png</file>
+    <file alias="Icons/Cluster/icon-neg-tree">Icons/cluster-neg_16.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/ClusterGroup/icon">Icons/user_25.png</file>
+    <file alias="Icons/ClusterGroup/icon-big">Icons/user_64.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/Compile">Icons/compile_25.png</file>
+    <file alias="Icons/Continue/icon">Icons/continue_25.png</file>
+    <file alias="Icons/Continue/icon-big">Icons/continue_64.png</file>
+    <file alias="Icons/Continue/icon-tree">Icons/continue_16.png</file>
+    <file alias="Icons/Custom/icon">Icons/custom_25.png</file>
+    <file alias="Icons/Custom/icon-big">Icons/custom_64.png</file>
+    <file alias="Icons/Custom/icon-tree">Icons/custom_16.png</file>
+    <file alias="Icons/CustomService/icon">Icons/service-custom_25.png</file>
+    <file alias="Icons/CustomService/icon-big">Icons/service-custom_64.png</file>
+    <file alias="Icons/CustomService/icon-neg">Icons/service-custom-neg_25.png</file>
+    <file alias="Icons/CustomService/icon-neg-tree">Icons/service-custom-neg_16.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/DNSName/icon">Icons/domainname_25.png</file>
+    <file alias="Icons/DNSName/icon-big">Icons/domainname_64.png</file>
+    <file alias="Icons/DNSName/icon-neg">Icons/domainname-neg_25.png</file>
+    <file alias="Icons/DNSName/icon-neg-tree">Icons/domainname-neg_16.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/Deny/icon">Icons/deny_25.png</file>
+    <file alias="Icons/Deny/icon-big">Icons/deny_64.png</file>
+    <file alias="Icons/Deny/icon-tree">Icons/deny_16.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon">Icons/failover-cluster-group_25.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-big">Icons/failover-cluster-group_64.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-neg">Icons/failover-cluster-group-neg_25.png</file>
+    <file alias="Icons/FailoverClusterGroup/icon-neg-tree">Icons/failover-cluster-group-neg_16.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/Firewall/icon">Icons/firewall_25.png</file>
+    <file alias="Icons/Firewall/icon-big">Icons/firewall_64.png</file>
+    <file alias="Icons/Firewall/icon-neg">Icons/firewall-neg_25.png</file>
+    <file alias="Icons/Firewall/icon-neg-tree">Icons/firewall-neg_16.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/Host/icon">Icons/host_25.png</file>
+    <file alias="Icons/Host/icon-big">Icons/host_64.png</file>
+    <file alias="Icons/Host/icon-neg">Icons/host-neg_25.png</file>
+    <file alias="Icons/Host/icon-neg-tree">Icons/host-neg_16.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/ICMP6Service/icon">Icons/service-icmp6_25.png</file>
+    <file alias="Icons/ICMP6Service/icon-big">Icons/service-icmp6_64.png</file>
+    <file alias="Icons/ICMP6Service/icon-neg">Icons/service-icmp6-neg_25.png</file>
+    <file alias="Icons/ICMP6Service/icon-neg-tree">Icons/service-icmp6-neg_16.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/ICMPService/icon">Icons/service-icmp_25.png</file>
+    <file alias="Icons/ICMPService/icon-big">Icons/service-icmp_64.png</file>
+    <file alias="Icons/ICMPService/icon-neg">Icons/service-icmp-neg_25.png</file>
+    <file alias="Icons/ICMPService/icon-neg-tree">Icons/service-icmp-neg_16.png</file>
+    <file alias="Icons/ICMPService/icon-ref">Icons/service-icmp-ref_25.png</file>
+    <file alias="Icons/ICMPService/icon-tree">Icons/service-icmp_16.png</file>
+    <file alias="Icons/IPService/icon">Icons/service-ip_25.png</file>
+    <file alias="Icons/IPService/icon-big">Icons/service-ip_64.png</file>
+    <file alias="Icons/IPService/icon-neg">Icons/service-ip-neg_25.png</file>
+    <file alias="Icons/IPService/icon-neg-tree">Icons/service-ip-neg_16.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/IPv4/icon">Icons/address_25.png</file>
+    <file alias="Icons/IPv4/icon-big">Icons/address_64.png</file>
+    <file alias="Icons/IPv4/icon-neg">Icons/address-neg_25.png</file>
+    <file alias="Icons/IPv4/icon-neg-tree">Icons/address-neg_16.png</file>
+    <file alias="Icons/IPv4/icon-ref">Icons/address-ref_25.png</file>
+    <file alias="Icons/IPv4/icon-tree">Icons/address_16.png</file>
+    <file alias="Icons/IPv6/icon">Icons/address6_25.png</file>
+    <file alias="Icons/IPv6/icon-big">Icons/address6_64.png</file>
+    <file alias="Icons/IPv6/icon-neg">Icons/address6-neg_25.png</file>
+    <file alias="Icons/IPv6/icon-neg-tree">Icons/address6-neg_16.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/Inbound/icon">Icons/inbound_25.png</file>
+    <file alias="Icons/Inbound/icon-big">Icons/inbound_64.png</file>
+    <file alias="Icons/Inbound/icon-tree">Icons/inbound_16.png</file>
+    <file alias="Icons/Install">Icons/install_25.png</file>
+    <file alias="Icons/Interface/icon">Icons/interface_25.png</file>
+    <file alias="Icons/Interface/icon-big">Icons/interface_64.png</file>
+    <file alias="Icons/Interface/icon-neg">Icons/interface-neg_25.png</file>
+    <file alias="Icons/Interface/icon-neg-tree">Icons/interface-neg_16.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/Interval/icon">Icons/clock_25.png</file>
+    <file alias="Icons/Interval/icon-big">Icons/clock_64.png</file>
+    <file alias="Icons/Interval/icon-neg">Icons/clock-neg_25.png</file>
+    <file alias="Icons/Interval/icon-neg-tree">Icons/clock-neg_16.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/IntervalGroup/icon">Icons/clock-group_25.png</file>
+    <file alias="Icons/IntervalGroup/icon-big">Icons/clock-group_64.png</file>
+    <file alias="Icons/IntervalGroup/icon-neg">Icons/clock-group-neg_25.png</file>
+    <file alias="Icons/IntervalGroup/icon-neg-tree">Icons/clock-group-neg_16.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/Library/icon">Icons/library_25.png</file>
+    <file alias="Icons/Library/icon-big">Icons/library_64.png</file>
+    <file alias="Icons/Library/icon-neg">Icons/library-neg_25.png</file>
+    <file alias="Icons/Library/icon-neg-tree">Icons/library-neg_16.png</file>
+    <file alias="Icons/Library/icon-ref">Icons/library-ref_25.png</file>
+    <file alias="Icons/Library/icon-tree">Icons/library_16.png</file>
+    <file alias="Icons/Log/icon">Icons/log_25.png</file>
+    <file alias="Icons/Log/icon-big">Icons/log_64.png</file>
+    <file alias="Icons/Log/icon-tree">Icons/log_16.png</file>
+    <file alias="Icons/NAT/icon">Icons/nat_25.png</file>
+    <file alias="Icons/NAT/icon-big">Icons/nat_64.png</file>
+    <file alias="Icons/NAT/icon-tree">Icons/nat_16.png</file>
+    <file alias="Icons/NATBranch/icon">Icons/branch_25.png</file>
+    <file alias="Icons/NATBranch/icon-big">Icons/branch_64.png</file>
+    <file alias="Icons/NATBranch/icon-tree">Icons/branch_16.png</file>
+    <file alias="Icons/Network/icon">Icons/network_25.png</file>
+    <file alias="Icons/Network/icon-big">Icons/network_64.png</file>
+    <file alias="Icons/Network/icon-neg">Icons/network-neg_25.png</file>
+    <file alias="Icons/Network/icon-neg-tree">Icons/network-neg_16.png</file>
+    <file alias="Icons/Network/icon-ref">Icons/network-ref_25.png</file>
+    <file alias="Icons/Network/icon-tree">Icons/network_16.png</file>
+    <file alias="Icons/NetworkIPv6/icon">Icons/network6_25.png</file>
+    <file alias="Icons/NetworkIPv6/icon-big">Icons/network6_64.png</file>
+    <file alias="Icons/NetworkIPv6/icon-neg">Icons/network6-neg_25.png</file>
+    <file alias="Icons/NetworkIPv6/icon-neg-tree">Icons/network6-neg_16.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/ObjectGroup/icon">Icons/object-group_25.png</file>
+    <file alias="Icons/ObjectGroup/icon-big">Icons/object-group_64.png</file>
+    <file alias="Icons/ObjectGroup/icon-neg">Icons/object-group-neg_25.png</file>
+    <file alias="Icons/ObjectGroup/icon-neg-tree">Icons/object-group-neg_16.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/DynamicGroup/icon">Icons/object-group_25.png</file>
+    <file alias="Icons/DynamicGroup/icon-big">Icons/object-group_64.png</file>
+    <file alias="Icons/DynamicGroup/icon-neg">Icons/object-group-neg_25.png</file>
+    <file alias="Icons/DynamicGroup/icon-neg-tree">Icons/object-group-neg_16.png</file>
+    <file alias="Icons/DynamicGroup/icon-ref">Icons/object-group-ref_25.png</file>
+    <file alias="Icons/DynamicGroup/icon-tree">Icons/object-group_16.png</file>
+    <file alias="Icons/Options/icon">Icons/options_25.png</file>
+    <file alias="Icons/Options/icon-big">Icons/options_64.png</file>
+    <file alias="Icons/Options/icon-tree">Icons/options_16.png</file>
+    <file alias="Icons/Outbound/icon">Icons/outbound_25.png</file>
+    <file alias="Icons/Outbound/icon-big">Icons/outbound_64.png</file>
+    <file alias="Icons/Outbound/icon-tree">Icons/outbound_16.png</file>
+    <file alias="Icons/Pipe/icon">Icons/pipe_25.png</file>
+    <file alias="Icons/Pipe/icon-big">Icons/pipe_64.png</file>
+    <file alias="Icons/Pipe/icon-tree">Icons/pipe_16.png</file>
+    <file alias="Icons/Policy/icon">Icons/ruleset_25.png</file>
+    <file alias="Icons/Policy/icon-big">Icons/ruleset_64.png</file>
+    <file alias="Icons/Policy/icon-tree">Icons/ruleset_16.png</file>
+    <file alias="Icons/Reject/icon">Icons/reject_25.png</file>
+    <file alias="Icons/Reject/icon-big">Icons/reject_64.png</file>
+    <file alias="Icons/Reject/icon-tree">Icons/reject_16.png</file>
+    <file alias="Icons/Return/icon">Icons/back_25.png</file>
+    <file alias="Icons/Route/icon">Icons/route_25.png</file>
+    <file alias="Icons/Route/icon-big">Icons/route_64.png</file>
+    <file alias="Icons/Route/icon-tree">Icons/route_16.png</file>
+    <file alias="Icons/Routing/icon">Icons/routing_25.png</file>
+    <file alias="Icons/Routing/icon-big">Icons/routing_64.png</file>
+    <file alias="Icons/Routing/icon-tree">Icons/routing_16.png</file>
+    <file alias="Icons/ServiceGroup/icon">Icons/service-group_25.png</file>
+    <file alias="Icons/ServiceGroup/icon-big">Icons/service-group_64.png</file>
+    <file alias="Icons/ServiceGroup/icon-neg">Icons/service-group-neg_25.png</file>
+    <file alias="Icons/ServiceGroup/icon-neg-tree">Icons/service-group-neg_16.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/StateSyncClusterGroup/icon">Icons/state-sync-cluster-group_25.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-big">Icons/state-sync-cluster-group_64.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-neg">Icons/state-sync-cluster-group-neg_25.png</file>
+    <file alias="Icons/StateSyncClusterGroup/icon-neg-tree">Icons/state-sync-cluster-group-neg_16.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/SystemGroup/icon">Icons/folder_25.png</file>
+    <file alias="Icons/SystemGroup/icon-big">Icons/folder_64.png</file>
+    <file alias="Icons/SystemGroup/icon-tree">Icons/folder_16.png</file>
+    <file alias="Icons/TCPService/icon">Icons/service-tcp_25.png</file>
+    <file alias="Icons/TCPService/icon-big">Icons/service-tcp_64.png</file>
+    <file alias="Icons/TCPService/icon-neg">Icons/service-tcp-neg_25.png</file>
+    <file alias="Icons/TCPService/icon-neg-tree">Icons/service-tcp-neg_16.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/Tag/icon">Icons/tag_25.png</file>
+    <file alias="Icons/Tag/icon-big">Icons/tag_64.png</file>
+    <file alias="Icons/Tag/icon-tree">Icons/tag_16.png</file>
+    <file alias="Icons/TagService/icon">Icons/service-tag_25.png</file>
+    <file alias="Icons/TagService/icon-big">Icons/service-tag_64.png</file>
+    <file alias="Icons/TagService/icon-neg">Icons/service-tag-neg_25.png</file>
+    <file alias="Icons/TagService/icon-neg-tree">Icons/service-tag-neg_16.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/Translate/icon">Icons/translate_25.png</file>
+    <file alias="Icons/Translate/icon-tree">Icons/translate_16.png</file>
+    <file alias="Icons/UDPService/icon">Icons/service-udp_25.png</file>
+    <file alias="Icons/UDPService/icon-big">Icons/service-udp_64.png</file>
+    <file alias="Icons/UDPService/icon-neg">Icons/service-udp-neg_25.png</file>
+    <file alias="Icons/UDPService/icon-neg-tree">Icons/service-udp-neg_16.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/UserService/icon">Icons/user_25.png</file>
+    <file alias="Icons/UserService/icon-big">Icons/user_64.png</file>
+    <file alias="Icons/UserService/icon-neg">Icons/user-neg_25.png</file>
+    <file alias="Icons/UserService/icon-neg-tree">Icons/user-neg_16.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/lock">Icons/lock.png</file>
+    <file alias="Icons/neg">Icons/neg.png</file>
+    <file alias="Icons/neg2">Icons/neg2.png</file>
+    <file alias="Icons/physAddress/icon">Icons/physaddress_25.png</file>
+    <file alias="Icons/physAddress/icon-big">Icons/physaddress_64.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>Icons/add.png</file>
     <file>Icons/apply.png</file>
     <file>Icons/back_32.png</file>
diff --git a/src/libgui/ObjectManipulator.cpp b/src/libgui/ObjectManipulator.cpp
index c042bb8a7..de7276cee 100644
--- a/src/libgui/ObjectManipulator.cpp
+++ b/src/libgui/ObjectManipulator.cpp
@@ -1260,10 +1260,10 @@ void ObjectManipulator::selectionChanged(QTreeWidgetItem *cur)
     FWObject *o = obj;
     //if (FWReference::cast(o)!=NULL) o=FWReference::cast(o)->getPointer();
 
-    if (history.empty() || otvi!=history.back().item() )
+    if (history.empty() || otvi != getCurrentHistoryItem() )
     {
         mw->enableBackAction();
-        history.push_back( HistoryItem(otvi, o->getId()) );
+        addObjectToHistory(otvi, o);
     }
 
     //currentObj = obj;
diff --git a/src/libgui/ObjectManipulator.h b/src/libgui/ObjectManipulator.h
index da5b54e84..a701ec8fd 100644
--- a/src/libgui/ObjectManipulator.h
+++ b/src/libgui/ObjectManipulator.h
@@ -98,6 +98,7 @@ class ObjectManipulator : public QWidget
     int previous_lib_index;
     QSet<int> ids ;
     std::list<HistoryItem> history;
+    std::list<HistoryItem>::iterator current_history_item;
     int cacheHits;
 
     //libfwbuilder::FWObject *currentObj;
@@ -120,7 +121,7 @@ class ObjectManipulator : public QWidget
     int dedup_marker_global_counter;
 
     void buildNewObjectMenu();
-
+    
     ObjectTreeViewItem* insertObject(ObjectTreeViewItem *itm,
                                      libfwbuilder::FWObject *obj);
     void insertSubtree( ObjectTreeViewItem *itm,libfwbuilder::FWObject *obj );
@@ -266,6 +267,8 @@ public slots:
      void findObject();
 
      virtual void back();
+     virtual void forward();
+
      virtual void lockObject();
      virtual void unlockObject();
      virtual void simulateInstall();
@@ -326,7 +329,10 @@ public:
      void openObjectInTree(ObjectTreeViewItem *otvi,    bool register_in_history);
 
      void removeObjectFromHistory(libfwbuilder::FWObject *obj);
-
+     void addObjectToHistory(ObjectTreeViewItem* otvi,
+                             libfwbuilder::FWObject *obj);
+     ObjectTreeViewItem* getCurrentHistoryItem();
+     
      /*
       * searches history trying to find an object that has given
       * parent. Used to find which rule set of the firewall user
diff --git a/src/libgui/ObjectManipulator_slots.cpp b/src/libgui/ObjectManipulator_slots.cpp
index 4bd9262eb..a45a4f0d6 100644
--- a/src/libgui/ObjectManipulator_slots.cpp
+++ b/src/libgui/ObjectManipulator_slots.cpp
@@ -434,34 +434,51 @@ void ObjectManipulator::back()
 {
     if (!history.empty())
     {
-        history.pop_back();
+        FWObject *obj = NULL;
 
-/* skip objects that have been deleted.
- *
- * But see removeObjectFromHistory() which is now called by
- * removeObjectFromTreeView() it may not be necessary to do this
- * additional check here, especially since according to #1661 it
- * probably does not work anyway.
- *
- */
-        while ( ! history.empty())
+        current_history_item--;
+
+        if ( current_history_item != history.end())
         {
-            if (m_project->db()->findInIndex( history.back().id() )!=NULL) break;
-            history.pop_back();
+            ObjectTreeViewItem* otvi = current_history_item->item();
+            int obj_id = current_history_item->id();
+            obj = m_project->db()->findInIndex(obj_id);
+            if ( obj != NULL)
+            {
+                openObjectInTree( otvi, false );
+
+                if (mw->isEditorVisible()) editSelectedObject();
+            }
+        } else
+        {
+            current_history_item = history.begin();
         }
+    }
+}
 
-        if (history.empty())
+void ObjectManipulator::forward()
+{
+    if (!history.empty())
+    {
+        FWObject *obj = NULL;
+
+        current_history_item++;
+
+        if ( current_history_item != history.end())
         {
-            mw->enableBackAction();
-            return;
-        }
+            ObjectTreeViewItem* otvi = current_history_item->item();
+            int obj_id = current_history_item->id();
+            obj = m_project->db()->findInIndex(obj_id);
+            if ( obj != NULL)
+            {
+                openObjectInTree( otvi, false );
 
-        openObjectInTree( history.back().item(), false );
-
-        if (mw->isEditorVisible())
+                if (mw->isEditorVisible()) editSelectedObject();
+            }
+        } else
         {
-            ObjectTreeViewItem *otvi=history.back().item();
-            switchObjectInEditor(otvi->getFWObject());
+            current_history_item = history.end();
+            current_history_item--;
         }
     }
 }
diff --git a/src/libgui/ObjectManipulator_tree_ops.cpp b/src/libgui/ObjectManipulator_tree_ops.cpp
index ee0d16563..c286e2113 100644
--- a/src/libgui/ObjectManipulator_tree_ops.cpp
+++ b/src/libgui/ObjectManipulator_tree_ops.cpp
@@ -407,6 +407,19 @@ void ObjectManipulator::removeObjectFromHistory(FWObject *obj)
     if (history.empty()) mw->enableBackAction();
 }
 
+void ObjectManipulator::addObjectToHistory(ObjectTreeViewItem* otvi,
+                                           FWObject *obj)
+{
+    history.push_back( HistoryItem(otvi, obj->getId()) );
+    current_history_item = history.end();
+    current_history_item--;
+}
+
+ObjectTreeViewItem* ObjectManipulator::getCurrentHistoryItem()
+{
+    return current_history_item->item();
+}
+
 void ObjectManipulator::updateLibColor(FWObject *lib)
 {
     QString clr = lib->getStr("color").c_str();
diff --git a/src/libgui/ProjectPanel.cpp b/src/libgui/ProjectPanel.cpp
index b529e2889..e2f78d75a 100644
--- a/src/libgui/ProjectPanel.cpp
+++ b/src/libgui/ProjectPanel.cpp
@@ -619,6 +619,11 @@ void ProjectPanel::back()
     m_panel->om->back();
 }
 
+void ProjectPanel::forward()
+{
+    m_panel->om->forward();
+}
+
 void ProjectPanel::lockObject()
 {
     m_panel->om->lockObject();
diff --git a/src/libgui/ProjectPanel.h b/src/libgui/ProjectPanel.h
index 91a390463..96c9f63bb 100644
--- a/src/libgui/ProjectPanel.h
+++ b/src/libgui/ProjectPanel.h
@@ -239,6 +239,8 @@ public:
     void newObject();
     
     virtual void back();
+    virtual void forward();
+    
     virtual void lockObject();
     virtual void unlockObject();