diff --git a/app/views/custom_fields/_custom_options.html.erb b/app/views/custom_fields/_custom_options.html.erb
index 814c08d939..1855ef1dba 100644
--- a/app/views/custom_fields/_custom_options.html.erb
+++ b/app/views/custom_fields/_custom_options.html.erb
@@ -80,7 +80,7 @@ See docs/COPYRIGHT.rdoc for more details.
           <%= f.fields_for :custom_options, custom_option do |co_f| %>
             <tr class="dragula-element custom-option-row">
               <td>
-                <span class="dragula-handle icon icon-table icon-toggle"></span>
+                <span class="dragula-handle icon icon-table icon-drag-handle"></span>
                 <%= co_f.hidden_field :id, class: 'custom-option-id' %>
                 <%= co_f.text_field :value,
                                     container_class: 'custom-option-value',
diff --git a/frontend/src/app/components/wp-fast-table/builders/drag-and-drop/drag-drop-handle-builder.ts b/frontend/src/app/components/wp-fast-table/builders/drag-and-drop/drag-drop-handle-builder.ts
index ce8416b4af..7e6575f6b9 100644
--- a/frontend/src/app/components/wp-fast-table/builders/drag-and-drop/drag-drop-handle-builder.ts
+++ b/frontend/src/app/components/wp-fast-table/builders/drag-and-drop/drag-drop-handle-builder.ts
@@ -33,7 +33,7 @@ export class DragDropHandleBuilder {
 
     // Wrap handle as span
     let span = document.createElement('span');
-    span.classList.add('wp-table--drag-and-drop-handle', 'icon-toggle');
+    span.classList.add('wp-table--drag-and-drop-handle', 'icon-drag-handle');
     td.appendChild(span);
 
     if (RENDER_DRAG_AND_DROP_POSITION) {
diff --git a/frontend/src/app/modules/admin/types/attribute-group.component.html b/frontend/src/app/modules/admin/types/attribute-group.component.html
index ef2cd2139f..482a206527 100644
--- a/frontend/src/app/modules/admin/types/attribute-group.component.html
+++ b/frontend/src/app/modules/admin/types/attribute-group.component.html
@@ -1,6 +1,6 @@
 <div class="type-form-conf-group">
   <div class="group-head">
-    <span class="group-handle icon-toggle"></span>
+    <span class="group-handle icon-drag-handle"></span>
     <group-edit-in-place
         [name]="group.name"
         (onValueChange)="rename($event)"
@@ -12,7 +12,7 @@
     <div *ngFor="let attribute of group.attributes"
          class="type-form-conf-attribute"
          [attr.data-key]="attribute.key">
-      <span class="attribute-handle icon-toggle"></span>
+      <span class="attribute-handle icon-drag-handle"></span>
       <span class="attribute-name">
         {{ attribute.translation }}
         <span class="attribute-cf-label"
diff --git a/frontend/src/app/modules/admin/types/query-group.component.html b/frontend/src/app/modules/admin/types/query-group.component.html
index d89e4860ac..52d7bb8f2a 100644
--- a/frontend/src/app/modules/admin/types/query-group.component.html
+++ b/frontend/src/app/modules/admin/types/query-group.component.html
@@ -1,6 +1,6 @@
 <div class="type-form-conf-group type-form-query-group">
     <div class="group-head">
-        <span class="group-handle icon-toggle"></span>
+        <span class="group-handle icon-drag-handle"></span>
         <group-edit-in-place
                 [name]="group.name"
                 (onValueChange)="rename($event)"
diff --git a/frontend/src/app/modules/admin/types/type-form-configuration.html b/frontend/src/app/modules/admin/types/type-form-configuration.html
index baf7e1aa0f..3e4010e641 100644
--- a/frontend/src/app/modules/admin/types/type-form-configuration.html
+++ b/frontend/src/app/modules/admin/types/type-form-configuration.html
@@ -63,7 +63,7 @@
         <div *ngFor="let inactive_attribute of inactives"
              class="type-form-conf-attribute"
              [attr.data-key]="inactive_attribute.key">
-          <span class="attribute-handle icon-toggle"></span>
+          <span class="attribute-handle icon-drag-handle"></span>
           <span class="attribute-name">
               {{ inactive_attribute.translation }}
             <span *ngIf="inactive_attribute.is_cf"
diff --git a/spec/features/work_packages/details/details_refreshing_spec.rb b/spec/features/work_packages/details/details_refreshing_spec.rb
index 14fb17c00b..b390027f80 100644
--- a/spec/features/work_packages/details/details_refreshing_spec.rb
+++ b/spec/features/work_packages/details/details_refreshing_spec.rb
@@ -47,7 +47,7 @@ describe 'Work package table refreshing due to split view', js: true do
 
     wp_table.expect_work_package_listed work_package
     page.within wp_table.row(work_package) do
-      expect(page).to have_selector('.wp-table--drag-and-drop-handle.icon-toggle', visible: :all)
+      expect(page).to have_selector('.wp-table--drag-and-drop-handle.icon-drag-handle', visible: :all)
     end
   end
 end