diff --git a/frappe/__init__.py b/frappe/__init__.py
index c04bbe1b98..9edc67a587 100644
--- a/frappe/__init__.py
+++ b/frappe/__init__.py
@@ -47,7 +47,7 @@ def _(msg, lang=None):
 		lang = local.lang
 
 	# msg should always be unicode
-	msg = cstr(msg)
+	msg = cstr(msg).strip()
 
 	return get_full_dict(local.lang).get(msg) or msg
 
diff --git a/frappe/public/css/mobile.css b/frappe/public/css/mobile.css
index 08a8e85c60..d3688f1f58 100644
--- a/frappe/public/css/mobile.css
+++ b/frappe/public/css/mobile.css
@@ -64,16 +64,6 @@ body {
     margin: 0px;
     display: inline-block;
   }
-  #navbar-breadcrumbs li {
-    max-width: 150px;
-    white-space: nowrap;
-    overflow: hidden;
-  }
-  #navbar-breadcrumbs li a {
-    width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-  }
   #navbar-breadcrumbs > li,
   #navbar-breadcrumbs > li > a {
     display: inline-block;
@@ -195,6 +185,14 @@ body {
     width: 100% !important;
   }
 }
+@media (max-width: 991px) and (max-width: 480px) {
+  #navbar-breadcrumbs li a {
+    width: 100px;
+    overflow: hidden;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+  }
+}
 @media (max-width: 767px) {
   .modal .modal-dialog {
     margin: 0px;
diff --git a/frappe/public/css/navbar.css b/frappe/public/css/navbar.css
index 8fd6326174..480ffaf0c6 100644
--- a/frappe/public/css/navbar.css
+++ b/frappe/public/css/navbar.css
@@ -187,9 +187,9 @@
 #navbar-breadcrumbs > li > a {
   padding: 6px 15px 10px 0px;
 }
-@media (max-width: 1199px) {
+@media (min-width: 991px) and (max-width: 1199px) {
   #navbar-breadcrumbs > li > a {
-    width: 140px;
+    max-width: 143px;
     overflow: hidden;
     text-overflow: ellipsis;
     white-space: nowrap;
diff --git a/frappe/public/less/mobile.less b/frappe/public/less/mobile.less
index eb47ef77bb..47cc7088a3 100644
--- a/frappe/public/less/mobile.less
+++ b/frappe/public/less/mobile.less
@@ -7,14 +7,14 @@ html {
 
 body {
 	height: 100%;
-	 // The html and body elements cannot have any padding or margin. 
+	 // The html and body elements cannot have any padding or margin.
 	margin: 0px;
 	padding: 0px !important;
 }
 
 html,
 body {
-	overflow-x: hidden;  //Prevent scroll on narrow devices 
+	overflow-x: hidden;  //Prevent scroll on narrow devices
 }
 
 @media(max-width: 991px) {
@@ -88,15 +88,14 @@ body {
 		margin: 0px;
 		display: inline-block;
 
-		li {
-			max-width: 150px;
-			white-space: nowrap;
-			overflow: hidden;
-
-			a {
-				width: 100px;
-				overflow: hidden;
-				text-overflow: ellipsis;
+		@media(max-width: 480px) {
+			li {
+				a {
+					width: 100px;
+					overflow: hidden;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
 			}
 		}
 	}
diff --git a/frappe/public/less/navbar.less b/frappe/public/less/navbar.less
index d2cafaf77f..84c8d28451 100644
--- a/frappe/public/less/navbar.less
+++ b/frappe/public/less/navbar.less
@@ -211,8 +211,8 @@
 #navbar-breadcrumbs > li > a {
 	padding: 6px 15px 10px 0px;
 
-	@media (max-width: 1199px) {
-		width: 140px;
+	@media (min-width:991px) and (max-width: 1199px) {
+		max-width: 143px;
 		overflow: hidden;
 		text-overflow: ellipsis;
 		white-space: nowrap;