diff --git a/html/src/app.scss b/html/src/app.scss
index 769f59cc..dd622db0 100644
--- a/html/src/app.scss
+++ b/html/src/app.scss
@@ -692,6 +692,11 @@ i.x-user-status.busy {
     padding: 0px 10px 10px 10px;
 }
 
+.options-container .header-bar {
+    display: flex;
+    align-items: center;
+}
+
 .options-container .header {
     font-weight: bold;
     font-size: 20px;
@@ -888,3 +893,7 @@ i.x-user-status.busy {
 .max-height-el-select .el-select-dropdown__wrap {
     max-height: 83vh;
 }
+
+.el-pagination .el-input .el-input__icon {
+    line-height: 22px;
+}
diff --git a/html/src/mixins/tabs/favorites.pug b/html/src/mixins/tabs/favorites.pug
index 6614f335..253588e2 100644
--- a/html/src/mixins/tabs/favorites.pug
+++ b/html/src/mixins/tabs/favorites.pug
@@ -1,6 +1,6 @@
 mixin favoritesTab()            
     .x-container(v-show="$refs.menu && $refs.menu.activeIndex === 'favorite'")
-        div(style="font-size:13px;position:absolute;right:0;z-index:1")
+        div(style="font-size:13px;position:absolute;right:0;z-index:1;margin-right:15px")
             div(v-if="editFavoritesMode" style="display:inline-block;margin-right:10px")
                 el-button(size="small" @click="clearBulkFavoriteSelection ") {{ $t('view.favorite.clear') }}
                 el-button(size="small" @click="bulkCopyFavoriteSelection") {{ $t('view.favorite.copy') }}
@@ -15,7 +15,7 @@ mixin favoritesTab()
                 el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '0'" style="border:0")
                     el-button(size="small" @click="showFriendExportDialog") {{ $t('view.favorite.export') }}
                     el-button(size="small" @click="showFriendImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }}
-                    div(style="display:inline-block;float:right;font-size:13px;margin-right:10px")
+                    div(style="display:flex;align-items:center;float:right;font-size:13px;margin-right:10px")
                         span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }}
                         el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
                     el-collapse-item(v-for="group in API.favoriteFriendGroups" :key="group.name")
@@ -57,7 +57,7 @@ mixin favoritesTab()
                 el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '1'" style="border:0")
                     el-button(size="small" @click="showWorldExportDialog") {{ $t('view.favorite.export') }}
                     el-button(size="small" @click="showWorldImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }}
-                    div(style="display:inline-block;float:right;font-size:13px;margin-right:10px")
+                    div(style="display:flex;align-items:center;float:right;font-size:13px;margin-right:10px")
                         span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }}
                         el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
                     span(style="display:block;margin-top:20px") {{ $t('view.favorite.worlds.search') }}
@@ -168,7 +168,7 @@ mixin favoritesTab()
                 el-collapse(v-if="$refs.menu && $refs.menu.activeIndex === 'favorite' && $refs.favoriteTabRef && $refs.favoriteTabRef.currentName === '2'" style="border:0")
                     el-button(size="small" @click="showAvatarExportDialog") {{ $t('view.favorite.export') }}
                     el-button(size="small" @click="showAvatarImportDialog" style="margin-left:5px") {{ $t('view.favorite.import') }}
-                    div(style="display:inline-block;float:right;font-size:13px;margin-right:10px")
+                    div(style="display:flex;align-items:center;float:right;font-size:13px;margin-right:10px")
                         span.name(style="margin-right:5px") {{ $t('view.favorite.sort_by') }}
                         el-switch(v-model="sortFavorites" :inactive-text="$t('view.settings.appearance.appearance.sort_favorite_by_name')" :active-text="$t('view.settings.appearance.appearance.sort_favorite_by_date')" @change="saveSortFavoritesOption")
                     span(style="display:block;margin-top:20px") {{ $t('view.favorite.avatars.search') }}
diff --git a/html/src/mixins/tabs/profile.pug b/html/src/mixins/tabs/profile.pug
index 8cd95f9a..3d2e6583 100644
--- a/html/src/mixins/tabs/profile.pug
+++ b/html/src/mixins/tabs/profile.pug
@@ -37,9 +37,10 @@ mixin profileTab()
                         span.extra(v-if="visits") {{ $t('view.profile.game_info.user_online', { count: visits }) }}
                         span.extra(v-else) {{ $t('view.profile.game_info.refresh') }}
         div.options-container
-            span.header {{ $t('view.profile.vrc_sdk_downloads.header') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="API.getConfig()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.vrc_sdk_downloads.header') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="API.getConfig()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
             .x-friend-list(style="margin-top:10px")
                 .x-friend-item(v-for="(link, item) in API.cachedConfig.downloadUrls" :key="item" placement="top")
                     .detail(@click="openExternalLink(link)")
@@ -54,11 +55,12 @@ mixin profileTab()
                     el-button(size="small" @click="promptWorldDialog()") {{ $t('view.profile.direct_access.world_instance') }}
                     el-button(size="small" @click="promptAvatarDialog()") {{ $t('view.profile.direct_access.avatar') }}
         div.options-container
-            span.header {{ $t('view.profile.invite_messages') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteMessageTable.visible = true; refreshInviteMessageTable('message')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.invite_messages') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteMessageTable.visible = true; refreshInviteMessageTable('message')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             data-tables(v-if="inviteMessageTable.visible" v-bind="inviteMessageTable" style="margin-top:10px")
                 el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70")
                 el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message")
@@ -69,11 +71,12 @@ mixin profileTab()
                     template(v-once #default="scope")
                         el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('message', scope.row)")
         div.options-container
-            span.header {{ $t('view.profile.invite_response_messages') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteResponseMessageTable.visible = true; refreshInviteMessageTable('response')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.invite_response_messages') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteResponseMessageTable.visible = true; refreshInviteMessageTable('response')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             data-tables(v-if="inviteResponseMessageTable.visible" v-bind="inviteResponseMessageTable" style="margin-top:10px")
                 el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70")
                 el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message")
@@ -84,11 +87,12 @@ mixin profileTab()
                     template(v-once #default="scope")
                         el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('response', scope.row)")
         div.options-container
-            span.header {{ $t('view.profile.invite_request_messages') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteRequestMessageTable.visible = true; refreshInviteMessageTable('request')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteRequestMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.invite_request_messages') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteRequestMessageTable.visible = true; refreshInviteMessageTable('request')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteRequestMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             data-tables(v-if="inviteRequestMessageTable.visible" v-bind="inviteRequestMessageTable" style="margin-top:10px")
                 el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70")
                 el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message")
@@ -99,11 +103,12 @@ mixin profileTab()
                     template(v-once #default="scope")
                         el-button(type="text" icon="el-icon-edit" size="mini" @click="showEditInviteMessageDialog('request', scope.row)")
         div.options-container
-            span.header {{ $t('view.profile.invite_request_response_messages') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteRequestResponseMessageTable.visible = true; refreshInviteMessageTable('requestResponse')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="inviteRequestResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.invite_request_response_messages') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteRequestResponseMessageTable.visible = true; refreshInviteMessageTable('requestResponse')" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="inviteRequestResponseMessageTable.visible = false" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             data-tables(v-if="inviteRequestResponseMessageTable.visible" v-bind="inviteRequestResponseMessageTable" style="margin-top:10px")
                 el-table-column(:label="$t('table.profile.invite_messages.slot')" prop="slot" sortable="custom" width="70")
                 el-table-column(:label="$t('table.profile.invite_messages.message')" prop="message")
@@ -121,33 +126,36 @@ mixin profileTab()
                         span {{ scope.row.updated_at | formatDate('long') }}
                 el-table-column(:label="$t('table.profile.previous_display_name.name')" prop="displayName")
         div.options-container
-            span.header {{ $t('view.profile.config_json') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="refreshConfigTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="configTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.config_json') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="refreshConfigTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="configTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             el-tree(v-if="configTreeData.length > 0" :data="configTreeData" style="margin-top:10px;font-size:12px")
                 template(#default="scope")
                     span
                         span(v-text="scope.data.key" style="font-weight:bold;margin-right:5px")
                         span(v-if="!scope.data.children" v-text="scope.data.value")
         div.options-container
-            span.header {{ $t('view.profile.current_user_json') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="refreshCurrentUserTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="currentUserTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.current_user_json') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="refreshCurrentUserTreeData()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="currentUserTreeData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             el-tree(v-if="currentUserTreeData.length > 0" :data="currentUserTreeData" style="margin-top:10px;font-size:12px")
                 template(#default="scope")
                     span
                         span(v-text="scope.data.key" style="font-weight:bold;margin-right:5px")
                         span(v-if="!scope.data.children" v-text="scope.data.value")
         div.options-container
-            span.header {{ $t('view.profile.feedback') }}
-            el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="getCurrentUserFeedback()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
-            el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
-                el-button(type="default" @click="currentUserFeedbackData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
+            div.header-bar
+                span.header {{ $t('view.profile.feedback') }}
+                el-tooltip(placement="top" :content="$t('view.profile.refresh_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="getCurrentUserFeedback()" size="mini" icon="el-icon-refresh" circle style="margin-left:5px")
+                el-tooltip(placement="top" :content="$t('view.profile.clear_results_tooltip')" :disabled="hideTooltips")
+                    el-button(type="default" @click="currentUserFeedbackData = []" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
             el-tree(v-if="currentUserFeedbackData.length > 0" :data="currentUserFeedbackData" style="margin-top:10px;font-size:12px")
                 template(#default="scope")
                     span
diff --git a/html/src/mixins/tabs/settings.pug b/html/src/mixins/tabs/settings.pug
index 2de04b79..53de1cb5 100644
--- a/html/src/mixins/tabs/settings.pug
+++ b/html/src/mixins/tabs/settings.pug
@@ -23,7 +23,7 @@ mixin simpleRadioGroup(nameTrKey, model, options, onChange="")
     div.options-container-item
         span.name {{ $t('#{nameTrKey}') }}
         br
-        el-radio-group(v-model=model @change=onChange size="mini")
+        el-radio-group(v-model=model @change=onChange size="mini" style="margin-top:5px")
             each option in options
                 el-radio-button(label=option.label) {{ $t('#{option.translationKey}') }}
 
@@ -33,7 +33,7 @@ mixin simpleRadioGroupWithTooltip(nameTrKey, tooltipContent, model, options, onC
             el-tooltip(placement="top" style="margin-left:5px" :content=tooltipContent)
                 i.el-icon-warning
         br
-        el-radio-group(v-model=model @change=onChange size="mini")
+        el-radio-group(v-model=model @change=onChange size="mini" style="margin-top:5px")
             each option in options
                 el-radio-button(label=option.label) {{ $t('#{option.translationKey}') }}
 
@@ -98,7 +98,7 @@ mixin settingsTab()
                 //- General | Favorite
                 +simpleSettingsCategory("view.settings.general.favorites.header")
                     br
-                    el-select(v-model="localFavoriteFriendsGroups" multiple clearable :placeholder="$t('view.settings.general.favorites.group_placeholder')" @change="updateLocalFavoriteFriends")
+                    el-select(v-model="localFavoriteFriendsGroups" multiple clearable :placeholder="$t('view.settings.general.favorites.group_placeholder')" @change="updateLocalFavoriteFriends" style="margin-top:8px")
                         el-option-group(:label="$t('view.settings.general.favorites.group_placeholder')")
                             el-option.x-friend-item(v-for="group in API.favoriteFriendGroups" :key="group.key" :label="group.displayName ? group.displayName : group.name" :value="group.key")
                                 .detail
@@ -252,7 +252,7 @@ mixin settingsTab()
                     div.options-container-item
                         span.name {{ $t('view.settings.appearance.user_dialog.export_vrcx_memos_into_vrchat_notes') }}
                         br
-                        el-button(size="small" icon="el-icon-document-copy" @click="showNoteExportDialog") {{ $t('view.settings.appearance.user_dialog.export_notes') }}
+                        el-button(size="small" icon="el-icon-document-copy" @click="showNoteExportDialog" style="margin-top:5px") {{ $t('view.settings.appearance.user_dialog.export_notes') }}
                 //- Appearance | Friend Log
                 div.options-container
                     span.header {{ $t('view.settings.appearance.friend_log.header') }}
@@ -325,7 +325,7 @@ mixin settingsTab()
                     div.options-container-item
                         span.name {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display') }}
                         br
-                        el-radio-group(v-model="desktopToast" @change="saveOpenVROption" size="mini")
+                        el-radio-group(v-model="desktopToast" @change="saveOpenVROption" size="mini" style="margin-top:5px")
                             el-radio-button(label="Never") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_never') }}
                             el-radio-button(label="Desktop Mode") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_desktop') }}
                             el-radio-button(label="Inside VR") {{ $t('view.settings.notifications.notifications.desktop_notifications.when_to_display_inside_vr') }}
@@ -342,7 +342,7 @@ mixin settingsTab()
                     div.options-container-item
                         span.name {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play') }}
                         br
-                        el-radio-group(v-model="notificationTTS" @change="saveNotificationTTS" size="mini")
+                        el-radio-group(v-model="notificationTTS" @change="saveNotificationTTS" size="mini" style="margin-top:5px")
                             el-radio-button(label="Never") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_never') }}
                             el-radio-button(label="Inside VR") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_inside_vr') }}
                             el-radio-button(label="Game Closed") {{ $t('view.settings.notifications.notifications.text_to_speech.when_to_play_game_closed') }}
@@ -504,7 +504,7 @@ mixin settingsTab()
                 //- Advanced | Automatic App Launcher
                 +simpleSettingsCategory("view.settings.advanced.advanced.app_launcher.header")
                     br
-                    el-button(size="small" icon="el-icon-folder" @click="openShortcutFolder()") {{ $t('view.settings.advanced.advanced.app_launcher.folder') }}
+                    el-button(size="small" icon="el-icon-folder" @click="openShortcutFolder()" style="margin-top:5px") {{ $t('view.settings.advanced.advanced.app_launcher.folder') }}
                         el-tooltip(placement="top" style="margin-left:5px" :content="$t('view.settings.advanced.advanced.app_launcher.folder_tooltip')")
                             i.el-icon-warning
                     +simpleSwitch("view.settings.advanced.advanced.app_launcher.enable", "enableAppLauncher", "updateAppLauncherSettings")