diff --git a/app/soapbox/actions/__tests__/blocks.test.ts b/app/soapbox/actions/__tests__/blocks.test.ts
index eedf17c30c..2d48320071 100644
--- a/app/soapbox/actions/__tests__/blocks.test.ts
+++ b/app/soapbox/actions/__tests__/blocks.test.ts
@@ -1,4 +1,4 @@
-import { Map as ImmutableMap } from 'immutable';
+import { Record as ImmutableRecord } from 'immutable';
 
 import { __stub } from 'soapbox/api';
 import { mockStore } from 'soapbox/jest/test-helpers';
@@ -113,7 +113,7 @@ describe('expandBlocks()', () => {
       beforeEach(() => {
         const state = rootReducer(undefined, {})
           .set('me', '1234')
-          .set('user_lists', ImmutableMap({ blocks: { next: null } }));
+          .set('user_lists', ImmutableRecord({ blocks: { next: null } })());
         store = mockStore(state);
       });
 
@@ -129,7 +129,7 @@ describe('expandBlocks()', () => {
       beforeEach(() => {
         const state = rootReducer(undefined, {})
           .set('me', '1234')
-          .set('user_lists', ImmutableMap({ blocks: { next: 'example' } }));
+          .set('user_lists', ImmutableRecord({ blocks: { next: 'example' } })());
         store = mockStore(state);
       });
 
diff --git a/app/soapbox/actions/accounts.ts b/app/soapbox/actions/accounts.ts
index e5a92fae95..60cb6bbe62 100644
--- a/app/soapbox/actions/accounts.ts
+++ b/app/soapbox/actions/accounts.ts
@@ -410,7 +410,6 @@ const unmuteAccountFail = (error: AxiosError) => ({
   error,
 });
 
-
 const subscribeAccount = (id: string, notifications?: boolean) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return null;
@@ -465,7 +464,6 @@ const unsubscribeAccountFail = (error: AxiosError) => ({
   error,
 });
 
-
 const removeFromFollowers = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
@@ -532,7 +530,7 @@ const expandFollowers = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
-    const url = getState().user_lists.getIn(['followers', id, 'next']);
+    const url = getState().user_lists.followers.get(id)?.next as string;
 
     if (url === null) {
       return;
@@ -606,7 +604,7 @@ const expandFollowing = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
-    const url = getState().user_lists.getIn(['following', id, 'next']);
+    const url = getState().user_lists.following.get(id)!.next;
 
     if (url === null) {
       return;
@@ -713,7 +711,7 @@ const expandFollowRequests = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
-    const url = getState().user_lists.getIn(['follow_requests', 'next']);
+    const url = getState().user_lists.follow_requests.next;
 
     if (url === null) {
       return;
@@ -771,7 +769,6 @@ const authorizeFollowRequestFail = (id: string, error: AxiosError) => ({
   error,
 });
 
-
 const rejectFollowRequest = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
diff --git a/app/soapbox/actions/auth.ts b/app/soapbox/actions/auth.ts
index 54473346ca..40532a5824 100644
--- a/app/soapbox/actions/auth.ts
+++ b/app/soapbox/actions/auth.ts
@@ -269,7 +269,6 @@ export const fetchOwnAccounts = () =>
     });
   };
 
-
 export const register = (params: Record<string, any>) =>
   (dispatch: AppDispatch) => {
     params.fullname = params.username;
diff --git a/app/soapbox/actions/blocks.ts b/app/soapbox/actions/blocks.ts
index 629be6f903..d3f6258843 100644
--- a/app/soapbox/actions/blocks.ts
+++ b/app/soapbox/actions/blocks.ts
@@ -58,7 +58,7 @@ const expandBlocks = () => (dispatch: React.Dispatch<AnyAction>, getState: () =>
   if (!isLoggedIn(getState)) return null;
   const nextLinkName = getNextLinkName(getState);
 
-  const url = getState().user_lists.getIn(['blocks', 'next']);
+  const url = getState().user_lists.blocks.next;
 
   if (url === null) {
     return null;
diff --git a/app/soapbox/actions/compose.ts b/app/soapbox/actions/compose.ts
index 721e6bad1d..d37330d289 100644
--- a/app/soapbox/actions/compose.ts
+++ b/app/soapbox/actions/compose.ts
@@ -285,7 +285,7 @@ const submitCompose = (routerHistory: History, force = false) =>
     };
 
     dispatch(createStatus(params, idempotencyKey, statusId)).then(function(data) {
-      if (!statusId && data.visibility === 'direct' && getState().conversations.get('mounted') <= 0 && routerHistory) {
+      if (!statusId && data.visibility === 'direct' && getState().conversations.mounted <= 0 && routerHistory) {
         routerHistory.push('/messages');
       }
       handleComposeSubmit(dispatch, getState, data, status);
diff --git a/app/soapbox/actions/conversations.ts b/app/soapbox/actions/conversations.ts
index a56e02d6f1..73507e3892 100644
--- a/app/soapbox/actions/conversations.ts
+++ b/app/soapbox/actions/conversations.ts
@@ -49,7 +49,7 @@ const expandConversations = ({ maxId }: Record<string, any> = {}) => (dispatch:
   const params: Record<string, any> = { max_id: maxId };
 
   if (!maxId) {
-    params.since_id = getState().conversations.getIn(['items', 0, 'id']);
+    params.since_id = getState().conversations.items.getIn([0, 'id']);
   }
 
   const isLoadingRecent = !!params.since_id;
diff --git a/app/soapbox/actions/directory.ts b/app/soapbox/actions/directory.ts
index 98e2dc2b21..37ddcfdfa4 100644
--- a/app/soapbox/actions/directory.ts
+++ b/app/soapbox/actions/directory.ts
@@ -44,7 +44,7 @@ const expandDirectory = (params: Record<string, any>) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch(expandDirectoryRequest());
 
-    const loadedItems = getState().user_lists.getIn(['directory', 'items']).size;
+    const loadedItems = getState().user_lists.directory.items.size;
 
     api(getState).get('/api/v1/directory', { params: { ...params, offset: loadedItems, limit: 20 } }).then(({ data }) => {
       dispatch(importFetchedAccounts(data));
diff --git a/app/soapbox/actions/filters.ts b/app/soapbox/actions/filters.ts
index 16bb23951b..61b4e9b631 100644
--- a/app/soapbox/actions/filters.ts
+++ b/app/soapbox/actions/filters.ts
@@ -65,7 +65,6 @@ const createFilter = (phrase: string, expires_at: string, context: Array<string>
     });
   };
 
-
 const deleteFilter = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     dispatch({ type: FILTERS_DELETE_REQUEST });
diff --git a/app/soapbox/actions/groups.ts b/app/soapbox/actions/groups.ts
index a6443758a0..808cc3204e 100644
--- a/app/soapbox/actions/groups.ts
+++ b/app/soapbox/actions/groups.ts
@@ -253,7 +253,7 @@ const expandMembers = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
-    const url = getState().user_lists.getIn(['groups', id, 'next']);
+    const url = getState().user_lists.groups.get(id)!.next;
 
     if (url === null) {
       return;
@@ -329,7 +329,7 @@ const expandRemovedAccounts = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
 
-    const url = getState().user_lists.getIn(['groups_removed_accounts', id, 'next']);
+    const url = getState().user_lists.groups_removed_accounts.get(id)!.next;
 
     if (url === null) {
       return;
diff --git a/app/soapbox/actions/media.ts b/app/soapbox/actions/media.ts
index 1a63d87d56..15c637c350 100644
--- a/app/soapbox/actions/media.ts
+++ b/app/soapbox/actions/media.ts
@@ -22,14 +22,12 @@ const uploadMediaV1 = (data: FormData, onUploadProgress = noOp) =>
       onUploadProgress: onUploadProgress,
     });
 
-
 const uploadMediaV2 = (data: FormData, onUploadProgress = noOp) =>
   (dispatch: any, getState: () => RootState) =>
     api(getState).post('/api/v2/media', data, {
       onUploadProgress: onUploadProgress,
     });
 
-
 const uploadMedia = (data: FormData, onUploadProgress = noOp) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
diff --git a/app/soapbox/actions/moderation.tsx b/app/soapbox/actions/moderation.tsx
index 946157071e..69342277b1 100644
--- a/app/soapbox/actions/moderation.tsx
+++ b/app/soapbox/actions/moderation.tsx
@@ -162,7 +162,6 @@ const deleteStatusModal = (intl: IntlShape, statusId: string, afterConfirm = ()
     }));
   };
 
-
 export {
   deactivateUserModal,
   deleteUserModal,
diff --git a/app/soapbox/actions/mutes.ts b/app/soapbox/actions/mutes.ts
index 0ec7d147b8..050a513f03 100644
--- a/app/soapbox/actions/mutes.ts
+++ b/app/soapbox/actions/mutes.ts
@@ -57,7 +57,7 @@ const expandMutes = () =>
     if (!isLoggedIn(getState)) return;
     const nextLinkName = getNextLinkName(getState);
 
-    const url = getState().user_lists.getIn(['mutes', 'next']);
+    const url = getState().user_lists.mutes.next;
 
     if (url === null) {
       return;
diff --git a/app/soapbox/actions/push_notifications/registerer.ts b/app/soapbox/actions/push_notifications/registerer.ts
index b8d12caa4a..893814b025 100644
--- a/app/soapbox/actions/push_notifications/registerer.ts
+++ b/app/soapbox/actions/push_notifications/registerer.ts
@@ -38,7 +38,7 @@ const unsubscribe = ({ registration, subscription }: {
 
 const sendSubscriptionToBackend = (subscription: PushSubscription, me: Me) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const alerts = getState().push_notifications.get('alerts').toJS();
+    const alerts = getState().push_notifications.alerts.toJS();
     const params = { subscription, data: { alerts } };
 
     if (me) {
@@ -82,7 +82,7 @@ const register = () =>
           // We have a subscription, check if it is still valid
           const currentServerKey = (new Uint8Array(subscription.options.applicationServerKey!)).toString();
           const subscriptionServerKey = urlBase64ToUint8Array(vapidKey).toString();
-          const serverEndpoint = getState().push_notifications.getIn(['subscription', 'endpoint']);
+          const serverEndpoint = getState().push_notifications.subscription?.endpoint;
 
           // If the VAPID public key did not change and the endpoint corresponds
           // to the endpoint saved in the backend, the subscription is valid
@@ -136,7 +136,7 @@ const register = () =>
 const saveSettings = () =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState().push_notifications;
-    const alerts = state.get('alerts');
+    const alerts = state.alerts;
     const data = { alerts };
     const me = getState().me;
 
diff --git a/app/soapbox/actions/statuses.ts b/app/soapbox/actions/statuses.ts
index f0a6aad150..5cf5344465 100644
--- a/app/soapbox/actions/statuses.ts
+++ b/app/soapbox/actions/statuses.ts
@@ -242,7 +242,6 @@ const fetchStatusWithContext = (id: string) =>
     }
   };
 
-
 const muteStatus = (id: string) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     if (!isLoggedIn(getState)) return;
diff --git a/app/soapbox/actions/timelines.ts b/app/soapbox/actions/timelines.ts
index ec8615def8..5d7fac2c43 100644
--- a/app/soapbox/actions/timelines.ts
+++ b/app/soapbox/actions/timelines.ts
@@ -82,7 +82,7 @@ const updateTimelineQueue = (timeline: string, statusId: string, accept: ((statu
 const dequeueTimeline = (timelineId: string, expandFunc?: (lastStatusId: string) => void, optionalExpandArgs?: any) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
     const state = getState();
-    const queuedCount = state.timelines.getIn([timelineId, 'totalQueuedItemsCount'], 0);
+    const queuedCount = state.timelines.get(timelineId)?.totalQueuedItemsCount || 0;
 
     if (queuedCount <= 0) return;
 
@@ -136,16 +136,16 @@ const parseTags = (tags: Record<string, any[]> = {}, mode: 'any' | 'all' | 'none
 
 const expandTimeline = (timelineId: string, path: string, params: Record<string, any> = {}, done = noOp) =>
   (dispatch: AppDispatch, getState: () => RootState) => {
-    const timeline = getState().timelines.get(timelineId) || ImmutableMap();
+    const timeline = getState().timelines.get(timelineId) || {} as Record<string, any>;
     const isLoadingMore = !!params.max_id;
 
-    if (timeline.get('isLoading')) {
+    if (timeline.isLoading) {
       done();
       return dispatch(noOpAsync());
     }
 
-    if (!params.max_id && !params.pinned && timeline.get('items', ImmutableOrderedSet()).size > 0) {
-      params.since_id = timeline.getIn(['items', 0]);
+    if (!params.max_id && !params.pinned && (timeline.items || ImmutableOrderedSet()).size > 0) {
+      params.since_id = timeline.items || 0;
     }
 
     const isLoadingRecent = !!params.since_id;
diff --git a/app/soapbox/actions/verification.ts b/app/soapbox/actions/verification.ts
index bc8db0189d..ce3d270090 100644
--- a/app/soapbox/actions/verification.ts
+++ b/app/soapbox/actions/verification.ts
@@ -59,7 +59,6 @@ const removeStoredVerification = () => {
   localStorage.removeItem(LOCAL_STORAGE_VERIFICATION_KEY);
 };
 
-
 /**
  * Fetch and return the Registration token for Pepe.
  */
@@ -207,7 +206,6 @@ const fetchRegistrationToken = () =>
       return null;
     }
 
-
     return api(getState).post('/api/v1/pepe/registrations')
       .then(response => {
         updateStorage({ token: response.data.access_token });
diff --git a/app/soapbox/components/birthday-panel.tsx b/app/soapbox/components/birthday-panel.tsx
index 6008cb423e..2cc1393571 100644
--- a/app/soapbox/components/birthday-panel.tsx
+++ b/app/soapbox/components/birthday-panel.tsx
@@ -15,7 +15,7 @@ interface IBirthdayPanel {
 const BirthdayPanel = ({ limit }: IBirthdayPanel) => {
   const dispatch = useDispatch();
 
-  const birthdays: ImmutableOrderedSet<string> = useAppSelector(state => state.user_lists.getIn(['birthday_reminders', state.me], ImmutableOrderedSet()));
+  const birthdays: ImmutableOrderedSet<string> = useAppSelector(state => state.user_lists.birthday_reminders.get(state.me as string)?.items || ImmutableOrderedSet());
   const birthdaysToRender = birthdays.slice(0, limit);
 
   React.useEffect(() => {
diff --git a/app/soapbox/components/error_boundary.tsx b/app/soapbox/components/error_boundary.tsx
index 6df25cb9dc..c1025d4653 100644
--- a/app/soapbox/components/error_boundary.tsx
+++ b/app/soapbox/components/error_boundary.tsx
@@ -171,7 +171,6 @@ class ErrorBoundary extends React.PureComponent<Props, State> {
                   />
                 )}
 
-
                 {browser && (
                   <Stack>
                     <Text weight='semibold'><FormattedMessage id='alert.unexpected.browser' defaultMessage='Browser' /></Text>
diff --git a/app/soapbox/components/sidebar-navigation.tsx b/app/soapbox/components/sidebar-navigation.tsx
index 5b8c792307..f4cf64e49f 100644
--- a/app/soapbox/components/sidebar-navigation.tsx
+++ b/app/soapbox/components/sidebar-navigation.tsx
@@ -1,4 +1,3 @@
-import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import React from 'react';
 import { FormattedMessage } from 'react-intl';
 
@@ -19,7 +18,7 @@ const SidebarNavigation = () => {
   const account = useOwnAccount();
   const notificationCount = useAppSelector((state) => state.notifications.get('unread'));
   const chatsCount = useAppSelector((state) => state.chats.items.reduce((acc, curr) => acc + Math.min(curr.unread || 0, 1), 0));
-  const followRequestsCount = useAppSelector((state) => state.user_lists.getIn(['follow_requests', 'items'], ImmutableOrderedSet()).count());
+  const followRequestsCount = useAppSelector((state) => state.user_lists.follow_requests.items.count());
   const dashboardCount = useAppSelector((state) => state.admin.openReports.count() + state.admin.awaitingApproval.count());
 
   const features = getFeatures(instance);
diff --git a/app/soapbox/components/ui/modal/modal.tsx b/app/soapbox/components/ui/modal/modal.tsx
index 3b2ba89e97..3987d6afe9 100644
--- a/app/soapbox/components/ui/modal/modal.tsx
+++ b/app/soapbox/components/ui/modal/modal.tsx
@@ -50,7 +50,7 @@ interface IModal {
   /** Don't focus the "confirm" button on mount. */
   skipFocus?: boolean,
   /** Title text for the modal. */
-  title: React.ReactNode,
+  title?: React.ReactNode,
   width?: Widths,
 }
 
@@ -86,28 +86,32 @@ const Modal: React.FC<IModal> = ({
     <div data-testid='modal' className={classNames('block w-full p-6 mx-auto overflow-hidden text-left align-middle transition-all transform bg-white dark:bg-slate-800 text-black dark:text-white shadow-xl rounded-2xl pointer-events-auto', widths[width])}>
       <div className='sm:flex sm:items-start w-full justify-between'>
         <div className='w-full'>
-          <div
-            className={classNames('w-full flex items-center gap-2', {
-              'flex-row-reverse': closePosition === 'left',
-            })}
-          >
-            <h3 className='flex-grow text-lg leading-6 font-medium text-gray-900 dark:text-white'>
-              {title}
-            </h3>
+          {title && (
+            <div
+              className={classNames('w-full flex items-center gap-2', {
+                'flex-row-reverse': closePosition === 'left',
+              })}
+            >
+              <h3 className='flex-grow text-lg leading-6 font-medium text-gray-900 dark:text-white'>
+                {title}
+              </h3>
 
-            {onClose && (
-              <IconButton
-                src={closeIcon}
-                title={intl.formatMessage(messages.close)}
-                onClick={onClose}
-                className='text-gray-500 hover:text-gray-700 dark:text-gray-300 dark:hover:text-gray-200'
-              />
-            )}
-          </div>
+              {onClose && (
+                <IconButton
+                  src={closeIcon}
+                  title={intl.formatMessage(messages.close)}
+                  onClick={onClose}
+                  className='text-gray-500 hover:text-gray-700 dark:text-gray-300 dark:hover:text-gray-200'
+                />
+              )}
+            </div>
+          )}
 
-          <div className={classNames('mt-2 w-full')}>
-            {children}
-          </div>
+          {title ? (
+            <div className='w-full mt-2'>
+              {children}
+            </div>
+          ) : children}
         </div>
       </div>
 
@@ -124,7 +128,6 @@ const Modal: React.FC<IModal> = ({
             )}
           </div>
 
-
           <div className='flex flex-row space-x-2'>
             {secondaryAction && (
               <Button
diff --git a/app/soapbox/features/account_gallery/index.tsx b/app/soapbox/features/account_gallery/index.tsx
index 2b8f9c9c6c..fd07d7c2b0 100644
--- a/app/soapbox/features/account_gallery/index.tsx
+++ b/app/soapbox/features/account_gallery/index.tsx
@@ -63,8 +63,8 @@ const AccountGallery = () => {
   });
   const isAccount = useAppSelector((state) => !!state.accounts.get(accountId));
   const attachments: ImmutableList<Attachment> = useAppSelector((state) => getAccountGallery(state, accountId as string));
-  const isLoading = useAppSelector((state) => state.timelines.getIn([`account:${accountId}:media`, 'isLoading']));
-  const hasMore = useAppSelector((state) => state.timelines.getIn([`account:${accountId}:media`, 'hasMore']));
+  const isLoading = useAppSelector((state) => state.timelines.get(`account:${accountId}:media`)?.isLoading);
+  const hasMore = useAppSelector((state) => state.timelines.get(`account:${accountId}:media`)?.hasMore);
 
   const ref = useRef<HTMLDivElement>(null);
   const [width] = useState(323);
diff --git a/app/soapbox/features/account_timeline/containers/header_container.js b/app/soapbox/features/account_timeline/containers/header_container.js
index c1eccba319..a0585c0c32 100644
Binary files a/app/soapbox/features/account_timeline/containers/header_container.js and b/app/soapbox/features/account_timeline/containers/header_container.js differ
diff --git a/app/soapbox/features/blocks/index.tsx b/app/soapbox/features/blocks/index.tsx
index c3ea6585f7..842950e494 100644
--- a/app/soapbox/features/blocks/index.tsx
+++ b/app/soapbox/features/blocks/index.tsx
@@ -21,8 +21,8 @@ const Blocks: React.FC = () => {
   const dispatch = useDispatch();
   const intl = useIntl();
 
-  const accountIds = useAppSelector((state) => state.user_lists.getIn(['blocks', 'items']));
-  const hasMore = useAppSelector((state) => !!state.user_lists.getIn(['blocks', 'next']));
+  const accountIds = useAppSelector((state) => state.user_lists.blocks.items);
+  const hasMore = useAppSelector((state) => !!state.user_lists.blocks.next);
 
   React.useEffect(() => {
     dispatch(fetchBlocks());
@@ -47,7 +47,7 @@ const Blocks: React.FC = () => {
         emptyMessage={emptyMessage}
         itemClassName='pb-4'
       >
-        {accountIds.map((id: string) =>
+        {accountIds.map((id) =>
           <AccountContainer key={id} id={id} actionType='blocking' />,
         )}
       </ScrollableList>
diff --git a/app/soapbox/features/conversations/components/conversation.tsx b/app/soapbox/features/conversations/components/conversation.tsx
index 6f638f2d6c..e48c0e17f0 100644
--- a/app/soapbox/features/conversations/components/conversation.tsx
+++ b/app/soapbox/features/conversations/components/conversation.tsx
@@ -5,8 +5,6 @@ import { markConversationRead } from 'soapbox/actions/conversations';
 import StatusContainer from 'soapbox/containers/status_container';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
 
-import type { Map as ImmutableMap } from 'immutable';
-
 interface IConversation {
   conversationId: string,
   onMoveUp: (id: string) => void,
@@ -18,12 +16,12 @@ const Conversation: React.FC<IConversation> = ({ conversationId, onMoveUp, onMov
   const history = useHistory();
 
   const { accounts, unread, lastStatusId } = useAppSelector((state) => {
-    const conversation = state.conversations.get('items').find((x: ImmutableMap<string, any>) => x.get('id') === conversationId);
+    const conversation = state.conversations.items.find(x => x.id === conversationId)!;
 
     return {
-      accounts: conversation.get('accounts').map((accountId: string) => state.accounts.get(accountId, null)),
-      unread: conversation.get('unread'),
-      lastStatusId: conversation.get('last_status', null),
+      accounts: conversation.accounts.map((accountId: string) => state.accounts.get(accountId, null)!),
+      unread: conversation.unread,
+      lastStatusId: conversation.last_status || null,
     };
   });
 
diff --git a/app/soapbox/features/conversations/components/conversations_list.tsx b/app/soapbox/features/conversations/components/conversations_list.tsx
index 9773b246e9..01705fd307 100644
--- a/app/soapbox/features/conversations/components/conversations_list.tsx
+++ b/app/soapbox/features/conversations/components/conversations_list.tsx
@@ -14,10 +14,10 @@ const ConversationsList: React.FC = () => {
   const dispatch = useAppDispatch();
   const ref = useRef<VirtuosoHandle>(null);
 
-  const conversations = useAppSelector((state) => state.conversations.get('items'));
-  const isLoading = useAppSelector((state) => state.conversations.get('isLoading', true));
+  const conversations = useAppSelector((state) => state.conversations.items);
+  const isLoading = useAppSelector((state) => state.conversations.isLoading);
 
-  const getCurrentIndex = (id: string) => conversations.findIndex((x: any) => x.get('id') === id);
+  const getCurrentIndex = (id: string) => conversations.findIndex(x => x.id === id);
 
   const handleMoveUp = (id: string) => {
     const elementIndex = getCurrentIndex(id) - 1;
@@ -60,8 +60,8 @@ const ConversationsList: React.FC = () => {
     >
       {conversations.map((item: any) => (
         <Conversation
-          key={item.get('id')}
-          conversationId={item.get('id')}
+          key={item.id}
+          conversationId={item.id}
           onMoveUp={handleMoveUp}
           onMoveDown={handleMoveDown}
         />
diff --git a/app/soapbox/features/direct_timeline/index.tsx b/app/soapbox/features/direct_timeline/index.tsx
index 49d275c682..139a1077e3 100644
--- a/app/soapbox/features/direct_timeline/index.tsx
+++ b/app/soapbox/features/direct_timeline/index.tsx
@@ -20,7 +20,7 @@ const DirectTimeline = () => {
   const intl = useIntl();
   const dispatch = useAppDispatch();
 
-  const hasUnread = useAppSelector((state) => state.timelines.getIn(['direct', 'unread']) > 0);
+  const hasUnread = useAppSelector((state) => (state.timelines.get('direct')?.unread || 0) > 0);
 
   useEffect(() => {
     dispatch(expandDirectTimeline());
diff --git a/app/soapbox/features/directory/index.tsx b/app/soapbox/features/directory/index.tsx
index c4bb5b4d84..375e99465e 100644
--- a/app/soapbox/features/directory/index.tsx
+++ b/app/soapbox/features/directory/index.tsx
@@ -1,5 +1,4 @@
 import classNames from 'classnames';
-import { List as ImmutableList } from 'immutable';
 import React, { useEffect, useState } from 'react';
 import { defineMessages, useIntl } from 'react-intl';
 import { useDispatch } from 'react-redux';
@@ -28,8 +27,8 @@ const Directory = () => {
   const { search } = useLocation();
   const params = new URLSearchParams(search);
 
-  const accountIds = useAppSelector((state) => state.user_lists.getIn(['directory', 'items'], ImmutableList()));
-  const isLoading = useAppSelector((state) => state.user_lists.getIn(['directory', 'isLoading'], true));
+  const accountIds = useAppSelector((state) => state.user_lists.directory.items);
+  const isLoading = useAppSelector((state) => state.user_lists.directory.isLoading);
   const title = useAppSelector((state) => state.instance.get('title'));
   const features = useAppSelector((state) => getFeatures(state.instance));
 
@@ -69,7 +68,7 @@ const Directory = () => {
       </div>
 
       <div className={classNames('directory__list', { loading: isLoading })}>
-        {accountIds.map((accountId: string) => <AccountCard id={accountId} key={accountId} />)}
+        {accountIds.map((accountId) => <AccountCard id={accountId} key={accountId} />)}
       </div>
 
       <LoadMore onClick={handleLoadMore} visible={!isLoading} />
diff --git a/app/soapbox/features/follow_requests/index.tsx b/app/soapbox/features/follow_requests/index.tsx
index 3c1d647eda..eed1a8e1f9 100644
--- a/app/soapbox/features/follow_requests/index.tsx
+++ b/app/soapbox/features/follow_requests/index.tsx
@@ -24,8 +24,8 @@ const FollowRequests: React.FC = () => {
   const dispatch = useDispatch();
   const intl = useIntl();
 
-  const accountIds = useAppSelector<string[]>((state) => state.user_lists.getIn(['follow_requests', 'items']));
-  const hasMore = useAppSelector((state) => !!state.user_lists.getIn(['follow_requests', 'next']));
+  const accountIds = useAppSelector((state) => state.user_lists.follow_requests.items);
+  const hasMore = useAppSelector((state) => !!state.user_lists.follow_requests.next);
 
   React.useEffect(() => {
     dispatch(fetchFollowRequests());
diff --git a/app/soapbox/features/followers/index.js b/app/soapbox/features/followers/index.js
index e728ebddfa..7a77e46a57 100644
Binary files a/app/soapbox/features/followers/index.js and b/app/soapbox/features/followers/index.js differ
diff --git a/app/soapbox/features/following/index.js b/app/soapbox/features/following/index.js
index 532a7d2c54..2f654fc5b1 100644
Binary files a/app/soapbox/features/following/index.js and b/app/soapbox/features/following/index.js differ
diff --git a/app/soapbox/features/groups/members/index.js b/app/soapbox/features/groups/members/index.js
index a7b56aeb17..1e9e39a4de 100644
Binary files a/app/soapbox/features/groups/members/index.js and b/app/soapbox/features/groups/members/index.js differ
diff --git a/app/soapbox/features/groups/removed_accounts/index.js b/app/soapbox/features/groups/removed_accounts/index.js
index cc7e1111de..e5d0dae411 100644
Binary files a/app/soapbox/features/groups/removed_accounts/index.js and b/app/soapbox/features/groups/removed_accounts/index.js differ
diff --git a/app/soapbox/features/home_timeline/index.tsx b/app/soapbox/features/home_timeline/index.tsx
index 99ed0d5696..ad3ee672d9 100644
--- a/app/soapbox/features/home_timeline/index.tsx
+++ b/app/soapbox/features/home_timeline/index.tsx
@@ -16,7 +16,7 @@ const HomeTimeline: React.FC = () => {
   const dispatch = useAppDispatch();
   const polling = useRef<NodeJS.Timer | null>(null);
 
-  const isPartial = useAppSelector(state => state.timelines.getIn(['home', 'isPartial']) === true);
+  const isPartial = useAppSelector(state => state.timelines.get('home')?.isPartial === true);
   const siteTitle = useAppSelector(state => state.instance.title);
 
   const handleLoadMore = (maxId: string) => {
diff --git a/app/soapbox/features/list_timeline/index.tsx b/app/soapbox/features/list_timeline/index.tsx
index 42b8d6fe49..f9d1e6f245 100644
--- a/app/soapbox/features/list_timeline/index.tsx
+++ b/app/soapbox/features/list_timeline/index.tsx
@@ -26,7 +26,7 @@ const ListTimeline: React.FC = () => {
   // const history = useHistory();
 
   const list = useAppSelector((state) => state.lists.get(id));
-  // const hasUnread = useAppSelector((state) => state.timelines.getIn([`list:${props.params.id}`, 'unread']) > 0);
+  // const hasUnread = useAppSelector((state) => state.timelines.get(`list:${props.params.id}`)?.unread > 0);
 
   useEffect(() => {
     dispatch(fetchList(id));
diff --git a/app/soapbox/features/mutes/index.tsx b/app/soapbox/features/mutes/index.tsx
index d564c68e7d..caf15ca267 100644
--- a/app/soapbox/features/mutes/index.tsx
+++ b/app/soapbox/features/mutes/index.tsx
@@ -21,8 +21,8 @@ const Mutes: React.FC = () => {
   const dispatch = useDispatch();
   const intl = useIntl();
 
-  const accountIds = useAppSelector((state) => state.user_lists.getIn(['mutes', 'items']));
-  const hasMore = useAppSelector((state) => !!state.user_lists.getIn(['mutes', 'next']));
+  const accountIds = useAppSelector((state) => state.user_lists.mutes.items);
+  const hasMore = useAppSelector((state) => !!state.user_lists.mutes.next);
 
   React.useEffect(() => {
     dispatch(fetchMutes());
@@ -47,7 +47,7 @@ const Mutes: React.FC = () => {
         emptyMessage={emptyMessage}
         itemClassName='pb-4'
       >
-        {accountIds.map((id: string) =>
+        {accountIds.map((id) =>
           <AccountContainer key={id} id={id} actionType='muting' />,
         )}
       </ScrollableList>
diff --git a/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx b/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx
index 0b09ca4c1b..6b52270c5c 100644
--- a/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx
+++ b/app/soapbox/features/onboarding/steps/suggested-accounts-step.tsx
@@ -91,8 +91,6 @@ const SuggestedAccountsStep = ({ onNext }: { onNext: () => void }) => {
 
           <div className='sm:w-2/3 md:w-1/2 mx-auto'>
             <Stack>
-
-
               <Stack justifyContent='center' space={2}>
                 <Button
                   block
diff --git a/app/soapbox/features/scheduled_statuses/builder.tsx b/app/soapbox/features/scheduled_statuses/builder.tsx
index 2927c89848..9db827412d 100644
--- a/app/soapbox/features/scheduled_statuses/builder.tsx
+++ b/app/soapbox/features/scheduled_statuses/builder.tsx
@@ -3,28 +3,29 @@ import { Map as ImmutableMap } from 'immutable';
 import { normalizeStatus } from 'soapbox/normalizers/status';
 import { calculateStatus } from 'soapbox/reducers/statuses';
 import { makeGetAccount } from 'soapbox/selectors';
-import { RootState } from 'soapbox/store';
 
-export const buildStatus = (state: RootState, scheduledStatus: ImmutableMap<string, any>) => {
+import type { ScheduledStatus } from 'soapbox/reducers/scheduled_statuses';
+import type { RootState } from 'soapbox/store';
+
+export const buildStatus = (state: RootState, scheduledStatus: ScheduledStatus) => {
   const getAccount = makeGetAccount();
 
   const me = state.me as string;
 
-  const params = scheduledStatus.get('params');
   const account = getAccount(state, me);
 
   const status = ImmutableMap({
     account,
-    content: params.get('text', '').replace(new RegExp('\n', 'g'), '<br>'), /* eslint-disable-line no-control-regex */
-    created_at: params.get('scheduled_at'),
-    id: scheduledStatus.get('id'),
-    in_reply_to_id: params.get('in_reply_to_id'),
-    media_attachments: scheduledStatus.get('media_attachments'),
-    poll: params.get('poll'),
-    sensitive: params.get('sensitive'),
-    uri: `/scheduled_statuses/${scheduledStatus.get('id')}`,
-    url: `/scheduled_statuses/${scheduledStatus.get('id')}`,
-    visibility: params.get('visibility'),
+    content: scheduledStatus.text.replace(new RegExp('\n', 'g'), '<br>'), /* eslint-disable-line no-control-regex */
+    created_at: scheduledStatus.scheduled_at,
+    id: scheduledStatus.id,
+    in_reply_to_id: scheduledStatus.in_reply_to_id,
+    media_attachments: scheduledStatus.media_attachments,
+    poll: scheduledStatus.poll,
+    sensitive: scheduledStatus.sensitive,
+    uri: `/scheduled_statuses/${scheduledStatus.id}`,
+    url: `/scheduled_statuses/${scheduledStatus.id}`,
+    visibility: scheduledStatus.visibility,
   });
 
   return calculateStatus(normalizeStatus(status));
diff --git a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx b/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx
index 65a90ad500..9bb26762aa 100644
--- a/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx
+++ b/app/soapbox/features/scheduled_statuses/components/scheduled_status.tsx
@@ -20,7 +20,7 @@ interface IScheduledStatus {
 }
 
 const ScheduledStatus: React.FC<IScheduledStatus> = ({ statusId, ...other }) => {
-  const status = useAppSelector((state) => buildStatus(state, state.scheduled_statuses.get(statusId))) as StatusEntity;
+  const status = useAppSelector((state) => buildStatus(state, state.scheduled_statuses.get(statusId)!)) as StatusEntity;
 
   if (!status) return null;
 
diff --git a/app/soapbox/features/status/components/detailed-status.tsx b/app/soapbox/features/status/components/detailed-status.tsx
index 640b3d5d2d..8745e6188f 100644
--- a/app/soapbox/features/status/components/detailed-status.tsx
+++ b/app/soapbox/features/status/components/detailed-status.tsx
@@ -163,7 +163,6 @@ class DetailedStatus extends ImmutablePureComponent<IDetailedStatus, IDetailedSt
           <HStack justifyContent='between' alignItems='center' className='py-2'>
             <StatusInteractionBar status={status} />
 
-
             <div className='detailed-status__timestamp'>
               {statusTypeIcon}
 
diff --git a/app/soapbox/features/ui/components/birthdays_modal.tsx b/app/soapbox/features/ui/components/birthdays_modal.tsx
index f0b25f5f40..058a16cfc8 100644
--- a/app/soapbox/features/ui/components/birthdays_modal.tsx
+++ b/app/soapbox/features/ui/components/birthdays_modal.tsx
@@ -11,7 +11,7 @@ interface IBirthdaysModal {
 }
 
 const BirthdaysModal = ({ onClose }: IBirthdaysModal) => {
-  const accountIds = useAppSelector<string[]>(state => state.user_lists.getIn(['birthday_reminders', state.me]));
+  const accountIds = useAppSelector(state => state.user_lists.birthday_reminders.get(state.me as string)?.items);
 
   const onClickClose = () => {
     onClose('BIRTHDAYS');
@@ -37,7 +37,6 @@ const BirthdaysModal = ({ onClose }: IBirthdaysModal) => {
     );
   }
 
-
   return (
     <Modal
       title={<FormattedMessage id='column.birthdays' defaultMessage='Birthdays' />}
diff --git a/app/soapbox/features/ui/components/crypto_donate_modal.tsx b/app/soapbox/features/ui/components/crypto_donate_modal.tsx
index 805012d3a4..29c2dfaa84 100644
--- a/app/soapbox/features/ui/components/crypto_donate_modal.tsx
+++ b/app/soapbox/features/ui/components/crypto_donate_modal.tsx
@@ -1,14 +1,18 @@
 import React from 'react';
 
+import { Modal } from 'soapbox/components/ui';
 import DetailedCryptoAddress from 'soapbox/features/crypto_donate/components/detailed_crypto_address';
 
 import type { ICryptoAddress } from '../../crypto_donate/components/crypto_address';
 
-const CryptoDonateModal: React.FC<ICryptoAddress> = (props) => {
+const CryptoDonateModal: React.FC<ICryptoAddress & { onClose: () => void }> = ({ onClose, ...props }) => {
+
   return (
-    <div className='modal-root__modal crypto-donate-modal'>
-      <DetailedCryptoAddress {...props} />
-    </div>
+    <Modal onClose={onClose} width='xs'>
+      <div className='crypto-donate-modal'>
+        <DetailedCryptoAddress {...props} />
+      </div>
+    </Modal>
   );
 
 };
diff --git a/app/soapbox/features/ui/components/familiar_followers_modal.tsx b/app/soapbox/features/ui/components/familiar_followers_modal.tsx
index 0ec081d586..f276e9a9ad 100644
--- a/app/soapbox/features/ui/components/familiar_followers_modal.tsx
+++ b/app/soapbox/features/ui/components/familiar_followers_modal.tsx
@@ -17,7 +17,7 @@ interface IFamiliarFollowersModal {
 
 const FamiliarFollowersModal = ({ accountId, onClose }: IFamiliarFollowersModal) => {
   const account = useAppSelector(state => getAccount(state, accountId));
-  const familiarFollowerIds: ImmutableOrderedSet<string> = useAppSelector(state => state.user_lists.getIn(['familiar_followers', accountId]));
+  const familiarFollowerIds: ImmutableOrderedSet<string> = useAppSelector(state => state.user_lists.familiar_followers.get(accountId)?.items || ImmutableOrderedSet());
 
   const onClickClose = () => {
     onClose('FAMILIAR_FOLLOWERS');
@@ -43,7 +43,6 @@ const FamiliarFollowersModal = ({ accountId, onClose }: IFamiliarFollowersModal)
     );
   }
 
-
   return (
     <Modal
       title={<FormattedMessage id='column.familiar_followers' defaultMessage='People you know following {name}' values={{ name: <span dangerouslySetInnerHTML={{ __html: account?.display_name_html || '' }} /> }} />}
diff --git a/app/soapbox/features/ui/components/favourites_modal.tsx b/app/soapbox/features/ui/components/favourites_modal.tsx
index f6089acf63..60bc9123f0 100644
--- a/app/soapbox/features/ui/components/favourites_modal.tsx
+++ b/app/soapbox/features/ui/components/favourites_modal.tsx
@@ -15,7 +15,7 @@ interface IFavouritesModal {
 const FavouritesModal: React.FC<IFavouritesModal> = ({ onClose, statusId }) => {
   const dispatch = useAppDispatch();
 
-  const accountIds = useAppSelector((state) => state.user_lists.getIn(['favourited_by', statusId]));
+  const accountIds = useAppSelector((state) => state.user_lists.favourited_by.get(statusId)?.items);
 
   const fetchData = () => {
     dispatch(fetchFavourites(statusId));
@@ -42,7 +42,7 @@ const FavouritesModal: React.FC<IFavouritesModal> = ({ onClose, statusId }) => {
         emptyMessage={emptyMessage}
         itemClassName='pb-3'
       >
-        {accountIds.map((id: string) =>
+        {accountIds.map((id) =>
           <AccountContainer key={id} id={id} />,
         )}
       </ScrollableList>
diff --git a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
index cf4748a63a..f22cde28b8 100644
--- a/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
+++ b/app/soapbox/features/ui/components/modals/report-modal/steps/other-actions-step.tsx
@@ -30,7 +30,7 @@ const OtherActionsStep = ({ account }: IOtherActionsStep) => {
   const features = useFeatures();
   const intl = useIntl();
 
-  const statusIds = useAppSelector((state) => OrderedSet(state.timelines.getIn([`account:${account.id}:with_replies`, 'items'])).union(state.reports.new.status_ids) as OrderedSet<string>);
+  const statusIds = useAppSelector((state) => OrderedSet(state.timelines.get(`account:${account.id}:with_replies`)!.items).union(state.reports.new.status_ids) as OrderedSet<string>);
   const isBlocked = useAppSelector((state) => state.reports.new.block);
   const isForward = useAppSelector((state) => state.reports.new.forward);
   const canForward = isRemote(account) && features.federating;
diff --git a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx b/app/soapbox/features/ui/components/pinned_accounts_panel.tsx
index d364d61e8e..1f5d3ebb63 100644
--- a/app/soapbox/features/ui/components/pinned_accounts_panel.tsx
+++ b/app/soapbox/features/ui/components/pinned_accounts_panel.tsx
@@ -1,4 +1,4 @@
-import { List as ImmutableList } from 'immutable';
+import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 import React, { useEffect } from 'react';
 import { FormattedMessage } from 'react-intl';
 
@@ -16,7 +16,7 @@ interface IPinnedAccountsPanel {
 
 const PinnedAccountsPanel: React.FC<IPinnedAccountsPanel> = ({ account, limit }) => {
   const dispatch = useAppDispatch();
-  const pinned = useAppSelector((state) => state.user_lists.getIn(['pinned', account.id, 'items'], ImmutableList())).slice(0, limit);
+  const pinned = useAppSelector((state) => state.user_lists.pinned.get(account.id)?.items || ImmutableOrderedSet<string>()).slice(0, limit);
 
   useEffect(() => {
     dispatch(fetchPinnedAccounts(account.id));
@@ -36,7 +36,7 @@ const PinnedAccountsPanel: React.FC<IPinnedAccountsPanel> = ({ account, limit })
         }}
       />}
     >
-      {pinned && pinned.map((suggestion: string) => (
+      {pinned && pinned.map((suggestion) => (
         <AccountContainer
           key={suggestion}
           id={suggestion}
diff --git a/app/soapbox/features/ui/components/profile_familiar_followers.tsx b/app/soapbox/features/ui/components/profile_familiar_followers.tsx
index 0b7c5b1446..a07f18c4da 100644
--- a/app/soapbox/features/ui/components/profile_familiar_followers.tsx
+++ b/app/soapbox/features/ui/components/profile_familiar_followers.tsx
@@ -24,7 +24,7 @@ const ProfileFamiliarFollowers: React.FC<IProfileFamiliarFollowers> = ({ account
   const dispatch = useDispatch();
   const me = useAppSelector((state) => state.me);
   const features = useFeatures();
-  const familiarFollowerIds: ImmutableOrderedSet<string> = useAppSelector(state => state.user_lists.getIn(['familiar_followers', account.id], ImmutableOrderedSet()));
+  const familiarFollowerIds = useAppSelector(state => state.user_lists.familiar_followers.get(account.id)?.items || ImmutableOrderedSet<string>());
   const familiarFollowers: ImmutableOrderedSet<Account | null> = useAppSelector(state => familiarFollowerIds.slice(0, 2).map(accountId => getAccount(state, accountId)));
 
   useEffect(() => {
diff --git a/app/soapbox/features/ui/components/reactions_modal.tsx b/app/soapbox/features/ui/components/reactions_modal.tsx
index f343dc5c40..7d0498c6dd 100644
--- a/app/soapbox/features/ui/components/reactions_modal.tsx
+++ b/app/soapbox/features/ui/components/reactions_modal.tsx
@@ -7,6 +7,7 @@ import ScrollableList from 'soapbox/components/scrollable_list';
 import { Emoji, Modal, Spinner, Tabs } from 'soapbox/components/ui';
 import AccountContainer from 'soapbox/containers/account_container';
 import { useAppDispatch, useAppSelector } from 'soapbox/hooks';
+import { ReactionRecord } from 'soapbox/reducers/user_lists';
 
 import type { Item } from 'soapbox/components/ui/tabs/tabs';
 
@@ -25,14 +26,10 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
   const dispatch = useAppDispatch();
   const intl = useIntl();
   const [reaction, setReaction] = useState(initialReaction);
-  const reactions = useAppSelector<ImmutableList<{
-    accounts: Array<string>,
-    count: number,
-    name: string,
-  }>>((state) => {
-    const favourites = state.user_lists.getIn(['favourited_by', statusId]);
-    const reactions = state.user_lists.getIn(['reactions', statusId]);
-    return favourites && reactions && ImmutableList(favourites.size ? [{ accounts: favourites, count: favourites.size, name: '👍' }] : []).concat(reactions || []);
+  const reactions = useAppSelector<ImmutableList<ReturnType<typeof ReactionRecord>> | undefined>((state) => {
+    const favourites = state.user_lists.favourited_by.get(statusId)?.items;
+    const reactions = state.user_lists.reactions.get(statusId)?.items;
+    return favourites && reactions && ImmutableList(favourites?.size ? [ReactionRecord({ accounts: favourites, count: favourites.size, name: '👍' })] : []).concat(reactions || []);
   });
 
   const fetchData = () => {
@@ -53,7 +50,7 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
       },
     ];
 
-    reactions.forEach(reaction => items.push(
+    reactions!.forEach(reaction => items.push(
       {
         text: <div className='flex items-center gap-1'>
           <Emoji className='w-4 h-4' emoji={reaction.name} />
@@ -73,7 +70,7 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
 
   const accounts = reactions && (reaction
     ? reactions.find(({ name }) => name === reaction)?.accounts.map(account => ({ id: account, reaction: reaction }))
-    : reactions.map(({ accounts, name }) => accounts.map(account => ({ id: account, reaction: name }))).flatten()) as Array<{ id: string, reaction: string }>;
+    : reactions.map(({ accounts, name }) => accounts.map(account => ({ id: account, reaction: name }))).flatten()) as ImmutableList<{ id: string, reaction: string }>;
 
   let body;
 
@@ -97,7 +94,6 @@ const ReactionsModal: React.FC<IReactionsModal> = ({ onClose, statusId, reaction
     </>);
   }
 
-
   return (
     <Modal
       title={<FormattedMessage id='column.reactions' defaultMessage='Reactions' />}
diff --git a/app/soapbox/features/ui/components/reblogs_modal.tsx b/app/soapbox/features/ui/components/reblogs_modal.tsx
index cb9906badb..3bacf3a25b 100644
--- a/app/soapbox/features/ui/components/reblogs_modal.tsx
+++ b/app/soapbox/features/ui/components/reblogs_modal.tsx
@@ -15,7 +15,7 @@ interface IReblogsModal {
 
 const ReblogsModal: React.FC<IReblogsModal> = ({ onClose, statusId }) => {
   const dispatch = useAppDispatch();
-  const accountIds = useAppSelector((state) => state.user_lists.getIn(['reblogged_by', statusId]));
+  const accountIds = useAppSelector((state) => state.user_lists.reblogged_by.get(statusId)?.items);
 
   const fetchData = () => {
     dispatch(fetchReblogs(statusId));
@@ -43,14 +43,13 @@ const ReblogsModal: React.FC<IReblogsModal> = ({ onClose, statusId }) => {
         emptyMessage={emptyMessage}
         itemClassName='pb-3'
       >
-        {accountIds.map((id: string) =>
+        {accountIds.map((id) =>
           <AccountContainer key={id} id={id} />,
         )}
       </ScrollableList>
     );
   }
 
-
   return (
     <Modal
       title={<FormattedMessage id='column.reblogs' defaultMessage='Reposts' />}
diff --git a/app/soapbox/features/ui/components/timeline.tsx b/app/soapbox/features/ui/components/timeline.tsx
index c58d9db799..bc7c01c47b 100644
--- a/app/soapbox/features/ui/components/timeline.tsx
+++ b/app/soapbox/features/ui/components/timeline.tsx
@@ -27,12 +27,12 @@ const Timeline: React.FC<ITimeline> = ({
   const dispatch = useAppDispatch();
   const getStatusIds = useCallback(makeGetStatusIds, [])();
 
-  const lastStatusId = useAppSelector(state => state.timelines.getIn([timelineId, 'items'], ImmutableOrderedSet()).last() as string | undefined);
+  const lastStatusId = useAppSelector(state => (state.timelines.get(timelineId)?.items || ImmutableOrderedSet()).last() as string | undefined);
   const statusIds = useAppSelector(state => getStatusIds(state, { type: timelineId }));
-  const isLoading = useAppSelector(state => state.timelines.getIn([timelineId, 'isLoading'], true) === true);
-  const isPartial = useAppSelector(state => state.timelines.getIn([timelineId, 'isPartial'], false) === true);
-  const hasMore = useAppSelector(state => state.timelines.getIn([timelineId, 'hasMore']) === true);
-  const totalQueuedItemsCount = useAppSelector(state => state.timelines.getIn([timelineId, 'totalQueuedItemsCount']));
+  const isLoading = useAppSelector(state => (state.timelines.get(timelineId) || { isLoading: true }).isLoading === true);
+  const isPartial = useAppSelector(state => (state.timelines.get(timelineId)?.isPartial || false) === true);
+  const hasMore = useAppSelector(state => state.timelines.get(timelineId)?.hasMore === true);
+  const totalQueuedItemsCount = useAppSelector(state => state.timelines.get(timelineId)?.totalQueuedItemsCount || 0);
 
   const handleDequeueTimeline = () => {
     dispatch(dequeueTimeline(timelineId, onLoadMore));
diff --git a/app/soapbox/reducers/__tests__/conversations.test.ts b/app/soapbox/reducers/__tests__/conversations.test.ts
index 496ea620de..b92c6b9315 100644
--- a/app/soapbox/reducers/__tests__/conversations.test.ts
+++ b/app/soapbox/reducers/__tests__/conversations.test.ts
@@ -1,4 +1,4 @@
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { List as ImmutableList, Record as ImmutableRecord } from 'immutable';
 
 import * as actions from 'soapbox/actions/conversations';
 
@@ -6,30 +6,30 @@ import reducer from '../conversations';
 
 describe('conversations reducer', () => {
   it('should return the initial state', () => {
-    expect(reducer(undefined, {})).toEqual(ImmutableMap({
+    expect(reducer(undefined, {} as any)).toMatchObject({
       items: ImmutableList(),
       isLoading: false,
       hasMore: true,
-      mounted: false,
-    }));
+      mounted: 0,
+    });
   });
 
   it('should handle CONVERSATIONS_FETCH_REQUEST', () => {
-    const state = ImmutableMap({ isLoading: false });
+    const state = ImmutableRecord({ isLoading: false })();
     const action = {
       type: actions.CONVERSATIONS_FETCH_REQUEST,
     };
-    expect(reducer(state, action).toJS()).toMatchObject({
+    expect(reducer(state as any, action).toJS()).toMatchObject({
       isLoading: true,
     });
   });
 
   it('should handle CONVERSATIONS_FETCH_FAIL', () => {
-    const state = ImmutableMap({ isLoading: true });
+    const state = ImmutableRecord({ isLoading: true })();
     const action = {
       type: actions.CONVERSATIONS_FETCH_FAIL,
     };
-    expect(reducer(state, action).toJS()).toMatchObject({
+    expect(reducer(state as any, action).toJS()).toMatchObject({
       isLoading: false,
     });
   });
diff --git a/app/soapbox/reducers/__tests__/push_notifications.test.ts b/app/soapbox/reducers/__tests__/push_notifications.test.ts
index e7080d42a7..6afcba258a 100644
--- a/app/soapbox/reducers/__tests__/push_notifications.test.ts
+++ b/app/soapbox/reducers/__tests__/push_notifications.test.ts
@@ -1,21 +1,19 @@
-import { Map as ImmutableMap } from 'immutable';
-
 import reducer from '../push_notifications';
 
 describe('push_notifications reducer', () => {
   it('should return the initial state', () => {
-    expect(reducer(undefined, {})).toEqual(ImmutableMap({
+    expect(reducer(undefined, {} as any).toJS()).toEqual({
       subscription: null,
-      alerts: ImmutableMap({
+      alerts: {
         follow: true,
         follow_request: true,
         favourite: true,
         reblog: true,
         mention: true,
         poll: true,
-      }),
+      },
       isSubscribed: false,
       browserSupport: false,
-    }));
+    });
   });
 });
diff --git a/app/soapbox/reducers/__tests__/timelines.test.ts b/app/soapbox/reducers/__tests__/timelines.test.ts
index 8f53da4f06..2ce8a5b9b8 100644
--- a/app/soapbox/reducers/__tests__/timelines.test.ts
+++ b/app/soapbox/reducers/__tests__/timelines.test.ts
@@ -1,4 +1,4 @@
-import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, Record as ImmutableRecord, fromJS } from 'immutable';
 
 import {
   TIMELINE_EXPAND_REQUEST,
@@ -10,7 +10,7 @@ import reducer from '../timelines';
 
 describe('timelines reducer', () => {
   it('should return the initial state', () => {
-    expect(reducer(undefined, {})).toEqual(ImmutableMap());
+    expect(reducer(undefined, {} as any)).toEqual(ImmutableMap());
   });
 
   describe('TIMELINE_EXPAND_REQUEST', () => {
@@ -27,16 +27,16 @@ describe('timelines reducer', () => {
 
   describe('TIMELINE_EXPAND_FAIL', () => {
     it('sets loading to false', () => {
-      const state = ImmutableMap(fromJS({
-        home: { isLoading: true },
-      }));
+      const state = ImmutableMap({
+        home: ImmutableRecord({ isLoading: true })(),
+      });
 
       const action = {
         type: TIMELINE_EXPAND_FAIL,
         timeline: 'home',
       };
 
-      const result = reducer(state, action);
+      const result = reducer(state as any, action);
       expect(result.getIn(['home', 'isLoading'])).toBe(false);
     });
   });
@@ -44,7 +44,7 @@ describe('timelines reducer', () => {
   describe('TIMELINE_EXPAND_SUCCESS', () => {
     it('sets loading to false', () => {
       const state = ImmutableMap(fromJS({
-        home: { isLoading: true },
+        home: ImmutableRecord({ isLoading: true })(),
       }));
 
       const action = {
@@ -52,7 +52,7 @@ describe('timelines reducer', () => {
         timeline: 'home',
       };
 
-      const result = reducer(state, action);
+      const result = reducer(state as any, action);
       expect(result.getIn(['home', 'isLoading'])).toBe(false);
     });
 
@@ -71,7 +71,7 @@ describe('timelines reducer', () => {
 
     it('merges new status IDs', () => {
       const state = ImmutableMap(fromJS({
-        home: { items: ImmutableOrderedSet(['5', '2', '1']) },
+        home: ImmutableRecord({ items: ImmutableOrderedSet(['5', '2', '1']) })(),
       }));
 
       const expected = ImmutableOrderedSet(['6', '5', '4', '2', '1']);
@@ -82,13 +82,13 @@ describe('timelines reducer', () => {
         statuses: [{ id: '6' }, { id: '5' }, { id: '4' }],
       };
 
-      const result = reducer(state, action);
+      const result = reducer(state as any, action);
       expect(result.getIn(['home', 'items'])).toEqual(expected);
     });
 
     it('merges old status IDs', () => {
       const state = ImmutableMap(fromJS({
-        home: { items: ImmutableOrderedSet(['6', '4', '3']) },
+        home: ImmutableRecord({ items: ImmutableOrderedSet(['6', '4', '3']) })(),
       }));
 
       const expected = ImmutableOrderedSet(['6', '4', '3', '5', '2', '1']);
@@ -99,13 +99,13 @@ describe('timelines reducer', () => {
         statuses: [{ id: '5' }, { id: '2' }, { id: '1' }],
       };
 
-      const result = reducer(state, action);
+      const result = reducer(state as any, action);
       expect(result.getIn(['home', 'items'])).toEqual(expected);
     });
 
     it('overrides pinned post IDs', () => {
       const state = ImmutableMap(fromJS({
-        'account:1:pinned': { items: ImmutableOrderedSet(['5', '2', '1']) },
+        'account:1:pinned': ImmutableRecord({ items: ImmutableOrderedSet(['5', '2', '1']) })(),
       }));
 
       const expected = ImmutableOrderedSet(['9', '8', '7']);
@@ -116,7 +116,7 @@ describe('timelines reducer', () => {
         statuses: [{ id: '9' }, { id: '8' }, { id: '7' }],
       };
 
-      const result = reducer(state, action);
+      const result = reducer(state as any, action);
       expect(result.getIn(['home', 'items'])).toEqual(expected);
     });
   });
diff --git a/app/soapbox/reducers/__tests__/user_lists.test.ts b/app/soapbox/reducers/__tests__/user_lists.test.ts
index 7c5ec7e204..5fbd5f1eaf 100644
--- a/app/soapbox/reducers/__tests__/user_lists.test.ts
+++ b/app/soapbox/reducers/__tests__/user_lists.test.ts
@@ -1,23 +1,24 @@
-import { Map as ImmutableMap } from 'immutable';
+import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 
 import reducer from '../user_lists';
 
 describe('user_lists reducer', () => {
   it('should return the initial state', () => {
-    expect(reducer(undefined, {})).toEqual(ImmutableMap({
-      followers: ImmutableMap(),
-      following: ImmutableMap(),
-      reblogged_by: ImmutableMap(),
-      favourited_by: ImmutableMap(),
-      follow_requests: ImmutableMap(),
-      blocks: ImmutableMap(),
-      reactions: ImmutableMap(),
-      mutes: ImmutableMap(),
-      groups: ImmutableMap(),
-      groups_removed_accounts: ImmutableMap(),
-      pinned: ImmutableMap(),
-      birthday_reminders: ImmutableMap(),
-      familiar_followers: ImmutableMap(),
-    }));
+    expect(reducer(undefined, {} as any)).toMatchObject({
+      followers: {},
+      following: {},
+      reblogged_by: {},
+      favourited_by: {},
+      reactions: {},
+      follow_requests: { next: null, items: ImmutableOrderedSet(), isLoading: false },
+      blocks: { next: null, items: ImmutableOrderedSet(), isLoading: false },
+      mutes: { next: null, items: ImmutableOrderedSet(), isLoading: false },
+      directory: { next: null, items: ImmutableOrderedSet(), isLoading: true },
+      groups: {},
+      groups_removed_accounts: {},
+      pinned: {},
+      birthday_reminders: {},
+      familiar_followers: {},
+    });
   });
 });
diff --git a/app/soapbox/reducers/conversations.js b/app/soapbox/reducers/conversations.ts
similarity index 70%
rename from app/soapbox/reducers/conversations.js
rename to app/soapbox/reducers/conversations.ts
index b001746d7f..622d11a23d 100644
Binary files a/app/soapbox/reducers/conversations.js and b/app/soapbox/reducers/conversations.ts differ
diff --git a/app/soapbox/reducers/pending_statuses.ts b/app/soapbox/reducers/pending_statuses.ts
index 090b8694a3..e0df9f07d2 100644
--- a/app/soapbox/reducers/pending_statuses.ts
+++ b/app/soapbox/reducers/pending_statuses.ts
@@ -1,11 +1,11 @@
 import { List as ImmutableList, Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutable';
-import { AnyAction } from 'redux';
 
 import {
   STATUS_CREATE_REQUEST,
   STATUS_CREATE_SUCCESS,
 } from 'soapbox/actions/statuses';
 
+import type { AnyAction } from 'redux';
 import type { StatusVisibility } from 'soapbox/normalizers/status';
 
 const PendingStatusRecord = ImmutableRecord({
diff --git a/app/soapbox/reducers/push_notifications.js b/app/soapbox/reducers/push_notifications.ts
similarity index 54%
rename from app/soapbox/reducers/push_notifications.js
rename to app/soapbox/reducers/push_notifications.ts
index 4358824795..0448abf088 100644
Binary files a/app/soapbox/reducers/push_notifications.js and b/app/soapbox/reducers/push_notifications.ts differ
diff --git a/app/soapbox/reducers/scheduled_statuses.js b/app/soapbox/reducers/scheduled_statuses.js
deleted file mode 100644
index f96573e880..0000000000
Binary files a/app/soapbox/reducers/scheduled_statuses.js and /dev/null differ
diff --git a/app/soapbox/reducers/scheduled_statuses.ts b/app/soapbox/reducers/scheduled_statuses.ts
new file mode 100644
index 0000000000..13b4a934d8
--- /dev/null
+++ b/app/soapbox/reducers/scheduled_statuses.ts
@@ -0,0 +1,57 @@
+import { List as ImmutableList, Map as ImmutableMap, Record as ImmutableRecord, fromJS } from 'immutable';
+
+import { STATUS_IMPORT, STATUSES_IMPORT } from 'soapbox/actions/importer';
+import {
+  SCHEDULED_STATUSES_FETCH_SUCCESS,
+  SCHEDULED_STATUS_CANCEL_REQUEST,
+  SCHEDULED_STATUS_CANCEL_SUCCESS,
+} from 'soapbox/actions/scheduled_statuses';
+import { STATUS_CREATE_SUCCESS } from 'soapbox/actions/statuses';
+
+import type { AnyAction } from 'redux';
+import type { StatusVisibility } from 'soapbox/normalizers/status';
+import type { APIEntity } from 'soapbox/types/entities';
+
+const ScheduledStatusRecord = ImmutableRecord({
+  id: '',
+  scheduled_at: new Date(),
+  media_attachments: null as ImmutableList<ImmutableMap<string, any>> | null,
+  text: '',
+  in_reply_to_id: null as string | null,
+  media_ids: null as ImmutableList<string> | null,
+  sensitive: false,
+  spoiler_text: '',
+  visibility: 'public' as StatusVisibility,
+  poll: null as ImmutableMap<string, any> | null,
+});
+
+export type ScheduledStatus = ReturnType<typeof ScheduledStatusRecord>;
+type State = ImmutableMap<string, ScheduledStatus>;
+
+const initialState: State = ImmutableMap();
+
+const importStatus = (state: State, { params, ...status }: APIEntity) => {
+  if (!status.scheduled_at) return state;
+  return state.set(status.id, ScheduledStatusRecord(ImmutableMap(fromJS({ ...status, ...params }))));
+};
+
+const importStatuses = (state: State, statuses: APIEntity[]) =>
+  state.withMutations(mutable => statuses.forEach(status => importStatus(mutable, status)));
+
+const deleteStatus = (state: State, id: string) => state.delete(id);
+
+export default function scheduled_statuses(state: State = initialState, action: AnyAction) {
+  switch (action.type) {
+    case STATUS_IMPORT:
+    case STATUS_CREATE_SUCCESS:
+      return importStatus(state, action.status);
+    case STATUSES_IMPORT:
+    case SCHEDULED_STATUSES_FETCH_SUCCESS:
+      return importStatuses(state, action.statuses);
+    case SCHEDULED_STATUS_CANCEL_REQUEST:
+    case SCHEDULED_STATUS_CANCEL_SUCCESS:
+      return deleteStatus(state, action.id);
+    default:
+      return state;
+  }
+}
diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.ts
similarity index 62%
rename from app/soapbox/reducers/settings.js
rename to app/soapbox/reducers/settings.ts
index b0329d00df..ee8ddc558d 100644
Binary files a/app/soapbox/reducers/settings.js and b/app/soapbox/reducers/settings.ts differ
diff --git a/app/soapbox/reducers/timelines.js b/app/soapbox/reducers/timelines.ts
similarity index 56%
rename from app/soapbox/reducers/timelines.js
rename to app/soapbox/reducers/timelines.ts
index a62a33a484..33ad2733e2 100644
Binary files a/app/soapbox/reducers/timelines.js and b/app/soapbox/reducers/timelines.ts differ
diff --git a/app/soapbox/reducers/user_lists.js b/app/soapbox/reducers/user_lists.js
deleted file mode 100644
index 69e8c181c4..0000000000
Binary files a/app/soapbox/reducers/user_lists.js and /dev/null differ
diff --git a/app/soapbox/reducers/user_lists.ts b/app/soapbox/reducers/user_lists.ts
new file mode 100644
index 0000000000..99483a854b
--- /dev/null
+++ b/app/soapbox/reducers/user_lists.ts
@@ -0,0 +1,193 @@
+import {
+  Map as ImmutableMap,
+  OrderedSet as ImmutableOrderedSet,
+  Record as ImmutableRecord,
+} from 'immutable';
+import { AnyAction } from 'redux';
+
+import {
+  FOLLOWERS_FETCH_SUCCESS,
+  FOLLOWERS_EXPAND_SUCCESS,
+  FOLLOWING_FETCH_SUCCESS,
+  FOLLOWING_EXPAND_SUCCESS,
+  FOLLOW_REQUESTS_FETCH_SUCCESS,
+  FOLLOW_REQUESTS_EXPAND_SUCCESS,
+  FOLLOW_REQUEST_AUTHORIZE_SUCCESS,
+  FOLLOW_REQUEST_REJECT_SUCCESS,
+  PINNED_ACCOUNTS_FETCH_SUCCESS,
+  BIRTHDAY_REMINDERS_FETCH_SUCCESS,
+} from '../actions/accounts';
+import {
+  BLOCKS_FETCH_SUCCESS,
+  BLOCKS_EXPAND_SUCCESS,
+} from '../actions/blocks';
+import {
+  DIRECTORY_FETCH_REQUEST,
+  DIRECTORY_FETCH_SUCCESS,
+  DIRECTORY_FETCH_FAIL,
+  DIRECTORY_EXPAND_REQUEST,
+  DIRECTORY_EXPAND_SUCCESS,
+  DIRECTORY_EXPAND_FAIL,
+} from '../actions/directory';
+import {
+  FAMILIAR_FOLLOWERS_FETCH_SUCCESS,
+} from '../actions/familiar_followers';
+import {
+  GROUP_MEMBERS_FETCH_SUCCESS,
+  GROUP_MEMBERS_EXPAND_SUCCESS,
+  GROUP_REMOVED_ACCOUNTS_FETCH_SUCCESS,
+  GROUP_REMOVED_ACCOUNTS_EXPAND_SUCCESS,
+  GROUP_REMOVED_ACCOUNTS_REMOVE_SUCCESS,
+} from '../actions/groups';
+import {
+  REBLOGS_FETCH_SUCCESS,
+  FAVOURITES_FETCH_SUCCESS,
+  REACTIONS_FETCH_SUCCESS,
+} from '../actions/interactions';
+import {
+  MUTES_FETCH_SUCCESS,
+  MUTES_EXPAND_SUCCESS,
+} from '../actions/mutes';
+import {
+  NOTIFICATIONS_UPDATE,
+} from '../actions/notifications';
+
+import type { APIEntity } from 'soapbox/types/entities';
+
+const ListRecord = ImmutableRecord({
+  next: null as string | null,
+  items: ImmutableOrderedSet<string>(),
+  isLoading: false,
+});
+
+export const ReactionRecord = ImmutableRecord({
+  accounts: ImmutableOrderedSet<string>(),
+  count: 0,
+  name: '',
+});
+
+const ReactionListRecord = ImmutableRecord({
+  next: null as string | null,
+  items: ImmutableOrderedSet<Reaction>(),
+  isLoading: false,
+});
+
+const ReducerRecord = ImmutableRecord({
+  followers: ImmutableMap<string, List>(),
+  following: ImmutableMap<string, List>(),
+  reblogged_by: ImmutableMap<string, List>(),
+  favourited_by: ImmutableMap<string, List>(),
+  reactions: ImmutableMap<string, ReactionList>(),
+  follow_requests: ListRecord(),
+  blocks: ListRecord(),
+  mutes: ListRecord(),
+  directory: ListRecord({ isLoading: true }),
+  groups: ImmutableMap<string, List>(),
+  groups_removed_accounts: ImmutableMap<string, List>(),
+  pinned: ImmutableMap<string, List>(),
+  birthday_reminders: ImmutableMap<string, List>(),
+  familiar_followers: ImmutableMap<string, List>(),
+});
+
+type State = ReturnType<typeof ReducerRecord>;
+type List = ReturnType<typeof ListRecord>;
+type Reaction = ReturnType<typeof ReactionRecord>;
+type ReactionList = ReturnType<typeof ReactionListRecord>;
+type Items = ImmutableOrderedSet<string>;
+type NestedListPath = ['followers' | 'following' | 'reblogged_by' | 'favourited_by' | 'reactions' | 'groups' | 'groups_removed_accounts' | 'pinned' | 'birthday_reminders' | 'familiar_followers', string];
+type ListPath = ['follow_requests' | 'blocks' | 'mutes' | 'directory'];
+
+const normalizeList = (state: State, path: NestedListPath | ListPath, accounts: APIEntity[], next?: string | null) => {
+
+  return state.setIn(path, ListRecord({
+    next,
+    items: ImmutableOrderedSet(accounts.map(item => item.id)),
+  }));
+};
+
+const appendToList = (state: State, path: NestedListPath | ListPath, accounts: APIEntity[], next: string | null) => {
+  return state.updateIn(path, map => {
+    return (map as List).set('next', next).update('items', list => (list as Items).concat(accounts.map(item => item.id)));
+  });
+};
+
+const removeFromList = (state: State, path: NestedListPath | ListPath, accountId: string) => {
+  return state.updateIn(path, map => {
+    return (map as List).update('items', list => (list as Items).filterNot(item => item === accountId));
+  });
+};
+
+const normalizeFollowRequest = (state: State, notification: APIEntity) => {
+  return state.updateIn(['follow_requests', 'items'], list => {
+    return ImmutableOrderedSet([notification.account.id]).union(list as Items);
+  });
+};
+
+export default function userLists(state = ReducerRecord(), action: AnyAction) {
+  switch (action.type) {
+    case FOLLOWERS_FETCH_SUCCESS:
+      return normalizeList(state, ['followers', action.id], action.accounts, action.next);
+    case FOLLOWERS_EXPAND_SUCCESS:
+      return appendToList(state, ['followers', action.id], action.accounts, action.next);
+    case FOLLOWING_FETCH_SUCCESS:
+      return normalizeList(state, ['following', action.id], action.accounts, action.next);
+    case FOLLOWING_EXPAND_SUCCESS:
+      return appendToList(state, ['following', action.id], action.accounts, action.next);
+    case REBLOGS_FETCH_SUCCESS:
+      return normalizeList(state, ['reblogged_by', action.id], action.accounts);
+    case FAVOURITES_FETCH_SUCCESS:
+      return normalizeList(state, ['favourited_by', action.id], action.accounts);
+    case REACTIONS_FETCH_SUCCESS:
+      return state.setIn(['reactions', action.id], ReactionListRecord({
+        items: ImmutableOrderedSet<Reaction>(action.reactions.map(({ accounts, ...reaction }: APIEntity) => ReactionRecord({
+          ...reaction,
+          accounts: ImmutableOrderedSet(accounts.map((account: APIEntity) => account.id)),
+        }))),
+      }));
+    case NOTIFICATIONS_UPDATE:
+      return action.notification.type === 'follow_request' ? normalizeFollowRequest(state, action.notification) : state;
+    case FOLLOW_REQUESTS_FETCH_SUCCESS:
+      return normalizeList(state, ['follow_requests'], action.accounts, action.next);
+    case FOLLOW_REQUESTS_EXPAND_SUCCESS:
+      return appendToList(state, ['follow_requests'], action.accounts, action.next);
+    case FOLLOW_REQUEST_AUTHORIZE_SUCCESS:
+    case FOLLOW_REQUEST_REJECT_SUCCESS:
+      return removeFromList(state, ['follow_requests'], action.id);
+    case BLOCKS_FETCH_SUCCESS:
+      return normalizeList(state, ['blocks'], action.accounts, action.next);
+    case BLOCKS_EXPAND_SUCCESS:
+      return appendToList(state, ['blocks'], action.accounts, action.next);
+    case MUTES_FETCH_SUCCESS:
+      return normalizeList(state, ['mutes'], action.accounts, action.next);
+    case MUTES_EXPAND_SUCCESS:
+      return appendToList(state, ['mutes'], action.accounts, action.next);
+    case DIRECTORY_FETCH_SUCCESS:
+      return normalizeList(state, ['directory'], action.accounts, action.next);
+    case DIRECTORY_EXPAND_SUCCESS:
+      return appendToList(state, ['directory'], action.accounts, action.next);
+    case DIRECTORY_FETCH_REQUEST:
+    case DIRECTORY_EXPAND_REQUEST:
+      return state.setIn(['directory', 'isLoading'], true);
+    case DIRECTORY_FETCH_FAIL:
+    case DIRECTORY_EXPAND_FAIL:
+      return state.setIn(['directory', 'isLoading'], false);
+    case GROUP_MEMBERS_FETCH_SUCCESS:
+      return normalizeList(state, ['groups', action.id], action.accounts, action.next);
+    case GROUP_MEMBERS_EXPAND_SUCCESS:
+      return appendToList(state, ['groups', action.id], action.accounts, action.next);
+    case GROUP_REMOVED_ACCOUNTS_FETCH_SUCCESS:
+      return normalizeList(state, ['groups_removed_accounts', action.id], action.accounts, action.next);
+    case GROUP_REMOVED_ACCOUNTS_EXPAND_SUCCESS:
+      return appendToList(state, ['groups_removed_accounts', action.id], action.accounts, action.next);
+    case GROUP_REMOVED_ACCOUNTS_REMOVE_SUCCESS:
+      return removeFromList(state, ['groups_removed_accounts', action.groupId], action.id);
+    case PINNED_ACCOUNTS_FETCH_SUCCESS:
+      return normalizeList(state, ['pinned', action.id], action.accounts, action.next);
+    case BIRTHDAY_REMINDERS_FETCH_SUCCESS:
+      return normalizeList(state, ['birthday_reminders', action.id], action.accounts, action.next);
+    case FAMILIAR_FOLLOWERS_FETCH_SUCCESS:
+      return normalizeList(state, ['familiar_followers', action.id], action.accounts, action.next);
+    default:
+      return state;
+  }
+}
diff --git a/app/soapbox/selectors/index.ts b/app/soapbox/selectors/index.ts
index c1160acd3a..4b91c8033e 100644
--- a/app/soapbox/selectors/index.ts
+++ b/app/soapbox/selectors/index.ts
@@ -221,7 +221,7 @@ export const makeGetNotification = () => {
 };
 
 export const getAccountGallery = createSelector([
-  (state: RootState, id: string) => state.timelines.getIn([`account:${id}:media`, 'items'], ImmutableList()),
+  (state: RootState, id: string) => state.timelines.get(`account:${id}:media`)?.items || ImmutableOrderedSet<string>(),
   (state: RootState)       => state.statuses,
   (state: RootState)       => state.accounts,
 ], (statusIds, statuses, accounts) => {
@@ -365,7 +365,7 @@ type ColumnQuery = { type: string, prefix?: string };
 
 export const makeGetStatusIds = () => createSelector([
   (state: RootState, { type, prefix }: ColumnQuery) => getSettings(state).get(prefix || type, ImmutableMap()),
-  (state: RootState, { type }: ColumnQuery) => state.timelines.getIn([type, 'items'], ImmutableOrderedSet()),
+  (state: RootState, { type }: ColumnQuery) => state.timelines.get(type)?.items || ImmutableOrderedSet(),
   (state: RootState) => state.statuses,
 ], (columnSettings, statusIds: ImmutableOrderedSet<string>, statuses) => {
   return statusIds.filter((id: string) => {
diff --git a/app/soapbox/stream.ts b/app/soapbox/stream.ts
index 5f4ced2352..8b09a86ad7 100644
--- a/app/soapbox/stream.ts
+++ b/app/soapbox/stream.ts
@@ -87,7 +87,6 @@ export function connectStream(
   };
 }
 
-
 export default function getStream(
   streamingAPIBaseURL: string,
   accessToken: string,
diff --git a/app/styles/components/crypto-donate.scss b/app/styles/components/crypto-donate.scss
index c90d279a31..4641c8269b 100644
--- a/app/styles/components/crypto-donate.scss
+++ b/app/styles/components/crypto-donate.scss
@@ -58,12 +58,7 @@
 }
 
 .crypto-donate-modal {
-  background: var(--foreground-color);
-  border-radius: 8px;
-  padding-bottom: 13px;
-
-  .crypto-address__actions .svg-icon {
-    width: 22px;
-    height: 22px;
+  .crypto-address {
+    padding: 0;
   }
 }