diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb
old mode 100644
new mode 100755
index a56fe73..63218e1
--- a/app/helpers/projects_helper.rb
+++ b/app/helpers/projects_helper.rb
@@ -65,7 +65,7 @@ module ProjectsHelper
   # Renders the projects index
   def render_project_hierarchy(projects)
     render_project_nested_lists(projects) do |project|
-      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'my-project' : nil}")
+      s = link_to_project(project, {}, :class => "#{project.css_classes} #{User.current.member_of?(project) ? 'icon icon-fav my-project' : nil}")
       if project.description.present?
         s << content_tag('div', textilizable(project.short_description, :project => project), :class => 'wiki description')
       end
diff --git a/app/views/attachments/_form.html.erb b/app/views/attachments/_form.html.erb
old mode 100644
new mode 100755
diff --git a/app/views/auth_sources/index.html.erb b/app/views/auth_sources/index.html.erb
old mode 100644
new mode 100755
index ecde2bf..16045d2
--- a/app/views/auth_sources/index.html.erb
+++ b/app/views/auth_sources/index.html.erb
@@ -20,7 +20,7 @@
     <td><%= source.host %></td>
     <td><%= source.users.count %></td>
     <td class="buttons">
-      <%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-test' %>
+      <%= link_to l(:button_test), try_connection_auth_source_path(source), :class => 'icon icon-arrow-right' %>
       <%= delete_link auth_source_path(source) %>
     </td>
   </tr>
diff --git a/app/views/boards/show.html.erb b/app/views/boards/show.html.erb
old mode 100644
new mode 100755
index b032a59..3de79b5
--- a/app/views/boards/show.html.erb
+++ b/app/views/boards/show.html.erb
@@ -36,7 +36,7 @@
   <tbody>
   <% @topics.each do |topic| %>
     <tr id="message-<%= topic.id %>" class="message <%= cycle 'odd', 'even' %> <%= topic.sticky? ? 'sticky' : '' %> <%= topic.locked? ? 'locked' : '' %>">
-      <td class="subject"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
+      <td class="subject icon <%= 'icon-arrow-right' if topic.sticky? %> <%= 'icon-lock' if topic.locked? %>"><%= link_to topic.subject, board_message_path(@board, topic) %></td>
       <td class="author"><%= link_to_user(topic.author) %></td>
       <td class="created_on"><%= format_time(topic.created_on) %></td>
       <td class="reply-count"><%= topic.replies_count %></td>
diff --git a/app/views/issues/_edit.html.erb b/app/views/issues/_edit.html.erb
old mode 100644
new mode 100755
index 3291ba7..aa1abfd
--- a/app/views/issues/_edit.html.erb
+++ b/app/views/issues/_edit.html.erb
@@ -31,11 +31,11 @@
       <fieldset><legend><%= l(:field_notes) %></legend>
       <%= f.text_area :notes, :cols => 60, :rows => 10, :class => 'wiki-edit', :no_label => true %>
       <%= wikitoolbar_for 'issue_notes' %>
-  
+
       <% if @issue.safe_attribute? 'private_notes' %>
       <%= f.check_box :private_notes, :no_label => true %> <label for="issue_private_notes"><%= l(:field_private_notes) %></label>
       <% end %>
-  
+
       <%= call_hook(:view_issues_edit_notes_bottom, { :issue => @issue, :notes => @notes, :form => f }) %>
       </fieldset>
 
@@ -45,7 +45,7 @@
         <div id="existing-attachments" style="<%= @issue.deleted_attachment_ids.blank? ? 'display:none;' : '' %>">
           <% @issue.attachments.each do |attachment| %>
           <span class="existing-attachment">
-            <%= text_field_tag '', attachment.filename, :class => "filename", :disabled => true %>
+            <%= text_field_tag '', attachment.filename, :class => "icon icon-attachment filename", :disabled => true %>
             <label>
               <%= check_box_tag 'issue[deleted_attachment_ids][]',
                                 attachment.id,
diff --git a/app/views/issues/new.html.erb b/app/views/issues/new.html.erb
old mode 100644
new mode 100755
index c93a1fc..ec7f262
--- a/app/views/issues/new.html.erb
+++ b/app/views/issues/new.html.erb
@@ -40,6 +40,7 @@
       <span class="search_for_watchers">
       <%= link_to l(:label_search_for_watchers),
                   {:controller => 'watchers', :action => 'new', :project_id => @issue.project},
+                  :class => 'icon icon-add-bullet',
                   :remote => true,
                   :method => 'get' %>
       </span>
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
old mode 100644
new mode 100755
index 0adf0f8..c4df83f
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -34,7 +34,7 @@
 <br />
 
 <% unless @replies.empty? %>
-<h3 class="comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
+<h3 class="icon icon-comment"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
 <% @replies.each do |message| %>
   <div class="message reply" id="<%= "message-#{message.id}" %>">
     <div class="contextual">
diff --git a/app/views/projects/index.html.erb b/app/views/projects/index.html.erb
old mode 100644
new mode 100755
index a223bde..92ea547
--- a/app/views/projects/index.html.erb
+++ b/app/views/projects/index.html.erb
@@ -14,7 +14,7 @@
 
 <% if User.current.logged? %>
 <p style="text-align:right;">
-<span class="my-project"><%= l(:label_my_projects) %></span>
+<span class="icon icon-fav my-project"><%= l(:label_my_projects) %></span>
 </p>
 <% end %>
 
diff --git a/app/views/projects/settings/_members.html.erb b/app/views/projects/settings/_members.html.erb
old mode 100644
new mode 100755
index 31415f8..fe1295d
--- a/app/views/projects/settings/_members.html.erb
+++ b/app/views/projects/settings/_members.html.erb
@@ -17,7 +17,7 @@
   <% members.each do |member| %>
   <% next if member.new_record? %>
   <tr id="member-<%= member.id %>" class="<%= cycle 'odd', 'even' %> member">
-  <td class="name <%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
+  <td class="name icon icon-<%= member.principal.class.name.downcase %>"><%= link_to_user member.principal %></td>
   <td class="roles">
     <span id="member-<%= member.id %>-roles"><%= member.roles.sort.collect(&:to_s).join(', ') %></span>
       <%= form_for(member,
diff --git a/app/views/projects/settings/_versions.html.erb b/app/views/projects/settings/_versions.html.erb
old mode 100644
new mode 100755
index 59576d2..8173433
--- a/app/views/projects/settings/_versions.html.erb
+++ b/app/views/projects/settings/_versions.html.erb
@@ -23,7 +23,7 @@
   <tbody>
 <% @versions.sort.each do |version| %>
     <tr class="version <%= cycle 'odd', 'even' %> <%=h version.status %> <%= 'shared' if version.project != @project %>">
-    <td class="name"><%= link_to_version version %></td>
+    <td class="name <%= 'icon icon-shared' if version.project != @project %>"><%= link_to_version version %></td>
     <td class="date"><%= format_date(version.effective_date) %></td>
     <td class="description"><%= version.description %></td>
     <td class="status"><%= l("version_status_#{version.status}") %></td>
diff --git a/public/javascripts/attachments.js b/public/javascripts/attachments.js
old mode 100644
new mode 100755
index 0d2eedc..8700aaf
--- a/public/javascripts/attachments.js
+++ b/public/javascripts/attachments.js
@@ -13,10 +13,10 @@ function addFile(inputEl, file, eagerUpload) {
     if (!param) {param = 'attachments'};
 
     fileSpan.append(
-        $('<input>', { type: 'text', 'class': 'filename readonly', name: param +'[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name),
+        $('<input>', { type: 'text', 'class': 'icon icon-attachment filename readonly', name: param +'[' + attachmentId + '][filename]', readonly: 'readonly'} ).val(file.name),
         $('<input>', { type: 'text', 'class': 'description', name: param + '[' + attachmentId + '][description]', maxlength: 255, placeholder: $(inputEl).data('description-placeholder') } ).toggle(!eagerUpload),
         $('<input>', { type: 'hidden', 'class': 'token', name: param + '[' + attachmentId + '][token]'} ),
-        $('<a>&nbsp</a>').attr({ href: "#", 'class': 'remove-upload' }).click(removeFile).toggle(!eagerUpload)
+        $('<a>&nbsp</a>').attr({ href: "#", 'class': 'icon-only icon-del remove-upload' }).click(removeFile).toggle(!eagerUpload)
     ).appendTo(attachmentsFields);
 
     if ($(inputEl).data('description') == 0) {
@@ -26,7 +26,7 @@ function addFile(inputEl, file, eagerUpload) {
     if(eagerUpload) {
       ajaxUpload(file, attachmentId, fileSpan, inputEl);
     }
-    
+
     addAttachment.toggle(attachmentsFields.children().length < maxFiles);
     return attachmentId;
   }
@@ -112,7 +112,7 @@ function uploadBlob(blob, uploadUrl, attachmentId, options) {
     contentType: 'application/octet-stream',
     beforeSend: function(jqXhr, settings) {
       jqXhr.setRequestHeader('Accept', 'application/js');
-      // attach proper File object 
+      // attach proper File object
       settings.data = blob;
     },
     xhr: function() {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index fb340a1..fd20bd3 100755
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -224,12 +224,10 @@ tr.message { height: 2.6em; }
 tr.message td.subject { padding-left: 20px; }
 tr.message td.created_on { white-space: nowrap; }
 tr.message td.last_message { font-size: 80%; white-space: nowrap; }
-tr.message.locked td.subject { background: url(../images/locked.png) no-repeat 0 1px; }
-tr.message.sticky td.subject { background: url(../images/bullet_go.png) no-repeat 0 1px; font-weight: bold; }
+tr.message.sticky td.subject { font-weight: bold; }
 
 tr.version.closed, tr.version.closed a { color: #999; }
 tr.version td.name { padding-left: 20px; }
-tr.version.shared td.name { background: url(../images/link.png) no-repeat 0% 70%; }
 tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
 
 tr.user td {width:13%;white-space: nowrap;}
@@ -275,7 +273,7 @@ a.sort { padding-right: 16px; background-position: 100% 50%; background-repeat:
 a.sort.asc  { background-image: url(../images/sort_asc.png); }
 a.sort.desc { background-image: url(../images/sort_desc.png); }
 
-table.boards a.board, h3.comments { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
+table.boards a.board { background: url(../images/comment.png) no-repeat 0% 50%; padding-left: 20px; }
 table.boards td.last-message {text-align:left;font-size:80%;}
 
 div.table-list.boards .table-list-cell.name {width: 30%;}
@@ -319,7 +317,7 @@ td.center {text-align:center;}
 span#watchers_inputs {overflow:auto; display:block;}
 span.search_for_watchers {display:block;}
 span.search_for_watchers, span.add_attachment {font-size:80%; line-height:2.5em;}
-span.search_for_watchers a, span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
+span.add_attachment a {padding-left:16px; background: url(../images/bullet_add.png) no-repeat 0 50%; }
 
 
 .highlight { background-color: #FCFD8D;}
@@ -482,7 +480,6 @@ ul.projects li {list-style-type:none;}
 #projects-index ul.projects li.root {margin-bottom: 1em;}
 #projects-index ul.projects li.child {margin-top: 1em;}
 #projects-index ul.projects div.root a.project { font-family: "Trebuchet MS", Verdana, sans-serif; font-weight: bold; font-size: 16px; margin: 0 0 10px 0; }
-.my-project { padding-left: 18px; background: url(../images/fav.png) no-repeat 0 50%; }
 
 #notified-projects>ul, #tracker_project_ids>ul, #custom_field_project_ids>ul {max-height:250px; overflow-y:auto;}
 
@@ -657,13 +654,13 @@ span.required {color: #bb0000;}
 
 .attachments_fields input.description, #existing-attachments input.description {margin-left:4px; width:340px;}
 .attachments_fields>span, #existing-attachments>span {display:block; white-space:nowrap;}
-.attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; background:url(../images/attachment.png) no-repeat 1px 50%; padding-left:18px;}
+.attachments_fields input.filename, #existing-attachments .filename {border:0; width:250px; color:#555; background-color:inherit; }
 .tabular input.filename {max-width:75% !important;}
 .attachments_fields input.filename {height:1.8em;}
 .attachments_fields .ajax-waiting input.filename {background:url(../images/hourglass.png) no-repeat 0px 50%;}
 .attachments_fields .ajax-loading input.filename {background:url(../images/loading.gif) no-repeat 0px 50%;}
 .attachments_fields div.ui-progressbar { width: 100px; height:14px; margin: 2px 0 -5px 8px; display: inline-block; }
-a.remove-upload {background: url(../images/delete.png) no-repeat 1px 50%; width:1px; display:inline-block; padding-left:16px;}
+
 a.remove-upload:hover {text-decoration:none !important;}
 .existing-attachment.deleted .filename {text-decoration:line-through; color:#999 !important;}
 
@@ -703,9 +700,6 @@ select.bool_cf {width:auto !important;}
 #users_for_watcher {height: 200px; overflow:auto;}
 #users_for_watcher label {display: block;}
 
-table.members td.name {padding-left: 20px;}
-table.members td.group, table.members td.groupnonmember, table.members td.groupanonymous {background: url(../images/group.png) no-repeat 0% 1px;}
-
 input#principal_search, input#user_search {width:90%}
 .roles-selection label {display:inline-block; width:210px;}
 
@@ -1164,7 +1158,7 @@ div.wiki img {vertical-align:middle; max-width:100%;}
 .icon-zoom-out { background-image: url(../images/zoom_out.png); }
 .icon-magnifier { background-image: url(../images/magnifier.png); }
 .icon-passwd { background-image: url(../images/textfield_key.png); }
-.icon-test { background-image: url(../images/bullet_go.png); }
+.icon-arrow-right { background-image: url(../images/bullet_go.png); }
 .icon-email { background-image: url(../images/email.png); }
 .icon-email-disabled { background-image: url(../images/email_disabled.png); }
 .icon-email-add { background-image: url(../images/email_add.png); }
@@ -1179,7 +1173,7 @@ div.wiki img {vertical-align:middle; max-width:100%;}
 .icon-close { background-image: url(../images/close.png); }
 .icon-close:hover { background-image: url(../images/close_hl.png); }
 .icon-settings { background-image: url(../images/changeset.png); }
-.icon-group { background-image: url(../images/group.png); }
+.icon-group, .icon-groupnonmember, .icon-groupanonymous { background-image: url(../images/group.png); }
 .icon-roles { background-image: url(../images/database_key.png); }
 .icon-issue-edit { background-image: url(../images/ticket_edit.png); }
 .icon-workflows { background-image: url(../images/ticket_go.png); }
@@ -1194,6 +1188,8 @@ div.wiki img {vertical-align:middle; max-width:100%;}
 .icon-wiki-page { background-image: url(../images/wiki_edit.png); }
 .icon-document { background-image: url(../images/document.png); }
 .icon-project { background-image: url(../images/projects.png); }
+.icon-add-bullet { background-image: url(../images/bullet_add.png); }
+.icon-shared { background-image: url(../images/link.png) };
 
 .icon-file { background-image: url(../images/files/default.png); }
 .icon-file.text-plain { background-image: url(../images/files/text.png); }