diff --git a/app/views/dmsf_workflows/_approval_workflow_button.html.erb b/app/views/dmsf_workflows/_approval_workflow_button.html.erb
index 0bb73743..08536151 100644
--- a/app/views/dmsf_workflows/_approval_workflow_button.html.erb
+++ b/app/views/dmsf_workflows/_approval_workflow_button.html.erb
@@ -53,9 +53,7 @@
         <% else %>
             <span class="icon"></span>
         <% end %>
-    <% when DmsfWorkflow::STATE_APPROVED %>
-        <span class="icon-only"></span>
-    <% when DmsfWorkflow::STATE_REJECTED %>
+    <% when DmsfWorkflow::STATE_APPROVED, DmsfWorkflow::STATE_REJECTED %>
         <span class="icon-only"></span>
     <% else %>
         <% if workflows_available %>
diff --git a/app/views/my/blocks/_open_approvals.html.erb b/app/views/my/blocks/_open_approvals.html.erb
index b150a014..5c6f04b4 100644
--- a/app/views/my/blocks/_open_approvals.html.erb
+++ b/app/views/my/blocks/_open_approvals.html.erb
@@ -67,9 +67,9 @@
                   <%= link_to(
                           assignment.dmsf_file_revision.workflow_str(false),
                           log_dmsf_workflow_path(
-                              :project_id => assignment.dmsf_file_revision.dmsf_file.project.id,
-                              :id => assignment.dmsf_workflow_step.dmsf_workflow.id,
-                              :dmsf_file_revision_id => assignment.dmsf_file_revision.id),
+                              :project_id => assignment.dmsf_file_revision.dmsf_file.project_id,
+                              :id => assignment.dmsf_workflow_step.dmsf_workflow_id,
+                              :dmsf_file_revision_id => assignment.dmsf_file_revision_id),
                           :title => assignment.dmsf_file_revision.workflow_tooltip,
                           :remote => true) %>
               <% else %>
@@ -86,28 +86,22 @@
               <% if assignment.dmsf_file_revision %>
                 <% if assignment.dmsf_file_revision.dmsf_file.dmsf_folder %>
                   <%= link_to(h(assignment.dmsf_file_revision.dmsf_file.dmsf_folder.title),
-                    {:controller => 'dmsf', :action => 'show', :id => assignment.dmsf_file_revision.dmsf_file.project, :folder_id => assignment.dmsf_file_revision.dmsf_file.dmsf_folder}) %>
+                    {:controller => 'dmsf', :action => 'show', :id => assignment.dmsf_file_revision.dmsf_file.project,
+                     :folder_id => assignment.dmsf_file_revision.dmsf_file.dmsf_folder}) %>
                 <% elsif assignment.dmsf_file_revision.dmsf_file.project %>
-                  <%= link_to(l(:link_documents), {:controller => 'dmsf', :action => 'show', :id => assignment.dmsf_file_revision.dmsf_file.project }) %>
+                  <%= link_to(l(:link_documents), {:controller => 'dmsf', :action => 'show',
+                                                   :id => assignment.dmsf_file_revision.dmsf_file.project }) %>
                 <% end %>
               <% end %>
             </td>
             <td class="dmsf_buttons">
-              <% if assignment.dmsf_workflow_step.dmsf_workflow %>
-                <% assigns = assignment.dmsf_workflow_step.dmsf_workflow.next_assignments(assignment.dmsf_file_revision.id) %>
-                <% index = assigns.find_index{|assign| assign.user_id == User.current.id} if assigns %>
-                <% if index %>
-                    <%= link_to('',
-                      action_dmsf_workflow_path(
-                        :project_id => assignment.dmsf_file_revision.dmsf_file.project.id,
-                        :id => assignment.dmsf_workflow_step.dmsf_workflow.id,
-                        :dmsf_workflow_step_assignment_id => assigns[index].id,
-                        :dmsf_file_revision_id => assignment.dmsf_file_revision.id),
-                      :title => l(:title_waiting_for_approval),
-                      :remote => true,
-                      :class => 'icon icon-wf-waiting') %>
-                <% end %>
-              <% end %>
+              <%= render(:partial => 'dmsf_workflows/approval_workflow_button',
+                         :locals => {:file => assignment.dmsf_file_revision.dmsf_file,
+                                     :file_approval_allowed => User.current.allowed_to?(:file_approval,
+                                       assignment.dmsf_file_revision.dmsf_file.project),
+                                     :workflows_available => nil,
+                                     :project => assignment.dmsf_file_revision.dmsf_file.project,
+                                     :wf => assignment.dmsf_workflow_step.dmsf_workflow, :dmsf_link_id => nil }) %>
             </td>
           </tr>
         <% end %>