diff --git a/demo_markdown/docs/button/mod.md b/demo_markdown/docs/button/mod.md
index 81e737e..ae8c087 100644
--- a/demo_markdown/docs/button/mod.md
+++ b/demo_markdown/docs/button/mod.md
@@ -4,7 +4,7 @@
 view! {
     <Space>
         <Button variant=ButtonVariant::Primary>"Primary"</Button>
-        <Button variant=ButtonVariant::Solid>"Solid"</Button>
+        <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
         <Button variant=ButtonVariant::Text>"Text"</Button>
         <Button variant=ButtonVariant::Link>"Link"</Button>
     </Space>
@@ -80,8 +80,8 @@ view! {
         <Button variant=ButtonVariant::Primary disabled=true>
             "Primary"
         </Button>
-        <Button variant=ButtonVariant::Solid disabled=true>
-            "Solid"
+        <Button variant=ButtonVariant::Outlined disabled=true>
+            "Outlined"
         </Button>
         <Button variant=ButtonVariant::Text disabled=true>
             "Text"
@@ -112,14 +112,14 @@ view! {
 view! {
     <Space>
         <ButtonGroup>
-            <Button variant=ButtonVariant::Solid>"Solid"</Button>
-            <Button variant=ButtonVariant::Solid>"Solid"</Button>
-            <Button variant=ButtonVariant::Solid>"Solid"</Button>
+            <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
+            <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
+            <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
         </ButtonGroup>
         <ButtonGroup vertical=true>
-            <Button variant=ButtonVariant::Solid>"Solid"</Button>
-            <Button variant=ButtonVariant::Solid>"Solid"</Button>
-            <Button variant=ButtonVariant::Solid>"Solid"</Button>
+            <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
+            <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
+            <Button variant=ButtonVariant::Outlined>"Outlined"</Button>
         </ButtonGroup>
     </Space>
 }
diff --git a/thaw/src/button/button.css b/thaw/src/button/button.css
index db77053..4afa9f1 100644
--- a/thaw/src/button/button.css
+++ b/thaw/src/button/button.css
@@ -13,7 +13,7 @@
     user-select: none;
 }
 
-.thaw-button:hover:not(.thaw-button--disabled, .thaw-button--solid) {
+.thaw-button:hover:not(.thaw-button--disabled, .thaw-button--outlined) {
     border-color: var(--thaw-border-color-hover);
     background-color: var(--thaw-background-color-hover);
     cursor: pointer;
@@ -37,13 +37,13 @@
     background-color: var(--thaw-background-color-active);
 }
 
-.thaw-button--solid {
+.thaw-button--outlined {
     background-color: transparent;
     color: inherit;
     transition: all 0.3s;
 }
 
-.thaw-button--solid:hover:not(.thaw-button--disabled) {
+.thaw-button--outlined:hover:not(.thaw-button--disabled) {
     cursor: pointer;
     color: var(--thaw-font-color-hover);
     border-color: var(--thaw-border-color-hover);
diff --git a/thaw/src/button/mod.rs b/thaw/src/button/mod.rs
index af140eb..4c1b645 100644
--- a/thaw/src/button/mod.rs
+++ b/thaw/src/button/mod.rs
@@ -15,7 +15,7 @@ pub use theme::ButtonTheme;
 pub enum ButtonVariant {
     #[default]
     Primary,
-    Solid,
+    Outlined,
     Text,
     Link,
 }
@@ -155,11 +155,11 @@ pub fn Button(
                         theme.button.color_border_disabled
                     ));
                 }
-                ButtonVariant::Solid => {
+                ButtonVariant::Outlined => {
                     css_vars.push_str(&format!("--thaw-font-color-hover: {bg_color};"));
                     css_vars.push_str(&format!(
                         "--thaw-border-color: {};",
-                        theme.button.border_color_solid
+                        theme.button.border_color_outlined
                     ));
                     css_vars.push_str(&format!("--thaw-border-color-hover: {bg_color};"));
                     css_vars.push_str(&format!("--thaw-ripple-color: {bg_color};"));
@@ -223,8 +223,8 @@ pub fn Button(
     view! {
         <button
             class=class_list![
-                "thaw-button", ("thaw-button--solid", move || variant.get() ==
-                ButtonVariant::Solid), ("thaw-button--text", move || variant.get() ==
+                "thaw-button", ("thaw-button--outlined", move || variant.get() ==
+                ButtonVariant::Outlined), ("thaw-button--text", move || variant.get() ==
                 ButtonVariant::Text), ("thaw-button--link", move || variant.get() ==
                 ButtonVariant::Link), ("thaw-button--round", move || round.get()),
                 ("thaw-button--circle", move || circle.get()), ("thaw-button--disabled", move ||
diff --git a/thaw/src/button/theme.rs b/thaw/src/button/theme.rs
index 0bbe235..d1faa0d 100644
--- a/thaw/src/button/theme.rs
+++ b/thaw/src/button/theme.rs
@@ -7,7 +7,7 @@ pub struct ButtonTheme {
     pub padding_medium: String,
     pub padding_large: String,
 
-    pub border_color_solid: String,
+    pub border_color_outlined: String,
     pub color_text_hover: String,
     pub color_text_active: String,
     pub color_text_disabled: String,
@@ -23,7 +23,7 @@ impl ThemeMethod for ButtonTheme {
             padding_medium: "0 14px".into(),
             padding_large: "0 18px".into(),
 
-            border_color_solid: "#e0e0e6".into(),
+            border_color_outlined: "#e0e0e6".into(),
             color_text_hover: "#f1f3f5".into(),
             color_text_active: "#eceef0".into(),
             color_text_disabled: "#00000040".into(),
@@ -39,7 +39,7 @@ impl ThemeMethod for ButtonTheme {
             padding_medium: "0 14px".into(),
             padding_large: "0 18px".into(),
 
-            border_color_solid: "#ffffff3d".into(),
+            border_color_outlined: "#ffffff3d".into(),
             color_text_hover: "#ffffff1a".into(),
             color_text_active: "#ffffff26".into(),
             color_text_disabled: "#4c5155".into(),
diff --git a/thaw/src/calendar/mod.rs b/thaw/src/calendar/mod.rs
index 1d60ff9..aa80517 100644
--- a/thaw/src/calendar/mod.rs
+++ b/thaw/src/calendar/mod.rs
@@ -135,15 +135,15 @@ pub fn Calendar(
                 <span>
                     <ButtonGroup>
                         <Button
-                            variant=ButtonVariant::Solid
+                            variant=ButtonVariant::Outlined
                             icon=icondata::AiLeftOutlined
                             on_click=previous_month
                         />
-                        <Button variant=ButtonVariant::Solid on_click=today>
+                        <Button variant=ButtonVariant::Outlined on_click=today>
                             "Today"
                         </Button>
                         <Button
-                            variant=ButtonVariant::Solid
+                            variant=ButtonVariant::Outlined
                             icon=icondata::AiRightOutlined
                             on_click=next_month
                         />
diff --git a/thaw/src/date_picker/panel/date_panel.rs b/thaw/src/date_picker/panel/date_panel.rs
index ff41dee..f2e041e 100644
--- a/thaw/src/date_picker/panel/date_panel.rs
+++ b/thaw/src/date_picker/panel/date_panel.rs
@@ -159,7 +159,7 @@ pub fn DatePanel(
                 </div>
             </div>
             <div class="thaw-date-picker-date-panel__footer">
-                <Button variant=ButtonVariant::Solid size=ButtonSize::Tiny on_click=now>
+                <Button variant=ButtonVariant::Outlined size=ButtonSize::Tiny on_click=now>
                     "Now"
                 </Button>
             </div>
diff --git a/thaw/src/time_picker/mod.rs b/thaw/src/time_picker/mod.rs
index b77be25..2fde7ed 100644
--- a/thaw/src/time_picker/mod.rs
+++ b/thaw/src/time_picker/mod.rs
@@ -257,7 +257,7 @@ fn Panel(
                 </div>
             </div>
             <div class="thaw-time-picker-panel__footer">
-                <Button variant=ButtonVariant::Solid size=ButtonSize::Tiny on_click=now>
+                <Button variant=ButtonVariant::Outlined size=ButtonSize::Tiny on_click=now>
                     "Now"
                 </Button>
                 <Button size=ButtonSize::Tiny on_click=ok>