diff --git a/crates/command_palette2/src/command_palette.rs b/crates/command_palette2/src/command_palette.rs
index 0afbe50a03..bf9f9fa94b 100644
--- a/crates/command_palette2/src/command_palette.rs
+++ b/crates/command_palette2/src/command_palette.rs
@@ -8,7 +8,7 @@ use gpui::{
 use picker::{Picker, PickerDelegate};
 use std::cmp::{self, Reverse};
 use theme::ActiveTheme;
-use ui::{modal, v_stack, Label};
+use ui::{v_stack, Label, StyledExt};
 use util::{
     channel::{parse_zed_link, ReleaseChannel, RELEASE_CHANNEL},
     ResultExt,
@@ -305,15 +305,13 @@ impl PickerDelegate for CommandPaletteDelegate {
         };
 
         div()
+            .px_1()
             .text_color(colors.text)
-            .when(selected, |s| {
-                s.border_l_10().border_color(colors.terminal_ansi_yellow)
-            })
-            .hover(|style| {
-                style
-                    .bg(colors.element_active)
-                    .text_color(colors.text_accent)
-            })
+            .text_ui()
+            .bg(colors.ghost_element_background)
+            .rounded_md()
+            .when(selected, |this| this.bg(colors.ghost_element_selected))
+            .hover(|this| this.bg(colors.ghost_element_hover))
             .child(Label::new(command.name.clone()))
     }
 
diff --git a/crates/editor2/src/editor.rs b/crates/editor2/src/editor.rs
index 27ec24b40b..b1f0d26786 100644
--- a/crates/editor2/src/editor.rs
+++ b/crates/editor2/src/editor.rs
@@ -1555,6 +1555,7 @@ impl CodeActionsMenu {
                         let colors = cx.theme().colors();
                         div()
                             .px_2()
+                            .text_ui()
                             .text_color(colors.text)
                             .when(selected, |style| {
                                 style
diff --git a/crates/picker2/src/picker2.rs b/crates/picker2/src/picker2.rs
index 4d6e178849..ac1c5f89ea 100644
--- a/crates/picker2/src/picker2.rs
+++ b/crates/picker2/src/picker2.rs
@@ -156,13 +156,12 @@ impl<D: PickerDelegate> Render for Picker<D> {
                 v_stack()
                     .py_0p5()
                     .px_1()
-                    .child(div().px_2().py_0p5().child(self.editor.clone())),
+                    .child(div().px_1().py_0p5().child(self.editor.clone())),
             )
             .child(Divider::horizontal())
             .child(
                 v_stack()
-                    .py_0p5()
-                    .px_1()
+                    .p_1()
                     .grow()
                     .child(
                         uniform_list("candidates", self.delegate.match_count(), {