diff --git a/src/components/DataTable.vue b/src/components/DataTable.vue
index 56eb9aab..4c4ddeda 100644
--- a/src/components/DataTable.vue
+++ b/src/components/DataTable.vue
@@ -16,6 +16,7 @@
 
         <div v-if="showPagination" class="pagination-wrapper">
             <el-pagination
+                size="small"
                 :current-page="internalCurrentPage"
                 :page-size="internalPageSize"
                 :total="filteredData.length"
@@ -105,7 +106,6 @@
             const mergedPaginationProps = computed(() => ({
                 layout: 'sizes, prev, pager, next, total',
                 pageSizes: [10, 15, 20, 25, 50, 100],
-                small: true,
                 ...paginationProps.value
             }));
 
diff --git a/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue b/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
index ae8d806a..e7a62554 100644
--- a/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
+++ b/src/components/dialogs/AvatarDialog/SetAvatarTagsDialog.vue
@@ -78,7 +78,7 @@
                         <span v-else class="extra" v-text="avatar.releaseStatus"></span>
                         <span class="extra" v-text="avatarTagStrings.get(avatar.id)"></span>
                     </div>
-                    <el-button type="text" size="small" style="margin-left: 5px" @click.stop>
+                    <el-button text size="small" style="margin-left: 5px" @click.stop>
                         <el-checkbox
                             :model-value="props.setAvatarTagsDialog.selectedAvatarIds.includes(avatar.id)"
                             @click="toggleAvatarSelection(avatar.id)"></el-checkbox>
diff --git a/src/components/dialogs/GroupDialog/GroupDialog.vue b/src/components/dialogs/GroupDialog/GroupDialog.vue
index bdec6c63..e3bc3384 100644
--- a/src/components/dialogs/GroupDialog/GroupDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupDialog.vue
@@ -511,7 +511,7 @@
                                     <template v-if="hasGroupPermission(groupDialog.ref, 'group-announcement-manage')">
                                         <el-tooltip placement="top" :content="t('dialog.group.posts.edit_tooltip')">
                                             <el-button
-                                                type="text"
+                                                text
                                                 :icon="Edit"
                                                 size="small"
                                                 style="margin-left: 5px; padding: 0"
@@ -521,7 +521,7 @@
                                         </el-tooltip>
                                         <el-tooltip placement="top" :content="t('dialog.group.posts.delete_tooltip')">
                                             <el-button
-                                                type="text"
+                                                text
                                                 :icon="Delete"
                                                 size="small"
                                                 style="margin-left: 5px; padding: 0"
@@ -784,7 +784,7 @@
                                             v-if="hasGroupPermission(groupDialog.ref, 'group-announcement-manage')">
                                             <el-tooltip placement="top" :content="t('dialog.group.posts.edit_tooltip')">
                                                 <el-button
-                                                    type="text"
+                                                    text
                                                     :icon="Edit"
                                                     size="small"
                                                     style="margin-left: 5px"
@@ -794,7 +794,7 @@
                                                 placement="top"
                                                 :content="t('dialog.group.posts.delete_tooltip')">
                                                 <el-button
-                                                    type="text"
+                                                    text
                                                     :icon="Delete"
                                                     size="small"
                                                     style="margin-left: 5px"
diff --git a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
index 59518962..ad4f6045 100644
--- a/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupMemberModerationDialog.vue
@@ -106,7 +106,7 @@
                             style="margin-top: 10px">
                             <el-table-column width="55" prop="$selected">
                                 <template #default="scope">
-                                    <el-button type="text" size="small" @click.stop>
+                                    <el-button text size="small" @click.stop>
                                         <el-checkbox
                                             v-model="scope.row.$selected"
                                             @change="
@@ -223,7 +223,7 @@
                         <DataTable v-bind="groupBansModerationTable" style="margin-top: 10px">
                             <el-table-column width="55" prop="$selected">
                                 <template #default="scope">
-                                    <el-button type="text" size="small" @click.stop>
+                                    <el-button text size="small" @click.stop>
                                         <el-checkbox
                                             v-model="scope.row.$selected"
                                             @change="
@@ -339,7 +339,7 @@
                                 <DataTable v-bind="groupInvitesModerationTable" style="margin-top: 10px">
                                     <el-table-column width="55" prop="$selected">
                                         <template #default="scope">
-                                            <el-button type="text" size="small" @click.stop>
+                                            <el-button text size="small" @click.stop>
                                                 <el-checkbox
                                                     v-model="scope.row.$selected"
                                                     @change="
@@ -424,7 +424,7 @@
                                 <DataTable v-bind="groupJoinRequestsModerationTable" style="margin-top: 10px">
                                     <el-table-column width="55" prop="$selected">
                                         <template #default="scope">
-                                            <el-button type="text" size="small" @click.stop>
+                                            <el-button text size="small" @click.stop>
                                                 <el-checkbox
                                                     v-model="scope.row.$selected"
                                                     @change="
@@ -535,7 +535,7 @@
                                 <DataTable v-bind="groupBlockedModerationTable" style="margin-top: 10px">
                                     <el-table-column width="55" prop="$selected">
                                         <template #default="scope">
-                                            <el-button type="text" size="small" @click.stop>
+                                            <el-button text size="small" @click.stop>
                                                 <el-checkbox
                                                     v-model="scope.row.$selected"
                                                     @change="
@@ -947,7 +947,6 @@
         tableProps: { stripe: true, size: 'small' },
         pageSize: 15,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
@@ -957,7 +956,6 @@
         tableProps: { stripe: true, size: 'small' },
         pageSize: 15,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
@@ -978,7 +976,6 @@
         tableProps: { stripe: true, size: 'small' },
         pageSize: 15,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
@@ -989,7 +986,6 @@
         tableProps: { stripe: true, size: 'small' },
         pageSize: 15,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
@@ -999,7 +995,6 @@
         tableProps: { stripe: true, size: 'small' },
         pageSize: 15,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
diff --git a/src/components/dialogs/GroupDialog/GroupPostEditDialog.vue b/src/components/dialogs/GroupDialog/GroupPostEditDialog.vue
index 2cc6f990..8ff7fa94 100644
--- a/src/components/dialogs/GroupDialog/GroupPostEditDialog.vue
+++ b/src/components/dialogs/GroupDialog/GroupPostEditDialog.vue
@@ -29,10 +29,10 @@
                 </el-form-item>
                 <el-form-item :label="t('dialog.group_post_edit.post_visibility')">
                     <el-radio-group v-model="groupPostEditDialog.visibility" size="small">
-                        <el-radio label="public">
+                        <el-radio value="public">
                             {{ t('dialog.group_post_edit.visibility_public') }}
                         </el-radio>
-                        <el-radio label="group">
+                        <el-radio value="group">
                             {{ t('dialog.group_post_edit.visibility_group') }}
                         </el-radio>
                     </el-radio-group>
diff --git a/src/components/dialogs/InviteDialog/SendInviteDialog.vue b/src/components/dialogs/InviteDialog/SendInviteDialog.vue
index 845fc264..01330f5c 100644
--- a/src/components/dialogs/InviteDialog/SendInviteDialog.vue
+++ b/src/components/dialogs/InviteDialog/SendInviteDialog.vue
@@ -58,7 +58,7 @@
             <el-table-column :label="t('table.profile.invite_messages.action')" width="70" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="Edit"
                         size="small"
                         @click.stop="showEditAndSendInviteDialog(scope.row)"></el-button>
diff --git a/src/components/dialogs/NewInstanceDialog.vue b/src/components/dialogs/NewInstanceDialog.vue
index c384f9cf..404e1468 100644
--- a/src/components/dialogs/NewInstanceDialog.vue
+++ b/src/components/dialogs/NewInstanceDialog.vue
@@ -10,22 +10,22 @@
                 <el-form :model="newInstanceDialog" label-width="150px">
                     <el-form-item :label="t('dialog.new_instance.access_type')">
                         <el-radio-group v-model="newInstanceDialog.accessType" size="small" @change="buildInstance">
-                            <el-radio-button label="public">{{
+                            <el-radio-button value="public">{{
                                 t('dialog.new_instance.access_type_public')
                             }}</el-radio-button>
-                            <el-radio-button label="group">{{
+                            <el-radio-button value="group">{{
                                 t('dialog.new_instance.access_type_group')
                             }}</el-radio-button>
-                            <el-radio-button label="friends+">{{
+                            <el-radio-button value="friends+">{{
                                 t('dialog.new_instance.access_type_friend_plus')
                             }}</el-radio-button>
-                            <el-radio-button label="friends">{{
+                            <el-radio-button value="friends">{{
                                 t('dialog.new_instance.access_type_friend')
                             }}</el-radio-button>
-                            <el-radio-button label="invite+">{{
+                            <el-radio-button value="invite+">{{
                                 t('dialog.new_instance.access_type_invite_plus')
                             }}</el-radio-button>
-                            <el-radio-button label="invite">{{
+                            <el-radio-button value="invite">{{
                                 t('dialog.new_instance.access_type_invite')
                             }}</el-radio-button>
                         </el-radio-group>
@@ -38,21 +38,21 @@
                             size="small"
                             @change="buildInstance">
                             <el-radio-button
-                                label="members"
+                                value="members"
                                 :disabled="
                                     !hasGroupPermission(newInstanceDialog.groupRef, 'group-instance-open-create')
                                 "
                                 >{{ t('dialog.new_instance.group_access_type_members') }}</el-radio-button
                             >
                             <el-radio-button
-                                label="plus"
+                                value="plus"
                                 :disabled="
                                     !hasGroupPermission(newInstanceDialog.groupRef, 'group-instance-plus-create')
                                 "
                                 >{{ t('dialog.new_instance.group_access_type_plus') }}</el-radio-button
                             >
                             <el-radio-button
-                                label="public"
+                                value="public"
                                 :disabled="
                                     !hasGroupPermission(newInstanceDialog.groupRef, 'group-instance-public-create') ||
                                     newInstanceDialog.groupRef.privacy === 'private'
@@ -63,10 +63,10 @@
                     </el-form-item>
                     <el-form-item :label="t('dialog.new_instance.region')">
                         <el-radio-group v-model="newInstanceDialog.region" size="small" @change="buildInstance">
-                            <el-radio-button label="US West">{{ t('dialog.new_instance.region_usw') }}</el-radio-button>
-                            <el-radio-button label="US East">{{ t('dialog.new_instance.region_use') }}</el-radio-button>
-                            <el-radio-button label="Europe">{{ t('dialog.new_instance.region_eu') }}</el-radio-button>
-                            <el-radio-button label="Japan">{{ t('dialog.new_instance.region_jp') }}</el-radio-button>
+                            <el-radio-button value="US West">{{ t('dialog.new_instance.region_usw') }}</el-radio-button>
+                            <el-radio-button value="US East">{{ t('dialog.new_instance.region_use') }}</el-radio-button>
+                            <el-radio-button value="Europe">{{ t('dialog.new_instance.region_eu') }}</el-radio-button>
+                            <el-radio-button value="Japan">{{ t('dialog.new_instance.region_jp') }}</el-radio-button>
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item
@@ -176,22 +176,22 @@
                             v-model="newInstanceDialog.accessType"
                             size="small"
                             @change="buildLegacyInstance">
-                            <el-radio-button label="public">{{
+                            <el-radio-button value="public">{{
                                 t('dialog.new_instance.access_type_public')
                             }}</el-radio-button>
-                            <el-radio-button label="group">{{
+                            <el-radio-button value="group">{{
                                 t('dialog.new_instance.access_type_group')
                             }}</el-radio-button>
-                            <el-radio-button label="friends+">{{
+                            <el-radio-button value="friends+">{{
                                 t('dialog.new_instance.access_type_friend_plus')
                             }}</el-radio-button>
-                            <el-radio-button label="friends">{{
+                            <el-radio-button value="friends">{{
                                 t('dialog.new_instance.access_type_friend')
                             }}</el-radio-button>
-                            <el-radio-button label="invite+">{{
+                            <el-radio-button value="invite+">{{
                                 t('dialog.new_instance.access_type_invite_plus')
                             }}</el-radio-button>
-                            <el-radio-button label="invite">{{
+                            <el-radio-button value="invite">{{
                                 t('dialog.new_instance.access_type_invite')
                             }}</el-radio-button>
                         </el-radio-group>
@@ -203,23 +203,23 @@
                             v-model="newInstanceDialog.groupAccessType"
                             size="small"
                             @change="buildLegacyInstance">
-                            <el-radio-button label="members">{{
+                            <el-radio-button value="members">{{
                                 t('dialog.new_instance.group_access_type_members')
                             }}</el-radio-button>
-                            <el-radio-button label="plus">{{
+                            <el-radio-button value="plus">{{
                                 t('dialog.new_instance.group_access_type_plus')
                             }}</el-radio-button>
-                            <el-radio-button label="public">{{
+                            <el-radio-button value="public">{{
                                 t('dialog.new_instance.group_access_type_public')
                             }}</el-radio-button>
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item :label="t('dialog.new_instance.region')">
                         <el-radio-group v-model="newInstanceDialog.region" size="small" @change="buildLegacyInstance">
-                            <el-radio-button label="US West">{{ t('dialog.new_instance.region_usw') }}</el-radio-button>
-                            <el-radio-button label="US East">{{ t('dialog.new_instance.region_use') }}</el-radio-button>
-                            <el-radio-button label="Europe">{{ t('dialog.new_instance.region_eu') }}</el-radio-button>
-                            <el-radio-button label="Japan">{{ t('dialog.new_instance.region_jp') }}</el-radio-button>
+                            <el-radio-button value="US West">{{ t('dialog.new_instance.region_usw') }}</el-radio-button>
+                            <el-radio-button value="US East">{{ t('dialog.new_instance.region_use') }}</el-radio-button>
+                            <el-radio-button value="Europe">{{ t('dialog.new_instance.region_eu') }}</el-radio-button>
+                            <el-radio-button value="Japan">{{ t('dialog.new_instance.region_jp') }}</el-radio-button>
                         </el-radio-group>
                     </el-form-item>
                     <el-form-item
@@ -478,7 +478,7 @@
 </template>
 
 <script setup>
-    import { computed, nextTick, ref, watch } from 'vue';
+    import { nextTick, ref, watch } from 'vue';
     import { ElMessage } from 'element-plus';
     import { storeToRefs } from 'pinia';
     import { useI18n } from 'vue-i18n';
diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue
index c240958d..af537539 100644
--- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue
+++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesGroupDialog.vue
@@ -38,20 +38,20 @@
             <el-table-column :label="t('table.previous_instances.action')" width="90" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="DataLine"
                         size="small"
                         @click="showPreviousInstancesInfoDialog(scope.row.location)" />
                     <el-button
                         v-if="shiftHeld"
                         style="color: #f56c6c"
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         @click="deleteGameLogGroupInstance(scope.row)" />
                     <el-button
                         v-else
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         @click="deleteGameLogGroupInstancePrompt(scope.row)" />
@@ -94,7 +94,7 @@
             defaultSort: { prop: 'created_at', order: 'descending' }
         },
         pageSize: 10,
-        paginationProps: { small: true, layout: 'sizes,prev,pager,next,total', pageSizes: [10, 25, 50, 100] }
+        paginationProps: { layout: 'sizes,prev,pager,next,total', pageSizes: [10, 25, 50, 100] }
     });
 
     const props = defineProps({
diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue
index 2d0b236f..4662471b 100644
--- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue
+++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesInfoDialog.vue
@@ -118,7 +118,6 @@
         },
         pageSize: 10,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 25, 50, 100]
         }
diff --git a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesWorldDialog.vue b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesWorldDialog.vue
index 374edb4b..c5aabacc 100644
--- a/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesWorldDialog.vue
+++ b/src/components/dialogs/PreviousInstancesDialog/PreviousInstancesWorldDialog.vue
@@ -42,7 +42,7 @@
             <el-table-column :label="t('table.previous_instances.action')" width="90" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="DataLine"
                         size="small"
                         class="button-pd-0"
@@ -50,14 +50,14 @@
                     <el-button
                         v-if="shiftHeld"
                         style="color: #f56c6c"
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         class="button-pd-0"
                         @click="deleteGameLogWorldInstance(scope.row)"></el-button>
                     <el-button
                         v-else
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         class="button-pd-0"
@@ -110,7 +110,6 @@
         },
         pageSize: 10,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 25, 50, 100]
         }
diff --git a/src/components/dialogs/UserDialog/PreviousInstancesUserDialog.vue b/src/components/dialogs/UserDialog/PreviousInstancesUserDialog.vue
index a69fa30e..594a6567 100644
--- a/src/components/dialogs/UserDialog/PreviousInstancesUserDialog.vue
+++ b/src/components/dialogs/UserDialog/PreviousInstancesUserDialog.vue
@@ -39,13 +39,13 @@
             <el-table-column :label="t('table.previous_instances.action')" width="90" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="SwitchButton"
                         size="small"
                         class="button-pd-0"
                         @click="showLaunchDialog(scope.row.location)"></el-button>
                     <el-button
-                        type="text"
+                        text
                         :icon="DataLine"
                         size="small"
                         class="button-pd-0"
@@ -53,14 +53,14 @@
                     <el-button
                         v-if="shiftHeld"
                         style="color: #f56c6c"
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         class="button-pd-0"
                         @click="deleteGameLogUserInstance(scope.row)"></el-button>
                     <el-button
                         v-else
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         class="button-pd-0"
@@ -119,7 +119,6 @@
         },
         pageSize: 10,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 25, 50, 100]
         }
diff --git a/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue b/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
index bd919741..94d9a7c6 100644
--- a/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
+++ b/src/components/dialogs/UserDialog/SendInviteRequestDialog.vue
@@ -33,7 +33,7 @@
             <el-table-column :label="t('table.profile.invite_messages.action')" width="70" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="Edit"
                         size="small"
                         @click.stop="showEditAndSendInviteDialog(scope.row)"></el-button>
diff --git a/src/components/dialogs/UserDialog/UserDialog.vue b/src/components/dialogs/UserDialog/UserDialog.vue
index 3a1fbd4d..46da08f3 100644
--- a/src/components/dialogs/UserDialog/UserDialog.vue
+++ b/src/components/dialogs/UserDialog/UserDialog.vue
@@ -236,7 +236,7 @@
                                 <div style="float: right">
                                     <el-button
                                         v-if="translationApi && userDialog.ref.bio"
-                                        type="text"
+                                        text
                                         size="small"
                                         style="margin-left: 5px; padding: 0"
                                         @click="translateBio"
@@ -244,7 +244,7 @@
                                     ></el-button>
                                     <el-button
                                         v-if="userDialog.id === currentUser.id"
-                                        type="text"
+                                        text
                                         :icon="Edit"
                                         size="small"
                                         style="margin-left: 5px; padding: 0"
diff --git a/src/stores/feed.js b/src/stores/feed.js
index 98bb3b5c..4c425906 100644
--- a/src/stores/feed.js
+++ b/src/stores/feed.js
@@ -35,7 +35,6 @@ export const useFeedStore = defineStore('Feed', () => {
         pageSize: 20,
         pageSizeLinked: true,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
diff --git a/src/stores/friend.js b/src/stores/friend.js
index 2e0f2ebb..7b36f814 100644
--- a/src/stores/friend.js
+++ b/src/stores/friend.js
@@ -91,7 +91,6 @@ export const useFriendStore = defineStore('Friend', () => {
         pageSize: 20,
         pageSizeLinked: true,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
diff --git a/src/stores/gameLog.js b/src/stores/gameLog.js
index a1fd81ed..f9ec7858 100644
--- a/src/stores/gameLog.js
+++ b/src/stores/gameLog.js
@@ -74,7 +74,6 @@ export const useGameLogStore = defineStore('GameLog', () => {
         pageSize: 20,
         pageSizeLinked: true,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         },
diff --git a/src/stores/moderation.js b/src/stores/moderation.js
index 7d0b36c8..728c5349 100644
--- a/src/stores/moderation.js
+++ b/src/stores/moderation.js
@@ -37,7 +37,6 @@ export const useModerationStore = defineStore('Moderation', () => {
         pageSize: 20,
         pageSizeLinked: true,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
diff --git a/src/stores/notification.js b/src/stores/notification.js
index 932d7a32..93d5c44a 100644
--- a/src/stores/notification.js
+++ b/src/stores/notification.js
@@ -77,7 +77,6 @@ export const useNotificationStore = defineStore('Notification', () => {
         pageSize: 20,
         pageSizeLinked: true,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [10, 15, 20, 25, 50, 100]
         }
diff --git a/src/stores/photon.js b/src/stores/photon.js
index bb4c96fe..764df1f1 100644
--- a/src/stores/photon.js
+++ b/src/stores/photon.js
@@ -107,7 +107,6 @@ export const usePhotonStore = defineStore('Photon', () => {
         },
         pageSize: 10,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [5, 10, 15, 25, 50]
         }
@@ -130,7 +129,6 @@ export const usePhotonStore = defineStore('Photon', () => {
         },
         pageSize: 10,
         paginationProps: {
-            small: true,
             layout: 'sizes,prev,pager,next,total',
             pageSizes: [5, 10, 15, 25, 50]
         }
diff --git a/src/views/Favorites/FavoritesAvatar.vue b/src/views/Favorites/FavoritesAvatar.vue
index f7f1b847..e42c5fe1 100644
--- a/src/views/Favorites/FavoritesAvatar.vue
+++ b/src/views/Favorites/FavoritesAvatar.vue
@@ -179,7 +179,7 @@
                                     circle
                                     @click.stop="refreshLocalAvatarFavorites" />
                             </template>
-                            <el-button v-else size="small" type="text" @click.stop="cancelLocalAvatarRefresh">
+                            <el-button v-else size="small" text @click.stop="cancelLocalAvatarRefresh">
                                 <el-icon class="is-loading"><Loading /></el-icon>
                                 {{ t('view.favorite.avatars.cancel_refresh') }}
                             </el-button>
diff --git a/src/views/Favorites/FavoritesWorld.vue b/src/views/Favorites/FavoritesWorld.vue
index bb9f17fb..bb92e35e 100644
--- a/src/views/Favorites/FavoritesWorld.vue
+++ b/src/views/Favorites/FavoritesWorld.vue
@@ -176,7 +176,7 @@
                                 @click.stop="refreshLocalWorldFavorites"
                                 :icon="Refresh"
                                 circle />
-                            <el-button v-else size="small" type="text" @click.stop="cancelLocalWorldRefresh">
+                            <el-button v-else size="small" text @click.stop="cancelLocalWorldRefresh">
                                 <el-icon class="is-loading"><Loading /></el-icon>
                                 {{ t('view.favorite.worlds.cancel_refresh') }}
                             </el-button>
diff --git a/src/views/Favorites/dialogs/AvatarImportDialog.vue b/src/views/Favorites/dialogs/AvatarImportDialog.vue
index cfc15d94..8300e916 100644
--- a/src/views/Favorites/dialogs/AvatarImportDialog.vue
+++ b/src/views/Favorites/dialogs/AvatarImportDialog.vue
@@ -168,7 +168,7 @@
             </el-table-column>
             <el-table-column :label="t('table.import.action')" width="90" align="right">
                 <template #default="{ row }">
-                    <el-button type="text" :icon="Close" size="small" @click="deleteItemAvatarImport(row)"> </el-button>
+                    <el-button text :icon="Close" size="small" @click="deleteItemAvatarImport(row)"> </el-button>
                 </template>
             </el-table-column>
         </DataTable>
diff --git a/src/views/Favorites/dialogs/FriendImportDialog.vue b/src/views/Favorites/dialogs/FriendImportDialog.vue
index 413e681e..c1bd5a97 100644
--- a/src/views/Favorites/dialogs/FriendImportDialog.vue
+++ b/src/views/Favorites/dialogs/FriendImportDialog.vue
@@ -115,7 +115,7 @@
             </el-table-column>
             <el-table-column :label="t('table.import.action')" width="90" align="right">
                 <template #default="{ row }">
-                    <el-button type="text" :icon="Close" size="small" @click="deleteItemFriendImport(row)"> </el-button>
+                    <el-button text :icon="Close" size="small" @click="deleteItemFriendImport(row)"> </el-button>
                 </template>
             </el-table-column>
         </DataTable>
diff --git a/src/views/Favorites/dialogs/WorldImportDialog.vue b/src/views/Favorites/dialogs/WorldImportDialog.vue
index c27f3e3c..12f8b7ca 100644
--- a/src/views/Favorites/dialogs/WorldImportDialog.vue
+++ b/src/views/Favorites/dialogs/WorldImportDialog.vue
@@ -164,7 +164,7 @@
             </el-table-column>
             <el-table-column :label="t('table.import.action')" width="90" align="right">
                 <template #default="{ row }">
-                    <el-button type="text" :icon="Close" size="small" @click="deleteItemWorldImport(row)"></el-button>
+                    <el-button text :icon="Close" size="small" @click="deleteItemWorldImport(row)"></el-button>
                 </template>
             </el-table-column>
         </DataTable>
diff --git a/src/views/FriendList/FriendList.vue b/src/views/FriendList/FriendList.vue
index 41fc71c0..d41679b1 100644
--- a/src/views/FriendList/FriendList.vue
+++ b/src/views/FriendList/FriendList.vue
@@ -92,7 +92,7 @@
                     width="55"
                     prop="$selected">
                     <template #default="{ row }">
-                        <el-button type="text" size="small" @click.stop>
+                        <el-button text size="small" @click.stop>
                             <el-checkbox
                                 v-model="row.$selected"
                                 @change="friendsListBulkUnfriendForceUpdate++"></el-checkbox>
@@ -243,7 +243,7 @@
                 <el-table-column :label="t('table.friendList.unfriend')" width="100" align="center">
                     <template #default="{ row }">
                         <el-button
-                            type="text"
+                            text
                             :icon="Close"
                             style="color: #f56c6c"
                             size="small"
@@ -301,7 +301,7 @@
         data: [],
         tableProps: { stripe: true, size: 'small', defaultSort: { prop: '$friendNumber', order: 'descending' } },
         pageSize: 100,
-        paginationProps: { small: true, layout: 'sizes,prev,pager,next,total', pageSizes: [50, 100, 250, 500] }
+        paginationProps: { layout: 'sizes,prev,pager,next,total', pageSizes: [50, 100, 250, 500] }
     });
     const friendsListBulkUnfriendMode = ref(false);
     const friendsListLoading = ref(false);
diff --git a/src/views/FriendLog/FriendLog.vue b/src/views/FriendLog/FriendLog.vue
index 296bc98a..4dec8ab9 100644
--- a/src/views/FriendLog/FriendLog.vue
+++ b/src/views/FriendLog/FriendLog.vue
@@ -70,14 +70,14 @@
                     <el-button
                         v-if="shiftHeld"
                         style="color: #f56c6c"
-                        type="text"
+                        text
                         :icon="Close"
                         size="small"
                         class="button-pd-0"
                         @click="deleteFriendLog(scope.row)"></el-button>
                     <el-button
                         v-else
-                        type="text"
+                        text
                         :icon="Delete"
                         size="small"
                         class="button-pd-0"
diff --git a/src/views/GameLog/GameLog.vue b/src/views/GameLog/GameLog.vue
index dc7181bf..06434a1d 100644
--- a/src/views/GameLog/GameLog.vue
+++ b/src/views/GameLog/GameLog.vue
@@ -162,14 +162,14 @@
                         <el-button
                             v-if="shiftHeld"
                             style="color: #f56c6c"
-                            type="text"
+                            text
                             :icon="Close"
                             size="small"
                             class="small-button"
                             @click="deleteGameLogEntry(scope.row)"></el-button>
                         <el-button
                             v-else
-                            type="text"
+                            text
                             :icon="Delete"
                             size="small"
                             class="small-button"
@@ -178,7 +178,7 @@
                     <el-tooltip placement="top" :content="t('dialog.previous_instances.info')">
                         <el-button
                             v-if="scope.row.type === 'Location'"
-                            type="text"
+                            text
                             :icon="DataLine"
                             size="small"
                             class="small-button"
diff --git a/src/views/Moderation/Moderation.vue b/src/views/Moderation/Moderation.vue
index d9e75321..cf934ad2 100644
--- a/src/views/Moderation/Moderation.vue
+++ b/src/views/Moderation/Moderation.vue
@@ -67,13 +67,13 @@
                         <el-button
                             v-if="shiftHeld"
                             style="color: #f56c6c"
-                            type="text"
+                            text
                             :icon="Close"
                             size="small"
                             @click="deletePlayerModeration(scope.row)"></el-button>
                         <el-button
                             v-else
-                            type="text"
+                            text
                             :icon="Close"
                             size="small"
                             @click="deletePlayerModerationPrompt(scope.row)"></el-button>
diff --git a/src/views/Notifications/Notification.vue b/src/views/Notifications/Notification.vue
index e4164815..eee8b8b2 100644
--- a/src/views/Notifications/Notification.vue
+++ b/src/views/Notifications/Notification.vue
@@ -187,7 +187,7 @@
                         <template v-if="scope.row.type === 'friendRequest'">
                             <el-tooltip placement="top" content="Accept">
                                 <el-button
-                                    type="text"
+                                    text
                                     :icon="Check"
                                     style="color: #67c23a"
                                     size="small"
@@ -198,7 +198,7 @@
                         <template v-else-if="scope.row.type === 'invite'">
                             <el-tooltip placement="top" content="Decline with message">
                                 <el-button
-                                    type="text"
+                                    text
                                     :icon="ChatLineSquare"
                                     size="small"
                                     class="button-pd-0"
@@ -210,7 +210,7 @@
                                 v-if="lastLocation.location && isGameRunning && checkCanInvite(lastLocation.location)">
                                 <el-tooltip placement="top" content="Invite">
                                     <el-button
-                                        type="text"
+                                        text
                                         :icon="Check"
                                         style="color: #67c23a"
                                         size="small"
@@ -220,7 +220,7 @@
                             </template>
                             <el-tooltip placement="top" content="Decline with message">
                                 <el-button
-                                    type="text"
+                                    text
                                     :icon="ChatLineSquare"
                                     size="small"
                                     :class="['button-pd-0', 'ml-5']"
@@ -233,14 +233,14 @@
                                 <el-tooltip placement="top" :content="response.text">
                                     <el-button
                                         v-if="response.type === 'link'"
-                                        type="text"
+                                        text
                                         :icon="Link"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
                                         @click="openNotificationLink(response.data)" />
                                     <el-button
                                         v-else-if="response.icon === 'check'"
-                                        type="text"
+                                        text
                                         :icon="Check"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
@@ -249,7 +249,7 @@
                                         " />
                                     <el-button
                                         v-else-if="response.icon === 'cancel'"
-                                        type="text"
+                                        text
                                         :icon="Close"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
@@ -258,7 +258,7 @@
                                         " />
                                     <el-button
                                         v-else-if="response.icon === 'ban'"
-                                        type="text"
+                                        text
                                         :icon="CircleClose"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
@@ -267,7 +267,7 @@
                                         " />
                                     <el-button
                                         v-else-if="response.icon === 'bell-slash'"
-                                        type="text"
+                                        text
                                         :icon="Bell"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
@@ -276,14 +276,14 @@
                                         " />
                                     <el-button
                                         v-else-if="response.icon === 'reply' && scope.row.type === 'boop'"
-                                        type="text"
+                                        text
                                         :icon="ChatLineSquare"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
                                         @click="showSendBoopDialog(scope.row.senderUserId)" />
                                     <el-button
                                         v-else-if="response.icon === 'reply'"
-                                        type="text"
+                                        text
                                         :icon="ChatLineSquare"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
@@ -292,7 +292,7 @@
                                         " />
                                     <el-button
                                         v-else
-                                        type="text"
+                                        text
                                         :icon="CollectionTag"
                                         size="small"
                                         :class="['button-pd-0', 'ml-5']"
@@ -318,14 +318,14 @@
                                 <el-button
                                     v-if="shiftHeld"
                                     style="color: #f56c6c"
-                                    type="text"
+                                    text
                                     :icon="Close"
                                     size="small"
                                     :class="['button-pd-0', 'ml-5']"
                                     @click="hideNotification(scope.row)" />
                                 <el-button
                                     v-else
-                                    type="text"
+                                    text
                                     :icon="Close"
                                     size="small"
                                     :class="['button-pd-0', 'ml-5']"
@@ -338,14 +338,14 @@
                             <el-button
                                 v-if="shiftHeld"
                                 style="color: #f56c6c"
-                                type="text"
+                                text
                                 :icon="Delete"
                                 size="small"
                                 :class="['button-pd-0', 'ml-5']"
                                 @click="deleteNotificationLog(scope.row)" />
                             <el-button
                                 v-else
-                                type="text"
+                                text
                                 :icon="Delete"
                                 size="small"
                                 :class="['button-pd-0', 'ml-5']"
@@ -364,14 +364,14 @@
                             <el-button
                                 v-if="shiftHeld"
                                 style="color: #f56c6c; margin-left: 5px"
-                                type="text"
+                                text
                                 :icon="Close"
                                 size="small"
                                 class="button-pd-0"
                                 @click="deleteNotificationLog(scope.row)" />
                             <el-button
                                 v-else
-                                type="text"
+                                text
                                 :icon="Delete"
                                 size="small"
                                 :class="['button-pd-0', 'ml-5']"
diff --git a/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue b/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
index 45d56f15..6ecb8024 100644
--- a/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
+++ b/src/views/Notifications/dialogs/SendInviteRequestResponseDialog.vue
@@ -30,7 +30,7 @@
             <el-table-column :label="t('table.profile.invite_messages.action')" width="70" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="Edit"
                         size="small"
                         @click.stop="showEditAndSendInviteResponseDialog(scope.row)">
diff --git a/src/views/Notifications/dialogs/SendInviteResponseDialog.vue b/src/views/Notifications/dialogs/SendInviteResponseDialog.vue
index 008eff12..9f993ade 100644
--- a/src/views/Notifications/dialogs/SendInviteResponseDialog.vue
+++ b/src/views/Notifications/dialogs/SendInviteResponseDialog.vue
@@ -29,7 +29,7 @@
             <el-table-column :label="t('table.profile.invite_messages.action')" width="70" align="right">
                 <template #default="scope">
                     <el-button
-                        type="text"
+                        text
                         :icon="Edit"
                         size="small"
                         @click.stop="showEditAndSendInviteResponseDialog(scope.row)" />
diff --git a/src/views/PlayerList/PlayerList.vue b/src/views/PlayerList/PlayerList.vue
index 5c20012f..afd5d4c0 100644
--- a/src/views/PlayerList/PlayerList.vue
+++ b/src/views/PlayerList/PlayerList.vue
@@ -154,7 +154,7 @@
                                     currentInstanceWorld.ref.description.length > 50 &&
                                     !currentInstanceWorldDescriptionExpanded
                                 "
-                                type="text"
+                                text
                                 size="small"
                                 @click="currentInstanceWorldDescriptionExpanded = true"
                                 >{{ !currentInstanceWorldDescriptionExpanded && 'Show more' }}</el-button
@@ -234,7 +234,7 @@
                             <template v-if="chatboxUserBlacklist.has(scope.row.ref.id)">
                                 <el-tooltip placement="left" content="Unblock chatbox messages">
                                     <el-button
-                                        type="text"
+                                        text
                                         :icon="Mute"
                                         size="small"
                                         style="color: red; margin-right: 5px"
@@ -244,7 +244,7 @@
                             <template v-else>
                                 <el-tooltip placement="left" content="Block chatbox messages">
                                     <el-button
-                                        type="text"
+                                        text
                                         :icon="Microphone"
                                         size="small"
                                         style="margin-right: 5px"
diff --git a/src/views/Search/Search.vue b/src/views/Search/Search.vue
index fdac2ba9..3b85a368 100644
--- a/src/views/Search/Search.vue
+++ b/src/views/Search/Search.vue
@@ -176,9 +176,9 @@
                             size="small"
                             style="margin: 5px; display: block"
                             @change="searchAvatar">
-                            <el-radio label="all">{{ t('view.search.avatar.all') }}</el-radio>
-                            <el-radio label="public">{{ t('view.search.avatar.public') }}</el-radio>
-                            <el-radio label="private">{{ t('view.search.avatar.private') }}</el-radio>
+                            <el-radio value="all">{{ t('view.search.avatar.all') }}</el-radio>
+                            <el-radio value="public">{{ t('view.search.avatar.public') }}</el-radio>
+                            <el-radio value="private">{{ t('view.search.avatar.private') }}</el-radio>
                         </el-radio-group>
                         <el-divider direction="vertical"></el-divider>
                         <el-radio-group
@@ -186,9 +186,9 @@
                             size="small"
                             style="margin: 5px; display: block"
                             @change="searchAvatar">
-                            <el-radio label="all">{{ t('view.search.avatar.all') }}</el-radio>
-                            <el-radio label="local">{{ t('view.search.avatar.local') }}</el-radio>
-                            <el-radio label="remote" :disabled="!avatarRemoteDatabase">{{
+                            <el-radio value="all">{{ t('view.search.avatar.all') }}</el-radio>
+                            <el-radio value="local">{{ t('view.search.avatar.local') }}</el-radio>
+                            <el-radio value="remote" :disabled="!avatarRemoteDatabase">{{
                                 t('view.search.avatar.remote')
                             }}</el-radio>
                         </el-radio-group>
@@ -201,9 +201,9 @@
                         size="small"
                         style="margin: 5px; display: block"
                         @change="searchAvatar">
-                        <el-radio label="name">{{ t('view.search.avatar.sort_name') }}</el-radio>
-                        <el-radio label="update">{{ t('view.search.avatar.sort_update') }}</el-radio>
-                        <el-radio label="created">{{ t('view.search.avatar.sort_created') }}</el-radio>
+                        <el-radio value="name">{{ t('view.search.avatar.sort_name') }}</el-radio>
+                        <el-radio value="update">{{ t('view.search.avatar.sort_update') }}</el-radio>
+                        <el-radio value="created">{{ t('view.search.avatar.sort_created') }}</el-radio>
                     </el-radio-group>
                 </div>
                 <div class="x-friend-list" style="margin-top: 20px; min-height: 500px">
diff --git a/src/views/Settings/components/PhotonSettings.vue b/src/views/Settings/components/PhotonSettings.vue
index 2119d2a9..3eeea1b3 100644
--- a/src/views/Settings/components/PhotonSettings.vue
+++ b/src/views/Settings/components/PhotonSettings.vue
@@ -20,13 +20,13 @@
                     setPhotonEventOverlayFilter($event);
                     saveEventOverlay();
                 ">
-                <el-radio-button label="VIP">{{
+                <el-radio-button value="VIP">{{
                     t('view.settings.advanced.photon.event_hud.filter_favorites')
                 }}</el-radio-button>
-                <el-radio-button label="Friends">{{
+                <el-radio-button value="Friends">{{
                     t('view.settings.advanced.photon.event_hud.filter_friends')
                 }}</el-radio-button>
-                <el-radio-button label="Everyone">{{
+                <el-radio-button value="Everyone">{{
                     t('view.settings.advanced.photon.event_hud.filter_everyone')
                 }}</el-radio-button>
             </el-radio-group>
diff --git a/src/views/Settings/components/Tabs/AppearanceTab.vue b/src/views/Settings/components/Tabs/AppearanceTab.vue
index f4ca4724..1b64fa7f 100644
--- a/src/views/Settings/components/Tabs/AppearanceTab.vue
+++ b/src/views/Settings/components/Tabs/AppearanceTab.vue
@@ -75,10 +75,10 @@
             <div class="options-container-item">
                 <span class="name">{{ t('view.settings.appearance.appearance.sort_favorite_by') }}</span>
                 <el-radio-group :model-value="sortFavorites" @change="saveSortFavoritesOption">
-                    <el-radio :label="false">{{
+                    <el-radio :value="false">{{
                         t('view.settings.appearance.appearance.sort_favorite_by_name')
                     }}</el-radio>
-                    <el-radio :label="true">{{
+                    <el-radio :value="true">{{
                         t('view.settings.appearance.appearance.sort_favorite_by_date')
                     }}</el-radio>
                 </el-radio-group>
@@ -86,10 +86,10 @@
             <div class="options-container-item">
                 <span class="name">{{ t('view.settings.appearance.appearance.sort_instance_users_by') }}</span>
                 <el-radio-group :model-value="instanceUsersSortAlphabetical" @change="setInstanceUsersSortAlphabetical">
-                    <el-radio :label="false">{{
+                    <el-radio :value="false">{{
                         t('view.settings.appearance.appearance.sort_instance_users_by_time')
                     }}</el-radio>
-                    <el-radio :label="true">{{
+                    <el-radio :value="true">{{
                         t('view.settings.appearance.appearance.sort_instance_users_by_alphabet')
                     }}</el-radio>
                 </el-radio-group>
@@ -111,8 +111,8 @@
                         setDtHour12();
                         updateVRConfigVars();
                     ">
-                    <el-radio :label="true">{{ t('view.settings.appearance.timedate.time_format_12') }}</el-radio>
-                    <el-radio :label="false">{{ t('view.settings.appearance.timedate.time_format_24') }}</el-radio>
+                    <el-radio :value="true">{{ t('view.settings.appearance.timedate.time_format_12') }}</el-radio>
+                    <el-radio :value="false">{{ t('view.settings.appearance.timedate.time_format_24') }}</el-radio>
                 </el-radio-group>
             </div>
             <simple-switch
diff --git a/src/views/Settings/components/Tabs/GeneralTab.vue b/src/views/Settings/components/Tabs/GeneralTab.vue
index cb7efd82..ded25805 100644
--- a/src/views/Settings/components/Tabs/GeneralTab.vue
+++ b/src/views/Settings/components/Tabs/GeneralTab.vue
@@ -50,13 +50,13 @@
                     size="small"
                     style="margin-top: 5px"
                     @change="setAutoUpdateVRCX">
-                    <el-radio-button label="Off">{{
+                    <el-radio-button value="Off">{{
                         t('view.settings.general.vrcx_updater.auto_update_off')
                     }}</el-radio-button>
-                    <el-radio-button label="Notify">{{
+                    <el-radio-button value="Notify">{{
                         t('view.settings.general.vrcx_updater.auto_update_notify')
                     }}</el-radio-button>
-                    <el-radio-button label="Auto Download">{{
+                    <el-radio-button value="Auto Download">{{
                         t('view.settings.general.vrcx_updater.auto_update_download')
                     }}</el-radio-button>
                 </el-radio-group>
@@ -230,8 +230,8 @@
                     :model-value="autoStateChangeNoFriends"
                     :disabled="!autoStateChangeEnabled"
                     @change="setAutoStateChangeNoFriends">
-                    <el-radio :label="false">{{ t('view.settings.general.automation.alone') }}</el-radio>
-                    <el-radio :label="true">{{ t('view.settings.general.automation.no_friends') }}</el-radio>
+                    <el-radio :value="false">{{ t('view.settings.general.automation.alone') }}</el-radio>
+                    <el-radio :value="true">{{ t('view.settings.general.automation.no_friends') }}</el-radio>
                 </el-radio-group>
             </div>
             <div class="options-container-item">
@@ -250,13 +250,13 @@
                     size="small"
                     style="margin-top: 5px"
                     @change="setAutoAcceptInviteRequests">
-                    <el-radio-button label="Off">{{
+                    <el-radio-button value="Off">{{
                         t('view.settings.general.automation.auto_invite_request_accept_off')
                     }}</el-radio-button>
-                    <el-radio-button label="All Favorites">{{
+                    <el-radio-button value="All Favorites">{{
                         t('view.settings.general.automation.auto_invite_request_accept_favs')
                     }}</el-radio-button>
-                    <el-radio-button label="Selected Favorites">{{
+                    <el-radio-button value="Selected Favorites">{{
                         t('view.settings.general.automation.auto_invite_request_accept_selected_favs')
                     }}</el-radio-button>
                 </el-radio-group>
diff --git a/src/views/Settings/components/Tabs/NotificationsTab.vue b/src/views/Settings/components/Tabs/NotificationsTab.vue
index 74a10b7f..6e25b610 100644
--- a/src/views/Settings/components/Tabs/NotificationsTab.vue
+++ b/src/views/Settings/components/Tabs/NotificationsTab.vue
@@ -31,16 +31,16 @@
                         setOverlayToast($event);
                         saveOpenVROption();
                     ">
-                    <el-radio-button label="Never">{{
+                    <el-radio-button value="Never">{{
                         t('view.settings.notifications.notifications.conditions.never')
                     }}</el-radio-button>
-                    <el-radio-button label="Game Running">{{
+                    <el-radio-button value="Game Running">{{
                         t('view.settings.notifications.notifications.conditions.inside_vrchat')
                     }}</el-radio-button>
-                    <el-radio-button label="Game Closed">{{
+                    <el-radio-button value="Game Closed">{{
                         t('view.settings.notifications.notifications.conditions.outside_vrchat')
                     }}</el-radio-button>
-                    <el-radio-button label="Always">{{
+                    <el-radio-button value="Always">{{
                         t('view.settings.notifications.notifications.conditions.always')
                     }}</el-radio-button>
                 </el-radio-group>
@@ -166,25 +166,25 @@
                         setDesktopToast($event);
                         saveOpenVROption();
                     ">
-                    <el-radio-button label="Never">{{
+                    <el-radio-button value="Never">{{
                         t('view.settings.notifications.notifications.conditions.never')
                     }}</el-radio-button>
-                    <el-radio-button label="Desktop Mode">{{
+                    <el-radio-button value="Desktop Mode">{{
                         t('view.settings.notifications.notifications.conditions.desktop')
                     }}</el-radio-button>
-                    <el-radio-button label="Inside VR">{{
+                    <el-radio-button value="Inside VR">{{
                         t('view.settings.notifications.notifications.conditions.inside_vr')
                     }}</el-radio-button>
-                    <el-radio-button label="Outside VR">{{
+                    <el-radio-button value="Outside VR">{{
                         t('view.settings.notifications.notifications.conditions.outside_vr')
                     }}</el-radio-button>
-                    <el-radio-button label="Game Running">{{
+                    <el-radio-button value="Game Running">{{
                         t('view.settings.notifications.notifications.conditions.inside_vrchat')
                     }}</el-radio-button>
-                    <el-radio-button label="Game Closed">{{
+                    <el-radio-button value="Game Closed">{{
                         t('view.settings.notifications.notifications.conditions.outside_vrchat')
                     }}</el-radio-button>
-                    <el-radio-button label="Always">{{
+                    <el-radio-button value="Always">{{
                         t('view.settings.notifications.notifications.conditions.always')
                     }}</el-radio-button>
                 </el-radio-group>
@@ -211,19 +211,19 @@
                     size="small"
                     style="margin-top: 5px"
                     @change="saveNotificationTTS">
-                    <el-radio-button label="Never">{{
+                    <el-radio-button value="Never">{{
                         t('view.settings.notifications.notifications.conditions.never')
                     }}</el-radio-button>
-                    <el-radio-button label="Inside VR">{{
+                    <el-radio-button value="Inside VR">{{
                         t('view.settings.notifications.notifications.conditions.inside_vr')
                     }}</el-radio-button>
-                    <el-radio-button label="Game Running">{{
+                    <el-radio-button value="Game Running">{{
                         t('view.settings.notifications.notifications.conditions.inside_vrchat')
                     }}</el-radio-button>
-                    <el-radio-button label="Game Closed">{{
+                    <el-radio-button value="Game Closed">{{
                         t('view.settings.notifications.notifications.conditions.outside_vrchat')
                     }}</el-radio-button>
-                    <el-radio-button label="Always">{{
+                    <el-radio-button value="Always">{{
                         t('view.settings.notifications.notifications.conditions.always')
                     }}</el-radio-button>
                 </el-radio-group>
diff --git a/src/views/Settings/components/WristOverlaySettings.vue b/src/views/Settings/components/WristOverlaySettings.vue
index a2782eaf..19559807 100644
--- a/src/views/Settings/components/WristOverlaySettings.vue
+++ b/src/views/Settings/components/WristOverlaySettings.vue
@@ -50,8 +50,8 @@
                     setOpenVRAlways();
                     saveOpenVROption();
                 ">
-                <el-radio :label="false">{{ 'VRChat' }}</el-radio>
-                <el-radio :label="true">{{ 'SteamVR' }}</el-radio>
+                <el-radio :value="false">{{ 'VRChat' }}</el-radio>
+                <el-radio :value="true">{{ 'SteamVR' }}</el-radio>
             </el-radio-group>
         </div>
         <div class="options-container-item">
@@ -63,10 +63,10 @@
                     setOverlaybutton();
                     saveOpenVROption();
                 ">
-                <el-radio :label="false">{{
+                <el-radio :value="false">{{
                     t('view.settings.wrist_overlay.steamvr_wrist_overlay.overlay_button_grip')
                 }}</el-radio>
-                <el-radio :label="true">{{
+                <el-radio :value="true">{{
                     t('view.settings.wrist_overlay.steamvr_wrist_overlay.overlay_button_menu')
                 }}</el-radio>
             </el-radio-group>
@@ -80,13 +80,13 @@
                     setOverlayHand($event);
                     saveOpenVROption();
                 ">
-                <el-radio-button label="1">{{
+                <el-radio-button value="1">{{
                     t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_left')
                 }}</el-radio-button>
-                <el-radio-button label="2">{{
+                <el-radio-button value="2">{{
                     t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_right')
                 }}</el-radio-button>
-                <el-radio-button label="0">{{
+                <el-radio-button value="0">{{
                     t('view.settings.wrist_overlay.steamvr_wrist_overlay.display_overlay_on_both')
                 }}</el-radio-button>
             </el-radio-group>
diff --git a/src/views/Settings/dialogs/FeedFiltersDialog.vue b/src/views/Settings/dialogs/FeedFiltersDialog.vue
index 8fc30ced..974a99de 100644
--- a/src/views/Settings/dialogs/FeedFiltersDialog.vue
+++ b/src/views/Settings/dialogs/FeedFiltersDialog.vue
@@ -23,7 +23,7 @@
                     v-model="currentSharedFeedFilters[setting.key]"
                     size="small"
                     @change="saveSharedFeedFilters">
-                    <el-radio-button v-for="option in setting.options" :key="option.label" :label="option.label">
+                    <el-radio-button v-for="option in setting.options" :key="option.label" :value="option.label">
                         {{ t(option.textKey) }}
                     </el-radio-button>
                 </el-radio-group>
@@ -40,7 +40,7 @@
                         v-model="currentSharedFeedFilters[setting.key]"
                         size="small"
                         @change="saveSharedFeedFilters">
-                        <el-radio-button v-for="option in setting.options" :key="option.label" :label="option.label">
+                        <el-radio-button v-for="option in setting.options" :key="option.label" :value="option.label">
                             {{ t(option.textKey) }}
                         </el-radio-button>
                     </el-radio-group>
diff --git a/src/views/Settings/dialogs/NotificationPositionDialog.vue b/src/views/Settings/dialogs/NotificationPositionDialog.vue
index d1795fb7..c677bce1 100644
--- a/src/views/Settings/dialogs/NotificationPositionDialog.vue
+++ b/src/views/Settings/dialogs/NotificationPositionDialog.vue
@@ -24,15 +24,15 @@
             <rect style="fill: #c4c4c4" x="5" y="5" width="290" height="158.75" rx="2.5" />
         </svg>
         <el-radio-group :model-value="notificationPosition" size="small" @change="changeNotificationPosition">
-            <el-radio label="topLeft" style="margin: 0; position: absolute; left: 35px; top: 120px">‎</el-radio>
-            <el-radio label="top" style="margin: 0; position: absolute; left: 195px; top: 120px">‎</el-radio>
-            <el-radio label="topRight" style="margin: 0; position: absolute; right: 25px; top: 120px">‎</el-radio>
-            <el-radio label="centerLeft" style="margin: 0; position: absolute; left: 35px; top: 200px">‎</el-radio>
-            <el-radio label="center" style="margin: 0; position: absolute; left: 195px; top: 200px">‎</el-radio>
-            <el-radio label="centerRight" style="margin: 0; position: absolute; right: 25px; top: 200px">‎</el-radio>
-            <el-radio label="bottomLeft" style="margin: 0; position: absolute; left: 35px; top: 280px">‎</el-radio>
-            <el-radio label="bottom" style="margin: 0; position: absolute; left: 195px; top: 280px">‎</el-radio>
-            <el-radio label="bottomRight" style="margin: 0; position: absolute; right: 25px; top: 280px">‎</el-radio>
+            <el-radio value="topLeft" style="margin: 0; position: absolute; left: 35px; top: 120px">‎</el-radio>
+            <el-radio value="top" style="margin: 0; position: absolute; left: 195px; top: 120px">‎</el-radio>
+            <el-radio value="topRight" style="margin: 0; position: absolute; right: 25px; top: 120px">‎</el-radio>
+            <el-radio value="centerLeft" style="margin: 0; position: absolute; left: 35px; top: 200px">‎</el-radio>
+            <el-radio value="center" style="margin: 0; position: absolute; left: 195px; top: 200px">‎</el-radio>
+            <el-radio value="centerRight" style="margin: 0; position: absolute; right: 25px; top: 200px">‎</el-radio>
+            <el-radio value="bottomLeft" style="margin: 0; position: absolute; left: 35px; top: 280px">‎</el-radio>
+            <el-radio value="bottom" style="margin: 0; position: absolute; left: 195px; top: 280px">‎</el-radio>
+            <el-radio value="bottomRight" style="margin: 0; position: absolute; right: 25px; top: 280px">‎</el-radio>
         </el-radio-group>
 
         <template #footer>
diff --git a/src/views/Settings/dialogs/RegistryBackupDialog.vue b/src/views/Settings/dialogs/RegistryBackupDialog.vue
index c8144aff..cd5d8a51 100644
--- a/src/views/Settings/dialogs/RegistryBackupDialog.vue
+++ b/src/views/Settings/dialogs/RegistryBackupDialog.vue
@@ -33,7 +33,7 @@
                     <template #default="scope">
                         <el-tooltip placement="top" :content="t('dialog.registry_backup.restore')">
                             <el-button
-                                type="text"
+                                text
                                 :icon="Upload"
                                 size="small"
                                 class="button-pd-0"
@@ -41,7 +41,7 @@
                         </el-tooltip>
                         <el-tooltip placement="top" :content="t('dialog.registry_backup.save_to_file')">
                             <el-button
-                                type="text"
+                                text
                                 :icon="Download"
                                 size="small"
                                 class="button-pd-0"
@@ -49,7 +49,7 @@
                         </el-tooltip>
                         <el-tooltip placement="top" :content="t('dialog.registry_backup.delete')">
                             <el-button
-                                type="text"
+                                text
                                 :icon="Delete"
                                 size="small"
                                 class="button-pd-0"
diff --git a/src/views/Sidebar/components/FriendItem.vue b/src/views/Sidebar/components/FriendItem.vue
index e2fd11ce..da34fa6c 100644
--- a/src/views/Sidebar/components/FriendItem.vue
+++ b/src/views/Sidebar/components/FriendItem.vue
@@ -35,7 +35,7 @@
         <template v-else-if="!friend.ref && !isRefreshFriendsLoading">
             <span>{{ friend.name || friend.id }}</span>
             <el-button
-                type="text"
+                text
                 :icon="Close"
                 size="small"
                 style="margin-left: 5px"
diff --git a/src/views/Tools/dialogs/GroupCalendarDialog.vue b/src/views/Tools/dialogs/GroupCalendarDialog.vue
index ddc4ed87..0511a51b 100644
--- a/src/views/Tools/dialogs/GroupCalendarDialog.vue
+++ b/src/views/Tools/dialogs/GroupCalendarDialog.vue
@@ -6,7 +6,7 @@
         width="90vw"
         height="80vh"
         @close="closeDialog">
-        <template #title>
+        <template #header>
             <div class="dialog-title-container">
                 <span>{{ t('dialog.group_calendar.header') }}</span>
                 <el-button @click="toggleViewMode" type="primary" size="small" class="view-toggle-btn">
diff --git a/src/views/Tools/dialogs/NoteExportDialog.vue b/src/views/Tools/dialogs/NoteExportDialog.vue
index d43419f2..a09df271 100644
--- a/src/views/Tools/dialogs/NoteExportDialog.vue
+++ b/src/views/Tools/dialogs/NoteExportDialog.vue
@@ -79,11 +79,7 @@
 
             <el-table-column :label="t('table.import.skip_export')" width="90" align="right">
                 <template #default="{ row }">
-                    <el-button
-                        type="text"
-                        :icon="Close"
-                        size="small"
-                        @click="removeFromNoteExportTable(row)"></el-button>
+                    <el-button text :icon="Close" size="small" @click="removeFromNoteExportTable(row)"></el-button>
                 </template>
             </el-table-column>
         </DataTable>