diff --git a/CHANGES.txt b/CHANGES.txt
index 6545fabd..481f40a7 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -2,6 +2,7 @@ New in 3.5.1.5
 ==============
 - FIX: Administration / Naviagtion menu still appearing when flat navigation is on because they are not in the side-pre region.
 - FIX: 'courselistteachericon' not showing.
+- FIX: Logo breaks header when using 'old navbar'.
 - NEW: Course content search attribute and order.
 
 New in 3.5.1.4
diff --git a/layout/tiles/header.php b/layout/tiles/header.php
index 0d234661..27467350 100755
--- a/layout/tiles/header.php
+++ b/layout/tiles/header.php
@@ -58,7 +58,6 @@
     <div id="page-header" class="clearfix<?php echo ($oldnavbar) ? ' oldnavbar' : ''; echo ($haslogo) ? ' logo' : ' nologo'; ?>">
         <div class="container-fluid">
             <div class="row-fluid">
-                <!-- HEADER: LOGO AREA -->
 <?php
 if (!$haslogo) {
     echo '<div class="pull-left">';
diff --git a/less/essential/header.less b/less/essential/header.less
index bf090902..b3748075 100644
--- a/less/essential/header.less
+++ b/less/essential/header.less
@@ -93,11 +93,6 @@
         }
     }
 
-    a.logo {
-        background-position: left center;
-        float: left;
-    }
-
     div.titlearea {
         margin-left: 80px;
         padding-left: 10px;
@@ -140,9 +135,16 @@
 }
 
 #page-header {
-    &.logo {
-        min-height: 52px;
+    &.logo .logo-container {
+        height: 52px;
+        .logo {
+            line-height: 52px;
+            img {
+                max-height: 52px;
+            }
+        }
     }
+
     &.nologo {
         height: 52px;
         max-height: 52px;
@@ -151,9 +153,16 @@
 
 @media (min-width: @navbarCollapseDesktopWidth) {
     #page-header {
-        &.logo {
-            min-height: 64px;
+        &.logo .logo-container {
+            height: 64px;
+            .logo {
+                line-height: 64px;
+                img {
+                    max-height: 64px;
+                }
+            }
         }
+
         &.nologo {
             height: 64px;
             max-height: 64px;
diff --git a/less/essential/navigation.less b/less/essential/navigation.less
index 4ff8afa9..a93d17b8 100644
--- a/less/essential/navigation.less
+++ b/less/essential/navigation.less
@@ -34,14 +34,12 @@
 
 #essentialnavbar {
     &.oldnavbar {
-        &.nologo {
-            top: 52px;
-        }
+        top: 52px;
     }
 }
 
 @media (min-width: @navbarCollapseDesktopWidth) {
-    #essentialnavbar.oldnavbar.nologo {
+    #essentialnavbar.oldnavbar {
         top: 64px;
     }
 }
diff --git a/style/essential.css b/style/essential.css
index 51497a33..85de49bb 100644
--- a/style/essential.css
+++ b/style/essential.css
@@ -14305,6 +14305,10 @@ form {
 .mform .fitem .fitemtitle div {
   display: inline;
 }
+.mform .fitem .fitemtitle .mediaplugin,
+.mform .fitem .fitemtitle .mediaplugin div {
+  display: block;
+}
 #adminsettings .error,
 .loginpanel .error,
 .mform .error {
@@ -23149,10 +23153,6 @@ table#greyboxleft h2 {
 #page-header #essentialicons button {
   margin: 0 0 0 5px;
 }
-#page-header a.logo {
-  background-position: left center;
-  float: left;
-}
 #page-header div.titlearea {
   margin-left: 80px;
   padding-left: 10px;
@@ -23184,16 +23184,28 @@ table#greyboxleft h2 {
     max-height: 80px;
   }
 }
-#page-header.logo {
-  min-height: 52px;
+#page-header.logo .logo-container {
+  height: 52px;
+}
+#page-header.logo .logo-container .logo {
+  line-height: 52px;
+}
+#page-header.logo .logo-container .logo img {
+  max-height: 52px;
 }
 #page-header.nologo {
   height: 52px;
   max-height: 52px;
 }
 @media (min-width: 980px) {
-  #page-header.logo {
-    min-height: 64px;
+  #page-header.logo .logo-container {
+    height: 64px;
+  }
+  #page-header.logo .logo-container .logo {
+    line-height: 64px;
+  }
+  #page-header.logo .logo-container .logo img {
+    max-height: 64px;
   }
   #page-header.nologo {
     height: 64px;
@@ -23367,11 +23379,11 @@ ul.socials li {
     margin-top: 0;
   }
 }
-#essentialnavbar.oldnavbar.nologo {
+#essentialnavbar.oldnavbar {
   top: 52px;
 }
 @media (min-width: 980px) {
-  #essentialnavbar.oldnavbar.nologo {
+  #essentialnavbar.oldnavbar {
     top: 64px;
   }
 }