diff --git a/src/_sass/gtk/_common-4.0.scss b/src/_sass/gtk/_common-4.0.scss
index 870ae448..604725e9 100644
--- a/src/_sass/gtk/_common-4.0.scss
+++ b/src/_sass/gtk/_common-4.0.scss
@@ -1563,6 +1563,27 @@ searchbar > revealer > box {
     border-image: none;
     box-shadow: none;
   }
+
+  > image { // icons inside the entry
+    color: gtkalpha(on($header), 0.9);
+
+    &:hover, &:active { color: on($header); }
+
+    &:disabled { color: on($header, disabled); }
+  }
+
+  > text {
+    color: on($header);
+
+    > placeholder {
+      color: on($header, disabled);
+    }
+  
+    > block-cursor {
+      color: $header;
+      background-color: on($header);
+    }
+  }
 }
 
 %header_button {
@@ -1655,6 +1676,10 @@ headerbar {
   &:backdrop {
     color: on($header, disabled);
     &:disabled { color: on($header, secondary-disabled); }
+
+    > windowhandle {
+      filter: none;
+    }
   }
 
   &:disabled { color: on($header, disabled); }
diff --git a/src/gtk/4.0/gtk-dark.css b/src/gtk/4.0/gtk-dark.css
index 867f0599..c5ee8838 100644
--- a/src/gtk/4.0/gtk-dark.css
+++ b/src/gtk/4.0/gtk-dark.css
@@ -2096,6 +2096,31 @@ headerbar entry:disabled {
   box-shadow: none;
 }
 
+headerbar entry > image {
+  color: alpha(white,0.9);
+}
+
+headerbar entry > image:hover, headerbar entry > image:active {
+  color: white;
+}
+
+headerbar entry > image:disabled {
+  color: rgba(255, 255, 255, 0.45);
+}
+
+headerbar entry > text {
+  color: white;
+}
+
+headerbar entry > text > placeholder {
+  color: rgba(255, 255, 255, 0.45);
+}
+
+headerbar entry > text > block-cursor {
+  color: #36383c;
+  background-color: white;
+}
+
 headerbar button:not(.suggested-action):not(.destructive-action) {
   box-shadow: none;
   background-color: transparent;
@@ -2209,6 +2234,10 @@ headerbar:backdrop:disabled {
   color: rgba(255, 255, 255, 0.3);
 }
 
+headerbar:backdrop > windowhandle {
+  filter: none;
+}
+
 headerbar:disabled {
   color: rgba(255, 255, 255, 0.45);
 }
diff --git a/src/gtk/4.0/gtk-light.css b/src/gtk/4.0/gtk-light.css
index 44806133..cb7282a6 100644
--- a/src/gtk/4.0/gtk-light.css
+++ b/src/gtk/4.0/gtk-light.css
@@ -2096,6 +2096,31 @@ headerbar entry:disabled {
   box-shadow: none;
 }
 
+headerbar entry > image {
+  color: alpha(rgba(0, 0, 0, 0.87),0.9);
+}
+
+headerbar entry > image:hover, headerbar entry > image:active {
+  color: rgba(0, 0, 0, 0.87);
+}
+
+headerbar entry > image:disabled {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+headerbar entry > text {
+  color: rgba(0, 0, 0, 0.87);
+}
+
+headerbar entry > text > placeholder {
+  color: rgba(0, 0, 0, 0.38);
+}
+
+headerbar entry > text > block-cursor {
+  color: #eeeeee;
+  background-color: rgba(0, 0, 0, 0.87);
+}
+
 headerbar button:not(.suggested-action):not(.destructive-action) {
   box-shadow: none;
   background-color: transparent;
@@ -2209,6 +2234,10 @@ headerbar:backdrop:disabled {
   color: rgba(0, 0, 0, 0.26);
 }
 
+headerbar:backdrop > windowhandle {
+  filter: none;
+}
+
 headerbar:disabled {
   color: rgba(0, 0, 0, 0.38);
 }
diff --git a/src/gtk/4.0/gtk.css b/src/gtk/4.0/gtk.css
index c52b423e..b89bfc83 100644
--- a/src/gtk/4.0/gtk.css
+++ b/src/gtk/4.0/gtk.css
@@ -2096,6 +2096,31 @@ headerbar entry:disabled {
   box-shadow: none;
 }
 
+headerbar entry > image {
+  color: alpha(white,0.9);
+}
+
+headerbar entry > image:hover, headerbar entry > image:active {
+  color: white;
+}
+
+headerbar entry > image:disabled {
+  color: rgba(255, 255, 255, 0.45);
+}
+
+headerbar entry > text {
+  color: white;
+}
+
+headerbar entry > text > placeholder {
+  color: rgba(255, 255, 255, 0.45);
+}
+
+headerbar entry > text > block-cursor {
+  color: #363636;
+  background-color: white;
+}
+
 headerbar button:not(.suggested-action):not(.destructive-action) {
   box-shadow: none;
   background-color: transparent;
@@ -2209,6 +2234,10 @@ headerbar:backdrop:disabled {
   color: rgba(255, 255, 255, 0.3);
 }
 
+headerbar:backdrop > windowhandle {
+  filter: none;
+}
+
 headerbar:disabled {
   color: rgba(255, 255, 255, 0.45);
 }