diff --git a/app/views/dmsf_context_menus/_file.html.erb b/app/views/dmsf_context_menus/_file.html.erb
index 7047f2e8..e352f54b 100644
--- a/app/views/dmsf_context_menus/_file.html.erb
+++ b/app/views/dmsf_context_menus/_file.html.erb
@@ -24,6 +24,15 @@
   <%= context_menu_link l(:button_edit), dmsf_file_path(id: dmsf_file), class: 'icon icon-edit',
                         disabled: !allowed || locked %>
 </li>
+<li>
+  <%= link_to "#{l(:button_copy)}/#{l(:button_move)}", copy_file_path(id: dmsf_file),
+              title: l(:title_copy), class: 'icon icon-copy', disabled: !dmsf_link.nil?  %>
+</li>
+<%= link_to l(:label_link_to),
+            new_dmsf_link_path(project_id: project.id,
+                               dmsf_folder_id: dmsf_file.dmsf_folder ? dmsf_file.dmsf_folder.id : nil,
+                               dmsf_file_id: dmsf_file.id, type: 'link_to'),
+            title: l(:title_create_link), class: 'icon icon-link' %>
 <li>
     <% if locked %>
       <%= context_menu_link l(:button_unlock), unlock_dmsf_files_path(id: dmsf_file), class: 'icon icon-unlock',
@@ -43,12 +52,7 @@
   <% end %>
 </li>
 <li>
-  <%= context_menu_link l(:button_delete), dmsf_link ? dmsf_link_path(dmsf_link) : dmsf_file_path(dmsf_file),
-                        method: :delete, class: 'icon icon-del', data: { confirm: l(:text_are_you_sure) },
-                        id: 'dmsf-cm-delete', disabled: !allowed || locked %>
-</li>
-<li>
-    <%= render(partial: 'approval_workflow', locals: { dmsf_file: dmsf_file, project: project, locked: locked }) %>
+    <%= render partial: 'approval_workflow', locals: { dmsf_file: dmsf_file, project: project, locked: locked } %>
 </li>
 <li>
 <%= context_menu_link l(:button_download), view_dmsf_file_path(dmsf_file, disposition: 'attachment'),
@@ -70,3 +74,8 @@
   <%= context_menu_link l(:button_edit_content), url, class: "icon icon-file #{DmsfHelper.filetype_css(dmsf_file.name)}",
                         disabled: url.blank? || locked %>
 </li>
+<li>
+  <%= context_menu_link l(:button_delete), dmsf_link ? dmsf_link_path(dmsf_link) : dmsf_file_path(dmsf_file),
+                        method: :delete, class: 'icon icon-del', data: { confirm: l(:text_are_you_sure) },
+                        id: 'dmsf-cm-delete', disabled: !allowed || locked %>
+</li>
diff --git a/app/views/dmsf_context_menus/_folder.html.erb b/app/views/dmsf_context_menus/_folder.html.erb
index 9933ffae..1f61bd76 100644
--- a/app/views/dmsf_context_menus/_folder.html.erb
+++ b/app/views/dmsf_context_menus/_folder.html.erb
@@ -51,12 +51,6 @@
               class: 'icon icon-email-add', disabled: !allowed || locked || dmsf_folder.notification? %>
   <% end %>
 </li>
-<li>
-  <%= context_menu_link l(:button_delete),
-              dmsf_link ? dmsf_link_path(dmsf_link) : delete_dmsf_path(id: project, folder_id: dmsf_folder),
-              data: { confirm: l(:text_are_you_sure) }, method: :delete, class: 'icon icon-del', id: 'dmsf-cm-delete',
-              disabled: !allowed || locked || (dmsf_link ? false : !dmsf_folder.empty?) %>
-</li>
 <li>
   <%= context_menu_link l(:button_download), entries_operations_dmsf_path(id: project, folder_id: folder,
     ids: params[:ids], download_entries: true), method: :post, class: 'icon icon-download',
@@ -67,3 +61,9 @@
     ids: params[:ids], email_entries: true), method: :post, class: 'icon icon-email',
     disabled: !email_allowed %>
 </li>
+<li>
+  <%= context_menu_link l(:button_delete),
+                        dmsf_link ? dmsf_link_path(dmsf_link) : delete_dmsf_path(id: project, folder_id: dmsf_folder),
+                        data: { confirm: l(:text_are_you_sure) }, method: :delete, class: 'icon icon-del', id: 'dmsf-cm-delete',
+                        disabled: !allowed || locked || (dmsf_link ? false : !dmsf_folder.empty?) %>
+</li>