diff --git a/images/logo_180px.png b/images/logo_180px.png
index c6c1e887..6746804e 100644
Binary files a/images/logo_180px.png and b/images/logo_180px.png differ
diff --git a/images/logo_180px_AE.png b/images/logo_180px_AE.png
new file mode 100644
index 00000000..c6c1e887
Binary files /dev/null and b/images/logo_180px_AE.png differ
diff --git a/template/New/admin/admin_header.tpl b/template/New/admin/admin_header.tpl
index c82ab4d1..212dc00e 100644
--- a/template/New/admin/admin_header.tpl
+++ b/template/New/admin/admin_header.tpl
@@ -48,7 +48,7 @@
       <!-- Sidebar - Brand -->
       
       <a class="sidebar-brand d-flex align-items-center justify-content-center" href="<?php echo $rSA['header_href'];?>">
-        <img src="images/<?php echo $rSA['header_icon'];?>" title="<?php echo $rSA['header_text'];?>" width="32">
+        <img src="images/logo_180px_AE.png" title="<?php echo $rSA['header_text'];?>" width="32">
         <div class="sidebar-brand-text "> <?php echo $rSA['header_text'];?></div>
       </a>
 
diff --git a/template/default/user/userpanel_header.tpl b/template/default/user/userpanel_header.tpl
index 1f93c349..ec76d5b5 100644
--- a/template/default/user/userpanel_header.tpl
+++ b/template/default/user/userpanel_header.tpl
@@ -114,8 +114,8 @@
                         <li class="hidden-xs"><a href="#"><?php echo $gsprache->last.'<br />'.$great_last;?></a></li>
                         <li class="divider hidden-xs"></li>
                         <?php if ($support_phonenumber!="") echo '<li><a href="#"><i class="fa fa-phone fa-fw"></i> '.$gsprache->hotline.": ".$support_phonenumber.'</a></li><li class="divider"></li>';?>
-                        <li><a href="userpanel.php?w=se&amp;d=pw"><i class="fa fa-key fa-fw"></i> <?php echo $gsprache->password." ".$gsprache->change;?></a></li>
-                        <li><a href="userpanel.php?w=se"><i class="fa fa-cog fa-fw"></i> <?php echo $gsprache->settings;?></a></li>
+                        <li><a href="admin.php?w=su&amp;d=pw"><i class="fa fa-key fa-fw"></i> <?php echo $gsprache->password." ".$gsprache->change;?></a></li>
+                        <li><a href="admin.php?w=su"><i class="fa fa-cog fa-fw"></i> <?php echo $gsprache->settings;?></a></li>
                         <li class="divider  hidden-xs"></li>
                         <li><a href="https://easy-wi.com" target="_blank"><i class="fa fa-info-circle fa-fw"></i> Easy-WI Homepage</a></li>
                         <li><a href="https://discord.gg/quJvvfF" target="_blank"><i class="fa fa-question-circle fa-fw"></i> Easy-WI @ Discord</a></li>