diff --git a/gtk/resources/theme/Adwaita/_common.scss b/gtk/resources/theme/Adwaita/_common.scss
index 0d455012b7..67b9af058d 100644
--- a/gtk/resources/theme/Adwaita/_common.scss
+++ b/gtk/resources/theme/Adwaita/_common.scss
@@ -246,6 +246,12 @@ GtkLabel {
       &:selected:backdrop { color: $backdrop_base_color; }
     }
   }
+  &.image { // entry icons colors
+    color: mix($fg_color,$base_color,80%);
+    &:hover { color: $fg_color; }
+    &:active { color: $selected_bg_color; }
+    &:backdrop { color: mix($backdrop_fg_color,$backdrop_base_color,80%); }
+  }
 }
 
 /***********
@@ -607,7 +613,7 @@ GtkColorButton.button {
     &:dir(rtl) { border-width: 0 1px 0 0; }
     &:hover {
       color: $fg_color;
-      background-color: transparentize(black,0.95);
+      background-color: transparentize($fg_color,0.95);
     }
     &:insensitive {
       color: transparentize($insensitive_fg_color,0.7);
diff --git a/gtk/resources/theme/Adwaita/gtk-contained-dark.css b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
index be91f42dc1..d461b5ab8c 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained-dark.css
@@ -256,6 +256,14 @@
       color: #292929; }
     .entry.warning:selected:backdrop {
       color: #2c2c2c; }
+  .entry.image {
+    color: #c6c6c5; }
+    .entry.image:hover {
+      color: #eeeeec; }
+    .entry.image:active {
+      color: #215d9c; }
+    .entry.image:backdrop {
+      color: #a9aba9; }
 
 /***********
  * Buttons *
@@ -702,7 +710,7 @@ GtkColorButton.button {
       border-width: 0 1px 0 0; }
     .spinbutton .button:hover {
       color: #eeeeec;
-      background-color: rgba(0, 0, 0, 0.05); }
+      background-color: rgba(238, 238, 236, 0.05); }
     .spinbutton .button:insensitive {
       color: rgba(147, 150, 149, 0.3); }
     .spinbutton .button:active {
diff --git a/gtk/resources/theme/Adwaita/gtk-contained.css b/gtk/resources/theme/Adwaita/gtk-contained.css
index b04a1d7723..154a96c6c9 100644
--- a/gtk/resources/theme/Adwaita/gtk-contained.css
+++ b/gtk/resources/theme/Adwaita/gtk-contained.css
@@ -248,6 +248,14 @@
       box-shadow: inset 0 2px 2px -2px #7f7f7f, inset 0 0 2px 1px #fde4cc, 0 1px white; }
     .entry.warning:selected, .entry.warning:selected:focus {
       background-color: #f57900; }
+  .entry.image {
+    color: #575c5e; }
+    .entry.image:hover {
+      color: #2e3436; }
+    .entry.image:active {
+      color: #4a90d9; }
+    .entry.image:backdrop {
+      color: #75797a; }
 
 /***********
  * Buttons *
@@ -694,7 +702,7 @@ GtkColorButton.button {
       border-width: 0 1px 0 0; }
     .spinbutton .button:hover {
       color: #2e3436;
-      background-color: rgba(0, 0, 0, 0.05); }
+      background-color: rgba(46, 52, 54, 0.05); }
     .spinbutton .button:insensitive {
       color: rgba(141, 144, 145, 0.3); }
     .spinbutton .button:active {