diff --git a/components/atoms/ButtonWrapper.tsx b/components/atoms/ButtonWrapper.tsx
index d0a31b08..6c1b6794 100644
--- a/components/atoms/ButtonWrapper.tsx
+++ b/components/atoms/ButtonWrapper.tsx
@@ -37,7 +37,7 @@ function ButtonWrapper({ children, onClick, url, size = "md" }: ButtonWrapperPro
           alignItems="center"
           onClick={onClick}
         >
-          ,<Box>{children}</Box>
+          <Box>{children}</Box>
         </Button>
       )}
     </>
diff --git a/pageTemplates/square/SecretSquare/SecretSquareComments.tsx b/pageTemplates/square/SecretSquare/SecretSquareComments.tsx
index c4078b62..06af0330 100644
--- a/pageTemplates/square/SecretSquare/SecretSquareComments.tsx
+++ b/pageTemplates/square/SecretSquare/SecretSquareComments.tsx
@@ -116,16 +116,16 @@ function SecretSquareComments({ author, comments, refetch }: SecretSquareComment
         </Flex>
       </Slide>
       <Box
-        h={`calc(60px + ${iPhoneNotchSize()}px)`}
+        h={"60px"}
         position="fixed"
-        borderTop="var(--border-main)"
+        borderTop="var(--border)"
         bottom="0"
         flex={1}
         w="100%"
         backgroundColor="white"
         p="16px"
         marginBottom={`calc(16px + ${iPhoneNotchSize()}px)`}
-        borderBottom="var(--border-main)"
+        borderBottom="var(--border)"
         maxW="var(--max-width)"
       >
         <UserCommentInput user={SECRET_USER_SUMMARY} onSubmit={onSubmit} type="message" />
diff --git a/pages/chat/[uid].tsx b/pages/chat/[uid].tsx
index d1184976..0cb1c2e9 100644
--- a/pages/chat/[uid].tsx
+++ b/pages/chat/[uid].tsx
@@ -150,11 +150,11 @@ function Uid() {
         </Flex>
       </Slide>
       <Box
-        h={`calc(60px + ${iPhoneNotchSize()}px)`}
-        borderBottom="var(--border-main)"
+        h={`60px`}
+        borderBottom="var(--border)"
         position="fixed"
         marginBottom={`calc(16px + ${iPhoneNotchSize()}px)`}
-        borderTop="var(--border-main)"
+        borderTop="var(--border)"
         bottom="0"
         flex={1}
         w="100%"