diff --git a/src/app/components/preferences/built-in/built-in-preferences.component.html b/src/app/components/preferences/built-in/built-in-preferences.component.html
index c914afb5..5b2a8d4c 100644
--- a/src/app/components/preferences/built-in/built-in-preferences.component.html
+++ b/src/app/components/preferences/built-in/built-in-preferences.component.html
@@ -1,22 +1,26 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Built-in preferences</h1>
-      <button class="top-button" class="cancel-button" routerLink="/controller/{{ controllerId }}/preferences" mat-button>
-        Back
-      </button>
+      <div class="col-md-1">
+        <button class="top-button" class="cancel-button" routerLink="/controller/{{ controllerId }}/preferences" mat-button>
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-11">
+        <h1 class="col">Built-in templates</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
     <div class="listcontainer mat-elevation-z8">
       <mat-nav-list>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/builtin/ethernet-hubs">
-          Ethernet hubs
+          Ethernet hub templates
         </mat-list-item>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/builtin/ethernet-switches">
-          Ethernet switches
+          Ethernet switch templates
         </mat-list-item>
-        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/builtin/cloud-nodes"> Cloud nodes </mat-list-item>
+        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/builtin/cloud-nodes"> Cloud node templates </mat-list-item>
       </mat-nav-list>
     </div>
   </div>
diff --git a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
index 88aa3267..1c7f8f15 100644
--- a/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
+++ b/src/app/components/preferences/built-in/cloud-nodes/cloud-nodes-templates/cloud-nodes-templates.component.html
@@ -1,26 +1,34 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Cloud nodes templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences/builtin"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/builtin/cloud-nodes/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add cloud node template
-      </button>
+      <div class="col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button"
+          class="cancel-button"
+          routerLink="/controller/{{ controller.id }}/preferences/builtin"
+          mat-button
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-10">
+        <h1 class="col">Cloud nodes templates</h1>
+      </div>
+      <div class="col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip=" Add cloud node template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/builtin/cloud-nodes/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
+
   </div>
   <app-empty-templates-list *ngIf="!cloudNodesTemplates.length"></app-empty-templates-list>
   <div class="default-content" *ngIf="cloudNodesTemplates.length">
diff --git a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
index 0e668cc3..1560c81d 100644
--- a/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
+++ b/src/app/components/preferences/built-in/ethernet-hubs/ethernet-hubs-templates/ethernet-hubs-templates.component.html
@@ -1,25 +1,32 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Ethernet hubs templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences/builtin"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/builtin/ethernet-hubs/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add Ethernet hub template
-      </button>
+      <div class="col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button"
+          class="cancel-button"
+          routerLink="/controller/{{ controller.id }}/preferences/builtin"
+          mat-button
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-10">
+        <h1 class="col">Ethernet hubs templates</h1>
+      </div>
+      <div class="col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add Ethernet hub template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/builtin/ethernet-hubs/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
   </div>
   <app-empty-templates-list *ngIf="!ethernetHubsTemplates.length"></app-empty-templates-list>
diff --git a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
index cd05e909..d45820a5 100644
--- a/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
+++ b/src/app/components/preferences/built-in/ethernet-switches/ethernet-switches-templates/ethernet-switches-templates.component.html
@@ -1,26 +1,34 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Ethernet switches templates</h1>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        class="cancel-button"
-        routerLink="/controller/{{ controller.id }}/preferences/builtin"
-        mat-button
-      >
-        Back
-      </button>
-      <button
-        *ngIf="controller"
-        class="top-button"
-        routerLink="/controller/{{ controller.id }}/preferences/builtin/ethernet-switches/addtemplate"
-        mat-raised-button
-        color="primary"
-      >
-        Add Ethernet switch template
-      </button>
+      <div class="col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button"
+          class="cancel-button"
+          routerLink="/controller/{{ controller.id }}/preferences/builtin"
+          mat-button
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-10">
+        <h1 class="col">Ethernet switches templates</h1>
+      </div>
+      <div class="col-md-1">
+        <button
+          *ngIf="controller"
+          class="top-button cancel-button"
+          matTooltip="Add Ethernet switch template"
+          matTooltipClass="custom-tooltip"
+          routerLink="/controller/{{ controller.id }}/preferences/builtin/ethernet-switches/addtemplate"
+          mat-button
+        >
+          <mat-icon>add_circle_outline</mat-icon>
+        </button>
+      </div>
     </div>
+
   </div>
   <app-empty-templates-list *ngIf="!ethernetSwitchesTemplates.length"></app-empty-templates-list>
   <div class="default-content" *ngIf="ethernetSwitchesTemplates.length">
diff --git a/src/app/components/preferences/preferences.component.html b/src/app/components/preferences/preferences.component.html
index ce2d3938..ec9868e5 100644
--- a/src/app/components/preferences/preferences.component.html
+++ b/src/app/components/preferences/preferences.component.html
@@ -1,18 +1,36 @@
 <div class="content">
   <div class="default-header">
     <div class="row">
-      <h1 class="col">Preferences</h1>
+      <div class="col-md-1">
+        <button
+          class="top-button"
+          class="cancel-button"
+          routerLink="/controller/{{ controllerId }}/projects"
+          mat-button
+        >
+          <mat-icon>arrow_back</mat-icon>
+        </button>
+      </div>
+      <div class="col-md-11">
+        <h1 class="col">Template preferences</h1>
+      </div>
     </div>
   </div>
   <div class="default-content">
     <div class="listcontainer mat-elevation-z8">
       <mat-nav-list>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/builtin"> Built-in </mat-list-item>
-        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/dynamips/templates"> Dynamips </mat-list-item>
-        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/iou/templates"> IOS on Unix </mat-list-item>
+        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/dynamips/templates">
+          Dynamips
+        </mat-list-item>
+        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/iou/templates">
+          IOS on Unix
+        </mat-list-item>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/vpcs/templates"> VPCS </mat-list-item>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/qemu/templates"> QEMU </mat-list-item>
-        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/virtualbox/templates"> VirtualBox </mat-list-item>
+        <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/virtualbox/templates">
+          VirtualBox
+        </mat-list-item>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/vmware/templates"> VMware </mat-list-item>
         <mat-list-item routerLink="/controller/{{ controllerId }}/preferences/docker/templates"> Docker </mat-list-item>
       </mat-nav-list>