diff --git a/public/css/built.css b/public/css/built.css
index d4b3a8204e6b..4a7c3612187f 100644
--- a/public/css/built.css
+++ b/public/css/built.css
@@ -2910,8 +2910,24 @@ box-shadow:         0px 0px 15px 0px rgba(0, 5, 5, 0.2);
    .large-dialog {
         width: 960px;
    }
-   .hide-desktop 
-   {
+   .hide-desktop {
+        display: none;
+   }
+}
+
+/* Style to fix navigation by show icon instead of name */
+@media only screen and (min-width : 1200px) {
+   .nav-account-icon {
+        display: none;
+   }
+}
+@media only screen and (max-width : 992px) {
+   .nav-account-icon {
+        display: none;
+   }
+}
+@media only screen and (max-width : 1200px) and (min-width: 992px) {
+   .nav-account-name {
         display: none;
    }
 }
diff --git a/public/css/style.css b/public/css/style.css
index e469e9418d83..97f2bbf79edf 100644
--- a/public/css/style.css
+++ b/public/css/style.css
@@ -783,8 +783,24 @@ box-shadow:         0px 0px 15px 0px rgba(0, 5, 5, 0.2);
    .large-dialog {
         width: 960px;
    }
-   .hide-desktop 
-   {
+   .hide-desktop {
+        display: none;
+   }
+}
+
+/* Style to fix navigation by show icon instead of name */
+@media only screen and (min-width : 1200px) {
+   .nav-account-icon {
+        display: none;
+   }
+}
+@media only screen and (max-width : 992px) {
+   .nav-account-icon {
+        display: none;
+   }
+}
+@media only screen and (max-width : 1200px) and (min-width: 992px) {
+   .nav-account-name {
         display: none;
    }
 }
diff --git a/resources/views/header.blade.php b/resources/views/header.blade.php
index 4a795e0e8a1a..46bebbd68732 100644
--- a/resources/views/header.blade.php
+++ b/resources/views/header.blade.php
@@ -427,14 +427,16 @@
 
         <div class="btn-group user-dropdown">
           <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
-            <div id="myAccountButton" class="ellipsis" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '130' : '100' }}px">
+            <div id="myAccountButton" class="ellipsis nav-account-name" style="max-width:{{ Utils::isPro() && ! Utils::isTrial() ? '130' : '100' }}px;">
                 @if (session(SESSION_USER_ACCOUNTS) && count(session(SESSION_USER_ACCOUNTS)))
                     {{ Auth::user()->account->getDisplayName() }}
                 @else
                     {{ Auth::user()->getDisplayName() }}
                 @endif
               <span class="caret"></span>
-            </div>            
+            </div>
+            <span class="glyphicon glyphicon-user nav-account-icon" style="padding-left:0px" 
+                title="{{ Auth::user()->account->getDisplayName() }}"/>            
           </button>			
           <ul class="dropdown-menu user-accounts">
             @if (session(SESSION_USER_ACCOUNTS))
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index afdc9c3ed3e9..ded91d7e0c90 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -87,7 +87,7 @@
 
 			<div data-bind="with: client" class="invoice-contact">
 				<div style="display:none" class="form-group" data-bind="visible: contacts().length > 0 &amp;&amp; (contacts()[0].email() || contacts()[0].first_name()), foreach: contacts">
-					<div class="col-lg-8 col-lg-offset-4">
+					<div class="col-lg-8 col-lg-offset-4 col-sm-offset-4">
 						<label class="checkbox" data-bind="attr: {for: $index() + '_check'}" onclick="refreshPDF(true)">
                             <input type="hidden" value="0" data-bind="attr: {name: 'client[contacts][' + $index() + '][send_invoice]'}">
 							<input type="checkbox" value="1" data-bind="checked: send_invoice, attr: {id: $index() + '_check', name: 'client[contacts][' + $index() + '][send_invoice]'}">