diff --git a/gajim/common/app.py b/gajim/common/app.py
index ab70ba5fa..c9b6a850e 100644
--- a/gajim/common/app.py
+++ b/gajim/common/app.py
@@ -448,8 +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 ('irc', 'icq', 'sms', 'weather', 'yahoo',
-    'mrim', 'facebook'):
+    if host in ('irc', 'icq', 'sms', 'weather', 'mrim', 'facebook'):
         return host
     elif host == 'gg':
         return 'gadu-gadu'
@@ -504,7 +503,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 ('icq', 'yahoo', 'facebook'):
+    if transport_name in ('icq', 'facebook'):
         prefix = transport_name
     else:
         prefix = 'jabber'
diff --git a/gajim/common/logger.py b/gajim/common/logger.py
index 7d593fd8c..bb5fadb28 100644
--- a/gajim/common/logger.py
+++ b/gajim/common/logger.py
@@ -505,8 +505,6 @@ class Logger:
             return TypeConstant.SMTP
         if type_ in ('tlen', 'x-tlen'):
             return TypeConstant.TLEN
-        if type_ == 'yahoo':
-            return TypeConstant.YAHOO
         if type_ == 'newmail':
             return TypeConstant.NEWMAIL
         if type_ == 'rss':
@@ -541,8 +539,6 @@ class Logger:
             return 'smtp'
         if type_id == TypeConstant.TLEN:
             return 'tlen'
-        if type_id == TypeConstant.YAHOO:
-            return 'yahoo'
         if type_id == TypeConstant.NEWMAIL:
             return 'newmail'
         if type_id == TypeConstant.RSS:
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-away.png b/gajim/data/icons/hicolor/16x16/status/yahoo-away.png
deleted file mode 100644
index f7647ac35..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-away.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-chat.png b/gajim/data/icons/hicolor/16x16/status/yahoo-chat.png
deleted file mode 100644
index 2f0747269..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-chat.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png b/gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png
deleted file mode 100644
index cda1d8e14..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-dnd.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png b/gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png
deleted file mode 100644
index e5d0fed8b..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-notinroster.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-offline.png b/gajim/data/icons/hicolor/16x16/status/yahoo-offline.png
deleted file mode 100644
index f0b768eb9..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-offline.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-online.png b/gajim/data/icons/hicolor/16x16/status/yahoo-online.png
deleted file mode 100644
index fb4579b83..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-online.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/16x16/status/yahoo-xa.png b/gajim/data/icons/hicolor/16x16/status/yahoo-xa.png
deleted file mode 100644
index 524a5023c..000000000
Binary files a/gajim/data/icons/hicolor/16x16/status/yahoo-xa.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/categories/gajim-agent-yahoo.png b/gajim/data/icons/hicolor/32x32/categories/gajim-agent-yahoo.png
deleted file mode 100644
index 7f6d02e51..000000000
Binary files a/gajim/data/icons/hicolor/32x32/categories/gajim-agent-yahoo.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-away.png b/gajim/data/icons/hicolor/32x32/status/yahoo-away.png
deleted file mode 100644
index 41eeaf325..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-away.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-chat.png b/gajim/data/icons/hicolor/32x32/status/yahoo-chat.png
deleted file mode 100644
index 69f4918cb..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-chat.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png b/gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png
deleted file mode 100644
index 8a5c3a30e..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-dnd.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png b/gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png
deleted file mode 100644
index aa01b2871..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-notinroster.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-offline.png b/gajim/data/icons/hicolor/32x32/status/yahoo-offline.png
deleted file mode 100644
index 691798d9f..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-offline.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-online.png b/gajim/data/icons/hicolor/32x32/status/yahoo-online.png
deleted file mode 100644
index 63ef8ae60..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-online.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/32x32/status/yahoo-xa.png b/gajim/data/icons/hicolor/32x32/status/yahoo-xa.png
deleted file mode 100644
index 6c5848f1b..000000000
Binary files a/gajim/data/icons/hicolor/32x32/status/yahoo-xa.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/48x48/status/yahoo-offline.png b/gajim/data/icons/hicolor/48x48/status/yahoo-offline.png
deleted file mode 100644
index 9da04cc8e..000000000
Binary files a/gajim/data/icons/hicolor/48x48/status/yahoo-offline.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/48x48/status/yahoo-online.png b/gajim/data/icons/hicolor/48x48/status/yahoo-online.png
deleted file mode 100644
index 8a9816fb3..000000000
Binary files a/gajim/data/icons/hicolor/48x48/status/yahoo-online.png and /dev/null differ
diff --git a/gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg b/gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg
deleted file mode 100644
index f94d34a15..000000000
--- a/gajim/data/icons/hicolor/scalable/status/gajim-agent-yahoo.svg
+++ /dev/null
@@ -1,204 +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="svg11807"
-   sodipodi:version="0.32"
-   inkscape:version="0.44+devel"
-   sodipodi:docbase="/home/cornelius/Desktop/GAJIM iconset/sources/pixmaps/agents"
-   sodipodi:docname="yahoo.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/pixmaps/agents/yahoo.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90"
-   sodipodi:modified="true">
-  <defs
-     id="defs11809">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5712">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5714" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5716" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11869">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop11871" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop11873" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient11837">
-      <stop
-         style="stop-color:#ffdf4e;stop-opacity:1"
-         offset="0"
-         id="stop11839" />
-      <stop
-         style="stop-color:#e28c00;stop-opacity:1"
-         offset="1"
-         id="stop11841" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11837"
-       id="radialGradient11843"
-       cx="12.111279"
-       cy="11.590742"
-       fx="12.111279"
-       fy="11.590742"
-       r="11.975467"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.127342,0,0,1.9023775,-13.842852,-11.348791)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient11869"
-       id="linearGradient11875"
-       x1="1.3395486"
-       y1="19.156826"
-       x2="1.3395486"
-       y2="3.6753652"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5712"
-       id="radialGradient5718"
-       cx="15.940628"
-       cy="29.008341"
-       fx="15.940628"
-       fy="29.008341"
-       r="10.939647"
-       gradientTransform="matrix(1,0,0,0.1836735,0,23.680278)"
-       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="27.591372"
-     inkscape:cy="7.6482637"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="928"
-     inkscape:window-height="868"
-     inkscape:window-x="0"
-     inkscape:window-y="26" />
-  <metadata
-     id="metadata11812">
-    <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.27074238;color:#000000;fill:url(#radialGradient5718);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999994;stroke-linecap:round;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.49099097;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path4741"
-       sodipodi:cx="15.940628"
-       sodipodi:cy="29.008341"
-       sodipodi:rx="10.939647"
-       sodipodi:ry="2.0093229"
-       d="M 26.880275 29.008341 A 10.939647 2.0093229 0 1 1  5.0009813,29.008341 A 10.939647 2.0093229 0 1 1  26.880275 29.008341 z"
-       transform="matrix(1.005517,0,0,0.7465204,-2.8571529e-2,5.8446835)" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:url(#radialGradient11843);fill-opacity:1.0;fill-rule:evenodd;stroke:#fd9600;stroke-width:1;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="path11825"
-       sodipodi:cx="17.10157"
-       sodipodi:cy="16.684494"
-       sodipodi:rx="11.475467"
-       sodipodi:ry="11.475467"
-       d="M 28.577037 16.684494 A 11.475467 11.475467 0 1 1  5.6261034,16.684494 A 11.475467 11.475467 0 1 1  28.577037 16.684494 z"
-       transform="translate(-1.0770369,-0.7090273)" />
-    <path
-       transform="matrix(0.9149955,0,0,0.9149955,0.3521408,0.7337637)"
-       d="M 28.577037 16.684494 A 11.475467 11.475467 0 1 1  5.6261034,16.684494 A 11.475467 11.475467 0 1 1  28.577037 16.684494 z"
-       sodipodi:ry="11.475467"
-       sodipodi:rx="11.475467"
-       sodipodi:cy="16.684494"
-       sodipodi:cx="17.10157"
-       id="path11827"
-       style="opacity:1;color:#000000;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.09290159;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.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#75507b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       id="path11845"
-       sodipodi:cx="11.609421"
-       sodipodi:cy="11.728165"
-       sodipodi:rx="1.5181551"
-       sodipodi:ry="1.5181551"
-       d="M 13.127576 11.728165 A 1.5181551 1.5181551 0 1 1  10.091266,11.728165 A 1.5181551 1.5181551 0 1 1  13.127576 11.728165 z"
-       transform="matrix(1.3173885,0,0,1.6467356,-2.2941174,-6.8131858)" />
-    <path
-       transform="matrix(1.3173885,0,0,1.6467356,3.7058826,-6.8131858)"
-       d="M 13.127576 11.728165 A 1.5181551 1.5181551 0 1 1  10.091266,11.728165 A 1.5181551 1.5181551 0 1 1  13.127576 11.728165 z"
-       sodipodi:ry="1.5181551"
-       sodipodi:rx="1.5181551"
-       sodipodi:cy="11.728165"
-       sodipodi:cx="11.609421"
-       id="path11847"
-       style="opacity:1;color:#000000;fill:#75507b;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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.58558559;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#555753;fill-opacity:1;fill-rule:evenodd;stroke:#2e3436;stroke-width:0.96594292;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="path11849"
-       sodipodi:cx="16.297842"
-       sodipodi:cy="24.811089"
-       sodipodi:rx="7.0103045"
-       sodipodi:ry="7.0103045"
-       d="M 23.308146,24.811089 A 7.0103045,7.0103045 0 1 1 9.2875376,24.811088 L 16.297842,24.811089 z"
-       transform="matrix(1.0699584,0,0,0.9987397,-1.4380139,-7.2805525)"
-       sodipodi:start="0"
-       sodipodi:end="3.1415927" />
-    <path
-       style="color:#000000;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
-       d="M 9.1820622,18.200235 L 22.817939,18.200235 C 22.737754,18.708375 22.794788,19.175319 22.376345,19.600117 L 9.6916799,19.600117 C 9.2691177,19.156776 9.3348549,18.685119 9.1820622,18.200235 z "
-       id="rect11851"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="opacity:1;color:#000000;fill:#cc0000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;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"
-       d="M 16,19.600117 C 13.302322,19.600117 11.066735,20.633388 10.54565,21.999916 C 11.939285,23.106979 13.857114,23.799764 16,23.799764 C 18.142886,23.799764 20.060715,23.106979 21.454351,21.999916 C 20.933264,20.63339 18.697678,19.600116 16,19.600117 z "
-       id="path11862" />
-    <path
-       style="fill:url(#linearGradient11875);fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0"
-       d="M 15,6 C 15,6 6.4465162,7.1962708 6,16 L 8,16 C 8,16 7.1844951,10.025514 15,6 z "
-       id="path11867"
-       sodipodi:nodetypes="cccc" />
-  </g>
-</svg>
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/away.png b/gajim/data/iconsets/transports/yahoo/16x16/away.png
deleted file mode 100644
index f7647ac35..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/away.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/chat.png b/gajim/data/iconsets/transports/yahoo/16x16/chat.png
deleted file mode 100644
index 2f0747269..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/chat.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/dnd.png b/gajim/data/iconsets/transports/yahoo/16x16/dnd.png
deleted file mode 100644
index cda1d8e14..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/dnd.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/not_in_roster.png b/gajim/data/iconsets/transports/yahoo/16x16/not_in_roster.png
deleted file mode 100644
index e5d0fed8b..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/not_in_roster.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/offline.png b/gajim/data/iconsets/transports/yahoo/16x16/offline.png
deleted file mode 100644
index f0b768eb9..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/offline.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/online.png b/gajim/data/iconsets/transports/yahoo/16x16/online.png
deleted file mode 100644
index fb4579b83..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/online.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/16x16/xa.png b/gajim/data/iconsets/transports/yahoo/16x16/xa.png
deleted file mode 100644
index 524a5023c..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/16x16/xa.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/away.png b/gajim/data/iconsets/transports/yahoo/32x32/away.png
deleted file mode 100644
index 41eeaf325..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/away.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/chat.png b/gajim/data/iconsets/transports/yahoo/32x32/chat.png
deleted file mode 100644
index 69f4918cb..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/chat.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/dnd.png b/gajim/data/iconsets/transports/yahoo/32x32/dnd.png
deleted file mode 100644
index 8a5c3a30e..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/dnd.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/not_in_roster.png b/gajim/data/iconsets/transports/yahoo/32x32/not_in_roster.png
deleted file mode 100644
index aa01b2871..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/not_in_roster.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/offline.png b/gajim/data/iconsets/transports/yahoo/32x32/offline.png
deleted file mode 100644
index 691798d9f..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/offline.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/online.png b/gajim/data/iconsets/transports/yahoo/32x32/online.png
deleted file mode 100644
index 63ef8ae60..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/online.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/32x32/xa.png b/gajim/data/iconsets/transports/yahoo/32x32/xa.png
deleted file mode 100644
index 6c5848f1b..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/32x32/xa.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/48x48/offline.png b/gajim/data/iconsets/transports/yahoo/48x48/offline.png
deleted file mode 100644
index 9da04cc8e..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/48x48/offline.png and /dev/null differ
diff --git a/gajim/data/iconsets/transports/yahoo/48x48/online.png b/gajim/data/iconsets/transports/yahoo/48x48/online.png
deleted file mode 100644
index 8a9816fb3..000000000
Binary files a/gajim/data/iconsets/transports/yahoo/48x48/online.png and /dev/null differ
diff --git a/gajim/dialogs.py b/gajim/dialogs.py
index fc0e541d2..750c1c2a3 100644
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -851,8 +851,7 @@ class AddNewContactWindow:
 
     uid_labels = {'jabber': _('JID:'),
         'gadu-gadu': _('GG Number:'),
-        'icq': _('ICQ Number:'),
-        'yahoo': _('Yahoo! Address:')}
+        'icq': _('ICQ Number:')}
 
     def __init__(self, account=None, jid=None, user_nick=None, group=None):
         self.account = account
@@ -934,8 +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', 'gadu-gadu': 'Gadu Gadu',
-                   'icq': 'ICQ', 'yahoo': 'Yahoo'}
+        uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ'}
         # Jabber as first
         liststore.append(['XMPP', 'xmpp', 'jabber'])
         for type_ in self.agents:
diff --git a/gajim/disco.py b/gajim/disco.py
index 78bd47fd9..423eb5c4e 100644
--- a/gajim/disco.py
+++ b/gajim/disco.py
@@ -109,8 +109,6 @@ def _gen_agent_type_info():
         ('gateway', 'sms'):             (False, 'sms'),
         ('_jid', 'sms'):                (False, 'sms'),
         ('gateway', 'smtp'):            (False, 'mail'),
-        ('gateway', 'yahoo'):           (False, 'yahoo'),
-        ('_jid', 'yahoo'):              (False, 'yahoo'),
         ('gateway', 'mrim'):            (False, 'mrim'),
         ('_jid', 'mrim'):               (False, 'mrim'),
         ('gateway', 'facebook'):        (False, 'facebook'),