diff --git a/static/app-strings.json b/static/app-strings.json
index 61bdbd0bd..6576939b8 100644
--- a/static/app-strings.json
+++ b/static/app-strings.json
@@ -2312,7 +2312,5 @@
   "Free --[legend, unused disk space]--": "Free",
   "Top content in %language%": "Top content in %language%",
   "Apply": "Apply",
-  "24-hour clock": "24-hour clock",
-  "Disable background": "Disable background",
   "--end--": "--end--"
 }
diff --git a/ui/component/channelThumbnail/view.jsx b/ui/component/channelThumbnail/view.jsx
index b1c8e8e1d..cc293a458 100644
--- a/ui/component/channelThumbnail/view.jsx
+++ b/ui/component/channelThumbnail/view.jsx
@@ -50,7 +50,6 @@ function ChannelThumbnail(props: Props) {
     setThumbUploadError,
     ThumbUploadError,
   } = props;
-  const [retries, setRetries] = React.useState(3);
   const [thumbLoadError, setThumbLoadError] = React.useState(ThumbUploadError);
   const shouldResolve = !isResolving && claim === undefined;
   const thumbnail = rawThumbnail && rawThumbnail.trim().replace(/^http:\/\//i, 'https://');
@@ -59,15 +58,6 @@ function ChannelThumbnail(props: Props) {
   const channelThumbnail = thumbnailPreview || thumbnail || defaultAvatar;
   const isGif = channelThumbnail && channelThumbnail.endsWith('gif');
   const showThumb = (!obscure && !!thumbnail) || thumbnailPreview;
-  const avatarSrc = React.useMemo(() => {
-    if (retries <= 0) {
-      return defaultAvatar;
-    }
-    if (!thumbLoadError) {
-      return channelThumbnail;
-    }
-    return defaultAvatar;
-  }, [retries, thumbLoadError, channelThumbnail, defaultAvatar]);
 
   // Generate a random color class based on the first letter of the channel name
   const { channelName } = parseURI(uri);
@@ -110,10 +100,9 @@ function ChannelThumbnail(props: Props) {
         <OptimizedImage
           alt={__('Channel profile picture')}
           className={!channelThumbnail ? 'channel-thumbnail__default' : 'channel-thumbnail__custom'}
-          src={avatarSrc}
+          src={(!thumbLoadError && channelThumbnail) || defaultAvatar}
           loading={noLazyLoad ? undefined : 'lazy'}
           onError={() => {
-            setRetries((retries) => retries - 1);
             if (setThumbUploadError) {
               setThumbUploadError(true);
             } else {
diff --git a/ui/component/common/file-selector.jsx b/ui/component/common/file-selector.jsx
index bd1729d31..fda7b11d7 100644
--- a/ui/component/common/file-selector.jsx
+++ b/ui/component/common/file-selector.jsx
@@ -47,24 +47,7 @@ class FileSelector extends React.PureComponent<Props> {
   };
 
   handleDirectoryInputSelection = () => {
-    let defaultPath;
-    let properties;
-    let isWin = process.platform === 'win32';
-    let type = this.props.type;
-
-    if (isWin === true) {
-      defaultPath = process.env.HOME || process.env.HOMEPATH || process.env.USERPROFILE;
-    }
-
-    if (type === 'openFile') {
-      properties = ['openFile'];
-    }
-
-    if (type === 'openDirectory') {
-      properties = ['openDirectory'];
-    }
-
-    remote.dialog.showOpenDialog({ properties, defaultPath }).then((result) => {
+    remote.dialog.showOpenDialog({ properties: ['openDirectory'] }).then((result) => {
       const path = result && result.filePaths[0];
       if (path) {
         // $FlowFixMe
@@ -99,11 +82,7 @@ class FileSelector extends React.PureComponent<Props> {
               autoFocus={autoFocus}
               button="primary"
               disabled={disabled}
-              onClick={
-                type === 'openDirectory' || type === 'openFile'
-                  ? this.handleDirectoryInputSelection
-                  : this.fileInputButton
-              }
+              onClick={type === 'openDirectory' ? this.handleDirectoryInputSelection : this.fileInputButton}
               label={__('Browse')}
             />
           }
diff --git a/ui/component/common/form-components/form-field.jsx b/ui/component/common/form-components/form-field.jsx
index ebcf4e718..570703cb5 100644
--- a/ui/component/common/form-components/form-field.jsx
+++ b/ui/component/common/form-components/form-field.jsx
@@ -261,7 +261,7 @@ export class FormField extends React.PureComponent<Props> {
                 {!noEmojis && openEmoteMenu && (
                   <Button
                     type="alt"
-                    className="button--file-action"
+                    className="button--comment-icons"
                     title="Emotes"
                     onClick={openEmoteMenu}
                     icon={ICONS.EMOJI}
diff --git a/ui/component/publishFile/view.jsx b/ui/component/publishFile/view.jsx
index b53b7720c..cc57aca89 100644
--- a/ui/component/publishFile/view.jsx
+++ b/ui/component/publishFile/view.jsx
@@ -325,7 +325,6 @@ function PublishFile(props: Props) {
           {showFileUpload && (
             <>
               <FileSelector
-                type="openFile"
                 label={__('File')}
                 disabled={disabled}
                 currentPath={currentFile}
diff --git a/ui/component/settingAppearance/index.js b/ui/component/settingAppearance/index.js
index 7b3f9c2fa..45d1b44e8 100644
--- a/ui/component/settingAppearance/index.js
+++ b/ui/component/settingAppearance/index.js
@@ -5,7 +5,6 @@ import { makeSelectClientSetting } from 'redux/selectors/settings';
 import SettingAppearance from './view';
 
 const select = (state) => ({
-  disableBackground: makeSelectClientSetting(SETTINGS.DISABLE_BACKGROUND)(state),
   clock24h: makeSelectClientSetting(SETTINGS.CLOCK_24H)(state),
   searchInLanguage: makeSelectClientSetting(SETTINGS.SEARCH_IN_LANGUAGE)(state),
   hideBalance: makeSelectClientSetting(SETTINGS.HIDE_BALANCE)(state),
diff --git a/ui/component/settingAppearance/view.jsx b/ui/component/settingAppearance/view.jsx
index 2065a5c7e..9425ec436 100644
--- a/ui/component/settingAppearance/view.jsx
+++ b/ui/component/settingAppearance/view.jsx
@@ -12,7 +12,6 @@ import ThemeSelector from 'component/themeSelector';
 import homepages from 'homepages';
 
 type Props = {
-  disableBackground: boolean,
   clock24h: boolean,
   searchInLanguage: boolean,
   hideBalance: boolean,
@@ -21,7 +20,7 @@ type Props = {
 };
 
 export default function SettingAppearance(props: Props) {
-  const { clock24h, disableBackground, searchInLanguage, hideBalance, setClientSetting, setSearchInLanguage } = props;
+  const { clock24h, searchInLanguage, hideBalance, setClientSetting, setSearchInLanguage } = props;
 
   return (
     <>
@@ -64,14 +63,6 @@ export default function SettingAppearance(props: Props) {
                 checked={clock24h}
               />
             </SettingsRow>
-            <SettingsRow title={__('Disable background')}>
-              <FormField
-                type="checkbox"
-                name="background"
-                onChange={() => setClientSetting(SETTINGS.DISABLE_BACKGROUND, !disableBackground)}
-                checked={disableBackground}
-              />
-            </SettingsRow>
             <SettingsRow title={__('Hide wallet balance in header')}>
               <FormField
                 type="checkbox"
diff --git a/ui/component/splash/view.jsx b/ui/component/splash/view.jsx
index 1dc5a2e6f..6d6c5459c 100644
--- a/ui/component/splash/view.jsx
+++ b/ui/component/splash/view.jsx
@@ -241,12 +241,8 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
 
     return (
       <div className="splash">
-        {!error && (
-          <>
-            <h1 className="splash__title">LBRY</h1>
-            <div className="splash__details">{details}</div>
-          </>
-        )}
+        <h1 className="splash__title">LBRY</h1>
+        <div className="splash__details">{details}</div>
 
         {!animationHidden && !error && (
           <css-doodle class="doodle">
@@ -294,7 +290,7 @@ export default class SplashScreen extends React.PureComponent<Props, State> {
         )}
         {error && (
           <Card
-            title={<h1 className="splash__error-title">{__('Error starting up')}</h1>}
+            title={__('Error starting up')}
             subtitle={
               <React.Fragment>
                 <p>
diff --git a/ui/component/wallpaper/index.js b/ui/component/wallpaper/index.js
index 2df615c90..61c65f06d 100644
--- a/ui/component/wallpaper/index.js
+++ b/ui/component/wallpaper/index.js
@@ -1,12 +1,16 @@
 import { connect } from 'react-redux';
+// import { makeSelectCoverForUri, makeSelectAvatarForUri } from 'redux/selectors/claims';
 import Wallpaper from './view';
-import * as SETTINGS from 'constants/settings';
-import { makeSelectClientSetting } from 'redux/selectors/settings';
 
-const select = (state) => ({
-  disableBackground: makeSelectClientSetting(SETTINGS.DISABLE_BACKGROUND)(state),
-});
+/*
+const select = (state, props) => {
+  if (props.uri && (props.uri.indexOf('@') !== -1 || props.uri.indexOf('#') !== -1)) {
+    return {
+      cover: makeSelectCoverForUri(props.uri)(state),
+      avatar: makeSelectAvatarForUri(props.uri)(state),
+    };
+  } else return {};
+};
+*/
 
-const perform = {};
-
-export default connect(select, perform)(Wallpaper);
+export default connect()(Wallpaper);
diff --git a/ui/component/wallpaper/view.jsx b/ui/component/wallpaper/view.jsx
index 8fd610165..3b21a735f 100644
--- a/ui/component/wallpaper/view.jsx
+++ b/ui/component/wallpaper/view.jsx
@@ -8,11 +8,10 @@ type Props = {
   // cover: ?string,
   // avatar: ?string,
   reset: ?boolean,
-  disableBackground: ?boolean,
 };
 
 const Wallpaper = (props: Props) => {
-  const { disableBackground } = props;
+  // const { cover, avatar } = props;
 
   /*
   if (avatar) {
@@ -228,13 +227,12 @@ const Wallpaper = (props: Props) => {
         }}
       />
    */
-
   return (
     <>
       <div
         className={'background-image'}
         style={{
-          backgroundImage: disableBackground ? `none` : `url(${freeezepeach})`,
+          backgroundImage: `url(${freeezepeach})`,
         }}
       />
       <div className={'theme'} />
diff --git a/ui/constants/settings.js b/ui/constants/settings.js
index 9121f71bc..a56b28fc3 100644
--- a/ui/constants/settings.js
+++ b/ui/constants/settings.js
@@ -14,7 +14,6 @@ export const THEME = 'theme';
 export const THEMES = 'themes';
 export const AUTOMATIC_DARK_MODE_ENABLED = 'automatic_dark_mode_enabled';
 export const CLOCK_24H = 'clock_24h';
-export const DISABLE_BACKGROUND = 'disableBackground';
 export const AUTOPLAY_MEDIA = 'autoplay';
 export const AUTOPLAY_NEXT = 'autoplay_next';
 export const OS_NOTIFICATIONS_ENABLED = 'os_notifications_enabled';
diff --git a/ui/redux/reducers/settings.js b/ui/redux/reducers/settings.js
index f82faf6f6..36e6250db 100644
--- a/ui/redux/reducers/settings.js
+++ b/ui/redux/reducers/settings.js
@@ -40,7 +40,6 @@ const defaultState = {
     [SETTINGS.OS_NOTIFICATIONS_ENABLED]: true,
     [SETTINGS.AUTOMATIC_DARK_MODE_ENABLED]: false,
     [SETTINGS.CLOCK_24H]: false,
-    [SETTINGS.DISABLE_BACKGROUND]: false,
     [SETTINGS.TILE_LAYOUT]: true,
     [SETTINGS.VIDEO_THEATER_MODE]: false,
     [SETTINGS.VIDEO_PLAYBACK_RATE]: 1,
diff --git a/ui/scss/component/_button.scss b/ui/scss/component/_button.scss
index a8cfd3b36..ebffffd73 100644
--- a/ui/scss/component/_button.scss
+++ b/ui/scss/component/_button.scss
@@ -378,15 +378,47 @@ a.button--alt {
   }
 
   &:hover {
-    .icon {
-      stroke: var(--color-link);
-    }
     .button__label {
       color: var(--color-link);
     }
   }
 }
 
+.button--comment-icons {
+  @extend .button--alt;
+  color: var(--color-text);
+  background-color: transparent;
+  margin-right: var(--spacing-m);
+  padding: 0 var(--spacing-xxs);
+  height: initial;
+  padding: 5px;
+
+  @media (max-width: $breakpoint-small) {
+    padding: 0 0;
+  }
+
+  .icon {
+    &:not(.color-override) {
+      stroke: var(--color-text);
+    }
+  }
+
+  .button__label {
+    min-width: 10px;
+  }
+
+  &:last-child {
+    margin-right: 0;
+  }
+
+  &:hover {
+    .button__label {
+      color: var(--color-link);
+    }
+    background-color: var(--color-primary);
+  }
+}
+
 [aria-expanded='true'].button--file-action {
   background-color: var(--color-header-background);
   .icon {
diff --git a/ui/scss/component/_form-field.scss b/ui/scss/component/_form-field.scss
index 0f5d9e8dd..d47cedb84 100644
--- a/ui/scss/component/_form-field.scss
+++ b/ui/scss/component/_form-field.scss
@@ -547,7 +547,7 @@ fieldset-group {
   text-align: right;
 
   span {
-    display: inline-block;
+    vertical-align: super;
     padding-right: 0px;
   }
 }
diff --git a/ui/scss/component/_splash.scss b/ui/scss/component/_splash.scss
index 88aaa03f4..56cedbde3 100644
--- a/ui/scss/component/_splash.scss
+++ b/ui/scss/component/_splash.scss
@@ -28,13 +28,6 @@
   margin-top: -1rem;
 }
 
-.splash__error-title {
-  font-size: 22px;
-  line-height: 1;
-  font-weight: var(--font-weight-bold);
-  color: #fff;
-}
-
 .splash__animation-toggle {
   position: fixed;
   top: var(--spacing-l);