diff --git a/packages/nicolium/src/components/statuses/status-content.tsx b/packages/nicolium/src/components/statuses/status-content.tsx
index 80e5ade2b..8df2f76ca 100644
--- a/packages/nicolium/src/components/statuses/status-content.tsx
+++ b/packages/nicolium/src/components/statuses/status-content.tsx
@@ -290,6 +290,7 @@ const StatusContent: React.FC<IStatusContent> = React.memo(
             direction={direction}
             lang={status.language ?? undefined}
             size={textSize}
+            tag='div'
           >
             {parsedContent}
           </Markup>,
diff --git a/packages/nicolium/src/features/compose/components/reply-indicator.tsx b/packages/nicolium/src/features/compose/components/reply-indicator.tsx
index 50fe249b5..af66bf5ac 100644
--- a/packages/nicolium/src/features/compose/components/reply-indicator.tsx
+++ b/packages/nicolium/src/features/compose/components/reply-indicator.tsx
@@ -73,7 +73,12 @@ const ReplyIndicator: React.FC<IReplyIndicator> = ({
         hideActions={hideActions}
       />
 
-      <Markup className='break-words' size='sm' direction={getTextDirection(status.search_index)}>
+      <Markup
+        className='break-words'
+        size='sm'
+        direction={getTextDirection(status.search_index)}
+        tag='div'
+      >
         <ParsedContent
           html={status.content}
           mentions={status.mentions}
diff --git a/packages/nicolium/src/features/notifications/components/notification.tsx b/packages/nicolium/src/features/notifications/components/notification.tsx
index ed727f9b8..ea108973e 100644
--- a/packages/nicolium/src/features/notifications/components/notification.tsx
+++ b/packages/nicolium/src/features/notifications/components/notification.tsx
@@ -241,6 +241,7 @@ const StatusPreview: React.FC<IStatusPreview> = ({ status }) => {
         truncate
         className='line-clamp-2 inline text-ellipsis [&_br]:hidden [&_p:first-child]:inline [&_p:first-child]:truncate [&_p]:hidden'
         size='sm'
+        tag='div'
       >
         <ParsedContent
           key='content'
diff --git a/packages/nicolium/src/pages/timelines/landing-timeline.tsx b/packages/nicolium/src/pages/timelines/landing-timeline.tsx
index 9a214d91a..9afc98470 100644
--- a/packages/nicolium/src/pages/timelines/landing-timeline.tsx
+++ b/packages/nicolium/src/pages/timelines/landing-timeline.tsx
@@ -41,7 +41,7 @@ const SiteBanner: React.FC = () => {
       </LogoText>
 
       {instance.description.trim().length > 0 && (
-        <Markup size='lg' direction={getTextDirection(instance.description)}>
+        <Markup size='lg' direction={getTextDirection(instance.description)} tag='div'>
           <ParsedContent html={instance.description} />
         </Markup>
       )}
diff --git a/packages/nicolium/src/styles/new/forms.scss b/packages/nicolium/src/styles/new/forms.scss
index f7a6b648f..807eb79d2 100644
--- a/packages/nicolium/src/styles/new/forms.scss
+++ b/packages/nicolium/src/styles/new/forms.scss
@@ -389,7 +389,7 @@
     cursor: default;
   }
 
-  &:not([type="radio"]) {
+  &:not([type='radio']) {
     &:not(:checked, :disabled) {
       background-color: rgb(var(--color-gray-500));
     }
@@ -411,7 +411,7 @@
     }
   }
 
-  &[type="radio"] {
+  &[type='radio'] {
     border: 2px solid;
 
     &::after {
@@ -455,7 +455,7 @@
       }
     }
 
-    &[type="radio"] {
+    &[type='radio'] {
       width: unset;
 
       &::after {
@@ -477,7 +477,7 @@
       }
     }
 
-    &[type="radio"] {
+    &[type='radio'] {
       width: unset;
 
       &::after {
@@ -487,7 +487,7 @@
     }
   }
 
-  &--sm:not([type="radio"]):checked::after {
+  &--sm:not([type='radio']):checked::after {
     transform: translateX(0.875rem);
 
     [dir='rtl'] & {
@@ -495,7 +495,7 @@
     }
   }
 
-  &--md:not([type="radio"]):checked::after {
+  &--md:not([type='radio']):checked::after {
     transform: translateX(1rem);
 
     [dir='rtl'] & {
@@ -503,7 +503,7 @@
     }
   }
 
-  &[type="radio"] {
+  &[type='radio'] {
     &::after {
       border-radius: 9999px;
     }
diff --git a/packages/nicolium/src/styles/new/layout.scss b/packages/nicolium/src/styles/new/layout.scss
index 7bbf9bfd1..bf9a35814 100644
--- a/packages/nicolium/src/styles/new/layout.scss
+++ b/packages/nicolium/src/styles/new/layout.scss
@@ -768,7 +768,6 @@ body {
     padding-bottom: 1.5rem;
   }
 
-
   &__header {
     display: flex;
     align-items: center;