diff --git a/app/assets/css/tailwind.css b/app/assets/css/tailwind.css
index c2cb68cf6..226f20114 100644
--- a/app/assets/css/tailwind.css
+++ b/app/assets/css/tailwind.css
@@ -3,7 +3,6 @@
 @tailwind utilities;
 
 @layer base {
-
     input[type='number']::-webkit-inner-spin-button,
     input[type='number']::-webkit-outer-spin-button {
         -webkit-appearance: none;
@@ -52,13 +51,13 @@ html {
             align-items: flex-start;
             display: flex;
 
-            >label {
+            > label {
                 flex: 0 0 auto;
                 margin-right: 0.5rem;
                 user-select: none;
             }
 
-            >div {
+            > div {
                 flex: 1 1 auto;
 
                 p {
@@ -102,7 +101,7 @@ html {
             position: relative;
             vertical-align: top;
 
-            >* {
+            > * {
                 margin-bottom: 0;
             }
         }
diff --git a/app/components/auth/ForgotPasswordForm.vue b/app/components/auth/ForgotPasswordForm.vue
index cc0b5bb6b..7fa590812 100644
--- a/app/components/auth/ForgotPasswordForm.vue
+++ b/app/components/auth/ForgotPasswordForm.vue
@@ -2,9 +2,9 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
 import PasswordStrengthMeter from '~/components/auth/PasswordStrengthMeter.vue';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const props = defineProps<{
     modelValue: boolean;
diff --git a/app/components/auth/LoginForm.vue b/app/components/auth/LoginForm.vue
index 1480c791d..983e98806 100644
--- a/app/components/auth/LoginForm.vue
+++ b/app/components/auth/LoginForm.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { useAuthStore } from '~/store/auth';
 import { useCookiesStore } from '~/store/cookies';
 import { useSettingsStore } from '~/store/settings';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const props = defineProps<{
     modelValue: boolean;
diff --git a/app/components/auth/RegistrationForm.vue b/app/components/auth/RegistrationForm.vue
index 6d33a3d3a..a9115a1d5 100644
--- a/app/components/auth/RegistrationForm.vue
+++ b/app/components/auth/RegistrationForm.vue
@@ -2,10 +2,10 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
 import PasswordStrengthMeter from '~/components/auth/PasswordStrengthMeter.vue';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { openTokenMgmt } from '~/composables/nui';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const notifications = useNotificatorStore();
 
diff --git a/app/components/calendar/CalendarCreateOrUpdateModal.vue b/app/components/calendar/CalendarCreateOrUpdateModal.vue
index acb5864ff..40e4acd53 100644
--- a/app/components/calendar/CalendarCreateOrUpdateModal.vue
+++ b/app/components/calendar/CalendarCreateOrUpdateModal.vue
@@ -1,6 +1,9 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import ColorPickerTW from '~/components/partials/ColorPickerTW.vue';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums } from '~/components/partials/access/helpers';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
@@ -9,9 +12,6 @@ import { useNotificatorStore } from '~/store/notificator';
 import { AccessLevel, type CalendarJobAccess, type CalendarUserAccess } from '~~/gen/ts/resources/calendar/access';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { CreateOrUpdateCalendarResponse } from '~~/gen/ts/services/calendar/calendar';
-import ColorPickerTW from '../partials/ColorPickerTW.vue';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums } from '../partials/access/helpers';
 
 const props = defineProps<{
     calendarId?: number;
diff --git a/app/components/calendar/CalendarViewSlideover.vue b/app/components/calendar/CalendarViewSlideover.vue
index 237bf4b3b..398269799 100644
--- a/app/components/calendar/CalendarViewSlideover.vue
+++ b/app/components/calendar/CalendarViewSlideover.vue
@@ -1,4 +1,5 @@
 <script lang="ts" setup>
+import AccessBadges from '~/components/partials/access/AccessBadges.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import ConfirmModal from '~/components/partials/ConfirmModal.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
@@ -7,7 +8,6 @@ import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
 import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
 import { useCalendarStore } from '~/store/calendar';
 import { AccessLevel } from '~~/gen/ts/resources/calendar/access';
-import AccessBadges from '../partials/access/AccessBadges.vue';
 import CalendarCreateOrUpdateModal from './CalendarCreateOrUpdateModal.vue';
 import { checkCalendarAccess } from './helpers';
 
diff --git a/app/components/citizens/CitizensList.vue b/app/components/citizens/CitizensList.vue
index 71a6a75b2..5de289ae0 100644
--- a/app/components/citizens/CitizensList.vue
+++ b/app/components/citizens/CitizensList.vue
@@ -2,6 +2,7 @@
 import type { TableColumn } from '#ui/types';
 import { vMaska } from 'maska/vue';
 import { z } from 'zod';
+import { sexToTextColor } from '~/components/partials/citizens/helpers';
 import PhoneNumberBlock from '~/components/partials/citizens/PhoneNumberBlock.vue';
 import ProfilePictureImg from '~/components/partials/citizens/ProfilePictureImg.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
@@ -11,7 +12,6 @@ import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { User } from '~~/gen/ts/resources/users/users';
 import type { ListCitizensRequest, ListCitizensResponse } from '~~/gen/ts/services/citizenstore/citizenstore';
-import { sexToTextColor } from '../partials/citizens/helpers';
 
 const { t } = useI18n();
 
diff --git a/app/components/documents/DocumentEditor.vue b/app/components/documents/DocumentEditor.vue
index 060125c4c..190213210 100644
--- a/app/components/documents/DocumentEditor.vue
+++ b/app/components/documents/DocumentEditor.vue
@@ -4,6 +4,10 @@ import { z } from 'zod';
 import DocumentReferenceManager from '~/components/documents/DocumentReferenceManager.vue';
 import DocumentRelationManager from '~/components/documents/DocumentRelationManager.vue';
 import { checkDocAccess, logger } from '~/components/documents/helpers';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums } from '~/components/partials/access/helpers';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
+import { availableIcons, fallbackIcon } from '~/components/partials/icons';
 import { getDocument, getUser, useClipboardStore } from '~/store/clipboard';
 import { useCompletorStore } from '~/store/completor';
 import { useDocumentEditorStore } from '~/store/documenteditor';
@@ -17,10 +21,6 @@ import { DocReference, DocRelation } from '~~/gen/ts/resources/documents/documen
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { CreateDocumentRequest, UpdateDocumentRequest } from '~~/gen/ts/services/docstore/docstore';
-import { markerFallbackIcon, markerIcons } from '../livemap/helpers';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums } from '../partials/access/helpers';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 
 const props = defineProps<{
     documentId?: number;
@@ -551,9 +551,9 @@ logger.info(
                                                     >
                                                         <component
                                                             :is="
-                                                                markerIcons.find(
+                                                                availableIcons.find(
                                                                     (item) => item.name === state.category?.icon,
-                                                                ) ?? markerFallbackIcon
+                                                                ) ?? fallbackIcon
                                                             "
                                                             v-if="state.category.icon"
                                                             class="size-5"
@@ -567,8 +567,8 @@ logger.info(
                                                     <span class="inline-flex gap-1" :class="`bg-${option.color}-500`">
                                                         <component
                                                             :is="
-                                                                markerIcons.find((item) => item.name === option.icon) ??
-                                                                markerFallbackIcon
+                                                                availableIcons.find((item) => item.name === option.icon) ??
+                                                                fallbackIcon
                                                             "
                                                             v-if="option.icon"
                                                             class="size-5"
diff --git a/app/components/documents/DocumentList.vue b/app/components/documents/DocumentList.vue
index dbadfca34..3ce3274aa 100644
--- a/app/components/documents/DocumentList.vue
+++ b/app/components/documents/DocumentList.vue
@@ -5,7 +5,10 @@ import { z } from 'zod';
 import DocumentListEntry from '~/components/documents/DocumentListEntry.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
+import DateRangePickerPopoverClient from '~/components/partials/DateRangePickerPopover.client.vue';
+import { availableIcons, fallbackIcon } from '~/components/partials/icons';
 import Pagination from '~/components/partials/Pagination.vue';
+import SortButton from '~/components/partials/SortButton.vue';
 import { useCompletorStore } from '~/store/completor';
 import { useSettingsStore } from '~/store/settings';
 import type { OpenClose } from '~/typings';
@@ -13,9 +16,6 @@ import * as googleProtobufTimestamp from '~~/gen/ts/google/protobuf/timestamp';
 import type { Category } from '~~/gen/ts/resources/documents/category';
 import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { ListDocumentsRequest, ListDocumentsResponse } from '~~/gen/ts/services/docstore/docstore';
-import { markerFallbackIcon, markerIcons } from '../livemap/helpers';
-import DateRangePickerPopoverClient from '../partials/DateRangePickerPopover.client.vue';
-import SortButton from '../partials/SortButton.vue';
 
 const { t } = useI18n();
 
@@ -191,8 +191,8 @@ defineShortcuts({
                                                 <span class="inline-flex gap-1" :class="`bg-${category.color}-500`">
                                                     <component
                                                         :is="
-                                                            markerIcons.find((item) => item.name === category?.icon) ??
-                                                            markerFallbackIcon
+                                                            availableIcons.find((item) => item.name === category?.icon) ??
+                                                            fallbackIcon
                                                         "
                                                         v-if="category.icon"
                                                         class="size-5"
@@ -207,9 +207,7 @@ defineShortcuts({
                                     <template #option="{ option }">
                                         <span class="inline-flex gap-1" :class="`bg-${option.color}-500`">
                                             <component
-                                                :is="
-                                                    markerIcons.find((item) => item.name === option.icon) ?? markerFallbackIcon
-                                                "
+                                                :is="availableIcons.find((item) => item.name === option.icon) ?? fallbackIcon"
                                                 v-if="option.icon"
                                                 class="size-5"
                                             />
diff --git a/app/components/documents/DocumentListEntry.vue b/app/components/documents/DocumentListEntry.vue
index f59b6c101..2cf8ac6a4 100644
--- a/app/components/documents/DocumentListEntry.vue
+++ b/app/components/documents/DocumentListEntry.vue
@@ -2,9 +2,9 @@
 import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
 import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { DocumentShort } from '~~/gen/ts/resources/documents/documents';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 
 defineProps<{
     document: DocumentShort;
diff --git a/app/components/documents/DocumentReferenceManager.vue b/app/components/documents/DocumentReferenceManager.vue
index ea1b19b58..3828892c7 100644
--- a/app/components/documents/DocumentReferenceManager.vue
+++ b/app/components/documents/DocumentReferenceManager.vue
@@ -2,12 +2,12 @@
 import type { TabItem } from '#ui/types';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
+import DocumentInfoPopover from '~/components/partials/documents/DocumentInfoPopover.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { ClipboardDocument } from '~/store/clipboard';
 import { getDocument, useClipboardStore } from '~/store/clipboard';
 import type { DocumentReference, DocumentShort } from '~~/gen/ts/resources/documents/documents';
 import { DocReference } from '~~/gen/ts/resources/documents/documents';
-import DocumentInfoPopover from '../partials/documents/DocumentInfoPopover.vue';
 
 const props = defineProps<{
     open: boolean;
diff --git a/app/components/documents/DocumentReferences.vue b/app/components/documents/DocumentReferences.vue
index 239fffa65..0273579c1 100644
--- a/app/components/documents/DocumentReferences.vue
+++ b/app/components/documents/DocumentReferences.vue
@@ -3,10 +3,10 @@ import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopove
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { DocumentReference } from '~~/gen/ts/resources/documents/documents';
 import { DocReference } from '~~/gen/ts/resources/documents/documents';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 import { refToBadge } from './helpers';
 
 const props = withDefaults(
diff --git a/app/components/documents/DocumentRelations.vue b/app/components/documents/DocumentRelations.vue
index 0f6a4d7d4..53266d7d8 100644
--- a/app/components/documents/DocumentRelations.vue
+++ b/app/components/documents/DocumentRelations.vue
@@ -3,10 +3,10 @@ import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopove
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import type { DocumentRelation } from '~~/gen/ts/resources/documents/documents';
 import { DocRelation } from '~~/gen/ts/resources/documents/documents';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 import { relationToBadge } from './helpers';
 
 const props = withDefaults(
diff --git a/app/components/documents/DocumentReminderModal.vue b/app/components/documents/DocumentReminderModal.vue
index e961fb0e3..cd9fe473d 100644
--- a/app/components/documents/DocumentReminderModal.vue
+++ b/app/components/documents/DocumentReminderModal.vue
@@ -2,11 +2,11 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { subDays } from 'date-fns';
 import { z } from 'zod';
+import DatePickerPopoverClient from '~/components/partials/DatePickerPopover.client.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { Timestamp } from '~~/gen/ts/resources/timestamp/timestamp';
 import type { SetDocumentReminderResponse } from '~~/gen/ts/services/docstore/docstore';
-import DatePickerPopoverClient from '../partials/DatePickerPopover.client.vue';
 
 const props = defineProps<{
     documentId: number;
diff --git a/app/components/documents/DocumentView.vue b/app/components/documents/DocumentView.vue
index e97a4aa4c..fd249d5eb 100644
--- a/app/components/documents/DocumentView.vue
+++ b/app/components/documents/DocumentView.vue
@@ -1,20 +1,23 @@
 <script lang="ts" setup>
 import AddToButton from '~/components/clipboard/AddToButton.vue';
-import DocumentActivityList from '~/components/documents/DocumentActivityList.vue';
-import DocumentComments from '~/components/documents/DocumentComments.vue';
+import DocumentActivityList from '~/components/documents/activity/DocumentActivityList.vue';
+import DocumentComments from '~/components/documents/comments/DocumentComments.vue';
 import DocumentReferences from '~/components/documents/DocumentReferences.vue';
 import DocumentRelations from '~/components/documents/DocumentRelations.vue';
 import { checkDocAccess } from '~/components/documents/helpers';
 import DocumentRequestAccess from '~/components/documents/requests/DocumentRequestAccess.vue';
 import DocumentRequestsModal from '~/components/documents/requests/DocumentRequestsModal.vue';
-import ConfirmModal from '~/components/partials/ConfirmModal.vue';
-import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
-import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
+import AccessBadges from '~/components/partials/access/AccessBadges.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
+import ConfirmModal from '~/components/partials/ConfirmModal.vue';
+import HTMLContent from '~/components/partials/content/HTMLContent.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
+import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
+import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
 import { useClipboardStore } from '~/store/clipboard';
 import { useNotificatorStore } from '~/store/notificator';
 import type { DocumentAccess } from '~~/gen/ts/resources/documents/access';
@@ -23,9 +26,6 @@ import type { Document } from '~~/gen/ts/resources/documents/documents';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { Timestamp } from '~~/gen/ts/resources/timestamp/timestamp';
 import type { ToggleDocumentPinResponse } from '~~/gen/ts/services/docstore/docstore';
-import AccessBadges from '../partials/access/AccessBadges.vue';
-import HTMLContent from '../partials/content/HTMLContent.vue';
-import DocumentCategoryBadge from '../partials/documents/DocumentCategoryBadge.vue';
 import DocumentReminderModal from './DocumentReminderModal.vue';
 
 const props = defineProps<{
diff --git a/app/components/documents/DocumentActivityList.vue b/app/components/documents/activity/DocumentActivityList.vue
similarity index 95%
rename from app/components/documents/DocumentActivityList.vue
rename to app/components/documents/activity/DocumentActivityList.vue
index eb5a0ca10..5e10f154a 100644
--- a/app/components/documents/DocumentActivityList.vue
+++ b/app/components/documents/activity/DocumentActivityList.vue
@@ -1,5 +1,5 @@
 <script lang="ts" setup>
-import DocumentActivityListEntry from '~/components/documents/DocumentActivityListEntry.vue';
+import DocumentActivityListEntry from '~/components/documents/activity/DocumentActivityListEntry.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
diff --git a/app/components/documents/DocumentActivityListEntry.vue b/app/components/documents/activity/DocumentActivityListEntry.vue
similarity index 98%
rename from app/components/documents/DocumentActivityListEntry.vue
rename to app/components/documents/activity/DocumentActivityListEntry.vue
index f81bd3dfc..bd9b4f446 100644
--- a/app/components/documents/DocumentActivityListEntry.vue
+++ b/app/components/documents/activity/DocumentActivityListEntry.vue
@@ -5,7 +5,7 @@ import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import { AccessLevel } from '~~/gen/ts/resources/documents/access';
 import type { DocActivity } from '~~/gen/ts/resources/documents/activity';
 import { DocActivityType } from '~~/gen/ts/resources/documents/activity';
-import { getDocAtivityIcon } from './helpers';
+import { getDocAtivityIcon } from '../helpers';
 
 defineProps<{
     entry: DocActivity;
diff --git a/app/components/documents/categories/CategoriesList.vue b/app/components/documents/categories/CategoriesList.vue
index 4d1447663..22d14bd56 100644
--- a/app/components/documents/categories/CategoriesList.vue
+++ b/app/components/documents/categories/CategoriesList.vue
@@ -81,6 +81,7 @@ const modal = useModal();
                     <template #title>
                         <USkeleton class="h-6 w-[275px]" />
                     </template>
+
                     <template #description>
                         <USkeleton class="h-11 w-[350px]" />
                     </template>
@@ -93,7 +94,7 @@ const modal = useModal();
             :error="error"
             :retry="refresh"
         />
-        <DataNoDataBlock v-else-if="categories && categories.length === 0" icon="i-mdi-tag" :type="$t('common.category', 2)" />
+        <DataNoDataBlock v-else-if="!categories || categories.length === 0" icon="i-mdi-tag" :type="$t('common.category', 2)" />
 
         <div v-else class="flex justify-center">
             <CardsList :items="items" @selected="categorySelected($event)" />
diff --git a/app/components/documents/DocumentCommentEntry.vue b/app/components/documents/comments/DocumentCommentEntry.vue
similarity index 97%
rename from app/components/documents/DocumentCommentEntry.vue
rename to app/components/documents/comments/DocumentCommentEntry.vue
index 1825814ba..a533de2d5 100644
--- a/app/components/documents/DocumentCommentEntry.vue
+++ b/app/components/documents/comments/DocumentCommentEntry.vue
@@ -3,12 +3,12 @@ import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import ConfirmModal from '~/components/partials/ConfirmModal.vue';
+import HTMLContent from '~/components/partials/content/HTMLContent.vue';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import type { Comment } from '~~/gen/ts/resources/documents/comment';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import HTMLContent from '../partials/content/HTMLContent.vue';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 
 const props = defineProps<{
     modelValue?: Comment;
diff --git a/app/components/documents/DocumentComments.vue b/app/components/documents/comments/DocumentComments.vue
similarity index 97%
rename from app/components/documents/DocumentComments.vue
rename to app/components/documents/comments/DocumentComments.vue
index 05b8f4191..c2130a923 100644
--- a/app/components/documents/DocumentComments.vue
+++ b/app/components/documents/comments/DocumentComments.vue
@@ -1,16 +1,16 @@
 <script setup lang="ts">
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
-import DocumentCommentEntry from '~/components/documents/DocumentCommentEntry.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import Pagination from '~/components/partials/Pagination.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import type { Comment } from '~~/gen/ts/resources/documents/comment';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { GetCommentsResponse } from '~~/gen/ts/services/docstore/docstore';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
+import DocumentCommentEntry from './DocumentCommentEntry.vue';
 
 const props = withDefaults(
     defineProps<{
diff --git a/app/components/livemap/MapMarkerMarker.vue b/app/components/livemap/MapMarkerMarker.vue
index 7fea51d21..3f413a90c 100644
--- a/app/components/livemap/MapMarkerMarker.vue
+++ b/app/components/livemap/MapMarkerMarker.vue
@@ -1,8 +1,8 @@
 <script lang="ts" setup>
 import { LCircle, LIcon, LMarker } from '@vue-leaflet/vue-leaflet';
 import type { PointExpression } from 'leaflet';
-import { markerFallbackIcon, markerIcons } from '~/components/livemap/helpers';
 import MarkerMarkerPopup from '~/components/livemap/MarkerMarkerPopup.vue';
+import { availableIcons, fallbackIcon } from '~/components/partials/icons';
 import type { MarkerMarker } from '~~/gen/ts/resources/livemap/livemap';
 
 const props = withDefaults(
@@ -47,11 +47,11 @@ const popupAnchor = ref<PointExpression>([0, (props.size / 2) * -1]);
         <LIcon :icon-size="[size, size]" :icon-anchor="iconAnchor" :popup-anchor="popupAnchor">
             <component
                 :is="
-                    markerIcons.find(
+                    availableIcons.find(
                         (icon) =>
                             marker.data?.data.oneofKind === 'icon' &&
                             icon.name === convertDynamicIconNameToComponent(marker.data?.data.icon.icon),
-                    ) ?? markerFallbackIcon.name
+                    ) ?? fallbackIcon.name
                 "
                 class="size-full"
                 :style="{ color: marker.info?.color ?? 'currentColor' }"
@@ -63,7 +63,7 @@ const popupAnchor = ref<PointExpression>([0, (props.size / 2) * -1]);
 
     <LMarker v-else :lat-lng="[marker.info!.y, marker.info!.x]" :name="marker.info!.name" @click="$emit('selected')">
         <LIcon :icon-size="[size, size]" :icon-anchor="iconAnchor" :popup-anchor="popupAnchor">
-            <component :is="markerFallbackIcon" :fill="marker.info?.color ?? 'currentColor'" />
+            <component :is="fallbackIcon" :fill="marker.info?.color ?? 'currentColor'" />
         </LIcon>
 
         <MarkerMarkerPopup :marker="marker" />
diff --git a/app/components/livemap/MarkerCreateOrUpdateSlideover.vue b/app/components/livemap/MarkerCreateOrUpdateSlideover.vue
index c858ad753..08937ae7d 100644
--- a/app/components/livemap/MarkerCreateOrUpdateSlideover.vue
+++ b/app/components/livemap/MarkerCreateOrUpdateSlideover.vue
@@ -4,10 +4,10 @@ import { HelpIcon } from 'mdi-vue3';
 import { z } from 'zod';
 import ColorPickerClient from '~/components/partials/ColorPicker.client.vue';
 import DatePickerPopoverClient from '~/components/partials/DatePickerPopover.client.vue';
+import IconSelectMenu from '~/components/partials/IconSelectMenu.vue';
 import { useLivemapStore } from '~/store/livemap';
 import type { MarkerMarker } from '~~/gen/ts/resources/livemap/livemap';
 import { MarkerType } from '~~/gen/ts/resources/livemap/livemap';
-import IconSelectMenu from '../partials/IconSelectMenu.vue';
 
 const props = defineProps<{
     location?: Coordinate;
diff --git a/app/components/livemap/helpers.ts b/app/components/livemap/helpers.ts
deleted file mode 100644
index 05cdd54a6..000000000
--- a/app/components/livemap/helpers.ts
+++ /dev/null
@@ -1,6 +0,0 @@
-import * as mdiVue3 from 'mdi-vue3';
-import type { DefineComponent } from 'vue';
-
-export const markerFallbackIcon = mdiVue3.MapMarkerQuestionIcon;
-
-export const markerIcons = Object.values(mdiVue3) as readonly DefineComponent[];
diff --git a/app/components/mailer/EmailCreateForm.vue b/app/components/mailer/EmailCreateForm.vue
index 10efc1e17..c1bdc1f0d 100644
--- a/app/components/mailer/EmailCreateForm.vue
+++ b/app/components/mailer/EmailCreateForm.vue
@@ -1,15 +1,15 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums } from '~/components/partials/access/helpers';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import { useMailerStore } from '~/store/mailer';
 import { useNotificatorStore } from '~/store/notificator';
 import { type Access, AccessLevel } from '~~/gen/ts/resources/mailer/access';
 import type { Email } from '~~/gen/ts/resources/mailer/email';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { GetEmailProposalsResponse } from '~~/gen/ts/services/mailer/mailer';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums } from '../partials/access/helpers';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
 
 const props = withDefaults(
     defineProps<{
diff --git a/app/components/mailer/EmailInfoPopover.vue b/app/components/mailer/EmailInfoPopover.vue
index 5b8b1b780..a44f11e6d 100644
--- a/app/components/mailer/EmailInfoPopover.vue
+++ b/app/components/mailer/EmailInfoPopover.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { ButtonColor, ButtonVariant } from '#ui/types';
+import EmailBlock from '~/components/partials/citizens/EmailBlock.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import type { ClassProp } from '~/typings';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import EmailBlock from '../partials/citizens/EmailBlock.vue';
 
 const props = withDefaults(
     defineProps<{
diff --git a/app/components/mailer/EmailSettingsModal.vue b/app/components/mailer/EmailSettingsModal.vue
index 2d593a890..9d0fdb4b2 100644
--- a/app/components/mailer/EmailSettingsModal.vue
+++ b/app/components/mailer/EmailSettingsModal.vue
@@ -1,9 +1,9 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import { useMailerStore } from '~/store/mailer';
 import { AccessLevel } from '~~/gen/ts/resources/mailer/access';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 import { canAccess } from './helpers';
 
 withDefaults(
diff --git a/app/components/mailer/MailerThread.vue b/app/components/mailer/MailerThread.vue
index a9664099d..d0a97454d 100644
--- a/app/components/mailer/MailerThread.vue
+++ b/app/components/mailer/MailerThread.vue
@@ -2,15 +2,15 @@
 import type { FormSubmitEvent } from '#ui/types';
 import { isToday } from 'date-fns';
 import { z } from 'zod';
+import ConfirmModal from '~/components/partials/ConfirmModal.vue';
+import HTMLContent from '~/components/partials/content/HTMLContent.vue';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
+import GenericTime from '~/components/partials/elements/GenericTime.vue';
+import Pagination from '~/components/partials/Pagination.vue';
 import { useMailerStore } from '~/store/mailer';
 import { useNotificatorStore } from '~/store/notificator';
 import { AccessLevel } from '~~/gen/ts/resources/mailer/access';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import ConfirmModal from '../partials/ConfirmModal.vue';
-import HTMLContent from '../partials/content/HTMLContent.vue';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
-import GenericTime from '../partials/elements/GenericTime.vue';
-import Pagination from '../partials/Pagination.vue';
 import EmailInfoPopover from './EmailInfoPopover.vue';
 import { canAccess, generateResponseTitle } from './helpers';
 import TemplateSelector from './TemplateSelector.vue';
diff --git a/app/components/mailer/TemplateEditForm.vue b/app/components/mailer/TemplateEditForm.vue
index f2a158888..12a0d6853 100644
--- a/app/components/mailer/TemplateEditForm.vue
+++ b/app/components/mailer/TemplateEditForm.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import { useMailerStore } from '~/store/mailer';
 import { useNotificatorStore } from '~/store/notificator';
 import type { Template } from '~~/gen/ts/resources/mailer/template';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { CreateOrUpdateTemplateRequest } from '~~/gen/ts/services/mailer/mailer';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 
 const props = defineProps<{
     template?: Template;
diff --git a/app/components/mailer/TemplatesModal.vue b/app/components/mailer/TemplatesModal.vue
index 46470fe16..bbcd41741 100644
--- a/app/components/mailer/TemplatesModal.vue
+++ b/app/components/mailer/TemplatesModal.vue
@@ -1,11 +1,11 @@
 <script lang="ts" setup>
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
+import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
+import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import { useMailerStore } from '~/store/mailer';
 import { AccessLevel } from '~~/gen/ts/resources/mailer/access';
 import type { ListTemplatesResponse } from '~~/gen/ts/services/mailer/mailer';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
-import DataNoDataBlock from '../partials/data/DataNoDataBlock.vue';
-import DataPendingBlock from '../partials/data/DataPendingBlock.vue';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 import { canAccess } from './helpers';
 import TemplateEditForm from './TemplateEditForm.vue';
 
diff --git a/app/components/mailer/ThreadCreateOrUpdateModal.vue b/app/components/mailer/ThreadCreateOrUpdateModal.vue
index ff3bb7add..2daaf7888 100644
--- a/app/components/mailer/ThreadCreateOrUpdateModal.vue
+++ b/app/components/mailer/ThreadCreateOrUpdateModal.vue
@@ -1,10 +1,10 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import { useMailerStore } from '~/store/mailer';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 import TemplateSelector from './TemplateSelector.vue';
 import { defaultEmptyContent } from './helpers';
 
diff --git a/app/components/partials/CardsList.vue b/app/components/partials/CardsList.vue
index 204f7ac71..801c6f88a 100644
--- a/app/components/partials/CardsList.vue
+++ b/app/components/partials/CardsList.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
-import { markerFallbackIcon, markerIcons } from '~/components/livemap/helpers';
 import type { CardElement } from '~/utils/types';
+import { availableIcons, fallbackIcon } from './icons';
 
 withDefaults(
     defineProps<{
@@ -38,7 +38,7 @@ const { can } = useAuth();
             <template v-if="showIcon && module.icon" #icon>
                 <template v-if="!module.icon.startsWith('i-')">
                     <component
-                        :is="markerIcons.find((item) => item.name === module.icon) ?? markerFallbackIcon"
+                        :is="availableIcons.find((item) => item.name === module.icon) ?? fallbackIcon"
                         v-if="module.icon"
                         class="text-primary h-10 w-10 shrink-0"
                         :class="module.color && `text-${module.color}-500 dark:text-${module.color}-400`"
diff --git a/app/components/partials/IconSelectMenu.vue b/app/components/partials/IconSelectMenu.vue
index faa7d0dc9..cee8bb738 100644
--- a/app/components/partials/IconSelectMenu.vue
+++ b/app/components/partials/IconSelectMenu.vue
@@ -1,6 +1,6 @@
 <script lang="ts" setup>
 import type { DefineComponent } from 'vue';
-import { markerFallbackIcon, markerIcons } from '~/components/livemap/helpers';
+import { availableIcons, fallbackIcon as defaultIcon } from './icons';
 
 const props = withDefaults(
     defineProps<{
@@ -10,7 +10,7 @@ const props = withDefaults(
     }>(),
     {
         color: undefined,
-        fallbackIcon: markerFallbackIcon,
+        fallbackIcon: defaultIcon,
     },
 );
 
@@ -24,11 +24,11 @@ defineOptions({
 
 const icon = useVModel(props, 'modelValue', emit);
 
-async function markerIconSearch(query: string): Promise<DefineComponent[]> {
+async function iconSearch(query: string): Promise<DefineComponent[]> {
     // Remove spaces from query as icon names don't have spaces
     query = query.toLowerCase().replaceAll(' ', '').trim();
     let count = 0;
-    return markerIcons.filter((icon) => {
+    return availableIcons.filter((icon) => {
         if (count < 35 && icon.name?.toLowerCase()?.startsWith(query)) {
             count++;
             return true;
@@ -43,14 +43,14 @@ async function markerIconSearch(query: string): Promise<DefineComponent[]> {
         <USelectMenu
             v-bind="$attrs"
             v-model="icon"
-            :searchable="markerIconSearch"
+            :searchable="iconSearch"
             searchable-lazy
             :searchable-placeholder="$t('common.search_field')"
             value-attribute="name"
         >
             <template #label>
                 <component
-                    :is="markerIcons.find((item) => item.name === icon) ?? fallbackIcon"
+                    :is="availableIcons.find((item) => item.name === icon) ?? fallbackIcon"
                     class="size-5"
                     :style="{ fill: color }"
                 />
diff --git a/app/components/partials/documents/DocumentInfoPopover.vue b/app/components/partials/documents/DocumentInfoPopover.vue
index ebe5363c2..28e7f394e 100644
--- a/app/components/partials/documents/DocumentInfoPopover.vue
+++ b/app/components/partials/documents/DocumentInfoPopover.vue
@@ -3,6 +3,7 @@ import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
+import type { ClassProp } from '~/typings';
 import type { Document, DocumentShort } from '~~/gen/ts/resources/documents/documents';
 import DocumentCategoryBadge from './DocumentCategoryBadge.vue';
 
@@ -17,6 +18,7 @@ const props = withDefaults(
         hideTrailing?: boolean;
         hideCategory?: boolean;
         loadOnOpen?: boolean;
+        buttonClass?: ClassProp;
     }>(),
     {
         documentId: undefined,
@@ -24,6 +26,7 @@ const props = withDefaults(
         hideTrailing: false,
         hideCategory: false,
         loadOnOpen: false,
+        buttonClass: '',
     },
 );
 
@@ -76,6 +79,7 @@ watchOnce(opened, async () => {
             variant="link"
             :padded="false"
             class="line-clamp-2 inline-flex w-full items-center gap-1 whitespace-normal break-words p-px"
+            :class="buttonClass"
             :trailing-icon="!hideTrailing ? 'i-mdi-chevron-down' : undefined"
             @click="opened = true"
         >
diff --git a/app/components/partials/icons.ts b/app/components/partials/icons.ts
new file mode 100644
index 000000000..52588d46b
--- /dev/null
+++ b/app/components/partials/icons.ts
@@ -0,0 +1,6 @@
+import * as mdiVue3 from 'mdi-vue3';
+import type { DefineComponent } from 'vue';
+
+export const fallbackIcon = mdiVue3.MapMarkerQuestionIcon;
+
+export const availableIcons = Object.values(mdiVue3) as readonly DefineComponent[];
diff --git a/app/components/qualifications/QualificationEditor.vue b/app/components/qualifications/QualificationEditor.vue
index 8151d3554..8e9c774cf 100644
--- a/app/components/qualifications/QualificationEditor.vue
+++ b/app/components/qualifications/QualificationEditor.vue
@@ -1,6 +1,9 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums, type AccessType } from '~/components/partials/access/helpers';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import QualificationRequirementEntry from '~/components/qualifications/QualificationRequirementEntry.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
@@ -19,9 +22,6 @@ import type {
     UpdateQualificationRequest,
     UpdateQualificationResponse,
 } from '~~/gen/ts/services/qualifications/qualifications';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums, type AccessType } from '../partials/access/helpers';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 import ExamEditor from './exam/ExamEditor.vue';
 
 const props = defineProps<{
diff --git a/app/components/qualifications/QualificationView.vue b/app/components/qualifications/QualificationView.vue
index fd919e9d5..20132bfeb 100644
--- a/app/components/qualifications/QualificationView.vue
+++ b/app/components/qualifications/QualificationView.vue
@@ -2,7 +2,9 @@
 import ConfirmModal from '~/components/partials/ConfirmModal.vue';
 import IDCopyBadge from '~/components/partials/IDCopyBadge.vue';
 import OpenClosedBadge from '~/components/partials/OpenClosedBadge.vue';
+import AccessBadges from '~/components/partials/access/AccessBadges.vue';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
+import HTMLContent from '~/components/partials/content/HTMLContent.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
@@ -21,8 +23,6 @@ import { NotificationType } from '~~/gen/ts/resources/notifications/notification
 import { AccessLevel } from '~~/gen/ts/resources/qualifications/access';
 import { QualificationExamMode, RequestStatus, ResultStatus } from '~~/gen/ts/resources/qualifications/qualifications';
 import type { DeleteQualificationResponse, GetQualificationResponse } from '~~/gen/ts/services/qualifications/qualifications';
-import AccessBadges from '../partials/access/AccessBadges.vue';
-import HTMLContent from '../partials/content/HTMLContent.vue';
 import QualificationTutorView from './tutor/QualificationTutorView.vue';
 
 const props = defineProps<{
diff --git a/app/components/qualifications/QualificationsList.vue b/app/components/qualifications/QualificationsList.vue
index c315015f0..a47d065fc 100644
--- a/app/components/qualifications/QualificationsList.vue
+++ b/app/components/qualifications/QualificationsList.vue
@@ -1,12 +1,12 @@
 <script lang="ts" setup>
 import { z } from 'zod';
 import Pagination from '~/components/partials/Pagination.vue';
+import SortButton from '~/components/partials/SortButton.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
 import QualificationsListEntry from '~/components/qualifications/QualificationsListEntry.vue';
 import type { ListQualificationsResponse } from '~~/gen/ts/services/qualifications/qualifications';
-import SortButton from '../partials/SortButton.vue';
 
 const page = useRouteQuery('page', '1', { transform: Number });
 const offset = computed(() => (data.value?.pagination?.pageSize ? data.value?.pagination?.pageSize * (page.value - 1) : 0));
diff --git a/app/components/qualifications/QualificationsRequestsList.vue b/app/components/qualifications/QualificationsRequestsList.vue
index 2ef33466b..376d08bd0 100644
--- a/app/components/qualifications/QualificationsRequestsList.vue
+++ b/app/components/qualifications/QualificationsRequestsList.vue
@@ -3,10 +3,10 @@ import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
 import Pagination from '~/components/partials/Pagination.vue';
+import SortButton from '~/components/partials/SortButton.vue';
 import QualificationsRequestsListEntry from '~/components/qualifications/QualificationsRequestsListEntry.vue';
 import type { RequestStatus } from '~~/gen/ts/resources/qualifications/qualifications';
 import type { ListQualificationRequestsResponse } from '~~/gen/ts/services/qualifications/qualifications';
-import SortButton from '../partials/SortButton.vue';
 
 const props = withDefaults(
     defineProps<{
diff --git a/app/components/qualifications/QualificationsResultsList.vue b/app/components/qualifications/QualificationsResultsList.vue
index 57cf1eaf0..847fe16e1 100644
--- a/app/components/qualifications/QualificationsResultsList.vue
+++ b/app/components/qualifications/QualificationsResultsList.vue
@@ -3,10 +3,10 @@ import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
 import Pagination from '~/components/partials/Pagination.vue';
+import SortButton from '~/components/partials/SortButton.vue';
 import QualificationsResultsListEntry from '~/components/qualifications/QualificationsResultsListEntry.vue';
 import { ResultStatus } from '~~/gen/ts/resources/qualifications/qualifications';
 import type { ListQualificationsResultsResponse } from '~~/gen/ts/services/qualifications/qualifications';
-import SortButton from '../partials/SortButton.vue';
 
 const props = withDefaults(
     defineProps<{
diff --git a/app/components/quickbuttons/mathcalculator/README.md b/app/components/quickbuttons/mathcalculator/README.md
index dc1b4c5d3..f0441da1c 100644
--- a/app/components/quickbuttons/mathcalculator/README.md
+++ b/app/components/quickbuttons/mathcalculator/README.md
@@ -1,4 +1,4 @@
 Originally based on the several Vue Calculator examples, primarily the following two repositories:
 
-* [GitHub kamaludin21/calculator](https://github.com/kamaludin21/calculator) by [kamaludin21 - GitHub](https://github.com/kamaludin21).
-* [GitHub lucas-santosP/calculator](https://github.com/lucas-santosP/calculator) by [lucas-santosP](https://github.com/lucas-santosP)
+- [GitHub kamaludin21/calculator](https://github.com/kamaludin21/calculator) by [kamaludin21 - GitHub](https://github.com/kamaludin21).
+- [GitHub lucas-santosP/calculator](https://github.com/lucas-santosP/calculator) by [lucas-santosP](https://github.com/lucas-santosP)
diff --git a/app/components/rector/AppConfig.vue b/app/components/rector/AppConfig.vue
index 49e7b688d..40cab13a9 100644
--- a/app/components/rector/AppConfig.vue
+++ b/app/components/rector/AppConfig.vue
@@ -4,6 +4,7 @@ import type { LocaleObject } from '@nuxtjs/i18n';
 import { z } from 'zod';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
+import StreamerModeAlert from '~/components/partials/StreamerModeAlert.vue';
 import { useCompletorStore } from '~/store/completor';
 import { useNotificatorStore } from '~/store/notificator';
 import { useSettingsStore } from '~/store/settings';
@@ -12,7 +13,6 @@ import { NotificationType } from '~~/gen/ts/resources/notifications/notification
 import { DiscordBotPresenceType } from '~~/gen/ts/resources/rector/config';
 import type { GetAppConfigResponse } from '~~/gen/ts/services/rector/config';
 import { grpcMethods, grpcServices } from '~~/gen/ts/svcs';
-import StreamerModeAlert from '../partials/StreamerModeAlert.vue';
 
 const { t, locales } = useI18n();
 
diff --git a/app/components/rector/AuditLog.vue b/app/components/rector/AuditLog.vue
index b35b0565f..a39cffcd0 100644
--- a/app/components/rector/AuditLog.vue
+++ b/app/components/rector/AuditLog.vue
@@ -6,6 +6,7 @@ import type { JSONDataType } from 'vue-json-pretty/types/utils';
 import { z } from 'zod';
 import CitizenInfoPopover from '~/components/partials/citizens/CitizenInfoPopover.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
+import DateRangePickerPopoverClient from '~/components/partials/DateRangePickerPopover.client.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import Pagination from '~/components/partials/Pagination.vue';
 import { useCompletorStore } from '~/store/completor';
@@ -16,7 +17,6 @@ import { EventType } from '~~/gen/ts/resources/rector/audit';
 import type { UserShort } from '~~/gen/ts/resources/users/users';
 import type { ViewAuditLogRequest, ViewAuditLogResponse } from '~~/gen/ts/services/rector/rector';
 import { grpcMethods, grpcServices } from '~~/gen/ts/svcs';
-import DateRangePickerPopoverClient from '../partials/DateRangePickerPopover.client.vue';
 import { eventTypeToBadgeColor } from './helpers';
 
 const { d, t } = useI18n();
diff --git a/app/components/rector/JobProps.vue b/app/components/rector/JobProps.vue
index 555186f35..cb2b5255d 100644
--- a/app/components/rector/JobProps.vue
+++ b/app/components/rector/JobProps.vue
@@ -8,13 +8,13 @@ import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
 import GenericImg from '~/components/partials/elements/GenericImg.vue';
 import GenericTime from '~/components/partials/elements/GenericTime.vue';
+import StreamerModeAlert from '~/components/partials/StreamerModeAlert.vue';
 import { useAuthStore } from '~/store/auth';
 import { useNotificatorStore } from '~/store/notificator';
 import { useSettingsStore } from '~/store/settings';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { JobProps } from '~~/gen/ts/resources/users/job_props';
 import { type DiscordSyncChange, UserInfoSyncUnemployedMode } from '~~/gen/ts/resources/users/job_settings';
-import StreamerModeAlert from '../partials/StreamerModeAlert.vue';
 
 const { t } = useI18n();
 
diff --git a/app/components/wiki/PageEditor.vue b/app/components/wiki/PageEditor.vue
index 920540be6..af22ac475 100644
--- a/app/components/wiki/PageEditor.vue
+++ b/app/components/wiki/PageEditor.vue
@@ -1,15 +1,15 @@
 <script lang="ts" setup>
 import type { FormSubmitEvent } from '#ui/types';
 import { z } from 'zod';
+import AccessManager from '~/components/partials/access/AccessManager.vue';
+import { enumToAccessLevelEnums } from '~/components/partials/access/helpers';
+import TiptapEditor from '~/components/partials/editor/TiptapEditor.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { ContentType } from '~~/gen/ts/resources/common/content/content';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import type { PageJobAccess, PageUserAccess } from '~~/gen/ts/resources/wiki/access';
 import { AccessLevel } from '~~/gen/ts/resources/wiki/access';
 import type { Page, PageShort } from '~~/gen/ts/resources/wiki/page';
-import AccessManager from '../partials/access/AccessManager.vue';
-import { enumToAccessLevelEnums } from '../partials/access/helpers';
-import TiptapEditor from '../partials/editor/TiptapEditor.vue';
 import { pageToURL } from './helpers';
 
 const props = defineProps<{
diff --git a/app/components/wiki/PageView.vue b/app/components/wiki/PageView.vue
index 7d5e9bd30..70b1390e5 100644
--- a/app/components/wiki/PageView.vue
+++ b/app/components/wiki/PageView.vue
@@ -1,17 +1,17 @@
 <script lang="ts" setup>
 import { emojiBlast } from 'emoji-blast';
+import AccessBadges from '~/components/partials/access/AccessBadges.vue';
+import ConfirmModal from '~/components/partials/ConfirmModal.vue';
+import HTMLContent from '~/components/partials/content/HTMLContent.vue';
+import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
+import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
+import DataPendingBlock from '~/components/partials/data/DataPendingBlock.vue';
+import GenericTime from '~/components/partials/elements/GenericTime.vue';
 import { useNotificatorStore } from '~/store/notificator';
 import { jsonNodeToTocLinks } from '~/utils/content';
 import { NotificationType } from '~~/gen/ts/resources/notifications/notifications';
 import { AccessLevel } from '~~/gen/ts/resources/wiki/access';
 import type { Page, PageShort } from '~~/gen/ts/resources/wiki/page';
-import AccessBadges from '../partials/access/AccessBadges.vue';
-import ConfirmModal from '../partials/ConfirmModal.vue';
-import HTMLContent from '../partials/content/HTMLContent.vue';
-import DataErrorBlock from '../partials/data/DataErrorBlock.vue';
-import DataNoDataBlock from '../partials/data/DataNoDataBlock.vue';
-import DataPendingBlock from '../partials/data/DataPendingBlock.vue';
-import GenericTime from '../partials/elements/GenericTime.vue';
 import { checkPageAccess } from './helpers';
 import PageActivityList from './PageActivityList.vue';
 import PageSearch from './PageSearch.vue';
diff --git a/app/pages/documents/index.vue b/app/pages/documents/index.vue
index 28d33182c..6fd183cfe 100644
--- a/app/pages/documents/index.vue
+++ b/app/pages/documents/index.vue
@@ -4,7 +4,6 @@ import TemplatesModal from '~/components/documents/templates/TemplatesModal.vue'
 import Pagination from '~/components/partials/Pagination.vue';
 import DataErrorBlock from '~/components/partials/data/DataErrorBlock.vue';
 import DataNoDataBlock from '~/components/partials/data/DataNoDataBlock.vue';
-import DocumentCategoryBadge from '~/components/partials/documents/DocumentCategoryBadge.vue';
 import DocumentInfoPopover from '~/components/partials/documents/DocumentInfoPopover.vue';
 import type { ListDocumentPinsResponse } from '~~/gen/ts/services/docstore/docstore';
 
@@ -126,58 +125,41 @@ const isOpen = ref(false);
                 </template>
             </UDashboardNavbar>
 
-            <UDashboardPanelContent>
-                <div class="flex flex-1 flex-col">
-                    <UDashboardSection
-                        :ui="{
-                            wrapper: 'divide-y space-y-0 *:pt-0 first:*:pt-0 first:*:pt-0 mb-6',
-                        }"
-                        :title="$t('common.pinned_document', 2)"
-                    >
-                        <div>
-                            <DataErrorBlock
-                                v-if="error"
-                                :title="$t('common.unable_to_load', [$t('common.pinned_document', 2)])"
-                                :error="error"
-                                :retry="refresh"
+            <UDashboardPanelContent class="p-2">
+                <UDashboardSection
+                    :ui="{
+                        wrapper: 'divide-y space-y-0 *:pt-2 first:*:pt-2 first:*:pt-2 mb-6',
+                    }"
+                    :title="$t('common.pinned_document', 2)"
+                >
+                    <div class="flex flex-col gap-2">
+                        <DataErrorBlock
+                            v-if="error"
+                            :title="$t('common.unable_to_load', [$t('common.pinned_document', 2)])"
+                            :error="error"
+                            :retry="refresh"
+                        />
+                        <DataNoDataBlock
+                            v-else-if="!data || data.documents.length === 0"
+                            icon="i-mdi-pin-outline"
+                            :type="$t('common.pinned_document', 0)"
+                        />
+
+                        <template v-else-if="loading">
+                            <USkeleton v-for="idx in 10" :key="idx" class="h-16 w-full" />
+                        </template>
+
+                        <template v-else>
+                            <DocumentInfoPopover
+                                v-for="doc in data?.documents"
+                                :key="doc.id"
+                                :document="doc"
+                                button-class="line-clamp-3 hyphens-auto break-words flex flex-col items-start"
+                                hide-trailing
                             />
-                            <DataNoDataBlock
-                                v-else-if="!data || data.documents.length === 0"
-                                icon="i-mdi-pin-outline"
-                                :type="$t('common.pinned_document', 0)"
-                            />
-
-                            <ul v-else role="list" class="my-1 flex flex-col divide-y divide-gray-100 dark:divide-gray-800">
-                                <template v-if="loading">
-                                    <li v-for="idx in 10" :key="idx">
-                                        <USkeleton class="h-16 w-full" />
-                                    </li>
-                                </template>
-
-                                <template v-else>
-                                    <li v-for="doc in data?.documents" :key="doc.id" class="flex flex-col px-1">
-                                        <DocumentInfoPopover :document="doc">
-                                            <template #title="{ document, loading: docLoading }">
-                                                <USkeleton v-if="!document && docLoading" class="h-8 w-[125px]" />
-
-                                                <div v-else class="flex flex-col">
-                                                    <DocumentCategoryBadge
-                                                        v-if="document?.category"
-                                                        :category="document?.category"
-                                                    />
-
-                                                    <span class="line-clamp-3 hyphens-auto break-words text-left">
-                                                        {{ document?.title }}
-                                                    </span>
-                                                </div>
-                                            </template>
-                                        </DocumentInfoPopover>
-                                    </li>
-                                </template>
-                            </ul>
-                        </div>
-                    </UDashboardSection>
-                </div>
+                        </template>
+                    </div>
+                </UDashboardSection>
             </UDashboardPanelContent>
 
             <Pagination v-model="page" :pagination="data?.pagination" :loading="loading" :refresh="refresh" />
diff --git a/app/plugins/polyfills.client.ts b/app/plugins/polyfills.client.ts
index dde348cde..1dfc6d81d 100644
--- a/app/plugins/polyfills.client.ts
+++ b/app/plugins/polyfills.client.ts
@@ -3,7 +3,10 @@ export default defineNuxtPlugin(() => {
         return;
     }
 
-    // toSorted polyfill
+    /* FiveM NUI uses Chromium Embedded Framework version 103.x - As of now requires following polyfills:
+     *
+     * toSorted polyfill
+     */
     if (!Array.prototype.toSorted) {
         console.info('Adding Polyfill');
         Object.defineProperty(Array.prototype, 'toSorted', {