diff --git a/gajim/common/app.py b/gajim/common/app.py
index 3d28d861f..7f355b8dd 100644
--- a/gajim/common/app.py
+++ b/gajim/common/app.py
@@ -428,7 +428,7 @@ def account_is_securely_connected(account):
 
 def get_transport_name_from_jid(jid, use_config_setting = True):
     """
-    Returns 'aim', 'gg', 'irc' etc
+    Returns 'gg', 'irc' etc
 
     If JID is not from transport returns None.
     """
@@ -448,7 +448,7 @@ def get_transport_name_from_jid(jid, use_config_setting = True):
         # now we support both 'icq.' and 'icq' but not icqsucks.org
         host = host_splitted[0]
 
-    if host in ('aim', 'irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo',
+    if host in ('irc', 'icq', 'msn', 'sms', 'tlen', 'weather', 'yahoo',
     'mrim', 'facebook'):
         return host
     elif host == 'gg':
@@ -504,7 +504,7 @@ 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', 'facebook'):
+    if transport_name in ('icq', 'msn', 'yahoo', 'facebook'):
         prefix = transport_name
     else:
         prefix = 'jabber'
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-away.png b/gajim/data/icons/hicolor/16x16/status/aim-away.png
deleted file mode 100644
index a4c812454..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-away.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-chat.png b/gajim/data/icons/hicolor/16x16/status/aim-chat.png
deleted file mode 100644
index 5bf473cbb..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-chat.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-dnd.png b/gajim/data/icons/hicolor/16x16/status/aim-dnd.png
deleted file mode 100644
index bf2cb9d0e..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-dnd.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-notinroster.png b/gajim/data/icons/hicolor/16x16/status/aim-notinroster.png
deleted file mode 100644
index 185a9ee53..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-notinroster.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-offline.png b/gajim/data/icons/hicolor/16x16/status/aim-offline.png
deleted file mode 100644
index b4368f6e3..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-offline.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-online.png b/gajim/data/icons/hicolor/16x16/status/aim-online.png
deleted file mode 100644
index 265fc1c74..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-online.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/aim-xa.png b/gajim/data/icons/hicolor/16x16/status/aim-xa.png
deleted file mode 100644
index 6df52c3c0..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/aim-xa.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/categories/gajim-agent-aim.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-aim.png
deleted file mode 100644
index 068609550..000000000
Binary files a/gajim/data/icons/hicolor/32x32/categories/gajim-agent-aim.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-away.png b/gajim/data/icons/hicolor/32x32/status/aim-away.png
deleted file mode 100644
index 611d4f879..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-away.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-chat.png b/gajim/data/icons/hicolor/32x32/status/aim-chat.png
deleted file mode 100644
index bdc05885e..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-chat.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-dnd.png b/gajim/data/icons/hicolor/32x32/status/aim-dnd.png
deleted file mode 100644
index 4ed29d2da..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-dnd.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-notinroster.png b/gajim/data/icons/hicolor/32x32/status/aim-notinroster.png
deleted file mode 100644
index 5a680a410..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-notinroster.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-offline.png b/gajim/data/icons/hicolor/32x32/status/aim-offline.png
deleted file mode 100644
index a7578a979..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-offline.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-online.png b/gajim/data/icons/hicolor/32x32/status/aim-online.png
deleted file mode 100644
index 823727ef7..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-online.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/aim-xa.png b/gajim/data/icons/hicolor/32x32/status/aim-xa.png
deleted file mode 100644
index 7890b53af..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/aim-xa.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/48x48/status/aim-offline.png b/gajim/data/icons/hicolor/48x48/status/aim-offline.png
deleted file mode 100644
index 049ddda3d..000000000
Binary files a/gajim/data/icons/hicolor/48x48/status/aim-offline.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/48x48/status/aim-online.png b/gajim/data/icons/hicolor/48x48/status/aim-online.png
deleted file mode 100644
index 757d7bba0..000000000
Binary files a/gajim/data/icons/hicolor/48x48/status/aim-online.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-aim.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-aim.svg
deleted file mode 100644
index ce2e7a76a..000000000
--- a/gajim/data/icons/hicolor/scalable/status/gajim-agent-aim.svg
+++ /dev/null
@@ -1,155 +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="32px"
-   height="32px"
-   id="svg7113"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources/agents"
-   sodipodi:docname="aim.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/agents/aim.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs7115">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7151">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7153" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7155" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7135">
-      <stop
-         style="stop-color:#fed354;stop-opacity:1"
-         offset="0"
-         id="stop7137" />
-      <stop
-         style="stop-color:#fec41b;stop-opacity:1"
-         offset="1"
-         id="stop7139" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7135"
-       id="linearGradient7141"
-       x1="14.020609"
-       y1="12.085378"
-       x2="17.235525"
-       y2="31.285574"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7135"
-       id="linearGradient7147"
-       gradientUnits="userSpaceOnUse"
-       x1="14.020609"
-       y1="12.085378"
-       x2="17.235525"
-       y2="31.285574"
-       gradientTransform="matrix(0.9076964,0,0,0.9072059,1.3857336,1.7754974)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7151"
-       id="radialGradient7157"
-       cx="15.002944"
-       cy="28.15996"
-       fx="15.002944"
-       fy="28.15996"
-       r="12.055938"
-       gradientTransform="matrix(1,0,0,0.2074074,0,22.319376)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.197802"
-     inkscape:cx="18.222847"
-     inkscape:cy="12.974983"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="872"
-     inkscape:window-height="627"
-     inkscape:window-x="5"
-     inkscape:window-y="49" />
-  <metadata
-     id="metadata7118">
-    <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:0.11353712;color:#000000;fill:url(#radialGradient7157);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.57207211;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path7149"
-       sodipodi:cx="15.002944"
-       sodipodi:cy="28.15996"
-       sodipodi:rx="12.055938"
-       sodipodi:ry="2.5004907"
-       d="M 27.058882 28.15996 A 12.055938 2.5004907 0 1 1  2.9470062,28.15996 A 12.055938 2.5004907 0 1 1  27.058882 28.15996 z"
-       transform="matrix(1.1197802,0,0,1,-1.2999992,0.3395495)" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient7141);fill-opacity:1.0;fill-rule:evenodd;stroke:#2e3436;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 11.183268,13.063052 C 11.183268,13.063052 13.4789,9.3660443 15.893032,9.7811575 C 18.307164,10.196271 18.997252,11.97423 19.483023,12.506124 C 21.252899,12.463777 22.943402,12.214006 24.6039,11.498481 L 25.466825,15.340397 C 23.827514,16.231483 20.044491,16.752107 17.508832,16.485404 C 20.420541,18.750417 24.290241,22.475627 25.492901,25.235106 L 22.531331,28.465344 C 19.683518,24.257807 17.703304,22.899822 15.557972,21.530985 C 13.239879,24.845875 9.9184424,27.150027 6.5688058,28.518835 L 4.5326461,24.728917 C 7.44218,22.979358 10.122418,21.386769 10.508832,19.495829 C 10.508832,18.064033 10.135917,14.759813 11.183268,13.063052 z "
-       id="path7133"
-       sodipodi:nodetypes="csccccccccccc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#fdcb39;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:1.13117337;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path7131"
-       sodipodi:cx="17.592739"
-       sodipodi:cy="5.2090278"
-       sodipodi:rx="5.0902848"
-       sodipodi:ry="5.0902848"
-       d="M 22.683024 5.2090278 A 5.0902848 5.0902848 0 1 1  12.502454,5.2090278 A 5.0902848 5.0902848 0 1 1  22.683024 5.2090278 z"
-       transform="matrix(0.8840371,0,0,0.8840371,1.4473657,1.3950264)" />
-    <path
-       transform="matrix(0.6875844,0,0,0.6875844,4.9035061,2.4183538)"
-       d="M 22.683024 5.2090278 A 5.0902848 5.0902848 0 1 1  12.502454,5.2090278 A 5.0902848 5.0902848 0 1 1  22.683024 5.2090278 z"
-       sodipodi:ry="5.0902848"
-       sodipodi:rx="5.0902848"
-       sodipodi:cy="5.2090278"
-       sodipodi:cx="17.592739"
-       id="path7143"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.45436573;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.3918919;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="ccccccccccccccc"
-       id="path7145"
-       d="M 12.027914,13.581723 C 12.027914,13.581723 13.066316,11.676735 14.658584,10.989013 C 15.331282,11.239385 16.524226,11.544509 17.293081,11.508423 C 18.333524,12.222142 18.75071,13.173133 19.070403,13.522992 C 20.676914,13.484574 22.30068,13.481239 23.807908,12.83211 L 24.278621,14.71006 C 23.012143,15.398112 19.618099,15.714711 17.083556,15.538186 C 16.524691,15.881679 16.379713,16.859398 16.862596,17.266437 C 19.575646,19.539201 23.304708,22.930153 24.257638,25.11545 L 22.59642,26.974302 C 20.01147,23.1572 17.321004,21.568015 15.373694,20.326198 C 13.269569,23.333486 10.031455,25.959646 6.991002,27.201437 L 5.8572131,25.102749 C 8.7214447,23.604842 11.109635,21.356306 11.460382,19.640834 C 11.460382,18.341901 11.077237,15.121035 12.027914,13.581723 z "
-       style="opacity:1;color:#000000;fill:url(#linearGradient7147);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.3918919;visibility:visible;display:inline;overflow:visible;enable-background:accumulate" />
-  </g>
-</svg>
diff --git a/gajim/data/iconsets/transports/aim/16x16/away.png b/gajim/data/iconsets/transports/aim/16x16/away.png
deleted file mode 100644
index a4c812454..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/away.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/16x16/chat.png b/gajim/data/iconsets/transports/aim/16x16/chat.png
deleted file mode 100644
index 5bf473cbb..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/chat.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/16x16/dnd.png b/gajim/data/iconsets/transports/aim/16x16/dnd.png
deleted file mode 100644
index bf2cb9d0e..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/dnd.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/16x16/not_in_roster.png b/gajim/data/iconsets/transports/aim/16x16/not_in_roster.png
deleted file mode 100644
index 185a9ee53..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/not_in_roster.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/16x16/offline.png b/gajim/data/iconsets/transports/aim/16x16/offline.png
deleted file mode 100644
index b4368f6e3..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/offline.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/16x16/online.png b/gajim/data/iconsets/transports/aim/16x16/online.png
deleted file mode 100644
index 265fc1c74..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/online.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/16x16/xa.png b/gajim/data/iconsets/transports/aim/16x16/xa.png
deleted file mode 100644
index 6df52c3c0..000000000
Binary files a/gajim/data/iconsets/transports/aim/16x16/xa.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/away.png b/gajim/data/iconsets/transports/aim/32x32/away.png
deleted file mode 100644
index 611d4f879..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/away.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/chat.png b/gajim/data/iconsets/transports/aim/32x32/chat.png
deleted file mode 100644
index bdc05885e..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/chat.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/dnd.png b/gajim/data/iconsets/transports/aim/32x32/dnd.png
deleted file mode 100644
index 4ed29d2da..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/dnd.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/not_in_roster.png b/gajim/data/iconsets/transports/aim/32x32/not_in_roster.png
deleted file mode 100644
index 5a680a410..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/not_in_roster.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/offline.png b/gajim/data/iconsets/transports/aim/32x32/offline.png
deleted file mode 100644
index a7578a979..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/offline.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/online.png b/gajim/data/iconsets/transports/aim/32x32/online.png
deleted file mode 100644
index 823727ef7..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/online.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/32x32/xa.png b/gajim/data/iconsets/transports/aim/32x32/xa.png
deleted file mode 100644
index 7890b53af..000000000
Binary files a/gajim/data/iconsets/transports/aim/32x32/xa.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/48x48/offline.png b/gajim/data/iconsets/transports/aim/48x48/offline.png
deleted file mode 100644
index 049ddda3d..000000000
Binary files a/gajim/data/iconsets/transports/aim/48x48/offline.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/aim/48x48/online.png b/gajim/data/iconsets/transports/aim/48x48/online.png
deleted file mode 100644
index 757d7bba0..000000000
Binary files a/gajim/data/iconsets/transports/aim/48x48/online.png and /dev/null differ
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index 577563cef..f17a20627 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -850,7 +850,6 @@ class AddNewContactWindow:
     """
 
     uid_labels = {'jabber': _('JID:'),
-        'aim': _('AIM Address:'),
         'gadu-gadu': _('GG Number:'),
         'icq': _('ICQ Number:'),
         'msn': _('MSN Address:'),
@@ -934,7 +933,7 @@ class AddNewContactWindow:
         self.protocol_combobox.pack_start(cell, True)
         self.protocol_combobox.add_attribute(cell, 'text', 0)
         self.protocol_combobox.set_model(liststore)
-        uf_type = {'jabber': 'XMPP', 'aim': 'AIM', 'gadu-gadu': 'Gadu Gadu',
+        uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu',
             'icq': 'ICQ', 'msn': 'MSN', 'yahoo': 'Yahoo'}
         # Jabber as first
         liststore.append(['XMPP', 'xmpp', 'jabber'])
diff --git a/gajim/disco.py b/gajim/disco.py
index 48f1ff827..fafa647c6 100644
--- a/gajim/disco.py
+++ b/gajim/disco.py
@@ -101,8 +101,6 @@ def _gen_agent_type_info():
         ('conference', 'irc'):          (ToplevelAgentBrowser, 'irc'),
         ('_jid', 'irc'):                (False, 'irc'),
         ('gateway', 'irc'):             (False, 'irc'),
-        ('gateway', 'aim'):             (False, 'aim'),
-        ('_jid', 'aim'):                (False, 'aim'),
         ('gateway', 'gadu-gadu'):       (False, 'gadu-gadu'),
         ('_jid', 'gadugadu'):           (False, 'gadu-gadu'),
         ('gateway', 'http-ws'):         (False, 'http-ws'),