diff --git a/build.xml b/build.xml
index c58f5c8c..9810f9ac 100755
--- a/build.xml
+++ b/build.xml
@@ -287,7 +287,7 @@
                     <methods>;
                     <fields>;
                 }
-		    	-keep class org.eclipse.swt.internal.buttonImage.*FileFormat
+		    	-keep class org.eclipse.swt.internal.image.*FileFormat
 				-keep class * {
 					% *Proc(int);
                     % *Proc(int, int);
diff --git a/resources/images/buttons/stop.svg b/resources/images/buttons/stop.svg
index 7b71c80b..95530540 100644
--- a/resources/images/buttons/stop.svg
+++ b/resources/images/buttons/stop.svg
@@ -15,9 +15,9 @@
         sodipodi:version="0.32"
         inkscape:version="0.91 r13725"
         sodipodi:docname="stop.svg"
-        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/buttons/stop@2x.png"
-        inkscape:export-xdpi="180"
-        inkscape:export-ydpi="180"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/buttons/stop.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
         version="1.1">
   <defs
      id="defs1874">
diff --git a/resources/images/list/addinfo.png b/resources/images/list/addinfo.png
deleted file mode 100644
index 8cc74aea..00000000
Binary files a/resources/images/list/addinfo.png and /dev/null differ
diff --git a/resources/images/list/alive.png b/resources/images/list/alive.png
index b168860b..8ef9b0f0 100644
Binary files a/resources/images/list/alive.png and b/resources/images/list/alive.png differ
diff --git a/resources/images/list/alive.svg b/resources/images/list/alive.svg
index c76660e1..1efde9f6 100644
--- a/resources/images/list/alive.svg
+++ b/resources/images/list/alive.svg
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources-src/images/list"
-   sodipodi:docname="alive.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources-src/start.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="alive.svg"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/list/alive@2x.png"
+        inkscape:export-xdpi="176"
+        inkscape:export-ydpi="176"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -101,28 +101,6 @@
        x2="11.453006"
        y2="13.71922"
        gradientTransform="matrix(0.922118,0,0,0.922118,0.175474,0.130764)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2825"
-       id="radialGradient2831"
-       cx="4.9103961"
-       cy="3.521287"
-       fx="4.9103961"
-       fy="3.521287"
-       r="1.7569307"
-       gradientTransform="matrix(1,0,0,0.230769,0,2.708682)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2835"
-       id="radialGradient2833"
-       cx="7.635891"
-       cy="7.5757427"
-       fx="7.635891"
-       fy="7.5757427"
-       r="7.6809406"
-       gradientTransform="matrix(1,0,0,0.979472,0,0.155514)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -131,17 +109,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.0197962"
+     inkscape:zoom="62.784865"
+     inkscape:cx="1.405341"
+     inkscape:cy="8.5437536"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -157,16 +136,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2833);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2809"
-       sodipodi:cx="7.635891"
-       sodipodi:cy="7.5757427"
-       sodipodi:rx="7.6809406"
-       sodipodi:ry="7.5232673"
-       d="M 15.316832 7.5757427 A 7.6809406 7.5232673 0 1 1  -0.045049667,7.5757427 A 7.6809406 7.5232673 0 1 1  15.316832 7.5757427 z"
-       transform="matrix(1.065189,0,0,1.065189,-0.150507,0.235349)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:url(#linearGradient2786);fill-opacity:1;stroke:url(#linearGradient2776);stroke-width:0.99201567;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -181,15 +150,5 @@
        style="opacity:1;fill:url(#linearGradient2801);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.5407355,6.7873036 C 9.1751305,6.8110199 8.8203305,6.8737522 8.4745365,6.9890169 C 5.833184,7.8694678 5.6597197,8.3365829 0.83824667,7.161914 C 0.83292457,7.2695189 0.83824667,7.3700027 0.83824667,7.4788921 C 0.83824667,11.128625 3.8550112,14.106615 7.5812348,14.106615 C 11.103631,14.106615 13.989222,11.456573 14.295408,8.0840321 C 13.322861,7.5669099 11.368764,6.6687221 9.5407355,6.7873036 z "
        id="path2788" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2831);fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2815"
-       sodipodi:cx="4.9103961"
-       sodipodi:cy="3.521287"
-       sodipodi:rx="1.7569307"
-       sodipodi:ry="0.40544555"
-       d="M 6.6673268 3.521287 A 1.7569307 0.40544555 0 1 1  3.1534654,3.521287 A 1.7569307 0.40544555 0 1 1  6.6673268 3.521287 z"
-       transform="matrix(1.845112,-1.498211,1.41749,1.950184,-9.74995,3.740622)" />
   </g>
 </svg>
diff --git a/resources/images/list/alive@2x.png b/resources/images/list/alive@2x.png
new file mode 100644
index 00000000..5e6e3d9c
Binary files /dev/null and b/resources/images/list/alive@2x.png differ
diff --git a/resources/images/list/dead.svg b/resources/images/list/dead.svg
index 34412e9b..077cfc62 100644
--- a/resources/images/list/dead.svg
+++ b/resources/images/list/dead.svg
@@ -1,21 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources-src"
-   sodipodi:docname="start.svg">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="dead.svg"
+        version="1.1"
+        inkscape:export-filename="/home/anton/dev/ipscan/resources/images/list/dead@2x.png"
+        inkscape:export-xdpi="180"
+        inkscape:export-ydpi="180">
   <defs
      id="defs1874">
     <linearGradient
@@ -98,28 +101,6 @@
        x2="11.453006"
        y2="13.71922"
        gradientTransform="matrix(0.922118,0,0,0.922118,0.175474,0.130764)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2825"
-       id="radialGradient2831"
-       cx="4.9103961"
-       cy="3.521287"
-       fx="4.9103961"
-       fy="3.521287"
-       r="1.7569307"
-       gradientTransform="matrix(1,0,0,0.230769,0,2.708682)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2835"
-       id="radialGradient2833"
-       cx="7.635891"
-       cy="7.5757427"
-       fx="7.635891"
-       fy="7.5757427"
-       r="7.6809406"
-       gradientTransform="matrix(1,0,0,0.979472,0,0.155514)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -128,17 +109,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.0197962"
+     inkscape:zoom="44.395604"
+     inkscape:cx="6.4711238"
+     inkscape:cy="8.1147734"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -154,16 +136,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2833);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2809"
-       sodipodi:cx="7.635891"
-       sodipodi:cy="7.5757427"
-       sodipodi:rx="7.6809406"
-       sodipodi:ry="7.5232673"
-       d="M 15.316832 7.5757427 A 7.6809406 7.5232673 0 1 1  -0.045049667,7.5757427 A 7.6809406 7.5232673 0 1 1  15.316832 7.5757427 z"
-       transform="matrix(1.065189,0,0,1.065189,-0.150507,0.235349)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:url(#linearGradient2786);fill-opacity:1;stroke:url(#linearGradient2776);stroke-width:0.99201567;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -178,15 +150,5 @@
        style="opacity:1;fill:url(#linearGradient2801);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.5407355,6.7873036 C 9.1751305,6.8110199 8.8203305,6.8737522 8.4745365,6.9890169 C 5.833184,7.8694678 5.6597197,8.3365829 0.83824667,7.161914 C 0.83292457,7.2695189 0.83824667,7.3700027 0.83824667,7.4788921 C 0.83824667,11.128625 3.8550112,14.106615 7.5812348,14.106615 C 11.103631,14.106615 13.989222,11.456573 14.295408,8.0840321 C 13.322861,7.5669099 11.368764,6.6687221 9.5407355,6.7873036 z "
        id="path2788" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2831);fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2815"
-       sodipodi:cx="4.9103961"
-       sodipodi:cy="3.521287"
-       sodipodi:rx="1.7569307"
-       sodipodi:ry="0.40544555"
-       d="M 6.6673268 3.521287 A 1.7569307 0.40544555 0 1 1  3.1534654,3.521287 A 1.7569307 0.40544555 0 1 1  6.6673268 3.521287 z"
-       transform="matrix(1.845112,-1.498211,1.41749,1.950184,-9.74995,3.740622)" />
   </g>
 </svg>
diff --git a/resources/images/list/dead@2x.png b/resources/images/list/dead@2x.png
new file mode 100644
index 00000000..452adaad
Binary files /dev/null and b/resources/images/list/dead@2x.png differ
diff --git a/resources/images/list/ports.png b/resources/images/list/ports.png
new file mode 100644
index 00000000..d33e5226
Binary files /dev/null and b/resources/images/list/ports.png differ
diff --git a/resources/images/list/addinfo.svg b/resources/images/list/ports.svg
similarity index 60%
rename from resources/images/list/addinfo.svg
rename to resources/images/list/ports.svg
index 81e1f2d8..ed2d66e6 100644
--- a/resources/images/list/addinfo.svg
+++ b/resources/images/list/ports.svg
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources-src"
-   sodipodi:docname="stop.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources-src/start.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="ports.svg"
+        inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources-src/start.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -101,28 +101,6 @@
        x2="11.453006"
        y2="13.71922"
        gradientTransform="matrix(0.922118,0,0,0.922118,0.175474,0.130764)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2825"
-       id="radialGradient2831"
-       cx="4.9103961"
-       cy="3.521287"
-       fx="4.9103961"
-       fy="3.521287"
-       r="1.7569307"
-       gradientTransform="matrix(1,0,0,0.230769,0,2.708682)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2835"
-       id="radialGradient2833"
-       cx="7.635891"
-       cy="7.5757427"
-       fx="7.635891"
-       fy="7.5757427"
-       r="7.6809406"
-       gradientTransform="matrix(1,0,0,0.979472,0,0.155514)"
-       gradientUnits="userSpaceOnUse" />
   </defs>
   <sodipodi:namedview
      id="base"
@@ -131,17 +109,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.0197962"
+     inkscape:zoom="44.395604"
+     inkscape:cx="7.7943455"
+     inkscape:cy="3.9238194"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -157,16 +136,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2833);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2809"
-       sodipodi:cx="7.635891"
-       sodipodi:cy="7.5757427"
-       sodipodi:rx="7.6809406"
-       sodipodi:ry="7.5232673"
-       d="M 15.316832 7.5757427 A 7.6809406 7.5232673 0 1 1  -0.045049667,7.5757427 A 7.6809406 7.5232673 0 1 1  15.316832 7.5757427 z"
-       transform="matrix(1.065189,0,0,1.065189,-0.150507,0.235349)" />
     <path
        sodipodi:type="arc"
        style="opacity:1;fill:url(#linearGradient2786);fill-opacity:1;stroke:url(#linearGradient2776);stroke-width:0.99201567;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
@@ -181,15 +150,5 @@
        style="opacity:1;fill:url(#linearGradient2801);fill-opacity:1;stroke:none;stroke-width:0.88499999;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
        d="M 9.5407355,6.7873036 C 9.1751305,6.8110199 8.8203305,6.8737522 8.4745365,6.9890169 C 5.833184,7.8694678 5.6597197,8.3365829 0.83824667,7.161914 C 0.83292457,7.2695189 0.83824667,7.3700027 0.83824667,7.4788921 C 0.83824667,11.128625 3.8550112,14.106615 7.5812348,14.106615 C 11.103631,14.106615 13.989222,11.456573 14.295408,8.0840321 C 13.322861,7.5669099 11.368764,6.6687221 9.5407355,6.7873036 z "
        id="path2788" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient2831);fill-opacity:1;stroke:none;stroke-width:0.1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       id="path2815"
-       sodipodi:cx="4.9103961"
-       sodipodi:cy="3.521287"
-       sodipodi:rx="1.7569307"
-       sodipodi:ry="0.40544555"
-       d="M 6.6673268 3.521287 A 1.7569307 0.40544555 0 1 1  3.1534654,3.521287 A 1.7569307 0.40544555 0 1 1  6.6673268 3.521287 z"
-       transform="matrix(1.845112,-1.498211,1.41749,1.950184,-9.74995,3.740622)" />
   </g>
 </svg>
diff --git a/resources/images/list/ports@2x.png b/resources/images/list/ports@2x.png
new file mode 100644
index 00000000..17e50715
Binary files /dev/null and b/resources/images/list/ports@2x.png differ
diff --git a/resources/images/list/unknown.png b/resources/images/list/unknown.png
index d949a3ee..ede13a80 100644
Binary files a/resources/images/list/unknown.png and b/resources/images/list/unknown.png differ
diff --git a/resources/images/list/unknown.svg b/resources/images/list/unknown.svg
index 7e8e04f3..b442828e 100644
--- a/resources/images/list/unknown.svg
+++ b/resources/images/list/unknown.svg
@@ -1,24 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!-- Created with Inkscape (http://www.inkscape.org/) -->
+
 <svg
-   xmlns:dc="http://purl.org/dc/elements/1.1/"
-   xmlns:cc="http://web.resource.org/cc/"
-   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
-   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="16px"
-   height="16px"
-   id="svg1872"
-   sodipodi:version="0.32"
-   inkscape:version="0.44.1"
-   sodipodi:docbase="/mnt/work/svn_sf/ipscan/resources/images/list"
-   sodipodi:docname="unknown.svg"
-   inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/list/unknown.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
+        xmlns:dc="http://purl.org/dc/elements/1.1/"
+        xmlns:cc="http://creativecommons.org/ns#"
+        xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+        xmlns="http://www.w3.org/2000/svg"
+        xmlns:xlink="http://www.w3.org/1999/xlink"
+        xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+        xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+        width="16px"
+        height="16px"
+        id="svg1872"
+        sodipodi:version="0.32"
+        inkscape:version="0.91 r13725"
+        sodipodi:docname="unknown.svg"
+        inkscape:export-filename="/mnt/work/svn_sf/ipscan/resources/images/list/unknown.png"
+        inkscape:export-xdpi="90"
+        inkscape:export-ydpi="90"
+        version="1.1">
   <defs
      id="defs1874">
     <linearGradient
@@ -217,17 +217,18 @@
      borderopacity="1.0"
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="8"
-     inkscape:cy="9.2698308"
+     inkscape:zoom="62.784865"
+     inkscape:cx="3.6698457"
+     inkscape:cy="9.6823155"
      inkscape:current-layer="layer1"
      showgrid="true"
      inkscape:grid-bbox="true"
      inkscape:document-units="px"
-     inkscape:window-width="1012"
-     inkscape:window-height="716"
-     inkscape:window-x="6"
-     inkscape:window-y="21" />
+     inkscape:window-width="3200"
+     inkscape:window-height="1752"
+     inkscape:window-x="0"
+     inkscape:window-y="48"
+     inkscape:window-maximized="1" />
   <metadata
      id="metadata1877">
     <rdf:RDF>
@@ -243,18 +244,6 @@
      id="layer1"
      inkscape:label="Layer 1"
      inkscape:groupmode="layer">
-    <text
-       id="text5336"
-       y="16.115181"
-       x="3.3766122"
-       style="font-size:21.2743187px;font-style:normal;font-weight:normal;fill:#acaa94;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Arial Black"
-       xml:space="preserve"
-       transform="scale(1.013346,0.98683)"><tspan
-         style="font-size:19.14689255px;fill:#acaa94;fill-opacity:1;stroke:none;stroke-width:1;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-         y="16.115181"
-         x="3.3766122"
-         id="tspan5338"
-         sodipodi:role="line">?</tspan></text>
     <text
        xml:space="preserve"
        style="font-size:21.27429008px;font-style:normal;font-weight:normal;fill:url(#linearGradient5334);fill-opacity:1;stroke:url(#linearGradient5348);stroke-width:0.90000004;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;font-family:Arial Black"
diff --git a/resources/images/list/unknown@2x.png b/resources/images/list/unknown@2x.png
new file mode 100644
index 00000000..a77c2093
Binary files /dev/null and b/resources/images/list/unknown@2x.png differ
diff --git a/resources/messages.properties b/resources/messages.properties
index af326e98..4462cb5f 100644
--- a/resources/messages.properties
+++ b/resources/messages.properties
@@ -175,10 +175,6 @@ button.insert=&Insert
 button.add=&Add
 button.check=Chec&k...
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_de.properties b/resources/messages_de.properties
index 173c62f7..681972de 100644
--- a/resources/messages_de.properties
+++ b/resources/messages_de.properties
@@ -154,10 +154,6 @@ button.insert=Einf\u00fcgen
 button.add=Hinzuf\u00fcgen
 button.check=Pr\u00fcfen...
 combobox.feeder.tooltip=IP Auswahl. \u00c4ndern Sie dies, wenn Sie eine andere Quelle f\u00fcr IP-Addressen zum scannen ben\u00f6tigen
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_es.properties b/resources/messages_es.properties
index e42821c8..f25d540e 100644
--- a/resources/messages_es.properties
+++ b/resources/messages_es.properties
@@ -147,10 +147,6 @@ button.insert=&Insertar
 button.add=&Agregar
 button.check=Chequea&r...
 combobox.feeder.tooltip=Selección de IP de origen. Cambie esto si necesita escanear otra IP.
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternativo)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_hu.properties b/resources/messages_hu.properties
index 52c5bac7..9e5868df 100644
--- a/resources/messages_hu.properties
+++ b/resources/messages_hu.properties
@@ -155,10 +155,6 @@ button.insert=&Beszúrás
 button.add=&Hozzáadás
 button.check=Vizsgál...
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternatív)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_it.properties b/resources/messages_it.properties
index 9f0ad2f0..7f9da076 100644
--- a/resources/messages_it.properties
+++ b/resources/messages_it.properties
@@ -156,10 +156,6 @@ button.insert=&Inserisci
 button.add=&Aggiungi
 button.check=C&ontrolla...
 combobox.feeder.tooltip=Selezione sorgente IP. Modificare questo se avete bisogno di un'altra fonte di indirizzi IP da scansionare
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternativo)
 pinger.windows=ICMP.DLL di Windows
diff --git a/resources/messages_ku.properties b/resources/messages_ku.properties
index af2174a9..719b2306 100644
--- a/resources/messages_ku.properties
+++ b/resources/messages_ku.properties
@@ -144,10 +144,6 @@ button.insert=&خستنه‌ ناو
 button.add=&زیاد کردن
 button.check=پشکنین...
 combobox.feeder.tooltip=ئای پی دۆزه‌ره‌وه‌ .ئه‌مه‌ بگۆره‌ ئه‌گه‌ر سه‌رچاوه‌ی تری ئای پی ده‌زانی
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_lt.properties b/resources/messages_lt.properties
index 6b61f3cb..859db8ff 100644
--- a/resources/messages_lt.properties
+++ b/resources/messages_lt.properties
@@ -146,10 +146,6 @@ button.insert= &Įterpti
 button.add= &Papildyti
 button.check=Chec&k...
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/resources/messages_tr.properties b/resources/messages_tr.properties
index 9a0d1106..22e23bfb 100644
--- a/resources/messages_tr.properties
+++ b/resources/messages_tr.properties
@@ -148,10 +148,6 @@ button.insert=&ekle
 button.add=&ekle
 button.check=kontrol
 combobox.feeder.tooltip=IP Feeder selection. Change this if you need another source for IP addresses to scan
-list.unknown.img=images/list/unknown.png
-list.dead.img=images/list/dead.png
-list.alive.img=images/list/alive.png
-list.addinfo.img=images/list/addinfo.png
 pinger.icmp=ICMP Echo
 pinger.icmp2=ICMP Echo (Alternative)
 pinger.windows=Windows ICMP.DLL
diff --git a/src/net/azib/ipscan/gui/MainWindow.java b/src/net/azib/ipscan/gui/MainWindow.java
index ac970b0a..0138f906 100644
--- a/src/net/azib/ipscan/gui/MainWindow.java
+++ b/src/net/azib/ipscan/gui/MainWindow.java
@@ -28,8 +28,8 @@ import org.eclipse.swt.widgets.*;
 import javax.inject.Inject;
 import javax.inject.Named;
 
-import static net.azib.ipscan.gui.util.LayoutHelper.buttonImage;
 import static net.azib.ipscan.gui.util.LayoutHelper.formData;
+import static net.azib.ipscan.gui.util.LayoutHelper.icon;
 
 /**
  * Main window of Angry IP Scanner.
@@ -169,13 +169,13 @@ public class MainWindow {
 
 		prefsButton = createToolbarButton(controlsArea);
 		ToolItem item = new ToolItem(prefsButton, SWT.PUSH);
-		item.setImage(buttonImage("prefs"));
+		item.setImage(icon("buttons/prefs"));
 		item.setToolTipText(Labels.getLabel("title.preferences"));
 		item.addListener(SWT.Selection, preferencesListener);
 
 		fetchersButton = createToolbarButton(controlsArea);
 		item = new ToolItem(fetchersButton, SWT.PUSH);
-		item.setImage(buttonImage("fetchers"));
+		item.setImage(icon("buttons/fetchers"));
 		item.setToolTipText(Labels.getLabel("title.fetchers.select"));
 		item.addListener(SWT.Selection, chooseFetchersListsner);
 
diff --git a/src/net/azib/ipscan/gui/ResultTable.java b/src/net/azib/ipscan/gui/ResultTable.java
index 2dbdca6b..3bf357aa 100644
--- a/src/net/azib/ipscan/gui/ResultTable.java
+++ b/src/net/azib/ipscan/gui/ResultTable.java
@@ -6,7 +6,6 @@
 package net.azib.ipscan.gui;
 
 import net.azib.ipscan.config.GUIConfig;
-import net.azib.ipscan.config.Labels;
 import net.azib.ipscan.core.ScanningResult;
 import net.azib.ipscan.core.ScanningResult.ResultType;
 import net.azib.ipscan.core.ScanningResultList;
@@ -28,6 +27,9 @@ import javax.inject.Inject;
 import javax.inject.Singleton;
 import java.util.List;
 
+import static net.azib.ipscan.core.ScanningResult.ResultType.*;
+import static net.azib.ipscan.gui.util.LayoutHelper.icon;
+
 /**
  * Table of scanning results.
  * 
@@ -62,10 +64,10 @@ public class ResultTable extends Table implements FetcherRegistryUpdateListener,
 		handleUpdateOfSelectedFetchers(fetcherRegistry);
 		
 		// load button images
-		listImages[ResultType.UNKNOWN.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.unknown.img"));
-		listImages[ResultType.DEAD.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.dead.img"));
-		listImages[ResultType.ALIVE.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.alive.img"));
-		listImages[ResultType.WITH_PORTS.ordinal()] = new Image(null, Labels.getInstance().getImageAsStream("list.addinfo.img"));
+		listImages[UNKNOWN.ordinal()] = icon("list/unknown");
+		listImages[DEAD.ordinal()] = icon("list/dead");
+		listImages[ALIVE.ordinal()] = icon("list/alive");
+		listImages[WITH_PORTS.ordinal()] = icon("list/ports");
 		
 		addListener(SWT.KeyDown, new CommandsMenuActions.Delete(this, stateMachine));
 		addListener(SWT.KeyDown, new CommandsMenuActions.CopyIP(this));
diff --git a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
index d57ae87b..50d1695f 100644
--- a/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
+++ b/src/net/azib/ipscan/gui/actions/StartStopScanningAction.java
@@ -31,7 +31,8 @@ import javax.inject.Named;
 import javax.inject.Singleton;
 import java.net.InetAddress;
 
-import static net.azib.ipscan.gui.util.LayoutHelper.buttonImage;
+import static net.azib.ipscan.core.state.ScanningState.*;
+import static net.azib.ipscan.gui.util.LayoutHelper.icon;
 
 /**
  * Start/Stop button action class.
@@ -66,20 +67,20 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		this.display = display;
 		
 		// preload button images
-		buttonImages[ScanningState.IDLE.ordinal()] = buttonImage("start");
-		buttonImages[ScanningState.SCANNING.ordinal()] = buttonImage("stop");
-		buttonImages[ScanningState.STARTING.ordinal()] = buttonImages[ScanningState.SCANNING.ordinal()]; 
-		buttonImages[ScanningState.RESTARTING.ordinal()] = buttonImages[ScanningState.SCANNING.ordinal()];
-		buttonImages[ScanningState.STOPPING.ordinal()] = buttonImage("kill");
-		buttonImages[ScanningState.KILLING.ordinal()] = buttonImages[ScanningState.STOPPING.ordinal()];
+		buttonImages[IDLE.ordinal()] = icon("buttons/start");
+		buttonImages[SCANNING.ordinal()] = icon("buttons/stop");
+		buttonImages[STARTING.ordinal()] = buttonImages[SCANNING.ordinal()];
+		buttonImages[RESTARTING.ordinal()] = buttonImages[SCANNING.ordinal()];
+		buttonImages[STOPPING.ordinal()] = icon("buttons/kill");
+		buttonImages[KILLING.ordinal()] = buttonImages[STOPPING.ordinal()];
 		
 		// preload button texts
-		buttonTexts[ScanningState.IDLE.ordinal()] = Labels.getLabel("button.start");
-		buttonTexts[ScanningState.SCANNING.ordinal()] = Labels.getLabel("button.stop");
-		buttonTexts[ScanningState.STARTING.ordinal()] = buttonTexts[ScanningState.SCANNING.ordinal()]; 
-		buttonTexts[ScanningState.RESTARTING.ordinal()] = buttonTexts[ScanningState.SCANNING.ordinal()];
-		buttonTexts[ScanningState.STOPPING.ordinal()] = Labels.getLabel("button.kill");
-		buttonTexts[ScanningState.KILLING.ordinal()] = Labels.getLabel("button.kill");
+		buttonTexts[IDLE.ordinal()] = Labels.getLabel("button.start");
+		buttonTexts[SCANNING.ordinal()] = Labels.getLabel("button.stop");
+		buttonTexts[STARTING.ordinal()] = buttonTexts[SCANNING.ordinal()];
+		buttonTexts[RESTARTING.ordinal()] = buttonTexts[SCANNING.ordinal()];
+		buttonTexts[STOPPING.ordinal()] = Labels.getLabel("button.kill");
+		buttonTexts[KILLING.ordinal()] = Labels.getLabel("button.kill");
 	}
 
 	@Inject
@@ -100,7 +101,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 		// add listeners to all state changes
 		stateMachine.addTransitionListener(this);
 		
-		// set the default buttonImage
+		// set the default image
 		ScanningState state = stateMachine.getState();
 		button.setImage(buttonImages[state.ordinal()]);
 		button.setText(buttonTexts[state.ordinal()]);
@@ -118,7 +119,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 	 */
 	public void widgetSelected(SelectionEvent event) {
 		// ask for confirmation before erasing scanning results
-		if (stateMachine.inState(ScanningState.IDLE)) {
+		if (stateMachine.inState(IDLE)) {
 			if (!preScanChecks())
 				return;
 		}
@@ -193,7 +194,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 				statusBar.setStatusText(Labels.getLabel("state.killingThreads"));
 				break;
 		}
-		// change button buttonImage
+		// change button image
 		button.setImage(buttonImages[state.ordinal()]);
 		button.setText(buttonTexts[state.ordinal()]);
 	}
@@ -203,7 +204,7 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 	 */
 	private ScanningResultCallback createResultsCallback(ScanningState state) {
 		// rescanning must follow the same strategy of displaying all hosts (even the dead ones), because the results are already in the list
-		if (guiConfig.displayMethod == DisplayMethod.ALL || state == ScanningState.RESTARTING) {
+		if (guiConfig.displayMethod == DisplayMethod.ALL || state == RESTARTING) {
 			return new ScanningResultCallback() {
 				public void prepareForResults(ScanningResult result) {
 					resultTable.addOrUpdateResultRow(result);
@@ -252,12 +253,12 @@ public class StartStopScanningAction implements SelectionListener, ScanningProgr
 				statusBar.setProgress(percentageComplete);
 				
 				// show percentage in main window title
-				if (!stateMachine.inState(ScanningState.IDLE)) 
+				if (!stateMachine.inState(IDLE))
 					statusBar.getShell().setText(percentageComplete + "% - " + mainWindowTitle);
 				else
 					statusBar.getShell().setText(mainWindowTitle);
 
-				// change button buttonImage according to the current state
+				// change button image according to the current state
 				button.setImage(buttonImages[stateMachine.getState().ordinal()]);
 			}
 		});
diff --git a/src/net/azib/ipscan/gui/util/LayoutHelper.java b/src/net/azib/ipscan/gui/util/LayoutHelper.java
index f482cb03..37ef92c3 100644
--- a/src/net/azib/ipscan/gui/util/LayoutHelper.java
+++ b/src/net/azib/ipscan/gui/util/LayoutHelper.java
@@ -49,12 +49,12 @@ public class LayoutHelper {
 		return new Font(shell.getDisplay(), fontData);
 	}
 
-	public static Image buttonImage(final String baseName) {
+	public static Image icon(final String baseName) {
 		final Display display = Display.getCurrent();
 		return new Image(display, new ImageDataProvider() {
 			@Override public ImageData getImageData(int zoom) {
 				String suffix = zoom == 200 ? "@2x.png" : ".png";
-				ImageData imageData = new ImageData(getClass().getResourceAsStream("/images/buttons/" + baseName + suffix));
+				ImageData imageData = new ImageData(getClass().getResourceAsStream("/images/" + baseName + suffix));
 				if (zoom != 100 & zoom != 200)
 					imageData = DPIUtil.autoScaleUp(display, imageData);
 				return imageData;
diff --git a/test/net/azib/ipscan/config/LabelsTest.java b/test/net/azib/ipscan/config/LabelsTest.java
index aba1ec56..2c36c69a 100644
--- a/test/net/azib/ipscan/config/LabelsTest.java
+++ b/test/net/azib/ipscan/config/LabelsTest.java
@@ -55,7 +55,7 @@ public class LabelsTest {
 	@Test
 	public void testImageAsStream() throws IOException {
 		InputStream stream = Labels.getInstance().getImageAsStream("button.start.img");
-		// Now check the first bytes of GIF buttonImage header
+		// Now check the first bytes of PNG image header
 		stream.read();
 		assertEquals((int)'P', stream.read());
 		assertEquals((int)'N', stream.read());