diff --git a/crates/storybook2/src/stories/components.rs b/crates/storybook2/src/stories/components.rs
index 38a93adec6..15ec29eca9 100644
--- a/crates/storybook2/src/stories/components.rs
+++ b/crates/storybook2/src/stories/components.rs
@@ -6,4 +6,5 @@ pub mod project_panel;
 pub mod tab;
 pub mod tab_bar;
 pub mod terminal;
+pub mod toolbar;
 pub mod workspace;
diff --git a/crates/storybook2/src/stories/components/toolbar.rs b/crates/storybook2/src/stories/components/toolbar.rs
new file mode 100644
index 0000000000..451ce76aab
--- /dev/null
+++ b/crates/storybook2/src/stories/components/toolbar.rs
@@ -0,0 +1,79 @@
+use std::marker::PhantomData;
+use std::path::PathBuf;
+use std::str::FromStr;
+use std::sync::Arc;
+
+use ui::prelude::*;
+use ui::{theme, Breadcrumb, HighlightColor, HighlightedText, Icon, IconButton, Symbol, Toolbar};
+
+use crate::story::Story;
+
+#[derive(Element)]
+pub struct ToolbarStory<S: 'static + Send + Sync + Clone> {
+    state_type: PhantomData<S>,
+}
+
+impl<S: 'static + Send + Sync + Clone> ToolbarStory<S> {
+    pub fn new() -> Self {
+        Self {
+            state_type: PhantomData,
+        }
+    }
+
+    fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
+        let theme = theme(cx);
+
+        struct LeftItemsPayload {
+            pub theme: Arc<Theme>,
+        }
+
+        Story::container(cx)
+            .child(Story::title_for::<_, Toolbar<S>>(cx))
+            .child(Story::label(cx, "Default"))
+            .child(Toolbar::new(
+                |_, payload| {
+                    let payload = payload.downcast_ref::<LeftItemsPayload>().unwrap();
+
+                    let theme = payload.theme.clone();
+
+                    vec![Breadcrumb::new(
+                        PathBuf::from_str("crates/ui/src/components/toolbar.rs").unwrap(),
+                        vec![
+                            Symbol(vec![
+                                HighlightedText {
+                                    text: "impl ".to_string(),
+                                    color: HighlightColor::Keyword.hsla(&theme),
+                                },
+                                HighlightedText {
+                                    text: "ToolbarStory".to_string(),
+                                    color: HighlightColor::Function.hsla(&theme),
+                                },
+                            ]),
+                            Symbol(vec![
+                                HighlightedText {
+                                    text: "fn ".to_string(),
+                                    color: HighlightColor::Keyword.hsla(&theme),
+                                },
+                                HighlightedText {
+                                    text: "render".to_string(),
+                                    color: HighlightColor::Function.hsla(&theme),
+                                },
+                            ]),
+                        ],
+                    )
+                    .into_any()]
+                },
+                Box::new(LeftItemsPayload {
+                    theme: theme.clone(),
+                }),
+                |_, _| {
+                    vec![
+                        IconButton::new(Icon::InlayHint).into_any(),
+                        IconButton::new(Icon::MagnifyingGlass).into_any(),
+                        IconButton::new(Icon::MagicWand).into_any(),
+                    ]
+                },
+                Box::new(()),
+            ))
+    }
+}
diff --git a/crates/storybook2/src/story_selector.rs b/crates/storybook2/src/story_selector.rs
index 937699c033..ae21c03355 100644
--- a/crates/storybook2/src/story_selector.rs
+++ b/crates/storybook2/src/story_selector.rs
@@ -42,6 +42,7 @@ pub enum ComponentStory {
     Tab,
     TabBar,
     Terminal,
+    Toolbar,
     Workspace,
 }
 
@@ -60,6 +61,7 @@ impl ComponentStory {
             Self::Tab => components::tab::TabStory::new().into_any(),
             Self::TabBar => components::tab_bar::TabBarStory::new().into_any(),
             Self::Terminal => components::terminal::TerminalStory::new().into_any(),
+            Self::Toolbar => components::toolbar::ToolbarStory::new().into_any(),
             Self::Workspace => components::workspace::WorkspaceStory::new().into_any(),
         }
     }
diff --git a/crates/ui2/src/components.rs b/crates/ui2/src/components.rs
index 4ebd0e0769..af7dff8390 100644
--- a/crates/ui2/src/components.rs
+++ b/crates/ui2/src/components.rs
@@ -10,6 +10,7 @@ mod status_bar;
 mod tab;
 mod tab_bar;
 mod terminal;
+mod toolbar;
 mod workspace;
 
 pub use assistant_panel::*;
@@ -24,4 +25,5 @@ pub use status_bar::*;
 pub use tab::*;
 pub use tab_bar::*;
 pub use terminal::*;
+pub use toolbar::*;
 pub use workspace::*;
diff --git a/crates/ui2/src/components/toolbar.rs b/crates/ui2/src/components/toolbar.rs
new file mode 100644
index 0000000000..27905589fb
--- /dev/null
+++ b/crates/ui2/src/components/toolbar.rs
@@ -0,0 +1,49 @@
+use crate::prelude::*;
+use crate::theme;
+
+#[derive(Clone)]
+pub struct ToolbarItem {}
+
+#[derive(Element)]
+pub struct Toolbar<S: 'static + Send + Sync> {
+    left_items: HackyChildren<S>,
+    left_items_payload: HackyChildrenPayload,
+    right_items: HackyChildren<S>,
+    right_items_payload: HackyChildrenPayload,
+}
+
+impl<S: 'static + Send + Sync> Toolbar<S> {
+    pub fn new(
+        left_items: HackyChildren<S>,
+        left_items_payload: HackyChildrenPayload,
+        right_items: HackyChildren<S>,
+        right_items_payload: HackyChildrenPayload,
+    ) -> Self {
+        Self {
+            left_items,
+            left_items_payload,
+            right_items,
+            right_items_payload,
+        }
+    }
+
+    fn render(&mut self, cx: &mut ViewContext<S>) -> impl Element<State = S> {
+        let theme = theme(cx);
+
+        div()
+            .fill(theme.highest.base.default.background)
+            .p_2()
+            .flex()
+            .justify_between()
+            .child(
+                div()
+                    .flex()
+                    .children_any((self.left_items)(cx, self.left_items_payload.as_ref())),
+            )
+            .child(
+                div()
+                    .flex()
+                    .children_any((self.right_items)(cx, self.right_items_payload.as_ref())),
+            )
+    }
+}