diff --git a/frontend/src/components/input/Button.vue b/frontend/src/components/input/Button.vue
index 9a9db2fbc..721b95507 100644
--- a/frontend/src/components/input/Button.vue
+++ b/frontend/src/components/input/Button.vue
@@ -29,7 +29,9 @@
 				/>
 			</span>
 		</template>
-		<slot />
+		<span>
+			<slot />
+		</span>
 	</BaseButton>
 </template>
 
@@ -84,6 +86,15 @@ const variantClass = computed(() => VARIANT_CLASS_MAP[props.variant])
 	display: inline-flex;
 	white-space: var(--button-white-space);
 	line-height: 1;
+	display: inline-flex;
+	padding-left: 0; // override bulma style
+	padding-right: 0; // override bulma style
+	padding-inline: .5rem;
+	gap: .25rem;
+
+	[dir="rtl"] & {
+		flex-direction: row-reverse;
+	}
 
 	&:hover {
 		box-shadow: var(--shadow-md);
@@ -105,6 +116,10 @@ const variantClass = computed(() => VARIANT_CLASS_MAP[props.variant])
 	&.is-primary.is-outlined:hover {
 		color: var(--white);
 	}
+
+	.icon {
+		margin: 0 !important;
+	}
 }
 
 .is-small {