diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 9b09565c37..2a120c9192 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -25,6 +25,10 @@
 	<li class="rating-icons"></li>
 </ul>
 <ul class="list-unstyled sidebar-menu">
+	<li class="visible-sm visible-xs">
+		<a class="navbar-home " href="#"><img class="erpnext-icon" src="http://group.local:8000/assets/erpnext/images/erp-icon.svg"></a>
+	</li>
+	<li class="divider visible-sm visible-xs"></li>
 	<li style="position: relative;">
 		<a class="sidebar-comments badge-hover">
 			<span>{%= __("Comments") %}</span>
diff --git a/frappe/public/js/frappe/list/list_sidebar.html b/frappe/public/js/frappe/list/list_sidebar.html
index 6b113fce79..1e778fc32c 100644
--- a/frappe/public/js/frappe/list/list_sidebar.html
+++ b/frappe/public/js/frappe/list/list_sidebar.html
@@ -3,6 +3,10 @@
 </ul>
 <ul class="list-unstyled sidebar-menu standard-actions">
 	{% if frappe.model.can_get_report(doctype) %}
+	<li class="visible-sm visible-xs">
+		<a class="navbar-home " href="#"><img class="erpnext-icon" src="http://group.local:8000/assets/erpnext/images/erp-icon.svg"></a>
+	</li>
+	<li class="divider visible-sm visible-xs"></li>
 	<li class="list-link">
 		<div class="btn-group">
 			<a class="dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
diff --git a/frappe/public/js/frappe/ui/toolbar/navbar.html b/frappe/public/js/frappe/ui/toolbar/navbar.html
index 1d9f459883..96ca1ead4e 100644
--- a/frappe/public/js/frappe/ui/toolbar/navbar.html
+++ b/frappe/public/js/frappe/ui/toolbar/navbar.html
@@ -80,7 +80,7 @@
 							<div class="input-group" style="width: 100%">
 								<input id="modal-search" type="text" class="form-control"
 								placeholder="{%= __("Search or type a command") %}" aria-haspopup="true">
-								<button type="reset" class="close"><i class="octicon octicon-x"></i></button>
+								<button type="reset" class="close" data-dismiss="modal"><i class="octicon octicon-x"></i></button>
 							</div>
 						</form>
 					</div>
diff --git a/frappe/public/less/form.less b/frappe/public/less/form.less
index d783e33303..9e3f4b7234 100644
--- a/frappe/public/less/form.less
+++ b/frappe/public/less/form.less
@@ -915,14 +915,9 @@ select.form-control {
 		// }
 
 		.form-control {
-			border: none;
-			border-bottom: 1px solid @border-color;
-			box-shadow: none;
-			background-color: inherit;
 			height: auto;
 			padding: 0px;
 			margin-bottom: 7px;
-			border-radius: 0px;
 
 			// make all fields left-aligned!
 			text-align: left !important;
diff --git a/frappe/public/less/mobile.less b/frappe/public/less/mobile.less
index 13b124feec..a3c446cf98 100644
--- a/frappe/public/less/mobile.less
+++ b/frappe/public/less/mobile.less
@@ -40,7 +40,7 @@ body {
 		}
 
 		.page-title .indicator {
-			display: inline-block;
+			display: none;
 			margin-top: 12px;
 		}
 
diff --git a/frappe/public/less/page.less b/frappe/public/less/page.less
index d051a63b00..e9e426c114 100644
--- a/frappe/public/less/page.less
+++ b/frappe/public/less/page.less
@@ -177,7 +177,7 @@ select.input-sm {
 
 @media(max-width: @screen-xs) {
 	.page-actions {
-		max-width: 150px;
+		position: absolute;
 		float: right;
 	}