diff --git a/app/views/content_viewer/_article_toolbar.rhtml b/app/views/content_viewer/_article_toolbar.rhtml
index 4bf7749..1dd2e84 100644
--- a/app/views/content_viewer/_article_toolbar.rhtml
+++ b/app/views/content_viewer/_article_toolbar.rhtml
@@ -34,11 +34,11 @@
         <%= expirable_button @page, :locale, content, url %>
       <% end %>
 
-      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) %>
+      <%= colorbox_button(:new, label_for_new_article(@page), profile.admin_url.merge(:controller => 'cms', :action => 'new', :parent_id => (@page.folder? ? @page : (@page.parent.nil? ? nil : @page.parent)))) if !remove_content_button(:new) %>
     <% end %>
 
     <% if @page.accept_uploads? && @page.allow_create?(user) %>
-      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) %>
+      <%= button('upload-file', _('Upload files'), profile.admin_url.merge(:controller => 'cms', :action => 'upload_files', :parent_id => (@page.folder? ? @page : @page.parent))) if !remove_content_button(:upload)%>
     <% end %>
 
     <% if !@page.allow_create?(user) && profile.community? && (@page.blog? || @page.parent && @page.parent.blog?) && !remove_content_button(:suggest) %>
diff --git a/lib/noosfero/plugin.rb b/lib/noosfero/plugin.rb
index 80fbe8b..986575f 100644
--- a/lib/noosfero/plugin.rb
+++ b/lib/noosfero/plugin.rb
@@ -353,7 +353,9 @@ class Noosfero::Plugin
   private
 
   def content_actions
-    %w[edit delete spread locale suggest home]
+    #FIXME 'new' and 'upload' only works for content_remove. It should work for
+    #content_expire too.
+    %w[edit delete spread locale suggest home new upload]
   end
 
 end
diff --git a/plugins/work_assignment/lib/work_assignment_plugin.rb b/plugins/work_assignment/lib/work_assignment_plugin.rb
index 54fc4dc..1d49ab4 100644
--- a/plugins/work_assignment/lib/work_assignment_plugin.rb
+++ b/plugins/work_assignment/lib/work_assignment_plugin.rb
@@ -16,4 +16,12 @@ class WorkAssignmentPlugin < Noosfero::Plugin
     true
   end
 
+  def content_remove_new(content)
+    content.kind_of?(WorkAssignmentPlugin::WorkAssignment)
+  end
+
+  def content_remove_upload(content)
+    !content.profile.members.include?(context.send(:user))
+  end
+
 end
--
libgit2 0.21.2