diff --git a/css/_atlaskit_overrides.scss b/css/_atlaskit_overrides.scss
index cc2ca6dc5..cee01fa07 100644
--- a/css/_atlaskit_overrides.scss
+++ b/css/_atlaskit_overrides.scss
@@ -10,3 +10,31 @@
     -ms-transform: translateX(0) translateY(100%) translateY(16px) !important;
     -webkit-transform: translateX(0) translateY(100%) translateY(16px) !important;
 }
+
+/**
+ * Welcome page tab color adjustments.
+ */
+.welcome {
+    /**
+     * The text color of the selected tab and hovered tabs.
+     */
+    li.bcVmZW,
+    li.bcVmZW:hover,
+    li.kheoEp:hover {
+        color: #172B4D;
+    }
+
+    /**
+     * The color of the inactive tab text.
+     */
+    li.kheoEp {
+        color: #FFFFFF;
+    }
+
+    /**
+     * The color of the underline of a selected tab.
+     */
+    li>span.kByArU {
+        background-color: #172B4D;
+    }
+}
diff --git a/css/_navigate_section_list.scss b/css/_navigate_section_list.scss
index 5c1d8bd15..32ffd684d 100644
--- a/css/_navigate_section_list.scss
+++ b/css/_navigate_section_list.scss
@@ -30,6 +30,10 @@
     &.with-click-handler:hover {
         background-color: #1a5dbb;
     }
+
+    i {
+        cursor: inherit;
+    }
 }
 .navigate-section-tile-body {
     @extend %navigate-section-list-tile-text;
diff --git a/react/features/base/react/components/web/NavigateSectionListItem.js b/react/features/base/react/components/web/NavigateSectionListItem.js
index 4a045b336..3ac8b14fa 100644
--- a/react/features/base/react/components/web/NavigateSectionListItem.js
+++ b/react/features/base/react/components/web/NavigateSectionListItem.js
@@ -12,21 +12,6 @@ import type { Item } from '../../Types';
  */
 type Props = {
 
-    /**
-     * The icon to use for the action button.
-     */
-    actionIconName: string,
-
-    /**
-     * The function to call when the action button is clicked.
-     */
-    actionOnClick: ?Function,
-
-    /**
-     * The tooltip to attach to the action button of this list item.
-     */
-    actionTooltip: string,
-
     /**
      * Function to be invoked when an item is pressed. The item's URL is passed.
      */
diff --git a/react/features/calendar-sync/components/AddMeetingUrlButton.web.js b/react/features/calendar-sync/components/AddMeetingUrlButton.web.js
index 818264695..774a9a31c 100644
--- a/react/features/calendar-sync/components/AddMeetingUrlButton.web.js
+++ b/react/features/calendar-sync/components/AddMeetingUrlButton.web.js
@@ -3,6 +3,7 @@
 import Button from '@atlaskit/button';
 import React, { Component } from 'react';
 import { connect } from 'react-redux';
+import Tooltip from '@atlaskit/tooltip';
 
 import { translate } from '../../base/i18n';
 
@@ -59,12 +60,14 @@ class AddMeetingUrlButton extends Component<Props> {
      */
     render() {
         return (
-            <Button
-                appearance = 'primary'
-                onClick = { this._onClick }
-                type = 'button'>
-                { this.props.t('calendarSync.addMeetingURL') }
-            </Button>
+            <Tooltip content = { this.props.t('calendarSync.addMeetingURL') }>
+                <Button
+                    appearance = 'primary'
+                    onClick = { this._onClick }
+                    type = 'button'>
+                    <i className = { 'icon-add' } />
+                </Button>
+            </Tooltip>
         );
     }
 
diff --git a/react/features/calendar-sync/components/AbstractCalendarList.js b/react/features/calendar-sync/components/BaseCalendarList.js
similarity index 97%
rename from react/features/calendar-sync/components/AbstractCalendarList.js
rename to react/features/calendar-sync/components/BaseCalendarList.js
index b9e5e4605..e7305dc10 100644
--- a/react/features/calendar-sync/components/AbstractCalendarList.js
+++ b/react/features/calendar-sync/components/BaseCalendarList.js
@@ -8,13 +8,14 @@ import { getLocalizedDateFormatter, translate } from '../../base/i18n';
 import { NavigateSectionList } from '../../base/react';
 
 import { refreshCalendar } from '../actions';
+
 import { isCalendarEnabled } from '../functions';
 
 import AddMeetingUrlButton from './AddMeetingUrlButton';
 
 /**
  * The type of the React {@code Component} props of
- * {@link AbstractCalendarList}.
+ * {@link BaseCalendarList}.
  */
 type Props = {
 
@@ -47,7 +48,7 @@ type Props = {
 /**
  * Component to display a list of events from a connected calendar.
  */
-class AbstractCalendarList extends Component<Props> {
+class BaseCalendarList extends Component<Props> {
     /**
      * Default values for the component's props.
      */
@@ -75,7 +76,7 @@ class AbstractCalendarList extends Component<Props> {
     }
 
     /**
-     * Initializes a new {@code CalendarList} instance.
+     * Initializes a new {@code BaseCalendarList} instance.
      *
      * @inheritdoc
      */
@@ -260,5 +261,5 @@ function _mapStateToProps(state: Object) {
 }
 
 export default isCalendarEnabled()
-    ? translate(connect(_mapStateToProps)(AbstractCalendarList))
+    ? translate(connect(_mapStateToProps)(BaseCalendarList))
     : undefined;
diff --git a/react/features/calendar-sync/components/CalendarList.native.js b/react/features/calendar-sync/components/CalendarList.native.js
index 012f4d648..a2f2b987d 100644
--- a/react/features/calendar-sync/components/CalendarList.native.js
+++ b/react/features/calendar-sync/components/CalendarList.native.js
@@ -10,7 +10,7 @@ import { translate } from '../../base/i18n';
 import { isCalendarEnabled } from '../functions';
 import styles from './styles';
 
-import AbstractCalendarList from './AbstractCalendarList';
+import BaseCalendarList from './BaseCalendarList';
 
 /**
  * The tyoe of the React {@code Component} props of {@link CalendarList}.
@@ -59,8 +59,8 @@ class CalendarList extends Component<Props> {
         const { disabled } = this.props;
 
         return (
-            AbstractCalendarList
-                ? <AbstractCalendarList
+            BaseCalendarList
+                ? <BaseCalendarList
                     disabled = { disabled }
                     renderListEmptyComponent
                         = { this._getRenderListEmptyComponent() } />
diff --git a/react/features/calendar-sync/components/CalendarList.web.js b/react/features/calendar-sync/components/CalendarList.web.js
index 3aa7785e2..8c32a14cd 100644
--- a/react/features/calendar-sync/components/CalendarList.web.js
+++ b/react/features/calendar-sync/components/CalendarList.web.js
@@ -11,7 +11,7 @@ import { openSettingsDialog, SETTINGS_TABS } from '../../settings';
 import { refreshCalendar } from '../actions';
 import { isCalendarEnabled } from '../functions';
 
-import AbstractCalendarList from './AbstractCalendarList';
+import BaseCalendarList from './BaseCalendarList';
 
 declare var interfaceConfig: Object;
 
@@ -74,8 +74,8 @@ class CalendarList extends Component<Props> {
         const { disabled } = this.props;
 
         return (
-            AbstractCalendarList
-                ? <AbstractCalendarList
+            BaseCalendarList
+                ? <BaseCalendarList
                     disabled = { disabled }
                     renderListEmptyComponent
                         = { this._getRenderListEmptyComponent() } />
diff --git a/react/features/settings/components/web/SettingsButton.js b/react/features/settings/components/web/SettingsButton.js
index 8760c560d..3740a0e3f 100644
--- a/react/features/settings/components/web/SettingsButton.js
+++ b/react/features/settings/components/web/SettingsButton.js
@@ -23,6 +23,11 @@ type Props = AbstractButtonProps & {
      */
     _filmstripOnly: boolean,
 
+    /**
+     * The default tab at which the settings dialog will be opened.
+     */
+    defaultTab: string,
+
     /**
      * The redux {@code dispatch} function.
      */
@@ -45,13 +50,16 @@ class SettingsButton extends AbstractButton<Props, *> {
      * @returns {void}
      */
     _handleClick() {
-        const { _filmstripOnly, dispatch } = this.props;
+        const {
+            _filmstripOnly,
+            defaultTab = SETTINGS_TABS.DEVICES,
+            dispatch } = this.props;
 
         sendAnalytics(createToolbarEvent('settings'));
         if (_filmstripOnly) {
             dispatch(openDeviceSelectionPopup());
         } else {
-            dispatch(openSettingsDialog(SETTINGS_TABS.DEVICES));
+            dispatch(openSettingsDialog(defaultTab));
         }
     }
 }
diff --git a/react/features/welcome/components/WelcomePage.web.js b/react/features/welcome/components/WelcomePage.web.js
index b3d8d3c9b..a0360362a 100644
--- a/react/features/welcome/components/WelcomePage.web.js
+++ b/react/features/welcome/components/WelcomePage.web.js
@@ -12,7 +12,7 @@ import { translate } from '../../base/i18n';
 import { Platform, Watermarks } from '../../base/react';
 import { CalendarList } from '../../calendar-sync';
 import { RecentList } from '../../recent-list';
-import { SettingsButton } from '../../settings';
+import { SettingsButton, SETTINGS_TABS } from '../../settings';
 
 import { AbstractWelcomePage, _mapStateToProps } from './AbstractWelcomePage';
 
@@ -237,7 +237,7 @@ class WelcomePage extends AbstractWelcomePage {
         return (
             <div className = 'tab-container' >
                 <div className = 'welcome-page-settings'>
-                    <SettingsButton />
+                    <SettingsButton defaultTab = { SETTINGS_TABS.CALENDAR } />
                 </div>
                 <Tabs tabs = { tabs } />
             </div>);