diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index b01f1274..9d6c05a6 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -335,6 +335,9 @@ img.avatar {
   &.s24 { 
     width:24px;
   }
+  &.s32 { 
+    width:32px;
+  }
 }
 
 img.lil_av { 
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 7d60cd25..5613f1e8 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -76,13 +76,13 @@ $hover: #FDF5D9;
  * Header of application. 
  * Contain application logo, search panel, profile icon
  */
-@import "header.scss";
+@import "sections/header.scss";
 
 /**
  * Navigation menu of application. 
  * Panel with links to pages depends on project, profile or admin area
  */
-@import "nav.scss";
+@import "sections/nav.scss";
 
 /**
  * This file represent some UI that can be changed 
@@ -147,12 +147,12 @@ $hover: #FDF5D9;
 /**
  * This file represent notes(comments) styles 
  */
-@import "notes.scss";
+@import "sections/notes.scss";
 
 /**
  * Devise styles 
  */
-@import "login.scss";
+@import "sections/login.scss";
 
 /**
  * CODE HIGHTLIGHT BASE
diff --git a/app/assets/stylesheets/header.scss b/app/assets/stylesheets/sections/header.scss
similarity index 100%
rename from app/assets/stylesheets/header.scss
rename to app/assets/stylesheets/sections/header.scss
diff --git a/app/assets/stylesheets/login.scss b/app/assets/stylesheets/sections/login.scss
similarity index 99%
rename from app/assets/stylesheets/login.scss
rename to app/assets/stylesheets/sections/login.scss
index 3bba7062..3726d9f0 100644
--- a/app/assets/stylesheets/login.scss
+++ b/app/assets/stylesheets/sections/login.scss
@@ -41,4 +41,3 @@ body.login-page{
 }
 
 .login-box a.forgot{float: right; padding-top: 6px}
-
diff --git a/app/assets/stylesheets/nav.scss b/app/assets/stylesheets/sections/nav.scss
similarity index 100%
rename from app/assets/stylesheets/nav.scss
rename to app/assets/stylesheets/sections/nav.scss
diff --git a/app/assets/stylesheets/notes.scss b/app/assets/stylesheets/sections/notes.scss
similarity index 81%
rename from app/assets/stylesheets/notes.scss
rename to app/assets/stylesheets/sections/notes.scss
index abce4c68..17805de4 100644
--- a/app/assets/stylesheets/notes.scss
+++ b/app/assets/stylesheets/sections/notes.scss
@@ -38,21 +38,31 @@
   }
 }
 
-.note .delete-note { 
-  display:none; 
-  float:right;
-}
-.note:hover .delete-note { display:block; }
-.note {padding: 10px 0; border-bottom: 1px solid #eee; overflow: hidden; display: block;}
-.note img{float: left; margin-right: 10px;}
-.note span.note-title{display: block;}
-.note span.note-title{margin-bottom: 10px}
-.note span.note-author{color: #999; font-weight: normal; font-style: italic;}
-.note span.note-author strong{font-weight: bold; font-style: normal;}
-.note p { color:$style_color; }
-.note .note-author { color: $style_color;}
+.note { 
+  padding: 8px 0; 
+  border-bottom: 1px solid #eee;
+  overflow: hidden;
+  display: block;
+  img {float: left; margin-right: 10px;}
+  .note-author cite{font-style: italic;}
+  p { color:$style_color; }
+  .note-author { color: $style_color;}
+
+  .note-title { margin-left:50px; padding-top: 5px;}
+  .avatar { 
+    margin-top:3px;
+  }
+
+  .delete-note { 
+    display:none; 
+    float:right;
+  }
+
+  &:hover { 
+    .delete-note { display:block; }
+  }
+}
 
-.note .note-title { margin-left:55px; }
 
 p.notify_controls input{
   margin: 5px;
diff --git a/app/views/notes/_show.html.haml b/app/views/notes/_show.html.haml
index 3cd72c38..62aca154 100644
--- a/app/views/notes/_show.html.haml
+++ b/app/views/notes/_show.html.haml
@@ -1,5 +1,5 @@
 %li{:id => dom_id(note), :class => "note"}
-  = image_tag gravatar_icon(note.author.email), :class => "left", :width => 40, :style => "padding-right:5px;"
+  = image_tag gravatar_icon(note.author.email), :class => "avatar"
   %div.note-author
     %strong= note.author_name
     = link_to "##{dom_id(note)}", name: dom_id(note) do
@@ -7,7 +7,9 @@
         = time_ago_in_words(note.updated_at)
         ago
     - if(note.author_id == current_user.id) || can?(current_user, :admin_note, @project)
-      %strong= link_to "Remove", [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn small"
+      = link_to [@project, note], :confirm => 'Are you sure?', :method => :delete, :remote => true, :class => "cred delete-note btn very_small" do 
+        %i.icon-trash
+        Remove
 
   %div.note-title
     = preserve do