diff --git a/app/app/components/layout/button-home.js b/app/app/components/layout/button-home.js
new file mode 100644
index 00000000..f62de890
--- /dev/null
+++ b/app/app/components/layout/button-home.js
@@ -0,0 +1,14 @@
+// Copyright 2016 Documize Inc. <legal@documize.com>. All rights reserved.
+//
+// This software (Documize Community Edition) is licensed under
+// GNU AGPL v3 http://www.gnu.org/licenses/agpl-3.0.en.html
+//
+// You can operate outside the AGPL restrictions by purchasing
+// Documize Enterprise Edition and obtaining a commercial license
+// by contacting <sales@documize.com>.
+//
+// https://documize.com
+
+import Ember from 'ember';
+
+export default Ember.Component.extend({});
diff --git a/app/app/pods/customize/template.hbs b/app/app/pods/customize/template.hbs
index 97e2e6e1..ae1e4594 100644
--- a/app/app/pods/customize/template.hbs
+++ b/app/app/pods/customize/template.hbs
@@ -3,14 +3,7 @@
 	{{layout/zone-navigation}}
 
 	{{#layout/zone-header title="Documize Settings" message="General options, space management, user management"}}
-		<div class="pull-right">
-			{{#link-to 'folders.folder' folder.id folder.slug}}
-				<div class="regular-button button-white">
-					<i class="material-icons">arrow_back</i>
-					<div class="name">space</div>
-				</div>
-			{{/link-to}}
-		</div>
+		{{layout/button-home}}
 	{{/layout/zone-header}}
 
 	{{#layout/zone-sidebar}}
diff --git a/app/app/pods/profile/template.hbs b/app/app/pods/profile/template.hbs
index af3f6b5d..69cc6f6d 100644
--- a/app/app/pods/profile/template.hbs
+++ b/app/app/pods/profile/template.hbs
@@ -3,14 +3,7 @@
 	{{layout/zone-navigation}}
 
 	{{#layout/zone-header title=session.user.fullname message="Your Documize profile"}}
-		<div class="pull-right">
-			{{#link-to 'folders.folder' folder.id folder.slug}}
-				<div class="regular-button button-white">
-					<i class="material-icons">arrow_back</i>
-					<div class="name">home</div>
-				</div>
-			{{/link-to}}
-		</div>
+		{{layout/button-home}}
 	{{/layout/zone-header}}
 
 	{{#layout/zone-sidebar}}
diff --git a/app/app/pods/search/template.hbs b/app/app/pods/search/template.hbs
index ce1b44b4..ccdf0b50 100644
--- a/app/app/pods/search/template.hbs
+++ b/app/app/pods/search/template.hbs
@@ -3,6 +3,7 @@
 	{{layout/zone-navigation}}
 
 	{{#layout/zone-header title=session.appMeta.title message=session.appMeta.message}}
+		{{layout/button-home}}
 	{{/layout/zone-header}}
 
 	<div class="page-search">
diff --git a/app/app/styles/view/document/content.scss b/app/app/styles/view/document/content.scss
index e784254e..609b88c1 100644
--- a/app/app/styles/view/document/content.scss
+++ b/app/app/styles/view/document/content.scss
@@ -43,7 +43,7 @@
 					}
 
 					> .file {
-						font-size: 1rem;
+						font-size: 0.9rem;
 					}
 				}
 
diff --git a/app/app/templates/components/layout/button-home.hbs b/app/app/templates/components/layout/button-home.hbs
new file mode 100644
index 00000000..28542c39
--- /dev/null
+++ b/app/app/templates/components/layout/button-home.hbs
@@ -0,0 +1,6 @@
+{{#link-to 'application'}}
+	<div class="regular-button button-white">
+		<i class="material-icons">arrow_back</i>
+		<div class="name">home</div>
+	</div>
+{{/link-to}}
diff --git a/app/app/templates/components/layout/zone-navigation.hbs b/app/app/templates/components/layout/zone-navigation.hbs
index 6d7345f2..433bcacb 100644
--- a/app/app/templates/components/layout/zone-navigation.hbs
+++ b/app/app/templates/components/layout/zone-navigation.hbs
@@ -6,13 +6,13 @@
                     <i class="material-icons">apps</i>
                 </div>
             {{else}}
-                {{#link-to 'folders.folder' folder.id folder.slug title=session.appMeta.title}}
+                {{#link-to 'application' title=session.appMeta.title}}
                     <div class="header-button">
                         <i class="material-icons">apps</i>
                     </div>
                 {{/link-to}}
             {{/if}}
-			{{#link-to 'folders.folder' folder.id folder.slug class="title"}}
+			{{#link-to 'application' class="title"}}
             	<div>{{session.appMeta.title}}</div>
 			{{/link-to}}
     	</div>