diff --git a/gtk/theme/Adwaita/_common.scss b/gtk/theme/Adwaita/_common.scss
index f477e7e3bd..5855913d3a 100644
--- a/gtk/theme/Adwaita/_common.scss
+++ b/gtk/theme/Adwaita/_common.scss
@@ -144,6 +144,8 @@ flowbox {
 }
 
 label {
+  caret-color: currentColor; // this shouldn't be needed.
+
   &.separator {
     @extend .dim-label;
 
diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index ffc271d763..9a855369fe 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -90,19 +90,21 @@ flowbox flowboxchild {
   flowbox flowboxchild:selected {
     outline-offset: -2px; }
 
-label.separator {
-  color: #eeeeec; }
-  label.separator:backdrop {
+label {
+  caret-color: currentColor; }
+  label.separator {
+    color: #eeeeec; }
+    label.separator:backdrop {
+      color: #919494; }
+  label selection {
+    background-color: #215d9c;
+    color: #ffffff; }
+  label:disabled {
+    color: #919494; }
+    label:disabled:backdrop {
+      color: #566164; }
+  label:backdrop {
     color: #919494; }
-label selection {
-  background-color: #215d9c;
-  color: #ffffff; }
-label:disabled {
-  color: #919494; }
-  label:disabled:backdrop {
-    color: #566164; }
-label:backdrop {
-  color: #919494; }
 
 .dim-label, label.separator, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle {
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index 3d8680c55a..4a7ccc779f 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -90,19 +90,21 @@ flowbox flowboxchild {
   flowbox flowboxchild:selected {
     outline-offset: -2px; }
 
-label.separator {
-  color: #2e3436; }
-  label.separator:backdrop {
+label {
+  caret-color: currentColor; }
+  label.separator {
+    color: #2e3436; }
+    label.separator:backdrop {
+      color: #8b8e8f; }
+  label selection {
+    background-color: #4a90d9;
+    color: #ffffff; }
+  label:disabled {
+    color: #8b8e8f; }
+    label:disabled:backdrop {
+      color: #c3c3c0; }
+  label:backdrop {
     color: #8b8e8f; }
-label selection {
-  background-color: #4a90d9;
-  color: #ffffff; }
-label:disabled {
-  color: #8b8e8f; }
-  label:disabled:backdrop {
-    color: #c3c3c0; }
-label:backdrop {
-  color: #8b8e8f; }
 
 .dim-label, label.separator, .titlebar:not(headerbar) .subtitle,
 headerbar .subtitle {