diff --git a/src/components/misc/dropdown-item.vue b/src/components/misc/dropdown-item.vue
index e1545ae15..7577e5970 100644
--- a/src/components/misc/dropdown-item.vue
+++ b/src/components/misc/dropdown-item.vue
@@ -1,46 +1,24 @@
 <template>
-	<component
-		:is="componentNodeName"
-		v-bind="elementBindings"
-		:to="to"
-		class="dropdown-item">
+	<BaseButton class="dropdown-item">
 		<span class="icon" v-if="icon">
-			<icon :icon="icon"/>
+			<Icon :icon="icon"/>
 		</span>
 		<span>
-			<slot></slot>
+			<slot  />
 		</span>
-	</component>
+	</BaseButton>
 </template>
 
 <script lang="ts" setup>
-import {ref, useAttrs, watchEffect} from 'vue'
+import BaseButton, { type BaseButtonProps } from '@/components/base//BaseButton.vue'
+import Icon from '@/components/misc/Icon'
+import type { IconProp } from '@fortawesome/fontawesome-svg-core'
 
-const props = defineProps<{
-	to?: object,
-	icon?: string | string[],
-}>()
+export interface DropDownItemProps extends BaseButtonProps {
+	icon?: IconProp,
+}
 
-const componentNodeName = ref<Node['nodeName']>('a')
-const elementBindings = ref({})
-
-const attrs = useAttrs()
-watchEffect(() => {
-	let nodeName = 'a'
-
-	if (props.to) {
-		nodeName = 'router-link'
-	}
-
-	if ('href' in attrs) {
-		nodeName = 'BaseButton'
-	}
-
-	componentNodeName.value = nodeName
-	elementBindings.value = {
-		...attrs,
-	}
-})
+defineProps<DropDownItemProps>()
 </script>
 
 <style scoped lang="scss">
@@ -91,5 +69,4 @@ button.dropdown-item {
 		}
 	}
 }
-
 </style>
diff --git a/src/components/misc/subscription.vue b/src/components/misc/subscription.vue
index 50f1f0719..41beab951 100644
--- a/src/components/misc/subscription.vue
+++ b/src/components/misc/subscription.vue
@@ -13,7 +13,7 @@
 		v-else-if="type === 'dropdown'"
 		v-tooltip="tooltipText"
 		@click="changeSubscription"
-		:class="{'is-disabled': disabled}"
+		:disabled="disabled"
 		:icon="iconName"
 	>
 		{{ buttonText }}