diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss
index be25f24c1d..967a07462f 100644
--- a/platform/features/timeline/res/sass/_timeline-thematic.scss
+++ b/platform/features/timeline/res/sass/_timeline-thematic.scss
@@ -140,17 +140,3 @@
         }
     }
 }
-
-.edit-mode .s-swimlane,
-.s-status-editing .s-swimlane {
-    cursor: pointer;
-    .t-object-label {
-        border-radius: $controlCr;
-        cursor: move;
-        padding: 2px 5px;
-        &:hover {
-            background: rgba($colorBodyFg, 0.3);
-            color: pullForward($colorBodyFg, 20%);
-        }
-    }
-}
diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss
index dceaa49f9b..0348839263 100644
--- a/platform/features/timeline/res/sass/_timelines.scss
+++ b/platform/features/timeline/res/sass/_timelines.scss
@@ -23,6 +23,11 @@
 .l-timeline-holder {
     @include absPosDefault();
 
+    .l-header {
+        @include user-select(none);
+        cursor: default;
+    }
+
     .l-timeline-pane {
         @include absPosDefault();
 
@@ -33,6 +38,9 @@
 	    .l-swimlanes-holder {
 		    @include absPosDefault();
 		    top: $timelineTopPaneHeaderH + 1;
+            .l-col.l-plot-resource {
+                cursor: pointer;
+            }
 	    }
 
 	    // Overall layout
@@ -250,21 +258,15 @@
 
 			&.l-plot-resource {
 				border-left: none !important;
-				cursor: pointer;
 				padding-left: 0;
 			}
 
 			&.l-title {
 				width: $timelineColTitleW;
-                .rep-object-label[draggable="true"] {
+                .rep-object-label {
                     border-radius: $basicCr;
-                    @include transition(background-color, 0.25s);
-                    cursor: pointer;
                     display: inline-block;
-                    padding: 0 $interiorMarginSm;
-                    &:hover {
-                        background-color: $colorItemTreeHoverBg;
-                    }
+                    padding: 0 $interiorMargin;
                 }
 			}
 
@@ -314,3 +316,11 @@
 		height: 5px
 	}
 }
+
+.s-status-editing .l-title .rep-object-label[draggable="true"] {
+    @include transition(background-color, 0.25s);
+    cursor: pointer;
+    &:hover {
+        background-color: $colorItemTreeHoverBg;
+    }
+}
\ No newline at end of file