diff --git a/platform/features/timeline/res/css/timeline-espresso.css b/platform/features/timeline/res/css/timeline-espresso.css
index eb2a6afab5..ae39ad66ba 100644
--- a/platform/features/timeline/res/css/timeline-espresso.css
+++ b/platform/features/timeline/res/css/timeline-espresso.css
@@ -279,12 +279,13 @@
 .edit-mode .s-swimlane {
   cursor: pointer; }
   /* line 145, ../sass/_timeline-thematic.scss */
-  .edit-mode .s-swimlane .s-label {
+  .edit-mode .s-swimlane .t-object-label {
     -moz-border-radius: 3px;
     -webkit-border-radius: 3px;
     border-radius: 3px;
+    cursor: move;
     padding: 2px 5px; }
-    /* line 148, ../sass/_timeline-thematic.scss */
-    .edit-mode .s-swimlane .s-label:hover {
-      background: rgba(255, 255, 255, 0.1);
-      color: #fff; }
+    /* line 149, ../sass/_timeline-thematic.scss */
+    .edit-mode .s-swimlane .t-object-label:hover {
+      background: rgba(153, 153, 153, 0.3);
+      color: #cccccc; }
diff --git a/platform/features/timeline/res/css/timeline-snow.css b/platform/features/timeline/res/css/timeline-snow.css
index 344c2beb9a..54c8fbe4b7 100644
--- a/platform/features/timeline/res/css/timeline-snow.css
+++ b/platform/features/timeline/res/css/timeline-snow.css
@@ -279,12 +279,13 @@
 .edit-mode .s-swimlane {
   cursor: pointer; }
   /* line 145, ../sass/_timeline-thematic.scss */
-  .edit-mode .s-swimlane .s-label {
+  .edit-mode .s-swimlane .t-object-label {
     -moz-border-radius: 4px;
     -webkit-border-radius: 4px;
     border-radius: 4px;
+    cursor: move;
     padding: 2px 5px; }
-    /* line 148, ../sass/_timeline-thematic.scss */
-    .edit-mode .s-swimlane .s-label:hover {
-      background: rgba(255, 255, 255, 0.1);
-      color: #fff; }
+    /* line 149, ../sass/_timeline-thematic.scss */
+    .edit-mode .s-swimlane .t-object-label:hover {
+      background: rgba(102, 102, 102, 0.3);
+      color: #333333; }
diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss
index 4a252957f0..62dbc27cdf 100644
--- a/platform/features/timeline/res/sass/_timeline-thematic.scss
+++ b/platform/features/timeline/res/sass/_timeline-thematic.scss
@@ -142,13 +142,13 @@
 
 .edit-mode .s-swimlane {
     cursor: pointer;
-    .s-label {
+    .t-object-label {
         @include border-radius($controlCr);
+        cursor: move;
         padding: 2px 5px;
         &:hover {
-            // TO-DO: Convert to theming!
-            background: rgba(#fff, 0.1);
-            color: #fff;
+            background: rgba($colorBodyFg, 0.3);
+            color: pullForward($colorBodyFg, 20%);
         }
     }
 }