diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index ca1e2ab..c9e73ff 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -369,4 +369,9 @@ module ApplicationHelper
     ]
     select_tag "#{object}[#{method}]", options_for_select(options, @page.filter_type || Comatose.config.default_filter), { :id=> "#{object}_#{method}" }.merge(html_options)
   end
+
+  def control_panel_button(title, icon, url)
+  end
+
+
 end
diff --git a/app/views/profile_editor/index.rhtml b/app/views/profile_editor/index.rhtml
index ef21fe7..8e4912a 100644
--- a/app/views/profile_editor/index.rhtml
+++ b/app/views/profile_editor/index.rhtml
@@ -2,14 +2,22 @@
 
 <%= display_profile_info(profile) %>
 
-<% if @profile.class == Person %>
-  <p> <%= link_to _('Edit'), :action => 'edit' %> </p>
-<% elsif @profile.class == Enterprise %>
-  <p> <%= link_to _('Edit'), :controller => 'enterprise_editor'%> </p>
-<% else %>
+<div class='file-manager'>
 
-<% end %>
+  <%= content_tag('div', link_to(image_tag('icons-app/edit-profile.png', :alt => _('Edit Profile'), :title => _('Edit Profile')) + tag('br') + _('Edit Profile'), :controller => 'profile_editor', :action => 'edit'), :class => 'file-manager-button') %>
 
-<p> <%= link_to _('Edit Visual Design'), :action => 'design_editor' %> </p>
+  <%= content_tag('div', link_to(image_tag('icons-app/design-editor.png', :alt => _('Edit Visual Design'), :title => _('Edit Visual Design')) + tag('br') + _('Edit Visual Design'), :controller => 'profile_editor', :action => 'design_editor'), :class => 'file-manager-button') %>
+
+  <%= content_tag('div', link_to(image_tag('icons-app/cms.png', :alt => _('Manage Content'), :title => _('Manage Content')) + tag('br') + _('Manage Content'), :controller => 'cms'), :class => 'file-manager-button') %>
+
+  <%= content_tag('div', link_to(image_tag('icons-app/change-password.png', :alt => _('Change Password'), :title => _('Change Password')) + tag('br') + _('Change Password'), :controller => 'account', :action => 'change_password'), :class => 'file-manager-button') %>
 
+</div>
+<br style='clear: left'/>
+
+<!--
+<p> <%= link_to _('Edit Visual Design'), :action => 'design_editor' %> </p>
 <p> <%= link_to _('Menage content'), :controller => 'cms' %> </p>
+-->
+
+<h2><%= _('My organizations') %></h2>
diff --git a/public/images/icons-app/abiword_48.png b/public/images/icons-app/abiword_48.png
new file mode 100644
index 0000000..91bff3b
Binary files /dev/null and b/public/images/icons-app/abiword_48.png differ
diff --git a/public/images/icons-app/change-password.png b/public/images/icons-app/change-password.png
new file mode 120000
index 0000000..42ae8ca
--- /dev/null
+++ b/public/images/icons-app/change-password.png
@@ -0,0 +1 @@
+password.png
\ No newline at end of file
diff --git a/public/images/icons-app/cms.png b/public/images/icons-app/cms.png
new file mode 120000
index 0000000..9026bc4
--- /dev/null
+++ b/public/images/icons-app/cms.png
@@ -0,0 +1 @@
+abiword_48.png
\ No newline at end of file
diff --git a/public/images/icons-app/design-editor.png b/public/images/icons-app/design-editor.png
new file mode 120000
index 0000000..35cd68b
--- /dev/null
+++ b/public/images/icons-app/design-editor.png
@@ -0,0 +1 @@
+gnome-settings-background.png
\ No newline at end of file
diff --git a/public/images/icons-app/edit-profile.png b/public/images/icons-app/edit-profile.png
new file mode 120000
index 0000000..dc6fc81
--- /dev/null
+++ b/public/images/icons-app/edit-profile.png
@@ -0,0 +1 @@
+user_icon.png
\ No newline at end of file
diff --git a/public/images/icons-app/gnome-settings-background.png b/public/images/icons-app/gnome-settings-background.png
new file mode 100644
index 0000000..4796187
Binary files /dev/null and b/public/images/icons-app/gnome-settings-background.png differ
diff --git a/public/images/icons-app/password.png b/public/images/icons-app/password.png
new file mode 100644
index 0000000..07078f6
Binary files /dev/null and b/public/images/icons-app/password.png differ
diff --git a/public/images/icons-app/user_icon.png b/public/images/icons-app/user_icon.png
new file mode 100644
index 0000000..b1f88eb
Binary files /dev/null and b/public/images/icons-app/user_icon.png differ
diff --git a/public/stylesheets/common.css b/public/stylesheets/common.css
index 081fc78..0fb3b22 100644
--- a/public/stylesheets/common.css
+++ b/public/stylesheets/common.css
@@ -95,3 +95,29 @@ float: right;
 margin-right: 20px;
 height: 20px;
 }
+
+div.file-manager {
+  clear: both;
+}
+
+div.file-manager-button {
+  float: left;
+  width: 140px;
+  text-align: center;
+  border: 1px solid #ccc;
+  margin-right: 0.5em;
+  margin-top: 0.5em;
+}
+
+div.file-manager-button a img {
+  border: none;
+}
+div.file-manager-button a {
+  display: block;
+  padding: 3px;
+  height: 80px;
+  overflow: hidden;
+}
+div.file-manager-button a:hover {
+  background: #ffc;
+}
--
libgit2 0.21.2