diff --git a/app/assets/javascripts/room.js b/app/assets/javascripts/room.js.erb
similarity index 96%
rename from app/assets/javascripts/room.js
rename to app/assets/javascripts/room.js.erb
index e229c7d4..f5be24f0 100644
--- a/app/assets/javascripts/room.js
+++ b/app/assets/javascripts/room.js.erb
@@ -32,10 +32,10 @@ $(document).on('turbolinks:load', function(){
       if (success) {
         inviteURL.blur();
         copy.addClass('btn-success');
-        copy.html("<i class='fas fa-check'></i> Copy")
+        copy.html("<i class='fas fa-check'></i> <%= I18n.t("copied") %>")
         setTimeout(function(){
           copy.removeClass('btn-success');
-          copy.html("<i class='fas fa-copy'></i> Copy")
+          copy.html("<i class='fas fa-copy'></i> <%= I18n.t("copy") %>")
         }, 2000)
       }
     });
diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss
index 93725e12..d675a905 100644
--- a/app/assets/stylesheets/application.scss
+++ b/app/assets/stylesheets/application.scss
@@ -105,7 +105,7 @@ a {
 }
 
 .invite-link-input {
-  width: 45%;
+  width: 100%;
 }
 
 .no-border-top {
diff --git a/app/helpers/rooms_helper.rb b/app/helpers/rooms_helper.rb
index e61f5cc9..a1991872 100644
--- a/app/helpers/rooms_helper.rb
+++ b/app/helpers/rooms_helper.rb
@@ -17,4 +17,9 @@
 # with BigBlueButton; if not, see <http://www.gnu.org/licenses/>.
 
 module RoomsHelper
+  # Helper to generate the path to a Google Calendar event creation
+  # It will have its title set as the room name, and the location as the URL to the room
+  def google_calendar_path
+    "http://calendar.google.com/calendar/r/eventedit?text=#{@room.name}&location=#{request.base_url + request.fullpath}"
+  end
 end
diff --git a/app/views/rooms/show.html.erb b/app/views/rooms/show.html.erb
index 70f262bf..83e1e93f 100644
--- a/app/views/rooms/show.html.erb
+++ b/app/views/rooms/show.html.erb
@@ -15,8 +15,8 @@
 
 <div class="background pb-1">
   <div class="container">
-    <div class="row pt-7">
-      <div class="col-lg-9 col-sm-12">
+    <div class="row pt-9">
+      <div class="col-lg-8 col-sm-12">
         <div id="room-title" class="display-3 form-inline <%= 'edit_hover_class' if current_user.main_room != @room %>">
           <h1 contenteditable=false id="user-text" class="display-3 text-left mb-3 font-weight-400"><%= @room.name %></h1>
           <% if current_user.main_room == @room %>
@@ -27,20 +27,36 @@
         </div>
         <h4 class="text-left mb-6"><%= @room.sessions %> <%= t("room.sessions") %> | <%= @recordings.length %> <%= t("room.recordings") %></h4>
         <label class="form-label"><%= t("room.invite_participants") %></label>
-        <form class="form-inline">
-          <div class="input-icon invite-link-input">
-            <span class="input-icon-addon">
-              <i class="fas fa-link"></i>
-            </span>
-            <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
+        <div class="row">
+          <div class="col-lg-5 col-md-12 mt-2 pr-0">
+            <div class="input-icon invite-link-input">
+              <span class="input-icon-addon">
+                <i class="fas fa-link"></i>
+              </span>
+              <input id="invite-url" type="text" class="form-control w-100" value="<%= request.base_url + @room.invite_path %>" readonly="">
+            </div>
           </div>
-          <div id="copy" class="btn btn-primary mx-2">
-            <i class="fas fa-copy"></i>
-            <%= t("copy") %>
+          <div class="col-lg-7 col-md-12 pr-0">
+            <div class="row">
+              <div class="col-sm-6">
+                <a href="#" id="copy" class="btn btn-primary btn-block mt-2">
+                  <i class="fas fa-copy"></i>
+                  <%= t("copy") %>
+                </a>
+              </div>
+              <div class="col-sm-6 pl-0">
+                <% if Rails.configuration.enable_google_calendar_button %>
+                  <a href="<%= google_calendar_path %>" target="__blank" id="schedule" class="btn btn-primary btn-block mt-2">
+                    <i class="fas fa-calendar-plus"></i>
+                    <%= t("add_to_google_calendar") %>
+                  </a>
+                <% end %>
+              </div>
+            </div>
           </div>
-        </form>
+        </div>
       </div>
-      <div class="col-lg-3 col-sm-12 force-bottom mt-5">
+      <div class="offset-lg-1 col-lg-3 col-sm-12 force-bottom mt-5 pr-0">
         <% if @is_running %>
           <%= button_to t("room.join"), room_path(@room), class: "btn btn-primary btn-block px-7 start-button float-right" %>
         <% else %>
diff --git a/app/views/shared/components/_recording_row.html.erb b/app/views/shared/components/_recording_row.html.erb
index 734d6ff9..1d298e19 100644
--- a/app/views/shared/components/_recording_row.html.erb
+++ b/app/views/shared/components/_recording_row.html.erb
@@ -39,7 +39,7 @@
       <% end %>
     </td>
   <% end %>
-  <td id="recording-length" class="text-left" data-full-length="<%=recording[:playbacks].first[:length]%>">
+  <td id="recording-length" class="text-left" data-full-length="<%= recording[:playbacks].empty? ? 0 : recording[:playbacks].first[:length]%>">
     <%= recording_length(recording[:playbacks]) %>
   </td>
   <td id="recording-users" class="text-left">
@@ -63,7 +63,7 @@
     </div>
   </td>
   <td>
-    <% sorted_formats =  recording[:playbacks].sort_by! {|p| p[:type]} %>
+    <% sorted_formats = recording[:playbacks].sort_by! { |p| p[:type] } %>
     <% sorted_formats.each do |p| %>
       <%= link_to t("recording.format.#{p[:type]}"), p[:url], class: "btn btn-sm btn-primary", target: "_blank" %>
     <% end %>
diff --git a/config/application.rb b/config/application.rb
index ac71d331..feb3bea2 100644
--- a/config/application.rb
+++ b/config/application.rb
@@ -111,5 +111,8 @@ module Greenlight
 
     # Whether the user has defined the variables required for recaptcha
     config.recaptcha_enabled = ENV['RECAPTCHA_SITE_KEY'].present? && ENV['RECAPTCHA_SECRET_KEY'].present?
+
+    # Show/hide "Add to Google Calendar" button in the room page
+    config.enable_google_calendar_button = (ENV['ENABLE_GOOGLE_CALENDAR_BUTTON'] == "true")
   end
 end
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 1c54de20..885afdc0 100755
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -62,12 +62,14 @@ en:
         uid: User ID
         username: Username
       title: Manage Users
+  add_to_google_calendar: "Add to Google Calendar"
   bigbluebutton: BigBlueButton
   bigbluebutton_exception: Oops, there was an error when starting the meeting!
   cancel: Cancel
   cookies:
     cookie_info: Cookies help us deliver our services. By using our services, you agree to our use of cookies.
     cookie_button: I Agree
+  copied: Copied
   copy: Copy
   default_admin: You are still using the default password for this account. Please click <a href="%{edit_link}">here</a> to change it
   delete: Delete
diff --git a/sample.env b/sample.env
index 59c80baf..b26beea9 100644
--- a/sample.env
+++ b/sample.env
@@ -139,6 +139,10 @@ PAGINATION_NUMBER=25
 # Default is set to 10 rows
 NUMBER_OF_ROWS=10
 
+# Specify if you want to display the Google Calendar button
+#   ENABLE_GOOGLE_CALENDAR_BUTTON=true|false
+ENABLE_GOOGLE_CALENDAR_BUTTON=
+
 # Comment this out to send logs to STDOUT in production instead of log/production.log .
 #
 # RAILS_LOG_TO_STDOUT=true