4 files changed, 18 insertions, 8 deletions

diff --git a/src/components/layout/AppLayout.js b/src/components/layout/AppLayout.js
index eb36ea431..4474fe0f4 100644
--- a/src/components/layout/AppLayout.js
+++ b/src/components/layout/AppLayout.js
@@ -126,7 +126,7 @@ class AppLayout extends Component {
 
     const { intl } = this.props;
 
-    const { locked } = settings.app;
+    const { locked, automaticUpdates } = settings.app;
     if (locked) {
       return <LockedScreen />;
     }
@@ -191,7 +191,7 @@ class AppLayout extends Component {
                     {intl.formatMessage(messages.servicesUpdated)}
                   </InfoBar>
                 )}
-              {appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && (
+              {automaticUpdates && appUpdateIsDownloaded && this.state.shouldShowAppUpdateInfoBar && (
                 <AppUpdateInfoBar
                   onInstallUpdate={installAppUpdate}
                   onHide={() => {
diff --git a/src/components/layout/Sidebar.js b/src/components/layout/Sidebar.js
index e3df9c2ea..1cbdcfe46 100644
--- a/src/components/layout/Sidebar.js
+++ b/src/components/layout/Sidebar.js
@@ -233,12 +233,14 @@ class Sidebar extends Component {
           )} (${settingsShortcutKey(false)})`}
         >
           <Icon icon={mdiCog} size={1.5} />
-          {(this.props.stores.app.updateStatus ===
-            this.props.stores.app.updateStatusTypes.AVAILABLE ||
-            this.props.stores.app.updateStatus ===
-              this.props.stores.app.updateStatusTypes.DOWNLOADED) && (
-            <span className="update-available">•</span>
-          )}
+          {
+            (this.props.stores.settings.app.automaticUpdates &&
+              (this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.AVAILABLE ||
+              this.props.stores.app.updateStatus === this.props.stores.app.updateStatusTypes.DOWNLOADED)
+            ) && (
+              <span className="update-available">•</span>
+            )
+          }
         </button>
         {this.state.tooltipEnabled && (
           <ReactTooltip place="right" type="dark" effect="solid" />
diff --git a/src/components/settings/navigation/SettingsNavigation.js b/src/components/settings/navigation/SettingsNavigation.js
index e8370d2ef..b58956f51 100644
--- a/src/components/settings/navigation/SettingsNavigation.js
+++ b/src/components/settings/navigation/SettingsNavigation.js
@@ -137,6 +137,11 @@ class SettingsNavigation extends Component {
           activeClassName="is-active"
         >
           {intl.formatMessage(globalMessages.settings)}
+          {stores.settings.app.automaticUpdates &&
+            (stores.app.updateStatus === stores.app.updateStatusTypes.AVAILABLE ||
+              stores.app.updateStatus === stores.app.updateStatusTypes.DOWNLOADED) && (
+            <span className="update-available">•</span>
+          )}
         </Link>
         <Link
           to="/settings/support"
diff --git a/src/components/settings/settings/EditSettingsForm.js b/src/components/settings/settings/EditSettingsForm.js
index 01e609580..3b2fe4af4 100644
--- a/src/components/settings/settings/EditSettingsForm.js
+++ b/src/components/settings/settings/EditSettingsForm.js
@@ -378,6 +378,9 @@ class EditSettingsForm extends Component {
                 }}
               >
                 {intl.formatMessage(messages.headlineUpdates)}
+                {automaticUpdates && (updateIsReadyToInstall || isUpdateAvailable) && (
+                  <span className="update-available">•</span>
+                )}
               </h2>
             </div>