diff --git a/app/views/dmsf/_query_rows.erb b/app/views/dmsf/_query_rows.erb
index d8807d42..ea552575 100644
--- a/app/views/dmsf/_query_rows.erb
+++ b/app/views/dmsf/_query_rows.erb
@@ -34,7 +34,9 @@
     <% id = "#{node.id}item" %>
   <% end %>
   <% @idnt ||= 0 %>
-  <tr id="<%= id %>" class="<%= cycle('odd', 'even') %> <%= node.css_classes(query.deleted) %> <%= params[:classes] %> <%= @idnt > 0 ? "idnt idnt-#{@idnt}" : nil %>">
+  <tr id="<%= id %>" data-cy="row__<%= node.title %>--<%= node.type %>_<%= node.id %>"
+      class="<%= cycle('odd', 'even') %>
+    <%= node.css_classes(query.deleted) %> <%= params[:classes] %> <%= @idnt > 0 ? "idnt idnt-#{@idnt}" : nil %>">
     <td class="checkbox hide-when-print">
       <%= check_box_tag('ids[]', "#{node.type}-#{node.id}", false, id: nil) unless system %>
     </td>
@@ -44,7 +46,9 @@
     <td class="buttons">
       <% unless system %>
         <% if defined?(EasyExtensions) %>
-          <%= link_to '', '#', title: l(:button_actions), class: 'icon-only icon-actions js-contextmenu icon-more-horiz' %>
+          <%= link_to '', '#', title: l(:button_actions),
+                      class: 'icon-only icon-actions js-contextmenu icon-more-horiz',
+                      data: { cy: "icon__more_horiz--#{node.type}_#{node.id}" } %>
         <% else %>
           <%= link_to_context_menu %>
         <% end %>
diff --git a/app/views/dmsf/edit.html.erb b/app/views/dmsf/edit.html.erb
index 5fd6466e..6c314132 100644
--- a/app/views/dmsf/edit.html.erb
+++ b/app/views/dmsf/edit.html.erb
@@ -136,7 +136,8 @@
     <% end %>    
   </div>
   <div class="form-actions">
-    <%= submit_tag create ? l(:button_create) : l(:submit_save), class: 'button-positive' %>
+    <%= submit_tag create ? l(:button_create) : l(:submit_save), class: 'button-positive',
+                   data: { cy: "button__submit--dmsf_folder" } %>
   </div>
 <% end %>
 
diff --git a/app/views/dmsf_context_menus/_file.html.erb b/app/views/dmsf_context_menus/_file.html.erb
index 82503ebe..f3db389e 100644
--- a/app/views/dmsf_context_menus/_file.html.erb
+++ b/app/views/dmsf_context_menus/_file.html.erb
@@ -20,38 +20,45 @@
 
 <li>
   <%= context_menu_link l(:button_edit), dmsf_file_path(id: dmsf_file, back_url: back_url), class: 'icon icon-edit',
-        disabled: !allowed || (locked && !unlockable) %>
+                        data: { cy: "icon__edit--dmsf_file_#{dmsf_file.id}" },
+                        disabled: !allowed || (locked && !unlockable) %>
+
 </li>
 <% unless dmsf_link %>
   <li>
-    <%= context_menu_link "#{l(:button_copy)}/#{l(:button_move)}", copymove_entries_path(id: project, folder_id: folder,
-      ids: ["file-#{dmsf_file.id}"], back_url: back_url), class: 'icon icon-copy' %>
+    <%= context_menu_link "#{l(:button_copy)}/#{l(:button_move)}",
+                          copymove_entries_path(id: project, folder_id: folder, ids: ["file-#{dmsf_file.id}"],
+                                                back_url: back_url), title: l(:title_copy), class: 'icon icon-copy',
+                          data: { cy: "icon__copy--dmsf_file_#{dmsf_file.id}" } %> %>
   </li>
   <li>
     <%= link_to l(:label_link_to),
-              new_dmsf_link_path(project_id: dmsf_file.project.id, dmsf_folder_id: dmsf_file.dmsf_folder,
+                new_dmsf_link_path(project_id: dmsf_file.project.id, dmsf_folder_id: dmsf_file.dmsf_folder,
                                  dmsf_file_id: dmsf_file.id, type: 'link_to', back_url: back_url),
-              title: l(:title_create_link), class: 'icon dmsf-icon-link' %>
+                title: l(:title_create_link), class: 'icon dmsf-icon-link',
+                data: { cy: "icon__link_to--dmsf_file_#{dmsf_file.id}" } %>
   </li>
 <% end %>
 <li>
     <% if locked %>
       <%= context_menu_link l(:button_unlock), unlock_dmsf_files_path(id: dmsf_file, back_url: back_url),
-            class: 'icon icon-unlock', title: l(:title_locked_by_user, user: dmsf_file.locked_by),
-            disabled: !unlockable %>
+            class: 'icon icon-unlock', data: { cy: "icon__unlock--dmsf_file_#{dmsf_file.id}" },
+            title: l(:title_locked_by_user, user: dmsf_file.locked_by), disabled: !unlockable %>
     <% else %>
       <%= context_menu_link l(:button_lock), lock_dmsf_files_path(id: dmsf_file, back_url: back_url),
-            class: 'icon icon-lock', disabled: !allowed %>
+            class: 'icon icon-lock', data: { cy: "icon__lock--dmsf_file_#{dmsf_file.id}" }, disabled: !allowed %>
     <% end %>
 </li>
 <% if notifications %>
   <li>
     <% if dmsf_file.notification %>
         <%= context_menu_link l(:label_notifications_off), notify_deactivate_dmsf_files_path(id: dmsf_file,
-              back_url: back_url), class: 'icon icon-email', disabled: !allowed || locked %>
+              back_url: back_url), class: 'icon icon-email', data: { cy: "icon__email--dmsf_file_#{dmsf_file.id}" },
+              disabled: !allowed || locked %>
     <% else %>
         <%= context_menu_link l(:label_notifications_on), notify_activate_dmsf_files_path(id: dmsf_file,
-              back_url: back_url), class: 'icon icon-email-add', disabled: !allowed || locked %>
+              back_url: back_url), class: 'icon icon-email-add',
+              data: { cy: "icon__email_add--dmsf_file_#{dmsf_file.id}" }, disabled: !allowed || locked %>
     <% end %>
   </li>
 <% end %>
@@ -63,7 +70,8 @@
   <% member = Member.find_by(user_id: User.current.id, project_id: dmsf_file.project.id) %>
   <% filename = dmsf_file.last_revision&.formatted_name(member) %>
   <%= context_menu_link l(:button_download), static_dmsf_file_path(dmsf_file, filename: filename),
-                        class: 'icon icon-download', disabled: false %>
+                        class: 'icon icon-download', data: { cy: "icon__download--dmsf_file_#{dmsf_file.id}" },
+                        disabled: false %>
 </li>
 <li>
 <%= context_menu_link l(:field_mail), entries_operations_dmsf_path(id: project, folder_id: folder,
@@ -97,6 +105,7 @@
   <%= context_menu_link l(:button_delete),
         dmsf_link ? dmsf_link_path(id: dmsf_link, folder_id: folder, back_url: back_url) : dmsf_file_path(id: dmsf_file,
           folder_id: folder, back_url: back_url),
-        method: :delete, class: 'icon icon-del', data: { confirm: l(:text_are_you_sure) }, id: 'dmsf-cm-delete',
+        method: :delete, class: 'icon icon-del', data: { confirm: l(:text_are_you_sure),
+        cy: "icon__delete--dmsf_file_#{dmsf_file.id}" }, id: 'dmsf-cm-delete',
         disabled: !allowed || (locked && !dmsf_link) %>
 </li>
diff --git a/app/views/dmsf_context_menus/_folder.html.erb b/app/views/dmsf_context_menus/_folder.html.erb
index 147d72bf..f254deb8 100644
--- a/app/views/dmsf_context_menus/_folder.html.erb
+++ b/app/views/dmsf_context_menus/_folder.html.erb
@@ -21,18 +21,21 @@
 <% unless edit %>
   <li>
     <%= context_menu_link l(:button_edit), edit_dmsf_path(id: dmsf_folder.project, folder_id: dmsf_folder,
-          back_url: back_url), class: 'icon icon-edit', disabled: !allowed || locked %>
+          back_url: back_url), class: 'icon icon-edit', data: { cy: "icon__edit--dmsf_folder_#{dmsf_folder.id}" },
+          disabled: !allowed || locked %>
   </li>
 <% end %>
 <% unless dmsf_link %>
   <li>
     <%= context_menu_link "#{l(:button_copy)}/#{l(:button_move)}", copymove_entries_path(id: project, folder_id: folder,
-      ids: ["folder-#{dmsf_folder.id}"], back_url: back_url), class: 'icon icon-copy', disabled: !allowed || locked %>
+      ids: ["folder-#{dmsf_folder.id}"], back_url: back_url), class: 'icon icon-copy',
+      data: { cy: "icon__copy--dmsf_folder_#{dmsf_folder.id}" }, disabled: !allowed || locked %>
   </li>
   <li>
     <%= context_menu_link l(:label_link_to),
-                new_dmsf_link_path(project_id: project.id, dmsf_folder_id: dmsf_folder.id, type: 'link_to',
-                back_url: back_url), class: 'icon dmsf-icon-link' %>
+          new_dmsf_link_path(project_id: project.id, dmsf_folder_id: dmsf_folder.id, type: 'link_to',
+                             back_url: back_url), class: 'icon dmsf-icon-link',
+          data: { cy: "icon__link_to--dmsf_folder_#{dmsf_folder.id}" } %>
   </li>
 <% end %>
 <% unless edit %>
@@ -40,10 +43,12 @@
     <% if locked %>
       <%= context_menu_link l(:button_unlock), unlock_dmsf_path(id: dmsf_folder.project, folder_id: dmsf_folder,
             back_url: back_url), title: l(:title_locked_by_user, user: dmsf_folder.locked_by),
-            class: 'icon icon-unlock', disabled: !allowed || !unlockable %>
+            class: 'icon icon-unlock', data: { cy: "icon__unlock--dmsf_folder_#{dmsf_folder.id}" },
+                            disabled: !allowed || !unlockable %>
     <% else %>
       <%= context_menu_link l(:button_lock), lock_dmsf_path(id: dmsf_folder.project, folder_id: dmsf_folder,
-            back_url: back_url), class: 'icon icon-lock', disabled: !allowed %>
+            back_url: back_url), class: 'icon icon-lock', data: { cy: "icon__lock--dmsf_folder_#{dmsf_folder.id}" },
+                            disabled: !allowed %>
       <% end %>
   </li>
 <% end %>
@@ -52,10 +57,12 @@
     <% if dmsf_folder.notification %>
       <%= context_menu_link l(:label_notifications_off), notify_deactivate_dmsf_path(id: dmsf_folder.project,
             folder_id: dmsf_folder, back_url: back_url), class: 'icon icon-email',
+                            data: { cy: "icon__email--dmsf_folder_#{dmsf_folder.id}" },
             disabled: !allowed || locked || !dmsf_folder.notification? %>
     <% else %>
       <%= context_menu_link l(:label_notifications_on), notify_activate_dmsf_path(id: dmsf_folder.project,
             folder_id: dmsf_folder, back_url: back_url), class: 'icon icon-email-add',
+                            data: { cy: "icon__email_add--dmsf_folder_#{dmsf_folder.id}" },
             disabled: !allowed || locked || dmsf_folder.notification? %>
     <% end %>
   </li>
@@ -64,11 +71,13 @@
   <li>
     <%= context_menu_link l(:button_download), entries_operations_dmsf_path(id: project, folder_id: folder,
       ids: params[:ids], download_entries: true, back_url: back_url), method: :post, class: 'icon icon-download',
+                          data: { cy: "icon__download--dmsf_folder_#{dmsf_folder.id}" },
       id: 'dmsf-cm-download', disabled: false %>
   </li>
   <li>
     <%= context_menu_link l(:field_mail), entries_operations_dmsf_path(id: dmsf_folder.project, folder_id: folder,
       ids: params[:ids], email_entries: true, back_url: back_url), method: :post, class: 'icon icon-email',
+                          data: { cy: "icon__email--dmsf_folder_#{dmsf_folder.id}" },
       disabled: !email_allowed %>
   </li>
 <% end %>
@@ -79,6 +88,7 @@
   <%= context_menu_link l(:button_delete),
     dmsf_link ? dmsf_link_path(id: dmsf_link, folder_id: folder, back_url: back_url) :
     delete_dmsf_path(id: dmsf_folder.project, folder_id: dmsf_folder, parent_id: folder, back_url: back_url),
-    data: { confirm: "#{l(:text_are_you_sure)}\n#{l(:text_not_empty) unless dmsf_folder.empty?}" }, method: :delete,
+    data: { confirm: "#{l(:text_are_you_sure)}\n#{l(:text_not_empty) unless dmsf_folder.empty?}",
+            cy: "icon__delete--dmsf_folder_#{dmsf_folder.id}" }, method: :delete,
     class: 'icon icon-del', id: 'dmsf-cm-delete', disabled: !allowed || (locked && !dmsf_link) %>
 </li>
diff --git a/app/views/dmsf_upload/multi_upload.html.erb b/app/views/dmsf_upload/multi_upload.html.erb
index 6d7a3de3..2d6e6abe 100644
--- a/app/views/dmsf_upload/multi_upload.html.erb
+++ b/app/views/dmsf_upload/multi_upload.html.erb
@@ -32,6 +32,6 @@
     </span>
   </div>
   <div class="form-actions">
-    <%= submit_tag l(:label_upload), data: { cy: 'button__submit__dmsf-upload--project' }, class: 'button-positive' %>
+    <%= submit_tag l(:label_upload), data: { cy: 'button__submit--dmsf-upload--project' }, class: 'button-positive' %>
   </div>
 <% end %>