diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
index 7d47aa240..e12b737e5 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/components/RichTextViewer.kt
@@ -788,24 +788,10 @@ private fun DisplayFullNote(
     nav: (String) -> Unit,
     loadedLink: LoadedBechLink
 ) {
-    val borderColor = MaterialTheme.colors.subtleBorder
-
-    val modifier = remember {
-        Modifier
-            .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
-            .fillMaxWidth()
-            .clip(shape = QuoteBorder)
-            .border(
-                1.dp,
-                borderColor,
-                QuoteBorder
-            )
-    }
-
     NoteCompose(
         baseNote = it,
         accountViewModel = accountViewModel,
-        modifier = modifier,
+        modifier = MaterialTheme.colors.replyModifier,
         parentBackgroundColor = backgroundColor,
         isQuotedNote = true,
         nav = nav
@@ -976,15 +962,7 @@ private fun DisplayNoteFromTag(
         NoteCompose(
             baseNote = baseNote,
             accountViewModel = accountViewModel,
-            modifier = Modifier
-                .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
-                .fillMaxWidth()
-                .clip(shape = QuoteBorder)
-                .border(
-                    1.dp,
-                    MaterialTheme.colors.subtleBorder,
-                    QuoteBorder
-                ),
+            modifier = MaterialTheme.colors.innerPostModifier,
             parentBackgroundColor = backgroundColor,
             isQuotedNote = true,
             nav = nav
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt
index 03e4b4157..1491f2148 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/MultiSetCompose.kt
@@ -393,7 +393,7 @@ private fun AuthorPictureAndComment(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Box(modifier = sizedModifier, contentAlignment = Alignment.BottomCenter) {
+    Box(modifier = Size35Modifier, contentAlignment = Alignment.BottomCenter) {
         DisplayPicture(authorComment, accountViewModel)
         DisplayAmount(authorComment)
     }
@@ -469,7 +469,7 @@ fun AuthorGallery(
     nav: (String) -> Unit,
     accountViewModel: AccountViewModel
 ) {
-    Column(modifier = remember { Modifier.padding(start = 10.dp) }) {
+    Column(modifier = StdStartPadding) {
         FlowRow() {
             authorNotes.forEach { note ->
                 BoxedAuthor(note, backgroundColor, nav, accountViewModel)
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
index a3a6805d1..c4255fa00 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/theme/Theme.kt
@@ -132,6 +132,26 @@ val DarkReplyBorderModifier = Modifier
     )
 
 val LightReplyBorderModifier = Modifier
+    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+    .fillMaxWidth()
+    .clip(shape = QuoteBorder)
+    .border(
+        1.dp,
+        LightSubtleBorder,
+        QuoteBorder
+    )
+
+val DarkInnerPostBorderModifier = Modifier
+    .padding(top = 2.dp, bottom = 0.dp, start = 0.dp, end = 0.dp)
+    .fillMaxWidth()
+    .clip(shape = QuoteBorder)
+    .border(
+        1.dp,
+        DarkSubtleBorder,
+        QuoteBorder
+    )
+
+val LightInnerPostBorderModifier = Modifier
     .padding(top = 5.dp)
     .fillMaxWidth()
     .clip(shape = QuoteBorder)
@@ -266,6 +286,9 @@ val Colors.imageModifier: Modifier
 val Colors.replyModifier: Modifier
     get() = if (isLight) LightReplyBorderModifier else DarkReplyBorderModifier
 
+val Colors.innerPostModifier: Modifier
+    get() = if (isLight) LightInnerPostBorderModifier else DarkInnerPostBorderModifier
+
 @Composable
 fun AmethystTheme(darkTheme: Boolean = isSystemInDarkTheme(), content: @Composable () -> Unit) {
     val colors = if (darkTheme) {