diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
  */
 return array(
   'names' => array(
-    'conpherence.pkg.css' => '4aa80958',
+    'conpherence.pkg.css' => 'd93561e2',
     'conpherence.pkg.js' => '11f3e07e',
     'core.pkg.css' => '2fd26498',
     'core.pkg.js' => '1d376fa9',
@@ -49,7 +49,7 @@
     'rsrc/css/application/conpherence/durable-column.css' => '194ac487',
     'rsrc/css/application/conpherence/header-pane.css' => '517de9fe',
     'rsrc/css/application/conpherence/menu.css' => '78c7b811',
-    'rsrc/css/application/conpherence/message-pane.css' => '60e10176',
+    'rsrc/css/application/conpherence/message-pane.css' => 'bbbb8a9b',
     'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
     'rsrc/css/application/conpherence/participant-pane.css' => '7bba0b56',
     'rsrc/css/application/conpherence/transaction.css' => '46253e19',
@@ -621,7 +621,7 @@
     'conpherence-durable-column-view' => '194ac487',
     'conpherence-header-pane-css' => '517de9fe',
     'conpherence-menu-css' => '78c7b811',
-    'conpherence-message-pane-css' => '60e10176',
+    'conpherence-message-pane-css' => 'bbbb8a9b',
     'conpherence-notification-css' => '6cdcc253',
     'conpherence-participant-pane-css' => '7bba0b56',
     'conpherence-thread-manager' => '01774ab2',
diff --git a/src/view/form/control/PhabricatorRemarkupControl.php b/src/view/form/control/PhabricatorRemarkupControl.php
--- a/src/view/form/control/PhabricatorRemarkupControl.php
+++ b/src/view/form/control/PhabricatorRemarkupControl.php
@@ -203,6 +203,10 @@
         $classes[] = 'remarkup-assist-button';
       }
 
+      if ($action == 'fa-cloud-upload') {
+        $classes[] = 'remarkup-assist-upload';
+      }
+
       $href = idx($spec, 'href', '#');
       if ($href == '#') {
         $meta = array('action' => $action);
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -168,9 +168,23 @@
 }
 
 .device .conpherence-message-pane .remarkup-assist-bar {
+  position: absolute;
+  top: 12px;
+  left: 12px;
+  background: {$bluebackground};
+  border-radius: 3px;
+  border: none;
+}
+
+.device .remarkup-assist-button,
+.device .remarkup-assist-separator {
   display: none;
 }
 
+.device .remarkup-assist-button.remarkup-assist-upload {
+  display: block;
+}
+
 .device .conpherence-message-pane .phui-form-view {
   left: 0;
   right: 0;
@@ -346,7 +360,7 @@
 
 .device .conpherence-message-pane .remarkup-assist-textarea {
   margin: 0;
-  padding: 8px 68px 8px 8px;
+  padding: 7px 8px 6px 30px;
   width: 100%;
   height: 34px;
   resize: none;