diff --git a/src/screens/Messages/ChatList.tsx b/src/screens/Messages/ChatList.tsx
index 92867ccfbe..dbc669c3c8 100644
--- a/src/screens/Messages/ChatList.tsx
+++ b/src/screens/Messages/ChatList.tsx
@@ -272,7 +272,7 @@ export function ChatList({
 
   if (conversations.length === 0) {
     return (
-      <Layout.Center>
+      <Layout.Center style={web({minHeight: '100%'})}>
         {isLoading ? (
           <ChatListLoadingPlaceholder />
         ) : (
@@ -319,6 +319,7 @@ export function ChatList({
                 iconSize="4xl"
                 textStyle={t.atoms.text}
                 iconColor={t.atoms.text.color}
+                style={web([a.h_full, a.justify_center, {paddingBottom: 120}])}
               />
             ) : (
               <EmptyState
@@ -335,6 +336,7 @@ export function ChatList({
                   color: 'primary',
                   icon: MessagePlusIcon,
                 }}
+                style={web([a.h_full, a.justify_center, {paddingBottom: 120}])}
               />
             )}
           </>
diff --git a/src/screens/Messages/Inbox.tsx b/src/screens/Messages/Inbox.tsx
index b9d0792464..360786f5b9 100644
--- a/src/screens/Messages/Inbox.tsx
+++ b/src/screens/Messages/Inbox.tsx
@@ -25,10 +25,11 @@ import {useMessagesEventBus} from '#/state/messages/events'
 import {useLeftConvos} from '#/state/queries/messages/leave-conversation'
 import {useListConvosQuery} from '#/state/queries/messages/list-conversations'
 import {useUpdateAllRead} from '#/state/queries/messages/update-all-read'
+import {EmptyState} from '#/view/com/util/EmptyState'
 import {FAB} from '#/view/com/util/fab/FAB'
 import {List} from '#/view/com/util/List'
 import {ChatListLoadingPlaceholder} from '#/view/com/util/LoadingPlaceholder'
-import {atoms as a, useBreakpoints, useTheme} from '#/alf'
+import {atoms as a, useBreakpoints, useTheme, web} from '#/alf'
 import {AgeRestrictedScreen} from '#/components/ageAssurance/AgeRestrictedScreen'
 import {useAgeAssuranceCopy} from '#/components/ageAssurance/useAgeAssuranceCopy'
 import {Button, ButtonIcon, ButtonText} from '#/components/Button'
@@ -37,7 +38,7 @@ import {ArrowLeft_Stroke2_Corner0_Rounded as ArrowLeftIcon} from '#/components/i
 import {ArrowRotateCounterClockwise_Stroke2_Corner0_Rounded as RetryIcon} from '#/components/icons/ArrowRotate'
 import {Check_Stroke2_Corner0_Rounded as CheckIcon} from '#/components/icons/Check'
 import {CircleInfo_Stroke2_Corner0_Rounded as CircleInfoIcon} from '#/components/icons/CircleInfo'
-import {Message_Stroke2_Corner0_Rounded as MessageIcon} from '#/components/icons/Message'
+import {Inbox_Stroke2_Corner2_Rounded_Large as InboxLargeIcon} from '#/components/icons/Inbox'
 import * as Layout from '#/components/Layout'
 import {ListFooter} from '#/components/Lists'
 import * as Toast from '#/components/Toast'
@@ -182,7 +183,7 @@ function RequestList({
 
   if (conversations.length < 1) {
     return (
-      <Layout.Center>
+      <Layout.Center style={web([a.h_full])}>
         {isLoading ? (
           <ChatListLoadingPlaceholder />
         ) : (
@@ -224,48 +225,36 @@ function RequestList({
                 </View>
               </>
             ) : (
-              <>
-                <View style={[a.pt_3xl, a.align_center]}>
-                  <MessageIcon width={48} fill={t.palette.primary_500} />
-                  <Text
-                    style={[a.pt_md, a.pb_sm, a.text_2xl, a.font_semi_bold]}>
-                    <Trans comment="Title message shown in chat requests inbox when it's empty">
-                      Inbox zero!
-                    </Trans>
-                  </Text>
-                  <Text
-                    style={[
-                      a.text_md,
-                      a.pb_xl,
-                      a.text_center,
-                      a.leading_snug,
-                      t.atoms.text_contrast_medium,
-                    ]}>
-                    <Trans>
-                      You don't have any chat requests at the moment.
-                    </Trans>
-                  </Text>
-                  {!isWithinSplitView && (
-                    <Button
-                      variant="solid"
-                      color="secondary"
-                      size="small"
-                      label={l`Go back`}
-                      onPress={() => {
-                        if (navigation.canGoBack()) {
-                          navigation.goBack()
-                        } else {
-                          navigation.navigate('Messages', {animation: 'pop'})
-                        }
-                      }}>
-                      <ButtonIcon icon={ArrowLeftIcon} />
-                      <ButtonText>
-                        <Trans>Back to Chats</Trans>
-                      </ButtonText>
-                    </Button>
-                  )}
-                </View>
-              </>
+              <EmptyState
+                message={l({
+                  message: `Inbox zero!`,
+                  comment:
+                    "Title message shown in chat requests inbox when it's empty",
+                })}
+                icon={InboxLargeIcon}
+                iconSize="4xl"
+                textStyle={t.atoms.text}
+                iconColor={t.atoms.text.color}
+                button={
+                  isWithinSplitView
+                    ? undefined
+                    : {
+                        label: l`Back to Chats`,
+                        text: l`Back`,
+                        onPress: () => {
+                          if (navigation.canGoBack()) {
+                            navigation.goBack()
+                          } else {
+                            navigation.navigate('Messages', {animation: 'pop'})
+                          }
+                        },
+                        size: 'small',
+                        color: 'secondary',
+                        icon: ArrowLeftIcon,
+                      }
+                }
+                style={web([a.h_full, a.justify_center, a.pb_5xl])}
+              />
             )}
           </>
         )}