diff --git a/src/components/badge/Badge.css.ts b/src/components/badge/Badge.css.ts
index d0564da..8f5ac04 100644
--- a/src/components/badge/Badge.css.ts
+++ b/src/components/badge/Badge.css.ts
@@ -71,21 +71,25 @@ export const Badge = recipe({
         backgroundColor: Main,
         color: OnMain,
         borderColor: MainLine,
+        outlineColor: MainLine,
       },
       Soft: {
         backgroundColor: Container,
         color: OnContainer,
         borderColor: ContainerLine,
+        outlineColor: ContainerLine,
       },
       None: {
         backgroundColor: "inherit",
         color: Main,
         borderColor: Main,
+        outlineColor: Main,
       },
     },
     outlined: {
       true: {
-        borderWidth: config.borderWidth.B300,
+        outlineWidth: config.borderWidth.B300,
+        outlineStyle: "solid",
       },
     },
     radii: RadiiVariant,
diff --git a/src/components/header/Header.css.ts b/src/components/header/Header.css.ts
index c88b245..4841ee4 100644
--- a/src/components/header/Header.css.ts
+++ b/src/components/header/Header.css.ts
@@ -17,6 +17,7 @@ export const Header = recipe({
     {
       display: "flex",
       alignItems: "center",
+      flexShrink: 0,
     },
   ],
   variants: {