diff --git a/app/models/link_list_block.rb b/app/models/link_list_block.rb
index e23c07b..7686a73 100644
--- a/app/models/link_list_block.rb
+++ b/app/models/link_list_block.rb
@@ -1,5 +1,29 @@
 class LinkListBlock < Block
 
+  ICONS = [
+    ['edit', N_('Edit')],
+    ['new', N_('New')],
+    ['save', N_('Save')],
+    ['send', N_('Send')],
+    ['cancel', N_('Cancel')],
+    ['add', N_('Add')],
+    ['up', N_('Up')],
+    ['down', N_('Down')],
+    ['left', N_('Left')],
+    ['right', N_('Right')],
+    ['up-disabled', N_('Gray Up')],
+    ['down-disabled', N_('Gray Down')],
+    ['left-disabled', N_('Gray Left')],
+    ['right-disabled', N_('Gray Right')],
+    ['up-red', N_('Red Up')],
+    ['search', N_('Search')],
+    ['ok', N_('Ok')],
+    ['login', N_('Login')],
+    ['help', N_('Help')],
+    ['spread', N_('Spread')],
+    ['eyes', N_('Eyes')]
+  ]
+
   settings_items :links, Array, :default => []
 
   before_save do |block|
@@ -13,14 +37,19 @@ class LinkListBlock < Block
   def help
     _('This block can be used to create a menu of links. You can add, remove and update the links as you wish.')
   end
-  
+
   def content
     block_title(title) +
     content_tag('ul',
-      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_to(i[:name], expand_address(i[:address])))}
+      links.select{|i| !i[:name].blank? and !i[:address].blank?}.map{|i| content_tag('li', link_html(i))}
     )
   end
 
+  def link_html(link)
+    klass = 'icon-' + link[:icon] if link[:icon]
+    link_to(link[:name], expand_address(link[:address]), :class => klass)
+  end
+
   def expand_address(address)
     if owner.respond_to?(:identifier)
       address.gsub('{profile}', owner.identifier)
@@ -33,4 +62,11 @@ class LinkListBlock < Block
     true
   end
 
+  def icons_options(selected = nil)
+    ICONS.map do |i|
+      select = "selected='1'" if i[0] == selected
+      "<option class='icon-#{i[0]}' value='#{i[0]}' #{select}>#{i[1]}</option>"
+    end
+  end
+
 end
diff --git a/app/models/profile_image_block.rb b/app/models/profile_image_block.rb
index 4c1f717..b67a641 100644
--- a/app/models/profile_image_block.rb
+++ b/app/models/profile_image_block.rb
@@ -1,5 +1,7 @@
 class ProfileImageBlock < Block
 
+  settings_items :show_name, :type => :boolean, :default => false
+
   def self.description
     _('A block that displays only image of profiles')
   end
@@ -8,15 +10,20 @@ class ProfileImageBlock < Block
     _('This block presents the profile image.')
   end
 
+  def default_title
+    owner.name
+  end
+
   def content
     block = self
+    s = show_name
     lambda do
-      render :file => 'blocks/profile_image', :locals => { :block => block }
+      render :file => 'blocks/profile_image', :locals => { :block => block, :show_name => s}
     end
   end
 
   def editable?
-    false
+    true
   end
 
   def cacheable?
diff --git a/app/views/blocks/profile_image.rhtml b/app/views/blocks/profile_image.rhtml
index 7597051..f6e2595 100644
--- a/app/views/blocks/profile_image.rhtml
+++ b/app/views/blocks/profile_image.rhtml
@@ -10,6 +10,10 @@
   </div>
 </div>
 
+<% if show_name %>
+  <p><%= block.title %></p>
+<% end %>
+
 <% if !user.nil? and user.has_permission?('edit_profile', profile) %>
   <div style='text-align: center; font-size: 75%; clear: both'>
     <%= link_to _('Control panel'), :controller => 'profile_editor' %>
diff --git a/app/views/box_organizer/_link_list_block.rhtml b/app/views/box_organizer/_link_list_block.rhtml
index 0c1187b..e4aa51e 100644
--- a/app/views/box_organizer/_link_list_block.rhtml
+++ b/app/views/box_organizer/_link_list_block.rhtml
@@ -1,9 +1,10 @@
 <strong><%= _('Links') %></strong>
 <div id='edit-link-list-block'>
 <table id='links' class='noborder'>
-  <tr><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
+  <tr><th><%= _('Icon') %></th><th><%= _('Name') %></th><th><%= _('Address') %></th></tr>
   <% for link in @block.links do %>
     <tr>
+      <td><%= select_tag 'block[links][][icon]', @block.icons_options(link['icon']) %></td>
       <td><%= text_field_tag 'block[links][][name]', link[:name] %></td>
       <td class='cel-address'><%= text_field_tag 'block[links][][address]', link[:address] %></td>
     </tr>
@@ -12,6 +13,6 @@
 </div>
 
 <%= link_to_function(_('New link'), nil, :class => 'button icon-add with-text') do |page|
-      page.insert_html :bottom, 'links', content_tag('tr', content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address'))) +
+      page.insert_html :bottom, 'links', content_tag('tr', content_tag('td', select_tag('block[links][][icon]', @block.icons_options)) + content_tag('td',text_field_tag('block[links][][name]')) + content_tag('td',text_field_tag('block[links][][address]', nil, :class => 'cel-address'))) +
         javascript_tag("$('edit-link-list-block').scrollTop = $('edit-link-list-block').scrollHeight")
 end %>
diff --git a/app/views/box_organizer/_profile_image_block.rhtml b/app/views/box_organizer/_profile_image_block.rhtml
new file mode 100644
index 0000000..0fedfd7
--- /dev/null
+++ b/app/views/box_organizer/_profile_image_block.rhtml
@@ -0,0 +1,2 @@
+<%= check_box(:block, :show_name) %>
+<label for="block_show_name"><%= _('Show name on block')%></label>
diff --git a/public/stylesheets/blocks/link-list-block.css b/public/stylesheets/blocks/link-list-block.css
index dd8bbb7..6076e6d 100644
--- a/public/stylesheets/blocks/link-list-block.css
+++ b/public/stylesheets/blocks/link-list-block.css
@@ -9,7 +9,7 @@
 }
 
 #edit-link-list-block table .cel-address {
-  width: 300px;
+  width: 180px;
 }
 
 #edit-link-list-block table .cel-address input {
@@ -33,6 +33,19 @@
 }
 
 .link-list-block a {
-  text-decoration: none;
   display: block;
+  text-decoration: none;
+  background-repeat: no-repeat;
+  padding-left: 23px;
+}
+
+#edit-link-list-block select {
+  width: 80px;
+}
+
+#edit-link-list-block option {
+  background-repeat: no-repeat;
+  padding-left: 23px;
+  margin: 2px;
+  height: 16px;
 }
diff --git a/test/unit/link_list_block_test.rb b/test/unit/link_list_block_test.rb
index 06899c3..e79e074 100644
--- a/test/unit/link_list_block_test.rb
+++ b/test/unit/link_list_block_test.rb
@@ -40,4 +40,21 @@ class LinkListBlockTest < ActiveSupport::TestCase
     assert_tag_in_string l.content, :tag => 'a', :attributes => {:href => '/test_profile/address'}
   end
 
+  should 'display options for icons' do
+    l = LinkListBlock.new
+    l.icons_options.each do |option|
+      assert_match(/<option class='icon-.+' value='.+' (selected='1')?>[^<>]+<\/option>/, option)
+    end
+  end
+
+  should 'link with icon' do
+    l = LinkListBlock.new
+    assert_match /class="icon-save"/, l.link_html({:icon => 'save', :name => 'test', :address => 'test.com'})
+  end
+
+  should 'no class without icon' do
+    l = LinkListBlock.new
+    assert_no_match /class="/, l.link_html({:icon => nil, :name => 'test', :address => 'test.com'})
+  end
+
 end
--
libgit2 0.21.2