diff --git a/app/assets/images/search_icon.png b/app/assets/images/search_icon.png
new file mode 100644
index 00000000..a18c2926
Binary files /dev/null and b/app/assets/images/search_icon.png differ
diff --git a/app/assets/javascripts/backbone/plugins/attachments.js.coffee b/app/assets/javascripts/backbone/plugins/attachments.js.coffee
index 5e23be1a..29962ea2 100644
--- a/app/assets/javascripts/backbone/plugins/attachments.js.coffee
+++ b/app/assets/javascripts/backbone/plugins/attachments.js.coffee
@@ -42,7 +42,7 @@ class Kandan.Plugins.Attachments
 
   @fileIcon: (fileName)->
     fileExtension = fileName.split(".").pop()
-    return "/assets/img_icon.png"   if fileExtension.match(/(png|jpeg|gif)/i)
+    return "/assets/img_icon.png"   if fileExtension.match(/(png|jpeg|jpg|gif)/i)
     return "/assets/video_icon.png" if fileExtension.match(/(mp3|wav)/i)
     return "/assets/audio_icon.png" if fileExtension.match(/(mov|mpg|mpeg|mp4)/i)
     return "/assets/file_icon.png"
diff --git a/app/assets/stylesheets/_sidebar.sass b/app/assets/stylesheets/_sidebar.sass
index c4f753c2..8a001d3e 100644
--- a/app/assets/stylesheets/_sidebar.sass
+++ b/app/assets/stylesheets/_sidebar.sass
@@ -56,12 +56,24 @@
 
 
 .search
-  width: 200px
+  min-width: 100px
   float: right
   text-align: right
   input
     +border-radius(20px)
+    background: $search-bg url(image_path('search_icon.png')) no-repeat
+    background-position: 95% center
     width: 100%
-    background: $search-bg 
     color: $search-color
     border: 2px solid darken($search-bg, 10%)
+    padding-right: 15%
+
+.header .user
+  float: right
+  color: #CCC
+  padding-left: 10px
+  padding-right: 10px
+  img
+    vertical-align: middle
+    width: 20px
+    height: 20px
\ No newline at end of file
diff --git a/app/assets/stylesheets/plugins/_attachments.sass b/app/assets/stylesheets/plugins/_attachments.sass
index 71ab62c0..251d83f6 100644
--- a/app/assets/stylesheets/plugins/_attachments.sass
+++ b/app/assets/stylesheets/plugins/_attachments.sass
@@ -12,6 +12,7 @@
     color: #585D5F
     img
       width: 14px
+      height: 12px
       margin-right: 10px
     a
       text-decoration: none
diff --git a/app/views/main/index.html.erb b/app/views/main/index.html.erb
index a5437465..35773b31 100644
--- a/app/views/main/index.html.erb
+++ b/app/views/main/index.html.erb
@@ -10,12 +10,12 @@
 <div class="header">
   <%= image_tag "logo.png", :class=>"logo" %>
 
+  <div class="user"></div>
   <div class="search">
     <form method="get" action="/search" target="_blank">
       <input type="text" class="query" name="query"/>
     </form>
   </div>
-  <div class="user"></div>
 </div>
 
 <div id="app_body">