diff --git a/app/assets/javascripts/landing.js b/app/assets/javascripts/landing.js
index 73be73e8..8c81fd21 100644
--- a/app/assets/javascripts/landing.js
+++ b/app/assets/javascripts/landing.js
@@ -87,7 +87,7 @@
       $(this).select();
     });
 
-    // only allow ctrl-c to work
+    // only allow ctrl commands
     $('.center-panel-wrapper').on('keydown', '.meeting-url', function (event, msg) {
       if(!event.ctrlKey) {
         event.preventDefault();
@@ -95,7 +95,15 @@
     });
 
     // enable tooltips
-    $('[data-toggle="tooltip"]').tooltip()
+    var options = {
+      selector: '.has-tooltip'
+    };
+    $(document).tooltip(options)
+    var options = {
+      selector: '.bottom-tooltip',
+      placement: 'bottom'
+    };
+    $(document).tooltip(options);
 
     // enable popovers
     var options = {
diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index 2dfc6e65..38426681 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -60,13 +60,16 @@ class @Recordings
             if type == 'display'
               roomName = Meeting.getInstance().getId()
               published = row.published
-              eye = getPublishClass(published)
-              return '<button type="button" class="btn btn-default recording-update" data-published="'+published+'">' +
-                '<i class="fa '+eye+'" aria-hidden="true"></i></button> ' +
-                '<a tabindex="0" role="button" class="btn btn-default has-popover"' +
-                  'data-toggle="popover" data-placement="top">' +
-                    '<i class="fa fa-trash-o" aria-hidden="true"></i>' +
-                '</a>'
+              icon = getPublishClass(published)
+              publishText = if published then 'publish' else 'unpublish'
+              recordingActions = $('.hidden-elements').find('.recording-actions')
+              recordingActions.find('.recording-update > i')
+                .removeClass()
+                .addClass('fa '+icon)
+              recordingActions.find('.recording-update')
+                .attr('data-published', published)
+                .attr('title', I18n[publishText+'_recording'])
+              return recordingActions.html()
             return data
         }
       ]
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index 52670083..4effe1a6 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -45,4 +45,13 @@
       <span class="alert-message"></span>
     </div>
   </div>
+  <div class="recording-actions">
+    <button type="button" class="btn btn-default recording-update bottom-tooltip" data-published="">
+        <i class="fa" aria-hidden="true"></i>
+    </button>
+    <a tabindex="0" role="button" class="btn btn-default has-popover bottom-tooltip"
+      data-placement="top" title="<%= t('delete_recording') %>">
+        <i class="fa fa-trash-o" aria-hidden="true"></i>
+    </a>
+  </div>
 </div>
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index ad54b33c..cab1ce4d 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -26,9 +26,11 @@ en-US:
     are_you_sure: Are you sure?
     meeting_ended: Meeting was ended
     meeting_started: Meeting was started
+    publish_recording: Publish recording
     recording_deleted: Recording was deleted
     recording_published: Recording was published
     recording_unpublished: Recording was unpublished
+    unpublish_recording: Unpublish recording
   copied: Copied
   copy_error: Use Ctrl-c to copy
   date_recorded: Date Recorded
@@ -50,6 +52,7 @@ en-US:
   powered_bigbluebutton: Powered by BigBlueButton
   presentation: Presentation
   refresh_html: <a href="#" class="generate-link">Click refresh</a> to generate a new meeting URL
+  delete_recording: Delete recording
   session_url_explanation: The session will be taking place using the following URL
   start: Start
   start_new_session: Start a new session