diff --git a/app/javascript/v3/components/Form/Button.vue b/app/javascript/v3/components/Form/Button.vue
index 04dbb032f..308a80234 100644
--- a/app/javascript/v3/components/Form/Button.vue
+++ b/app/javascript/v3/components/Form/Button.vue
@@ -4,7 +4,12 @@
     :class="buttonClasses"
     v-bind="$attrs"
   >
-    <fluent-icon v-if="icon" size="1.16em" :icon="icon" class="flex-shrink-0" />
+    <fluent-icon
+      v-if="icon && !trailingIcon"
+      size="1.16em"
+      :icon="icon"
+      class="flex-shrink-0"
+    />
     <span
       v-if="$slots.default"
       class="text-sm font-medium truncate ltr:text-left rtl:text-right"
@@ -12,9 +17,9 @@
       <slot />
     </span>
     <fluent-icon
-      v-if="trailingIcon"
+      v-if="icon && trailingIcon"
       size="1.16em"
-      :icon="trailingIcon"
+      :icon="icon"
       class="flex-shrink-0"
     />
   </button>
@@ -43,8 +48,8 @@ const props = defineProps({
     validator: value => ['primary', 'secondary', 'danger'].includes(value),
   },
   trailingIcon: {
-    type: String,
-    default: '',
+    type: Boolean,
+    default: false,
   },
 });