diff --git a/api/js/etemplate/Et2Favorites/Et2Favorites.ts b/api/js/etemplate/Et2Favorites/Et2Favorites.ts
index d69f7ba953..ba7cda01fc 100644
--- a/api/js/etemplate/Et2Favorites/Et2Favorites.ts
+++ b/api/js/etemplate/Et2Favorites/Et2Favorites.ts
@@ -16,6 +16,7 @@ import {et2_INextmatchHeader, et2_nextmatch} from "../et2_extension_nextmatch";
 import {Et2Image} from "../Et2Image/Et2Image";
 import {Et2Dialog} from "../Et2Dialog/Et2Dialog";
 import {SlMenuItem} from "@shoelace-style/shoelace";
+import {cssImage} from "../Et2Widget/Et2Widget";
 
 /**
  * Favorites widget, designed for use in the nextmatch header
@@ -50,24 +51,34 @@ export class Et2Favorites extends Et2DropdownButton implements et2_INextmatchHea
 		return [
 			...super.styles,
 			css`
-				et2-image {
-					height: 2ex;
-					padding: 0px;
-					margin-top: -5px;
-					vertical-align: middle;
-				}
-				et2-image[src="trash"] {
-					display:none;
-				}
-				sl-menu {
-					min-width: 15em;
-				}
-				sl-menu-item:hover et2-image[src="trash"] {
-					display:initial;
-				}
-    .menu-item__chevron {
-    	display:none;
-    }
+			et2-image {
+				height: 2ex;
+				padding: 0px;
+				margin-top: -5px;
+				vertical-align: middle;
+			}
+			et2-image[src="trash"] {
+				display:none;
+			}
+			sl-menu {
+				min-width: 15em;
+			}
+			sl-menu-item:hover et2-image[src="trash"] {
+				display:initial;
+			}
+			/* Add star icons - radio button is already in prefix */
+			sl-menu-item::part(base) {
+				background-image: ${cssImage("fav_filter")};
+				background-repeat: no-repeat;
+				background-size: 16px 16px;
+				background-position: 5px center;
+			}
+			sl-menu-item[checked]::part(base) {
+				background-image: ${cssImage("favorites")};
+			}
+			sl-menu-item:last-child::part(base) {
+				background-image: none;
+			}
             `,
 		];
 	}
@@ -145,14 +156,14 @@ export class Et2Favorites extends Et2DropdownButton implements et2_INextmatchHea
                                 title="${this.egw().lang('Set as default')}"/>`;
 
 		//@ts-ignore TS doesn't know about window.app
-		let is_admin = (typeof window.app['admin'] != "undefined");
+		let is_admin = (typeof this.egw().app('admin') != "undefined");
 		//@ts-ignore option.group does not exist
 		let icon = (option.group !== false && !is_admin || option.value == 'blank') ? "" : html`
             <et2-image slot="suffix" src=${"trash"} icon @click=${this._handleDelete}
                        statustext="${this.egw().lang("Delete")}"></et2-image>`;
 
 		return html`
-            <sl-menu-item value="${option.value}">
+            <sl-menu-item value="${option.value}" ?checked="${option.value == this._preferred}">
                 ${option.value !== Et2Favorites.ADD_VALUE ? radio : ""}
                 ${icon}
                 ${option.label}
diff --git a/api/js/etemplate/Et2Image/Et2Image.ts b/api/js/etemplate/Et2Image/Et2Image.ts
index cd0ce92fe0..9cbc4e0bec 100644
--- a/api/js/etemplate/Et2Image/Et2Image.ts
+++ b/api/js/etemplate/Et2Image/Et2Image.ts
@@ -26,7 +26,6 @@ export class Et2Image extends Et2Widget(SlotMixin(LitElement)) implements et2_ID
             ::slotted(img) {
             	max-height: 100%;
             	max-width: 100%;
-            	vertical-align: middle;
             }
             :host([icon]) {
             	height: 1.3rem;
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index 40e5c0eea2..aecac0512c 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -2262,7 +2262,7 @@ div.message.floating, lion-validation-feedback[type] {
     display: inline-block;
 }
 
-.favorites .sideboxstar {
+.favorites .sideboxstar, .favorites div.ui-icon-heart {
     height: 9px;
     display: inline-block;
     padding: 0px 4px;
@@ -2292,11 +2292,17 @@ div.message.floating, lion-validation-feedback[type] {
     vertical-align: middle;
     display: inline-block;
     margin: -1px 1px 0px 1px;
+    height: 12px;
+    width: 6px;
 }
 
 .sidebox-favorites .favorites div.ui-icon-trash {
     margin-top: -5px;
     margin-right: 4px;
+
+    width: 14px;
+    height: 14px;
+    background-repeat: no-repeat;
 }
 
 ul[id$='favorites_popup_state'] span.filter_value {
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index 4174382bcc..eed0f274fa 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -934,7 +934,7 @@
     background-size: 12px 12px;
     background-position: 1px 0;
     margin-right: 9px;
-    margin-left: 2px;
+    margin-left: 4px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 4px;
@@ -4937,7 +4937,7 @@ span.overlayContainer img.overlay {
 #egw_fw_sidebar #egw_fw_splitter {
   position: absolute;
   width: 8px;
-  top: 40px;
+  top: 0px;
   bottom: 3px;
   right: 0px;
 }
@@ -5075,9 +5075,9 @@ span.overlayContainer img.overlay {
   background-image: url(../images/splitter_vert.png);
   background-position: center;
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: transparent;
   position: absolute;
-  width: 5px;
+  width: 4px;
   height: 100%;
   cursor: col-resize;
 }
@@ -5087,7 +5087,7 @@ span.overlayContainer img.overlay {
   opacity: 1 !important;
 }
 .egw_fw_ui_splitter_hover {
-  background-color: white;
+  background-color: #CDCDCD;
 }
 .egw_fw_ui_category_content {
   background-color: #ffffff;
diff --git a/pixelegg/css/monochrome.css b/pixelegg/css/monochrome.css
index e0e25de5f3..9cee259913 100644
--- a/pixelegg/css/monochrome.css
+++ b/pixelegg/css/monochrome.css
@@ -914,7 +914,7 @@
     background-size: 12px 12px;
     background-position: 1px 0;
     margin-right: 9px;
-    margin-left: 2px;
+    margin-left: 4px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 4px;
@@ -4917,7 +4917,7 @@ span.overlayContainer img.overlay {
 #egw_fw_sidebar #egw_fw_splitter {
   position: absolute;
   width: 8px;
-  top: 40px;
+  top: 0px;
   bottom: 3px;
   right: 0px;
 }
@@ -5055,9 +5055,9 @@ span.overlayContainer img.overlay {
   background-image: url(../images/splitter_vert.png);
   background-position: center;
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: transparent;
   position: absolute;
-  width: 5px;
+  width: 4px;
   height: 100%;
   cursor: col-resize;
 }
@@ -5067,7 +5067,7 @@ span.overlayContainer img.overlay {
   opacity: 1 !important;
 }
 .egw_fw_ui_splitter_hover {
-  background-color: white;
+  background-color: #CDCDCD;
 }
 .egw_fw_ui_category_content {
   background-color: #ffffff;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index e5c8ec5329..b71f2ff725 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -924,7 +924,7 @@
     background-size: 12px 12px;
     background-position: 1px 0;
     margin-right: 9px;
-    margin-left: 2px;
+    margin-left: 4px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 4px;
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 15d22a2397..baea214724 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -754,7 +754,13 @@ div.header_row_right{
 				line-height: inherit;
 				padding: 2px 1px;
 				// Heart
-				div.ui-icon-heart {background-image: url(../images/favorites.svg); background-size: 12px 12px;background-position: 1px 0;margin-right:9px;margin-left:2px;}
+				div.ui-icon-heart {
+                  background-image: url(../images/favorites.svg);
+                  background-size: 12px 12px;
+                  background-position: 1px 0;
+                  margin-right: 9px;
+                  margin-left: 4px;
+                }
 				// Bulltpoints
 				div.sideboxstar {
 					width: 4px;
diff --git a/pixelegg/mobile/fw_mobile.css b/pixelegg/mobile/fw_mobile.css
index 20056a504a..af665b7125 100644
--- a/pixelegg/mobile/fw_mobile.css
+++ b/pixelegg/mobile/fw_mobile.css
@@ -945,7 +945,7 @@
     background-size: 12px 12px;
     background-position: 1px 0;
     margin-right: 9px;
-    margin-left: 2px;
+    margin-left: 4px;
   }
   .sidebox-favorites ul.favorites li.ui-menu-item a div.sideboxstar {
     width: 4px;
@@ -4948,7 +4948,7 @@ span.overlayContainer img.overlay {
 #egw_fw_sidebar #egw_fw_splitter {
   position: absolute;
   width: 8px;
-  top: 40px;
+  top: 0px;
   bottom: 3px;
   right: 0px;
 }
@@ -5086,9 +5086,9 @@ span.overlayContainer img.overlay {
   background-image: url(../images/splitter_vert.png);
   background-position: center;
   background-repeat: no-repeat;
-  background-color: #ffffff;
+  background-color: transparent;
   position: absolute;
-  width: 5px;
+  width: 4px;
   height: 100%;
   cursor: col-resize;
 }
@@ -5098,7 +5098,7 @@ span.overlayContainer img.overlay {
   opacity: 1 !important;
 }
 .egw_fw_ui_splitter_hover {
-  background-color: white;
+  background-color: #CDCDCD;
 }
 .egw_fw_ui_category_content {
   background-color: #ffffff;