diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html
index 102cecf11..247a4ef0f 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.component.html
@@ -1,9 +1,5 @@
 <div class="esh-basket">
-    <div class="esh-basket-header">
-        <div class="container">
-            <a class="esh-basket-back" routerLink="/catalog">Back to catalog</a>
-        </div>
-    </div>
+    <esh-header url="/catalog">Back to catalog</esh-header>
 
     <div class="container">
         <article class="esh-basket-titles row">
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts
index 5f954e332..a7b14e090 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/basket/basket.module.ts
@@ -4,8 +4,8 @@ import { BrowserModule  }               from '@angular/platform-browser';
 import { SharedModule }                 from '../shared/shared.module';
 import { BasketComponent }              from './basket.component';
 import { BasketStatusComponent }        from './basket-status/basket-status.component';
-//import { routing }                      from './basket.routes';
 import { BasketService }                from './basket.service';
+import { Header }                from '../shared/components/header/header';
 
 @NgModule({
     imports: [SharedModule],
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts
index 4aba2c433..254690de2 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.component.ts
@@ -57,7 +57,6 @@ export class CatalogComponent implements OnInit {
     getCatalog(pageSize:number, pageIndex: number, brand?: number, type?: number) {
         this.service.getCatalog(pageIndex, pageSize, brand, type).subscribe(catalog => {
             this.catalog = catalog;
-            //console.log('catalog items retrieved: ' + catalog.count);
 
             this.paginationInfo = {
                 actualPage : catalog.pageIndex,
@@ -67,7 +66,6 @@ export class CatalogComponent implements OnInit {
                 items: catalog.pageSize
             };
 
-            //console.log(this.paginationInfo);
         });
     }
 
@@ -76,7 +74,6 @@ export class CatalogComponent implements OnInit {
             this.types = types;
             let alltypes = { id: null, type: 'All' };
             this.types.unshift(alltypes);
-            //console.log('types retrieved: ' + types.length);
         });
     }
 
@@ -85,7 +82,6 @@ export class CatalogComponent implements OnInit {
             this.brands = brands;
             let allBrands = { id: null, brand: 'All' };
             this.brands.unshift(allBrands);
-            //console.log('brands retrieved: ' + brands.length);
         });
     }
 }
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts
index d520db097..2736b4b7e 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/catalog/catalog.module.ts
@@ -3,7 +3,6 @@ import { BrowserModule  }       from '@angular/platform-browser';
 
 import { SharedModule }         from '../shared/shared.module';
 import { CatalogComponent }     from './catalog.component';
-//import { routing }              from './catalog.routes';
 import { CatalogService }       from './catalog.service';
 import { Pager }                from '../shared/components/pager/pager';
 
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html
index eabf08e1f..fb2dfaa26 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.html
@@ -1,9 +1,5 @@
 <div class="esh-orders_detail">
-    <div class="esh-orders_detail-header">
-        <div class="container">
-            <a class="esh-orders_detail-back" routerLink="/orders">Back to list</a>
-        </div>
-    </div>
+    <esh-header url="/orders">Back to list</esh-header>
 
     <div class="container">
         <section class="esh-orders_detail-section">
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss
index d84940461..c34f44bdd 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders-detail/orders-detail.component.scss
@@ -3,25 +3,6 @@
 .esh-orders_detail {
     min-height: 80vh;
 
-    $header-height: 4rem;
-    &-header {
-        background-color: #00A69C;
-        height: $header-height;
-    }
-
-    &-back {
-        color: rgba($color-foreground-brighter, .4);
-        line-height: $header-height;
-        text-transform: uppercase;
-        text-decoration: none;
-        transition: color $animation-speed-default;
-
-        &:hover {
-            color: $color-foreground-brighter;
-            transition: color $animation-speed-default;
-        }
-    }
-
     &-section {
         padding: 1rem 0;
 
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html
index 1e18813ba..f6c547279 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.component.html
@@ -1,9 +1,5 @@
 <div class="esh-orders">
-    <div class="esh-orders-header">
-        <div class="container">
-            <a class="esh-orders-back" routerLink="/catalog">Back to catalog</a>
-        </div>
-    </div>
+    <esh-header url="/catalog">Back to catalog</esh-header>
 
     <div class="container">
         <article class="esh-orders-titles row">
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts
index 6e8f73358..1ecd0e9f5 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/orders/orders.module.ts
@@ -6,7 +6,7 @@ import { OrdersComponent }      from './orders.component';
 import { OrdersDetailComponent }      from './orders-detail/orders-detail.component';
 import { OrdersNewComponent }      from './orders-new/orders-new.component';
 import { OrdersService }        from './orders.service';
-import { Pager }                from '../shared/components/pager/pager';
+import { Header }                from '../shared/components/header/header';
 
 @NgModule({
     imports: [BrowserModule, SharedModule],
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.html b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.html
new file mode 100644
index 000000000..c0f771fa6
--- /dev/null
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.html
@@ -0,0 +1,7 @@
+<div class="esh-header">
+    <div class="container">
+        <a class="esh-header-back" routerLink="{{url}}">
+            <ng-content></ng-content>
+        </a>
+    </div>
+</div>
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss
new file mode 100644
index 000000000..8f06233da
--- /dev/null
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.scss
@@ -0,0 +1,21 @@
+@import "../../../variables";
+
+.esh-header {
+    $header-height: 4rem;
+
+    background-color: $color-brand;
+    height: $header-height;
+
+    &-back {
+        color: rgba($color-foreground-brighter, .4);
+        line-height: $header-height;
+        text-transform: uppercase;
+        text-decoration: none;
+        transition: color $animation-speed-default;
+
+        &:hover {
+            color: $color-foreground-brighter;
+            transition: color $animation-speed-default;
+        }
+    }
+}
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.ts
new file mode 100644
index 000000000..43e996d0f
--- /dev/null
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/header/header.ts
@@ -0,0 +1,11 @@
+import { Component, Input } from '@angular/core';
+
+@Component({
+    selector: 'esh-header',
+    templateUrl: './header.html',
+    styleUrls: ['./header.scss']
+})
+export class Header {
+    @Input()
+    url: string;
+}
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
index edec0e452..152c987dc 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/components/identity/identity.scss
@@ -39,7 +39,7 @@
     }
 
     &:hover &-drop {
-        height: 6rem;
+        height: 7rem;
         transition: height $animation-speed-default;
     }
 
diff --git a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/shared.module.ts b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/shared.module.ts
index c55830018..cde0b9a5e 100644
--- a/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/shared.module.ts
+++ b/src/Web/WebSPA/eShopOnContainers.WebSPA/Client/modules/shared/shared.module.ts
@@ -20,8 +20,9 @@ import { BasketWrapperService} from './services/basket.wrapper.service';
 import { SecurityService } from './services/security.service';
 
 //Components:
-import {Pager } from './components/pager/pager';
-import {Identity } from './components/identity/identity';
+import { Pager } from './components/pager/pager';
+import { Header } from './components/header/header';
+import { Identity } from './components/identity/identity';
 
 @NgModule({
     imports: [
@@ -41,7 +42,8 @@ import {Identity } from './components/identity/identity';
         ErrorSummaryComponent,
         PageHeadingComponent,
         UppercasePipe,
-        Pager, 
+        Pager,
+        Header,
         Identity
     ],
     exports: [
@@ -60,7 +62,8 @@ import {Identity } from './components/identity/identity';
         //HeaderComponent,
         PageHeadingComponent,
         UppercasePipe,
-        Pager, 
+        Pager,
+        Header,
         Identity
     ]
 })