diff --git a/THANKS.artists b/THANKS.artists
index 728d456e1..b6501e6e8 100644
--- a/THANKS.artists
+++ b/THANKS.artists
@@ -5,3 +5,4 @@ Guillaume Morin
 Josef Vybíral
 Membris Khan
 Rederick Asher
+Jakub Szypulka
diff --git a/data/iconsets/transports/facebook/16x16/away.png b/data/iconsets/transports/facebook/16x16/away.png
new file mode 100644
index 000000000..4bb8de1bb
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/away.png differ
diff --git a/data/iconsets/transports/facebook/16x16/chat.png b/data/iconsets/transports/facebook/16x16/chat.png
new file mode 100644
index 000000000..bc42cf9b0
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/chat.png differ
diff --git a/data/iconsets/transports/facebook/16x16/dnd.png b/data/iconsets/transports/facebook/16x16/dnd.png
new file mode 100644
index 000000000..4bb8de1bb
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/dnd.png differ
diff --git a/data/iconsets/transports/facebook/16x16/not_in_roster.png b/data/iconsets/transports/facebook/16x16/not_in_roster.png
new file mode 100644
index 000000000..2666be91a
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/not_in_roster.png differ
diff --git a/data/iconsets/transports/facebook/16x16/offline.png b/data/iconsets/transports/facebook/16x16/offline.png
new file mode 100644
index 000000000..a980b777b
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/offline.png differ
diff --git a/data/iconsets/transports/facebook/16x16/online.png b/data/iconsets/transports/facebook/16x16/online.png
new file mode 100644
index 000000000..bc42cf9b0
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/online.png differ
diff --git a/data/iconsets/transports/facebook/16x16/xa.png b/data/iconsets/transports/facebook/16x16/xa.png
new file mode 100644
index 000000000..4bb8de1bb
Binary files /dev/null and b/data/iconsets/transports/facebook/16x16/xa.png differ
diff --git a/data/iconsets/transports/facebook/32x32/away.png b/data/iconsets/transports/facebook/32x32/away.png
new file mode 100644
index 000000000..c89b9304d
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/away.png differ
diff --git a/data/iconsets/transports/facebook/32x32/chat.png b/data/iconsets/transports/facebook/32x32/chat.png
new file mode 100644
index 000000000..65695e9e5
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/chat.png differ
diff --git a/data/iconsets/transports/facebook/32x32/dnd.png b/data/iconsets/transports/facebook/32x32/dnd.png
new file mode 100644
index 000000000..c89b9304d
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/dnd.png differ
diff --git a/data/iconsets/transports/facebook/32x32/not_in_roster.png b/data/iconsets/transports/facebook/32x32/not_in_roster.png
new file mode 100644
index 000000000..faaaa1ccd
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/not_in_roster.png differ
diff --git a/data/iconsets/transports/facebook/32x32/offline.png b/data/iconsets/transports/facebook/32x32/offline.png
new file mode 100644
index 000000000..2ae605802
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/offline.png differ
diff --git a/data/iconsets/transports/facebook/32x32/online.png b/data/iconsets/transports/facebook/32x32/online.png
new file mode 100644
index 000000000..65695e9e5
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/online.png differ
diff --git a/data/iconsets/transports/facebook/32x32/xa.png b/data/iconsets/transports/facebook/32x32/xa.png
new file mode 100644
index 000000000..c89b9304d
Binary files /dev/null and b/data/iconsets/transports/facebook/32x32/xa.png differ
diff --git a/data/iconsets/transports/facebook/48x48/offline.png b/data/iconsets/transports/facebook/48x48/offline.png
new file mode 100644
index 000000000..fd33197c2
Binary files /dev/null and b/data/iconsets/transports/facebook/48x48/offline.png differ
diff --git a/data/iconsets/transports/facebook/48x48/online.png b/data/iconsets/transports/facebook/48x48/online.png
new file mode 100644
index 000000000..2501acaab
Binary files /dev/null and b/data/iconsets/transports/facebook/48x48/online.png differ
diff --git a/src/common/gajim.py b/src/common/gajim.py
index 6b160c3b8..3e3c2a5a5 100644
--- a/src/common/gajim.py
+++ b/src/common/gajim.py
@@ -344,12 +344,14 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
 		host = host_splitted[0]
 
 	if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo',
-	'mrim'):
+	'mrim', 'facebook'):
 		return host
 	elif host == 'gg':
 		return 'gadu-gadu'
 	elif host == 'jit':
 		return 'icq'
+	elif host == 'facebook':
+		return 'facebook'
 	else:
 		return None
 
@@ -384,7 +386,7 @@ def get_hostname_from_account(account_name, use_srv = False):
 def get_notification_image_prefix(jid):
 	'''returns the prefix for the notification images'''
 	transport_name = get_transport_name_from_jid(jid)
-	if transport_name in ('aim', 'icq', 'msn', 'yahoo'):
+	if transport_name in ('aim', 'icq', 'msn', 'yahoo', 'facebook'):
 		prefix = transport_name
 	else:
 		prefix = 'jabber'
diff --git a/src/disco.py b/src/disco.py
index 1496f8eef..f30c127c6 100644
--- a/src/disco.py
+++ b/src/disco.py
@@ -109,6 +109,8 @@ def _gen_agent_type_info():
 		('_jid', 'yahoo'):			(False, 'yahoo.png'),
 		('gateway', 'mrim'):			(False, 'mrim.png'),
 		('_jid', 'mrim'):				(False, 'mrim.png'),
+		('gateway', 'facebook'):	(False, 'facebook.png'),
+		('_jid', 'facebook'):		(False, 'facebook.png'),
 	}
 
 # Category type to "human-readable" description string, and sort priority