diff --git a/packages/nicolium/src/features/birthdays/account.tsx b/packages/nicolium/src/components/accounts/birthday-account.tsx
similarity index 89%
rename from packages/nicolium/src/features/birthdays/account.tsx
rename to packages/nicolium/src/components/accounts/birthday-account.tsx
index f70782692..8ed4e15ed 100644
--- a/packages/nicolium/src/features/birthdays/account.tsx
+++ b/packages/nicolium/src/components/accounts/birthday-account.tsx
@@ -10,11 +10,11 @@ const messages = defineMessages({
   birthday: { id: 'account.birthday', defaultMessage: 'Born {date}' },
 });
 
-interface IAccount {
+interface IBirthdayAccount {
   accountId: string;
 }
 
-const Account: React.FC<IAccount> = ({ accountId }) => {
+const BirthdayAccount: React.FC<IBirthdayAccount> = ({ accountId }) => {
   const intl = useIntl();
   const { data: account } = useAccount(accountId);
 
@@ -47,4 +47,4 @@ const Account: React.FC<IAccount> = ({ accountId }) => {
   );
 };
 
-export { Account as default };
+export { BirthdayAccount as default };
diff --git a/packages/nicolium/src/features/ui/components/profile-dropdown.tsx b/packages/nicolium/src/components/navigation/profile-dropdown.tsx
similarity index 98%
rename from packages/nicolium/src/features/ui/components/profile-dropdown.tsx
rename to packages/nicolium/src/components/navigation/profile-dropdown.tsx
index fff07b946..7c8074cda 100644
--- a/packages/nicolium/src/features/ui/components/profile-dropdown.tsx
+++ b/packages/nicolium/src/components/navigation/profile-dropdown.tsx
@@ -15,7 +15,7 @@ import {
 } from '@/queries/accounts/use-logged-in-accounts';
 import { useAuthActions } from '@/stores/auth';
 
-import ThemeToggle from './theme-toggle';
+import ThemeToggle from '../../features/ui/components/theme-toggle';
 
 import type { Account as AccountEntity } from 'pl-api';
 
diff --git a/packages/nicolium/src/components/navigation/sidebar-navigation.tsx b/packages/nicolium/src/components/navigation/sidebar-navigation.tsx
index 0fa829802..6ca73f064 100644
--- a/packages/nicolium/src/components/navigation/sidebar-navigation.tsx
+++ b/packages/nicolium/src/components/navigation/sidebar-navigation.tsx
@@ -53,9 +53,9 @@ import React, { useMemo } from 'react';
 import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 
 import ComposeButton from '@/components/navigation/compose-button';
+import ProfileDropdown from '@/components/navigation/profile-dropdown';
 import Icon from '@/components/ui/icon';
 import { useStatContext } from '@/contexts/stat-context';
-import ProfileDropdown from '@/features/ui/components/profile-dropdown';
 import { useClient } from '@/hooks/use-client';
 import { useFeatures } from '@/hooks/use-features';
 import { useOwnAccount } from '@/hooks/use-own-account';
diff --git a/packages/nicolium/src/components/panels/instance-moderation-panel.tsx b/packages/nicolium/src/components/panels/instance-moderation-panel.tsx
index 95e0e5e04..1780d30a8 100644
--- a/packages/nicolium/src/components/panels/instance-moderation-panel.tsx
+++ b/packages/nicolium/src/components/panels/instance-moderation-panel.tsx
@@ -5,8 +5,8 @@ import { useIntl, defineMessages, FormattedMessage } from 'react-intl';
 
 import DropdownMenu from '@/components/dropdown-menu';
 import Widget from '@/components/ui/widget';
-import InstanceRestrictions from '@/features/federation-restrictions/components/instance-restrictions';
 import { useOwnAccount } from '@/hooks/use-own-account';
+import InstanceRestrictions from '@/pages/instance/components/instance-restrictions';
 import { useRemoteInstance } from '@/queries/instance/use-remote-instance';
 import { useModalsActions } from '@/stores/modals';
 
diff --git a/packages/nicolium/src/modals/birthdays-modal.tsx b/packages/nicolium/src/modals/birthdays-modal.tsx
index 8a062415c..2c058433a 100644
--- a/packages/nicolium/src/modals/birthdays-modal.tsx
+++ b/packages/nicolium/src/modals/birthdays-modal.tsx
@@ -1,11 +1,11 @@
 import React, { useState } from 'react';
 import { FormattedMessage } from 'react-intl';
 
+import BirthdayAccount from '@/components/accounts/birthday-account';
 import { getCurrentDate } from '@/components/panels/birthday-panel';
 import ScrollableList from '@/components/scrollable-list';
 import Modal from '@/components/ui/modal';
 import Spinner from '@/components/ui/spinner';
-import Account from '@/features/birthdays/account';
 import { useBirthdayReminders } from '@/queries/accounts/use-birthday-reminders';
 
 import type { BaseModalProps } from '@/features/ui/components/modal-root';
@@ -38,7 +38,7 @@ const BirthdaysModal = ({ onClose }: BaseModalProps) => {
         useWindowScroll={false}
       >
         {accountIds.map((id) => (
-          <Account key={id} accountId={id} />
+          <BirthdayAccount key={id} accountId={id} />
         ))}
       </ScrollableList>
     );
diff --git a/packages/nicolium/src/features/federation-restrictions/components/instance-restrictions.tsx b/packages/nicolium/src/pages/instance/components/instance-restrictions.tsx
similarity index 100%
rename from packages/nicolium/src/features/federation-restrictions/components/instance-restrictions.tsx
rename to packages/nicolium/src/pages/instance/components/instance-restrictions.tsx
diff --git a/packages/nicolium/src/features/federation-restrictions/components/restricted-instance.tsx b/packages/nicolium/src/pages/instance/components/restricted-instance.tsx
similarity index 100%
rename from packages/nicolium/src/features/federation-restrictions/components/restricted-instance.tsx
rename to packages/nicolium/src/pages/instance/components/restricted-instance.tsx
diff --git a/packages/nicolium/src/pages/instance/federation-restrictions.tsx b/packages/nicolium/src/pages/instance/federation-restrictions.tsx
index 34ec32584..485495cb5 100644
--- a/packages/nicolium/src/pages/instance/federation-restrictions.tsx
+++ b/packages/nicolium/src/pages/instance/federation-restrictions.tsx
@@ -4,7 +4,7 @@ import { defineMessages, FormattedMessage, useIntl } from 'react-intl';
 import ScrollableList from '@/components/scrollable-list';
 import Accordion from '@/components/ui/accordion';
 import Column from '@/components/ui/column';
-import RestrictedInstance from '@/features/federation-restrictions/components/restricted-instance';
+import RestrictedInstance from '@/pages/instance/components/restricted-instance';
 import { useHosts } from '@/queries/instance/use-remote-instance';
 import { useInstance } from '@/stores/instance';
 import { useFederationRestrictionsDisclosed } from '@/utils/state';