diff --git a/apps/tailwind-components/components/Button.vue b/apps/tailwind-components/components/Button.vue
index a00ad0146f..2ade2fb506 100644
--- a/apps/tailwind-components/components/Button.vue
+++ b/apps/tailwind-components/components/Button.vue
@@ -13,6 +13,8 @@ const props = withDefaults(
     icon?: string;
     iconPosition?: ButtonIconPosition;
     disabled?: boolean;
+    iconOnly?: boolean;
+    tooltip?: string;
   }>(),
   {
     type: "primary",
@@ -20,9 +22,16 @@ const props = withDefaults(
     label: "",
     iconPosition: "left",
     disabled: false,
+    iconOnly: false,
   }
 );
 
+watchEffect(() => {
+  if (props.iconOnly && (props.label === "" || props.label === undefined)) {
+    console.error("Icon only buttons must have a label");
+  }
+});
+
 const COLOR_MAPPING = {
   primary:
     "tracking-widest uppercase font-display bg-button-primary text-button-primary border-button-primary hover:bg-button-primary-hover hover:text-button-primary-hover hover:border-button-primary-hover",
@@ -55,22 +64,26 @@ const colorClasses = computed(() => {
 });
 
 const sizeClasses = computed(() => {
-  return SIZE_MAPPING[props.size];
+  return props.iconOnly ? "p-[8px]" : SIZE_MAPPING[props.size];
 });
 
 const iconPositionClass = computed(() => {
   return ICON_POSITION_MAPPING[props.iconPosition];
 });
+
+const tooltipText = computed(() => {
+  return props.tooltip || props.iconOnly ? props.label : "";
+});
 </script>
 
 <template>
   <button
+    v-tooltip.bottom="tooltipText"
     class="flex items-center border rounded-input group-[.button-bar]:rounded-none group-[.button-bar]:first:rounded-l-input group-[.button-bar]:last:rounded-r-input"
     :class="`${colorClasses} ${sizeClasses} ${iconPositionClass} transition-colors`"
   >
-    <span v-if="icon">
-      <BaseIcon :name="icon" />
-    </span>
-    <span>{{ label }}<slot /></span>
+    <BaseIcon v-if="icon" :name="icon" />
+
+    <span :class="{ 'sr-only': iconOnly }">{{ label }}<slot /></span>
   </button>
 </template>
diff --git a/apps/tailwind-components/pages/Button.story.vue b/apps/tailwind-components/pages/Button.story.vue
index ebbaf28a4a..f0520337bd 100644
--- a/apps/tailwind-components/pages/Button.story.vue
+++ b/apps/tailwind-components/pages/Button.story.vue
@@ -60,5 +60,54 @@
         CaretDown
       </Button>
     </div>
+
+    <h2 class="text-2xl text-title">Icon only</h2>
+    <div class="flex flex-col gap-4">
+      <div class="flex gap-4">
+        <Button iconOnly icon="plus" label="add" />
+        <Button iconOnly icon="plus" label="add" type="secondary" />
+        <Button iconOnly icon="plus" label="add" type="tertiary" />
+        <Button iconOnly icon="plus" label="add" type="outline" />
+        <Button iconOnly icon="plus" label="add" type="disabled" />
+        <Button iconOnly icon="plus" label="add" type="filterWell" />
+      </div>
+
+      <div class="flex gap-4">
+        <Button iconOnly icon="trash" label="Remove" />
+        <Button iconOnly icon="trash" label="Remove" type="secondary" />
+        <Button iconOnly icon="trash" label="Remove" type="tertiary" />
+        <Button iconOnly icon="trash" label="Remove" type="outline" />
+        <Button iconOnly icon="trash" label="Remove" type="disabled" />
+        <Button iconOnly icon="trash" label="Remove" type="filterWell" />
+      </div>
+
+      <div class="flex gap-4">
+        <Button iconOnly icon="caret-up" label="previous" />
+        <Button iconOnly icon="caret-up" label="previous" type="secondary" />
+        <Button iconOnly icon="caret-up" label="previous" type="tertiary" />
+        <Button iconOnly icon="caret-up" label="previous" type="outline" />
+        <Button iconOnly icon="caret-up" label="previous" type="disabled" />
+        <Button iconOnly icon="caret-up" label="previous" type="filterWell" />
+      </div>
+
+      <div class="flex gap-4">
+        <Button iconOnly icon="caret-down" label="next" />
+        <Button iconOnly icon="caret-down" label="next" type="secondary" />
+        <Button iconOnly icon="caret-down" label="next" type="tertiary" />
+        <Button iconOnly icon="caret-down" label="next" type="outline" />
+        <Button iconOnly icon="caret-down" label="next" type="disabled" />
+        <Button iconOnly icon="caret-down" label="next" type="filterWell" />
+      </div>
+
+      <!-- do not render by default to avoid errors on clean load-->
+      <div v-if="route.query.showError" class="flex gap-4">
+        <!-- this should result in an error ( due to missing label)-->
+        <Button iconOnly icon="plus"></Button>
+      </div>
+    </div>
   </div>
 </template>
+
+<script setup lang="ts">
+const route = useRoute();
+</script>
diff --git a/apps/tailwind-components/pages/ButtonBar.story.vue b/apps/tailwind-components/pages/ButtonBar.story.vue
index 1b58b9a88c..832b4389d1 100644
--- a/apps/tailwind-components/pages/ButtonBar.story.vue
+++ b/apps/tailwind-components/pages/ButtonBar.story.vue
@@ -14,4 +14,9 @@
     <Button icon="caret-down" size="small">three</Button>
     <Button icon="trash" size="small">four</Button>
   </ButtonBar>
+
+  <ButtonBar class="mt-4">
+    <Button :icon-only="true" icon="caret-up" label="up up up !" />
+    <Button :icon-only="true" icon="caret-down" label="going down" />
+  </ButtonBar>
 </template>