diff --git a/content/netError.xhtml b/content/netError.xhtml
index b524972..f653928 100644
--- a/content/netError.xhtml
+++ b/content/netError.xhtml
@@ -28,10 +28,6 @@
         value='googletext' label=' &resurrect.google;&resurrect.textonly;'
         image='chrome://resurrect/skin/cacheicons/google.png'
       />
-      <xul:button
-        value='yahoo' label=' &resurrect.yahoo;'
-        image='chrome://resurrect/skin/cacheicons/yahoo.png'
-      />
       <xul:button
         value='archive' label=' &resurrect.archive;'
         image='chrome://resurrect/skin/cacheicons/archive.png'
diff --git a/content/resurrect-select-mirror.xul b/content/resurrect-select-mirror.xul
index 16381a0..7464c11 100644
--- a/content/resurrect-select-mirror.xul
+++ b/content/resurrect-select-mirror.xul
@@ -44,10 +44,6 @@ window.addEventListener('load', resurrect.loadTarget, false);
       value='googletext' label=' &resurrect.google;&resurrect.textonly;'
       image='chrome://resurrect/skin/cacheicons/google.png'
     />
-    <xul:button
-      value='yahoo' label=' &resurrect.yahoo;'
-      image='chrome://resurrect/skin/cacheicons/yahoo.png'
-    />
     <xul:button
       value='archive' label=' &resurrect.archive;'
       image='chrome://resurrect/skin/cacheicons/archive.png'
diff --git a/content/resurrect.js b/content/resurrect.js
index b8e33f1..95e6a0e 100644
--- a/content/resurrect.js
+++ b/content/resurrect.js
@@ -174,22 +174,6 @@ var resurrect={
       break;
     case 'archiveis':
       gotoUrl='https://archive.is/'+rawUrl;
-      break;
-    case 'yahoo':
-      var xhr=new XMLHttpRequest();
-      xhr.open('GET',
-          'http://api.search.yahoo.com/WebSearchService/V1/'+
-          'webSearch?appid=firefox-resurrect&query='+encUrl+'&results=1',
-          false);
-      xhr.send(null);
-
-      try {
-        var c=xhr.responseXML.getElementsByTagName('Cache');
-        gotoUrl=c[0].firstChild.textContent;
-      } catch (e ) {
-        gotoUrl='http://search.yahoo.com/search?p='+encUrl;
-      }
-
       break;
     case 'bing':
       var xhr=new XMLHttpRequest();
diff --git a/locale/ca-AD/overlay.dtd b/locale/ca-AD/overlay.dtd
index 0ffd5f5..a080fe2 100644
--- a/locale/ca-AD/overlay.dtd
+++ b/locale/ca-AD/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly "(només text)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/cs-CZ/overlay.dtd b/locale/cs-CZ/overlay.dtd
index 62f9edb..3ddec24 100644
--- a/locale/cs-CZ/overlay.dtd
+++ b/locale/cs-CZ/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(prostý text)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/da-DK/overlay.dtd b/locale/da-DK/overlay.dtd
index 14d8674..b117754 100644
--- a/locale/da-DK/overlay.dtd
+++ b/locale/da-DK/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly "(kun tekst)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/da/overlay.dtd b/locale/da/overlay.dtd
index 6ea7ee1..a5a54f4 100644
--- a/locale/da/overlay.dtd
+++ b/locale/da/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(kun tekst)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/de-DE/overlay.dtd b/locale/de-DE/overlay.dtd
index 5894ccc..9072262 100644
--- a/locale/de-DE/overlay.dtd
+++ b/locale/de-DE/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(Nur Text)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/de/overlay.dtd b/locale/de/overlay.dtd
index 5894ccc..9072262 100644
--- a/locale/de/overlay.dtd
+++ b/locale/de/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(Nur Text)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/el-GR/overlay.dtd b/locale/el-GR/overlay.dtd
index 0a54f68..f7ed7ff 100644
--- a/locale/el-GR/overlay.dtd
+++ b/locale/el-GR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly "(μόνο κείμενο)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/el/overlay.dtd b/locale/el/overlay.dtd
index 0a54f68..f7ed7ff 100644
--- a/locale/el/overlay.dtd
+++ b/locale/el/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly "(μόνο κείμενο)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/en-US/overlay.dtd b/locale/en-US/overlay.dtd
index 1b78b61..fd08111 100644
--- a/locale/en-US/overlay.dtd
+++ b/locale/en-US/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly " (text only)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.archiveis "archive.is">
 <!ENTITY resurrect.bing "Bing">
diff --git a/locale/es-AR/overlay.dtd b/locale/es-AR/overlay.dtd
index 1b10f37..afb7c57 100644
--- a/locale/es-AR/overlay.dtd
+++ b/locale/es-AR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Cache de Google">
 <!ENTITY resurrect.textonly "(solo texto)">
-<!ENTITY resurrect.yahoo "Cache de Yahoo!">
 <!ENTITY resurrect.archive "El Archivo de Internet">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/es-CL/overlay.dtd b/locale/es-CL/overlay.dtd
index 1b10f37..afb7c57 100644
--- a/locale/es-CL/overlay.dtd
+++ b/locale/es-CL/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Cache de Google">
 <!ENTITY resurrect.textonly "(solo texto)">
-<!ENTITY resurrect.yahoo "Cache de Yahoo!">
 <!ENTITY resurrect.archive "El Archivo de Internet">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/es-ES/overlay.dtd b/locale/es-ES/overlay.dtd
index d911db0..d1917a2 100644
--- a/locale/es-ES/overlay.dtd
+++ b/locale/es-ES/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Caché de Google">
 <!ENTITY resurrect.textonly "(sólo texto)">
-<!ENTITY resurrect.yahoo "Caché de Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/fi-FI/overlay.dtd b/locale/fi-FI/overlay.dtd
index c7fe7d0..3aefbb3 100644
--- a/locale/fi-FI/overlay.dtd
+++ b/locale/fi-FI/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google välimuisti">
 <!ENTITY resurrect.textonly "(vain teksti)">
-<!ENTITY resurrect.yahoo "Yahoo! välimuisti">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/fr-FR/overlay.dtd b/locale/fr-FR/overlay.dtd
index 4aa7afb..3149320 100644
--- a/locale/fr-FR/overlay.dtd
+++ b/locale/fr-FR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Cache Google">
 <!ENTITY resurrect.textonly "(texte seulement)">
-<!ENTITY resurrect.yahoo "Cache Yahoo!">
 <!ENTITY resurrect.archive "Archive internet">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gogablast">
diff --git a/locale/fr/overlay.dtd b/locale/fr/overlay.dtd
index b76c96c..6557235 100644
--- a/locale/fr/overlay.dtd
+++ b/locale/fr/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Cache Google">
 <!ENTITY resurrect.textonly "(texte seulement)">
-<!ENTITY resurrect.yahoo "Cache Yahoo!">
 <!ENTITY resurrect.archive "Archive internet">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gogablast">
diff --git a/locale/hr-HR/overlay.dtd b/locale/hr-HR/overlay.dtd
index 75ab45e..bc4b040 100644
--- a/locale/hr-HR/overlay.dtd
+++ b/locale/hr-HR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google privremeni spremnik">
 <!ENTITY resurrect.textonly "(samo tekst)">
-<!ENTITY resurrect.yahoo "Yahoo! privremeni spremnik">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/it-IT/overlay.dtd b/locale/it-IT/overlay.dtd
index cbaf535..5d9b4f3 100644
--- a/locale/it-IT/overlay.dtd
+++ b/locale/it-IT/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly " (solo testo)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/it/overlay.dtd b/locale/it/overlay.dtd
index f99ac2b..2f7f5e8 100644
--- a/locale/it/overlay.dtd
+++ b/locale/it/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly " (solo testo)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive ">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/ja-JP/overlay.dtd b/locale/ja-JP/overlay.dtd
index 8cac58f..3595ea0 100644
--- a/locale/ja-JP/overlay.dtd
+++ b/locale/ja-JP/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(テキストのみ)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/ko-KR/overlay.dtd b/locale/ko-KR/overlay.dtd
index 48ab512..e49fee1 100644
--- a/locale/ko-KR/overlay.dtd
+++ b/locale/ko-KR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google 캐쉬">
 <!ENTITY resurrect.textonly "(본문 만)">
-<!ENTITY resurrect.yahoo "Yahoo! 캐쉬">
 <!ENTITY resurrect.archive "인터넷 아카이브">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/nl-NL/overlay.dtd b/locale/nl-NL/overlay.dtd
index f914bec..5962cac 100644
--- a/locale/nl-NL/overlay.dtd
+++ b/locale/nl-NL/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(alleen tekst)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/nl/overlay.dtd b/locale/nl/overlay.dtd
index c0f6d89..338e940 100644
--- a/locale/nl/overlay.dtd
+++ b/locale/nl/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(alleen tekst)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/pl-PL/overlay.dtd b/locale/pl-PL/overlay.dtd
index 460cef1..2908494 100644
--- a/locale/pl-PL/overlay.dtd
+++ b/locale/pl-PL/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly "(tylko tekst)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/pl/overlay.dtd b/locale/pl/overlay.dtd
index 460cef1..2908494 100644
--- a/locale/pl/overlay.dtd
+++ b/locale/pl/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly "(tylko tekst)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/pt-BR/overlay.dtd b/locale/pt-BR/overlay.dtd
index 9c08894..6f758cd 100644
--- a/locale/pt-BR/overlay.dtd
+++ b/locale/pt-BR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Cache do Google">
 <!ENTITY resurrect.textonly "(somente texto)">
-<!ENTITY resurrect.yahoo "Cache do Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/pt-PT/overlay.dtd b/locale/pt-PT/overlay.dtd
index 5e9bed1..e4c554b 100644
--- a/locale/pt-PT/overlay.dtd
+++ b/locale/pt-PT/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Cache do Google">
 <!ENTITY resurrect.textonly "(só texto)">
-<!ENTITY resurrect.yahoo "Cache do Yahoo!">
 <!ENTITY resurrect.archive "Arquivo de internet">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/ru-RU/overlay.dtd b/locale/ru-RU/overlay.dtd
index ee8cdcc..c4cf82b 100644
--- a/locale/ru-RU/overlay.dtd
+++ b/locale/ru-RU/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(только текст)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/sl-SI/overlay.dtd b/locale/sl-SI/overlay.dtd
index 02bb1fa..9517d06 100644
--- a/locale/sl-SI/overlay.dtd
+++ b/locale/sl-SI/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google posnetek">
 <!ENTITY resurrect.textonly "(samo besedilo)">
-<!ENTITY resurrect.yahoo "Yahoo! posnetek">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/sr/overlay.dtd b/locale/sr/overlay.dtd
index b0b5618..22c24b7 100644
--- a/locale/sr/overlay.dtd
+++ b/locale/sr/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(само текст)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/sv-SE/overlay.dtd b/locale/sv-SE/overlay.dtd
index db72e24..f71324a 100644
--- a/locale/sv-SE/overlay.dtd
+++ b/locale/sv-SE/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(endast text)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/tr-TR/overlay.dtd b/locale/tr-TR/overlay.dtd
index 328cfe5..4fb6f2f 100644
--- a/locale/tr-TR/overlay.dtd
+++ b/locale/tr-TR/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(salt metin)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/uk-UA/overlay.dtd b/locale/uk-UA/overlay.dtd
index d0e609e..d3b9b8b 100644
--- a/locale/uk-UA/overlay.dtd
+++ b/locale/uk-UA/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google Cache">
 <!ENTITY resurrect.textonly " (text only)">
-<!ENTITY resurrect.yahoo "Yahoo! Cache">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/zh-CN/overlay.dtd b/locale/zh-CN/overlay.dtd
index c8ffc00..f1d71ee 100644
--- a/locale/zh-CN/overlay.dtd
+++ b/locale/zh-CN/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(纯文字版)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "The Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/locale/zh-TW/overlay.dtd b/locale/zh-TW/overlay.dtd
index b1ddffb..d773c15 100644
--- a/locale/zh-TW/overlay.dtd
+++ b/locale/zh-TW/overlay.dtd
@@ -7,7 +7,6 @@
 <!ENTITY resurrect.coralcdn "CoralCDN">
 <!ENTITY resurrect.google "Google">
 <!ENTITY resurrect.textonly "(限文字)">
-<!ENTITY resurrect.yahoo "Yahoo!">
 <!ENTITY resurrect.archive "Internet Archive">
 <!ENTITY resurrect.bing "Bing">
 <!ENTITY resurrect.gigablast "Gigablast">
diff --git a/skin/cacheicons/yahoo.png b/skin/cacheicons/yahoo.png
deleted file mode 100644
index 12489c1..0000000
Binary files a/skin/cacheicons/yahoo.png and /dev/null differ