diff --git a/src/renderer/page/settings/view.jsx b/src/renderer/page/settings/view.jsx
index fd8788caf..d09dbaffc 100644
--- a/src/renderer/page/settings/view.jsx
+++ b/src/renderer/page/settings/view.jsx
@@ -178,17 +178,6 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 currentPath={daemonSettings.download_directory}
                 onFileChosen={this.onDownloadDirChange}
               />
-
-              <br />
-              <span className="card__subtitle">{__('App Notifications.')}</span>
-
-              <FormField
-                type="checkbox"
-                name="desktopNotification"
-                onChange={this.onDesktopNotificationsChange}
-                checked={desktopNotificationsEnabled}
-                postfix={__('Desktop Notification')}
-              />
             </section>
             <section className="card card--section">
               <div className="card__title">{__('Max Purchase Price')}</div>
@@ -270,6 +259,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
             <section className="card card--section">
               <div className="card__title">{__('Content Settings')}</div>
               <FormField
+                useToggle
                 type="checkbox"
                 name="autoplay"
                 onChange={this.onAutoplayChange}
@@ -277,6 +267,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 postfix={__('Autoplay media files')}
               />
               <FormField
+                useToggle
                 type="checkbox"
                 name="show_nsfw"
                 onChange={this.onShowNsfwChange}
@@ -287,9 +278,23 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 )}
               />
             </section>
+
+            <section className="card card--section">
+              <div className="card__title">{__('Notifications')}</div>
+              <FormField
+                useToggle
+                type="checkbox"
+                name="desktopNotification"
+                onChange={this.onDesktopNotificationsChange}
+                checked={desktopNotificationsEnabled}
+                postfix={__('On Download Completion')}
+              />
+            </section>
+
             <section className="card card--section">
               <div className="card__title">{__('Share Diagnostic Data')}</div>
               <FormField
+                useToggle
                 type="checkbox"
                 name="share_usage_data"
                 onChange={this.onShareDataChange}
@@ -318,6 +323,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
                 ))}
               </FormField>
               <FormField
+                useToggle
                 type="checkbox"
                 name="automatic_dark_mode"
                 onChange={e => this.onAutomaticDarkModeChange(e.target.checked)}
@@ -329,6 +335,7 @@ class SettingsPage extends React.PureComponent<Props, State> {
             <section className="card card--section">
               <div className="card__title">{__('Wallet Security')}</div>
               <FormField
+                useToggle
                 type="checkbox"
                 name="encrypt_wallet"
                 onChange={e => this.onChangeEncryptWallet(e)}