diff --git a/demo/blocks_joined/run.py b/demo/blocks_joined/run.py
index 4800f014a7..56969e43e2 100644
--- a/demo/blocks_joined/run.py
+++ b/demo/blocks_joined/run.py
@@ -33,7 +33,6 @@ with gr.Blocks(css=".container { max-width: 800px; margin: auto; }") as demo:
                     label="Enter your prompt", show_label=False, max_lines=1
                 ).style(
                     border=(True, False, True, True),
-                    margin=False,
                     rounded=(True, False, False, True),
                     container=False,
                 )
diff --git a/gradio/components.py b/gradio/components.py
index 2adfae5ee7..ee78aa2403 100644
--- a/gradio/components.py
+++ b/gradio/components.py
@@ -3615,9 +3615,12 @@ class Button(Clickable, Component):
         rounded: Optional[bool | Tuple[bool, bool, bool, bool]] = None,
         full_width: Optional[str] = None,
         border: Optional[bool | Tuple[bool, bool, bool, bool]] = None,
+        margin: Optional[bool | Tuple[bool, bool, bool, bool]] = None,
     ):
         if full_width is not None:
             self._style["full_width"] = full_width
+        if margin is not None:
+            self._style["margin"] = margin
 
         return IOComponent.style(
             self,
diff --git a/ui/packages/app/src/components/Group/Group.svelte b/ui/packages/app/src/components/Group/Group.svelte
index dc7eacab2b..835b0dbe43 100644
--- a/ui/packages/app/src/components/Group/Group.svelte
+++ b/ui/packages/app/src/components/Group/Group.svelte
@@ -14,18 +14,18 @@
 
 <style>
 	div > :global(*:not(.absolute)) {
-		@apply rounded-none;
+		@apply !rounded-none;
 	}
 
 	div > :global(*:first-child) {
-		@apply rounded-tl-lg rounded-tr-lg;
+		@apply !rounded-tl-lg !rounded-tr-lg;
 	}
 
 	div > :global(*:last-child) {
-		@apply rounded-bl-lg rounded-br-lg;
+		@apply !rounded-bl-lg !rounded-br-lg;
 	}
 
 	div > :global(* + *:not(.absolute)) {
-		@apply border-t-0;
+		@apply !border-t-0;
 	}
 </style>
diff --git a/ui/packages/atoms/src/Block.svelte b/ui/packages/atoms/src/Block.svelte
index c1cfd89ea8..080cf63929 100644
--- a/ui/packages/atoms/src/Block.svelte
+++ b/ui/packages/atoms/src/Block.svelte
@@ -61,7 +61,7 @@
 		(typeof style.rounded === "boolean" && style.rounded);
 
 	$: rounded_style = get_styles({ rounded: rounded }, ["rounded"]).classes;
-	$: visible_style = get_styles({ visible }, ["visible"]);
+	$: visible_style = get_styles({ visible }, ["visible"]).classes;
 </script>
 
 <svelte:element
diff --git a/ui/packages/button/src/Button.svelte b/ui/packages/button/src/Button.svelte
index 072ec4ef90..a097dbe657 100644
--- a/ui/packages/button/src/Button.svelte
+++ b/ui/packages/button/src/Button.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { create_classes } from "../../utils";
+	import { create_classes, get_styles } from "../../utils";
 	import type { Styles } from "@gradio/utils";
 
 	export let style: Styles = {};
@@ -7,12 +7,19 @@
 	export let visible: boolean = true;
 	export let variant: "primary" | "secondary" = "secondary";
 	export let size: "sm" | "lg" = "lg";
+
+	$: ({ classes } = get_styles(style, [
+		"border",
+		"full_width",
+		"rounded",
+		"margin"
+	]));
 </script>
 
 <button
 	on:click
-	class={`gr-button gr-button-${size} gr-button-${variant} self-start` +
-		create_classes(style)}
+	class="gr-button gr-button-{size} gr-button-{variant} self-start
+		{classes}"
 	id={elem_id}
 	class:hidden={visible === false}
 >
diff --git a/ui/packages/theme/src/global.css b/ui/packages/theme/src/global.css
index 407f5965f9..d530555b34 100644
--- a/ui/packages/theme/src/global.css
+++ b/ui/packages/theme/src/global.css
@@ -61,7 +61,7 @@
 	}
 
 	.row.gr-gap.mobile-row > *:not(.absolute) + * {
-		@apply !ml-3 !mt-0;
+		@apply ml-3 mt-0;
 	}
 
 	.row.gr-form-gap > .form + .form {
diff --git a/ui/packages/utils/src/styles.ts b/ui/packages/utils/src/styles.ts
index 5ebc0daf9f..b3c2dce2cd 100644
--- a/ui/packages/utils/src/styles.ts
+++ b/ui/packages/utils/src/styles.ts
@@ -4,6 +4,7 @@ type BoolOrTuple = boolean | BoolTuple;
 export interface Styles {
 	rounded?: BoolOrTuple;
 	border?: BoolOrTuple;
+	margin?: BoolOrTuple;
 	container?: boolean;
 	grid?: number | Array<number>;
 	height?: "auto" | string;
@@ -78,6 +79,13 @@ const style_handlers: StyleHandlers = {
 			[false, "0"]
 		);
 	},
+	margin(margin) {
+		let _style: BoolTuple = Array.isArray(margin)
+			? margin
+			: bool_to_tuple(margin);
+
+		return tuple_to_class(_style, "!m", ["t", "r", "b", "l"], [false, "0"]);
+	},
 	container(container_visible) {
 		return container_visible
 			? ""
@@ -112,7 +120,7 @@ const style_handlers: StyleHandlers = {
 		return mobile_collapse ? "flex-col" : "mobile-row";
 	},
 	visible(visible) {
-		return visible ? "!hidden" : "";
+		return visible ? "" : "!hidden";
 	},
 	item_container(visible) {
 		return visible ? "" : "!border-none";