diff --git a/src/gui/ICMPServiceDialog.cpp b/src/gui/ICMPServiceDialog.cpp
index 4f049ebc0..8ad123efc 100644
--- a/src/gui/ICMPServiceDialog.cpp
+++ b/src/gui/ICMPServiceDialog.cpp
@@ -72,9 +72,16 @@ void ICMPServiceDialog::loadFWObject(FWObject *o)
     assert(s!=NULL);
 
     if (ICMP6Service::isA(o))
+    {
         m_dialog->editorTitle->setText("ICMP6 Service");
-    else
+        m_dialog->editorLabel->setPixmap(
+            QPixmap(QString::fromUtf8(":/Icons/ICMP6Service/icon")));
+    } else
+    {
         m_dialog->editorTitle->setText("ICMP Service");
+        m_dialog->editorLabel->setPixmap(
+            QPixmap(QString::fromUtf8(":/Icons/ICMPService/icon")));
+    }
 
     init=true;
 
diff --git a/src/gui/Icons/service-icmp6-neg_16.png b/src/gui/Icons/service-icmp6-neg_16.png
new file mode 100644
index 000000000..634878fe3
Binary files /dev/null and b/src/gui/Icons/service-icmp6-neg_16.png differ
diff --git a/src/gui/Icons/service-icmp6-neg_25.png b/src/gui/Icons/service-icmp6-neg_25.png
new file mode 100644
index 000000000..324f78a45
Binary files /dev/null and b/src/gui/Icons/service-icmp6-neg_25.png differ
diff --git a/src/gui/Icons/service-icmp6-ref_25.png b/src/gui/Icons/service-icmp6-ref_25.png
new file mode 100644
index 000000000..d7676bece
Binary files /dev/null and b/src/gui/Icons/service-icmp6-ref_25.png differ
diff --git a/src/gui/Icons/service-icmp6_16.png b/src/gui/Icons/service-icmp6_16.png
new file mode 100644
index 000000000..6b725a5d3
Binary files /dev/null and b/src/gui/Icons/service-icmp6_16.png differ
diff --git a/src/gui/Icons/service-icmp6_25.png b/src/gui/Icons/service-icmp6_25.png
new file mode 100644
index 000000000..0d23b6736
Binary files /dev/null and b/src/gui/Icons/service-icmp6_25.png differ
diff --git a/src/gui/MainRes.qrc b/src/gui/MainRes.qrc
index 29d1c0f6c..cce8a1f61 100644
--- a/src/gui/MainRes.qrc
+++ b/src/gui/MainRes.qrc
@@ -184,11 +184,11 @@
         <file alias="Icons/ICMPService/icon">Icons/service-icmp_25.png</file>
 
 
-        <file alias="Icons/ICMP6Service/icon-neg">Icons/service-icmp-neg_25.png</file>
-        <file alias="Icons/ICMP6Service/icon-neg-tree">Icons/service-icmp-neg_16.png</file>
-        <file alias="Icons/ICMP6Service/icon-ref">Icons/service-icmp-ref_25.png</file>
-        <file alias="Icons/ICMP6Service/icon-tree">Icons/service-icmp_16.png</file>
-        <file alias="Icons/ICMP6Service/icon">Icons/service-icmp_25.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/ICMP6Service/icon">Icons/service-icmp6_25.png</file>
 
 
         <file alias="Icons/IPService/icon-neg">Icons/service-ip-neg_25.png</file>
diff --git a/src/gui/icmpservicedialog_q.ui b/src/gui/icmpservicedialog_q.ui
index cfc00d8d7..cc95b3fe8 100644
--- a/src/gui/icmpservicedialog_q.ui
+++ b/src/gui/icmpservicedialog_q.ui
@@ -199,7 +199,7 @@
          </widget>
         </item>
         <item row="0" column="1" >
-         <widget class="QLabel" name="label" >
+         <widget class="QLabel" name="editorLabel" >
           <property name="sizePolicy" >
            <sizepolicy vsizetype="Preferred" hsizetype="Maximum" >
             <horstretch>0</horstretch>