diff --git a/Template.php b/Template.php
index f8ad262..374b57d 100644
--- a/Template.php
+++ b/Template.php
@@ -118,4 +118,41 @@ class Template {
         // return the full tag
         return '<' . $tag . ' ' . buildAttributes($attributes) . ' />';
     }
+
+    /**
+     * Embed the main logo
+     *
+     * Tries a few different locations
+     */
+    public function mainLogo() {
+        global $conf;
+
+        $desktop = self::getResizedImgTag(
+            'img',
+            array(
+                'class' => 'mobile-hide',
+                'src' => array(tpl_getConf('logo'), 'wiki:logo-wide.png', 'wiki:logo.png'),
+                'alt' => tpl_getLang('adjunct_start_logo_text') . $conf['title'],
+            ),
+            0, 0
+        );
+        $mobile = self::getResizedImgTag(
+            'img',
+            array(
+                'class' => 'mobile-only',
+                'src' => array('wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo')),
+                'alt' => tpl_getLang('adjunct_start_logo_text') . $conf['title'],
+            ),
+            32, 32
+        );
+
+        // homepage logo should not link to itself (BITV accessibility requirement)
+        if(strcmp(wl(), $_SERVER['REQUEST_URI']) === 0) {
+            echo $desktop;
+            echo $mobile;
+        } else {
+            tpl_link(wl(), $desktop, 'accesskey="h" title="[H]"');
+            tpl_link(wl(), $mobile, 'accesskey="h" title="[H]"');
+        }
+    }
 }
diff --git a/tpl/main-sidebar-logo.php b/tpl/main-sidebar-logo.php
index babda99..ffdb206 100755
--- a/tpl/main-sidebar-logo.php
+++ b/tpl/main-sidebar-logo.php
@@ -4,13 +4,6 @@
     echo '<div class="menu-togglelink mobile-only"><a href=\'#\'>MOB</a></div>';
     echo '<div class="logo">';
 
-    /* homepage logo should not link to itself (BITV accessibility requirement) */
-    if (strcmp(wl(), $_SERVER['REQUEST_URI']) === 0 ){
-        echo '<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
-        echo '<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
+    \dokuwiki\template\sprintdoc\Template::getInstance()->mainLogo();
 
-    } else{
-        tpl_link( wl(),'<img class="mobile-hide" src="'.ml(tpl_getConf('logo')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
-        tpl_link( wl(),'<img class="mobile-only" src="'.tpl_getMediaFile(array(':wiki:favicon-32x32.png', 'images/fav/favicon-32x32.png')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
-    }
     echo "<hr class=\"structure\" /></div>";