diff --git a/lib/web/css/source/lib/_icons.less b/lib/web/css/source/lib/_icons.less
index d113935e2b1cd..abb8b43368f13 100644
--- a/lib/web/css/source/lib/_icons.less
+++ b/lib/web/css/source/lib/_icons.less
@@ -25,9 +25,12 @@
     @_icon-font-text-hide: @icon-font__text-hide,
     @_icon-font-display: @icon-font__display
 ) when (@_icon-font-position = before) {
-    ._lib-icon-text-hide(@_icon-font-text-hide);
     .lib-css(display, @_icon-font-display);
-    text-decoration: none;
+    text-decoration: none; 
+    
+    & when not (@_icon-font-content = false) {
+        ._lib-icon-text-hide(@_icon-font-text-hide);
+    }
 
     &:before {
         ._lib-icon-font(
@@ -68,10 +71,13 @@
     @_icon-font-text-hide: @icon-font__text-hide,
     @_icon-font-display: @icon-font__display
 ) when (@_icon-font-position = after) {
-    ._lib-icon-text-hide(@_icon-font-text-hide);
     .lib-css(display, @_icon-font-display);
     text-decoration: none;
-
+    
+    & when not (@_icon-font-content = false) {
+        ._lib-icon-text-hide(@_icon-font-text-hide);
+    }
+    
     &:after {
         ._lib-icon-font(
             @_icon-font-content,
@@ -151,8 +157,11 @@
     @_icon-image-text-hide: @icon__text-hide
 ) when (@_icon-image-position = before) {
     display: inline-block;
-    ._lib-icon-text-hide(@_icon-image-text-hide);
-
+    
+    & when not (@_icon-image = false) {
+        ._lib-icon-text-hide(@_icon-image-text-hide);
+    }
+    
     &:before {
         ._lib-icon-image(
             @_icon-image,
@@ -179,7 +188,10 @@
     @_icon-image-text-hide: @icon__text-hide
 ) when (@_icon-image-position = after) {
     display: inline-block;
-    ._lib-icon-text-hide(@_icon-image-text-hide);
+    
+    & when not (@_icon-image = false) {
+        ._lib-icon-text-hide(@_icon-font-text-hide);
+    }
 
     &:after {
         ._lib-icon-image(