diff --git a/templates/eggs/templates/oscar/egg-base.html b/templates/eggs/templates/oscar/egg-base.html
index ee86053..79842c8 100644
--- a/templates/eggs/templates/oscar/egg-base.html
+++ b/templates/eggs/templates/oscar/egg-base.html
@@ -28,13 +28,13 @@
         <!-- Favicon and Touch Icons-->
         {% if setting %}
         {% with image=setting.logo %}
-        {% oscar_thumbnail image.url '180x180' crop='center' quality=99 as thumb %}
+        {% oscar_thumbnail image '180x180' crop='center' quality=99 as thumb %}
             <link rel="apple-touch-icon" sizes="180x180" href="{{ thumb.url }}">
-        {% oscar_thumbnail image.url '32x32' crop='center' quality=99 as thumb %}
+        {% oscar_thumbnail image '32x32' crop='center' quality=99 as thumb %}
             <link rel="icon" type="image/png" sizes="32x32" href="{{ thumb.url }}">
-        {% oscar_thumbnail image.url '16x16' crop='center' quality=99 as thumb %}
+        {% oscar_thumbnail image '16x16' crop='center' quality=99 as thumb %}
             <link rel="icon" type="image/png" sizes="16x16" href="{{ thumb.url }}">
-            {% oscar_thumbnail image.url setting.logo_size crop='center' quality=99 as thumb %}
+            {% oscar_thumbnail image setting.logo_size crop='center' quality=99 as thumb %}
                 <link rel="shortcut icon" href="{{ thumb.url }}" />
             {% endwith %}
         {% endif %}
diff --git a/templates/eggs/templates/oscar/partials/brand.html b/templates/eggs/templates/oscar/partials/brand.html
index 774f4fc..809b631 100644
--- a/templates/eggs/templates/oscar/partials/brand.html
+++ b/templates/eggs/templates/oscar/partials/brand.html
@@ -3,7 +3,7 @@
 {% block brand_title %}
 {% if setting %}
 {% with image=setting.logo %}
-{% oscar_thumbnail image.url setting.logo_size crop='center' quality=99 as thumb %}
+{% oscar_thumbnail image setting.logo_size crop='center' quality=99 as thumb %}
 <a href="{{ homepage_url }}" class="navbar-brand d-none d-sm-block mr-3 flex-shrink-0" style="min-width: 7rem;">
     <img src="{{ thumb.url }}" alt="{{ setting.store_name }}">
 </a>
@@ -13,7 +13,7 @@
 
 {% if setting %}
 {% with image=setting.logo %}
-{% oscar_thumbnail image.url setting.logo_size crop='center' quality=99 as thumb %}
+{% oscar_thumbnail image setting.logo_size crop='center' quality=99 as thumb %}
 <a href="{{ homepage_url }}" class="navbar-brand d-sm-none mr-2" style="min-width: 4.625rem;">
     <img src="{{ thumb.url }}" alt="{{ setting.store_name }}" width="74"/>
 </a>
@@ -25,4 +25,4 @@
         <input class="form-control appended-form-control" name="q" type="text" placeholder="{% trans " Search for products" %}">
         <div class="input-group-append-overlay"><span class="input-group-text"><i
                 class="czi-search"></i></span></div>
-</form>
\ No newline at end of file
+</form>
diff --git a/templates/oscar/base.html b/templates/oscar/base.html
index 7da75f0..11277e2 100644
--- a/templates/oscar/base.html
+++ b/templates/oscar/base.html
@@ -6,14 +6,14 @@
     <!-- Favicon and Touch Icons-->
     {% if setting %}
         {% with image=setting.logo %}
-            {% oscar_thumbnail image.url '180x180' crop='center' quality=99 as thumb %}
+            {% oscar_thumbnail image '180x180' crop='center' quality=99 as thumb %}
             <link rel="apple-touch-icon" sizes="180x180" href="{{ thumb.url }}">
-            {% oscar_thumbnail image.url '32x32' crop='center' quality=99 as thumb %}
+            {% oscar_thumbnail image '32x32' crop='center' quality=99 as thumb %}
             <link rel="icon" type="image/png" sizes="32x32" href="{{ thumb.url }}">
-            {% oscar_thumbnail image.url '16x16' crop='center' quality=99 as thumb %}
+            {% oscar_thumbnail image '16x16' crop='center' quality=99 as thumb %}
             <link rel="icon" type="image/png" sizes="16x16" href="{{ thumb.url }}">
-            {% oscar_thumbnail image.url setting.logo_size crop='center' quality=99 as thumb %}
+            {% oscar_thumbnail image setting.logo_size crop='center' quality=99 as thumb %}
             <link rel="shortcut icon" href="{{ thumb.url }}" />
         {% endwith %}
     {% endif %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/templates/oscar/dashboard/layout.html b/templates/oscar/dashboard/layout.html
index 9926846..fe3de5c 100644
--- a/templates/oscar/dashboard/layout.html
+++ b/templates/oscar/dashboard/layout.html
@@ -3,33 +3,36 @@
 {% load image_tags %}
 
 {% block navbar %}
-<nav class="navbar navbar-static-top navbar-inverse navbar-accounts">
-    <div class="container-fluid">
-        <div class="navbar-header">
-            <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target=".nav-accounts">
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-                <span class="icon-bar"></span>
-            </button>
-            {% block partner_logo %}
-            {% if setting %}
-                {% with image=setting.logo %}
-                    {% oscar_thumbnail image.url setting.logo_size crop='center' quality=99 as thumb %}
-                    <a href="{{ homepage_url }}" class="navbar-brand d-none d-sm-block mr-3 flex-shrink-0" style="min-width: 7rem;">
-                        <img src="{{ thumb.url }}" alt="{{ setting.store_name }}" width="60" height="38">
+    <nav class="navbar navbar-expand-lg navbar-dark bg-dark navbar-accounts">
+        {% if setting %}
+            {% with image=setting.logo %}
+                {% oscar_thumbnail image '40x40' crop='center' quality=99 as thumb %}
+                <a href="{{ homepage_url }}" class="navbar-brand"
+                   style="min-width: 7rem;background: url({{ thumb.url }}) no-repeat scroll 0 0 transparent;">{{ shop_name }}</a>
+            {% endwith %}
+        {% endif %}
+        <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#top_nav_bar" aria-controls="top_nav_bar" aria-expanded="false" aria-label="Toggle navigation">
+            <i class="fas fa-bars"></i>
+        </button>
+
+        <div class="collapse navbar-collapse" id="top_nav_bar">
+            <ul class="navbar-nav mr-auto"></ul>
+            <ul class="navbar-nav">
+                <li class="nav-item">
+                    <a class="nav-link disabled" href="#">
+                        {% trans "Welcome" %} <em>{{ user.get_full_name|default:request.user.email }}</em>
                     </a>
-                {% endwith %}
-            {% endif %}
-            {% endblock partner_logo %}
-        </div>
-        <div class="collapse navbar-collapse nav-accounts">
-            <ul class="nav navbar-nav navbar-right">
-                <li><span>{% trans "Welcome" %} <em>{{ user.get_full_name|default:request.user.email }}</em></span></li>
-                <li><a href="{{ homepage_url }}"><i class="icon-home"></i> {% trans "Return to site" %}</a></li>
-                <li><a href="{% url 'customer:summary' %}"><i class="icon-user"></i> {% trans "Account" %}</a></li>
-                <li><a href="{% url 'dashboard:logout' %}"><i class="icon-signout"></i> {% trans "Log out" %}</a></li>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{{ homepage_url }}"><i class="fas fa-home"></i> {% trans "Return to site" %}</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{% url 'customer:summary' %}"><i class="fas fa-user"></i> {% trans "Account" %}</a>
+                </li>
+                <li class="nav-item">
+                    <a class="nav-link" href="{% url 'dashboard:logout' %}"><i class="fas fa-sign-out-alt"></i> {% trans "Log out" %}</a>
+                </li>
             </ul>
         </div>
-    </div><!-- /navbar-inner -->
-</nav><!-- /navbar -->
-{% endblock navbar %}
\ No newline at end of file
+    </nav>
+{% endblock navbar %}