diff --git a/packages/ui/src/components/OsIcon/OsIcon.vue b/packages/ui/src/components/OsIcon/OsIcon.vue
index 9fe02c059..4724db2c3 100644
--- a/packages/ui/src/components/OsIcon/OsIcon.vue
+++ b/packages/ui/src/components/OsIcon/OsIcon.vue
@@ -80,15 +80,13 @@
           return h(
             'span',
             {
-              class: [
-                cn(
-                  'os-icon inline-flex items-center align-bottom shrink-0',
-                  sizeClass,
-                  '[&>svg]:h-full [&>svg]:w-auto [&>svg]:fill-current',
-                ),
+              class: cn(
+                'os-icon inline-flex items-center align-bottom shrink-0',
+                sizeClass,
+                '[&>svg]:h-full [&>svg]:w-auto [&>svg]:fill-current',
                 parentClass,
                 parentDynClass,
-              ].filter(Boolean),
+              ),
               attrs: { ...a11yAttrs, ...parentAttrs, ...attrs },
             },
             [iconVNode],
diff --git a/webapp/components/AvatarMenu/AvatarMenu.vue b/webapp/components/AvatarMenu/AvatarMenu.vue
index 13aa2a703..f6616479c 100644
--- a/webapp/components/AvatarMenu/AvatarMenu.vue
+++ b/webapp/components/AvatarMenu/AvatarMenu.vue
@@ -60,7 +60,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 import Dropdown from '~/components/Dropdown'
 import ProfileAvatar from '~/components/_new/generic/ProfileAvatar/ProfileAvatar'
@@ -138,7 +138,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     matcher(url, route) {
diff --git a/webapp/components/Button/FollowButton.vue b/webapp/components/Button/FollowButton.vue
index da223f84b..4e65fc1c1 100644
--- a/webapp/components/Button/FollowButton.vue
+++ b/webapp/components/Button/FollowButton.vue
@@ -19,7 +19,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { followUserMutation, unfollowUserMutation } from '~/graphql/User'
 
 export default {
@@ -59,7 +59,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     onHover() {
diff --git a/webapp/components/Button/JoinLeaveButton.vue b/webapp/components/Button/JoinLeaveButton.vue
index 8ebd0f1ce..5904538bd 100644
--- a/webapp/components/Button/JoinLeaveButton.vue
+++ b/webapp/components/Button/JoinLeaveButton.vue
@@ -21,7 +21,7 @@
 <script>
 import { mapMutations } from 'vuex'
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { joinGroupMutation, leaveGroupMutation } from '~/graphql/groups'
 
 export default {
@@ -84,7 +84,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/Chat/AddChatRoomByUserSearch.vue b/webapp/components/Chat/AddChatRoomByUserSearch.vue
index e59587852..8e606f13b 100644
--- a/webapp/components/Chat/AddChatRoomByUserSearch.vue
+++ b/webapp/components/Chat/AddChatRoomByUserSearch.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import SelectUserSearch from '~/components/generic/SelectUserSearch/SelectUserSearch'
 
 export default {
@@ -48,7 +48,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     selectUser(user) {
diff --git a/webapp/components/Chat/Chat.vue b/webapp/components/Chat/Chat.vue
index fceaa7f1e..b8b8eb60b 100644
--- a/webapp/components/Chat/Chat.vue
+++ b/webapp/components/Chat/Chat.vue
@@ -106,7 +106,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { roomQuery, createRoom, unreadRoomsQuery } from '~/graphql/Rooms'
 import {
   messageQuery,
@@ -201,7 +201,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   mounted() {
     if (this.singleRoom) {
diff --git a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
index 2a53f28cf..c2cce6318 100644
--- a/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
+++ b/webapp/components/ChatNotificationMenu/ChatNotificationMenu.vue
@@ -20,7 +20,7 @@
 
 <script>
 import { OsButton } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import { unreadRoomsQuery, roomCountUpdated } from '~/graphql/Rooms'
@@ -38,7 +38,7 @@ export default {
     }),
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/CommentCard/CommentCard.vue b/webapp/components/CommentCard/CommentCard.vue
index 6698f16d7..aaa64dba4 100644
--- a/webapp/components/CommentCard/CommentCard.vue
+++ b/webapp/components/CommentCard/CommentCard.vue
@@ -75,7 +75,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 import { COMMENT_MAX_UNTRUNCATED_LENGTH, COMMENT_TRUNCATE_TO_LENGTH } from '~/constants/comment'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
@@ -178,7 +178,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     checkAnchor(anchor) {
diff --git a/webapp/components/CommentList/CommentList.vue b/webapp/components/CommentList/CommentList.vue
index 4b5de6f7e..86b67315e 100644
--- a/webapp/components/CommentList/CommentList.vue
+++ b/webapp/components/CommentList/CommentList.vue
@@ -19,7 +19,7 @@
   </div>
 </template>
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 import CommentCard from '~/components/CommentCard/CommentCard'
 import scrollToAnchor from '~/mixins/scrollToAnchor'
@@ -47,7 +47,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     reply(message) {
diff --git a/webapp/components/ContentMenu/ContentMenu.vue b/webapp/components/ContentMenu/ContentMenu.vue
index 719ba941f..278b5b6ca 100644
--- a/webapp/components/ContentMenu/ContentMenu.vue
+++ b/webapp/components/ContentMenu/ContentMenu.vue
@@ -38,7 +38,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 import PinnedPostsMixin from '~/mixins/pinnedPosts'
 
@@ -70,7 +70,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   computed: {
     routes() {
@@ -102,7 +102,7 @@ export default {
               callback: () => {
                 this.$emit('pinPost', this.resource)
               },
-              icon: this.icons.link,
+              icon: this.icons.mapPin,
             })
           } else {
             if (this.resource.pinnedBy) {
@@ -123,7 +123,7 @@ export default {
             callback: () => {
               this.$emit('pushPost', this.resource)
             },
-            icon: this.icons.link,
+            icon: this.icons.arrowUp,
           })
         }
 
@@ -270,7 +270,7 @@ export default {
           callback: () => {
             this.$emit(this.resource.groupPinned ? 'unpinGroupPost' : 'pinGroupPost', this.resource)
           },
-          icon: this.resource.groupPinned ? this.icons.unlink : this.icons.link,
+          icon: this.resource.groupPinned ? this.icons.unlink : this.icons.mapPin,
         })
       }
 
diff --git a/webapp/components/ContentMenu/GroupContentMenu.vue b/webapp/components/ContentMenu/GroupContentMenu.vue
index 69999e342..2cd30bfef 100644
--- a/webapp/components/ContentMenu/GroupContentMenu.vue
+++ b/webapp/components/ContentMenu/GroupContentMenu.vue
@@ -39,7 +39,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 
 export default {
@@ -110,7 +110,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     openItem(route, toggleMenu) {
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index 34e32bb4e..ba8d80f0d 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -203,7 +203,7 @@
 </template>
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import gql from 'graphql-tag'
 import { mapGetters } from 'vuex'
 import Editor from '~/components/Editor/Editor'
@@ -383,7 +383,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     notBeforeToday(date) {
diff --git a/webapp/components/DateTimeRange/DateTimeRange.vue b/webapp/components/DateTimeRange/DateTimeRange.vue
index 5cd911e9a..db73e282d 100644
--- a/webapp/components/DateTimeRange/DateTimeRange.vue
+++ b/webapp/components/DateTimeRange/DateTimeRange.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { format, isSameDay, isSameYear } from 'date-fns'
 
 export default {
@@ -88,7 +88,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/DeleteData/DeleteData.vue b/webapp/components/DeleteData/DeleteData.vue
index fb6c83515..1a68d50dc 100644
--- a/webapp/components/DeleteData/DeleteData.vue
+++ b/webapp/components/DeleteData/DeleteData.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapActions, mapGetters } from 'vuex'
 import gql from 'graphql-tag'
 import { currentUserCountQuery } from '~/graphql/User'
@@ -86,7 +86,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   computed: {
     ...mapGetters({
diff --git a/webapp/components/DropdownFilter/DropdownFilter.vue b/webapp/components/DropdownFilter/DropdownFilter.vue
index b2861f5c0..b70ed8291 100644
--- a/webapp/components/DropdownFilter/DropdownFilter.vue
+++ b/webapp/components/DropdownFilter/DropdownFilter.vue
@@ -31,7 +31,7 @@
 </template>
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 
 export default {
@@ -40,7 +40,7 @@ export default {
     OsIcon,
   },
   setup() {
-    return { icons: ocelotIcons }
+    return { icons: iconRegistry }
   },
   props: {
     selected: { type: String, default: '' },
diff --git a/webapp/components/Editor/MenuBar.vue b/webapp/components/Editor/MenuBar.vue
index d906add93..4901eb369 100644
--- a/webapp/components/Editor/MenuBar.vue
+++ b/webapp/components/Editor/MenuBar.vue
@@ -147,7 +147,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { EditorMenuBar } from 'tiptap'
 import MenuLegend from './MenuLegend.vue'
 
@@ -163,7 +163,7 @@ export default {
     toggleLinkInput: { type: Function, required: true },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/Editor/MenuLegend.vue b/webapp/components/Editor/MenuLegend.vue
index e7561aace..2ace3155b 100644
--- a/webapp/components/Editor/MenuLegend.vue
+++ b/webapp/components/Editor/MenuLegend.vue
@@ -43,7 +43,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 
 export default {
@@ -73,7 +73,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/Embed/EmbedComponent.vue b/webapp/components/Embed/EmbedComponent.vue
index 38e7b4a26..c26728741 100644
--- a/webapp/components/Embed/EmbedComponent.vue
+++ b/webapp/components/Embed/EmbedComponent.vue
@@ -65,7 +65,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import { updateUserMutation } from '~/graphql/User.js'
 
@@ -96,7 +96,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
     if (this.currentUser.allowEmbedIframes) {
       this.showEmbed = this.currentUser.allowEmbedIframes
       this.checkedAlwaysAllowEmbeds = this.currentUser.allowEmbedIframes
diff --git a/webapp/components/Empty/CallToAction/CtaUnblockAuthor.vue b/webapp/components/Empty/CallToAction/CtaUnblockAuthor.vue
index bf02f3915..57f47d7b6 100644
--- a/webapp/components/Empty/CallToAction/CtaUnblockAuthor.vue
+++ b/webapp/components/Empty/CallToAction/CtaUnblockAuthor.vue
@@ -20,7 +20,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   name: 'CtaUnblockAuthor',
@@ -39,7 +39,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/FilterMenu/EventsByFilter.vue b/webapp/components/FilterMenu/EventsByFilter.vue
index 033a9657b..669d8f368 100644
--- a/webapp/components/FilterMenu/EventsByFilter.vue
+++ b/webapp/components/FilterMenu/EventsByFilter.vue
@@ -37,7 +37,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 
@@ -61,7 +61,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue
index 26f1ec93f..67f7b0dc9 100644
--- a/webapp/components/FilterMenu/FilterMenu.vue
+++ b/webapp/components/FilterMenu/FilterMenu.vue
@@ -21,7 +21,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 import { mapGetters } from 'vuex'
 import FilterMenuComponent from './FilterMenuComponent'
@@ -43,7 +43,7 @@ export default {
     }),
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/FilterMenu/FilterMenuComponent.vue b/webapp/components/FilterMenu/FilterMenuComponent.vue
index db2909d49..81261aa0f 100644
--- a/webapp/components/FilterMenu/FilterMenuComponent.vue
+++ b/webapp/components/FilterMenu/FilterMenuComponent.vue
@@ -28,7 +28,7 @@
 </template>
 
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 import EventsByFilter from './EventsByFilter'
 import PostTypeFilter from './PostTypeFilter'
@@ -59,7 +59,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     saveCategories() {
diff --git a/webapp/components/FilterMenu/FollowingFilter.vue b/webapp/components/FilterMenu/FollowingFilter.vue
index 0abb9b335..a6efc6313 100644
--- a/webapp/components/FilterMenu/FollowingFilter.vue
+++ b/webapp/components/FilterMenu/FollowingFilter.vue
@@ -56,7 +56,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 
@@ -75,7 +75,7 @@ export default {
     }),
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/FilterMenu/HeaderButton.vue b/webapp/components/FilterMenu/HeaderButton.vue
index 413b8377a..4864f6095 100644
--- a/webapp/components/FilterMenu/HeaderButton.vue
+++ b/webapp/components/FilterMenu/HeaderButton.vue
@@ -21,7 +21,7 @@
 </template>
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   name: 'HeaderButton',
@@ -45,7 +45,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/FilterMenu/OrderByFilter.vue b/webapp/components/FilterMenu/OrderByFilter.vue
index c5e013437..7903599e8 100644
--- a/webapp/components/FilterMenu/OrderByFilter.vue
+++ b/webapp/components/FilterMenu/OrderByFilter.vue
@@ -37,7 +37,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 
@@ -69,7 +69,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 229d1488b..205432dc3 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -39,7 +39,7 @@
 </template>
 
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import FilterMenuSection from '~/components/FilterMenu/FilterMenuSection'
 import LabeledButton from '~/components/_new/generic/LabeledButton/LabeledButton'
@@ -56,7 +56,7 @@ export default {
     }),
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/Group/GroupForm.vue b/webapp/components/Group/GroupForm.vue
index d05212218..d48d18dce 100644
--- a/webapp/components/Group/GroupForm.vue
+++ b/webapp/components/Group/GroupForm.vue
@@ -152,7 +152,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import CategoriesSelect from '~/components/CategoriesSelect/CategoriesSelect'
 import { CATEGORIES_MIN, CATEGORIES_MAX } from '~/constants/categories.js'
 import {
@@ -284,7 +284,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     checkFormError(error) {
diff --git a/webapp/components/Group/GroupTeaser.vue b/webapp/components/Group/GroupTeaser.vue
index bda8edc52..7f98ad3e3 100644
--- a/webapp/components/Group/GroupTeaser.vue
+++ b/webapp/components/Group/GroupTeaser.vue
@@ -80,7 +80,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Category from '~/components/Category'
 import GroupContentMenu from '~/components/ContentMenu/GroupContentMenu'
 import GetCategories from '~/mixins/getCategoriesMixin.js'
@@ -104,7 +104,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   computed: {
     descriptionExcerpt() {
diff --git a/webapp/components/HashtagsFilter/HashtagsFilter.vue b/webapp/components/HashtagsFilter/HashtagsFilter.vue
index 3127c6ee4..05dd59840 100644
--- a/webapp/components/HashtagsFilter/HashtagsFilter.vue
+++ b/webapp/components/HashtagsFilter/HashtagsFilter.vue
@@ -19,7 +19,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   components: { OsButton, OsIcon },
@@ -30,7 +30,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     clearSearch() {
diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index af0b9e5b7..dbd27ef32 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -343,7 +343,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 import isEmpty from 'lodash/isEmpty'
 import { SHOW_GROUP_BUTTON_IN_HEADER } from '~/constants/groups.js'
@@ -409,7 +409,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     handleScroll() {
diff --git a/webapp/components/InviteButton/InviteButton.vue b/webapp/components/InviteButton/InviteButton.vue
index 2a7f07be2..2a6d34b91 100644
--- a/webapp/components/InviteButton/InviteButton.vue
+++ b/webapp/components/InviteButton/InviteButton.vue
@@ -37,7 +37,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 import { mapGetters, mapMutations } from 'vuex'
 import InvitationList from '~/components/_new/features/Invitations/InvitationList.vue'
@@ -62,7 +62,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/LocaleSwitch/LocaleSwitch.vue b/webapp/components/LocaleSwitch/LocaleSwitch.vue
index 85350d106..af4270dd3 100644
--- a/webapp/components/LocaleSwitch/LocaleSwitch.vue
+++ b/webapp/components/LocaleSwitch/LocaleSwitch.vue
@@ -35,7 +35,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import gql from 'graphql-tag'
 import Dropdown from '~/components/Dropdown'
 import find from 'lodash/find'
@@ -75,7 +75,7 @@ export default {
     }),
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     changeLanguage(locale, toggleMenu) {
diff --git a/webapp/components/LocationInfo/LocationInfo.vue b/webapp/components/LocationInfo/LocationInfo.vue
index 12ea60098..b93168783 100644
--- a/webapp/components/LocationInfo/LocationInfo.vue
+++ b/webapp/components/LocationInfo/LocationInfo.vue
@@ -12,7 +12,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   name: 'LocationInfo',
@@ -32,7 +32,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/LocationTeaser/LocationTeaser.vue b/webapp/components/LocationTeaser/LocationTeaser.vue
index a6e64e60a..b72e5b2c2 100644
--- a/webapp/components/LocationTeaser/LocationTeaser.vue
+++ b/webapp/components/LocationTeaser/LocationTeaser.vue
@@ -14,7 +14,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   name: 'LocationTeaser',
@@ -45,7 +45,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/LoginButton/LoginButton.vue b/webapp/components/LoginButton/LoginButton.vue
index 5c6c7451d..d7039c4f0 100644
--- a/webapp/components/LoginButton/LoginButton.vue
+++ b/webapp/components/LoginButton/LoginButton.vue
@@ -27,7 +27,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Dropdown from '~/components/Dropdown'
 
 export default {
@@ -40,7 +40,7 @@ export default {
     placement: { type: String, default: 'top-end' },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index 32065aa2c..3bbff1454 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -67,7 +67,7 @@ import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
 import ShowPassword from '../ShowPassword/ShowPassword.vue'
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 
 export default {
@@ -103,7 +103,7 @@ export default {
     }),
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/Modal/DeleteUserModal.vue b/webapp/components/Modal/DeleteUserModal.vue
index 5c300967b..955267c53 100644
--- a/webapp/components/Modal/DeleteUserModal.vue
+++ b/webapp/components/Modal/DeleteUserModal.vue
@@ -56,7 +56,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import gql from 'graphql-tag'
 import { mapMutations } from 'vuex'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
@@ -83,7 +83,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   computed: {
     title() {
diff --git a/webapp/components/Modal/DisableModal.vue b/webapp/components/Modal/DisableModal.vue
index 6f13f8d8b..74f8ea0fc 100644
--- a/webapp/components/Modal/DisableModal.vue
+++ b/webapp/components/Modal/DisableModal.vue
@@ -23,7 +23,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import gql from 'graphql-tag'
 
 export default {
@@ -51,7 +51,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     async cancel() {
diff --git a/webapp/components/Modal/ReportModal.vue b/webapp/components/Modal/ReportModal.vue
index 628d5570e..3df941fb2 100644
--- a/webapp/components/Modal/ReportModal.vue
+++ b/webapp/components/Modal/ReportModal.vue
@@ -55,7 +55,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import { reportMutation } from '~/graphql/Moderation.js'
 import { valuesReasonCategoryOptions } from '~/constants/modals.js'
@@ -101,7 +101,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
     this.form.reasonCategoryOptions = valuesReasonCategoryOptions.map((reasonCategory) => {
       return {
         label: this.$t('report.reason.category.options.' + reasonCategory),
diff --git a/webapp/components/NotificationMenu/NotificationMenu.vue b/webapp/components/NotificationMenu/NotificationMenu.vue
index d73d2e490..94fef26d2 100644
--- a/webapp/components/NotificationMenu/NotificationMenu.vue
+++ b/webapp/components/NotificationMenu/NotificationMenu.vue
@@ -78,7 +78,7 @@
 import { mapGetters } from 'vuex'
 import unionBy from 'lodash/unionBy'
 import { OsButton } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import {
   notificationQuery,
   markAsReadMutation,
@@ -107,7 +107,7 @@ export default {
     noMenu: { type: Boolean, default: false },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   mounted() {
     window.addEventListener('resize', this.handleResize)
diff --git a/webapp/components/NotificationsTable/NotificationsTable.vue b/webapp/components/NotificationsTable/NotificationsTable.vue
index e1f0cc01d..fc1430d8b 100644
--- a/webapp/components/NotificationsTable/NotificationsTable.vue
+++ b/webapp/components/NotificationsTable/NotificationsTable.vue
@@ -95,7 +95,7 @@
 </template>
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
 import HcEmpty from '~/components/Empty/Empty'
 import BaseCard from '../_new/generic/BaseCard/BaseCard.vue'
@@ -130,7 +130,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     isComment(notificationSource) {
diff --git a/webapp/components/ObserveButton.vue b/webapp/components/ObserveButton.vue
index 9c8cd744d..55c98143e 100644
--- a/webapp/components/ObserveButton.vue
+++ b/webapp/components/ObserveButton.vue
@@ -11,7 +11,7 @@
 </template>
 
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import ActionButton from '~/components/ActionButton.vue'
 
 export default {
@@ -24,7 +24,7 @@ export default {
     isObserved: { type: Boolean, default: false },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     toggle() {
diff --git a/webapp/components/PostTeaser/PostTeaser.vue b/webapp/components/PostTeaser/PostTeaser.vue
index c530a483d..738f2a591 100644
--- a/webapp/components/PostTeaser/PostTeaser.vue
+++ b/webapp/components/PostTeaser/PostTeaser.vue
@@ -123,6 +123,16 @@
       <client-only>
         <div class="date-row" v-if="post.createdAt">
           <span class="text">
+            <os-icon
+              v-if="post.sortDate && post.sortDate !== post.createdAt"
+              :icon="icons.arrowUp"
+              size="sm"
+              v-tooltip="{
+                content: $t('post.menu.pushed'),
+                placement: 'bottom-end',
+              }"
+              class="pushed-icon"
+            />
             <date-time :date-time="post.createdAt" />
             <slot name="dateTime"></slot>
           </span>
@@ -133,7 +143,8 @@
 </template>
 
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { OsIcon } from '@ocelot-social/ui'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Category from '~/components/Category'
 import ContentMenu from '~/components/ContentMenu/ContentMenu'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
@@ -154,6 +165,7 @@ export default {
   components: {
     Category,
     ContentMenu,
+    OsIcon,
     CounterIcon,
     DateTimeRange,
     HcRibbon,
@@ -220,7 +232,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     async deletePostCallback() {
@@ -362,6 +374,11 @@ export default {
       color: $text-color-soft;
       font-size: $font-size-small;
 
+      > .pushed-icon {
+        margin-right: $space-xx-small;
+        vertical-align: middle !important; // Override OsIcon's Tailwind align-bottom
+      }
+
       > .ds-text {
         display: inline;
       }
diff --git a/webapp/components/Registration/RegistrationSlideCreate.vue b/webapp/components/Registration/RegistrationSlideCreate.vue
index e398f71f0..c5f0da4c0 100644
--- a/webapp/components/Registration/RegistrationSlideCreate.vue
+++ b/webapp/components/Registration/RegistrationSlideCreate.vue
@@ -165,7 +165,7 @@ import PasswordStrength from '~/components/Password/Strength'
 import EmailDisplayAndVerify from './EmailDisplayAndVerify'
 import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import ShowPassword from '../ShowPassword/ShowPassword.vue'
 import LocationSelect from '~/components/Select/LocationSelect'
 
@@ -296,7 +296,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     buildName(data) {
diff --git a/webapp/components/ReleaseModal/ReleaseModal.vue b/webapp/components/ReleaseModal/ReleaseModal.vue
index 749ccfca3..0b2d3d0e0 100644
--- a/webapp/components/ReleaseModal/ReleaseModal.vue
+++ b/webapp/components/ReleaseModal/ReleaseModal.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import gql from 'graphql-tag'
 
 export default {
@@ -53,7 +53,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     cancel() {
diff --git a/webapp/components/Select/LocationSelect.vue b/webapp/components/Select/LocationSelect.vue
index f863a65fa..36f1e9542 100644
--- a/webapp/components/Select/LocationSelect.vue
+++ b/webapp/components/Select/LocationSelect.vue
@@ -30,7 +30,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { queryLocations } from '~/graphql/location'
 
 let timeout
@@ -54,7 +54,7 @@ export default {
     },
   },
   async created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
     const result = await this.requestGeoData(this.locationName)
     this.$nextTick(() => {
       this.currentValue = result || this.locationName
diff --git a/webapp/components/ShoutButton.vue b/webapp/components/ShoutButton.vue
index 2877a777c..068c9f432 100644
--- a/webapp/components/ShoutButton.vue
+++ b/webapp/components/ShoutButton.vue
@@ -12,7 +12,7 @@
 
 <script>
 import gql from 'graphql-tag'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 import ActionButton from '~/components/ActionButton.vue'
 
@@ -43,7 +43,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     toggle() {
diff --git a/webapp/components/Uploader/AvatarUploader.vue b/webapp/components/Uploader/AvatarUploader.vue
index c6c07bef9..6d1b9abbe 100644
--- a/webapp/components/Uploader/AvatarUploader.vue
+++ b/webapp/components/Uploader/AvatarUploader.vue
@@ -21,7 +21,7 @@
 </template>
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import vueDropzone from 'nuxt-dropzone'
 
 export default {
@@ -60,7 +60,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     template() {
diff --git a/webapp/components/Uploader/ImageUploader.vue b/webapp/components/Uploader/ImageUploader.vue
index 5ba591bed..2a6241ea0 100644
--- a/webapp/components/Uploader/ImageUploader.vue
+++ b/webapp/components/Uploader/ImageUploader.vue
@@ -59,7 +59,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import Cropper from 'cropperjs'
 import VueDropzone from 'nuxt-dropzone'
 import LoadingSpinner from '~/components/_new/generic/LoadingSpinner/LoadingSpinner'
@@ -96,7 +96,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     onUnSupportedFormat(message) {
diff --git a/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue b/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue
index 426b120c2..51f421fbb 100644
--- a/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue
+++ b/webapp/components/UserTeaser/UserTeaserNonAnonymous.vue
@@ -60,7 +60,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 
 import { userTeaserQuery } from '~/graphql/User.js'
@@ -132,7 +132,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     async loadPopover(openMenu) {
diff --git a/webapp/components/_new/features/Invitations/CreateInvitation.vue b/webapp/components/_new/features/Invitations/CreateInvitation.vue
index 59766fee4..b4986ca05 100644
--- a/webapp/components/_new/features/Invitations/CreateInvitation.vue
+++ b/webapp/components/_new/features/Invitations/CreateInvitation.vue
@@ -27,7 +27,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   name: 'CreateInvitation',
@@ -44,7 +44,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     generateInviteCode() {
diff --git a/webapp/components/_new/features/Invitations/Invitation.vue b/webapp/components/_new/features/Invitations/Invitation.vue
index 2399e5c3c..38c874a7e 100644
--- a/webapp/components/_new/features/Invitations/Invitation.vue
+++ b/webapp/components/_new/features/Invitations/Invitation.vue
@@ -47,7 +47,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapMutations } from 'vuex'
 
 export default {
@@ -80,7 +80,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
     this.canCopy = !!navigator.clipboard
   },
   methods: {
diff --git a/webapp/components/_new/features/MySomethingList/MySomethingList.vue b/webapp/components/_new/features/MySomethingList/MySomethingList.vue
index 1b9a472da..f9353ae79 100644
--- a/webapp/components/_new/features/MySomethingList/MySomethingList.vue
+++ b/webapp/components/_new/features/MySomethingList/MySomethingList.vue
@@ -83,7 +83,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapMutations } from 'vuex'
 
 export default {
@@ -135,7 +135,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js b/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js
index 39e26c3b6..ab51a7c4e 100644
--- a/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js
+++ b/webapp/components/_new/generic/LabeledButton/LabeledButton.story.js
@@ -1,5 +1,5 @@
 import { storiesOf } from '@storybook/vue'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import helpers from '~/storybook/helpers'
 import LabeledButton from './LabeledButton.vue'
 
@@ -11,7 +11,7 @@ storiesOf('Generic/LabeledButton', module)
     components: { LabeledButton },
     data: () => ({
       filled: false,
-      icons: ocelotIcons,
+      icons: iconRegistry,
     }),
     template: `
       <labeled-button
diff --git a/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue b/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
index d1647babf..4347916ba 100644
--- a/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
+++ b/webapp/components/_new/generic/PaginationButtons/PaginationButtons.vue
@@ -35,7 +35,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   components: {
@@ -73,7 +73,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue b/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue
index 27f6fa8b4..9618a1006 100644
--- a/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue
+++ b/webapp/components/_new/generic/ProfileAvatar/ProfileAvatar.vue
@@ -17,7 +17,7 @@
 
 <script>
 import { OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import ResponsiveImage from '~/components/ResponsiveImage/ResponsiveImage.vue'
 
 export default {
@@ -58,7 +58,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/features/ReportList/ReportList.vue b/webapp/components/features/ReportList/ReportList.vue
index d56a0744f..55e09256f 100644
--- a/webapp/components/features/ReportList/ReportList.vue
+++ b/webapp/components/features/ReportList/ReportList.vue
@@ -12,7 +12,7 @@
 </template>
 
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapMutations } from 'vuex'
 import DropdownFilter from '~/components/DropdownFilter/DropdownFilter'
 import ReportsTable from '~/components/features/ReportsTable/ReportsTable'
@@ -112,7 +112,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/components/features/ReportRow/ReportRow.vue b/webapp/components/features/ReportRow/ReportRow.vue
index bd1367514..1adcbf3de 100644
--- a/webapp/components/features/ReportRow/ReportRow.vue
+++ b/webapp/components/features/ReportRow/ReportRow.vue
@@ -86,7 +86,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import FiledReportsTable from '~/components/features/FiledReportsTable/FiledReportsTable'
 import UserTeaser from '~/components/UserTeaser/UserTeaser'
 
@@ -110,7 +110,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   computed: {
     isPost() {
diff --git a/webapp/components/generic/SearchPost/SearchPost.vue b/webapp/components/generic/SearchPost/SearchPost.vue
index a235a1eb6..bb7152644 100644
--- a/webapp/components/generic/SearchPost/SearchPost.vue
+++ b/webapp/components/generic/SearchPost/SearchPost.vue
@@ -14,7 +14,7 @@
 </template>
 
 <script>
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import CounterIcon from '~/components/_new/generic/CounterIcon/CounterIcon'
 
 export default {
@@ -26,7 +26,7 @@ export default {
     option: { type: Object, required: true },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
 }
 </script>
diff --git a/webapp/components/generic/SearchableInput/SearchableInput.vue b/webapp/components/generic/SearchableInput/SearchableInput.vue
index 86d77aacb..3d6d4908e 100644
--- a/webapp/components/generic/SearchableInput/SearchableInput.vue
+++ b/webapp/components/generic/SearchableInput/SearchableInput.vue
@@ -67,7 +67,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { isEmpty } from 'lodash'
 import SearchHeading from '~/components/generic/SearchHeading/SearchHeading.vue'
 import SearchPost from '~/components/generic/SearchPost/SearchPost.vue'
@@ -99,7 +99,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   computed: {
     emptyText() {
diff --git a/webapp/components/utils/PostHelpers.js b/webapp/components/utils/PostHelpers.js
index a23518464..13ece62b1 100644
--- a/webapp/components/utils/PostHelpers.js
+++ b/webapp/components/utils/PostHelpers.js
@@ -1,4 +1,4 @@
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import PostMutations from '~/graphql/PostMutations.js'
 
 export function postMenuModalsData(truncatedPostName, confirmCallback, cancelCallback = () => {}) {
@@ -12,12 +12,12 @@ export function postMenuModalsData(truncatedPostName, confirmCallback, cancelCal
       buttons: {
         confirm: {
           danger: true,
-          icon: ocelotIcons.trash,
+          icon: iconRegistry.trash,
           textIdent: 'delete.submit',
           callback: confirmCallback,
         },
         cancel: {
-          icon: ocelotIcons.close,
+          icon: iconRegistry.close,
           textIdent: 'delete.cancel',
           callback: cancelCallback,
         },
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 708f71429..34781fb2c 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -884,6 +884,7 @@
       "pin": "Beitrag anheften",
       "pinnedSuccessfully": "Beitrag erfolgreich angeheftet!",
       "push": "Beitrag hochschieben",
+      "pushed": "Nach oben geschoben",
       "pushedSuccessfully": "Beitrag erfolgreich nach oben geschoben!",
       "unobserve": "Beitrag nicht mehr beobachten",
       "unobservedSuccessfully": "Du beobachtest diesen Beitrag nicht mehr!",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e1b97e7fd..51838c649 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -884,6 +884,7 @@
       "pin": "Pin post",
       "pinnedSuccessfully": "Post pinned successfully!",
       "push": "Push to top",
+      "pushed": "Pushed to top",
       "pushedSuccessfully": "Post pushed to top successfully!",
       "unobserve": "Stop to observe post",
       "unobservedSuccessfully": "You are no longer observing this post!",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index bc9565d0d..a6a06eb76 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -884,6 +884,7 @@
       "pin": "Anclar contribución",
       "pinnedSuccessfully": "¡Contribución anclado con éxito!",
       "push": null,
+      "pushed": "Subido arriba",
       "pushedSuccessfully": null,
       "unobserve": "Dejar de observar contribución",
       "unobservedSuccessfully": null,
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index 8c1d09197..cf3b68213 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -884,6 +884,7 @@
       "pin": "Épingler le Post",
       "pinnedSuccessfully": "Poste épinglé avec succès!",
       "push": null,
+      "pushed": "Remonté en haut",
       "pushedSuccessfully": null,
       "unobserve": "Ne plus observer le Post",
       "unobservedSuccessfully": null,
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index f49779e4b..2438f0370 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -884,6 +884,7 @@
       "pin": null,
       "pinnedSuccessfully": null,
       "push": null,
+      "pushed": "Spostato in alto",
       "pushedSuccessfully": null,
       "unobserve": null,
       "unobservedSuccessfully": null,
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index c848bcde2..61cb8e203 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -884,6 +884,7 @@
       "pin": null,
       "pinnedSuccessfully": null,
       "push": null,
+      "pushed": "Naar boven geduwd",
       "pushedSuccessfully": null,
       "unobserve": null,
       "unobservedSuccessfully": null,
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index 00f253399..41e35cdba 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -884,6 +884,7 @@
       "pin": null,
       "pinnedSuccessfully": null,
       "push": null,
+      "pushed": "Przesunięto na górę",
       "pushedSuccessfully": null,
       "unobserve": null,
       "unobservedSuccessfully": null,
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 32bfb0862..6d6a05fe8 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -884,6 +884,7 @@
       "pin": "Fixar publicação",
       "pinnedSuccessfully": "Publicação fixada com sucesso!",
       "push": null,
+      "pushed": "Movido para o topo",
       "pushedSuccessfully": null,
       "unobserve": "Deixar de observar publicação",
       "unobservedSuccessfully": null,
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index f2ea01044..d9c50e9f7 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -884,6 +884,7 @@
       "pin": "Закрепить пост",
       "pinnedSuccessfully": "Пост больше не закреплен!",
       "push": null,
+      "pushed": "Поднято наверх",
       "pushedSuccessfully": null,
       "unobserve": null,
       "unobservedSuccessfully": null,
diff --git a/webapp/pages/admin/users/index.vue b/webapp/pages/admin/users/index.vue
index 8a2444073..caa53284a 100644
--- a/webapp/pages/admin/users/index.vue
+++ b/webapp/pages/admin/users/index.vue
@@ -98,7 +98,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 import { isEmail } from 'validator'
 import PaginationButtons from '~/components/_new/generic/PaginationButtons/PaginationButtons'
@@ -112,7 +112,7 @@ export default {
     PaginationButtons,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   data() {
     const pageSize = 15
diff --git a/webapp/pages/groups/_id/_slug.vue b/webapp/pages/groups/_id/_slug.vue
index b76309a57..9a48b3f33 100644
--- a/webapp/pages/groups/_id/_slug.vue
+++ b/webapp/pages/groups/_id/_slug.vue
@@ -289,7 +289,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import uniqBy from 'lodash/uniqBy'
 import { profilePagePosts } from '~/graphql/PostQuery'
 import { updateGroupMutation, groupQuery, groupMembersQuery } from '~/graphql/groups'
@@ -432,7 +432,7 @@ export default {
     // },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   watch: {
     isAllowedSeeingGroupMembers(to, _from) {
diff --git a/webapp/pages/groups/index.vue b/webapp/pages/groups/index.vue
index fcbf3207e..6b5f0fcb3 100644
--- a/webapp/pages/groups/index.vue
+++ b/webapp/pages/groups/index.vue
@@ -60,7 +60,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import GroupList from '~/components/Group/GroupList'
 import { groupQuery, groupCountQuery } from '~/graphql/groups.js'
 import TabNavigation from '~/components/_new/generic/TabNavigation/TabNavigation'
@@ -83,7 +83,7 @@ export default {
     PaginationButtons,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   data() {
     return {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 5c741e64f..fe9459858 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -152,7 +152,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import postListActions from '~/mixins/postListActions'
 import mobile from '~/mixins/mobile'
 import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
@@ -238,7 +238,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   mounted() {
     if (this.categoryId) {
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 7251185c3..804297505 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -182,7 +182,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import ContentViewer from '~/components/Editor/ContentViewer'
 import CommentForm from '~/components/CommentForm/CommentForm'
 import CommentList from '~/components/CommentList/CommentList'
@@ -238,7 +238,7 @@ export default {
   },
   mixins: [GetCategories, postListActions, SortCategories],
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   head() {
     return {
diff --git a/webapp/pages/profile/_id/_slug.vue b/webapp/pages/profile/_id/_slug.vue
index 4e43233c4..60ac1a011 100644
--- a/webapp/pages/profile/_id/_slug.vue
+++ b/webapp/pages/profile/_id/_slug.vue
@@ -211,7 +211,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import uniqBy from 'lodash/uniqBy'
 import { mapGetters, mapMutations } from 'vuex'
 import postListActions from '~/mixins/postListActions'
@@ -263,7 +263,7 @@ export default {
     LocationInfo,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   mixins: [postListActions],
   transition: {
diff --git a/webapp/pages/settings/blocked-users.vue b/webapp/pages/settings/blocked-users.vue
index ae33339bc..a238db0e9 100644
--- a/webapp/pages/settings/blocked-users.vue
+++ b/webapp/pages/settings/blocked-users.vue
@@ -84,7 +84,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { blockedUsers, unblockUser } from '~/graphql/settings/BlockedUsers'
 import ProfileAvatar from '~/components/_new/generic/ProfileAvatar/ProfileAvatar'
 import scrollToContent from './scroll-to-content.js'
@@ -97,7 +97,7 @@ export default {
     ProfileAvatar,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   data() {
     return {
diff --git a/webapp/pages/settings/data-download.vue b/webapp/pages/settings/data-download.vue
index 5e67f138d..20f2d99cc 100644
--- a/webapp/pages/settings/data-download.vue
+++ b/webapp/pages/settings/data-download.vue
@@ -23,7 +23,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters } from 'vuex'
 import { userDataQuery } from '~/graphql/User'
 import isEmpty from 'lodash/isEmpty'
@@ -36,7 +36,7 @@ export default {
     OsIcon,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   data() {
     return {
diff --git a/webapp/pages/settings/index.vue b/webapp/pages/settings/index.vue
index b8465e5ec..3ca3e4461 100644
--- a/webapp/pages/settings/index.vue
+++ b/webapp/pages/settings/index.vue
@@ -46,7 +46,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import UniqueSlugForm from '~/components/utils/UniqueSlugForm'
 import LocationSelect from '~/components/Select/LocationSelect'
@@ -75,7 +75,7 @@ export default {
     }
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   mounted() {
     this.formData.name = this.currentUser.name
diff --git a/webapp/pages/settings/muted-users.vue b/webapp/pages/settings/muted-users.vue
index a6a62392f..e3fbc6d52 100644
--- a/webapp/pages/settings/muted-users.vue
+++ b/webapp/pages/settings/muted-users.vue
@@ -81,7 +81,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mutedUsers, unmuteUser } from '~/graphql/settings/MutedUsers'
 import ProfileAvatar from '~/components/_new/generic/ProfileAvatar/ProfileAvatar'
 import scrollToContent from './scroll-to-content.js'
@@ -94,7 +94,7 @@ export default {
     ProfileAvatar,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   data() {
     return {
diff --git a/webapp/pages/settings/my-email-address/enter-nonce.vue b/webapp/pages/settings/my-email-address/enter-nonce.vue
index 8c2022377..6621d4ed5 100644
--- a/webapp/pages/settings/my-email-address/enter-nonce.vue
+++ b/webapp/pages/settings/my-email-address/enter-nonce.vue
@@ -27,7 +27,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 
 export default {
   components: { OsButton, OsIcon },
@@ -50,7 +50,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     async submit() {
diff --git a/webapp/pages/settings/my-email-address/index.vue b/webapp/pages/settings/my-email-address/index.vue
index 9ee3e5a94..461da1124 100644
--- a/webapp/pages/settings/my-email-address/index.vue
+++ b/webapp/pages/settings/my-email-address/index.vue
@@ -36,7 +36,7 @@
 <script>
 import { mapGetters } from 'vuex'
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { AddEmailAddressMutation } from '~/graphql/EmailAddress.js'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import scrollToContent from '../scroll-to-content.js'
@@ -49,7 +49,7 @@ export default {
     SweetalertIcon,
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   data() {
     return {
diff --git a/webapp/pages/settings/my-social-media.vue b/webapp/pages/settings/my-social-media.vue
index 985aff084..316269395 100644
--- a/webapp/pages/settings/my-social-media.vue
+++ b/webapp/pages/settings/my-social-media.vue
@@ -27,7 +27,7 @@
 
 <script>
 import { mapGetters, mapMutations } from 'vuex'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import unionBy from 'lodash/unionBy'
 import {
   createSocialMediaMutation,
@@ -96,7 +96,7 @@ export default {
     },
   },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   methods: {
     ...mapMutations({
diff --git a/webapp/pages/terms-and-conditions-confirm.vue b/webapp/pages/terms-and-conditions-confirm.vue
index 647369d61..4ec32b14b 100644
--- a/webapp/pages/terms-and-conditions-confirm.vue
+++ b/webapp/pages/terms-and-conditions-confirm.vue
@@ -25,7 +25,7 @@
 
 <script>
 import { OsButton, OsIcon } from '@ocelot-social/ui'
-import { ocelotIcons } from '@ocelot-social/ui/ocelot'
+import { iconRegistry } from '~/utils/iconRegistry'
 import { mapGetters, mapMutations } from 'vuex'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { updateUserMutation } from '~/graphql/User.js'
@@ -34,7 +34,7 @@ export default {
   name: 'TermsAndConditionsConfirm',
   components: { OsButton, OsIcon },
   created() {
-    this.icons = ocelotIcons
+    this.icons = iconRegistry
   },
   layout: 'default',
   head() {