diff --git a/articles/datenschutz.php b/articles/datenschutz.php
index 48b4da8..9d68459 100644
--- a/articles/datenschutz.php
+++ b/articles/datenschutz.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
             <div style="float:left; text-align: center;">
                 <a href="../index.php">
-        	        <img src="../images/logo.png" alt="" style="height: 44px;">
+        	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
         	    </a>
             |
         	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/articles/pythagoras.php b/articles/pythagoras.php
index 350f534..be0c8f5 100644
--- a/articles/pythagoras.php
+++ b/articles/pythagoras.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
             <div style="float:left; text-align: center;">
                 <a href="../index.php">
-        	        <img src="../images/logo.png" alt="" style="height: 44px;">
+        	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
         	    </a>
             |
         	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/articles/tunneleffekt.php b/articles/tunneleffekt.php
index 505075a..6a2bf5d 100644
--- a/articles/tunneleffekt.php
+++ b/articles/tunneleffekt.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
         <div style="float:left; text-align: center;">
             <a href="../index.php">
-    	        <img src="../images/logo.png" alt="" style="height: 44px;">
+    	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
     	    </a>
         |
     	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/auth/login.php b/auth/login.php
index 9dba584..1066cd3 100644
--- a/auth/login.php
+++ b/auth/login.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
             <div style="float:left; text-align: center;">
                 <a href="../index.php">
-        	        <img src="../images/logo.png" alt="" style="height: 44px;">
+        	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
         	    </a>
             |
         	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
@@ -44,7 +44,7 @@
     <main>
     <div style="width: 50%">
         <div style="width: 130px;">
-            <img src="../images/logo.png" alt="" width="120" height="72">
+            <img src="../images/logos/logo.png" alt="" width="120" height="72">
         </div>
 
         <h1 style="width: 60%; text-align: center">Bitte anmelden</h1><br>
diff --git a/auth/register.php b/auth/register.php
index d154634..1d0070e 100644
--- a/auth/register.php
+++ b/auth/register.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
         <div style="float:left; text-align: center;">
             <a href="../index.php">
-    	        <img src="../images/logo.png" alt="" style="height: 44px;">
+    	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
     	    </a>
         |
     	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
@@ -44,7 +44,7 @@
     <main>
     <div style="width: 50%">
         <div style="width: 130px;">
-            <img src="../images/logo.png" alt="" width="120" height="72">
+            <img src="../images/logos/logo.png" alt="" width="120" height="72">
         </div>
 
         <h1 style="width: 50%; text-align: center">Jetzt Registrieren!</h1><br>
diff --git a/content/informatik.php b/content/informatik.php
index 12b3f4b..a79c173 100644
--- a/content/informatik.php
+++ b/content/informatik.php
@@ -1,4 +1,4 @@
-<!--
+    <!--
     Seite: Informatik
     Inhalt: Eine Übersicht über alle Beiträge zum Fach
 -->
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
             <div style="float:left; text-align: center;">
                 <a href="../index.php">
-        	        <img src="../images/logo.png" alt="" style="height: 44px;">
+        	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
         	    </a>
             |
         	<a href = "informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/content/mathe.php b/content/mathe.php
index 02134df..5885b3f 100644
--- a/content/mathe.php
+++ b/content/mathe.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
             <div style="float:left; text-align: center;">
                 <a href="../index.php">
-        	        <img src="../images/logo.png" alt="" style="height: 44px;">
+        	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
         	    </a>
             |
         	<a href = "informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/content/physik.php b/content/physik.php
index 300107d..507d718 100644
--- a/content/physik.php
+++ b/content/physik.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
             <div style="float:left; text-align: center;">
                 <a href="../index.php">
-        	        <img src="../images/logo.png" alt="" style="height: 44px;">
+        	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
         	    </a>
             |
         	<a href = "informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/content/profile.php b/content/profile.php
index 34f096a..8cb7830 100644
--- a/content/profile.php
+++ b/content/profile.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
         <div style="float:left; text-align: center;">
             <a href="../index.php">
-    	        <img src="../images/logo.png" alt="" style="height: 44px;">
+    	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
     	    </a>
         |
     	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
@@ -47,7 +47,7 @@
         <div>
             <div>
                 <h1>Benutzerdaten ändern</h1>
-                <a href="/users"><img src="../images/logo.png" alt="" width="120" height="72"></a>
+                <a href="/users"><img src="../images/logos/logo.png" alt="" width="120" height="72"></a>
             </div>
             <div>
                 <div>
diff --git a/images/guestbook.png b/images/guestbook.png
deleted file mode 100644
index 76708dd..0000000
Binary files a/images/guestbook.png and /dev/null differ
diff --git a/images/logo.png b/images/logos/logo.png
similarity index 100%
rename from images/logo.png
rename to images/logos/logo.png
diff --git a/images/logos/logo_full.png b/images/logos/logo_full.png
new file mode 100644
index 0000000..91c6056
Binary files /dev/null and b/images/logos/logo_full.png differ
diff --git a/images/logos/logo_icon.ico b/images/logos/logo_icon.ico
new file mode 100644
index 0000000..b614d6a
Binary files /dev/null and b/images/logos/logo_icon.ico differ
diff --git a/includes/navbar.php b/includes/navbar.php
index 3a486e2..8c66946 100644
--- a/includes/navbar.php
+++ b/includes/navbar.php
@@ -4,7 +4,7 @@ Globales Menü, wird via PHP später in alle Seiten eingebunden
 <nav class="nav">
     <div class="nav__left">
         <a href="index.php" class="nav_logo">
-	        <img src="images/logo.png" alt="Logo">
+	        <img src="images/logo/logo_full.png" alt="Logo">
 	    </a>
     </div>
 
diff --git a/legal/datenschutz.php b/legal/datenschutz.php
index 07c5138..7be662c 100644
--- a/legal/datenschutz.php
+++ b/legal/datenschutz.php
@@ -19,7 +19,7 @@
     <nav style="background:#808080; height: 60px;">
                 <div style="float:left; text-align: center;">
                     <a href="../index.php">
-            	        <img src="../images/logo.png" alt="" style="height: 44px;">
+            	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
             	    </a>
                 |
             	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/legal/impressum.php b/legal/impressum.php
index 2cf7b58..a214f47 100644
--- a/legal/impressum.php
+++ b/legal/impressum.php
@@ -19,7 +19,7 @@
     <nav style="background:#808080; height: 60px;">
                 <div style="float:left; text-align: center;">
                     <a href="../index.php">
-            	        <img src="../images/logo.png" alt="" style="height: 44px;">
+            	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
             	    </a>
                 |
             	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>
diff --git a/legal/nutzungsbedingungen.php b/legal/nutzungsbedingungen.php
index 9daa916..6ac7ab3 100644
--- a/legal/nutzungsbedingungen.php
+++ b/legal/nutzungsbedingungen.php
@@ -18,7 +18,7 @@
     <nav style="background:#808080; height: 60px;">
                 <div style="float:left; text-align: center;">
                     <a href="../index.php">
-            	        <img src="../images/logo.png" alt="" style="height: 44px;">
+            	        <img src="../images/logos/logo.png" alt="" style="height: 44px;">
             	    </a>
                 |
             	<a href = "../content/informatik.php" style = "padding: 5px; text-align: center; text-decoration: none; display: inline-block;"><b>Informatik</b></a>