diff --git a/Tekst-API/openapi.json b/Tekst-API/openapi.json
index 54bd200ce..f61214dd2 100644
--- a/Tekst-API/openapi.json
+++ b/Tekst-API/openapi.json
@@ -4,7 +4,7 @@
     "title": "Tekst-Dev",
     "summary": "An online text research platform",
     "contact": {},
-    "version": "0.51.1b0"
+    "version": "0.51.2b0"
   },
   "servers": [
     {
diff --git a/Tekst-API/pyproject.toml b/Tekst-API/pyproject.toml
index 1cf46420d..8b4452e5b 100644
--- a/Tekst-API/pyproject.toml
+++ b/Tekst-API/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "tekst"
-version = "0.51.1b0"
+version = "0.51.2b0"
 description = "An online text research platform"
 readme = "README.md"
 authors = [
diff --git a/Tekst-API/uv.lock b/Tekst-API/uv.lock
index ff308079d..602f372cd 100644
--- a/Tekst-API/uv.lock
+++ b/Tekst-API/uv.lock
@@ -1327,7 +1327,7 @@ wheels = [
 
 [[package]]
 name = "tekst"
-version = "0.51.1b0"
+version = "0.51.2b0"
 source = { editable = "." }
 dependencies = [
     { name = "beanie" },
diff --git a/Tekst-Web/i18n/ui/deDE.yml b/Tekst-Web/i18n/ui/deDE.yml
index 848bc5078..5f96f8d96 100644
--- a/Tekst-Web/i18n/ui/deDE.yml
+++ b/Tekst-Web/i18n/ui/deDE.yml
@@ -236,9 +236,9 @@ browse:
     activateCategory: Zeige alle Ressourcen dieser Kategorie
     deactivateCategory: Verstecke alle Ressourcen dieser Kategorie
   contentCitation:
-    title: Inhalt zitieren
-    full: Volle Ressourcen-Zitation mit Inhalts-URL
-    urlOnly: URL zu diesem Inhalt
+    full: Volle Ressourcen-Zitation mit Belegstellen-URL
+    resOnly: Ressourcen-Zitation
+    urlOnly: URL zu Inhalt/Belegstelle
   uncategorized: Unkategorisiert
   locationResourceNoData: Keine Daten für diese Belegstelle
   textNoLocations: Die Einrichtung dieses Textes scheint unvollständig. Es wurden keine Belegstellen definiert.
diff --git a/Tekst-Web/i18n/ui/enUS.yml b/Tekst-Web/i18n/ui/enUS.yml
index 47d10b29f..e05af5ae7 100644
--- a/Tekst-Web/i18n/ui/enUS.yml
+++ b/Tekst-Web/i18n/ui/enUS.yml
@@ -232,9 +232,9 @@ browse:
     activateCategory: Show all resources in this category
     deactivateCategory: Hide all resources in this category
   contentCitation:
-    title: Content Citation
-    full: Full resource citation with content URL
-    urlOnly: URL for this content
+    full: Full resource citation with location URL
+    resOnly: Resource citation
+    urlOnly: URL of content/location
   archiveWidgetTitle: Content Archive
   uncategorized: Uncategorized
   locationResourceNoData: No data for this location
@@ -597,8 +597,8 @@ contents:
   tipBtnCompare: Select other resource to compare with
   tipBtnCopyOriginal: Copy from original resource
   tipBtnApplyChanges: Copy content for this location
-  tipBtnPrevChange: Go to previous content
-  tipBtnNextChange: Go to next content
+  tipBtnPrevChange: Skip to previous content
+  tipBtnNextChange: Skip to next content
   forComparison: '{title} (for comparison)'
   fromOriginalResourceHint: |
     This is a resource patch.
diff --git a/Tekst-Web/package-lock.json b/Tekst-Web/package-lock.json
index 3f1fbd8d2..0f7923036 100644
--- a/Tekst-Web/package-lock.json
+++ b/Tekst-Web/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "tekst",
-  "version": "0.51.1-beta.0",
+  "version": "0.51.2-beta.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tekst",
-      "version": "0.51.1-beta.0",
+      "version": "0.51.2-beta.0",
       "dependencies": {
         "@codemirror/lang-html": "^6.4.9",
         "@codemirror/lang-json": "^6.0.1",
@@ -39,13 +39,13 @@
         "@babel/types": "^7.25.6",
         "@intlify/eslint-plugin-vue-i18n": "^4.0.0",
         "@intlify/unplugin-vue-i18n": "^11.0.0",
+        "@lucide/vue": "^1.7.0",
         "@rushstack/eslint-patch": "^1.10.4",
         "@tsconfig/node24": "^24.0.0",
         "@types/color": "^4.0.0",
         "@types/js-cookie": "^3.0.6",
         "@types/jsdom": "^28.0.0",
         "@types/node": "^24.0.0",
-        "@vicons/material": "^0.13.0",
         "@vitejs/plugin-vue": "^6.0.0",
         "@vue/eslint-config-prettier": "^10.0.0",
         "@vue/eslint-config-typescript": "^14.0.1",
@@ -1738,6 +1738,16 @@
         "@lezer/common": "^1.0.0"
       }
     },
+    "node_modules/@lucide/vue": {
+      "version": "1.7.0",
+      "resolved": "https://registry.npmjs.org/@lucide/vue/-/vue-1.7.0.tgz",
+      "integrity": "sha512-X3gTarOkNh2ThNK7IaDa4gdjFAtZyoKH/eoScklvmtNTWE5uxkycBQOuchGExY5swCqh1WptEIAWrmbuQcy2fA==",
+      "dev": true,
+      "license": "ISC",
+      "peerDependencies": {
+        "vue": ">=3.0.1"
+      }
+    },
     "node_modules/@marijn/find-cluster-break": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/@marijn/find-cluster-break/-/find-cluster-break-1.0.2.tgz",
@@ -3095,13 +3105,6 @@
         "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/@vicons/material": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/@vicons/material/-/material-0.13.0.tgz",
-      "integrity": "sha512-lKVxFNprM+CaBkUH3gt6VjIeiMsKQl2zARQMwTCZruQl2vRHzyeZiKeCflWS99CEfv2JzX/6y697smxlzyxcVw==",
-      "dev": true,
-      "license": "Apache 2.0"
-    },
     "node_modules/@vitejs/plugin-vue": {
       "version": "6.0.5",
       "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-6.0.5.tgz",
diff --git a/Tekst-Web/package.json b/Tekst-Web/package.json
index 9109572ef..c2760ed14 100644
--- a/Tekst-Web/package.json
+++ b/Tekst-Web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "tekst",
-  "version": "0.51.1-beta.0",
+  "version": "0.51.2-beta.0",
   "private": true,
   "type": "module",
   "scripts": {
@@ -47,13 +47,13 @@
     "@babel/types": "^7.25.6",
     "@intlify/eslint-plugin-vue-i18n": "^4.0.0",
     "@intlify/unplugin-vue-i18n": "^11.0.0",
+    "@lucide/vue": "^1.7.0",
     "@rushstack/eslint-patch": "^1.10.4",
     "@tsconfig/node24": "^24.0.0",
     "@types/color": "^4.0.0",
     "@types/js-cookie": "^3.0.6",
     "@types/jsdom": "^28.0.0",
     "@types/node": "^24.0.0",
-    "@vicons/material": "^0.13.0",
     "@vitejs/plugin-vue": "^6.0.0",
     "@vue/eslint-config-prettier": "^10.0.0",
     "@vue/eslint-config-typescript": "^14.0.1",
diff --git a/Tekst-Web/src/components/AudioPlayer.vue b/Tekst-Web/src/components/AudioPlayer.vue
index 5bd999e3a..211060876 100644
--- a/Tekst-Web/src/components/AudioPlayer.vue
+++ b/Tekst-Web/src/components/AudioPlayer.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { DownloadIcon, ErrorIcon, LinkIcon, PauseIcon, PlayIcon } from '@/icons';
+import { DownloadIcon, ErrorIcon, ExternalLinkIcon, PauseIcon, PlayIcon } from '@/icons';
 import { useMediaControls } from '@vueuse/core';
 import { NButton, NFlex, NIcon, NSlider } from 'naive-ui';
 import { computed, onMounted, ref, watch, type CSSProperties } from 'vue';
@@ -104,7 +104,7 @@ onMounted(() => {
           style="color: var(--text-color)"
         >
           <template #icon>
-            <n-icon :component="LinkIcon" />
+            <n-icon :component="ExternalLinkIcon" />
           </template>
         </n-button>
         <n-button
diff --git a/Tekst-Web/src/components/HelpButtonWidget.vue b/Tekst-Web/src/components/HelpButtonWidget.vue
index ad7153991..7c190c746 100644
--- a/Tekst-Web/src/components/HelpButtonWidget.vue
+++ b/Tekst-Web/src/components/HelpButtonWidget.vue
@@ -3,7 +3,7 @@ import GenericModal from '@/components/generic/GenericModal.vue';
 import type { HelpText } from '@/composables/help';
 import { useHelp } from '@/composables/help';
 import { $t } from '@/i18n';
-import { ErrorIcon, QuestionMarkIcon } from '@/icons';
+import { ErrorIcon, FileQuestionMarkIcon } from '@/icons';
 import { NButton, NEmpty, NIcon, NSpin, type ButtonSize } from 'naive-ui';
 import { computed, ref } from 'vue';
 
@@ -74,16 +74,14 @@ async function handleHelpButtonClick() {
     :style="buttonStyle"
     @click.stop.prevent="handleHelpButtonClick"
   >
-    <template #icon>
-      <n-icon :component="QuestionMarkIcon" />
-    </template>
+    <b>?</b>
   </n-button>
 
   <generic-modal
     v-model:show="showModal"
     width="wide"
     :title="$t('help.help')"
-    :icon="QuestionMarkIcon"
+    :icon="FileQuestionMarkIcon"
     heading-level="3"
     @after-leave="handleClose"
   >
diff --git a/Tekst-Web/src/components/InsertItemSeparator.vue b/Tekst-Web/src/components/InsertItemSeparator.vue
index fbadad5b8..085a15aae 100644
--- a/Tekst-Web/src/components/InsertItemSeparator.vue
+++ b/Tekst-Web/src/components/InsertItemSeparator.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { NButton, NIcon } from 'naive-ui';
 
-import { AddIcon } from '@/icons';
+import { PlusIcon } from '@/icons';
 
 defineProps<{
   title?: string;
@@ -23,7 +23,7 @@ defineEmits(['click']);
       @click="$emit('click')"
     >
       <template #icon>
-        <n-icon :component="AddIcon" />
+        <n-icon :component="PlusIcon" />
       </template>
     </n-button>
     <div class="add-level-separator"></div>
diff --git a/Tekst-Web/src/components/ListingsFilters.vue b/Tekst-Web/src/components/ListingsFilters.vue
index 41a46b144..f3bd0bce6 100644
--- a/Tekst-Web/src/components/ListingsFilters.vue
+++ b/Tekst-Web/src/components/ListingsFilters.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { FilterIcon, JumpBackIcon, SearchIcon } from '@/icons';
+import { FilterIcon, SearchIcon, UndoIcon } from '@/icons';
 import {
   NButton,
   NCollapse,
@@ -86,7 +86,7 @@ onMounted(() => {
             <n-button secondary class="mt-md" @click="reset">
               {{ $t('common.reset') }}
               <template #icon>
-                <n-icon :component="JumpBackIcon" />
+                <n-icon :component="UndoIcon" />
               </template>
             </n-button>
           </n-flex>
diff --git a/Tekst-Web/src/components/TasksWidget.vue b/Tekst-Web/src/components/TasksWidget.vue
index b2b840444..d456347dd 100644
--- a/Tekst-Web/src/components/TasksWidget.vue
+++ b/Tekst-Web/src/components/TasksWidget.vue
@@ -2,7 +2,7 @@
 import { commonDialogOptions } from '@/common';
 import { useTasks } from '@/composables/tasks';
 import { $t, $te } from '@/i18n';
-import { CheckCircleIcon, ErrorIcon, HourglassIcon, UpdateIcon } from '@/icons';
+import { CheckCircleIcon, ErrorIcon, HourglassIcon, TaskIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import {
   NBadge,
@@ -72,7 +72,7 @@ function handleTaskClick(id: string) {
     <template #menu>
       <div class="task-list">
         <n-flex justify="flex-start" align="center" :wrap="false" class="task-list-header">
-          <n-icon :component="UpdateIcon" />
+          <n-icon :component="TaskIcon" />
           <span class="b ellipsis" style="color: var(--base-color)">{{ $t('tasks.title') }}</span>
         </n-flex>
         <n-scrollbar style="max-height: 60vh">
diff --git a/Tekst-Web/src/components/browse/BookmarksWidget.vue b/Tekst-Web/src/components/browse/BookmarksWidget.vue
index b7d9556ac..7054e9bcb 100644
--- a/Tekst-Web/src/components/browse/BookmarksWidget.vue
+++ b/Tekst-Web/src/components/browse/BookmarksWidget.vue
@@ -6,7 +6,14 @@ import { useBookmarks } from '@/composables/bookmarks';
 import { useMessages } from '@/composables/messages';
 import { usePrompt } from '@/composables/prompt';
 import { $t } from '@/i18n';
-import { AddIcon, BookIcon, BookmarksIcon, DeleteIcon, NoContentIcon, SearchIcon } from '@/icons';
+import {
+  AddBookmarkIcon,
+  BookIcon,
+  BookmarkIcon,
+  DeleteIcon,
+  NoContentIcon,
+  SearchIcon,
+} from '@/icons';
 import { useBrowseStore, useStateStore, useThemeStore } from '@/stores';
 import {
   NButton,
@@ -71,7 +78,7 @@ async function handleCreateBookmarkClick() {
   loading.value = true;
   const comment = await prompt({
     type: 'multiLineInput',
-    icon: BookmarksIcon,
+    icon: BookmarkIcon,
     title: $t('browse.bookmarks.commentModalTitle'),
     label: $t('browse.bookmarks.commentModalInputLabel'),
     rows: 3,
@@ -111,7 +118,7 @@ async function handleWidgetClick() {
     @click.stop.prevent="handleWidgetClick"
   >
     <template #icon>
-      <n-icon :component="BookmarksIcon" />
+      <n-icon :component="BookmarkIcon" />
     </template>
   </n-button>
 
@@ -119,7 +126,7 @@ async function handleWidgetClick() {
     v-model:show="showModal"
     width="wide"
     :title="$t('browse.bookmarks.bookmarks')"
-    :icon="BookmarksIcon"
+    :icon="BookmarkIcon"
   >
     <n-input
       v-model:value="filterString"
@@ -142,7 +149,7 @@ async function handleWidgetClick() {
       @click="handleCreateBookmarkClick"
     >
       <template #icon>
-        <n-icon :component="AddIcon" size="large" />
+        <n-icon :component="AddBookmarkIcon" size="large" />
       </template>
       {{
         !maxCountReached ? $t('browse.bookmarks.lblCreate') : $t('browse.bookmarks.maxCountReached')
diff --git a/Tekst-Web/src/components/browse/BrowseLocationControls.vue b/Tekst-Web/src/components/browse/BrowseLocationControls.vue
index a32be68a7..4821d675a 100644
--- a/Tekst-Web/src/components/browse/BrowseLocationControls.vue
+++ b/Tekst-Web/src/components/browse/BrowseLocationControls.vue
@@ -3,7 +3,7 @@ import type { LocationRead } from '@/api';
 import BookmarksWidget from '@/components/browse/BookmarksWidget.vue';
 import LocationSelectModal from '@/components/modals/LocationSelectModal.vue';
 import { $t } from '@/i18n';
-import { ArrowBackIcon, ArrowForwardIcon, BookIcon } from '@/icons';
+import { ArrowLeftIcon, ArrowRightIcon, BookIcon } from '@/icons';
 import router from '@/router';
 import { useAuthStore, useBrowseStore, useThemeStore } from '@/stores';
 import { isInputFocused, isOverlayOpen } from '@/utils';
@@ -64,7 +64,7 @@ whenever(ArrowRight, () => {
       @click="() => gotoLocation(browse.prevLocationId)"
     >
       <template #icon>
-        <n-icon :component="ArrowBackIcon" />
+        <n-icon :component="ArrowLeftIcon" />
       </template>
     </n-button>
 
@@ -100,7 +100,7 @@ whenever(ArrowRight, () => {
       @click="() => gotoLocation(browse.nextLocationId)"
     >
       <template #icon>
-        <n-icon :component="ArrowForwardIcon" />
+        <n-icon :component="ArrowRightIcon" />
       </template>
     </n-button>
     <location-select-modal
diff --git a/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue b/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue
index 75a3cb6fe..2a1ddef21 100644
--- a/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue
+++ b/Tekst-Web/src/components/browse/BrowseSearchResultsToolbar.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import {
-  CheckListIcon,
+  CheckAllIcon,
   ClearIcon,
   RefreshIcon,
   SearchIcon,
@@ -176,7 +176,7 @@ onMounted(() => {
             @click="() => switchBrowseHitResourcesActive(!search.browseHitResourcesActive)"
           >
             <template #icon>
-              <n-icon :component="CheckListIcon" />
+              <n-icon :component="CheckAllIcon" />
             </template>
           </n-button>
         </n-badge>
diff --git a/Tekst-Web/src/components/browse/ContentArchiveWidget.vue b/Tekst-Web/src/components/browse/ContentArchiveWidget.vue
index d55450fce..6f8f4b1f3 100644
--- a/Tekst-Web/src/components/browse/ContentArchiveWidget.vue
+++ b/Tekst-Web/src/components/browse/ContentArchiveWidget.vue
@@ -11,7 +11,7 @@ import ButtonShelf from '@/components/generic/ButtonShelf.vue';
 import GenericModal from '@/components/generic/GenericModal.vue';
 import { useMessages } from '@/composables/messages';
 import { $t } from '@/i18n';
-import { ArchiveIcon, ArrowBackIcon, NoContentIcon } from '@/icons';
+import { ArchiveIcon, ArrowLeftIcon, NoContentIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { utcToDateTimeString } from '@/utils';
 import { NButton, NEmpty, NFlex, NIcon, NSpin } from 'naive-ui';
@@ -165,7 +165,7 @@ function cleanup() {
         <template #start>
           <n-button text icon-placement="left" @click="handleBackToOverview">
             <template #icon>
-              <n-icon :component="ArrowBackIcon" />
+              <n-icon :component="ArrowLeftIcon" />
             </template>
             {{ $t('common.backToOverview') }}
           </n-button>
diff --git a/Tekst-Web/src/components/browse/ContentCitationWidget.vue b/Tekst-Web/src/components/browse/ContentCitationWidget.vue
index 73959ef8d..c016b13f9 100644
--- a/Tekst-Web/src/components/browse/ContentCitationWidget.vue
+++ b/Tekst-Web/src/components/browse/ContentCitationWidget.vue
@@ -22,7 +22,7 @@ function handleClick() {
   dialog.create({
     ...commonDialogOptions,
     icon: renderIcon(QuoteIcon, undefined, 'large'),
-    title: $t('browse.contentCitation.title'),
+    title: $t('models.resource.citation'),
     contentClass: 'my-lg',
     content: () => h(ContentCitationWidgetContent, { resource: props.resource }),
     style: 'width: 600px',
@@ -36,7 +36,7 @@ function handleClick() {
   <content-container-header-widget
     v-bind="$attrs"
     :full="full"
-    :title="$t('browse.contentCitation.title')"
+    :title="$t('models.resource.citation')"
     :icon-component="QuoteIcon"
     @click="handleClick"
   />
diff --git a/Tekst-Web/src/components/browse/ContentCitationWidgetContent.vue b/Tekst-Web/src/components/browse/ContentCitationWidgetContent.vue
index 2446c6eac..1dd777bb2 100644
--- a/Tekst-Web/src/components/browse/ContentCitationWidgetContent.vue
+++ b/Tekst-Web/src/components/browse/ContentCitationWidgetContent.vue
@@ -23,41 +23,55 @@ const browseUrl = computed(() => {
     queryPart
   );
 });
-const citation = computed(() => {
-  const citation = replaceResUrlPh(
+const citationRes = computed(() =>
+  replaceResUrlPh(
     replaceCurrDatePh(props.resource.citation, state.locale),
     state.text?.slug,
     props.resource.id
-  );
-  return `${citation} – ${$t('common.location')}: ${browseUrl.value}`;
-});
+  )
+);
+const citationFull = computed(
+  () => `${citationRes.value} – ${$t('common.location')}: ${browseUrl.value}`
+);
 </script>
 
 <template>
   <div>
     <n-thing v-if="props.resource.citation">
       <template #header>
-        <b>{{ $t('browse.contentCitation.full') }}</b>
+        <b class="text-small">{{ $t('browse.contentCitation.full') }}</b>
+      </template>
+      <template #header-extra>
+        <copy-to-clipboard-button secondary size="small" :text="citationFull" show-msg />
+      </template>
+      <template #description>
+        <p class="text-small">{{ citationFull }}</p>
+      </template>
+    </n-thing>
+    <n-divider v-if="props.resource.citation" />
+    <n-thing v-if="props.resource.citation">
+      <template #header>
+        <b class="text-small">{{ $t('browse.contentCitation.resOnly') }}</b>
       </template>
       <template #header-extra>
-        <copy-to-clipboard-button secondary size="small" :text="citation" show-msg />
+        <copy-to-clipboard-button secondary size="small" :text="citationRes" show-msg />
       </template>
       <template #description>
-        <p class="text-tiny">{{ citation }}</p>
+        <p class="text-small">{{ citationRes }}</p>
       </template>
     </n-thing>
     <n-divider v-if="props.resource.citation" />
     <n-thing>
       <template #header>
-        <b>{{ $t('browse.contentCitation.urlOnly') }}</b>
+        <b class="text-small">{{ $t('browse.contentCitation.urlOnly') }}</b>
       </template>
       <template #header-extra>
         <copy-to-clipboard-button secondary size="small" :text="browseUrl" show-msg />
       </template>
       <template #description>
-        <a :href="browseUrl" target="_blank" rel="noreferrer" class="text-tiny"
-          ><p>{{ browseUrl }}</p></a
-        >
+        <a :href="browseUrl" target="_blank" rel="noreferrer" class="text-small">
+          <p>{{ browseUrl }}</p>
+        </a>
       </template>
     </n-thing>
   </div>
diff --git a/Tekst-Web/src/components/content/ExternalReferencesContent.vue b/Tekst-Web/src/components/content/ExternalReferencesContent.vue
index 4e3ed81c0..81f6e388a 100644
--- a/Tekst-Web/src/components/content/ExternalReferencesContent.vue
+++ b/Tekst-Web/src/components/content/ExternalReferencesContent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ExternalReferencesResourceRead } from '@/api';
-import { LinkIcon } from '@/icons';
+import { ExternalLinkIcon } from '@/icons';
 import { NFlex, NIcon } from 'naive-ui';
 import { type CSSProperties } from 'vue';
 import CommonContentDisplay from './CommonContentDisplay.vue';
@@ -50,8 +50,8 @@ const fontStyle: CSSProperties = {
               rel="noreferrer"
             >
               <n-flex align="center" size="small">
-                <n-icon :component="LinkIcon" :size="focusView ? 24 : undefined" />
                 <span v-if="!focusView">{{ link.title }}</span>
+                <n-icon :component="ExternalLinkIcon" :size="focusView ? 20 : 14" />
               </n-flex>
             </a>
             <div
diff --git a/Tekst-Web/src/components/content/ImagesContent.vue b/Tekst-Web/src/components/content/ImagesContent.vue
index 04b014d72..6fd3744c8 100644
--- a/Tekst-Web/src/components/content/ImagesContent.vue
+++ b/Tekst-Web/src/components/content/ImagesContent.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import type { ImagesResourceRead } from '@/api';
-import { LinkIcon } from '@/icons';
+import { ExternalLinkIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { NFlex, NIcon, NImage, NImageGroup } from 'naive-ui';
 import { type ImageRenderToolbarProps } from 'naive-ui/es/image/src/public-types';
@@ -82,7 +82,7 @@ const renderToolbar = ({ nodes }: ImageRenderToolbarProps) => {
                       rel="noreferrer"
                       class="source-link mx-sm"
                     >
-                      <n-icon :component="LinkIcon" />
+                      <n-icon :component="ExternalLinkIcon" />
                     </a>
                   </figcaption>
                 </n-flex>
diff --git a/Tekst-Web/src/components/content/TextAnnotationContent.vue b/Tekst-Web/src/components/content/TextAnnotationContent.vue
index e8cbd6cfc..adf74b5e1 100644
--- a/Tekst-Web/src/components/content/TextAnnotationContent.vue
+++ b/Tekst-Web/src/components/content/TextAnnotationContent.vue
@@ -10,7 +10,7 @@ import {
   ColorOffIcon,
   CommentIcon,
   CopyIcon,
-  LabelIcon,
+  TagsIcon,
 } from '@/icons';
 import { useBrowseStore, useStateStore, useThemeStore } from '@/stores';
 import {
@@ -597,7 +597,7 @@ function generatePlaintextAnno(): string {
     <generic-modal
       v-model:show="showDetailsModal"
       :title="tokenDetails?.form"
-      :icon="LabelIcon"
+      :icon="TagsIcon"
       heading-level="3"
       :header-style="{
         'font-family': resource.config.general.font || 'var(--font-family-content)',
diff --git a/Tekst-Web/src/components/editors/WysiwygEditor.vue b/Tekst-Web/src/components/editors/WysiwygEditor.vue
index bdce4a0af..fc5c0418d 100644
--- a/Tekst-Web/src/components/editors/WysiwygEditor.vue
+++ b/Tekst-Web/src/components/editors/WysiwygEditor.vue
@@ -13,15 +13,14 @@ import {
   FormatItalicIcon,
   FormatListBulletedIcon,
   FormatListNumberedIcon,
-  FormatSizeIcon,
+  HeadingIcon,
   HorizontalRuleIcon,
   ImageIcon,
-  JumpBackIcon,
-  JumpForwardIcon,
   KeyboardReturnIcon,
   LinkIcon,
   QuoteIcon,
-  ShortTextIcon,
+  RedoIcon,
+  UndoIcon,
 } from '@/icons';
 import CharacterCount from '@tiptap/extension-character-count';
 import Image from '@tiptap/extension-image';
@@ -148,35 +147,35 @@ const blockTypeOptions = computed(() => [
       editor.value?.chain().focus().setParagraph().run();
     },
     isActive: () => editor.value?.isActive('paragraph'),
-    iconComponent: ShortTextIcon,
+    iconComponent: FormatAlignLeftIcon,
   },
   {
     label: $t('wysiwyg.blockTypes.heading', { level: 1 }),
     value: 'h1',
     action: () => editor.value?.chain().focus().toggleHeading({ level: 1 }).run(),
     isActive: () => editor.value?.isActive('heading', { level: 1 }),
-    iconComponent: FormatSizeIcon,
+    iconComponent: HeadingIcon,
   },
   {
     label: $t('wysiwyg.blockTypes.heading', { level: 2 }),
     value: 'h2',
     action: () => editor.value?.chain().focus().toggleHeading({ level: 2 }).run(),
     isActive: () => editor.value?.isActive('heading', { level: 2 }),
-    iconComponent: FormatSizeIcon,
+    iconComponent: HeadingIcon,
   },
   {
     label: $t('wysiwyg.blockTypes.heading', { level: 3 }),
     value: 'h3',
     action: () => editor.value?.chain().focus().toggleHeading({ level: 3 }).run(),
     isActive: () => editor.value?.isActive('heading', { level: 3 }),
-    iconComponent: FormatSizeIcon,
+    iconComponent: HeadingIcon,
   },
   {
     label: $t('wysiwyg.blockTypes.heading', { level: 4 }),
     value: 'h4',
     action: () => editor.value?.chain().focus().toggleHeading({ level: 4 }).run(),
     isActive: () => editor.value?.isActive('heading', { level: 4 }),
-    iconComponent: FormatSizeIcon,
+    iconComponent: HeadingIcon,
   },
   {
     label: $t('wysiwyg.blockTypes.bulletedList'),
@@ -432,7 +431,7 @@ onUnmounted(() => {
           :size="toolbarSize"
           :title="$t('wysiwyg.undo')"
           :disabled="!editor.can().chain().focus().undo().run()"
-          :render-icon="renderToolbarIcon(JumpBackIcon)"
+          :render-icon="renderToolbarIcon(UndoIcon)"
           :focusable="false"
           @click="editor.chain().focus().undo().run()"
         />
@@ -441,7 +440,7 @@ onUnmounted(() => {
           :size="toolbarSize"
           :title="$t('wysiwyg.redo')"
           :disabled="!editor.can().chain().focus().redo().run()"
-          :render-icon="renderToolbarIcon(JumpForwardIcon)"
+          :render-icon="renderToolbarIcon(RedoIcon)"
           :focusable="false"
           @click="editor.chain().focus().redo().run()"
         />
diff --git a/Tekst-Web/src/components/generic/IconHeading.vue b/Tekst-Web/src/components/generic/IconHeading.vue
index 8e52094b7..3048f4518 100644
--- a/Tekst-Web/src/components/generic/IconHeading.vue
+++ b/Tekst-Web/src/components/generic/IconHeading.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { useThemeStore } from '@/stores';
-import { NEllipsis, NIcon } from 'naive-ui';
+import { NEllipsis, NFlex, NIcon } from 'naive-ui';
 import { type CSSProperties, type Component } from 'vue';
 
 withDefaults(
@@ -30,6 +30,9 @@ const theme = useThemeStore();
     <template v-else>
       <slot></slot>
     </template>
+    <n-flex v-if="$slots['end']" justify="flex-end" style="flex: 2">
+      <slot name="end"></slot>
+    </n-flex>
   </component>
 </template>
 
diff --git a/Tekst-Web/src/components/navigation/HelpWidget.vue b/Tekst-Web/src/components/navigation/HelpWidget.vue
index 152c0e2dd..73675712c 100644
--- a/Tekst-Web/src/components/navigation/HelpWidget.vue
+++ b/Tekst-Web/src/components/navigation/HelpWidget.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import { useGuidedTour } from '@/composables/tour';
 import { $t } from '@/i18n';
-import { HelpOverviewIcon, QuestionMarkIcon, TourIcon } from '@/icons';
+import { FileQuestionMarkIcon, TourIcon } from '@/icons';
 import { renderIcon } from '@/utils';
-import { NButton, NDropdown, NIcon } from 'naive-ui';
+import { NButton, NDropdown } from 'naive-ui';
 import { useRouter } from 'vue-router';
 
 const emit = defineEmits(['done']);
@@ -19,7 +19,7 @@ const options = [
   {
     label: () => $t('help.heading'),
     key: 'help',
-    icon: renderIcon(HelpOverviewIcon),
+    icon: renderIcon(FileQuestionMarkIcon),
   },
 ];
 
@@ -36,9 +36,7 @@ async function handleSelect(key: string) {
 <template>
   <n-dropdown trigger="hover" :options="options" @select="handleSelect">
     <n-button secondary circle size="large" :focusable="false">
-      <template #icon>
-        <n-icon :component="QuestionMarkIcon" />
-      </template>
+      <b>?</b>
     </n-button>
   </n-dropdown>
 </template>
diff --git a/Tekst-Web/src/components/navigation/LocaleSwitcher.vue b/Tekst-Web/src/components/navigation/LocaleSwitcher.vue
index 34c3912df..1faafd732 100644
--- a/Tekst-Web/src/components/navigation/LocaleSwitcher.vue
+++ b/Tekst-Web/src/components/navigation/LocaleSwitcher.vue
@@ -5,7 +5,7 @@ import { useStateStore } from '@/stores';
 import { NButton, NIcon, NPopselect } from 'naive-ui';
 import { computed } from 'vue';
 
-import { LanguageIcon } from '@/icons';
+import { LanguagesIcon } from '@/icons';
 
 const state = useStateStore();
 
@@ -33,7 +33,7 @@ function handleLanguageSelect(localeCode: LocaleKey) {
   >
     <n-button secondary circle size="large" :title="$t('i18n.tipSwitcher')" :focusable="false">
       <template #icon>
-        <n-icon :component="LanguageIcon" />
+        <n-icon :component="LanguagesIcon" />
       </template>
     </n-button>
   </n-popselect>
diff --git a/Tekst-Web/src/components/navigation/TextSelectOption.vue b/Tekst-Web/src/components/navigation/TextSelectOption.vue
index 13b972ce1..ea3b867f9 100644
--- a/Tekst-Web/src/components/navigation/TextSelectOption.vue
+++ b/Tekst-Web/src/components/navigation/TextSelectOption.vue
@@ -3,7 +3,7 @@ import type { TextRead } from '@/api';
 import TranslationDisplay from '@/components/generic/TranslationDisplay.vue';
 import { NFlex, NIcon } from 'naive-ui';
 
-import { CheckIcon, DisabledVisibleIcon } from '@/icons';
+import { BlockCircleIcon, CheckIcon } from '@/icons';
 import { useThemeStore } from '@/stores';
 import { computed } from 'vue';
 
@@ -44,7 +44,7 @@ const indicatorStyle = computed(() => ({
         {{ resourcesCount }} {{ $t('models.resource.modelLabel', resourcesCount) }}
       </div>
       <div v-if="!text.isActive && !singleLine" class="text-small translucent i">
-        <n-icon :component="DisabledVisibleIcon" />
+        <n-icon :component="BlockCircleIcon" />
         {{ $t('models.text.isInactive') }}
       </div>
     </div>
diff --git a/Tekst-Web/src/components/navigation/UserActionsButton.vue b/Tekst-Web/src/components/navigation/UserActionsButton.vue
index f89389cde..7f263a09b 100644
--- a/Tekst-Web/src/components/navigation/UserActionsButton.vue
+++ b/Tekst-Web/src/components/navigation/UserActionsButton.vue
@@ -2,18 +2,18 @@
 import UserAvatar from '@/components/user/UserAvatar.vue';
 import { $t } from '@/i18n';
 import {
-  AdminIcon,
-  CommunityIcon,
+  AdminSettingsIcon,
   LoginIcon,
   LogoutIcon,
   MessageIcon,
   StatsIcon,
   TextsIcon,
   UserIcon,
+  UsersIcon,
 } from '@/icons';
 import { useAuthStore, useStateStore, useUserMessagesStore } from '@/stores';
 import { renderIcon } from '@/utils';
-import { NBadge, NButton, NDropdown, NFlex, NIcon } from 'naive-ui';
+import { NBadge, NButton, NDropdown, NIcon } from 'naive-ui';
 import { computed, h, ref } from 'vue';
 import { type RouteLocationRaw, RouterLink } from 'vue-router';
 
@@ -49,7 +49,7 @@ const userOptions = computed(() => [
       name: 'community',
     }),
     key: 'community',
-    icon: renderIcon(CommunityIcon),
+    icon: renderIcon(UsersIcon),
   },
   ...(!!auth.user?.isSuperuser
     ? [
@@ -72,7 +72,7 @@ const userOptions = computed(() => [
             name: 'admin',
           }),
           key: 'admin',
-          icon: renderIcon(AdminIcon),
+          icon: renderIcon(AdminSettingsIcon),
         },
       ]
     : []),
@@ -128,9 +128,7 @@ function handleUserOptionSelect(key: string) {
   >
     <n-badge :show="!!userMessages.unreadCount" :offset="[-8, 2]">
       <template #value>
-        <n-flex :wrap="false" size="small">
-          <n-icon :component="MessageIcon" />
-        </n-flex>
+        <n-icon :component="MessageIcon" />
       </template>
       <user-avatar
         :username="auth.user.username"
diff --git a/Tekst-Web/src/components/navigation/navMenuOptions.ts b/Tekst-Web/src/components/navigation/navMenuOptions.ts
index f09b26b80..96bdd5825 100644
--- a/Tekst-Web/src/components/navigation/navMenuOptions.ts
+++ b/Tekst-Web/src/components/navigation/navMenuOptions.ts
@@ -14,12 +14,11 @@ import { RouterLink, type RouteLocationRaw } from 'vue-router';
 
 import {
   BookIcon,
-  CommunityIcon,
   InfoIcon,
   LogoutIcon,
   MaintenanceIcon,
   ManageAccountIcon,
-  MessageIcon,
+  MessagesIcon,
   ResourceIcon,
   SearchIcon,
   SegmentsIcon,
@@ -144,7 +143,7 @@ export function useMainMenuOptions(showIcons: boolean = true) {
               name: 'community',
             }),
             key: 'community',
-            icon: (showIcons && renderIcon(CommunityIcon)) || undefined,
+            icon: (showIcons && renderIcon(UsersIcon)) || undefined,
           },
           {
             label: renderLink(() => $t('stats.heading'), {
@@ -226,7 +225,7 @@ export function useAccountMenuOptions(showIcons: boolean = true) {
         }
       ),
       key: 'accountMessages',
-      icon: (showIcons && renderIcon(MessageIcon)) || undefined,
+      icon: (showIcons && renderIcon(MessagesIcon)) || undefined,
     },
     ...(state.vw < 900
       ? [
diff --git a/Tekst-Web/src/components/resource/DeepLLinksWidget.vue b/Tekst-Web/src/components/resource/DeepLLinksWidget.vue
index 41d50830f..396fa5a09 100644
--- a/Tekst-Web/src/components/resource/DeepLLinksWidget.vue
+++ b/Tekst-Web/src/components/resource/DeepLLinksWidget.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { deeplTargetLanguages, type AnyResourceRead } from '@/api';
 import ContentContainerHeaderWidget from '@/components/browse/ContentContainerHeaderWidget.vue';
-import { SearchIcon, TranslateIcon } from '@/icons';
+import { LanguagesIcon, SearchIcon } from '@/icons';
 import { NIcon, NInput, NPopselect } from 'naive-ui';
 import type { SelectBaseOption } from 'naive-ui/es/select/src/interface';
 import { computed, nextTick, ref } from 'vue';
@@ -96,7 +96,7 @@ async function handleUpdateShow(show: boolean) {
     <content-container-header-widget
       :full="full"
       :title="$t('browse.contents.widgets.deeplTranslate.title')"
-      :icon-component="TranslateIcon"
+      :icon-component="LanguagesIcon"
     />
   </n-popselect>
 </template>
diff --git a/Tekst-Web/src/components/resource/OtherCorrectionsListItem.vue b/Tekst-Web/src/components/resource/OtherCorrectionsListItem.vue
index f6517b7b5..e9ef836ca 100644
--- a/Tekst-Web/src/components/resource/OtherCorrectionsListItem.vue
+++ b/Tekst-Web/src/components/resource/OtherCorrectionsListItem.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { ArrowBackIcon, ArrowForwardIcon, WarningIcon } from '@/icons';
+import { ArrowLeftIcon, ArrowRightIcon, WarningIcon } from '@/icons';
 import { NButton, NFlex, NIcon, NListItem, NThing } from 'naive-ui';
 
 defineProps<{
@@ -37,7 +37,7 @@ const emit = defineEmits(['prevClick', 'nextClick']);
             @click="emit('prevClick')"
           >
             <template #icon>
-              <n-icon :component="ArrowBackIcon" />
+              <n-icon :component="ArrowLeftIcon" />
             </template>
           </n-button>
           <n-button
@@ -49,7 +49,7 @@ const emit = defineEmits(['prevClick', 'nextClick']);
             @click="emit('nextClick')"
           >
             <template #icon>
-              <n-icon :component="ArrowForwardIcon" />
+              <n-icon :component="ArrowRightIcon" />
             </template>
           </n-button>
         </n-flex>
diff --git a/Tekst-Web/src/components/resource/ResourceInfoContent.vue b/Tekst-Web/src/components/resource/ResourceInfoContent.vue
index ab1aeda99..653e75203 100644
--- a/Tekst-Web/src/components/resource/ResourceInfoContent.vue
+++ b/Tekst-Web/src/components/resource/ResourceInfoContent.vue
@@ -7,7 +7,7 @@ import TranslationDisplay from '@/components/generic/TranslationDisplay.vue';
 import MetadataDisplay from '@/components/resource/MetadataDisplay.vue';
 import ResourceCoverageWidget from '@/components/resource/ResourceCoverageWidget.vue';
 import UserDisplay from '@/components/user/UserDisplay.vue';
-import { CoverageIcon, DescIcon, LabelIcon, LinkIcon, QuoteIcon, SiteNoticeIcon } from '@/icons';
+import { CoverageIcon, DescIcon, ExternalLinkIcon, LegalIcon, QuoteIcon, TagsIcon } from '@/icons';
 import { useAuthStore, useStateStore } from '@/stores';
 import { pickTranslation, replaceCurrDatePh, replaceResUrlPh } from '@/utils';
 import { NFlex, NIcon } from 'naive-ui';
@@ -60,7 +60,7 @@ const citation = computed(() => {
 
     <!-- METADATA -->
     <div v-if="resource.meta && Object.keys(resource.meta).length" class="gray-box">
-      <icon-heading level="3" :icon="LabelIcon">
+      <icon-heading level="3" :icon="TagsIcon">
         {{ $t('models.meta.modelLabel') }}
       </icon-heading>
       <metadata-display :data="resource.meta" class="text-medium" />
@@ -70,10 +70,18 @@ const citation = computed(() => {
     <div v-if="citation" class="gray-box">
       <icon-heading level="3" :icon="QuoteIcon">
         {{ $t('browse.contents.widgets.infoWidget.citeAs') }}
+        <template #end>
+          <copy-to-clipboard-button
+            secondary
+            :text="citation"
+            size="small"
+            class="ml-sm"
+            show-msg
+          />
+        </template>
       </icon-heading>
       <div :style="{ fontFamily: resource.contentFont }" class="text-medium pre-wrap">
         {{ citation }}
-        <copy-to-clipboard-button secondary :text="citation" size="tiny" class="ml-sm" show-msg />
       </div>
     </div>
 
@@ -87,13 +95,13 @@ const citation = computed(() => {
 
     <!-- LICENSE -->
     <div class="gray-box">
-      <icon-heading level="3" :icon="SiteNoticeIcon">
+      <icon-heading level="3" :icon="LegalIcon">
         {{ $t('models.resource.license') }}
       </icon-heading>
       <template v-if="resource.license || resource.licenseUrl">
         <a v-if="resource.licenseUrl" :href="resource.licenseUrl" target="_blank" rel="noreferrer">
           <n-flex align="center" size="small">
-            <n-icon :component="LinkIcon" />
+            <n-icon :component="ExternalLinkIcon" />
             <span>{{ resource.license || resource.licenseUrl }}</span>
           </n-flex>
         </a>
diff --git a/Tekst-Web/src/components/resource/ResourceInfoTags.vue b/Tekst-Web/src/components/resource/ResourceInfoTags.vue
index a64e9e0b8..7a87fb149 100644
--- a/Tekst-Web/src/components/resource/ResourceInfoTags.vue
+++ b/Tekst-Web/src/components/resource/ResourceInfoTags.vue
@@ -2,13 +2,13 @@
 import type { AnyResourceRead } from '@/api';
 import { $t } from '@/i18n';
 import {
-  CommunityIcon,
   LevelsIcon,
   PatchIcon,
   ProposedIcon,
   PublicIcon,
   PublicOffIcon,
   ResourceIcon,
+  UsersIcon,
 } from '@/icons';
 import { useAuthStore, useResourcesStore, useStateStore } from '@/stores';
 import { pickTranslation } from '@/utils';
@@ -70,7 +70,7 @@ const accessSharesTip = computed(() => {
       :title="accessSharesTip"
     >
       <template #icon>
-        <n-icon :component="CommunityIcon" />
+        <n-icon :component="UsersIcon" />
       </template>
       {{
         $t('resources.shared', { count: resource.sharedRead.length + resource.sharedWrite.length })
diff --git a/Tekst-Web/src/components/resource/ResourceListItem.vue b/Tekst-Web/src/components/resource/ResourceListItem.vue
index 8ae28100e..e29f95763 100644
--- a/Tekst-Web/src/components/resource/ResourceListItem.vue
+++ b/Tekst-Web/src/components/resource/ResourceListItem.vue
@@ -13,12 +13,12 @@ import {
   DeleteIcon,
   DownloadIcon,
   EditIcon,
+  IntegratePatchIcon,
   MoreIcon,
   PatchIcon,
   ProposedIcon,
   PublicIcon,
   PublicOffIcon,
-  ReviewIcon,
   SettingsIcon,
   UnproposedIcon,
   UploadIcon,
@@ -224,7 +224,7 @@ const actionOptions = computed<DropdownOption[]>(() => [
                   {
                     label: $t('resources.reqPatchIntegration.action'),
                     key: 'reqPatchtegration',
-                    icon: renderIcon(ReviewIcon),
+                    icon: renderIcon(IntegratePatchIcon),
                     disabled:
                       resources.all
                         .find((r) => r.id === props.resource.patchFor)
diff --git a/Tekst-Web/src/components/search/LocationRange.vue b/Tekst-Web/src/components/search/LocationRange.vue
index 35e664823..838dc30a7 100644
--- a/Tekst-Web/src/components/search/LocationRange.vue
+++ b/Tekst-Web/src/components/search/LocationRange.vue
@@ -2,7 +2,7 @@
 import { type LocationRead } from '@/api';
 import LocationSelectForm from '@/forms/LocationSelectForm.vue';
 import { $t } from '@/i18n';
-import { ArrowForwardIcon, ErrorIcon } from '@/icons';
+import { ArrowRightIcon, ErrorIcon } from '@/icons';
 import { NCollapse, NCollapseItem, NEmpty, NFlex, NIcon, NTag } from 'naive-ui';
 import { computed, ref, watchEffect } from 'vue';
 
@@ -42,7 +42,7 @@ function handleExpandedChange(names: string[]) {
             {{ $t('search.advancedSearch.range.title') }}:&nbsp;
             <n-flex v-if="enabled && !!rangeExpandedNames.length" align="center" size="small">
               <n-tag size="small">{{ fromLocationFullLabel }}</n-tag>
-              <n-icon :component="ArrowForwardIcon" />
+              <n-icon :component="ArrowRightIcon" />
               <n-tag size="small">{{ toLocationFullLabel }}</n-tag>
             </n-flex>
             <template v-else>
diff --git a/Tekst-Web/src/components/search/SearchResult.vue b/Tekst-Web/src/components/search/SearchResult.vue
index f795179cc..980c35a6c 100644
--- a/Tekst-Web/src/components/search/SearchResult.vue
+++ b/Tekst-Web/src/components/search/SearchResult.vue
@@ -2,7 +2,7 @@
 import type { SearchHit, TextRead } from '@/api';
 import CollapsibleContent from '@/components/CollapsibleContent.vue';
 import { $t } from '@/i18n';
-import { BookIcon, LevelsIcon, StarHalfIcon, TextsIcon } from '@/icons';
+import { BookIcon, LevelsIcon, ScoreIcon, TextsIcon } from '@/icons';
 import { useResourcesStore, useStateStore, useThemeStore } from '@/stores';
 import { lighten, toRgba, transparentize } from 'color2k';
 import { NFlex, NIcon, NListItem, NTag } from 'naive-ui';
@@ -117,7 +117,7 @@ const highlightsProcessed = computed<HighlightDisplayData[]>(() => {
               :color="{ textColor: scoreTagColor, borderColor: scoreTagBorderColor }"
             >
               <template #icon>
-                <n-icon class="translucent" :component="StarHalfIcon" />
+                <n-icon class="translucent" :component="ScoreIcon" />
               </template>
               {{ scorePercentDisplay }}
             </n-tag>
diff --git a/Tekst-Web/src/components/user/UserListItem.vue b/Tekst-Web/src/components/user/UserListItem.vue
index 1135b5bcc..eb610abe1 100644
--- a/Tekst-Web/src/components/user/UserListItem.vue
+++ b/Tekst-Web/src/components/user/UserListItem.vue
@@ -35,7 +35,7 @@ const props = defineProps<{
 const emit = defineEmits([
   'setSuperuserClick',
   'unsetSuperuserClick',
-  'activateClick',
+  'toggleActive',
   'verifyClick',
   'deleteClick',
 ]);
@@ -60,7 +60,7 @@ const actionOptions = computed(() => [
               key: 'setInactive',
               icon: renderIcon(BlockCircleIcon, 'var(--error-color)'),
               disabled: targetUserIsCurrentUser.value,
-              action: () => emit('activateClick', props.targetUser, false),
+              action: () => emit('toggleActive', props.targetUser, false),
             },
           ]
         : [
@@ -69,7 +69,7 @@ const actionOptions = computed(() => [
               key: 'setActive',
               icon: renderIcon(CheckCircleIcon, 'var(--success-color)'),
               disabled: targetUserIsCurrentUser.value,
-              action: () => emit('activateClick', props.targetUser, true),
+              action: () => emit('toggleActive', props.targetUser, true),
             },
           ]),
       ...(props.targetUser.isVerified
diff --git a/Tekst-Web/src/components/userMessages/MessagingModal.vue b/Tekst-Web/src/components/userMessages/MessagingModal.vue
index 959c972fc..50dee51d1 100644
--- a/Tekst-Web/src/components/userMessages/MessagingModal.vue
+++ b/Tekst-Web/src/components/userMessages/MessagingModal.vue
@@ -3,7 +3,7 @@ import type { UserMessageRead } from '@/api';
 import GenericModal from '@/components/generic/GenericModal.vue';
 import UserDisplay from '@/components/user/UserDisplay.vue';
 import { $t } from '@/i18n';
-import { MarkChatReadIcon, MarkChatUnreadIcon, SendIcon } from '@/icons';
+import { MessageReadIcon, MessageUnreadIcon, SendIcon } from '@/icons';
 import { useAuthStore, useUserMessagesStore } from '@/stores';
 import { delay, utcToLocalTime } from '@/utils';
 import { useIntervalFn, useMagicKeys, whenever } from '@vueuse/core';
@@ -111,7 +111,7 @@ whenever(ctrlEnter, () => {
             <n-time v-if="msg.createdAt" :time="utcToLocalTime(msg.createdAt)" type="datetime" />
             <n-icon
               v-if="msg.sender === auth.user?.id"
-              :component="msg.read ? MarkChatReadIcon : MarkChatUnreadIcon"
+              :component="msg.read ? MessageReadIcon : MessageUnreadIcon"
               :title="$t(msg.read ? 'account.messages.read' : 'account.messages.unread')"
               :color="msg.read ? 'var(--success-color)' : 'inherit'"
             />
diff --git a/Tekst-Web/src/forms/DynamicInputControls.vue b/Tekst-Web/src/forms/DynamicInputControls.vue
index ac3de756b..5d3e80ab5 100644
--- a/Tekst-Web/src/forms/DynamicInputControls.vue
+++ b/Tekst-Web/src/forms/DynamicInputControls.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { $t } from '@/i18n';
-import { AddIcon, ArrowDownIcon, ArrowUpIcon, MinusIcon } from '@/icons';
+import { ArrowDownIcon, ArrowUpIcon, MinusIcon, PlusIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { NButton, NButtonGroup, NIcon, type ButtonProps } from 'naive-ui';
 import { computed } from 'vue';
@@ -94,7 +94,7 @@ const btnProps = computed<ButtonProps>(() => ({
         @click="$emit('insert')"
       >
         <template #icon>
-          <n-icon :component="AddIcon" />
+          <n-icon :component="PlusIcon" />
         </template>
       </n-button>
     </n-button-group>
diff --git a/Tekst-Web/src/forms/resources/config/ResourceSettingsPropertiesFormItems.vue b/Tekst-Web/src/forms/resources/config/ResourceSettingsPropertiesFormItems.vue
index 166b7b45f..b6f56dc96 100644
--- a/Tekst-Web/src/forms/resources/config/ResourceSettingsPropertiesFormItems.vue
+++ b/Tekst-Web/src/forms/resources/config/ResourceSettingsPropertiesFormItems.vue
@@ -7,7 +7,7 @@ import DynamicInputControls from '@/forms/DynamicInputControls.vue';
 import { resourceSettingsFormRules } from '@/forms/formRules';
 import TranslationFormItem from '@/forms/TranslationFormItem.vue';
 import { $t } from '@/i18n';
-import { TranslateIcon } from '@/icons';
+import { LanguagesIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { pickTranslation } from '@/utils';
 import { NDynamicInput, NFlex, NFormItem, NIcon, NInput, NSelect } from 'naive-ui';
@@ -21,7 +21,7 @@ const metadataKeysOptions = computed(() =>
   state.pf?.state.resMetaTranslations.map((rmt) => ({
     label: () =>
       h('div', { style: 'display: flex; align-items: center; gap: 4px; padding: 4px' }, [
-        h(NIcon, { component: TranslateIcon }),
+        h(NIcon, { component: LanguagesIcon }),
         pickTranslation(rmt.translations, state.locale),
       ]),
     value: rmt.key,
diff --git a/Tekst-Web/src/forms/texts/TextLocationsForm.vue b/Tekst-Web/src/forms/texts/TextLocationsForm.vue
index e0775d3de..486f3f799 100644
--- a/Tekst-Web/src/forms/texts/TextLocationsForm.vue
+++ b/Tekst-Web/src/forms/texts/TextLocationsForm.vue
@@ -10,14 +10,7 @@ import EditLocationModal, {
 import { useMessages } from '@/composables/messages';
 import { useTasks } from '@/composables/tasks';
 import { $t } from '@/i18n';
-import {
-  AddIcon,
-  DeleteIcon,
-  DownloadIcon,
-  EditIcon,
-  ExpandArrowRightIcon,
-  UploadIcon,
-} from '@/icons';
+import { DeleteIcon, DownloadIcon, EditIcon, PlusIcon, UploadIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { renderIcon } from '@/utils';
 import {
@@ -337,16 +330,6 @@ async function handleUploadClick() {
   });
 }
 
-function renderSwitcherIcon() {
-  return h(
-    NIcon,
-    { size: 'var(--font-size-medium)', style: 'align-self: center' },
-    {
-      default: () => h(ExpandArrowRightIcon),
-    }
-  );
-}
-
 function renderLabel({ option }: { option: TreeOption }) {
   const levelLabel = state.textLevelLabels[option.level as number];
   return h('div', { class: 'entry-label mr-lg' }, [
@@ -398,7 +381,7 @@ function renderSuffix(info: { option: TreeOption; checked: boolean; selected: bo
     info.option.isLeaf
       ? null
       : renderSuffixButton(
-          AddIcon,
+          PlusIcon,
           () => handleAddClick(info.option as LocationTreeOption),
           $t('texts.locations.editOrAdd.headingAdd'),
           loadingAdd
@@ -448,7 +431,7 @@ onMounted(() => {
               @click="handleAddClick(null)"
             >
               <template #icon>
-                <n-icon :component="AddIcon" />
+                <n-icon :component="PlusIcon" />
               </template>
               {{ $t('texts.locations.lblBtnAddLocationFirstLevel') }}
             </n-button>
@@ -502,7 +485,6 @@ onMounted(() => {
             :selectable="!loading"
             :data="treeData"
             :on-load="loadTreeData"
-            :render-switcher-icon="renderSwitcherIcon"
             :render-label="renderLabel"
             :allow-drop="isDropAllowed"
             :render-suffix="renderSuffix"
diff --git a/Tekst-Web/src/icons.ts b/Tekst-Web/src/icons.ts
index 1f773493e..9a4a493d0 100644
--- a/Tekst-Web/src/icons.ts
+++ b/Tekst-Web/src/icons.ts
@@ -1,248 +1,225 @@
-import AddOutlined from '@vicons/material/AddOutlined';
-import AltRouteOutlined from '@vicons/material/AltRouteOutlined';
-import ArrowBackOutlined from '@vicons/material/ArrowBackOutlined';
-import ArrowDownwardOutlined from '@vicons/material/ArrowDownwardOutlined';
-import ArrowForwardOutlined from '@vicons/material/ArrowForwardOutlined';
-import ArrowUpwardOutlined from '@vicons/material/ArrowUpwardOutlined';
-import AutoAwesomeMosaicOutlined from '@vicons/material/AutoAwesomeMosaicOutlined';
-import AutoFixHighOutlined from '@vicons/material/AutoFixHighOutlined';
-import BackspaceOutlined from '@vicons/material/BackspaceOutlined';
-import BarChartOutlined from '@vicons/material/BarChartOutlined';
-import BlockOutlined from '@vicons/material/BlockOutlined';
-import BookmarksOutlined from '@vicons/material/BookmarksOutlined';
-import CampaignOutlined from '@vicons/material/CampaignOutlined';
-import ChatBubbleOutlineOutlined from '@vicons/material/ChatBubbleOutlineOutlined';
-import CheckCircleOutlined from '@vicons/material/CheckCircleOutlined';
-import ChecklistOutlined from '@vicons/material/ChecklistOutlined';
-import CheckOutlined from '@vicons/material/CheckOutlined';
-import ClearOutlined from '@vicons/material/ClearOutlined';
-import CodeOutlined from '@vicons/material/CodeOutlined';
-import CompareArrowsOutlined from '@vicons/material/CompareArrowsOutlined';
-import CompressOutlined from '@vicons/material/CompressOutlined';
-import ConstructionOutlined from '@vicons/material/ConstructionOutlined';
-import ContentCopyOutlined from '@vicons/material/ContentCopyOutlined';
-import DarkModeOutlined from '@vicons/material/DarkModeOutlined';
-import DeleteFilled from '@vicons/material/DeleteFilled';
-import DescriptionOutlined from '@vicons/material/DescriptionOutlined';
-import DisabledVisibleRound from '@vicons/material/DisabledVisibleRound';
-import EditOutlined from '@vicons/material/EditOutlined';
-import ErrorOutlineOutlined from '@vicons/material/ErrorOutlineOutlined';
-import ExpandOutlined from '@vicons/material/ExpandOutlined';
-import FileDownloadOutlined from '@vicons/material/FileDownloadOutlined';
-import FileOpenOutlined from '@vicons/material/FileOpenOutlined';
-import FileUploadOutlined from '@vicons/material/FileUploadOutlined';
-import FilterAltOutlined from '@vicons/material/FilterAltOutlined';
-import FindInPageOutlined from '@vicons/material/FindInPageOutlined';
-import FlagFilled from '@vicons/material/FlagFilled';
-import FlagOutlined from '@vicons/material/FlagOutlined';
-import FolderOffOutlined from '@vicons/material/FolderOffOutlined';
-import FormatAlignCenterOutlined from '@vicons/material/FormatAlignCenterOutlined';
-import FormatAlignJustifyOutlined from '@vicons/material/FormatAlignJustifyOutlined';
-import FormatAlignLeftOutlined from '@vicons/material/FormatAlignLeftOutlined';
-import FormatAlignRightOutlined from '@vicons/material/FormatAlignRightOutlined';
-import FormatBoldOutlined from '@vicons/material/FormatBoldOutlined';
-import FormatClearOutlined from '@vicons/material/FormatClearOutlined';
-import FormatItalicOutlined from '@vicons/material/FormatItalicOutlined';
-import FormatListBulletedOutlined from '@vicons/material/FormatListBulletedOutlined';
-import FormatListNumberedOutlined from '@vicons/material/FormatListNumberedOutlined';
-import FormatQuoteFilled from '@vicons/material/FormatQuoteFilled';
-import FormatSizeOutlined from '@vicons/material/FormatSizeOutlined';
-import GavelOutlined from '@vicons/material/GavelOutlined';
-import GroupOutlined from '@vicons/material/GroupOutlined';
-import GroupsOutlined from '@vicons/material/GroupsOutlined';
-import HelpCenterOutlined from '@vicons/material/HelpCenterOutlined';
-import HistoryOutlined from '@vicons/material/HistoryOutlined';
-import HorizontalRuleOutlined from '@vicons/material/HorizontalRuleOutlined';
-import HourglassTopOutlined from '@vicons/material/HourglassTopOutlined';
-import ImageOutlined from '@vicons/material/ImageOutlined';
-import InfoOutlined from '@vicons/material/InfoOutlined';
-import InvertColorsOffOutlined from '@vicons/material/InvertColorsOffOutlined';
-import InvertColorsOutlined from '@vicons/material/InvertColorsOutlined';
-import KeyboardAltOutlined from '@vicons/material/KeyboardAltOutlined';
-import KeyboardArrowDownOutlined from '@vicons/material/KeyboardArrowDownOutlined';
-import KeyboardArrowRightOutlined from '@vicons/material/KeyboardArrowRightOutlined';
-import KeyboardArrowUpOutlined from '@vicons/material/KeyboardArrowUpOutlined';
-import KeyboardCapslockOutlined from '@vicons/material/KeyboardCapslockOutlined';
-import KeyboardReturnOutlined from '@vicons/material/KeyboardReturnOutlined';
-import KeyOffFilled from '@vicons/material/KeyOffFilled';
-import LabelOutlined from '@vicons/material/LabelOutlined';
-import LanguageOutlined from '@vicons/material/LanguageOutlined';
-import LayersOutlined from '@vicons/material/LayersOutlined';
-import LibraryBooksOutlined from '@vicons/material/LibraryBooksOutlined';
-import LightModeOutlined from '@vicons/material/LightModeOutlined';
-import LinkOutlined from '@vicons/material/LinkOutlined';
-import LogInOutlined from '@vicons/material/LogInOutlined';
-import LogOutOutlined from '@vicons/material/LogOutOutlined';
-import MailOutlined from '@vicons/material/MailOutlined';
-import ManageAccountsOutlined from '@vicons/material/ManageAccountsOutlined';
-import ManageSearchOutlined from '@vicons/material/ManageSearchOutlined';
-import MarkChatReadRound from '@vicons/material/MarkChatReadRound';
-import MarkChatUnreadRound from '@vicons/material/MarkChatUnreadRound';
-import MenuBookTwotone from '@vicons/material/MenuBookTwotone';
-import MenuOutlined from '@vicons/material/MenuOutlined';
-import MergeOutlined from '@vicons/material/MergeOutlined';
-import MessageOutlined from '@vicons/material/MessageOutlined';
-import MinusOutlined from '@vicons/material/MinusOutlined';
-import MiscellaneousServicesOutlined from '@vicons/material/MiscellaneousServicesOutlined';
-import MoreVertOutlined from '@vicons/material/MoreVertOutlined';
-import MoveDownOutlined from '@vicons/material/MoveDownOutlined';
-import PanToolAltOutlined from '@vicons/material/PanToolAltOutlined';
-import PauseFilled from '@vicons/material/PauseFilled';
-import PercentOutlined from '@vicons/material/PercentOutlined';
-import PersonAddOutlined from '@vicons/material/PersonAddOutlined';
-import PersonOutlined from '@vicons/material/PersonOutlined';
-import PersonRemoveFilled from '@vicons/material/PersonRemoveFilled';
-import PlayArrowFilled from '@vicons/material/PlayArrowFilled';
-import PlaylistAddCheckOutlined from '@vicons/material/PlaylistAddCheckOutlined';
-import PlaylistRemoveOutlined from '@vicons/material/PlaylistRemoveOutlined';
-import PrivacyTipOutlined from '@vicons/material/PrivacyTipOutlined';
-import PublicOffOutlined from '@vicons/material/PublicOffOutlined';
-import PublicOutlined from '@vicons/material/PublicOutlined';
-import PushPinOutlined from '@vicons/material/PushPinOutlined';
-import QuestionMarkOutlined from '@vicons/material/QuestionMarkOutlined';
-import RateReviewOutlined from '@vicons/material/RateReviewOutlined';
-import RedoOutlined from '@vicons/material/RedoOutlined';
-import RefreshOutlined from '@vicons/material/RefreshOutlined';
-import RemoveCircleFilled from '@vicons/material/RemoveCircleFilled';
-import SearchOutlined from '@vicons/material/SearchOutlined';
-import SendFilled from '@vicons/material/SendFilled';
-import SettingsOutlined from '@vicons/material/SettingsOutlined';
-import ShieldOutlined from '@vicons/material/ShieldOutlined';
-import ShortTextOutlined from '@vicons/material/ShortTextOutlined';
-import SkipNextFilled from '@vicons/material/SkipNextFilled';
-import SkipPreviousFilled from '@vicons/material/SkipPreviousFilled';
-import SortOutlined from '@vicons/material/SortOutlined';
-import StarHalfFilled from '@vicons/material/StarHalfFilled';
-import TranslateOutlined from '@vicons/material/TranslateOutlined';
-import UndoOutlined from '@vicons/material/UndoOutlined';
-import UpdateOutlined from '@vicons/material/UpdateOutlined';
-import VerifiedUserOutlined from '@vicons/material/VerifiedUserOutlined';
-import VerticalAlignBottomOutlined from '@vicons/material/VerticalAlignBottomOutlined';
-import VerticalAlignTopOutlined from '@vicons/material/VerticalAlignTopOutlined';
-import WarningAmberOutlined from '@vicons/material/WarningAmberOutlined';
+import {
+  ArrowBigUp,
+  ArrowBigUpDash,
+  ArrowDown,
+  ArrowDownNarrowWide,
+  ArrowLeft,
+  ArrowRight,
+  ArrowUp,
+  Blocks,
+  Bold,
+  Bookmark,
+  BookmarkPlus,
+  BookOpenText,
+  ChartColumn,
+  Check,
+  ChevronFirst,
+  ChevronLast,
+  CircleCheck,
+  CircleX,
+  Clipboard,
+  ClipboardPaste,
+  Code,
+  CornerDownLeft,
+  Delete,
+  Download,
+  Droplet,
+  DropletOff,
+  EllipsisVertical,
+  ExternalLink,
+  File,
+  FileQuestionMark,
+  FileText,
+  FileUp,
+  FileX,
+  Flag,
+  FlagOff,
+  FoldVertical,
+  Funnel,
+  GitCompareArrows,
+  Globe,
+  GlobeOff,
+  HatGlasses,
+  Heading,
+  Highlighter,
+  History,
+  Hourglass,
+  Image,
+  Info,
+  Italic,
+  Keyboard,
+  Languages,
+  Layers,
+  LibraryBig,
+  Link,
+  List,
+  ListChecks,
+  ListOrdered,
+  ListX,
+  LogIn,
+  LogOut,
+  Mail,
+  MailCheck,
+  MailQuestionMark,
+  Mails,
+  Menu,
+  Merge,
+  MessageSquareQuote,
+  MessageSquareWarning,
+  Minus,
+  Moon,
+  Pause,
+  Pencil,
+  Pickaxe,
+  Play,
+  Plus,
+  Puzzle,
+  Redo,
+  RefreshCcw,
+  RemoveFormatting,
+  Scale,
+  Search,
+  SearchCheck,
+  SearchX,
+  Send,
+  Settings,
+  ShieldCog,
+  ShieldMinus,
+  ShieldUser,
+  Signpost,
+  Split,
+  SquaresSubtract,
+  Sun,
+  Tags,
+  Target,
+  TextAlignCenter,
+  TextAlignEnd,
+  TextAlignJustify,
+  TextAlignStart,
+  Toolbox,
+  Trash2,
+  TriangleAlert,
+  Undo,
+  UnfoldVertical,
+  User,
+  UserCog,
+  UserPlus,
+  Users,
+  WandSparkles,
+  X,
+} from '@lucide/vue';
 
 export {
-  AddOutlined as AddIcon,
-  ShieldOutlined as AdminIcon,
-  HistoryOutlined as ArchiveIcon,
-  ArrowBackOutlined as ArrowBackIcon,
-  ArrowDownwardOutlined as ArrowDownIcon,
-  ArrowForwardOutlined as ArrowForwardIcon,
-  ArrowUpwardOutlined as ArrowUpIcon,
-  BackspaceOutlined as BackspaceIcon,
-  RemoveCircleFilled as BlockCircleIcon,
-  BlockOutlined as BlockIcon,
-  MenuBookTwotone as BookIcon,
-  BookmarksOutlined as BookmarksIcon,
-  VerticalAlignBottomOutlined as BottomIcon,
-  KeyboardCapslockOutlined as CapsLockIcon,
-  PlaylistAddCheckOutlined as CheckAllIcon,
-  CheckCircleOutlined as CheckCircleIcon,
-  CheckOutlined as CheckIcon,
-  ChecklistOutlined as CheckListIcon,
-  ClearOutlined as ClearIcon,
-  CodeOutlined as CodeIcon,
-  InvertColorsOutlined as ColorIcon,
-  InvertColorsOffOutlined as ColorOffIcon,
-  ChatBubbleOutlineOutlined as CommentIcon,
-  GroupsOutlined as CommunityIcon,
-  CompareArrowsOutlined as CompareIcon,
-  CompressOutlined as CompressIcon,
-  ContentCopyOutlined as CopyIcon,
-  PanToolAltOutlined as CorrectionNoteIcon,
-  PercentOutlined as CoverageIcon,
-  DarkModeOutlined as DarkModeIcon,
-  DeleteFilled as DeleteIcon,
-  DescriptionOutlined as DescIcon,
-  DisabledVisibleRound as DisabledVisibleIcon,
-  FileDownloadOutlined as DownloadIcon,
-  EditOutlined as EditIcon,
-  MailOutlined as EMailIcon,
-  ErrorOutlineOutlined as ErrorIcon,
-  KeyboardArrowDownOutlined as ExpandArrowDownIcon,
-  KeyboardArrowRightOutlined as ExpandArrowRightIcon,
-  ExpandOutlined as ExpandIcon,
-  FileOpenOutlined as FileOpenIcon,
-  FilterAltOutlined as FilterIcon,
-  FormatAlignCenterOutlined as FormatAlignCenterIcon,
-  FormatAlignJustifyOutlined as FormatAlignJustifyIcon,
-  FormatAlignLeftOutlined as FormatAlignLeftIcon,
-  FormatAlignRightOutlined as FormatAlignRightIcon,
-  FormatBoldOutlined as FormatBoldIcon,
-  FormatClearOutlined as FormatClearIcon,
-  FormatItalicOutlined as FormatItalicIcon,
-  FormatListBulletedOutlined as FormatListBulletedIcon,
-  FormatListNumberedOutlined as FormatListNumberedIcon,
-  FormatSizeOutlined as FormatSizeIcon,
-  MenuOutlined as HamburgerMenuIcon,
-  HelpCenterOutlined as HelpOverviewIcon,
-  HorizontalRuleOutlined as HorizontalRuleIcon,
-  HourglassTopOutlined as HourglassIcon,
-  ImageOutlined as ImageIcon,
-  InfoOutlined as InfoIcon,
-  UndoOutlined as JumpBackIcon,
-  RedoOutlined as JumpForwardIcon,
-  KeyboardAltOutlined as KeyboardIcon,
-  KeyboardReturnOutlined as KeyboardReturnIcon,
-  KeyOffFilled as KeyOffIcon,
-  LabelOutlined as LabelIcon,
-  LanguageOutlined as LanguageIcon,
-  FormatListNumberedOutlined as LevelsIcon,
-  LightModeOutlined as LightModeIcon,
-  LinkOutlined as LinkIcon,
-  LogInOutlined as LoginIcon,
-  LogOutOutlined as LogoutIcon,
-  ConstructionOutlined as MaintenanceIcon,
-  ManageAccountsOutlined as ManageAccountIcon,
-  MarkChatReadRound as MarkChatReadIcon,
-  MarkChatUnreadRound as MarkChatUnreadIcon,
-  MergeOutlined as MergeIcon,
-  MessageOutlined as MessageIcon,
-  MinusOutlined as MinusIcon,
-  MoreVertOutlined as MoreIcon,
-  MoveDownOutlined as MoveDownIcon,
-  PersonAddOutlined as NewUserIcon,
-  FolderOffOutlined as NoContentIcon,
-  FindInPageOutlined as NothingFoundIcon,
-  AltRouteOutlined as PatchIcon,
-  PauseFilled as PauseIcon,
-  PushPinOutlined as PinIcon,
-  PlayArrowFilled as PlayIcon,
-  PrivacyTipOutlined as PrivacyIcon,
-  FlagFilled as ProposedIcon,
-  PublicOutlined as PublicIcon,
-  PublicOffOutlined as PublicOffIcon,
-  QuestionMarkOutlined as QuestionMarkIcon,
-  FormatQuoteFilled as QuoteIcon,
-  RefreshOutlined as RefreshIcon,
-  LayersOutlined as ResourceIcon,
-  RateReviewOutlined as ReviewIcon,
-  SearchOutlined as SearchIcon,
-  ManageSearchOutlined as SearchResultsIcon,
-  AutoAwesomeMosaicOutlined as SegmentsIcon,
-  SendFilled as SendIcon,
-  SettingsOutlined as SettingsIcon,
-  KeyboardArrowUpOutlined as ShiftIcon,
-  ShortTextOutlined as ShortTextIcon,
-  GavelOutlined as SiteNoticeIcon,
-  SkipNextFilled as SkipNextIcon,
-  SkipPreviousFilled as SkipPreviousIcon,
-  SortOutlined as SortIcon,
-  StarHalfFilled as StarHalfIcon,
-  BarChartOutlined as StatsIcon,
-  MiscellaneousServicesOutlined as SystemIcon,
-  LibraryBooksOutlined as TextsIcon,
-  VerticalAlignTopOutlined as TopIcon,
-  CampaignOutlined as TourIcon,
-  TranslateOutlined as TranslateIcon,
-  PlaylistRemoveOutlined as UncheckAllIcon,
-  FlagOutlined as UnproposedIcon,
-  UpdateOutlined as UpdateIcon,
-  FileUploadOutlined as UploadIcon,
-  PersonRemoveFilled as UserDowngradeIcon,
-  PersonOutlined as UserIcon,
-  GroupOutlined as UsersIcon,
-  VerifiedUserOutlined as VerifiedUserIcon,
-  AutoFixHighOutlined as WandIcon,
-  WarningAmberOutlined as WarningIcon,
+  BookmarkPlus as AddBookmarkIcon,
+  ShieldUser as AdminIcon,
+  ShieldCog as AdminSettingsIcon,
+  History as ArchiveIcon,
+  ArrowDown as ArrowDownIcon,
+  ArrowLeft as ArrowLeftIcon,
+  ArrowRight as ArrowRightIcon,
+  ArrowUp as ArrowUpIcon,
+  Delete as BackspaceIcon,
+  CircleX as BlockCircleIcon,
+  BookOpenText as BookIcon,
+  Bookmark as BookmarkIcon,
+  ArrowBigUpDash as CapsLockIcon,
+  ListChecks as CheckAllIcon,
+  CircleCheck as CheckCircleIcon,
+  Check as CheckIcon,
+  X as ClearIcon,
+  Code as CodeIcon,
+  Droplet as ColorIcon,
+  DropletOff as ColorOffIcon,
+  MessageSquareWarning as CommentIcon,
+  GitCompareArrows as CompareIcon,
+  FoldVertical as CompressIcon,
+  Clipboard as CopyIcon,
+  Highlighter as CorrectionNoteIcon,
+  SquaresSubtract as CoverageIcon,
+  Moon as DarkModeIcon,
+  Trash2 as DeleteIcon,
+  FileText as DescIcon,
+  Download as DownloadIcon,
+  Pencil as EditIcon,
+  CircleX as ErrorIcon,
+  UnfoldVertical as ExpandIcon,
+  ExternalLink as ExternalLinkIcon,
+  File as FileOpenIcon,
+  FileQuestionMark as FileQuestionMarkIcon,
+  Funnel as FilterIcon,
+  TextAlignCenter as FormatAlignCenterIcon,
+  TextAlignJustify as FormatAlignJustifyIcon,
+  TextAlignStart as FormatAlignLeftIcon,
+  TextAlignEnd as FormatAlignRightIcon,
+  Bold as FormatBoldIcon,
+  RemoveFormatting as FormatClearIcon,
+  Italic as FormatItalicIcon,
+  List as FormatListBulletedIcon,
+  ListOrdered as FormatListNumberedIcon,
+  Menu as HamburgerMenuIcon,
+  Heading as HeadingIcon,
+  Minus as HorizontalRuleIcon,
+  Hourglass as HourglassIcon,
+  Image as ImageIcon,
+  Info as InfoIcon,
+  Blocks as IntegratePatchIcon,
+  Keyboard as KeyboardIcon,
+  CornerDownLeft as KeyboardReturnIcon,
+  Languages as LanguagesIcon,
+  Scale as LegalIcon,
+  ListOrdered as LevelsIcon,
+  Sun as LightModeIcon,
+  Link as LinkIcon,
+  LogIn as LoginIcon,
+  LogOut as LogoutIcon,
+  Toolbox as MaintenanceIcon,
+  UserCog as ManageAccountIcon,
+  Merge as MergeIcon,
+  Mail as MessageIcon,
+  MailCheck as MessageReadIcon,
+  Mails as MessagesIcon,
+  MailQuestionMark as MessageUnreadIcon,
+  Minus as MinusIcon,
+  EllipsisVertical as MoreIcon,
+  UserPlus as NewUserIcon,
+  FileX as NoContentIcon,
+  SearchX as NothingFoundIcon,
+  ClipboardPaste as PasteIcon,
+  Split as PatchIcon,
+  Pause as PauseIcon,
+  Play as PlayIcon,
+  Plus as PlusIcon,
+  HatGlasses as PrivacyIcon,
+  Flag as ProposedIcon,
+  Globe as PublicIcon,
+  GlobeOff as PublicOffIcon,
+  MessageSquareQuote as QuoteIcon,
+  Redo as RedoIcon,
+  RefreshCcw as RefreshIcon,
+  Layers as ResourceIcon,
+  Target as ScoreIcon,
+  Search as SearchIcon,
+  SearchCheck as SearchResultsIcon,
+  Puzzle as SegmentsIcon,
+  Send as SendIcon,
+  Settings as SettingsIcon,
+  ArrowBigUp as ShiftIcon,
+  ChevronLast as SkipNextIcon,
+  ChevronFirst as SkipPreviousIcon,
+  ArrowDownNarrowWide as SortIcon,
+  ChartColumn as StatsIcon,
+  Tags as TagsIcon,
+  Pickaxe as TaskIcon,
+  LibraryBig as TextsIcon,
+  Signpost as TourIcon,
+  ListX as UncheckAllIcon,
+  Undo as UndoIcon,
+  FlagOff as UnproposedIcon,
+  FileUp as UploadIcon,
+  ShieldMinus as UserDowngradeIcon,
+  User as UserIcon,
+  Users as UsersIcon,
+  MailCheck as VerifiedUserIcon,
+  WandSparkles as WandIcon,
+  TriangleAlert as WarningIcon,
 };
diff --git a/Tekst-Web/src/router.ts b/Tekst-Web/src/router.ts
index 159218860..0a253567f 100644
--- a/Tekst-Web/src/router.ts
+++ b/Tekst-Web/src/router.ts
@@ -2,7 +2,7 @@ import { GET } from '@/api';
 import { useMessages } from '@/composables/messages';
 import env from '@/env';
 import { $t } from '@/i18n';
-import { InfoIcon, PrivacyIcon, SiteNoticeIcon } from '@/icons';
+import { InfoIcon, LegalIcon, PrivacyIcon } from '@/icons';
 import { useAuthStore, useStateStore } from '@/stores';
 import { delay } from '@/utils';
 import {
@@ -162,7 +162,7 @@ const router = createRouter({
       component: InfoPageView,
       props: {
         pageKey: 'systemSiteNotice',
-        icon: SiteNoticeIcon,
+        icon: LegalIcon,
       },
     },
     {
diff --git a/Tekst-Web/src/stores/theme.ts b/Tekst-Web/src/stores/theme.ts
index f55249cae..664d71db8 100644
--- a/Tekst-Web/src/stores/theme.ts
+++ b/Tekst-Web/src/stores/theme.ts
@@ -52,7 +52,6 @@ const _COMMON_OVERRIDES: GlobalThemeOverrides = {
   },
   Empty: {
     textColor: 'var(--text-color-translucent)',
-    iconColor: 'var(--text-color-translucent)',
   },
 };
 
diff --git a/Tekst-Web/src/views/CommunityView.vue b/Tekst-Web/src/views/CommunityView.vue
index 49a6be15d..5786b1a16 100644
--- a/Tekst-Web/src/views/CommunityView.vue
+++ b/Tekst-Web/src/views/CommunityView.vue
@@ -6,7 +6,7 @@ import UserAvatar from '@/components/user/UserAvatar.vue';
 import UserThingHeader from '@/components/user/UserThingHeader.vue';
 import { usePublicUserSearch } from '@/composables/user';
 import { $t } from '@/i18n';
-import { CommunityIcon, ErrorIcon, NoContentIcon, SearchIcon } from '@/icons';
+import { ErrorIcon, NoContentIcon, SearchIcon, UsersIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { createReusableTemplate } from '@vueuse/core';
 import { NEmpty, NFlex, NIcon, NInput, NList, NListItem, NPagination, NSpin } from 'naive-ui';
@@ -35,7 +35,7 @@ function resetPagination() {
 </script>
 
 <template>
-  <icon-heading level="1" :icon="CommunityIcon">
+  <icon-heading level="1" :icon="UsersIcon">
     {{ $t('common.community') }}
     <help-button-widget help-key="communityView" />
   </icon-heading>
diff --git a/Tekst-Web/src/views/ContentsView.vue b/Tekst-Web/src/views/ContentsView.vue
index afdd6cae4..d1890e51a 100644
--- a/Tekst-Web/src/views/ContentsView.vue
+++ b/Tekst-Web/src/views/ContentsView.vue
@@ -31,15 +31,15 @@ import ContentFormItems from '@/forms/resources/contents/ContentFormItems.vue';
 import { defaultContentModels } from '@/forms/resources/contents/defaultContentModels';
 import { $t } from '@/i18n';
 import {
-  AddIcon,
-  ArrowBackIcon,
-  ArrowForwardIcon,
+  ArrowLeftIcon,
+  ArrowRightIcon,
   BookIcon,
   CompareIcon,
   EditIcon,
-  MoveDownIcon,
   NoContentIcon,
+  PasteIcon,
   PatchIcon,
+  PlusIcon,
   ResourceIcon,
   SkipNextIcon,
   SkipPreviousIcon,
@@ -467,7 +467,7 @@ whenever(ArrowRight, () => {
   <router-link :to="{ name: 'resources', params: { textSlug: state.text?.slug } }">
     <n-button text :focusable="false">
       <template #icon>
-        <n-icon :component="ArrowBackIcon" />
+        <n-icon :component="ArrowLeftIcon" />
       </template>
       {{ $t('common.backToOverview') }}
     </n-button>
@@ -499,7 +499,7 @@ whenever(ArrowRight, () => {
         @click="gotoLocation(prevLocationId)"
       >
         <template #icon>
-          <n-icon :component="ArrowBackIcon" />
+          <n-icon :component="ArrowLeftIcon" />
         </template>
       </n-button>
       <n-button
@@ -525,7 +525,7 @@ whenever(ArrowRight, () => {
         @click="gotoLocation(nextLocationId)"
       >
         <template #icon>
-          <n-icon :component="ArrowForwardIcon" />
+          <n-icon :component="ArrowRightIcon" />
         </template>
       </n-button>
     </template>
@@ -630,7 +630,7 @@ whenever(ArrowRight, () => {
             @click="copyFromComparison"
           >
             <template #icon>
-              <n-icon :component="MoveDownIcon" />
+              <n-icon :component="PasteIcon" />
             </template>
           </n-button>
           <n-button
@@ -714,7 +714,7 @@ whenever(ArrowRight, () => {
         </n-empty>
         <n-button type="primary" :disabled="loading" @click="handleAddContentClick">
           <template #icon>
-            <n-icon :component="AddIcon" />
+            <n-icon :component="PlusIcon" />
           </template>
           {{ $t('contents.btnAddContent') }}
         </n-button>
diff --git a/Tekst-Web/src/views/CorrectionsView.vue b/Tekst-Web/src/views/CorrectionsView.vue
index ca8eeba52..2068f0ca4 100644
--- a/Tekst-Web/src/views/CorrectionsView.vue
+++ b/Tekst-Web/src/views/CorrectionsView.vue
@@ -2,7 +2,7 @@
 import IconHeading from '@/components/generic/IconHeading.vue';
 import CorrectionListItem from '@/components/resource/CorrectionListItem.vue';
 import { $t } from '@/i18n';
-import { ArrowBackIcon, CorrectionNoteIcon, NoContentIcon } from '@/icons';
+import { ArrowLeftIcon, CorrectionNoteIcon, NoContentIcon } from '@/icons';
 import { useResourcesStore, useStateStore } from '@/stores';
 import { pickTranslation } from '@/utils';
 import { NButton, NEmpty, NIcon, NList } from 'naive-ui';
@@ -42,7 +42,7 @@ onBeforeMount(async () => {
   <router-link :to="{ name: 'resources', params: { textSlug: props.textSlug } }">
     <n-button text :focusable="false">
       <template #icon>
-        <n-icon :component="ArrowBackIcon" />
+        <n-icon :component="ArrowLeftIcon" />
       </template>
       {{ $t('common.backToOverview') }}
     </n-button>
diff --git a/Tekst-Web/src/views/HelpView.vue b/Tekst-Web/src/views/HelpView.vue
index 523a902b3..f8bf0535d 100644
--- a/Tekst-Web/src/views/HelpView.vue
+++ b/Tekst-Web/src/views/HelpView.vue
@@ -7,7 +7,7 @@ import { NEmpty, NIcon, NInput, NSpin } from 'naive-ui';
 import { computed, onMounted, ref, watch } from 'vue';
 
 import type { HelpText } from '@/composables/help';
-import { HelpOverviewIcon, NoContentIcon, SearchIcon } from '@/icons';
+import { FileQuestionMarkIcon, NoContentIcon, SearchIcon } from '@/icons';
 
 const { getHelpTexts } = useHelp();
 
@@ -62,7 +62,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <icon-heading level="1" :icon="HelpOverviewIcon">
+  <icon-heading level="1" :icon="FileQuestionMarkIcon">
     {{ $t('help.heading') }}
     <help-button-widget help-key="helpView" />
   </icon-heading>
diff --git a/Tekst-Web/src/views/ResourceCreateView.vue b/Tekst-Web/src/views/ResourceCreateView.vue
index 0298cac75..1be2c3775 100644
--- a/Tekst-Web/src/views/ResourceCreateView.vue
+++ b/Tekst-Web/src/views/ResourceCreateView.vue
@@ -8,7 +8,7 @@ import { useMessages } from '@/composables/messages';
 import { resourceSettingsFormRules } from '@/forms/formRules';
 import ResourceSettingsPropertiesFormItems from '@/forms/resources/config/ResourceSettingsPropertiesFormItems.vue';
 import { $t } from '@/i18n';
-import { ArrowBackIcon, ResourceIcon, WarningIcon } from '@/icons';
+import { ArrowLeftIcon, ResourceIcon, WarningIcon } from '@/icons';
 import { useAuthStore, useResourcesStore, useStateStore } from '@/stores';
 import { pickTranslation } from '@/utils';
 import {
@@ -129,7 +129,7 @@ async function handleSaveClick() {
   >
     <n-button text :focusable="false" @click="navigate">
       <template #icon>
-        <n-icon :component="ArrowBackIcon" />
+        <n-icon :component="ArrowLeftIcon" />
       </template>
       {{ $t('common.backToOverview') }}
     </n-button>
diff --git a/Tekst-Web/src/views/ResourceSettingsView.vue b/Tekst-Web/src/views/ResourceSettingsView.vue
index fca47ae15..e93a19312 100644
--- a/Tekst-Web/src/views/ResourceSettingsView.vue
+++ b/Tekst-Web/src/views/ResourceSettingsView.vue
@@ -10,7 +10,7 @@ import { useModelChanges } from '@/composables/modelChanges';
 import { resourceSettingsFormRules } from '@/forms/formRules';
 import ResourceSettingsFormItems from '@/forms/resources/config/ResourceSettingsFormItems.vue';
 import { $t } from '@/i18n';
-import { ArrowBackIcon, ResourceIcon, SettingsIcon } from '@/icons';
+import { ArrowLeftIcon, ResourceIcon, SettingsIcon } from '@/icons';
 import { useAuthStore, useResourcesStore, useStateStore } from '@/stores';
 import { pickTranslation } from '@/utils';
 import { cloneDeep } from 'lodash-es';
@@ -106,7 +106,7 @@ async function handleSaveClick() {
   >
     <n-button text :focusable="false" @click="navigate">
       <template #icon>
-        <n-icon :component="ArrowBackIcon" />
+        <n-icon :component="ArrowLeftIcon" />
       </template>
       {{ $t('common.backToOverview') }}
     </n-button>
diff --git a/Tekst-Web/src/views/ResourcesView.vue b/Tekst-Web/src/views/ResourcesView.vue
index 2f39972ca..fe5e7e1bb 100644
--- a/Tekst-Web/src/views/ResourcesView.vue
+++ b/Tekst-Web/src/views/ResourcesView.vue
@@ -19,7 +19,7 @@ import { useMessages } from '@/composables/messages';
 import { usePrompt } from '@/composables/prompt';
 import { useTasks } from '@/composables/tasks';
 import { $t } from '@/i18n';
-import { AddIcon, JumpBackIcon, NoContentIcon, ResourceIcon, SearchIcon, UserIcon } from '@/icons';
+import { NoContentIcon, PlusIcon, ResourceIcon, SearchIcon, UndoIcon, UserIcon } from '@/icons';
 import {
   useAuthStore,
   useBrowseStore,
@@ -462,7 +462,7 @@ onMounted(() => {
       <!-- Reset filters button -->
       <n-button secondary :disabled="!searchInput?.length" @click="searchInput = ''">
         <template #icon>
-          <n-icon :component="JumpBackIcon" />
+          <n-icon :component="UndoIcon" />
         </template>
         {{ $t('common.reset') }}
       </n-button>
@@ -473,7 +473,7 @@ onMounted(() => {
         @click="router.push({ name: 'resourceCreate', params: { textSlug: props.textSlug } })"
       >
         <template #icon>
-          <n-icon :component="AddIcon" />
+          <n-icon :component="PlusIcon" />
         </template>
         {{ $t('resources.new') }}
       </n-button>
diff --git a/Tekst-Web/src/views/SearchView.vue b/Tekst-Web/src/views/SearchView.vue
index c3568fc9f..280f9d10f 100644
--- a/Tekst-Web/src/views/SearchView.vue
+++ b/Tekst-Web/src/views/SearchView.vue
@@ -17,7 +17,7 @@ import SearchOccurrenceSelector from '@/forms/resources/search/SearchOccurrenceS
 import { resourceTypeSearchForms } from '@/forms/resources/search/mappings';
 import GeneralSearchSettingsForm from '@/forms/search/GeneralSearchSettingsForm.vue';
 import { $t } from '@/i18n';
-import { AddIcon, ClearIcon, LevelsIcon, NoContentIcon, ResourceIcon, SearchIcon } from '@/icons';
+import { ClearIcon, LevelsIcon, NoContentIcon, PlusIcon, ResourceIcon, SearchIcon } from '@/icons';
 import { useResourcesStore, useSearchStore, useStateStore, useThemeStore } from '@/stores';
 import { pickTranslation } from '@/utils';
 import { useMagicKeys, whenever } from '@vueuse/core';
@@ -331,7 +331,7 @@ whenever(ctrlEnter, () => {
           @click="addSearchItem(queryIndex)"
         >
           <template #icon>
-            <n-icon :component="AddIcon" />
+            <n-icon :component="PlusIcon" />
           </template>
           {{ $t('search.advancedSearch.addQuery') }}
         </n-button>
diff --git a/Tekst-Web/src/views/UserView.vue b/Tekst-Web/src/views/UserView.vue
index 1547f2b65..393faddae 100644
--- a/Tekst-Web/src/views/UserView.vue
+++ b/Tekst-Web/src/views/UserView.vue
@@ -3,7 +3,7 @@ import IconHeading from '@/components/generic/IconHeading.vue';
 import UserAvatar from '@/components/user/UserAvatar.vue';
 import UserThingHeader from '@/components/user/UserThingHeader.vue';
 import { useUser } from '@/composables/user';
-import { MessageIcon, UserIcon } from '@/icons';
+import { MessagesIcon, UserIcon } from '@/icons';
 import { useAuthStore, useStateStore, useUserMessagesStore } from '@/stores';
 import { NButton, NIcon, NSpin, NThing } from 'naive-ui';
 import { computed, watchEffect } from 'vue';
@@ -62,7 +62,7 @@ watchEffect(() => {
         @click="() => userMessages.openConversation(user?.id || '?')"
       >
         <template #icon>
-          <n-icon :component="MessageIcon" />
+          <n-icon :component="MessagesIcon" />
         </template>
         {{
           $t('account.messages.btnSendMessageToUser', {
diff --git a/Tekst-Web/src/views/VerifyView.vue b/Tekst-Web/src/views/VerifyView.vue
index c0a8da82e..19171f6d8 100644
--- a/Tekst-Web/src/views/VerifyView.vue
+++ b/Tekst-Web/src/views/VerifyView.vue
@@ -2,7 +2,7 @@
 import { POST } from '@/api';
 import { useErrors } from '@/composables/errors';
 import { $t } from '@/i18n';
-import { CheckCircleIcon, HourglassIcon, KeyOffIcon } from '@/icons';
+import { CheckCircleIcon, ErrorIcon, HourglassIcon } from '@/icons';
 import { NEmpty, NIcon } from 'naive-ui';
 import { onMounted, ref } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
@@ -36,7 +36,7 @@ onMounted(async () => {
   </n-empty>
   <n-empty v-else-if="error" :description="error">
     <template #icon>
-      <n-icon :component="KeyOffIcon" />
+      <n-icon :component="ErrorIcon" />
     </template>
   </n-empty>
   <n-empty v-else :description="$t('account.verify.success')">
diff --git a/Tekst-Web/src/views/account/AccountMessagesView.vue b/Tekst-Web/src/views/account/AccountMessagesView.vue
index 3455c0560..44ebfe454 100644
--- a/Tekst-Web/src/views/account/AccountMessagesView.vue
+++ b/Tekst-Web/src/views/account/AccountMessagesView.vue
@@ -4,7 +4,7 @@ import HelpButtonWidget from '@/components/HelpButtonWidget.vue';
 import IconHeading from '@/components/generic/IconHeading.vue';
 import MessageThreadListItem from '@/components/userMessages/MessageThreadListItem.vue';
 import { $t } from '@/i18n';
-import { MessageIcon, NoContentIcon } from '@/icons';
+import { MessagesIcon, NoContentIcon } from '@/icons';
 import { useUserMessagesStore } from '@/stores';
 import { NEmpty, NIcon, NList, NSpin } from 'naive-ui';
 import { onMounted } from 'vue';
@@ -22,7 +22,7 @@ onMounted(() => {
 </script>
 
 <template>
-  <icon-heading level="1" :icon="MessageIcon">
+  <icon-heading level="1" :icon="MessagesIcon">
     {{ $t('account.messages.heading') }}
     <help-button-widget help-key="accountMessagesView" />
   </icon-heading>
diff --git a/Tekst-Web/src/views/admin/AdminSystemMaintenanceView.vue b/Tekst-Web/src/views/admin/AdminSystemMaintenanceView.vue
index a375179d0..64c86dc2d 100644
--- a/Tekst-Web/src/views/admin/AdminSystemMaintenanceView.vue
+++ b/Tekst-Web/src/views/admin/AdminSystemMaintenanceView.vue
@@ -8,7 +8,7 @@ import ButtonShelf from '@/components/generic/ButtonShelf.vue';
 import IconHeading from '@/components/generic/IconHeading.vue';
 import { useMessages } from '@/composables/messages';
 import { useTasks } from '@/composables/tasks';
-import { DeleteIcon, EMailIcon, MaintenanceIcon, RefreshIcon, UpdateIcon } from '@/icons';
+import { DeleteIcon, MaintenanceIcon, MessageIcon, RefreshIcon, TaskIcon } from '@/icons';
 import { useStateStore, useThemeStore } from '@/stores';
 import { utcToLocalTime } from '@/utils';
 import {
@@ -180,7 +180,7 @@ onBeforeMount(() => {
             <template #start>
               <n-button type="primary" :disabled="indicesInfoLoading" @click="() => createIndex()">
                 <template #icon>
-                  <n-icon :component="UpdateIcon" />
+                  <n-icon :component="TaskIcon" />
                 </template>
                 {{ $t('admin.maintenance.indices.actionCreate') }}
               </n-button>
@@ -191,7 +191,7 @@ onBeforeMount(() => {
                 @click="() => createIndex(true)"
               >
                 <template #icon>
-                  <n-icon :component="UpdateIcon" />
+                  <n-icon :component="TaskIcon" />
                 </template>
                 {{ $t('admin.maintenance.indices.actionCreate') }}
                 ({{ $t('admin.maintenance.force') }})
@@ -286,7 +286,7 @@ onBeforeMount(() => {
                 @click="() => triggerPrecomputation()"
               >
                 <template #icon>
-                  <n-icon :component="UpdateIcon" />
+                  <n-icon :component="TaskIcon" />
                 </template>
                 {{ $t('common.run') }}
               </n-button>
@@ -298,7 +298,7 @@ onBeforeMount(() => {
                 @click="() => triggerPrecomputation(true)"
               >
                 <template #icon>
-                  <n-icon :component="UpdateIcon" />
+                  <n-icon :component="TaskIcon" />
                 </template>
                 {{ $t('common.run') }}
                 ({{ $t('admin.maintenance.force') }})
@@ -323,7 +323,7 @@ onBeforeMount(() => {
             @click="triggerInternalCleanup"
           >
             <template #icon>
-              <n-icon :component="UpdateIcon" />
+              <n-icon :component="TaskIcon" />
             </template>
             {{ $t('common.run') }}
           </n-button>
@@ -457,7 +457,7 @@ onBeforeMount(() => {
             @click="sendTestEMail"
           >
             <template #icon>
-              <n-icon :component="EMailIcon" />
+              <n-icon :component="MessageIcon" />
             </template>
             {{ $t('admin.maintenance.email.btn') }}
           </n-button>
diff --git a/Tekst-Web/src/views/admin/AdminSystemSegmentsView.vue b/Tekst-Web/src/views/admin/AdminSystemSegmentsView.vue
index 1b240c9e4..9dfa61adf 100644
--- a/Tekst-Web/src/views/admin/AdminSystemSegmentsView.vue
+++ b/Tekst-Web/src/views/admin/AdminSystemSegmentsView.vue
@@ -10,7 +10,7 @@ import { useModelChanges } from '@/composables/modelChanges';
 import { usePlatformData } from '@/composables/platformData';
 import { infoSegmentFormRules, systemSegmentFormRules } from '@/forms/formRules';
 import { $t, getLocaleProfile, renderLanguageOptionLabel } from '@/i18n';
-import { AddIcon, FileOpenIcon, InfoIcon, SegmentsIcon } from '@/icons';
+import { FileOpenIcon, InfoIcon, PlusIcon, SegmentsIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { useUrlSearchParams } from '@vueuse/core';
 import { cloneDeep } from 'lodash-es';
@@ -323,7 +323,7 @@ onMounted(() => {
       @click="() => handleChangeSegment()"
     >
       <template #icon>
-        <n-icon :component="AddIcon" />
+        <n-icon :component="PlusIcon" />
       </template>
     </n-button>
   </n-flex>
diff --git a/Tekst-Web/src/views/admin/AdminSystemUsersView.vue b/Tekst-Web/src/views/admin/AdminSystemUsersView.vue
index d7e262d49..12d04fb9a 100644
--- a/Tekst-Web/src/views/admin/AdminSystemUsersView.vue
+++ b/Tekst-Web/src/views/admin/AdminSystemUsersView.vue
@@ -74,7 +74,7 @@ function handleSetSuperuserClick(user: UserRead, setSuperuser: boolean) {
   });
 }
 
-function handleActiveClick(user: UserRead, setActive: boolean) {
+function handleToggleActive(user: UserRead, setActive: boolean) {
   dialog.warning({
     ...commonDialogOptions,
     title: $t('common.warning'),
@@ -228,7 +228,7 @@ onMounted(() => {
             :target-user="user"
             :platform-name="state.pf?.state.platformName || 'Tekst'"
             :current-user="auth.user"
-            @activate-click="handleActiveClick"
+            @toggle-active="handleToggleActive"
             @verify-click="handleVerifiedClick"
             @set-superuser-click="handleSetSuperuserClick"
             @delete-click="handleDeleteClick"
diff --git a/Tekst-Web/src/views/admin/TextView.vue b/Tekst-Web/src/views/admin/TextView.vue
index 2447dccab..5bdf428b4 100644
--- a/Tekst-Web/src/views/admin/TextView.vue
+++ b/Tekst-Web/src/views/admin/TextView.vue
@@ -8,7 +8,7 @@ import TextLevelsForm from '@/forms/texts/TextLevelsForm.vue';
 import TextLocationsForm from '@/forms/texts/TextLocationsForm.vue';
 import TextSettingsForm from '@/forms/texts/TextSettingsForm.vue';
 import { $t } from '@/i18n';
-import { AddIcon, DeleteIcon, TextsIcon } from '@/icons';
+import { DeleteIcon, PlusIcon, TextsIcon } from '@/icons';
 import { useStateStore } from '@/stores';
 import { NButton, NFlex, NIcon, NTabPane, NTabs, useDialog, type TabsInst } from 'naive-ui';
 import { computed, ref, watch } from 'vue';
@@ -89,7 +89,7 @@ watch(
       </n-button>
       <n-button type="primary" @click="router.push({ name: 'newText' })">
         <template #icon>
-          <n-icon :component="AddIcon" />
+          <n-icon :component="PlusIcon" />
         </template>
         {{ $t('admin.newText.heading') }}
       </n-button>