diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss
index b88801344d..61352e9768 100644
--- a/platform/commonUI/general/res/sass/_icons.scss
+++ b/platform/commonUI/general/res/sass/_icons.scss
@@ -85,9 +85,12 @@
 	// Used in grid-item.html, tree-item, inspector location, more?
 	@extend .ui-symbol;
     @extend .icon;
-    display: inline-block;
+    //display: inline-block;
     line-height: normal; // This is Ok for the symbolsfont
     position: relative;
+    .t-item-icon-glyph {
+        position: relative;
+    }
     &.l-icon-link {
         .t-item-icon-glyph {
             &:before {
diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss
index afa1b37a67..fdadaecad3 100644
--- a/platform/commonUI/general/res/sass/tree/_tree.scss
+++ b/platform/commonUI/general/res/sass/tree/_tree.scss
@@ -72,7 +72,6 @@ ul.tree {
 
 	.t-object-label {
 		line-height: $menuLineH;
-
         .t-item-icon {
             @include txtShdwSubtle($shdwItemTreeIcon);
             font-size: $treeTypeIconH;
@@ -80,7 +79,6 @@ ul.tree {
             margin-right: $interiorMargin;
             width: $treeTypeIconW;
         }
-		.title-label,
         .t-title-label {
             @include ellipsize();
 		}
diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html
index 2b04d85e37..62babcf9ca 100644
--- a/platform/commonUI/general/res/templates/label.html
+++ b/platform/commonUI/general/res/templates/label.html
@@ -19,9 +19,9 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span class="t-object-label l-flex-row flex-elem grows">
-    <span class="t-item-icon flex-elem" ng-class="{ 'l-icon-link':location.isLink() }">
-        <span class="t-item-icon-glyph">{{type.getGlyph()}}</span>
-    </span>
-    <span class='t-title-label flex-elem grows'>{{model.name}}</span>
-</span>
+<div class="t-object-label l-flex-row flex-elem grows">
+    <div class="t-item-icon flex-elem" ng-class="{ 'l-icon-link':location.isLink() }">
+        <div class="t-item-icon-glyph">{{type.getGlyph()}}</div>
+    </div>
+    <div class='t-title-label flex-elem grows'>{{model.name}}</div>
+</div>
diff --git a/platform/commonUI/themes/espresso/res/css/theme-espresso.css b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
index 828c27dd41..07ce98ffa3 100644
--- a/platform/commonUI/themes/espresso/res/css/theme-espresso.css
+++ b/platform/commonUI/themes/espresso/res/css/theme-espresso.css
@@ -830,10 +830,12 @@ mct-container {
 
 /* line 84, ../../../../general/res/sass/_icons.scss */
 .t-item-icon {
-  display: inline-block;
   line-height: normal;
   position: relative; }
-  /* line 93, ../../../../general/res/sass/_icons.scss */
+  /* line 91, ../../../../general/res/sass/_icons.scss */
+  .t-item-icon .t-item-icon-glyph {
+    position: relative; }
+  /* line 96, ../../../../general/res/sass/_icons.scss */
   .t-item-icon.l-icon-link .t-item-icon-glyph:before {
     color: #49dedb;
     content: "\f4";
diff --git a/platform/commonUI/themes/snow/res/css/theme-snow.css b/platform/commonUI/themes/snow/res/css/theme-snow.css
index ea2e6cd015..2c8fe466c1 100644
--- a/platform/commonUI/themes/snow/res/css/theme-snow.css
+++ b/platform/commonUI/themes/snow/res/css/theme-snow.css
@@ -830,10 +830,12 @@ mct-container {
 
 /* line 84, ../../../../general/res/sass/_icons.scss */
 .t-item-icon {
-  display: inline-block;
   line-height: normal;
   position: relative; }
-  /* line 93, ../../../../general/res/sass/_icons.scss */
+  /* line 91, ../../../../general/res/sass/_icons.scss */
+  .t-item-icon .t-item-icon-glyph {
+    position: relative; }
+  /* line 96, ../../../../general/res/sass/_icons.scss */
   .t-item-icon.l-icon-link .t-item-icon-glyph:before {
     color: #49dedb;
     content: "\f4";