diff --git a/ember/app/templates/components/ui/controls/text-editor.hbs b/ember/app/templates/components/ui/controls/text-editor.hbs
index 6c6a884a8..40d299326 100644
--- a/ember/app/templates/components/ui/controls/text-editor.hbs
+++ b/ember/app/templates/components/ui/controls/text-editor.hbs
@@ -3,7 +3,9 @@
 <div class="composer-editor-controls">
 	<div class="pull-left">
 		<button class="btn btn-primary">Submit Post</button>
-        <button class="btn btn-default btn-icon btn-sm"><i class="fa fa-fw fa-image"></i></button>
-		<button class="btn btn-default btn-icon btn-sm"><i class="fa fa-fw fa-paperclip"></i></button>
+		<div class="btn-group">
+	        <button class="btn btn-default"><i class="fa fa-fw fa-image"></i></button>
+			<button class="btn btn-default"><i class="fa fa-fw fa-paperclip"></i></button>
+		</div>
 	</div>
 </div>
diff --git a/ember/app/templates/composer.hbs b/ember/app/templates/composer.hbs
index 0e6734076..d76e2a12a 100644
--- a/ember/app/templates/composer.hbs
+++ b/ember/app/templates/composer.hbs
@@ -1,12 +1,14 @@
 <div class="composer-handle"></div>
 
-<div class="composer-body">
+<div class="composer-controls">
+	<a href="#" {{action "fullScreen"}}>{{fa-icon "fa-expand"}}</a>
+	<a href="#" {{action "hide"}}>{{fa-icon "fa-caret-square-o-down"}}</a>
+	<a href="#" {{action "close"}}>{{fa-icon "fa-times"}}</a>
+</div>
 
-	<div class="composer-controls">
-		<a href="#" {{action "fullScreen"}}><i class="fa fa-fw fa-expand"></i></a>
-		<a href="#" {{action "hide"}}><i class="fa fa-fw fa-caret-square-o-down"></i></a>
-		<a href="#" {{action "close"}}><i class="fa fa-fw fa-times"></i></a>
-	</div>
+{{user-avatar user}}
+
+<div class="composer-body">
 
 	<h3>{{{title}}}</h3>