diff --git a/Signal/Images.xcassets/Loki V2/ArrowUp.imageset/ArrowUp.pdf b/Signal/Images.xcassets/Loki V2/ArrowUp.imageset/ArrowUp.pdf
new file mode 100644
index 000000000..a142b6d5f
Binary files /dev/null and b/Signal/Images.xcassets/Loki V2/ArrowUp.imageset/ArrowUp.pdf differ
diff --git a/Signal/Images.xcassets/Loki V2/ArrowUp.imageset/Contents.json b/Signal/Images.xcassets/Loki V2/ArrowUp.imageset/Contents.json
new file mode 100644
index 000000000..3aae6207a
--- /dev/null
+++ b/Signal/Images.xcassets/Loki V2/ArrowUp.imageset/Contents.json	
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "ArrowUp.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Signal/Images.xcassets/Loki V2/QRCodeFilled.imageset/Contents.json b/Signal/Images.xcassets/Loki V2/QRCode.imageset/Contents.json
similarity index 100%
rename from Signal/Images.xcassets/Loki V2/QRCodeFilled.imageset/Contents.json
rename to Signal/Images.xcassets/Loki V2/QRCode.imageset/Contents.json
diff --git a/Signal/Images.xcassets/Loki V2/QRCodeFilled.imageset/QRCodeFilled.pdf b/Signal/Images.xcassets/Loki V2/QRCode.imageset/QRCodeFilled.pdf
similarity index 100%
rename from Signal/Images.xcassets/Loki V2/QRCodeFilled.imageset/QRCodeFilled.pdf
rename to Signal/Images.xcassets/Loki V2/QRCode.imageset/QRCodeFilled.pdf
diff --git a/Signal/Images.xcassets/Loki V2/StarOutline.imageset/Contents.json b/Signal/Images.xcassets/Loki V2/Star.imageset/Contents.json
similarity index 100%
rename from Signal/Images.xcassets/Loki V2/StarOutline.imageset/Contents.json
rename to Signal/Images.xcassets/Loki V2/Star.imageset/Contents.json
diff --git a/Signal/Images.xcassets/Loki V2/StarOutline.imageset/StarOutline.pdf b/Signal/Images.xcassets/Loki V2/Star.imageset/StarOutline.pdf
similarity index 100%
rename from Signal/Images.xcassets/Loki V2/StarOutline.imageset/StarOutline.pdf
rename to Signal/Images.xcassets/Loki V2/Star.imageset/StarOutline.pdf
diff --git a/Signal/src/Loki/Redesign/View Controllers/SettingsVC.swift b/Signal/src/Loki/Redesign/View Controllers/SettingsVC.swift
index 5f63a55cc..72281f660 100644
--- a/Signal/src/Loki/Redesign/View Controllers/SettingsVC.swift	
+++ b/Signal/src/Loki/Redesign/View Controllers/SettingsVC.swift	
@@ -243,7 +243,7 @@ final class SettingsVC : UIViewController, AvatarViewHelperDelegate {
             let closeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "X"), style: .plain, target: self, action: #selector(close))
             closeButton.tintColor = Colors.text
             navigationItem.leftBarButtonItem = closeButton
-            let qrCodeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "QRCodeFilled"), style: .plain, target: self, action: #selector(showQRCode))
+            let qrCodeButton = UIBarButtonItem(image: #imageLiteral(resourceName: "QRCode"), style: .plain, target: self, action: #selector(showQRCode))
             qrCodeButton.tintColor = Colors.text
             navigationItem.rightBarButtonItem = qrCodeButton
         }
diff --git a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
index 929c4c374..73c93a039 100644
--- a/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
+++ b/Signal/src/ViewControllers/ConversationView/ConversationInputToolbar.m
@@ -144,18 +144,14 @@ const CGFloat kMaxTextViewHeight = 120;
     SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _attachmentButton);
 
     _sendButton = [UIButton buttonWithType:UIButtonTypeCustom];
-    [self.sendButton setTitle:MessageStrings.sendButton forState:UIControlStateNormal];
-    [self.sendButton setTitleColor:LKColors.text forState:UIControlStateNormal];
-    self.sendButton.titleLabel.textAlignment = NSTextAlignmentCenter;
-    self.sendButton.titleLabel.font = [UIFont boldSystemFontOfSize:LKValues.mediumFontSize];
-    self.sendButton.contentEdgeInsets = UIEdgeInsetsMake(0, 4, 0, 4);
-    [self.sendButton autoSetDimension:ALDimensionHeight toSize:kMinTextViewHeight];
-    [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];
+    UIImage *sendImage = [UIImage imageNamed:@"ArrowUp"];
+    [self.sendButton setImage:sendImage forState:UIControlStateNormal];
+    [self.sendButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)];
     SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _sendButton);
+    [self.sendButton addTarget:self action:@selector(sendButtonPressed) forControlEvents:UIControlEventTouchUpInside];
 
-    UIImage *voiceMemoIcon = [UIImage imageNamed:@"Microphone"];
-    OWSAssertDebug(voiceMemoIcon);
     _voiceMemoButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    UIImage *voiceMemoIcon = [UIImage imageNamed:@"Microphone"];
     [self.voiceMemoButton setImage:voiceMemoIcon forState:UIControlStateNormal];
     [self.voiceMemoButton autoSetDimensionsToSize:CGSizeMake(40, kMinTextViewHeight)];
     SET_SUBVIEW_ACCESSIBILITY_IDENTIFIER(self, _voiceMemoButton);
@@ -210,9 +206,16 @@ const CGFloat kMaxTextViewHeight = 120;
     self.mentionCandidateSelectionViewSizeConstraint = [self.mentionCandidateSelectionView autoSetDimension:ALDimensionHeight toSize:0];
     self.mentionCandidateSelectionView.delegate = self;
     
+    // Button Container
+    UIView *buttonContainer = [UIView new];
+    [buttonContainer addSubview:self.voiceMemoButton];
+    [self.voiceMemoButton ows_autoPinToSuperviewEdges];
+    [buttonContainer addSubview:self.sendButton];
+    [self.sendButton ows_autoPinToSuperviewEdges];
+    
     // H Stack
     _hStack = [[UIStackView alloc]
-        initWithArrangedSubviews:@[ self.attachmentButton, vStackWrapper, self.voiceMemoButton, self.sendButton ]];
+        initWithArrangedSubviews:@[ self.attachmentButton, vStackWrapper, buttonContainer ]];
     self.hStack.axis = UILayoutConstraintAxisHorizontal;
     self.hStack.layoutMarginsRelativeArrangement = YES;
     self.hStack.layoutMargins = UIEdgeInsetsMake(LKValues.smallSpacing, LKValues.smallSpacing, LKValues.smallSpacing, LKValues.smallSpacing);
@@ -409,20 +412,20 @@ const CGFloat kMaxTextViewHeight = 120;
 {
     void (^updateBlock)(void) = ^{
         if (self.inputTextView.trimmedText.length > 0) {
-            if (!self.voiceMemoButton.isHidden) {
-                self.voiceMemoButton.hidden = YES;
+            if (self.voiceMemoButton.alpha != 0) {
+                self.voiceMemoButton.alpha = 0;
             }
 
-            if (self.sendButton.isHidden) {
-                self.sendButton.hidden = NO;
+            if (self.sendButton.alpha == 0) {
+                self.sendButton.alpha = 1;
             }
         } else {
-            if (self.voiceMemoButton.isHidden) {
-                self.voiceMemoButton.hidden = NO;
+            if (self.voiceMemoButton.alpha == 0) {
+                self.voiceMemoButton.alpha = 1;
             }
 
-            if (!self.sendButton.isHidden) {
-                self.sendButton.hidden = YES;
+            if (self.sendButton.alpha != 0) {
+                self.sendButton.alpha = 0;
             }
         }
         if (doLayout) {