2 files changed, 6 insertions, 3 deletions

diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index d567a47d1..dacd4d9c0 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -384,10 +384,9 @@ export default @observer class EditSettingsForm extends Component {
             <Toggle field={form.$('showDisabledServices')} />
             <Toggle field={form.$('showMessageBadgeWhenMuted')} />
             <Toggle field={form.$('darkMode')} />
-            {isMac && <Toggle field={form.$('adaptableDarkMode')} disabled={isDarkmodeEnabled} />}
             {isDarkmodeEnabled && (
               <>
-                <Toggle field={form.$('adaptableDarkMode')} />
+                {isMac && <Toggle field={form.$('adaptableDarkMode')} />}
                 <Toggle field={form.$('universalDarkMode')} />
                 <p
                   className="settings__message"
diff --git a/src/components/settings/team/TeamDashboard.js b/src/components/settings/team/TeamDashboard.js
index 7e6d93997..57db1dcbd 100644
--- a/src/components/settings/team/TeamDashboard.js
+++ b/src/components/settings/team/TeamDashboard.js
@@ -210,7 +210,11 @@ export default @injectSheet(styles) @observer class TeamDashboard extends Compon
           <h1 className={classes.headline}>
             {intl.formatMessage(messages.teamsUnavailable)}
           </h1>
-          {intl.formatMessage(messages.teamsUnavailableInfo)}
+          <p className="settings__message" style={{
+            borderTop: 0, marginTop: 0
+          }}>
+            {intl.formatMessage(messages.teamsUnavailableInfo)}
+          </p>
         </div>
       </div>
     );