diff --git a/src/components/modals/main/settings/sections/About.jsx b/src/components/modals/main/settings/sections/About.jsx
index 25c56fb9..9797b24c 100644
--- a/src/components/modals/main/settings/sections/About.jsx
+++ b/src/components/modals/main/settings/sections/About.jsx
@@ -67,7 +67,7 @@ export default class About extends React.PureComponent {
     if (navigator.onLine === false || localStorage.getItem('offlineMode') === 'true') {
       this.setState({
         update: this.language.version.offline_mode,
-        loading: window.language.modals.update.offline.title
+        loading: window.language.modals.main.marketplace.offline.description
       });
       return;
     }
diff --git a/src/components/modals/main/settings/sections/Language.jsx b/src/components/modals/main/settings/sections/Language.jsx
index 43fa462a..4bd79dbd 100644
--- a/src/components/modals/main/settings/sections/Language.jsx
+++ b/src/components/modals/main/settings/sections/Language.jsx
@@ -37,6 +37,14 @@ export default class BackgroundSettings extends React.PureComponent {
   }
 
   componentDidMount() {
+    if (navigator.onLine === false || localStorage.getItem('offlineMode') === 'true') {
+      return this.setState({
+        quoteLanguages: [{
+          name: window.language.modals.main.marketplace.offline.description,
+          value: 'loading'
+        }]
+      });
+    }
     this.getQuoteLanguages();
   }
 
diff --git a/src/components/modals/main/settings/sections/background/Background.jsx b/src/components/modals/main/settings/sections/background/Background.jsx
index 39d71704..624dd5f9 100644
--- a/src/components/modals/main/settings/sections/background/Background.jsx
+++ b/src/components/modals/main/settings/sections/background/Background.jsx
@@ -158,9 +158,9 @@ export default class BackgroundSettings extends React.PureComponent {
         {backgroundSettings}
 
         <h3>{background.buttons.title}</h3>
-        <Checkbox name='view' text={background.buttons.view} />
-        <Checkbox name='favouriteEnabled' text={background.buttons.favourite} />
-        <Checkbox name='downloadbtn' text={background.buttons.download}/>
+        <Checkbox name='view' text={background.buttons.view} element='.other' />
+        <Checkbox name='favouriteEnabled' text={background.buttons.favourite} element='.other' />
+        <Checkbox name='downloadbtn' text={background.buttons.download} element='.other' />
 
         <h3>{background.effects.title}</h3>
         <Slider title={background.effects.blur} name='blur' min='0' max='100' default='0' display='%' category='background' />
diff --git a/src/components/modals/main/settings/sections/background/Colour.jsx b/src/components/modals/main/settings/sections/background/Colour.jsx
index e6da0b9a..c61d3b8d 100644
--- a/src/components/modals/main/settings/sections/background/Colour.jsx
+++ b/src/components/modals/main/settings/sections/background/Colour.jsx
@@ -30,7 +30,7 @@ export default class ColourSettings extends React.PureComponent {
     toast(window.language.toasts.reset);
   }
 
-  initialiseColorPickerState(gradientSettings) {
+  initialiseColourPickerState(gradientSettings) {
     this.GradientPickerInitalState = {
       points: gradientSettings.gradient.map((g) => {
         const rgb = hexToRgb(g.colour);
@@ -110,7 +110,7 @@ export default class ColourSettings extends React.PureComponent {
     return this.language.sections.background.source.disabled;
   }
 
-  onColorPickerChange = (attrs, name) => {
+  onColourPickerChange = (attrs, name) => {
     if (process.env.NODE_ENV === 'development') {
       console.log(attrs, name);
     }
@@ -138,14 +138,14 @@ export default class ColourSettings extends React.PureComponent {
       let gradientInputs;
       if (gradientHasMoreThanOneColour) {
         if (this.GradientPickerInitalState === undefined) {
-          this.initialiseColorPickerState(this.state.gradientSettings);
+          this.initialiseColourPickerState(this.state.gradientSettings);
         }
 
         gradientInputs = (
           <ColorPicker
-            onStartChange={(color) => this.onColorPickerChange(color, 'start')}
-            onChange={(color) => this.onColorPickerChange(color, 'change')}
-            onEndChange={(color) => this.onColorPickerChange(color, 'end')}
+            onStartChange={(colour) => this.onColourPickerChange(colour, 'start')}
+            onChange={(colour) => this.onColourPickerChange(colour, 'change')}
+            onEndChange={(colour) => this.onColourPickerChange(colour, 'end')}
             gradient={this.GradientPickerInitalState}
             isGradient/>
         );
diff --git a/src/components/widgets/background/PhotoInformation.jsx b/src/components/widgets/background/PhotoInformation.jsx
index bd3cb877..0ed22ac1 100644
--- a/src/components/widgets/background/PhotoInformation.jsx
+++ b/src/components/widgets/background/PhotoInformation.jsx
@@ -57,7 +57,7 @@ export default function PhotoInformation(props) {
         <span>{props.info.resolution || 'N/A'}</span>
         <Photographer/>
         <span>{photographer}</span>
-        {(localStorage.getItem('downloadbtn') === 'true') ? 
+        {(localStorage.getItem('downloadbtn') === 'true') && !props.info.offline && !props.info.photographerURL ? 
           <>
             <Download/>
             <span className='download' onClick={() => downloadImage(props.info)}>{language.download}</span>
diff --git a/src/translations/de_DE.json b/src/translations/de_DE.json
index 2dad787f..c7693099 100644
--- a/src/translations/de_DE.json
+++ b/src/translations/de_DE.json
@@ -319,14 +319,14 @@
         },
         "offline": {
           "title": "Sieht aus, als ob Sie offline sind",
-          "description": "Bitte stellen Sie eine Verbindung zum Internet her."
+          "description": "Bitte stellen Sie eine Verbindung zum Internet her"
         }
       },
       "addons": {
         "added": "Hinzugefügt",
         "empty": {
           "title": "Hier ist es leer",
-          "description": "Gehen Sie zum Marktplatz, um einige hinzuzufügen."
+          "description": "Gehen Sie zum Marktplatz, um einige hinzuzufügen"
         },
         "sideload": "Hochladen"
       }
diff --git a/src/translations/en_GB.json b/src/translations/en_GB.json
index 220ad98a..0ce86b40 100644
--- a/src/translations/en_GB.json
+++ b/src/translations/en_GB.json
@@ -319,7 +319,7 @@
         },
         "offline": {
           "title": "Looks like you're offline",
-          "description": "Please connect to the internet."
+          "description": "Please connect to the internet"
         }
       },
       "addons": {
diff --git a/src/translations/en_US.json b/src/translations/en_US.json
index b1109e06..a2b9e804 100644
--- a/src/translations/en_US.json
+++ b/src/translations/en_US.json
@@ -319,7 +319,7 @@
         },
         "offline": {
           "title": "Looks like you're offline",
-          "description": "Please connect to the internet."
+          "description": "Please connect to the internet"
         }
       },
       "addons": {
diff --git a/src/translations/es.json b/src/translations/es.json
index 5fd7c297..e7a4c411 100644
--- a/src/translations/es.json
+++ b/src/translations/es.json
@@ -319,7 +319,7 @@
         },
         "offline": {
           "title": "Parece que estás desconectado",
-          "description": "Por favor conéctate a Internet."
+          "description": "Por favor conéctate a Internet"
         }
       },
       "addons": {
diff --git a/src/translations/fr.json b/src/translations/fr.json
index 86ed090d..1cf762a9 100644
--- a/src/translations/fr.json
+++ b/src/translations/fr.json
@@ -326,7 +326,7 @@
         "added": "Ajoutées",
         "empty": {
           "title": "C'est vide par ici",
-          "description": "Dirigez vous vers le marché pour ajouter des options."
+          "description": "Dirigez vous vers le marché pour ajouter des options"
         },
         "sideload": "Charger"
       }
diff --git a/src/translations/nl.json b/src/translations/nl.json
index 6c3977c9..2a269164 100644
--- a/src/translations/nl.json
+++ b/src/translations/nl.json
@@ -319,14 +319,14 @@
         },
         "offline": {
           "title": "Het lijkt er op dat je niet verbonden bent het internet",
-          "description": "Maak verbinding met het internet."
+          "description": "Maak verbinding met het internet"
         }
       },
       "addons": {
         "added": "Toegevoegd",
         "empty": {
           "title": "Het is hier erg leeg",
-          "description": "Ga naar de marktplaats om een paar extensies toe te voegen."
+          "description": "Ga naar de marktplaats om een paar extensies toe te voegen"
         },
         "sideload": "Sideloaden"
       }
diff --git a/src/translations/no.json b/src/translations/no.json
index 29a72014..fe14f51a 100644
--- a/src/translations/no.json
+++ b/src/translations/no.json
@@ -318,15 +318,15 @@
           }
         },
         "offline": {
-          "title": "Ser ut som at du er offiline.",
-          "description": "Vær så snill, koble til internettet."
+          "title": "Ser ut som at du er offiline",
+          "description": "Vær så snill, koble til internettet"
         }
       },
       "addons": {
         "added": "Lagt til",
         "empty": {
           "title": "Det er tomt her.",
-          "description": "Gå til markedsplassen å legg til noe."
+          "description": "Gå til markedsplassen å legg til noe"
         },
         "sideload": "Sideload"
       }
@@ -335,7 +335,7 @@
       "title": "Oppdater",
       "offline": {
         "title": "Offline",
-        "description": "Kan ikke få oppdatering loggene når i offline modus."
+        "description": "Kan ikke få oppdatering loggene når i offline modus"
       },
       "error": {
         "title": "Error",
diff --git a/src/translations/ru.json b/src/translations/ru.json
index 6d6cfc77..ae519331 100644
--- a/src/translations/ru.json
+++ b/src/translations/ru.json
@@ -319,14 +319,14 @@
         },
         "offline": {
           "title": "Похоже, что вы офлайн",
-          "description": "Пожалуйста, подключитесь к интернету."
+          "description": "Пожалуйста, подключитесь к интернету"
         }
       },
       "addons": {
         "added": "Добавлен",
         "empty": {
           "title": "Здесь пусто",
-          "description": "Зайдите в магазин, чтобы найти что-то интересное."
+          "description": "Зайдите в магазин, чтобы найти что-то интересное"
         },
         "sideload": "Загрузить"
       }