diff --git a/docs/pages/buttons.vue b/docs/pages/buttons.vue
index ffc6166c4..a553f174f 100644
--- a/docs/pages/buttons.vue
+++ b/docs/pages/buttons.vue
@@ -132,7 +132,7 @@
         Be sure to consider internationalization, translation, and cultural meaning in the use of icon buttons.
       </p>
       <p>
-        Always include a tooltip with the name of the action for icon buttons.
+        A tooltip with the name of the action is required for an icon button.
       </p>
       <DocsShow>
         <KButtonGroup>
diff --git a/lib/buttons-and-links/KIconButton.vue b/lib/buttons-and-links/KIconButton.vue
index aee25ed04..79a485cc8 100644
--- a/lib/buttons-and-links/KIconButton.vue
+++ b/lib/buttons-and-links/KIconButton.vue
@@ -7,6 +7,7 @@
     :appearanceOverrides="appearanceOverrides"
     :buttonType="buttonType"
     :aria-label="ariaLabel"
+    text=""
     v-on="$listeners"
   >
     <UiTooltip
@@ -63,7 +64,7 @@
       },
       tooltip: {
         type: String,
-        default: null,
+        required: true,
       },
     },
     computed: {
diff --git a/lib/buttons-and-links/buttonMixin.js b/lib/buttons-and-links/buttonMixin.js
index 8fb6f9d56..3c6342cf2 100644
--- a/lib/buttons-and-links/buttonMixin.js
+++ b/lib/buttons-and-links/buttonMixin.js
@@ -18,7 +18,7 @@ export default {
      */
     text: {
       type: String,
-      required: false,
+      default: null,
     },
     /**
      * Button appearance: 'raised-button', 'flat-button', or 'basic-link'