diff --git a/formats/AtomFormat.php b/formats/AtomFormat.php
index 66f0d2b4..82d90106 100644
--- a/formats/AtomFormat.php
+++ b/formats/AtomFormat.php
@@ -15,8 +15,8 @@ class AtomFormat extends FormatAbstract{
 
 		$extraInfos = $this->getExtraInfos();
 		$title = $this->xml_encode($extraInfos['name']);
-		$uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/sebsauvage/rss-bridge';
-		$icon = $this->xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
+		$uri = !empty($extraInfos['uri']) ? $extraInfos['uri'] : 'https://github.com/RSS-Bridge/rss-bridge';
+		$icon = $this->xml_encode($uri .'/favicon.ico');
 		$uri = $this->xml_encode($uri);
 
 		$entries = '';
diff --git a/formats/MrssFormat.php b/formats/MrssFormat.php
index 2fcf2836..4e09c5d7 100644
--- a/formats/MrssFormat.php
+++ b/formats/MrssFormat.php
@@ -18,10 +18,10 @@ class MrssFormat extends FormatAbstract {
 		if(!empty($extraInfos['uri'])) {
 			$uri = $this->xml_encode($extraInfos['uri']);
 		} else {
-			$uri = 'https://github.com/sebsauvage/rss-bridge';
+			$uri = 'https://github.com/RSS-Bridge/rss-bridge';
 		}
 
-		$icon = $this->xml_encode('http://icons.better-idea.org/icon?url='. $uri .'&size=64');
+		$icon = $this->xml_encode($uri .'/favicon.ico');
 
 		$items = '';
 		foreach($this->getItems() as $item) {