diff --git a/gtk/theme/Adwaita/gtk-contained-dark.css b/gtk/theme/Adwaita/gtk-contained-dark.css
index d4a2b3e22b..6ecfe0c027 100644
--- a/gtk/theme/Adwaita/gtk-contained-dark.css
+++ b/gtk/theme/Adwaita/gtk-contained-dark.css
@@ -414,6 +414,25 @@ treeview entry.flat, treeview entry {
   treeview entry.flat:focus, treeview entry:focus {
     border-color: #215d9c; }
 
+.entry-tag {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  background-color: #0c0d0d; }
+  .entry-tag:hover {
+    background-color: #232729; }
+  .entry-tag .button {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    background-color: transparent; }
+
 /***********
  * Buttons *
  ***********/
@@ -2240,7 +2259,6 @@ menubar,
 menu,
 .menu,
 .context-menu {
-  margin: 4px;
   padding: 2px 0px;
   background-color: #262b2d;
   border: 1px solid #1b1f20; }
diff --git a/gtk/theme/Adwaita/gtk-contained.css b/gtk/theme/Adwaita/gtk-contained.css
index e44a94faee..a9100756e9 100644
--- a/gtk/theme/Adwaita/gtk-contained.css
+++ b/gtk/theme/Adwaita/gtk-contained.css
@@ -414,6 +414,25 @@ treeview entry.flat, treeview entry {
   treeview entry.flat:focus, treeview entry:focus {
     border-color: #4a90d9; }
 
+.entry-tag {
+  border-color: transparent;
+  background-color: transparent;
+  background-image: none;
+  box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+  text-shadow: none;
+  -gtk-icon-shadow: none;
+  background-color: #e6e6e6; }
+  .entry-tag:hover {
+    background-color: #ffffff; }
+  .entry-tag .button {
+    border-color: transparent;
+    background-color: transparent;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0);
+    text-shadow: none;
+    -gtk-icon-shadow: none;
+    background-color: transparent; }
+
 /***********
  * Buttons *
  ***********/
@@ -2255,7 +2274,6 @@ menubar,
 menu,
 .menu,
 .context-menu {
-  margin: 4px;
   padding: 2px 0px;
   background-color: #ffffff;
   border: 1px solid #b6b6b3; }