diff --git a/web/react/components/create_post.jsx b/web/react/components/create_post.jsx
index 50aa0850d1..d9e67836d8 100644
--- a/web/react/components/create_post.jsx
+++ b/web/react/components/create_post.jsx
@@ -315,25 +315,33 @@ export default class CreatePost extends React.Component {
             >
                 <div className='post-create'>
                     <div className='post-create-body'>
-                        <Textbox
-                            onUserInput={this.handleUserInput}
-                            onKeyPress={this.postMsgKeyPress}
-                            onHeightChange={this.resizePostHolder}
-                            messageText={this.state.messageText}
-                            createMessage='Write a message...'
-                            channelId={this.state.channelId}
-                            id='post_textbox'
-                            ref='textbox'
-                        />
-                        <FileUpload
-                            ref='fileUpload'
-                            getFileCount={this.getFileCount}
-                            onUploadStart={this.handleUploadStart}
-                            onFileUpload={this.handleFileUploadComplete}
-                            onUploadError={this.handleUploadError}
-                            postType='post'
-                            channelId=''
-                        />
+                        <div className='post-body__cell'>
+                            <Textbox
+                                onUserInput={this.handleUserInput}
+                                onKeyPress={this.postMsgKeyPress}
+                                onHeightChange={this.resizePostHolder}
+                                messageText={this.state.messageText}
+                                createMessage='Write a message...'
+                                channelId={this.state.channelId}
+                                id='post_textbox'
+                                ref='textbox'
+                            />
+                            <FileUpload
+                                ref='fileUpload'
+                                getFileCount={this.getFileCount}
+                                onUploadStart={this.handleUploadStart}
+                                onFileUpload={this.handleFileUploadComplete}
+                                onUploadError={this.handleUploadError}
+                                postType='post'
+                                channelId=''
+                            />
+                        </div>
+                        <a
+                            className='send-button theme'
+                            onClick={this.handleSubmit}
+                        >
+                            <i className='fa fa-paper-plane' />
+                        </a>
                     </div>
                     <div className={postFooterClassName}>
                         {postError}
diff --git a/web/sass-files/sass/partials/_post.scss b/web/sass-files/sass/partials/_post.scss
index a8e77f7d5f..76d0cc29a6 100644
--- a/web/sass-files/sass/partials/_post.scss
+++ b/web/sass-files/sass/partials/_post.scss
@@ -188,6 +188,25 @@ body.ios {
 		max-width: 850px;
 		padding: 0 0 2px;
 		position: relative;
+		.post-body__cell {
+			vertical-align: top;
+			position: relative;
+		}
+		.send-button {
+			display: none;
+			cursor: pointer;
+			padding-right: 4px;
+			width: 45px;
+			height: 37px;
+			font-size: 18px;
+			line-height: 37px;
+			vertical-align: top;
+			text-align: center;
+			@include single-transition(all, 0.15s);
+			&:active {
+				@include opacity(0.75);
+			}
+		}
 		.custom-textarea {
 			padding-top: 8px;
 			padding-right: 28px;
diff --git a/web/sass-files/sass/partials/_responsive.scss b/web/sass-files/sass/partials/_responsive.scss
index c56625b883..71e9d0f96c 100644
--- a/web/sass-files/sass/partials/_responsive.scss
+++ b/web/sass-files/sass/partials/_responsive.scss
@@ -409,9 +409,22 @@
             }
         }
     }
-    #post-create {
+    .post-create__container {
+        form {
+            padding: 0;
+        }
         .post-create-body {
             padding-bottom: 10px;
+            display: table;
+            width: 100%;
+            table-layout: fixed;
+            .post-body__cell {
+                display: table-cell;
+                padding-left: 1em;
+            }
+            .send-button {
+                display: table-cell;
+            }
         }
         .post-create-footer .msg-typing {
             display: none;