diff --git a/app/assets/javascripts/recordings.coffee b/app/assets/javascripts/recordings.coffee
index ff9fa804..96a55ad1 100644
--- a/app/assets/javascripts/recordings.coffee
+++ b/app/assets/javascripts/recordings.coffee
@@ -183,6 +183,10 @@ class @Recordings
     options.title = I18n.mail_recording
     $('#recordings').tooltip(options)
 
+    options.selector = '.disabled-tooltip'
+    options.title = I18n.youtube_disabled
+    $('#recordings').tooltip(options)
+
     $(document).one "turbolinks:before-cache", =>
       @getTable().api().clear().draw().destroy()
 
diff --git a/app/assets/stylesheets/main/landing.scss b/app/assets/stylesheets/main/landing.scss
index cf00e43a..1ad74b6b 100644
--- a/app/assets/stylesheets/main/landing.scss
+++ b/app/assets/stylesheets/main/landing.scss
@@ -101,3 +101,7 @@
 .top-buffer {
   margin-top: 8px;
 }
+
+.tooltip-wrapper {
+  display: inline-block;
+}
diff --git a/app/views/landing/rooms.html.erb b/app/views/landing/rooms.html.erb
index f3881873..1ca7b2ad 100644
--- a/app/views/landing/rooms.html.erb
+++ b/app/views/landing/rooms.html.erb
@@ -58,21 +58,22 @@
   <div class="youtube-popover">
     <form class = "form-inline">
       <div class = "row">
-        <div class="col-xs-5">
+        <div class="col-xs-12">
           <input type="title" class="form-control" id="video-title" placeholder="<%= t('video_title') %>">
         </div>
-        <div class="col-xs-4 col-xs-offset-2">
-          <button type="button" class="btn btn-success upload-button centered" data-dismiss="popover">
-            <%= t('upload') %>
-          </button>
-        </div>
       </div>
       <div class = "row top-buffer text-center">
         <form class="privacy_form">
           <label class="radio-inline"><input type="radio" name="privacy_status" value="public" checked><%= t('youtube_privacy_options.public') %> </label>
+          <label class="radio-inline"><input type="radio" name="privacy_status" value="private" checked><%= t('youtube_privacy_options.private') %> </label>
           <label class="radio-inline"><input type="radio" name="privacy_status" value="unlisted"><%= t('youtube_privacy_options.unlisted') %></label>
         </form>
       </div>
+        <div class="row top-buffer text-center">
+          <button type="button" class="btn btn-success upload-button centered" data-dismiss="popover">
+            <%= t('upload') %>
+          </button>
+        </div>
     </form>
   </div>
   <div class='mail_youtube_popover'>
@@ -80,14 +81,20 @@
       <%= icon('envelope-o') %>
     </button>
     <button type="button" class="btn btn-default has-popover youtube-upload youtube-tooltip"
-          data-placement="top" data-popover-body=".youtube-popover">
+          data-placement="top" data-popover-body=".youtube-popover"
+          data-popover-title="<%= t('upload_to_youtube') %>" >
       <div class = 'youtube-red'> <%= icon('youtube-play') %> </div>
     </button>
   </div>
   <div class='mail_popover'>
-    <button type="button" class="btn btn-default mail-recording mail-tooltip">
+    <button type="button" class="btn btn-default mail-recording mail-tooltip fa-2x">
       <%= icon('envelope-o') %>
     </button>
+    <div class="tooltip-wrapper disabled disabled-tooltip">
+      <button type="button" class="btn btn-default" disabled>
+          <%= icon('youtube-play') %>
+      </button>
+    </div>
   </div>
   <div class="recording-visibility-popover">
     <button type="button" class="btn btn-default btn-success recording-update" data-visibility="published">
diff --git a/config/locales/en-us.yml b/config/locales/en-us.yml
index 3ec14721..f1fb81ed 100644
--- a/config/locales/en-us.yml
+++ b/config/locales/en-us.yml
@@ -70,6 +70,7 @@ en-US:
     upload_youtube: Youtube
     user_waiting_body: "%{user} is waiting to join %{meeting}!"
     user_waiting_title: A user is waiting
+    youtube_disabled: Recording did not contain any video.
   copied: Copied
   copy_error: Use Ctrl-c to copy
   create_your_session: Create your own meeting
@@ -160,6 +161,7 @@ en-US:
       phrase1: This is a test email sent to %{email}
   thumbnails: Thumbnails
   upload: Upload
+  upload_to_youtube: Upload to Youtube
   url_copy_explanation: Copy this URL to invite others to the meeting
   user_person_room: "%{name} personal room"
   video: Video