31 files changed, 30 insertions, 30 deletions

diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
index a579544dc..436d13675 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_user-available.png
index 5435e02d5..5435e02d5 100644
--- a/data/icons/hicolor_status_16x16_empathy-available.png
+++ b/data/icons/hicolor_status_16x16_user-available.png
diff --git a/data/icons/hicolor_status_16x16_empathy-away.png b/data/icons/hicolor_status_16x16_user-away.png
index 7576a611f..7576a611f 100644
--- a/data/icons/hicolor_status_16x16_empathy-away.png
+++ b/data/icons/hicolor_status_16x16_user-away.png
diff --git a/data/icons/hicolor_status_16x16_empathy-busy.png b/data/icons/hicolor_status_16x16_user-busy.png
index 90eab6077..90eab6077 100644
--- a/data/icons/hicolor_status_16x16_empathy-busy.png
+++ b/data/icons/hicolor_status_16x16_user-busy.png
diff --git a/data/icons/hicolor_status_16x16_empathy-extended-away.png b/data/icons/hicolor_status_16x16_user-idle.png
index 9dec477e1..9dec477e1 100644
--- a/data/icons/hicolor_status_16x16_empathy-extended-away.png
+++ b/data/icons/hicolor_status_16x16_user-idle.png
diff --git a/data/icons/hicolor_status_16x16_empathy-offline.png b/data/icons/hicolor_status_16x16_user-offline.png
index 637be12cb..637be12cb 100644
--- a/data/icons/hicolor_status_16x16_empathy-offline.png
+++ b/data/icons/hicolor_status_16x16_user-offline.png
diff --git a/data/icons/hicolor_status_22x22_empathy-available.png b/data/icons/hicolor_status_22x22_user-available.png
index ec8c4522b..ec8c4522b 100644
--- a/data/icons/hicolor_status_22x22_empathy-available.png
+++ b/data/icons/hicolor_status_22x22_user-available.png
diff --git a/data/icons/hicolor_status_22x22_empathy-away.png b/data/icons/hicolor_status_22x22_user-away.png
index 6c068f2d4..6c068f2d4 100644
--- a/data/icons/hicolor_status_22x22_empathy-away.png
+++ b/data/icons/hicolor_status_22x22_user-away.png
diff --git a/data/icons/hicolor_status_22x22_empathy-busy.png b/data/icons/hicolor_status_22x22_user-busy.png
index 0fe61fd23..0fe61fd23 100644
--- a/data/icons/hicolor_status_22x22_empathy-busy.png
+++ b/data/icons/hicolor_status_22x22_user-busy.png
diff --git a/data/icons/hicolor_status_22x22_empathy-extended-away.png b/data/icons/hicolor_status_22x22_user-idle.png
index 72c5b1985..72c5b1985 100644
--- a/data/icons/hicolor_status_22x22_empathy-extended-away.png
+++ b/data/icons/hicolor_status_22x22_user-idle.png
diff --git a/data/icons/hicolor_status_22x22_empathy-offline.png b/data/icons/hicolor_status_22x22_user-offline.png
index fe5de8288..fe5de8288 100644
--- a/data/icons/hicolor_status_22x22_empathy-offline.png
+++ b/data/icons/hicolor_status_22x22_user-offline.png
diff --git a/data/icons/hicolor_status_24x24_empathy-available.png b/data/icons/hicolor_status_24x24_user-available.png
index 95f25345a..95f25345a 100644
--- a/data/icons/hicolor_status_24x24_empathy-available.png
+++ b/data/icons/hicolor_status_24x24_user-available.png
diff --git a/data/icons/hicolor_status_24x24_empathy-away.png b/data/icons/hicolor_status_24x24_user-away.png
index 3a7e01f16..3a7e01f16 100644
--- a/data/icons/hicolor_status_24x24_empathy-away.png
+++ b/data/icons/hicolor_status_24x24_user-away.png
diff --git a/data/icons/hicolor_status_24x24_empathy-busy.png b/data/icons/hicolor_status_24x24_user-busy.png
index 7e5dced26..7e5dced26 100644
--- a/data/icons/hicolor_status_24x24_empathy-busy.png
+++ b/data/icons/hicolor_status_24x24_user-busy.png
diff --git a/data/icons/hicolor_status_24x24_empathy-extended-away.png b/data/icons/hicolor_status_24x24_user-idle.png
index 968472e74..968472e74 100644
--- a/data/icons/hicolor_status_24x24_empathy-extended-away.png
+++ b/data/icons/hicolor_status_24x24_user-idle.png
diff --git a/data/icons/hicolor_status_24x24_empathy-offline.png b/data/icons/hicolor_status_24x24_user-offline.png
index bdfc8855b..bdfc8855b 100644
--- a/data/icons/hicolor_status_24x24_empathy-offline.png
+++ b/data/icons/hicolor_status_24x24_user-offline.png
diff --git a/data/icons/hicolor_status_32x32_empathy-available.png b/data/icons/hicolor_status_32x32_user-available.png
index 5d04e0a23..5d04e0a23 100644
--- a/data/icons/hicolor_status_32x32_empathy-available.png
+++ b/data/icons/hicolor_status_32x32_user-available.png
diff --git a/data/icons/hicolor_status_32x32_empathy-away.png b/data/icons/hicolor_status_32x32_user-away.png
index 712f68aea..712f68aea 100644
--- a/data/icons/hicolor_status_32x32_empathy-away.png
+++ b/data/icons/hicolor_status_32x32_user-away.png
diff --git a/data/icons/hicolor_status_32x32_empathy-busy.png b/data/icons/hicolor_status_32x32_user-busy.png
index be1280e75..be1280e75 100644
--- a/data/icons/hicolor_status_32x32_empathy-busy.png
+++ b/data/icons/hicolor_status_32x32_user-busy.png
diff --git a/data/icons/hicolor_status_32x32_empathy-extended-away.png b/data/icons/hicolor_status_32x32_user-idle.png
index cf7ff2db7..cf7ff2db7 100644
--- a/data/icons/hicolor_status_32x32_empathy-extended-away.png
+++ b/data/icons/hicolor_status_32x32_user-idle.png
diff --git a/data/icons/hicolor_status_32x32_empathy-offline.png b/data/icons/hicolor_status_32x32_user-offline.png
index 3c4d664f2..3c4d664f2 100644
--- a/data/icons/hicolor_status_32x32_empathy-offline.png
+++ b/data/icons/hicolor_status_32x32_user-offline.png
diff --git a/data/icons/hicolor_status_48x48_empathy-available.png b/data/icons/hicolor_status_48x48_user-available.png
index 5bcae55c2..5bcae55c2 100644
--- a/data/icons/hicolor_status_48x48_empathy-available.png
+++ b/data/icons/hicolor_status_48x48_user-available.png
diff --git a/data/icons/hicolor_status_48x48_empathy-away.png b/data/icons/hicolor_status_48x48_user-away.png
index f9d7aeefa..f9d7aeefa 100644
--- a/data/icons/hicolor_status_48x48_empathy-away.png
+++ b/data/icons/hicolor_status_48x48_user-away.png
diff --git a/data/icons/hicolor_status_48x48_empathy-busy.png b/data/icons/hicolor_status_48x48_user-busy.png
index b6c60c902..b6c60c902 100644
--- a/data/icons/hicolor_status_48x48_empathy-busy.png
+++ b/data/icons/hicolor_status_48x48_user-busy.png
diff --git a/data/icons/hicolor_status_48x48_empathy-extended-away.png b/data/icons/hicolor_status_48x48_user-idle.png
index 3ca50e5a0..3ca50e5a0 100644
--- a/data/icons/hicolor_status_48x48_empathy-extended-away.png
+++ b/data/icons/hicolor_status_48x48_user-idle.png
diff --git a/data/icons/hicolor_status_48x48_empathy-offline.png b/data/icons/hicolor_status_48x48_user-offline.png
index b65080ba0..b65080ba0 100644
--- a/data/icons/hicolor_status_48x48_empathy-offline.png
+++ b/data/icons/hicolor_status_48x48_user-offline.png
diff --git a/data/icons/hicolor_status_scalable_empathy-available.svg b/data/icons/hicolor_status_scalable_user-available.svg
index 8d4cc585f..8d4cc585f 100644
--- a/data/icons/hicolor_status_scalable_empathy-available.svg
+++ b/data/icons/hicolor_status_scalable_user-available.svg
diff --git a/data/icons/hicolor_status_scalable_empathy-away.svg b/data/icons/hicolor_status_scalable_user-away.svg
index 7e7b0ed6b..7e7b0ed6b 100644
--- a/data/icons/hicolor_status_scalable_empathy-away.svg
+++ b/data/icons/hicolor_status_scalable_user-away.svg
diff --git a/data/icons/hicolor_status_scalable_empathy-busy.svg b/data/icons/hicolor_status_scalable_user-busy.svg
index 66fc70945..66fc70945 100644
--- a/data/icons/hicolor_status_scalable_empathy-busy.svg
+++ b/data/icons/hicolor_status_scalable_user-busy.svg
diff --git a/data/icons/hicolor_status_scalable_empathy-extended-away.svg b/data/icons/hicolor_status_scalable_user-idle.svg
index 3104dff54..3104dff54 100644
--- a/data/icons/hicolor_status_scalable_empathy-extended-away.svg
+++ b/data/icons/hicolor_status_scalable_user-idle.svg
diff --git a/data/icons/hicolor_status_scalable_empathy-offline.svg b/data/icons/hicolor_status_scalable_user-offline.svg
index 975f7dc8f..975f7dc8f 100644
--- a/data/icons/hicolor_status_scalable_empathy-offline.svg
+++ b/data/icons/hicolor_status_scalable_user-offline.svg