diff --git a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
index 4f0072cc24..ffa2e197d3 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/components/emoji/EmojiTextView.java
@@ -45,7 +45,7 @@ public class EmojiTextView extends AppCompatTextView {
 
     scaleEmojis = true;
     maxLength   = 1000;
-    originalFontSize = getResources().getDimension(R.dimen.small_font_size);
+    originalFontSize = getResources().getDimension(R.dimen.medium_font_size);
   }
 
   @Override public void setText(@Nullable CharSequence text, BufferType type) {
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
index 76de9c3fcc..f0d530253c 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/ConversationActivityV2.kt
@@ -853,7 +853,7 @@ class ConversationActivityV2 : PassphraseRequiredActionBarActivity(), InputBarDe
             // we need to add the inline icon
             val drawable = ContextCompat.getDrawable(this@ConversationActivityV2, R.drawable.ic_external)
             val imageSize = toPx(10, resources)
-            val imagePaddingTop = toPx(2, resources)
+            val imagePaddingTop = toPx(4, resources)
             drawable?.setBounds(0, 0, imageSize, imageSize)
             drawable?.setTint(getColorFromAttr(R.attr.message_sent_text_color))
 
diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
index c1eccee5ce..3eec96bd13 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/menus/ConversationMenuHelper.kt
@@ -440,8 +440,7 @@ object ConversationMenuHelper {
         var positiveButton = R.string.leave
 
         if(isKicked){
-            //todo GROUPSV2 we will need a new string for this (that says delete instead of leave)
-            message = Phrase.from(context, R.string.groupLeaveDescription)
+            message = Phrase.from(context, R.string.groupDeleteDescriptionMember)
                 .put(GROUP_NAME_KEY, groupName)
                 .format()
 
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index bdb58a2d43..0e91855589 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -266,7 +266,7 @@
             android:layout_marginVertical="@dimen/very_small_spacing"
             android:layout_marginHorizontal="@dimen/medium_spacing"
             android:textColor="@color/black"
-            android:textSize="@dimen/very_small_font_size"
+            android:textSize="@dimen/small_font_size"
             tools:text="This user's client is outdated, things may not work as expected" />
 
     </FrameLayout>
@@ -283,7 +283,7 @@
         android:textColor="?message_sent_text_color"
         android:paddingHorizontal="@dimen/medium_spacing"
         android:contentDescription="@string/AccessibilityId_outdated_group_banner"
-        android:textSize="@dimen/very_small_font_size"
+        android:textSize="@dimen/small_font_size"
         android:visibility="gone"
         tools:text="@string/groupLegacyBanner"
         tools:visibility="visible" />
diff --git a/app/src/main/res/layout/view_document.xml b/app/src/main/res/layout/view_document.xml
index c760a1a592..1159b60c1a 100644
--- a/app/src/main/res/layout/view_document.xml
+++ b/app/src/main/res/layout/view_document.xml
@@ -6,7 +6,8 @@
     android:layout_height="wrap_content"
     xmlns:tools="http://schemas.android.com/tools"
     android:orientation="horizontal"
-    android:padding="@dimen/medium_spacing"
+    android:paddingHorizontal="@dimen/medium_spacing"
+    android:paddingVertical="12dp"
     android:gravity="center"
     android:contentDescription="@string/AccessibilityId_document">
 
@@ -19,8 +20,8 @@
 
     <ImageView
         android:id="@+id/documentViewIconImageView"
-        android:layout_width="36dp"
-        android:layout_height="36dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:src="@drawable/ic_document_large_light"
         app:tint="?android:textColorPrimary" />
 
@@ -28,8 +29,8 @@
         android:id="@+id/documentTitleTextView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:textSize="@dimen/small_font_size"
+        android:layout_marginStart="12dp"
+        android:textSize="@dimen/medium_font_size"
         android:textColor="?android:textColorPrimary"
         tools:text="I'm a very long document title. Did you know that?"
         android:maxLines="2"
diff --git a/app/src/main/res/layout/view_open_group_invitation.xml b/app/src/main/res/layout/view_open_group_invitation.xml
index e102df18f4..8567c06f64 100644
--- a/app/src/main/res/layout/view_open_group_invitation.xml
+++ b/app/src/main/res/layout/view_open_group_invitation.xml
@@ -5,7 +5,8 @@
     android:layout_height="wrap_content"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:padding="12dp"
+    android:paddingHorizontal="@dimen/medium_spacing"
+    android:paddingVertical="12dp"
     android:orientation="horizontal"
     android:gravity="center_vertical">
 
diff --git a/app/src/main/res/layout/view_pending_attachment.xml b/app/src/main/res/layout/view_pending_attachment.xml
index 4d91e88ae6..a913177651 100644
--- a/app/src/main/res/layout/view_pending_attachment.xml
+++ b/app/src/main/res/layout/view_pending_attachment.xml
@@ -7,14 +7,14 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:contentDescription="@string/AccessibilityId_attachmentsClickToDownload"
     android:orientation="horizontal"
-    android:paddingHorizontal="12dp"
-    android:paddingVertical="@dimen/small_spacing"
+    android:paddingHorizontal="@dimen/medium_spacing"
+    android:paddingVertical="12dp"
     android:gravity="center">
 
     <ImageView
         android:id="@+id/pendingDownloadIcon"
-        android:layout_width="16dp"
-        android:layout_height="16dp"
+        android:layout_width="24dp"
+        android:layout_height="24dp"
         android:src="@drawable/ic_images"
         app:tint="?android:textColorPrimary" />
 
@@ -22,8 +22,8 @@
         android:id="@+id/pendingDownloadSize"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="4dp"
-        android:textSize="@dimen/very_small_font_size"
+        android:layout_marginStart="12dp"
+        android:textSize="@dimen/medium_font_size"
         android:textColor="?android:textColorPrimary"
         android:maxLines="1"
         tools:text="1.23MB"
@@ -40,7 +40,7 @@
         android:id="@+id/pendingDownloadTitle"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="@dimen/very_small_font_size"
+        android:textSize="@dimen/medium_font_size"
         android:textColor="?android:textColorPrimary"
         tools:text="I'm a very long document title. Did you know that?"
         android:maxLines="2"
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 2233037e81..492cc2c732 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -4,13 +4,12 @@
     <!-- Font Sizes -->
     <dimen name="tiny_font_size">9sp</dimen>
     <dimen name="very_small_font_size">12sp</dimen>
-    <dimen name="small_font_size">15sp</dimen>
-    <dimen name="medium_font_size">17sp</dimen>
+    <dimen name="small_font_size">14sp</dimen>
+    <dimen name="medium_font_size">16sp</dimen>
     <dimen name="large_font_size">20sp</dimen>
     <dimen name="very_large_font_size">26sp</dimen>
 
     <!-- Need to be temporary added until the theming is properly centralised in Compose -->
-    <dimen name="small2_font_size">16sp</dimen>
     <dimen name="medium2_font_size">18sp</dimen>
 
     <!-- Element Sizes -->
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index c6abb3ae30..255044ab4d 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -73,7 +73,7 @@
 
     <style name="MenuTextAppearance" parent="TextAppearance.AppCompat.Widget.ActionBar.Menu">
         <item name="android:textAllCaps">false</item>
-        <item name="android:textSize">@dimen/small2_font_size</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
         <item name="android:textStyle">bold</item>
     </style>
 
@@ -83,7 +83,7 @@
     </style>
 
     <style name="TextAppearance.Session.Dialog.Message" parent="TextAppearance.AppCompat.Body1">
-        <item name="android:textSize">@dimen/small2_font_size</item>
+        <item name="android:textSize">@dimen/small_font_size</item>
     </style>
 
     <style name="ThemeOverlay.Session.AlertDialog" parent="ThemeOverlay.AppCompat.Dialog.Alert">
diff --git a/libsession/src/main/res/values/strings.xml b/libsession/src/main/res/values/strings.xml
index 3bae00ec5a..b20ef3c403 100644
--- a/libsession/src/main/res/values/strings.xml
+++ b/libsession/src/main/res/values/strings.xml
@@ -411,6 +411,7 @@
     <string name="groupCreate">Create Group</string>
     <string name="groupCreateErrorNoMembers">Please pick at least one other group member.</string>
     <string name="groupDelete">Delete Group</string>
+    <string name="groupDeleteDescriptionMember">Are you sure you want to delete <b>{group_name}</b>?</string>
     <string name="groupDeleteDescription">Are you sure you want to delete <b>{group_name}</b>? This will remove all members and delete all group content.</string>
     <string name="groupDeletedMemberDescription">{group_name} has been deleted by a group admin. You will not be able to send any more messages.</string>
     <string name="groupDescriptionEnter">Enter a group description</string>