diff --git a/app/views/profile/_comment.rhtml b/app/views/profile/_comment.rhtml
index 3398bf4..2a6dcf5 100644
--- a/app/views/profile/_comment.rhtml
+++ b/app/views/profile/_comment.rhtml
@@ -25,6 +25,7 @@
       <%= icon_button(:delete, _('Remove'), { :action => :remove_comment, :comment_id => comment.id }, :method => :get, :confirm => _('Are you sure you want to remove this comment and all its replies?')) %>
     <% end %>
   <% end %>
+  <br style="clear: both;" />
 
   <div class="comment_reply post_comment_box closed">
     <% if @comment && @comment.errors.any? && @comment.reply_of_id.to_i == comment.id %>
diff --git a/app/views/profile/_create_article.rhtml b/app/views/profile/_create_article.rhtml
index 29429bb..584ebd1 100644
--- a/app/views/profile/_create_article.rhtml
+++ b/app/views/profile/_create_article.rhtml
@@ -1,13 +1,16 @@
 <div class='profile-activity-image'>
   <%= link_to(profile_image(activity.user, :minor), activity.user.url) %>
 </div>
-<div class='profile-activity-description'>
+<div class='profile-activity-description profile-activity-article-<%= activity.target.class.icon_name %>'>
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %></p>
   <div class='profile-activity-lead'>
-  <b><%= activity.params['name'] %></b> <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span><br />
-  <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(activity.params['lead']).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more +'), activity.params['url']) unless activity.get_lead.blank? %></small></div>
+  <b><%= activity.params['name'] %></b>
+  <span title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-new<%= activity.target.class.icon_name %>'></span><br />
+  <%= image_tag(activity.params['first_image']) unless activity.params['first_image'].blank? %><%= strip_tags(activity.params['lead']).gsub(/(\xA0|\xC2|\s)+/, ' ').gsub(/^\s+/, '') %> <small><%= link_to(_('See more'), activity.params['url']) unless activity.get_lead.blank? %></small></div>
+  <%= content_tag(:p, link_to(_('See complete forum'), activity.get_url), :class => 'see-forum') if activity.target.is_a?(Forum) %>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
   <div class='profile-wall-actions'>
+    <%= link_to _('Comment'), "#reply_content_#{activity.id}" %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
diff --git a/app/views/profile/_default_activity.rhtml b/app/views/profile/_default_activity.rhtml
index c3c487d..c4d0905 100644
--- a/app/views/profile/_default_activity.rhtml
+++ b/app/views/profile/_default_activity.rhtml
@@ -5,6 +5,7 @@
   <p class='profile-activity-text'><%= link_to activity.user.name, activity.user.url %> <%= describe activity %></p>
   <p class='profile-activity-time'><%= time_ago_as_sentence(activity.created_at) + ' ' + _('ago') %></p>
   <div class='profile-wall-actions'>
+    <%= link_to _('Comment'), "#reply_content_#{activity.id}" %>
     <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_activity', :activity_id => activity.id}, :update => "profile-activity-item-#{activity.id}") if logged_in? && current_person == @profile %>
   </div>
 </div>
diff --git a/app/views/profile/_profile_comment_form.rhtml b/app/views/profile/_profile_comment_form.rhtml
index 6152fa4..48619b8 100644
--- a/app/views/profile/_profile_comment_form.rhtml
+++ b/app/views/profile/_profile_comment_form.rhtml
@@ -2,7 +2,7 @@
   <div id='profile-wall-reply-form-<%= activity.id%>'>
     <p class='profile-wall-reply'>
       <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_comment_on_activity'}, :update => 'profile_activities', :html => { :class => 'profile-wall-reply-form' } do %>
-        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'), :onfocus => 'if(this.value==this.title){this.value="";this.style.color="#000"}', :onblur => 'if(this.value==""){this.value=this.title;this.style.color="#ccc"}', :value => _('Leave your comment'), :style => 'color: #ccc' } %>
+        <%= text_area :comment, :body, {:id => "reply_content_#{activity.id}", :cols => 50, :rows => 1, :class => 'submit-with-keypress', :title => _('Leave your comment'), :onfocus => 'if(this.value==this.title){this.value="";this.style.color="#000"};this.style.backgroundImage="url(' + current_person.profile_custom_icon + ')"', :onblur => 'if(this.value==""){this.value=this.title;this.style.color="#ccc"};this.style.backgroundImage="none"', :value => _('Leave your comment'), :style => 'color: #ccc' } %>
         <%= hidden_field_tag :source_id, activity.id, :id => "activity_id_#{activity.id}" %>
       <% end %>
     </p>
diff --git a/app/views/profile/_profile_scrap.rhtml b/app/views/profile/_profile_scrap.rhtml
index 4cb556a..29fb1e9 100644
--- a/app/views/profile/_profile_scrap.rhtml
+++ b/app/views/profile/_profile_scrap.rhtml
@@ -1,38 +1,35 @@
-<li class='profile-wall-item' id='profile-wall-item-<%= scrap.id %>'>
-  <div class='profile-wall-image'>
+<li class='profile-activity-item' id='profile-activity-item-<%= scrap.id %>'>
+  <div class='profile-activity-image'>
     <%= link_to(profile_image(scrap.sender, :minor), scrap.sender.url) %>
-    <% if logged_in? && current_person.follows?(scrap.sender) && current_person != scrap.sender %>
-      <p class='profile-wall-send-message'><%= link_to_function _('Scrap'), "hide_and_show(['#profile-wall-message-response-#{scrap.id}'],['#profile-wall-message-#{scrap.id}', '#profile-wall-form-#{scrap.id}']);$('content_#{scrap.id}').value='';return false", :class => "profile-send-message", :title => _("Send a message to %s") % scrap.sender.name %></p>
-    <% end %>
   </div>
-  <% comment_balloon :class => 'profile-wall-description' do %>
-    <p class='profile-wall-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
-    <p class='profile-wall-text'><%= txt2html scrap.content %></p>
-    <p class='profile-wall-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
+  <% comment_balloon :class => 'profile-activity-description' do %>
+    <p class='profile-activity-sender'><%= link_to scrap.sender.name, scrap.sender.url %></p>
+    <p class='profile-activity-text'><%= txt2html scrap.content %></p>
+    <p class='profile-activity-time'><%= time_ago_as_sentence(scrap.created_at) + ' ' + _('ago') %></p>
     <div class='profile-wall-actions'>
     <% if logged_in? && current_person.follows?(scrap.sender) %>
-      <span class='profile-wall-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-wall-reply-response-#{scrap.id}'],['#profile-wall-reply-#{scrap.id}', '#profile-wall-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
+      <span class='profile-activity-send-reply'><%= link_to_function _('Comment'), "hide_and_show(['#profile-activity-reply-response-#{scrap.id}'],['#profile-activity-reply-#{scrap.id}', '#profile-activity-reply-form-#{scrap.id}']);$('reply_content_#{scrap.id}').value='';$('reply_content_#{scrap.id}').focus();$('scrap_id_#{scrap.id}').value='#{scrap.id}';return false", :class => "profile-send-reply" %></span>
     <% end %>
-    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-wall-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
+    <%= link_to_remote(content_tag(:span, _('Remove')), :url =>{:action => 'remove_scrap', :scrap_id => scrap.id}, :update => "profile-activity-item-#{scrap.id}") if logged_in? && user.can_control_scrap?(scrap) %>
   <% end %>
   </div>
-  <ul class="profile-wall-scrap-replies">
+  <ul class="profile-activity-scrap-replies">
     <% scrap.replies.map do |reply| %>
       <%= render :partial => 'profile_scrap', :locals => {:scrap => reply} %>
     <% end %>
   </ul>
-  <div id='profile-wall-message-<%= scrap.id%>' style='display:none;'>
-    <div id='profile-wall-form-<%= scrap.id%>' style='display:none;'>
-      <p class='profile-wall-message'>
-        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-wall-message-response-#{scrap.id}", :success =>"hide_and_show(['#profile-wall-form-#{scrap.id}'],['#profile-wall-message-response-#{scrap.id}'])" do %>
+  <div id='profile-activity-message-<%= scrap.id%>' style='display:none;'>
+    <div id='profile-activity-form-<%= scrap.id%>' style='display:none;'>
+      <p class='profile-activity-message'>
+        <% form_remote_tag :url => {:controller => 'profile', :action => 'leave_scrap', :not_load_scraps => true}, :update => "profile-activity-message-response-#{scrap.id}", :success =>"hide_and_show(['#profile-activity-form-#{scrap.id}'],['#profile-activity-message-response-#{scrap.id}'])" do %>
           <%= limited_text_area :scrap, :content, 420, "content_#{scrap.id}", :cols => 50, :rows => 2 %>
           <%= hidden_field_tag 'receiver_id', scrap.sender.id %>
           <%= submit_button :add, _('Leave a scrap') %>
-          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-wall-message-#{scrap.id}'],[]);return false" %>
+          <%= button_to_function :cancel, _('Cancel'), "hide_and_show(['#profile-activity-message-#{scrap.id}'],[]);return false" %>
         <% end %>
       </p>
     </div>
-    <div id='profile-wall-message-response-<%=scrap.id%>' class='profile-wall-message-response'></div>
+    <div id='profile-activity-message-response-<%=scrap.id%>' class='profile-activity-message-response'></div>
   </div>
   <%= render :partial => 'profile_scrap_reply_form', :locals => { :scrap => scrap } %>
   <hr />  
diff --git a/app/views/profile/_upload_image.rhtml b/app/views/profile/_upload_image.rhtml
index 118a275..7d2a986 100644
--- a/app/views/profile/_upload_image.rhtml
+++ b/app/views/profile/_upload_image.rhtml
@@ -1 +1,4 @@
-<%= render :partial => 'default_activity', :locals => {:activity => activity} %>
+<div class="activity-gallery-images-count-<%= activity.get_view_url.size %>">
+  <%= render :partial => 'default_activity', :locals => {:activity => activity} %>
+</div>
+<div title='<%= activity.target.class.short_description %>' class='profile-activity-icon icon-new icon-newgallery'></div>
diff --git a/public/designs/icons/tango/style.css b/public/designs/icons/tango/style.css
index cc3d2bc..678d581 100644
--- a/public/designs/icons/tango/style.css
+++ b/public/designs/icons/tango/style.css
@@ -91,7 +91,7 @@
 .icon-lock	       { background-image: url(Tango/16x16/actions/lock.png) }
 .icon-chat             { background-image: url(Tango/16x16/apps/internet-group-chat.png); background-repeat: no-repeat }
 .icon-reply            { background-image: url(Tango/16x16/actions/mail-reply-sender.png) }
-.icon-newforum   { background-image: url(Tango/16x16/apps/system-users.png) }
+.icon-newforum   { background-image: url(Tango/16x16/apps/internet-group-chat.png) }
 .icon-forum      { background-image: url(Tango/16x16/apps/system-users.png) }
 .icon-gallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
 .icon-newgallery   { background-image: url(Tango/16x16/mimetypes/image-x-generic.png) }
diff --git a/public/designs/templates/leftbar/stylesheets/style.css b/public/designs/templates/leftbar/stylesheets/style.css
index 6b65ea2..a8beae4 100644
--- a/public/designs/templates/leftbar/stylesheets/style.css
+++ b/public/designs/templates/leftbar/stylesheets/style.css
@@ -23,3 +23,15 @@
 #profile-wall ul {
   width: 620px;
 }
+
+.profile-activity-lead {
+  width: 534px;
+}
+
+#profile-wall textarea {
+  width: 534px;
+}
+
+#profile-wall #leave_scrap textarea {
+  width: 640px;
+}
diff --git a/public/designs/templates/rightbar/stylesheets/style.css b/public/designs/templates/rightbar/stylesheets/style.css
index 3ec2a08..48ac3a4 100644
--- a/public/designs/templates/rightbar/stylesheets/style.css
+++ b/public/designs/templates/rightbar/stylesheets/style.css
@@ -23,3 +23,15 @@
 #profile-wall ul {
   width: 620px;
 }
+
+.profile-activity-lead {
+  width: 534px;
+}
+
+#profile-wall textarea {
+  width: 534px;
+}
+
+#profile-wall #leave_scrap textarea {
+  width: 640px;
+}
diff --git a/public/images/forum-activity-bg.png b/public/images/forum-activity-bg.png
new file mode 100644
index 0000000..b6e7926
Binary files /dev/null and b/public/images/forum-activity-bg.png differ
diff --git a/public/images/forum-activity-icon.png b/public/images/forum-activity-icon.png
new file mode 100644
index 0000000..acadece
Binary files /dev/null and b/public/images/forum-activity-icon.png differ
diff --git a/public/images/gallery-image-activity-border-big.png b/public/images/gallery-image-activity-border-big.png
new file mode 100644
index 0000000..358302c
Binary files /dev/null and b/public/images/gallery-image-activity-border-big.png differ
diff --git a/public/images/gallery-image-activity-border.png b/public/images/gallery-image-activity-border.png
index 7b125f2..15dd635 100644
Binary files a/public/images/gallery-image-activity-border.png and b/public/images/gallery-image-activity-border.png differ
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b92dd42..b08d61c 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -5884,8 +5884,9 @@ h1#agenda-title {
   display: block;
   padding: 10px;
   margin-bottom: 10px;
-  background-color: #f0f0f1;
-  border-bottom: 0;
+  background-color: #fff;
+  border-bottom: 1px solid #e8e8e8;
+  position: relative;
 }
 
 .profile-activity-lead img {
@@ -5901,6 +5902,32 @@ h1#agenda-title {
   margin: 5px 0;
 }
 
+.profile-activity-article-forum .profile-activity-lead {
+  height: 50px;
+  width: 297px;
+  padding-left: 60px;
+  float: none;
+  overflow: hidden;
+  background: transparent url(/images/forum-activity-bg.png) left center no-repeat;
+}
+
+.profile-activity-article-forum .see-forum {
+  text-align: right;
+}
+
+.profile-activity-article-forum .see-forum a {
+  background: transparent url(/images/forum-activity-icon.png) left center no-repeat;
+  padding-left: 30px;
+  font-weight: bold;
+  color: #dadada !important;
+  text-decoration: none;
+  font-size: 11px;
+}
+
+.profile-activity-article-forum .profile-activity-lead b {
+  font-weight: normal;
+}
+
 #profile-activity li a, #profile-network li a, #profile-wall li a,
 #profile-wall .profile-wall-send-reply {
   color: #333;
@@ -5908,7 +5935,7 @@ h1#agenda-title {
 
 .profile-activity-text {
   margin: 0;
-  color: #808080;
+  color: #000;
 }
 
 #profile-wall li.profile-activity-item.upload_image span,
@@ -5924,6 +5951,16 @@ h1#agenda-title {
   position: absolute;
 }
 
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span img,
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span img,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+  width: 383px;
+  height: 177px;
+}
+
 #profile-wall li.profile-activity-item.upload_image span,
 #profile-network li.profile-activity-item.upload_image span {
   position: relative;
@@ -5937,6 +5974,11 @@ h1#agenda-title {
   text-indent: -5000em;
 }
 
+#profile-wall li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a,
+#profile-network li.profile-activity-item.upload_image .activity-gallery-images-count-1 span a {
+  background-image: url(/images/gallery-image-activity-border-big.png);
+}
+
 #profile-wall li.profile-activity-item.upload_image .article-comment span,
 #profile-wall li.profile-activity-item.upload_image .profile-wall-actions span,
 #profile-network li.profile-activity-item.upload_image .article-comment span,
@@ -6058,9 +6100,8 @@ h1#agenda-title {
 .profile-wall-actions a {
   display: block;
   float: right;
-  font-size: 11px;
-  margin: 0;
-  margin-left: 10px;
+  font-size: 10px;
+  margin: 2px 0 3px 10px;
   color: #ccc;
   padding: 0;
 }
@@ -6163,8 +6204,9 @@ h1#agenda-title {
 }
 
 .profile-network-sender,
+.profile-activity-sender,
 .profile-wall-sender {
-  margin: 2px 0;
+  margin: 0;
 }
 
 #profile-activity .profile-activity-time,
@@ -6181,6 +6223,13 @@ h1#agenda-title {
   overflow: hidden;
 }
 
+#profile-network li textarea:focus,
+#profile-wall li textarea:focus {
+  background-position: left center;
+  background-repeat: no-repeat;
+  text-indent: 28px;
+}
+
 .profile-network-message,
 .profile-wall-message {
   margin: 0;
@@ -6258,7 +6307,7 @@ h1#agenda-title {
 
 #profile-wall .profile-wall-activities-comments li,
 #profile-network .profile-wall-activities-comments li {
-  background: #e8e8e8;
+  background: #f0f0f1;
   border-bottom: 1px solid #d2d2d2 !important;
   border-top: 1px solid #fff;
   margin-bottom: 0;
@@ -6300,10 +6349,17 @@ h1#agenda-title {
 
 #profile-wall .profile-wall-activities-comments .article-comment .button-bar,
 #profile-network .profile-wall-activities-comments .article-comment .button-bar {
-  float: none !important;
+  float: right;
   padding: 0;
   text-align: right;
   position: static;
+  clear: none;
+  display: none;
+}
+
+#profile-wall .profile-wall-activities-comments .article-comment:hover .button-bar,
+#profile-network .profile-wall-activities-comments .article-comment:hover .button-bar {
+  display: block;
 }
 
 #profile-wall .profile-wall-activities-comments .article-comment .button-bar a.button,
@@ -6314,7 +6370,7 @@ h1#agenda-title {
   line-height: auto;
   color: #333;
   text-decoration: none;
-  font-size: 11px;
+  font-size: 10px;
   padding: 0;
   margin: 0;
   display: inline;
@@ -6332,7 +6388,6 @@ h1#agenda-title {
   display: inline;
   position: static;
   display: inline;
-  margin-right: -5px;
 }
 
 /* friends online {{{ */
@@ -6473,7 +6528,7 @@ h1#agenda-title {
 
 .profile-wall-reply-form {
   display: block;
-  background: #e8e8e8;
+  background: #f0f0f1;
   border-bottom: 1px solid #d2d2d2;
   border-top: 1px solid #fff;
   margin-left: 50px;
@@ -6518,6 +6573,10 @@ h1#agenda-title {
   width: 375px;
 }
 
+#profile-wall #leave_scrap textarea {
+  width: 442px;
+}
+
 .profile-wall-scrap-replies {
   width: 100%;
   position: relative;
--
libgit2 0.21.2