diff --git a/src/ui/component/header/view.jsx b/src/ui/component/header/view.jsx
index af57ab392..cada976a8 100644
--- a/src/ui/component/header/view.jsx
+++ b/src/ui/component/header/view.jsx
@@ -71,6 +71,12 @@ const Header = (props: Props) => {
             icon={ICONS.LBRY}
             navigate="/"
           />
+          <Button
+            className="header__navigation-item header__navigation-item--lbry"
+            label={__('auth')}
+            icon={ICONS.LBRY}
+            navigate="/$/signin"
+          />
 
           {/* @if TARGET='app' */}
           {!minimal && (
diff --git a/src/ui/page/settings/index.js b/src/ui/page/settings/index.js
index 7de1c56b1..93901cc9f 100644
--- a/src/ui/page/settings/index.js
+++ b/src/ui/page/settings/index.js
@@ -1,7 +1,13 @@
 import { connect } from 'react-redux';
 import * as SETTINGS from 'constants/settings';
 import { doClearCache, doNotifyEncryptWallet, doNotifyDecryptWallet, doNotifyForgetPassword } from 'redux/actions/app';
-import { doSetDaemonSetting, doSetClientSetting, doSetDarkTime } from 'redux/actions/settings';
+import {
+  doSetDaemonSetting,
+  doSetClientSetting,
+  doGetThemes,
+  doChangeLanguage,
+  doSetDarkTime,
+} from 'redux/actions/settings';
 import { doSetPlayingUri } from 'redux/actions/content';
 import { makeSelectClientSetting, selectDaemonSettings, selectosNotificationsEnabled } from 'redux/selectors/settings';
 import { doWalletStatus, selectWalletIsEncrypted, selectBlockedChannelsCount } from 'lbry-redux';
@@ -30,6 +36,7 @@ const perform = dispatch => ({
   setDaemonSetting: (key, value) => dispatch(doSetDaemonSetting(key, value)),
   clearCache: () => dispatch(doClearCache()),
   setClientSetting: (key, value) => dispatch(doSetClientSetting(key, value)),
+  getThemes: () => dispatch(doGetThemes()),
   encryptWallet: () => dispatch(doNotifyEncryptWallet()),
   decryptWallet: () => dispatch(doNotifyDecryptWallet()),
   updateWalletStatus: () => dispatch(doWalletStatus()),
diff --git a/src/ui/page/settings/view.jsx b/src/ui/page/settings/view.jsx
index 9848d5820..69b352cc3 100644
--- a/src/ui/page/settings/view.jsx
+++ b/src/ui/page/settings/view.jsx
@@ -44,6 +44,7 @@ type Props = {
   setDaemonSetting: (string, ?SetDaemonSettingArg) => void,
   setClientSetting: (string, SetDaemonSettingArg) => void,
   clearCache: () => Promise<any>,
+  getThemes: () => void,
   daemonSettings: DaemonSettings,
   showNsfw: boolean,
   instantPurchaseEnabled: boolean,
@@ -94,6 +95,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
   }
 
   componentDidMount() {
+    this.props.getThemes();
     this.props.updateWalletStatus();
     getSavedPassword().then(p => {
       if (p) {
diff --git a/src/ui/redux/actions/settings.js b/src/ui/redux/actions/settings.js
index c962e52be..6c90c5895 100644
--- a/src/ui/redux/actions/settings.js
+++ b/src/ui/redux/actions/settings.js
@@ -46,6 +46,13 @@ export function doSetClientSetting(key, value) {
   };
 }
 
+export function doGetThemes() {
+  return dispatch => {
+    const themes = [__('light'), __('dark')];
+    dispatch(doSetClientSetting(SETTINGS.THEMES, themes));
+  };
+}
+
 export function doUpdateIsNight() {
   return {
     type: ACTIONS.UPDATE_IS_NIGHT,
diff --git a/src/ui/redux/reducers/settings.js b/src/ui/redux/reducers/settings.js
index 6a567c5ef..5ab039a7d 100644
--- a/src/ui/redux/reducers/settings.js
+++ b/src/ui/redux/reducers/settings.js
@@ -16,8 +16,8 @@ const defaultState = {
 
     // UI
     [SETTINGS.LANGUAGE]: window.localStorage.getItem(SETTINGS.LANGUAGE) || 'en',
-    [SETTINGS.THEME]: __('light'),
-    [SETTINGS.THEMES]: [__('light'), __('dark')],
+    [SETTINGS.THEME]: 'light',
+    [SETTINGS.THEMES]: [],
     [SETTINGS.SUPPORT_OPTION]: false,
     [SETTINGS.HIDE_SPLASH_ANIMATION]: false,
     [SETTINGS.HIDE_BALANCE]: false,