diff --git a/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue b/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
index 5b86c01c9cc..bfe7fb51958 100644
--- a/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
+++ b/kolibri/core/assets/src/views/ContentRenderer/DownloadButton.vue
@@ -1,10 +1,18 @@
 <template>
 
-  <KDropdownMenu
-    :text="$tr('downloadContent')"
-    :options="fileOptions"
-    @select="download"
-  />
+  <KButton
+    ref="button"
+    hasDropdown
+    :primary="$attrs.primary"
+  >
+    <span>{{ $tr('downloadContent') }}</span>
+    <template #menu>
+      <KDropdownMenu
+        :options="fileOptions"
+        @select="download"
+      />
+    </template>
+  </KButton>
 
 </template>
 
diff --git a/kolibri/core/assets/src/views/HorizontalNavBarWithOverflowMenu.vue b/kolibri/core/assets/src/views/HorizontalNavBarWithOverflowMenu.vue
index 81488abb762..b32145a8075 100644
--- a/kolibri/core/assets/src/views/HorizontalNavBarWithOverflowMenu.vue
+++ b/kolibri/core/assets/src/views/HorizontalNavBarWithOverflowMenu.vue
@@ -26,7 +26,6 @@
       >
         <template #menu>
           <KDropdownMenu
-            :primary="false"
             :hasIcons="true"
             :options="overflowMenuLinks"
             @select="handleSelect"
diff --git a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
index 2bf11a6ae6a..cebb252b60a 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/CoachExamsPage/index.vue
@@ -27,14 +27,20 @@
         -->
         <div>&nbsp;</div>
         <KButtonGroup v-if="practiceQuizzesExist">
-          <KDropdownMenu
+          <KButton
+            primary
+            hasDropdown
             appearance="raised-button"
-            :primary="true"
             :text="coachString('newQuizAction')"
-            :options="dropdownOptions"
-            class="options-btn"
-            @select="handleSelect"
-          />
+          >
+            <template #menu>
+              <KDropdownMenu
+                :options="dropdownOptions"
+                class="options-btn"
+                @select="handleSelect"
+              />
+            </template>
+          </KButton>
         </KButtonGroup>
         <KRouterLink
           v-else
diff --git a/kolibri/plugins/coach/assets/src/views/plan/GroupsPage/GroupRow.vue b/kolibri/plugins/coach/assets/src/views/plan/GroupsPage/GroupRow.vue
index a8723f799c8..7f751e52da2 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/GroupsPage/GroupRow.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/GroupsPage/GroupRow.vue
@@ -12,12 +12,18 @@
       {{ this.$formatNumber(group.users.length) }}
     </td>
     <td class="core-table-button-col">
-      <KDropdownMenu
+      <KButton
+        hasDropdown
         appearance="flat-button"
         :text="coreString('optionsLabel')"
-        :options="menuOptions"
-        @select="handleSelection"
-      />
+      >
+        <template #menu>
+          <KDropdownMenu
+            :options="menuOptions"
+            @select="handleSelection"
+          />
+        </template>
+      </KButton>
     </td>
   </tr>
 
diff --git a/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/LessonOptionsDropdownMenu.vue b/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/LessonOptionsDropdownMenu.vue
index c5b30e217a9..a28b1ce805b 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/LessonOptionsDropdownMenu.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/LessonSummaryPage/LessonOptionsDropdownMenu.vue
@@ -1,12 +1,17 @@
 <template>
 
-  <KDropdownMenu
-    :text="coreString('optionsLabel')"
-    :options="options"
+  <KButton
+    hasDropdown
     appearance="flat-button"
-    :primary="false"
-    @select="$emit('select', $event.value)"
-  />
+    :text="coreString('optionsLabel')"
+  >
+    <template #menu>
+      <KDropdownMenu
+        :options="options"
+        @select="$emit('select', $event.value)"
+      />
+    </template>
+  </KButton>
 
 </template>
 
diff --git a/kolibri/plugins/coach/assets/src/views/plan/QuizSummaryPage/QuizOptionsDropdownMenu.vue b/kolibri/plugins/coach/assets/src/views/plan/QuizSummaryPage/QuizOptionsDropdownMenu.vue
index 581fba8f322..34076506363 100644
--- a/kolibri/plugins/coach/assets/src/views/plan/QuizSummaryPage/QuizOptionsDropdownMenu.vue
+++ b/kolibri/plugins/coach/assets/src/views/plan/QuizSummaryPage/QuizOptionsDropdownMenu.vue
@@ -1,12 +1,17 @@
 <template>
 
-  <KDropdownMenu
-    :text="coreString('optionsLabel')"
-    :options="options"
+  <KButton
+    hasDropdown
     appearance="flat-button"
-    :primary="false"
-    @select="$emit('select', $event.value)"
-  />
+    :text="coreString('optionsLabel')"
+  >
+    <template #menu>
+      <KDropdownMenu
+        :options="options"
+        @select="$emit('select', $event.value)"
+      />
+    </template>
+  </KButton>
 
 </template>
 
diff --git a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
index becebca3f63..e93c9548661 100644
--- a/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/FacilitiesPage/index.vue
@@ -61,12 +61,18 @@
                       appearance="flat-button"
                       @click="facilityForSync = facility"
                     />
-                    <KDropdownMenu
-                      :text="coreString('optionsLabel')"
-                      :options="facilityOptions(facility)"
+                    <KButton
+                      hasDropdown
                       appearance="flat-button"
-                      @select="handleOptionSelect($event.value, facility)"
-                    />
+                      :text="coreString('optionsLabel')"
+                    >
+                      <template #menu>
+                        <KDropdownMenu
+                          :options="facilityOptions(facility)"
+                          @select="handleOptionSelect($event.value, facility)"
+                        />
+                      </template>
+                    </KButton>
                   </KButtonGroup>
                 </td>
               </tr>
@@ -91,12 +97,18 @@
                     appearance="flat-button"
                     @click="facilityForSync = facility"
                   />
-                  <KDropdownMenu
-                    :text="coreString('optionsLabel')"
-                    :options="facilityOptions(facility)"
+                  <KButton
+                    hasDropdown
                     appearance="flat-button"
-                    @select="handleOptionSelect($event.value, facility)"
-                  />
+                    :text="coreString('optionsLabel')"
+                  >
+                    <template #menu>
+                      <KDropdownMenu
+                        :options="facilityOptions(facility)"
+                        @select="handleOptionSelect($event.value, facility)"
+                      />
+                    </template>
+                  </KButton>
                 </KButtonGroup>
               </td>
             </tr>
diff --git a/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue b/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue
index cdc1ce9d305..73ec7d874de 100644
--- a/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue
+++ b/kolibri/plugins/device/assets/src/views/ManageContentPage/index.vue
@@ -13,16 +13,21 @@
           <template #options>
             <KButtonGroup>
               <!-- Margins to and bottom adds space when buttons are vertically stacked -->
-              <KDropdownMenu
+              <KButton
                 v-if="channelsAreInstalled"
+                hasDropdown
                 appearance="raised-button"
                 :text="coreString('optionsLabel')"
-                position="bottom left"
-                :options="dropdownOptions"
-                style="margin-top: 16px; margin-bottom: -16px;"
-                class="options-btn"
-                @select="handleSelect"
-              />
+                :style="{ margin: '16px 8px -16px 0' }"
+              >
+                <template #menu>
+                  <KDropdownMenu
+                    position="bottom left"
+                    :options="dropdownOptions"
+                    @select="handleSelect"
+                  />
+                </template>
+              </KButton>
               <KButton
                 :text="$tr('import')"
                 style="margin-top: 16px; margin-bottom: -16px;"
@@ -282,9 +287,4 @@
     margin: auto;
   }
 
-  .options-btn {
-    margin: 0;
-    margin-right: 8px;
-  }
-
 </style>
diff --git a/kolibri/plugins/facility/assets/src/views/UserPage/index.vue b/kolibri/plugins/facility/assets/src/views/UserPage/index.vue
index 4ba2217f4d8..ddb7b53eb75 100644
--- a/kolibri/plugins/facility/assets/src/views/UserPage/index.vue
+++ b/kolibri/plugins/facility/assets/src/views/UserPage/index.vue
@@ -54,13 +54,19 @@
             :showDemographicInfo="true"
           >
             <template #action="userRow">
-              <KDropdownMenu
+              <KButton
+                appearance="flat-button"
+                hasDropdown
                 :text="$tr('optionsButtonLabel')"
-                :options="manageUserOptions(userRow.user.id)"
                 :disabled="!userCanBeEdited(userRow.user)"
-                appearance="flat-button"
-                @select="handleManageUserSelection($event, userRow.user)"
-              />
+              >
+                <template #menu>
+                  <KDropdownMenu
+                    :options="manageUserOptions(userRow.user.id)"
+                    @select="handleManageUserSelection($event, userRow.user)"
+                  />
+                </template>
+              </KButton>
             </template>
           </UserTable>
         </template>