diff --git a/src/components/modals/main/settings/sections/Message.jsx b/src/components/modals/main/settings/sections/Message.jsx
index 837fdf10..4b41df01 100644
--- a/src/components/modals/main/settings/sections/Message.jsx
+++ b/src/components/modals/main/settings/sections/Message.jsx
@@ -70,7 +70,6 @@ export default class Message extends PureComponent {
         />
         <SettingsItem
           title={variables.getMessage('modals.main.settings.sections.message.messages')}
-          subtitle=""
           final={true}
         >
           <button onClick={() => this.modifyMessage('add')}>
diff --git a/src/components/modals/main/settings/sections/QuickLinks.jsx b/src/components/modals/main/settings/sections/QuickLinks.jsx
index 8fd5376f..c3cd9dec 100644
--- a/src/components/modals/main/settings/sections/QuickLinks.jsx
+++ b/src/components/modals/main/settings/sections/QuickLinks.jsx
@@ -234,7 +234,6 @@ export default class QuickLinks extends PureComponent {
 
         <SettingsItem
           title={variables.getMessage('modals.main.settings.sections.quicklinks.title')}
-          subtitle=""
           final={true}
         >
           <button onClick={() => this.setState({ showAddModal: true })}>
diff --git a/src/components/modals/main/settings/sections/Time.jsx b/src/components/modals/main/settings/sections/Time.jsx
index 1d701934..cc212ccd 100644
--- a/src/components/modals/main/settings/sections/Time.jsx
+++ b/src/components/modals/main/settings/sections/Time.jsx
@@ -102,7 +102,6 @@ export default class TimeSettings extends PureComponent {
           title={variables.getMessage(
             'modals.main.settings.sections.time.vertical_clock.change_hour_colour',
           )}
-          subtitle=""
         >
           <div className="colourInput">
             <input
@@ -124,7 +123,6 @@ export default class TimeSettings extends PureComponent {
           title={variables.getMessage(
             'modals.main.settings.sections.time.vertical_clock.change_minute_colour',
           )}
-          subtitle=""
         >
           <div className="colourInput">
             <input
diff --git a/src/components/widgets/background/Background.jsx b/src/components/widgets/background/Background.jsx
index ac43673f..aec54af3 100644
--- a/src/components/widgets/background/Background.jsx
+++ b/src/components/widgets/background/Background.jsx
@@ -257,17 +257,19 @@ export default class Background extends PureComponent {
               this.state.firstTime === true) ||
             (localStorage.getItem('backgroundchange') === null && this.state.firstTime === true)
           ) {
-            localStorage.setItem('marketplaceNumber', randomNumber);
-            this.setState({
-              firstTime: false,
-              url: randomPhoto.url.default,
-              type: 'photo_pack',
-              photoInfo: {
-                hidden: false,
-                credit: randomPhoto.photographer,
-                location: randomPhoto.location || 'N/A',
-              },
-            });
+            if (this.state.firstTime !== true) {
+              localStorage.setItem('marketplaceNumber', randomNumber);
+              this.setState({
+                firstTime: false,
+                url: randomPhoto.url.default,
+                type: 'photo_pack',
+                photoInfo: {
+                  hidden: false,
+                  credit: randomPhoto.photographer,
+                  location: randomPhoto.location || 'N/A',
+                },
+              });
+            }
           } else {
             if (
               Number(