diff --git a/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx b/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx
old mode 100644
new mode 100755
index 58606e4e2b6f8e5bc5df26981e61426d0feec3b4..7d1b19815657631366cc28c68abad88ba0d96ce4
--- a/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/logout-confirmation/component.jsx
@@ -47,7 +47,7 @@ class LeaveConfirmation extends Component {
       <Modal
         title={intl.formatMessage(intlMessages.title)}
         confirm={{
-          callback: this.handleLeave,
+          callback: this.handleLeaveConfirmation,
           label: intl.formatMessage(intlMessages.confirmLabel),
           description: intl.formatMessage(intlMessages.confirmDesc),
         }}
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
old mode 100644
new mode 100755
index c51a89a914107347d1da80c1fd9020b5330fc365..e6f1b900819d89db778e2a324c1a1c154903068b
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/component.jsx
@@ -2,7 +2,7 @@ import React, { Component, PropTyes } from 'react';
 import { FormattedMessage } from 'react-intl';
 import ReactDOM from 'react-dom';
 import classNames from 'classnames';
-import styles from './styles';
+import styles from '../styles';
 
 import { showModal } from '/imports/ui/components/app/service';
 import LogoutConfirmation from '/imports/ui/components/logout-confirmation/component';
@@ -63,6 +63,7 @@ export default class SettingsDropdown extends Component {
             ghost={true}
             circle={true}
             hideLabel={true}
+            className={styles.settingBtn}
 
             // FIXME: Without onClick react proptypes keep warning
             // even after the DropdownTrigger inject an onClick handler
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/styles.scss
deleted file mode 100644
index 746c3831b0420f0ba9b2f5c6c75c2140df5d8eac..0000000000000000000000000000000000000000
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/settings-dropdown/styles.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import "../../../stylesheets/variables/_all";
diff --git a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
index fb935ec5610ccdc779d4ed3a4850fa6ebfb760fa..ffbd0b2854016cd15585b03e8ec3df3aa67b8e3c 100755
--- a/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
+++ b/bigbluebutton-html5/imports/ui/components/nav-bar/styles.scss
@@ -60,3 +60,11 @@
   height:1px;
   overflow:hidden;
 }
+
+.settingBtn {
+  transform: rotate(90deg);
+  span {
+    border: none;
+    box-shadow: none;
+  }
+}
diff --git a/bigbluebutton-html5/imports/ui/services/auth/index.js b/bigbluebutton-html5/imports/ui/services/auth/index.js
index 7e7ab98e7fdd6a48d9d54140b8f8454a453e897c..465e27b09550e9ecd28feb05b1bfc90872067f16 100755
--- a/bigbluebutton-html5/imports/ui/services/auth/index.js
+++ b/bigbluebutton-html5/imports/ui/services/auth/index.js
@@ -77,7 +77,7 @@ class Auth {
     let logoutURL = this.logoutURL;
     callServer('userLogout');
 
-    clearCredentials(() => {
+    this.clearCredentials(() => {
       document.location.href = logoutURL;
     });
   };