diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss
index 07cf990b97..adce3fdb7e 100644
--- a/platform/commonUI/general/res/sass/controls/_controls.scss
+++ b/platform/commonUI/general/res/sass/controls/_controls.scss
@@ -72,6 +72,14 @@
     }
 }
 
+.s-clickable-icon {
+    // Clickable icon elements that have hover
+    @extend .ui-symbol;
+    &:hover {
+        color: $colorKeyHov;
+    }
+}
+
 .l-composite-control {
     vertical-align: middle;
     &:not(.l-inline) {
diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss
index bbbd0e87aa..05a36018cc 100644
--- a/platform/commonUI/themes/espresso/res/sass/_constants.scss
+++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss
@@ -6,6 +6,7 @@ $colorFooterBg: #000;
 $colorKey: #0099cc;
 $colorKeySelectedBg: #005177;
 $colorKeyFg: #fff;
+$colorKeyHov: pullForward($colorKey, 20%);
 $colorEditAreaBg: #31363e;
 $colorEditAreaFg: #587ab5;
 $colorInteriorBorder: rgba($colorBodyFg, 0.1);
diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss
index 76fe415bad..dcb14ca0a3 100644
--- a/platform/commonUI/themes/snow/res/sass/_constants.scss
+++ b/platform/commonUI/themes/snow/res/sass/_constants.scss
@@ -6,6 +6,7 @@ $colorFooterBg: #000;
 $colorKey: #0099cc;
 $colorKeySelectedBg: $colorKey;
 $colorKeyFg: #fff;
+$colorKeyHov: pullForward($colorKey, 20%);
 $colorEditAreaBg: #eafaff;
 $colorEditAreaFg: #4bb1c7; //587ab5;
 $colorInteriorBorder: rgba($colorBodyFg, 0.2);
diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss
index d97dc4a58b..0cca3f8b27 100644
--- a/platform/features/timeline/res/sass/_timeline-thematic.scss
+++ b/platform/features/timeline/res/sass/_timeline-thematic.scss
@@ -52,8 +52,8 @@
     .l-pane-l {
         // Left pane of the tabular area
         .l-cols {
-            .s-label .ui-symbol.icon {
-                color: $colorGanttBarTabularFgIcon;
+            .t-object-label .t-item-icon {
+                color: pullForward($colorGanttBarBg, 10%);
             }
         }
     }
@@ -104,7 +104,7 @@
     }
 
     .s-ticks {
-        @include bgTicks($timelineColorAlt1);
+        @include bgTicks(   $timelineColorAlt1);
     }
     .s-hover-btns-holder {
         $bg: $timelineHeaderColorBg;
diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss
index 62cb103e46..2ebca3e588 100644
--- a/platform/features/timeline/res/sass/_timelines.scss
+++ b/platform/features/timeline/res/sass/_timelines.scss
@@ -266,9 +266,6 @@
 				width: $timelineColIconW;
                 text-align: center;
                 padding: 0;
-				.ui-symbol {
-					color: $colorKey;
-				}
 			}
 
 			&.l-plot-resource {
@@ -303,6 +300,16 @@
 			top: $timelineTopPaneHeaderElemMargin; bottom: $timelineTopPaneHeaderElemMargin;
 		}
 
+        .l-swimlanes-holder .l-cols {
+            .l-col-icon,
+            .l-col-icon a {
+                color: $colorKey;
+            }
+            .t-toggle .inactive {
+                color: pullForward(rgba($colorBodyFg, 0.2));
+            }
+        }
+
 		.l-pane-l {
 			// Left pane of the tabular area
 			.l-cols {
diff --git a/platform/features/timeline/res/templates/activity-gantt.html b/platform/features/timeline/res/templates/activity-gantt.html
index 1436ab9d6e..df8f12ef0a 100644
--- a/platform/features/timeline/res/templates/activity-gantt.html
+++ b/platform/features/timeline/res/templates/activity-gantt.html
@@ -29,9 +29,7 @@
                } : {}">
 
     <div class="bar">
-		<span class="s-activity-type ui-symbol">
-            {{type.getGlyph()}}
-        </span>
+		<span class="s-activity-type {{type.getCssClass()}}"></span>
 		<span class="s-title">
             {{model.name}}
         </span>
diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
index 09b798fcc1..bb3f1d8dcd 100644
--- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
+++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html
@@ -28,23 +28,20 @@
                'drop-after': ngModel.highlightBottom()
                }">
     <div class="l-cols">
-        <span class="l-col l-col-icon l-plot-resource"
+        <span class="l-col l-col-icon l-plot-resource t-toggle"
               ng-click="ngModel.toggleGraph(); parameters.commit()"
               title="Click to enable or disable inclusion in Resource Graphing">
-            <span class="ui-symbol"
-                  ng-show="ngModel.graph()"
-                  >
-                &#x00e9;
+            <span class="icon-plot-resource s-clickable-icon"
+                  ng-class="{ inactive: !ngModel.graph() }">
             </span>
         </span>
         <span class="l-col l-col-icon l-link">
-            <a class="ui-symbol"
+            <a class="icon-chain-links"
                target="_blank"
                ng-href="{{ngModel.link()}}"
                ng-if="ngModel.link().length > 0"
                title="{{ngModel.link()}}"
                >
-                &#x00e8;
             </a>
         </span>
         <span class="l-col l-title"
diff --git a/platform/features/timeline/res/templates/timeline.html b/platform/features/timeline/res/templates/timeline.html
index 87ebec6543..ef347a6e62 100644
--- a/platform/features/timeline/res/templates/timeline.html
+++ b/platform/features/timeline/res/templates/timeline.html
@@ -35,8 +35,8 @@
 
                     <div class="t-header l-header s-header">
                         <div class="l-cols">
-                            <span title="Resource Graphing: click a row to toggle" class="l-col l-col-icon l-plot-resource ui-symbol">&#x00e9;</span>
-                            <span title="Activity Links" class="l-col  l-col-icon l-col-link ui-symbol">&#x00e8;</span>
+                            <span title="Resource Graphing: click a row to toggle" class="l-col l-col-icon l-plot-resource icon-plot-resource"></span>
+                            <span title="Activity Links" class="l-col  l-col-icon l-col-link icon-chain-links"></span>
                             <span class="l-col l-title">Title</span>
                         </div>
                     </div>
@@ -103,25 +103,22 @@
         <!-- TOP PANE GANTT BARS -->
         <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
             <div class="l-hover-btns-holder s-hover-btns-holder t-btns-zoom">
-                <a class="t-btn l-btn s-btn"
+                <a class="t-btn l-btn s-btn icon-arrows-out"
                    ng-click="zoomController.fit()"
                    ng-show="true"
                    title="Zoom to fit">
-                    <span class="ui-symbol icon zoom-in">I</span>
                 </a>
 
-                <a class="t-btn l-btn s-btn"
+                <a class="t-btn l-btn s-btn icon-magnify-in"
                    ng-click="zoomController.zoom(-1)"
                    ng-show="true"
                    title="Zoom in">
-                    <span class="ui-symbol icon zoom-in">X</span>
                 </a>
 
-                <a class="t-btn l-btn s-btn"
+                <a class="t-btn l-btn s-btn icon-magnify-out"
                    ng-click="zoomController.zoom(1)"
                    ng-show="true"
                    title="Zoom out">
-                    <span class="ui-symbol icon zoom-out">Y</span>
                 </a>
             </div>