diff --git a/frontend/components/TeamsDropdown/_styles.scss b/frontend/components/TeamsDropdown/_styles.scss
index 01ac545fc6..5463d1d480 100644
--- a/frontend/components/TeamsDropdown/_styles.scss
+++ b/frontend/components/TeamsDropdown/_styles.scss
@@ -52,6 +52,7 @@
     border-radius: 6px;
     padding-right: 0;
     margin: 0;
+    z-index: 999; // in front of tooltip wrapper
   }
 
   .Select-control {
diff --git a/frontend/components/buttons/Button/_styles.scss b/frontend/components/buttons/Button/_styles.scss
index 7844a14d3a..cd32c04e66 100644
--- a/frontend/components/buttons/Button/_styles.scss
+++ b/frontend/components/buttons/Button/_styles.scss
@@ -244,6 +244,16 @@ $base-class: "button";
           fill: $core-vibrant-blue-over;
         }
       }
+
+      // Copy button uses stroke color instead of fill color to darken
+      &.input-field__copy-value-button {
+        svg {
+          path {
+            fill: none;
+            stroke: $core-vibrant-blue-over;
+          }
+        }
+      }
     }
 
     // globally styled gap between text and icon
diff --git a/frontend/pages/policies/ManagePoliciesPage/_styles.scss b/frontend/pages/policies/ManagePoliciesPage/_styles.scss
index 345b183d97..d8e20f56b2 100644
--- a/frontend/pages/policies/ManagePoliciesPage/_styles.scss
+++ b/frontend/pages/policies/ManagePoliciesPage/_styles.scss
@@ -164,6 +164,7 @@
           .name__cell {
             .policy-name-cell {
               display: flex; // required for inline icon
+              gap: $pad-xsmall;
 
               .tooltip-base {
                 display: inline-flex;
diff --git a/frontend/pages/queries/ManageQueriesPage/_styles.scss b/frontend/pages/queries/ManageQueriesPage/_styles.scss
index fb26c7918c..ce18192409 100644
--- a/frontend/pages/queries/ManageQueriesPage/_styles.scss
+++ b/frontend/pages/queries/ManageQueriesPage/_styles.scss
@@ -137,6 +137,8 @@
 
               .query-name-cell {
                 display: flex; // required for inline icon
+                gap: $pad-xsmall;
+
                 .children-wrapper {
                   .query-name-text {
                     text-overflow: ellipsis;