diff --git a/appearance_menu.html.erb b/appearance_menu.html.erb
index 80c912f..07fba92 100644
--- a/appearance_menu.html.erb
+++ b/appearance_menu.html.erb
@@ -1,11 +1,17 @@
 <div id="control_panel_bar" class="menu_aparence controller-profile_editor">
 
-<% control_panel do %>
-  <%= control_panel_button(_('Edit sideboxes'), 'blocks', :controller => 'profile_design', :action => 'index') %>
+<ul class="control-panel">
+  <li>
+    <%= link_to(_('Edit sideboxes'), url_for(:controller => 'profile_design', :action => 'index'), :class => 'control-panel-blocks') %>
+  </li>
 
-  <%= control_panel_button(_('Edit Appearance'), 'design-editor', :controller => 'profile_themes', :action => 'index') %>
+  <li>
+    <%= link_to(_('Edit Appearance'), url_for(:controller => 'profile_themes', :action => 'index'), :class => 'control-panel-design-editor') %>
+  </li>
 
-  <%= control_panel_button(_('Edit Header and Footer'), 'header-and-footer', :controller => 'profile_editor', :action => 'header_footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
-<% end %>
+  <li>
+    <%= link_to(_('Edit Header and Footer'), url_for(:controller => 'profile_editor', :action => 'header_footer'), :class => 'control-panel-header-and-footer') unless profile.enterprise? && environment.enabled?('disable_header_and_footer') && !user.is_admin?(environment) %>
+  </li>
+</ul>
 
 </div>
diff --git a/cabecalho.css b/cabecalho.css
index 260093e..e28dd49 100644
--- a/cabecalho.css
+++ b/cabecalho.css
@@ -1252,3 +1252,11 @@ float: right;
 #user #homepage-link strong {
   padding: 10px 0 10px 35px;
 }
+
+#control_panel_bar .control-panel a {
+  margin-bottom: 0;
+  border: 0;
+  line-height: normal;
+}
+#control_panel_bar .control-panel a:hover {
+}
diff --git a/content_menu.html.erb b/content_menu.html.erb
index fd5376c..69a7b94 100644
--- a/content_menu.html.erb
+++ b/content_menu.html.erb
@@ -1,18 +1,9 @@
 <div id="control_panel_bar" class="menu_content controller-profile_editor">
 
-<% control_panel do %>
-  <%= control_panel_button(_('Manage Content'), 'cms', :controller => 'cms') %>
-
-  <% unless profile.enterprise? %>
-    <%= case profile.blogs.count
-      when 0
-        control_panel_button(_('Create blog'), 'blog-disabled', :controller => 'cms', :action => 'new', :type => 'Blog')
-      when 1
-        control_panel_button(_('Configure blog'), 'blog', :controller => 'cms', :action => 'edit', :id => profile.blog)
-      else
-        control_panel_button(_('Configure blog'), 'blog', :controller => 'cms')
-    end %>
-  <% end %>
-<% end %>
+<ul class="control-panel">
+  <li>
+    <%= link_to(_('Manage Content'), url_for(:controller => 'cms'), :class => 'control-panel-cms') %>
+  </li>
+</ul>
 
 </div>
diff --git a/settings_menu.html.erb b/settings_menu.html.erb
index bf9a5e0..3fb5de9 100644
--- a/settings_menu.html.erb
+++ b/settings_menu.html.erb
@@ -1,50 +1,69 @@
 <div id="control_panel_bar" class="menu_settings controller-profile_editor">
 
-<% control_panel do %>
+<ul class="control-panel">
+  <li>
+    <%= link_to(profile.control_panel_settings_button[:title],
+                             url_for(:controller => 'profile_editor', :action => 'edit'),
+                             :class => "control-panel-#{profile.control_panel_settings_button[:icon]}") %>
+  </li>
 
-  <%= control_panel_button(profile.control_panel_settings_button[:title],
-                           profile.control_panel_settings_button[:icon],
-                           :controller => 'profile_editor', :action => 'edit') %>
+  <li>
+    <%= link_to(_('Location'), url_for(:controller => 'maps', :action => 'edit_location'), :class => 'control-panel-edit-location') %>
+  </li>
 
-  <%= control_panel_button(_('Location'), 'edit-location', :controller => 'maps', :action => 'edit_location') %>
+  <li>
+    <%= link_to(_('Mail settings'), url_for(:controller => 'mailconf'), :class => 'control-panel-mail') if profile.person? && MailConf.enabled? %>
+  </li>
 
-  <%= control_panel_button(_('Mail settings'), 'mail', :controller => 'mailconf') if profile.person? && MailConf.enabled? %>
+  <li>
+    <%= link_to(_('Tasks'), url_for(:controller => 'tasks', :action => 'index'), :class => 'control-panel-todo') %>
+  </li>
 
-  <%= control_panel_button(_('Tasks'), 'todo', :controller => 'tasks', :action => 'index') %>
+  <li>
+    <%= link_to(_('Change Password'), url_for(:controller => 'account', :action => 'change_password'), :class => 'control-panel-change-password') if profile.person? %>
+  </li>
 
-  <%= control_panel_button(_('Change Password'), 'change-password', :controller => 'account', :action => 'change_password') if profile.person? %>
+  <li>
+    <%= link_to(_('Manage friends'), url_for(:controller => 'friends', :action => 'index'), :class => 'control-panel-friends') if profile.person? %>
+  </li>
 
-  <%= control_panel_button(_('Manage friends'), 'friends', :controller => 'friends', :action => 'index') if profile.person? %>
+  <li>
+    <%= link_to(_('Manage Members'), url_for(:controller => 'profile_members'), :class => 'control-panel-members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
+  </li>
 
-  <%= control_panel_button(_('Manage Members'), 'members', :controller => 'profile_members') if profile.organization? && user.has_permission?(:manage_memberships, profile) %>
-
-  <%= control_panel_button(_('Manage Products/Services'), 'products', :controller => 'manage_products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
+  <li>
+    <%= link_to(_('Manage Products/Services'), url_for(:controller => 'manage_products'), :class => 'control-panel-products') if profile.enterprise? && environment.enabled?('products_for_enterprises') %>
+  </li>
 
   <% if !environment.enabled?('disable_asset_enterprises') %>
     <% if profile.is_validation_entity? %>
-      <%= control_panel_button(_('Enterprise Validation'), 'validation', :controller => 'enterprise_validation') %>
+      <li><%= link_to(_('Enterprise Validation'), url_for(:controller => 'enterprise_validation'), :class => 'control-panel-validation') %></li>
     <% end %>
     <% if profile.person? %>
-      <%= control_panel_button(_('Favorite Enterprises'), 'favorites', :controller => 'favorite_enterprises') %>
+      <li><%= link_to(_('Favorite Enterprises'), url_for(:controller => 'favorite_enterprises'), :class => 'control-panel-favorites') %></li>
     <% end %>
   <% end %>
 
   <% if profile.enterprise? %>
     <% if profile.enabled? %>
-      <%= control_panel_button(_('Disable'), 'disable', :action => 'disable') %>
+      <li><%= link_to(_('Disable'), url_for(:action => 'disable'), :class => 'control-panel-disable') %></li>
     <% else %>
-      <%= control_panel_button(_('Enable'), 'enable', :action => 'enable') %>
+      <li><%= link_to(_('Enable'), url_for(:action => 'enable'), :class => 'control-panel-enable') %></li>
     <% end %>
   <% end %>
 
-  <%= control_panel_button(_('Manage my groups'), 'groups', :controller => 'memberships') if profile.person? %>
+  <li>
+    <%= link_to(_('Manage my groups'), url_for(:controller => 'memberships'), :class => 'control-panel-groups') if profile.person? %>
+  </li>
 
-  <%= control_panel_button(_('Manage SPAM'), 'manage-spam', :controller => 'spam', :action => 'index') %>
+  <li>
+    <%= link_to(_('Manage SPAM'), url_for(:controller => 'spam', :action => 'index'), :class => 'control-panel-manage-spam') %>
+  </li>
 
   <% @plugins.dispatch(:control_panel_buttons).each do |button| %>
-    <%= control_panel_button(button[:title], button[:icon], button[:url]) %>
+    <li><%= link_to(button[:title], button[:url], :class => "control-panel-#{button[:icon]}") %></li>
   <% end %>
 
-<% end %>
+</ul>
 
 </div>
--
libgit2 0.21.2