diff --git a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss
index 957668cc1d..dd705b0000 100644
--- a/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss
+++ b/platform/commonUI/general/res/sass/user-environ/_bottom-bar.scss
@@ -54,7 +54,7 @@
 .status.block {
 	//display: inline-block;
 	display: inline;  // New status bar design. Inline to support ellipsis overflow
-	margin-right: $interiorMargin * 2;
+	margin-right: $interiorMarginLg;
 	.status-indicator {
 		//@include border-radius($controlCr * 0.9);
 		//@include box-shadow(inset rgba(black, 0.5) 0 0 3px);
diff --git a/platform/commonUI/general/res/templates/indicator.html b/platform/commonUI/general/res/templates/indicator.html
index a07979b212..34ea2fe9c8 100644
--- a/platform/commonUI/general/res/templates/indicator.html
+++ b/platform/commonUI/general/res/templates/indicator.html
@@ -22,7 +22,8 @@
 <div class='status block'
      title="{{ngModel.getDescription()}}"
      ng-click='ngModel.configure()'
-     ng-class='ngModel.getClass()'>
+     ng-class='ngModel.getClass()'
+     ng-show="ngModel.getText().length > 0">
     <span class="ui-symbol status-indicator"
           ng-class='ngModel.getGlyphClass()'>
         {{ngModel.getGlyph()}}
@@ -31,9 +32,9 @@
           ng-class='ngModel.getTextClass()'>
         {{ngModel.getText()}}
     </span>
-    <a href=''
-       class="ui-symbol"
-       ng-if="ngModel.configure">
-        G
-    </a>
+	<a href=''
+	   class="ui-symbol"
+	   ng-if="ngModel.configure">
+		G
+	</a>
 </div>
\ No newline at end of file