diff --git a/api/js/etemplate/Et2Image/Et2Image.ts b/api/js/etemplate/Et2Image/Et2Image.ts
index 4de56ca8ad..a1aa4c5cc2 100644
--- a/api/js/etemplate/Et2Image/Et2Image.ts
+++ b/api/js/etemplate/Et2Image/Et2Image.ts
@@ -177,7 +177,7 @@ export class Et2Image extends Et2Widget(LitElement) implements et2_IDetachedDOM
             <img ${this.id ? html`id="${this.id}"` : ''}
                  src="${url}"
                  alt="${this.label}"
-				 style="${this.height ? 'height: 100%; width: auto' : (this.width ? 'width: 100%; height: auto' : 'max-width: 100%; height: auto')}"
+				 style="${this.height ? 'height: 100%; width: auto' : (this.width ? 'width: 100%; height: auto' : 'width: 16px; height: auto')}"
                  part="image"
                  loading="lazy"
                  title="${this.statustext || this.label}"
diff --git a/api/js/etemplate/Et2Tree/Et2Tree.ts b/api/js/etemplate/Et2Tree/Et2Tree.ts
index a4796d6a21..04702dd3e0 100644
--- a/api/js/etemplate/Et2Tree/Et2Tree.ts
+++ b/api/js/etemplate/Et2Tree/Et2Tree.ts
@@ -239,9 +239,10 @@ export class Et2Tree extends Et2WidgetWithSelectMixin(LitElement) implements Fin
                 /* Stop icon from shrinking if there's not enough space */
                 /* increase font size by 2px this was previously done in pixelegg css but document css can not reach shadow root*/
 
-                sl-tree-item sl-icon {
+                sl-tree-item et2-image {
                     flex: 0 0 1em;
                     font-size: calc(100% + 2px);
+					padding-right: .4em;
                 }
 
                 ::part(label) {
diff --git a/pixelegg/css/fancy.css b/pixelegg/css/fancy.css
index 60390d7af9..9ba673e04f 100644
--- a/pixelegg/css/fancy.css
+++ b/pixelegg/css/fancy.css
@@ -6094,6 +6094,7 @@ table.egwGridView_grid img {
 }
 table.egwGridView_grid et2-image {
   width: 16px;
+  font-size: 16px;
 }
 table.egwGridView_grid tbody {
   border-bottom: 1px solid #000000;
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 152e8c113b..ac65318115 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -6097,6 +6097,7 @@ table.egwGridView_grid img {
 }
 table.egwGridView_grid et2-image {
   width: 16px;
+  font-size: 16px;
 }
 table.egwGridView_grid tbody {
   border-bottom: 1px solid #000000;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index 5633f3b05b..6407ac7bf9 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -6076,6 +6076,7 @@ table.egwGridView_grid img {
 }
 table.egwGridView_grid et2-image {
   width: 16px;
+  font-size: 16px;
 }
 table.egwGridView_grid tbody {
   border-bottom: 1px solid #000000;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 228a3f0078..643887bd51 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -6087,6 +6087,7 @@ table.egwGridView_grid img {
 }
 table.egwGridView_grid et2-image {
   width: 16px;
+  font-size: 16px;
 }
 table.egwGridView_grid tbody {
   border-bottom: 1px solid #000000;
diff --git a/pixelegg/less/layout_table.less b/pixelegg/less/layout_table.less
index 8f42b49036..8edc64fad4 100755
--- a/pixelegg/less/layout_table.less
+++ b/pixelegg/less/layout_table.less
@@ -178,7 +178,10 @@ table.egwGridView_grid
     width: 100%;
 
     img{ .dimension_height_s;}
-    et2-image { width: 16px; }
+    et2-image {
+        width: 16px;
+        font-size: 16px;
+    }
 
     tbody {
         border-bottom: 1px solid @lightgray;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index b025a2e665..6108605269 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -6108,6 +6108,7 @@ table.egwGridView_grid img {
 }
 table.egwGridView_grid et2-image {
   width: 16px;
+  font-size: 16px;
 }
 table.egwGridView_grid tbody {
   border-bottom: 1px solid #000000;