diff --git a/cms/templates/asset_index.html b/cms/templates/asset_index.html
index 900ef3b697..173b751305 100644
--- a/cms/templates/asset_index.html
+++ b/cms/templates/asset_index.html
@@ -21,7 +21,7 @@
         </div>
       </td>
       <td class="name-col">
-        <a href="{{url}}" class="filename">{{displayname}}</a>
+        <a data-tooltip="Open/download this file" href="{{url}}" class="filename">{{displayname}}</a>
         <div class="embeddable-xml"></div>
       </td>
       <td class="date-col">
@@ -61,7 +61,7 @@
                 </div>
               </td>
               <td class="name-col">
-                <a href="${asset['url']}" class="filename">${asset['displayname']}</a>
+                <a data-tooltip="Open/download this file" href="${asset['url']}" class="filename">${asset['displayname']}</a>
                 <div class="embeddable-xml"></div>
               </td>
               <td class="date-col">
diff --git a/cms/templates/component.html b/cms/templates/component.html
index 2ec54d3b29..b7ad9c3c33 100644
--- a/cms/templates/component.html
+++ b/cms/templates/component.html
@@ -9,5 +9,5 @@
   <a href="#" class="edit-button standard"><span class="edit-icon"></span>Edit</a>
   <a href="#" class="delete-button standard"><span class="delete-icon"></span>Delete</a>  
 </div>
-<a href="#" class="drag-handle"></a>
+<a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
 ${preview}
\ No newline at end of file
diff --git a/cms/templates/editable_preview.html b/cms/templates/editable_preview.html
index 16fca59e14..731fd9b1c8 100644
--- a/cms/templates/editable_preview.html
+++ b/cms/templates/editable_preview.html
@@ -4,7 +4,7 @@ ${content}
   <a href="#" class="edit-button"><span class="edit-icon white"></span>Edit</a>
   <a href="#" class="delete-button"><span class="delete-icon white"></span>Delete</a>	
 </div>
-<a href="#" class="drag-handle"></a>
+<a data-tooltip="Drag to reorder" href="#" class="drag-handle"></a>
 <div class="component-editor">
   <h5>Edit Video Component</h5>
   <textarea class="component-source"><video youtube="1.50:q1xkuPsOY6Q,1.25:9WOY2dHz5i4,1.0:4rpg8Bq6hb4,0.75:KLim9Xkp7IY"/></textarea>