diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index a579544..436d136 100644
--- a/data/icons/Makefile.am
+++ b/data/icons/Makefile.am
@@ -146,41 +146,41 @@ private_icons = \
 	hicolor_apps_scalable_im-sametime.svg \
 	hicolor_apps_scalable_im-yahoo.svg \
 	hicolor_apps_scalable_im-zephyr.svg \
-	hicolor_status_16x16_empathy-available.png \
-	hicolor_status_16x16_empathy-away.png \
-	hicolor_status_16x16_empathy-busy.png \
-	hicolor_status_16x16_empathy-extended-away.png \
-	hicolor_status_16x16_empathy-offline.png \
+	hicolor_status_16x16_user-available.png \
+	hicolor_status_16x16_user-away.png \
+	hicolor_status_16x16_user-busy.png \
+	hicolor_status_16x16_user-idle.png \
+	hicolor_status_16x16_user-offline.png \
 	hicolor_status_16x16_empathy-pending.png \
-	hicolor_status_22x22_empathy-available.png \
-	hicolor_status_22x22_empathy-away.png \
-	hicolor_status_22x22_empathy-busy.png \
-	hicolor_status_22x22_empathy-extended-away.png \
-	hicolor_status_22x22_empathy-offline.png \
+	hicolor_status_22x22_user-available.png \
+	hicolor_status_22x22_user-away.png \
+	hicolor_status_22x22_user-busy.png \
+	hicolor_status_22x22_user-idle.png \
+	hicolor_status_22x22_user-offline.png \
 	hicolor_status_22x22_empathy-pending.png \
-	hicolor_status_24x24_empathy-available.png \
-	hicolor_status_24x24_empathy-away.png \
-	hicolor_status_24x24_empathy-busy.png \
-	hicolor_status_24x24_empathy-extended-away.png \
-	hicolor_status_24x24_empathy-offline.png \
+	hicolor_status_24x24_user-available.png \
+	hicolor_status_24x24_user-away.png \
+	hicolor_status_24x24_user-busy.png \
+	hicolor_status_24x24_user-idle.png \
+	hicolor_status_24x24_user-offline.png \
 	hicolor_status_24x24_empathy-pending.png \
-	hicolor_status_32x32_empathy-available.png \
-	hicolor_status_32x32_empathy-away.png \
-	hicolor_status_32x32_empathy-busy.png \
-	hicolor_status_32x32_empathy-extended-away.png \
-	hicolor_status_32x32_empathy-offline.png \
+	hicolor_status_32x32_user-available.png \
+	hicolor_status_32x32_user-away.png \
+	hicolor_status_32x32_user-busy.png \
+	hicolor_status_32x32_user-idle.png \
+	hicolor_status_32x32_user-offline.png \
 	hicolor_status_32x32_empathy-pending.png \
-	hicolor_status_48x48_empathy-available.png \
-	hicolor_status_48x48_empathy-away.png \
-	hicolor_status_48x48_empathy-busy.png \
-	hicolor_status_48x48_empathy-extended-away.png \
-	hicolor_status_48x48_empathy-offline.png \
+	hicolor_status_48x48_user-available.png \
+	hicolor_status_48x48_user-away.png \
+	hicolor_status_48x48_user-busy.png \
+	hicolor_status_48x48_user-idle.png \
+	hicolor_status_48x48_user-offline.png \
 	hicolor_status_48x48_empathy-pending.png \
-	hicolor_status_scalable_empathy-available.svg \
-	hicolor_status_scalable_empathy-away.svg \
-	hicolor_status_scalable_empathy-busy.svg \
-	hicolor_status_scalable_empathy-extended-away.svg \
-	hicolor_status_scalable_empathy-offline.svg \
+	hicolor_status_scalable_user-available.svg \
+	hicolor_status_scalable_user-away.svg \
+	hicolor_status_scalable_user-busy.svg \
+	hicolor_status_scalable_user-extended-away.svg \
+	hicolor_status_scalable_user-offline.svg \
 	hicolor_status_scalable_empathy-pending.svg \
 	$(NULL)
 
diff --git a/data/icons/hicolor_status_16x16_empathy-available.png b/data/icons/hicolor_status_16x16_empathy-available.png
deleted file mode 100644
index 5435e02..0000000
Binary files a/data/icons/hicolor_status_16x16_empathy-available.png and /dev/null differ
diff --git a/data/icons/hicolor_status_16x16_empathy-away.png b/data/icons/hicolor_status_16x16_empathy-away.png
deleted file mode 100644
index 7576a61..0000000
Binary files a/data/icons/hicolor_status_16x16_empathy-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_16x16_empathy-busy.png b/data/icons/hicolor_status_16x16_empathy-busy.png
deleted file mode 100644
index 90eab60..0000000
Binary files a/data/icons/hicolor_status_16x16_empathy-busy.png and /dev/null differ
diff --git a/data/icons/hicolor_status_16x16_empathy-extended-away.png b/data/icons/hicolor_status_16x16_empathy-extended-away.png
deleted file mode 100644
index 9dec477..0000000
Binary files a/data/icons/hicolor_status_16x16_empathy-extended-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_16x16_empathy-offline.png b/data/icons/hicolor_status_16x16_empathy-offline.png
deleted file mode 100644
index 637be12..0000000
Binary files a/data/icons/hicolor_status_16x16_empathy-offline.png and /dev/null differ
diff --git a/data/icons/hicolor_status_16x16_user-available.png b/data/icons/hicolor_status_16x16_user-available.png
new file mode 100644
index 0000000..5435e02
Binary files /dev/null and b/data/icons/hicolor_status_16x16_user-available.png differ
diff --git a/data/icons/hicolor_status_16x16_user-away.png b/data/icons/hicolor_status_16x16_user-away.png
new file mode 100644
index 0000000..7576a61
Binary files /dev/null and b/data/icons/hicolor_status_16x16_user-away.png differ
diff --git a/data/icons/hicolor_status_16x16_user-busy.png b/data/icons/hicolor_status_16x16_user-busy.png
new file mode 100644
index 0000000..90eab60
Binary files /dev/null and b/data/icons/hicolor_status_16x16_user-busy.png differ
diff --git a/data/icons/hicolor_status_16x16_user-idle.png b/data/icons/hicolor_status_16x16_user-idle.png
new file mode 100644
index 0000000..9dec477
Binary files /dev/null and b/data/icons/hicolor_status_16x16_user-idle.png differ
diff --git a/data/icons/hicolor_status_16x16_user-offline.png b/data/icons/hicolor_status_16x16_user-offline.png
new file mode 100644
index 0000000..637be12
Binary files /dev/null and b/data/icons/hicolor_status_16x16_user-offline.png differ
diff --git a/data/icons/hicolor_status_22x22_empathy-available.png b/data/icons/hicolor_status_22x22_empathy-available.png
deleted file mode 100644
index ec8c452..0000000
Binary files a/data/icons/hicolor_status_22x22_empathy-available.png and /dev/null differ
diff --git a/data/icons/hicolor_status_22x22_empathy-away.png b/data/icons/hicolor_status_22x22_empathy-away.png
deleted file mode 100644
index 6c068f2..0000000
Binary files a/data/icons/hicolor_status_22x22_empathy-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_22x22_empathy-busy.png b/data/icons/hicolor_status_22x22_empathy-busy.png
deleted file mode 100644
index 0fe61fd..0000000
Binary files a/data/icons/hicolor_status_22x22_empathy-busy.png and /dev/null differ
diff --git a/data/icons/hicolor_status_22x22_empathy-extended-away.png b/data/icons/hicolor_status_22x22_empathy-extended-away.png
deleted file mode 100644
index 72c5b19..0000000
Binary files a/data/icons/hicolor_status_22x22_empathy-extended-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_22x22_empathy-offline.png b/data/icons/hicolor_status_22x22_empathy-offline.png
deleted file mode 100644
index fe5de82..0000000
Binary files a/data/icons/hicolor_status_22x22_empathy-offline.png and /dev/null differ
diff --git a/data/icons/hicolor_status_22x22_user-available.png b/data/icons/hicolor_status_22x22_user-available.png
new file mode 100644
index 0000000..ec8c452
Binary files /dev/null and b/data/icons/hicolor_status_22x22_user-available.png differ
diff --git a/data/icons/hicolor_status_22x22_user-away.png b/data/icons/hicolor_status_22x22_user-away.png
new file mode 100644
index 0000000..6c068f2
Binary files /dev/null and b/data/icons/hicolor_status_22x22_user-away.png differ
diff --git a/data/icons/hicolor_status_22x22_user-busy.png b/data/icons/hicolor_status_22x22_user-busy.png
new file mode 100644
index 0000000..0fe61fd
Binary files /dev/null and b/data/icons/hicolor_status_22x22_user-busy.png differ
diff --git a/data/icons/hicolor_status_22x22_user-idle.png b/data/icons/hicolor_status_22x22_user-idle.png
new file mode 100644
index 0000000..72c5b19
Binary files /dev/null and b/data/icons/hicolor_status_22x22_user-idle.png differ
diff --git a/data/icons/hicolor_status_22x22_user-offline.png b/data/icons/hicolor_status_22x22_user-offline.png
new file mode 100644
index 0000000..fe5de82
Binary files /dev/null and b/data/icons/hicolor_status_22x22_user-offline.png differ
diff --git a/data/icons/hicolor_status_24x24_empathy-available.png b/data/icons/hicolor_status_24x24_empathy-available.png
deleted file mode 100644
index 95f2534..0000000
Binary files a/data/icons/hicolor_status_24x24_empathy-available.png and /dev/null differ
diff --git a/data/icons/hicolor_status_24x24_empathy-away.png b/data/icons/hicolor_status_24x24_empathy-away.png
deleted file mode 100644
index 3a7e01f..0000000
Binary files a/data/icons/hicolor_status_24x24_empathy-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_24x24_empathy-busy.png b/data/icons/hicolor_status_24x24_empathy-busy.png
deleted file mode 100644
index 7e5dced..0000000
Binary files a/data/icons/hicolor_status_24x24_empathy-busy.png and /dev/null differ
diff --git a/data/icons/hicolor_status_24x24_empathy-extended-away.png b/data/icons/hicolor_status_24x24_empathy-extended-away.png
deleted file mode 100644
index 968472e..0000000
Binary files a/data/icons/hicolor_status_24x24_empathy-extended-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_24x24_empathy-offline.png b/data/icons/hicolor_status_24x24_empathy-offline.png
deleted file mode 100644
index bdfc885..0000000
Binary files a/data/icons/hicolor_status_24x24_empathy-offline.png and /dev/null differ
diff --git a/data/icons/hicolor_status_24x24_user-available.png b/data/icons/hicolor_status_24x24_user-available.png
new file mode 100644
index 0000000..95f2534
Binary files /dev/null and b/data/icons/hicolor_status_24x24_user-available.png differ
diff --git a/data/icons/hicolor_status_24x24_user-away.png b/data/icons/hicolor_status_24x24_user-away.png
new file mode 100644
index 0000000..3a7e01f
Binary files /dev/null and b/data/icons/hicolor_status_24x24_user-away.png differ
diff --git a/data/icons/hicolor_status_24x24_user-busy.png b/data/icons/hicolor_status_24x24_user-busy.png
new file mode 100644
index 0000000..7e5dced
Binary files /dev/null and b/data/icons/hicolor_status_24x24_user-busy.png differ
diff --git a/data/icons/hicolor_status_24x24_user-idle.png b/data/icons/hicolor_status_24x24_user-idle.png
new file mode 100644
index 0000000..968472e
Binary files /dev/null and b/data/icons/hicolor_status_24x24_user-idle.png differ
diff --git a/data/icons/hicolor_status_24x24_user-offline.png b/data/icons/hicolor_status_24x24_user-offline.png
new file mode 100644
index 0000000..bdfc885
Binary files /dev/null and b/data/icons/hicolor_status_24x24_user-offline.png differ
diff --git a/data/icons/hicolor_status_32x32_empathy-available.png b/data/icons/hicolor_status_32x32_empathy-available.png
deleted file mode 100644
index 5d04e0a..0000000
Binary files a/data/icons/hicolor_status_32x32_empathy-available.png and /dev/null differ
diff --git a/data/icons/hicolor_status_32x32_empathy-away.png b/data/icons/hicolor_status_32x32_empathy-away.png
deleted file mode 100644
index 712f68a..0000000
Binary files a/data/icons/hicolor_status_32x32_empathy-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_32x32_empathy-busy.png b/data/icons/hicolor_status_32x32_empathy-busy.png
deleted file mode 100644
index be1280e..0000000
Binary files a/data/icons/hicolor_status_32x32_empathy-busy.png and /dev/null differ
diff --git a/data/icons/hicolor_status_32x32_empathy-extended-away.png b/data/icons/hicolor_status_32x32_empathy-extended-away.png
deleted file mode 100644
index cf7ff2d..0000000
Binary files a/data/icons/hicolor_status_32x32_empathy-extended-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_32x32_empathy-offline.png b/data/icons/hicolor_status_32x32_empathy-offline.png
deleted file mode 100644
index 3c4d664..0000000
Binary files a/data/icons/hicolor_status_32x32_empathy-offline.png and /dev/null differ
diff --git a/data/icons/hicolor_status_32x32_user-available.png b/data/icons/hicolor_status_32x32_user-available.png
new file mode 100644
index 0000000..5d04e0a
Binary files /dev/null and b/data/icons/hicolor_status_32x32_user-available.png differ
diff --git a/data/icons/hicolor_status_32x32_user-away.png b/data/icons/hicolor_status_32x32_user-away.png
new file mode 100644
index 0000000..712f68a
Binary files /dev/null and b/data/icons/hicolor_status_32x32_user-away.png differ
diff --git a/data/icons/hicolor_status_32x32_user-busy.png b/data/icons/hicolor_status_32x32_user-busy.png
new file mode 100644
index 0000000..be1280e
Binary files /dev/null and b/data/icons/hicolor_status_32x32_user-busy.png differ
diff --git a/data/icons/hicolor_status_32x32_user-idle.png b/data/icons/hicolor_status_32x32_user-idle.png
new file mode 100644
index 0000000..cf7ff2d
Binary files /dev/null and b/data/icons/hicolor_status_32x32_user-idle.png differ
diff --git a/data/icons/hicolor_status_32x32_user-offline.png b/data/icons/hicolor_status_32x32_user-offline.png
new file mode 100644
index 0000000..3c4d664
Binary files /dev/null and b/data/icons/hicolor_status_32x32_user-offline.png differ
diff --git a/data/icons/hicolor_status_48x48_empathy-available.png b/data/icons/hicolor_status_48x48_empathy-available.png
deleted file mode 100644
index 5bcae55..0000000
Binary files a/data/icons/hicolor_status_48x48_empathy-available.png and /dev/null differ
diff --git a/data/icons/hicolor_status_48x48_empathy-away.png b/data/icons/hicolor_status_48x48_empathy-away.png
deleted file mode 100644
index f9d7aee..0000000
Binary files a/data/icons/hicolor_status_48x48_empathy-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_48x48_empathy-busy.png b/data/icons/hicolor_status_48x48_empathy-busy.png
deleted file mode 100644
index b6c60c9..0000000
Binary files a/data/icons/hicolor_status_48x48_empathy-busy.png and /dev/null differ
diff --git a/data/icons/hicolor_status_48x48_empathy-extended-away.png b/data/icons/hicolor_status_48x48_empathy-extended-away.png
deleted file mode 100644
index 3ca50e5..0000000
Binary files a/data/icons/hicolor_status_48x48_empathy-extended-away.png and /dev/null differ
diff --git a/data/icons/hicolor_status_48x48_empathy-offline.png b/data/icons/hicolor_status_48x48_empathy-offline.png
deleted file mode 100644
index b65080b..0000000
Binary files a/data/icons/hicolor_status_48x48_empathy-offline.png and /dev/null differ
diff --git a/data/icons/hicolor_status_48x48_user-available.png b/data/icons/hicolor_status_48x48_user-available.png
new file mode 100644
index 0000000..5bcae55
Binary files /dev/null and b/data/icons/hicolor_status_48x48_user-available.png differ
diff --git a/data/icons/hicolor_status_48x48_user-away.png b/data/icons/hicolor_status_48x48_user-away.png
new file mode 100644
index 0000000..f9d7aee
Binary files /dev/null and b/data/icons/hicolor_status_48x48_user-away.png differ
diff --git a/data/icons/hicolor_status_48x48_user-busy.png b/data/icons/hicolor_status_48x48_user-busy.png
new file mode 100644
index 0000000..b6c60c9
Binary files /dev/null and b/data/icons/hicolor_status_48x48_user-busy.png differ
diff --git a/data/icons/hicolor_status_48x48_user-idle.png b/data/icons/hicolor_status_48x48_user-idle.png
new file mode 100644
index 0000000..3ca50e5
Binary files /dev/null and b/data/icons/hicolor_status_48x48_user-idle.png differ
diff --git a/data/icons/hicolor_status_48x48_user-offline.png b/data/icons/hicolor_status_48x48_user-offline.png
new file mode 100644
index 0000000..b65080b
Binary files /dev/null and b/data/icons/hicolor_status_48x48_user-offline.png differ
diff --git a/data/icons/hicolor_status_scalable_empathy-available.svg b/data/icons/hicolor_status_scalable_empathy-available.svg
deleted file mode 100644
index 8d4cc58..0000000
--- a/data/icons/hicolor_status_scalable_empathy-available.svg
+++ /dev/null
@@ -1,104 +0,0 @@
-<?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="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-avaible.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-avaible.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs4910">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5899">
-      <stop
-         style="stop-color:#7fe719;stop-opacity:1"
-         offset="0"
-         id="stop5901" />
-      <stop
-         style="stop-color:#67bc13;stop-opacity:1"
-         offset="1"
-         id="stop5903" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5899"
-       id="radialGradient5905"
-       cx="9.466115"
-       cy="8.9839392"
-       fx="9.466115"
-       fy="8.9839392"
-       r="6.7474474"
-       gradientTransform="matrix(1.1671849,-3.2679277e-3,2.7524467e-3,1.0150183,-1.6222549,-0.2024225)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="14.452639"
-     inkscape:cy="6.4458104"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata4913">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5905);fill-opacity:1;stroke:#376e01;stroke-width:0.97113216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4926"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(1.0380267,0,0,1.0214918,-0.2769783,0.1118841)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.14770162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5897"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(0.8783303,0,0,0.8643392,0.996403,1.3254404)" />
-  </g>
-</svg>
diff --git a/data/icons/hicolor_status_scalable_empathy-away.svg b/data/icons/hicolor_status_scalable_empathy-away.svg
deleted file mode 100644
index 7e7b0ed..0000000
--- a/data/icons/hicolor_status_scalable_empathy-away.svg
+++ /dev/null
@@ -1,93 +0,0 @@
-<?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="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-away.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-away.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs4910">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5917">
-      <stop
-         style="stop-color:#f80000;stop-opacity:1"
-         offset="0"
-         id="stop5919" />
-      <stop
-         style="stop-color:#e70000;stop-opacity:1"
-         offset="1"
-         id="stop5921" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5917"
-       id="linearGradient5923"
-       x1="6.5096536"
-       y1="8.5893564"
-       x2="9.9108915"
-       y2="11.540099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.9925682,6.043956e-8,1.1147803e-2)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.627417"
-     inkscape:cx="13.206814"
-     inkscape:cy="4.0564985"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata4913">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient5923);fill-opacity:1;fill-rule:evenodd;stroke:#8a0000;stroke-width:0.99999988px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 1.5,13.5 L 14.499999,13.5 L 7.9789933,1.4999999 L 1.5,13.5 z "
-       id="path4944"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 3.2186016,12.488535 L 12.832121,12.488535 L 8.0098272,3.5671249 L 3.2186016,12.488535 z "
-       id="path4946"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/data/icons/hicolor_status_scalable_empathy-busy.svg b/data/icons/hicolor_status_scalable_empathy-busy.svg
deleted file mode 100644
index 66fc709..0000000
--- a/data/icons/hicolor_status_scalable_empathy-busy.svg
+++ /dev/null
@@ -1,140 +0,0 @@
-<?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="svg6941"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-busy.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-busy.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs6943">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5899">
-      <stop
-         style="stop-color:#fce94f;stop-opacity:1"
-         offset="0"
-         id="stop5901" />
-      <stop
-         style="stop-color:#edd400;stop-opacity:1"
-         offset="1"
-         id="stop5903" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5899"
-       id="radialGradient5905"
-       cx="9.466115"
-       cy="8.9839392"
-       fx="9.466115"
-       fy="8.9839392"
-       r="6.7474474"
-       gradientTransform="matrix(1.1671849,-3.2679277e-3,2.7524467e-3,1.0150183,-1.6222549,-0.2024225)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="15.696217"
-     inkscape:cx="17.665904"
-     inkscape:cy="9.7718474"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata6946">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:url(#radialGradient5905);fill-opacity:1;stroke:#8d7300;stroke-width:0.97113222;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4926"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(1.0380267,0,0,1.0214918,-0.2769782,0.1118841)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.6;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.14770162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5897"
-       sodipodi:cx="7.9737625"
-       sodipodi:cy="7.7221532"
-       sodipodi:rx="6.2618814"
-       sodipodi:ry="6.3632426"
-       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
-       transform="matrix(0.8783303,0,0,0.8643392,0.996403,1.3254404)" />
-    <rect
-       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5886"
-       width="9.000001"
-       height="9"
-       x="5.5"
-       y="5.5"
-       rx="0"
-       ry="0" />
-    <rect
-       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5969"
-       width="7"
-       height="7"
-       x="6.5"
-       y="6.5"
-       rx="0"
-       ry="0" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#8d7300;fill-opacity:1;stroke:none;stroke-width:1.46393549;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5888"
-       sodipodi:cx="10.676733"
-       sodipodi:cy="7.8460393"
-       sodipodi:rx="1.4415842"
-       sodipodi:ry="1.4866337"
-       d="M 12.118317 7.8460393 A 1.4415842 1.4866337 0 1 1  9.2351488,7.8460393 A 1.4415842 1.4866337 0 1 1  12.118317 7.8460393 z"
-       transform="matrix(0.6936814,0,0,0.6726606,2.5937487,2.7222784)" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.4772272,10.5 L 11.522773,10.5"
-       id="path5883" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 7.4872926,12.5 L 11.524094,12.5"
-       id="path5885" />
-  </g>
-</svg>
diff --git a/data/icons/hicolor_status_scalable_empathy-extended-away.svg b/data/icons/hicolor_status_scalable_empathy-extended-away.svg
deleted file mode 100644
index 3104dff..0000000
--- a/data/icons/hicolor_status_scalable_empathy-extended-away.svg
+++ /dev/null
@@ -1,120 +0,0 @@
-<?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="svg4908"
-   sodipodi:version="0.32"
-   inkscape:version="0.44"
-   sodipodi:docbase="/home/martyn/Desktop/16x16"
-   sodipodi:docname="status-away-extended.svg"
-   inkscape:export-filename="/home/martyn/Desktop/16x16/status-away-extended.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <defs
-     id="defs4910">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5917">
-      <stop
-         style="stop-color:#d80000;stop-opacity:1"
-         offset="0"
-         id="stop5919" />
-      <stop
-         style="stop-color:#ca0000;stop-opacity:1"
-         offset="1"
-         id="stop5921" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5917"
-       id="linearGradient5923"
-       x1="6.5096536"
-       y1="8.5893564"
-       x2="9.9108915"
-       y2="11.540099"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.1538462,0,0,1.0752822,-1.2307693,-0.1129232)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="42.866662"
-     inkscape:cx="8.0000008"
-     inkscape:cy="7.4533429"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1323"
-     inkscape:window-height="987"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata4913">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:url(#linearGradient5923);fill-opacity:1;fill-rule:evenodd;stroke:#8a0000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 0.5,14.5 L 15.5,14.5 L 7.975762,1.5 L 0.5,14.5 z "
-       id="path4944"
-       sodipodi:nodetypes="cccc" />
-    <path
-       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 2.2790289,13.5 L 13.779497,13.5 L 8.0106803,3.5000001 L 2.2790289,13.5 z "
-       id="path4946"
-       sodipodi:nodetypes="cccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:#ffe680;fill-opacity:1;stroke:#555753;stroke-width:0.8123197;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path4911"
-       sodipodi:cx="11.09375"
-       sodipodi:cy="11.890625"
-       sodipodi:rx="4.53125"
-       sodipodi:ry="3.640625"
-       d="M 15.625 11.890625 A 4.53125 3.640625 0 1 1  6.5625,11.890625 A 4.53125 3.640625 0 1 1  15.625 11.890625 z"
-       transform="matrix(0.983072,0,0,1.223563,-1.005946,-3.448939)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;fill:none;fill-opacity:1;stroke:white;stroke-width:1.01539958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path5882"
-       sodipodi:cx="11.09375"
-       sodipodi:cy="11.890625"
-       sodipodi:rx="4.53125"
-       sodipodi:ry="3.640625"
-       d="M 15.625 11.890625 A 4.53125 3.640625 0 1 1  6.5625,11.890625 A 4.53125 3.640625 0 1 1  15.625 11.890625 z"
-       transform="matrix(0.786458,0,0,0.978852,1.175241,-0.539149)" />
-    <path
-       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.91149789px;stroke-linecap:round;stroke-linejoin:round;marker-mid:none;stroke-opacity:1"
-       d="M 10.027723,8.0394381 L 10.027723,11.229682 L 6.8944493,11.229682"
-       id="path5884" />
-    <path
-       style="opacity:0.33695655;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 5.8909083,11.545458 C 9.3617367,11.656825 9.9649551,9.8471677 13.714194,9.8750085 C 13.073853,8.0931929 11.598288,7.100202 9.8999937,7.0909217 C 8.1738593,7.0816413 5.9187492,8.9469795 5.8909083,11.545458 z "
-       id="path5886"
-       sodipodi:nodetypes="cczc" />
-  </g>
-</svg>
diff --git a/data/icons/hicolor_status_scalable_empathy-offline.svg b/data/icons/hicolor_status_scalable_empathy-offline.svg
deleted file mode 100644
index 975f7dc..0000000
--- a/data/icons/hicolor_status_scalable_empathy-offline.svg
+++ /dev/null
@@ -1,101 +0,0 @@
-<?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="svg6941"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/andreas/project/gossip/16x16"
-   sodipodi:docname="status-offline.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-offline.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs6943">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7922">
-      <stop
-         style="stop-color:#e8e8e6;stop-opacity:1"
-         offset="0"
-         id="stop7924" />
-      <stop
-         style="stop-color:#babdb6;stop-opacity:1"
-         offset="1"
-         id="stop7926" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7922"
-       id="linearGradient7928"
-       x1="0.67574239"
-       y1="0.81831664"
-       x2="9.8658419"
-       y2="10.594059"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.8666667,0,0,0.8666667,1.0666667,1.0666666)" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="22.197802"
-     inkscape:cx="15.038145"
-     inkscape:cy="7.8865336"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1674"
-     inkscape:window-height="969"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata6946">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="opacity:1;fill:url(#linearGradient7928);fill-opacity:1;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect6949"
-       width="13"
-       height="13"
-       x="1.5"
-       y="1.4999999"
-       rx="1.4641089"
-       ry="1.4641089" />
-    <rect
-       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect7920"
-       width="11"
-       height="11"
-       x="2.5"
-       y="2.5"
-       rx="0.45049509"
-       ry="0.45049506" />
-  </g>
-</svg>
diff --git a/data/icons/hicolor_status_scalable_user-available.svg b/data/icons/hicolor_status_scalable_user-available.svg
new file mode 100644
index 0000000..8d4cc58
--- /dev/null
+++ b/data/icons/hicolor_status_scalable_user-available.svg
@@ -0,0 +1,104 @@
+<?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="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   sodipodi:docbase="/home/andreas/project/gossip/16x16"
+   sodipodi:docname="status-avaible.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-avaible.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:modified="true">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5899">
+      <stop
+         style="stop-color:#7fe719;stop-opacity:1"
+         offset="0"
+         id="stop5901" />
+      <stop
+         style="stop-color:#67bc13;stop-opacity:1"
+         offset="1"
+         id="stop5903" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5899"
+       id="radialGradient5905"
+       cx="9.466115"
+       cy="8.9839392"
+       fx="9.466115"
+       fy="8.9839392"
+       r="6.7474474"
+       gradientTransform="matrix(1.1671849,-3.2679277e-3,2.7524467e-3,1.0150183,-1.6222549,-0.2024225)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="14.452639"
+     inkscape:cy="6.4458104"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1674"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient5905);fill-opacity:1;stroke:#376e01;stroke-width:0.97113216;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4926"
+       sodipodi:cx="7.9737625"
+       sodipodi:cy="7.7221532"
+       sodipodi:rx="6.2618814"
+       sodipodi:ry="6.3632426"
+       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
+       transform="matrix(1.0380267,0,0,1.0214918,-0.2769783,0.1118841)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.14770162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5897"
+       sodipodi:cx="7.9737625"
+       sodipodi:cy="7.7221532"
+       sodipodi:rx="6.2618814"
+       sodipodi:ry="6.3632426"
+       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
+       transform="matrix(0.8783303,0,0,0.8643392,0.996403,1.3254404)" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor_status_scalable_user-away.svg b/data/icons/hicolor_status_scalable_user-away.svg
new file mode 100644
index 0000000..7e7b0ed
--- /dev/null
+++ b/data/icons/hicolor_status_scalable_user-away.svg
@@ -0,0 +1,93 @@
+<?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="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   sodipodi:docbase="/home/andreas/project/gossip/16x16"
+   sodipodi:docname="status-away.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-away.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:modified="true">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5917">
+      <stop
+         style="stop-color:#f80000;stop-opacity:1"
+         offset="0"
+         id="stop5919" />
+      <stop
+         style="stop-color:#e70000;stop-opacity:1"
+         offset="1"
+         id="stop5921" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5917"
+       id="linearGradient5923"
+       x1="6.5096536"
+       y1="8.5893564"
+       x2="9.9108915"
+       y2="11.540099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1,0,0,0.9925682,6.043956e-8,1.1147803e-2)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.627417"
+     inkscape:cx="13.206814"
+     inkscape:cy="4.0564985"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1674"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:url(#linearGradient5923);fill-opacity:1;fill-rule:evenodd;stroke:#8a0000;stroke-width:0.99999988px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 1.5,13.5 L 14.499999,13.5 L 7.9789933,1.4999999 L 1.5,13.5 z "
+       id="path4944"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 3.2186016,12.488535 L 12.832121,12.488535 L 8.0098272,3.5671249 L 3.2186016,12.488535 z "
+       id="path4946"
+       sodipodi:nodetypes="cccc" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor_status_scalable_user-busy.svg b/data/icons/hicolor_status_scalable_user-busy.svg
new file mode 100644
index 0000000..66fc709
--- /dev/null
+++ b/data/icons/hicolor_status_scalable_user-busy.svg
@@ -0,0 +1,140 @@
+<?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="svg6941"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   sodipodi:docbase="/home/andreas/project/gossip/16x16"
+   sodipodi:docname="status-busy.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-busy.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:modified="true">
+  <defs
+     id="defs6943">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5899">
+      <stop
+         style="stop-color:#fce94f;stop-opacity:1"
+         offset="0"
+         id="stop5901" />
+      <stop
+         style="stop-color:#edd400;stop-opacity:1"
+         offset="1"
+         id="stop5903" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5899"
+       id="radialGradient5905"
+       cx="9.466115"
+       cy="8.9839392"
+       fx="9.466115"
+       fy="8.9839392"
+       r="6.7474474"
+       gradientTransform="matrix(1.1671849,-3.2679277e-3,2.7524467e-3,1.0150183,-1.6222549,-0.2024225)"
+       gradientUnits="userSpaceOnUse" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="15.696217"
+     inkscape:cx="17.665904"
+     inkscape:cy="9.7718474"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1674"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata6946">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:url(#radialGradient5905);fill-opacity:1;stroke:#8d7300;stroke-width:0.97113222;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4926"
+       sodipodi:cx="7.9737625"
+       sodipodi:cy="7.7221532"
+       sodipodi:rx="6.2618814"
+       sodipodi:ry="6.3632426"
+       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
+       transform="matrix(1.0380267,0,0,1.0214918,-0.2769782,0.1118841)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:0.6;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1.14770162;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5897"
+       sodipodi:cx="7.9737625"
+       sodipodi:cy="7.7221532"
+       sodipodi:rx="6.2618814"
+       sodipodi:ry="6.3632426"
+       d="M 14.235644 7.7221532 A 6.2618814 6.3632426 0 1 1  1.7118812,7.7221532 A 6.2618814 6.3632426 0 1 1  14.235644 7.7221532 z"
+       transform="matrix(0.8783303,0,0,0.8643392,0.996403,1.3254404)" />
+    <rect
+       style="opacity:1;fill:#eeeeec;fill-opacity:1;stroke:#888a85;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5886"
+       width="9.000001"
+       height="9"
+       x="5.5"
+       y="5.5"
+       rx="0"
+       ry="0" />
+    <rect
+       style="opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect5969"
+       width="7"
+       height="7"
+       x="6.5"
+       y="6.5"
+       rx="0"
+       ry="0" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#8d7300;fill-opacity:1;stroke:none;stroke-width:1.46393549;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5888"
+       sodipodi:cx="10.676733"
+       sodipodi:cy="7.8460393"
+       sodipodi:rx="1.4415842"
+       sodipodi:ry="1.4866337"
+       d="M 12.118317 7.8460393 A 1.4415842 1.4866337 0 1 1  9.2351488,7.8460393 A 1.4415842 1.4866337 0 1 1  12.118317 7.8460393 z"
+       transform="matrix(0.6936814,0,0,0.6726606,2.5937487,2.7222784)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.4772272,10.5 L 11.522773,10.5"
+       id="path5883" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:1px;stroke-linecap:round;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 7.4872926,12.5 L 11.524094,12.5"
+       id="path5885" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor_status_scalable_user-idle.svg b/data/icons/hicolor_status_scalable_user-idle.svg
new file mode 100644
index 0000000..3104dff
--- /dev/null
+++ b/data/icons/hicolor_status_scalable_user-idle.svg
@@ -0,0 +1,120 @@
+<?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="svg4908"
+   sodipodi:version="0.32"
+   inkscape:version="0.44"
+   sodipodi:docbase="/home/martyn/Desktop/16x16"
+   sodipodi:docname="status-away-extended.svg"
+   inkscape:export-filename="/home/martyn/Desktop/16x16/status-away-extended.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90">
+  <defs
+     id="defs4910">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient5917">
+      <stop
+         style="stop-color:#d80000;stop-opacity:1"
+         offset="0"
+         id="stop5919" />
+      <stop
+         style="stop-color:#ca0000;stop-opacity:1"
+         offset="1"
+         id="stop5921" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient5917"
+       id="linearGradient5923"
+       x1="6.5096536"
+       y1="8.5893564"
+       x2="9.9108915"
+       y2="11.540099"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(1.1538462,0,0,1.0752822,-1.2307693,-0.1129232)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="42.866662"
+     inkscape:cx="8.0000008"
+     inkscape:cy="7.4533429"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1323"
+     inkscape:window-height="987"
+     inkscape:window-x="0"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata4913">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <path
+       style="fill:url(#linearGradient5923);fill-opacity:1;fill-rule:evenodd;stroke:#8a0000;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
+       d="M 0.5,14.5 L 15.5,14.5 L 7.975762,1.5 L 0.5,14.5 z "
+       id="path4944"
+       sodipodi:nodetypes="cccc" />
+    <path
+       style="opacity:0.3;fill:none;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 2.2790289,13.5 L 13.779497,13.5 L 8.0106803,3.5000001 L 2.2790289,13.5 z "
+       id="path4946"
+       sodipodi:nodetypes="cccc" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:#ffe680;fill-opacity:1;stroke:#555753;stroke-width:0.8123197;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path4911"
+       sodipodi:cx="11.09375"
+       sodipodi:cy="11.890625"
+       sodipodi:rx="4.53125"
+       sodipodi:ry="3.640625"
+       d="M 15.625 11.890625 A 4.53125 3.640625 0 1 1  6.5625,11.890625 A 4.53125 3.640625 0 1 1  15.625 11.890625 z"
+       transform="matrix(0.983072,0,0,1.223563,-1.005946,-3.448939)" />
+    <path
+       sodipodi:type="arc"
+       style="opacity:1;fill:none;fill-opacity:1;stroke:white;stroke-width:1.01539958;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="path5882"
+       sodipodi:cx="11.09375"
+       sodipodi:cy="11.890625"
+       sodipodi:rx="4.53125"
+       sodipodi:ry="3.640625"
+       d="M 15.625 11.890625 A 4.53125 3.640625 0 1 1  6.5625,11.890625 A 4.53125 3.640625 0 1 1  15.625 11.890625 z"
+       transform="matrix(0.786458,0,0,0.978852,1.175241,-0.539149)" />
+    <path
+       style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:0.91149789px;stroke-linecap:round;stroke-linejoin:round;marker-mid:none;stroke-opacity:1"
+       d="M 10.027723,8.0394381 L 10.027723,11.229682 L 6.8944493,11.229682"
+       id="path5884" />
+    <path
+       style="opacity:0.33695655;fill:white;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+       d="M 5.8909083,11.545458 C 9.3617367,11.656825 9.9649551,9.8471677 13.714194,9.8750085 C 13.073853,8.0931929 11.598288,7.100202 9.8999937,7.0909217 C 8.1738593,7.0816413 5.9187492,8.9469795 5.8909083,11.545458 z "
+       id="path5886"
+       sodipodi:nodetypes="cczc" />
+  </g>
+</svg>
diff --git a/data/icons/hicolor_status_scalable_user-offline.svg b/data/icons/hicolor_status_scalable_user-offline.svg
new file mode 100644
index 0000000..975f7dc
--- /dev/null
+++ b/data/icons/hicolor_status_scalable_user-offline.svg
@@ -0,0 +1,101 @@
+<?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="svg6941"
+   sodipodi:version="0.32"
+   inkscape:version="0.44+devel"
+   sodipodi:docbase="/home/andreas/project/gossip/16x16"
+   sodipodi:docname="status-offline.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   inkscape:export-filename="/home/andreas/project/gossip/16x16/status-offline.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   sodipodi:modified="true">
+  <defs
+     id="defs6943">
+    <linearGradient
+       inkscape:collect="always"
+       id="linearGradient7922">
+      <stop
+         style="stop-color:#e8e8e6;stop-opacity:1"
+         offset="0"
+         id="stop7924" />
+      <stop
+         style="stop-color:#babdb6;stop-opacity:1"
+         offset="1"
+         id="stop7926" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7922"
+       id="linearGradient7928"
+       x1="0.67574239"
+       y1="0.81831664"
+       x2="9.8658419"
+       y2="10.594059"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.8666667,0,0,0.8666667,1.0666667,1.0666666)" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="22.197802"
+     inkscape:cx="15.038145"
+     inkscape:cy="7.8865336"
+     inkscape:current-layer="layer1"
+     showgrid="false"
+     inkscape:grid-bbox="true"
+     inkscape:document-units="px"
+     inkscape:window-width="1674"
+     inkscape:window-height="969"
+     inkscape:window-x="0"
+     inkscape:window-y="26" />
+  <metadata
+     id="metadata6946">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer">
+    <rect
+       style="opacity:1;fill:url(#linearGradient7928);fill-opacity:1;stroke:#555753;stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect6949"
+       width="13"
+       height="13"
+       x="1.5"
+       y="1.4999999"
+       rx="1.4641089"
+       ry="1.4641089" />
+    <rect
+       style="opacity:0.4;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
+       id="rect7920"
+       width="11"
+       height="11"
+       x="2.5"
+       y="2.5"
+       rx="0.45049509"
+       ry="0.45049506" />
+  </g>
+</svg>
diff --git a/libempathy-gtk/empathy-images.h b/libempathy-gtk/empathy-images.h
index c714f04..d5fa536 100644
--- a/libempathy-gtk/empathy-images.h
+++ b/libempathy-gtk/empathy-images.h
@@ -24,12 +24,14 @@
 
 G_BEGIN_DECLS
 
-#define EMPATHY_IMAGE_OFFLINE             "empathy-offline"
-#define EMPATHY_IMAGE_HIDDEN              "empathy-offline"
-#define EMPATHY_IMAGE_AVAILABLE           "empathy-available"
-#define EMPATHY_IMAGE_BUSY                "empathy-busy"
-#define EMPATHY_IMAGE_AWAY                "empathy-away"
-#define EMPATHY_IMAGE_EXT_AWAY            "empathy-extended-away"
+#define EMPATHY_IMAGE_OFFLINE             "user-offline"
+/* user-invisible is not (yet?) in the naming spec but already implemented by
+ * some theme */
+#define EMPATHY_IMAGE_HIDDEN              "user-invisible"
+#define EMPATHY_IMAGE_AVAILABLE           "user-available"
+#define EMPATHY_IMAGE_BUSY                "user-busy"
+#define EMPATHY_IMAGE_AWAY                "user-away"
+#define EMPATHY_IMAGE_EXT_AWAY            "user-idle"
 #define EMPATHY_IMAGE_UNKNOWN             "empathy-pending"
 
 #define EMPATHY_IMAGE_MESSAGE             "im-message"
diff --git a/libempathy-gtk/empathy-ui-utils.c b/libempathy-gtk/empathy-ui-utils.c
index ef7ff78..fb72fd1 100644
--- a/libempathy-gtk/empathy-ui-utils.c
+++ b/libempathy-gtk/empathy-ui-utils.c
@@ -183,7 +183,13 @@ empathy_icon_name_for_presence (TpConnectionPresenceType presence)
 	case TP_CONNECTION_PRESENCE_TYPE_EXTENDED_AWAY:
 		return EMPATHY_IMAGE_EXT_AWAY;
 	case TP_CONNECTION_PRESENCE_TYPE_HIDDEN:
-		return EMPATHY_IMAGE_HIDDEN;
+		if (gtk_icon_theme_has_icon (gtk_icon_theme_get_default (),
+					     EMPATHY_IMAGE_HIDDEN))
+			return EMPATHY_IMAGE_HIDDEN;
+
+		/* The 'hidden' icon is not an official one so we fallback to offline if
+		 * it's not implemented */
+		return EMPATHY_IMAGE_OFFLINE;
 	case TP_CONNECTION_PRESENCE_TYPE_OFFLINE:
 	case TP_CONNECTION_PRESENCE_TYPE_ERROR:
 	case TP_CONNECTION_PRESENCE_TYPE_UNKNOWN:
