diff --git a/src/App.tsx b/src/App.tsx
index 0104099..381b41b 100644
--- a/src/App.tsx
+++ b/src/App.tsx
@@ -2571,7 +2571,7 @@ function App() {
                 lineHeight: '15px',
               }}
             >
-              The Application <br></br>{' '}
+              The Application <br></br>
               <TextItalic>{requestConnection?.hostname}</TextItalic> <br></br>
               <TextSpan>is requestion a connection</TextSpan>
             </TextP>
@@ -2580,8 +2580,8 @@ function App() {
 
             <Box
               sx={{
-                display: 'flex',
                 alignItems: 'center',
+                display: 'flex',
                 gap: '14px',
               }}
             >
@@ -2644,7 +2644,7 @@ function App() {
                 lineHeight: '15px',
               }}
             >
-              The Application <br></br>{' '}
+              The Application <br></br>
               <TextItalic>{requestConnection?.hostname}</TextItalic> <br></br>
               <TextSpan>requests authentication</TextSpan>
             </TextP>
diff --git a/src/common/BoundedNumericTextField.tsx b/src/common/BoundedNumericTextField.tsx
index f64c8ad..803011e 100644
--- a/src/common/BoundedNumericTextField.tsx
+++ b/src/common/BoundedNumericTextField.tsx
@@ -140,7 +140,7 @@ export const BoundedNumericTextField = ({
                 sx={{
                   color: theme.palette.text.primary,
                 }}
-              />{' '}
+              />
             </IconButton>
             <IconButton
               size="small"
@@ -150,7 +150,7 @@ export const BoundedNumericTextField = ({
                 sx={{
                   color: theme.palette.text.primary,
                 }}
-              />{' '}
+              />
             </IconButton>
           </InputAdornment>
         ) : (
diff --git a/src/components/Chat/MessageItem.tsx b/src/components/Chat/MessageItem.tsx
index a50d312..a54ac70 100644
--- a/src/components/Chat/MessageItem.tsx
+++ b/src/components/Chat/MessageItem.tsx
@@ -468,7 +468,7 @@ export const MessageItem = memo(
                             }}
                           >
                             {reaction}
-                          </div>{' '}
+                          </div>
                           {numberOfReactions > 1 && (
                             <Typography
                               sx={{
diff --git a/src/components/Embeds/AttachmentEmbed.tsx b/src/components/Embeds/AttachmentEmbed.tsx
index e8a7d71..46d18cc 100644
--- a/src/components/Embeds/AttachmentEmbed.tsx
+++ b/src/components/Embeds/AttachmentEmbed.tsx
@@ -243,7 +243,6 @@ export const AttachmentCard = ({
               width: '100%',
             }}
           >
-            {' '}
             <Typography
               sx={{
                 fontSize: '14px',
@@ -251,7 +250,7 @@ export const AttachmentCard = ({
               }}
             >
               {errorMsg}
-            </Typography>{' '}
+            </Typography>
           </Box>
         )}
       </Box>
diff --git a/src/components/Embeds/ImageEmbed.tsx b/src/components/Embeds/ImageEmbed.tsx
index 53bedc5..487fe25 100644
--- a/src/components/Embeds/ImageEmbed.tsx
+++ b/src/components/Embeds/ImageEmbed.tsx
@@ -177,7 +177,6 @@ export const ImageCard = ({
               justifyContent: 'center',
             }}
           >
-            {' '}
             <Typography
               sx={{
                 fontSize: '14px',
diff --git a/src/components/Embeds/PollEmbed.tsx b/src/components/Embeds/PollEmbed.tsx
index 8959d39..84c28e4 100644
--- a/src/components/Embeds/PollEmbed.tsx
+++ b/src/components/Embeds/PollEmbed.tsx
@@ -325,10 +325,8 @@ export const PollCard = ({
                 fontStyle: 'italic',
               }}
             >
-              {' '}
-              {`${poll?.votes?.totalVotes} ${
-                poll?.votes?.totalVotes === 1 ? ' vote' : ' votes'
-              }`}
+              {poll?.votes?.totalVotes}{' '}
+              {poll?.votes?.totalVotes === 1 ? ' vote' : ' votes'}
             </Typography>
           </Box>
 
diff --git a/src/components/GeneralNotifications.tsx b/src/components/GeneralNotifications.tsx
index 53e85a8..4164214 100644
--- a/src/components/GeneralNotifications.tsx
+++ b/src/components/GeneralNotifications.tsx
@@ -157,7 +157,7 @@ export const GeneralNotifications = ({ address }) => {
                     sx={{
                       color: theme.palette.text.primary,
                     }}
-                  />{' '}
+                  />
                   {formatDate(latestTx?.timestamp)}
                 </Box>
 
diff --git a/src/components/Group/BlockedUsersModal.tsx b/src/components/Group/BlockedUsersModal.tsx
index e0a7b99..6bca8c2 100644
--- a/src/components/Group/BlockedUsersModal.tsx
+++ b/src/components/Group/BlockedUsersModal.tsx
@@ -412,7 +412,7 @@ export const BlockedUsersModal = () => {
               sx={{
                 color: theme.palette.text.primary,
               }}
-            />{' '}
+            />
             <Typography>
               {t('auth:message.generic.choose_block', {
                 postProcess: 'capitalizeFirstChar',
diff --git a/src/components/Group/Group.tsx b/src/components/Group/Group.tsx
index f4091f2..607280e 100644
--- a/src/components/Group/Group.tsx
+++ b/src/components/Group/Group.tsx
@@ -2124,7 +2124,6 @@ export const Group = ({
                       width: '100%',
                     }}
                   >
-                    {' '}
                     <Typography>
                       {t('group:message.generic.encryption_key', {
                         postProcess: 'capitalizeFirstChar',
diff --git a/src/components/Group/HomeDesktop.tsx b/src/components/Group/HomeDesktop.tsx
index f148be1..bcfff93 100644
--- a/src/components/Group/HomeDesktop.tsx
+++ b/src/components/Group/HomeDesktop.tsx
@@ -209,7 +209,7 @@ export const HomeDesktop = ({
                   sx={{
                     ccolor: theme.palette.text.primary,
                   }}
-                />{' '}
+                />
                 <Typography
                   sx={{
                     fontSize: '1rem',
@@ -218,7 +218,7 @@ export const HomeDesktop = ({
                   {t('tutorial:initial.explore', {
                     postProcess: 'capitalizeFirstChar',
                   })}
-                </Typography>{' '}
+                </Typography>
               </Box>
             </Divider>
 
diff --git a/src/components/Save/Save.tsx b/src/components/Save/Save.tsx
index 3d2b7cc..49a3761 100644
--- a/src/components/Save/Save.tsx
+++ b/src/components/Save/Save.tsx
@@ -307,8 +307,10 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                 {t('core:message.generic.settings', {
                   postProcess: 'capitalizeFirstChar',
                 })}
-              </Typography>{' '}
+              </Typography>
+
               <Spacer height="40px" />
+
               <Button
                 size="small"
                 onClick={() => {
@@ -353,10 +355,10 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
             {!myName ? (
               <Box
                 sx={{
-                  width: '100%',
+                  alignItems: 'center',
                   display: 'flex',
                   flexDirection: 'column',
-                  alignItems: 'center',
+                  width: '100%',
                 }}
               >
                 <Typography
@@ -458,7 +460,6 @@ export const Save = ({ isDesktop, disableWidth, myName }) => {
                               fontSize: '14px',
                             }}
                           >
-                            {' '}
                             {t('core:message.question.reset_pinned', {
                               postProcess: 'capitalizeFirstChar',
                             })}