diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
new file mode 100644
index 0000000000..6967d0b523
--- /dev/null
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/v2/input_bar/InputBar.kt
@@ -0,0 +1,28 @@
+package org.thoughtcrime.securesms.conversation.v2.input_bar
+
+import android.content.Context
+import android.util.AttributeSet
+import android.view.LayoutInflater
+import android.widget.LinearLayout
+import network.loki.messenger.R
+
+class InputBar : LinearLayout {
+
+    // region Lifecycle
+    constructor(context: Context) : super(context) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs) {
+        setUpViewHierarchy()
+    }
+
+    constructor(context: Context, attrs: AttributeSet, defStyleAttr: Int) : super(context, attrs, defStyleAttr) {
+        setUpViewHierarchy()
+    }
+
+    private fun setUpViewHierarchy() {
+        LayoutInflater.from(context).inflate(R.layout.view_input_bar, this)
+    }
+    // endregion
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_conversation_v2.xml b/app/src/main/res/layout/activity_conversation_v2.xml
index 9d5dcff51d..f59cacf377 100644
--- a/app/src/main/res/layout/activity_conversation_v2.xml
+++ b/app/src/main/res/layout/activity_conversation_v2.xml
@@ -10,12 +10,11 @@
         android:id="@+id/conversationRecyclerView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_marginBottom="40dp" />
+        android:layout_marginBottom="@dimen/input_bar_height" />
 
-    <View
+    <org.thoughtcrime.securesms.conversation.v2.input_bar.InputBar
         android:layout_width="match_parent"
-        android:layout_height="40dp"
-        android:background="@color/red"
+        android:layout_height="wrap_content"
         android:layout_alignParentBottom="true" />
 
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/view_input_bar.xml b/app/src/main/res/layout/view_input_bar.xml
new file mode 100644
index 0000000000..ce79624b4d
--- /dev/null
+++ b/app/src/main/res/layout/view_input_bar.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="@dimen/input_bar_height"
+    android:orientation="vertical">
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@color/separator" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <View
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_alignParentStart="true"
+            android:background="@color/red" />
+
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_marginStart="24dp"
+            android:layout_marginEnd="24dp" />
+
+        <View
+            android:layout_width="24dp"
+            android:layout_height="24dp"
+            android:layout_alignParentEnd="true"
+            android:background="@color/blue" />
+
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values-notnight-v21/colors.xml b/app/src/main/res/values-notnight-v21/colors.xml
index edfb18a33b..302c241c8d 100644
--- a/app/src/main/res/values-notnight-v21/colors.xml
+++ b/app/src/main/res/values-notnight-v21/colors.xml
@@ -20,10 +20,11 @@
     <color name="pn_option_background">#FCFCFC</color>
     <color name="open_group_chip_color">#0D000000</color>
     <color name="message_selected">#FFFFFF</color>
+    <color name="input_bar_background">#FCFCFC</color>
 
     <color name="default_background_start">#ffffff</color>
-    <color name="default_background_end">#fcfcfd</color>
-    <color name="action_bar_background">#fcfcfd</color>
+    <color name="default_background_end">#fcfcfc</color>
+    <color name="action_bar_background">#fcfcfc</color>
 
     <color name="app_icon_background">#333132</color>
     <color name="progress_bar_background">#0A000000</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 2eea313b33..51b2067573 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -27,6 +27,7 @@
     <color name="paths_building">#FFCE3A</color>
     <color name="open_group_chip_color">#0DFFFFFF</color>
     <color name="message_selected">#000000</color>
+    <color name="input_bar_background">#171717</color>
 
     <array name="profile_picture_placeholder_colors">
         <item>#5ff8b0</item>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index 3d44675888..146fe79268 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -1,8 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-    <!-- Session -->
-
     <!-- Font Sizes -->
     <dimen name="very_small_font_size">12sp</dimen>
     <dimen name="small_font_size">15sp</dimen>
@@ -38,6 +36,7 @@
     <dimen name="path_row_height">56dp</dimen>
     <dimen name="path_row_dot_size">8dp</dimen>
     <dimen name="path_row_expanded_dot_size">16dp</dimen>
+    <dimen name="input_bar_height">64dp</dimen>
 
     <!-- Distances -->
     <dimen name="small_spacing">8dp</dimen>
@@ -48,8 +47,6 @@
     <dimen name="new_conversation_button_bottom_offset">56dp</dimen>
     <dimen name="onboarding_button_bottom_offset">40dp</dimen>
 
-    <!-- Session -->
-
     <dimen name="emoji_drawer_size">32sp</dimen>
     <dimen name="min_keyboard_size">50dp</dimen>
     <dimen name="default_custom_keyboard_size">220dp</dimen>