diff --git a/js/background.js b/js/background.js
index ec294293e..1e057c046 100644
--- a/js/background.js
+++ b/js/background.js
@@ -907,17 +907,17 @@
     };
 
     window.toggleMenuBar = () => {
-      const newValue = ! window.getSettingValue('hide-menu-bar');
+      const newValue = !window.getSettingValue('hide-menu-bar');
       window.Events.setHideMenuBar(newValue);
     };
 
     window.toggleSpellCheck = () => {
-      const newValue = ! window.getSettingValue('spell-check');
+      const newValue = !window.getSettingValue('spell-check');
       window.Events.setSpellCheck(newValue);
     };
 
     window.toggleLinkPreview = () => {
-      const newValue = ! window.getSettingValue('link-preview-setting');
+      const newValue = !window.getSettingValue('link-preview-setting');
       window.Events.setLinkPreviewSetting(newValue);
     };
 
diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index da182b905..bf6b71732 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -1176,7 +1176,6 @@ button.module-scroll-down {
   }
 }
 
-  
 .standalone {
   .button {
     background: $session-color-green;
diff --git a/ts/components/session/LeftPaneSettingSection.tsx b/ts/components/session/LeftPaneSettingSection.tsx
index bbb1b1730..0e07c9285 100644
--- a/ts/components/session/LeftPaneSettingSection.tsx
+++ b/ts/components/session/LeftPaneSettingSection.tsx
@@ -127,9 +127,8 @@ export class LeftPaneSettingSection extends React.Component<any, State> {
                 iconSize={SessionIconSize.Huge}
               />
             </SessionButton>
-
-          </div>
           </div>
+        </div>
       </div>
     );
   }
diff --git a/ts/components/session/SessionPasswordModal.tsx b/ts/components/session/SessionPasswordModal.tsx
index b86ac6d98..637276226 100644
--- a/ts/components/session/SessionPasswordModal.tsx
+++ b/ts/components/session/SessionPasswordModal.tsx
@@ -172,7 +172,6 @@ export class SessionPasswordModal extends React.Component<Props, State> {
   }
 
   private closeDialog() {
-
     if (this.props.onClose) {
       this.props.onClose();
     }
diff --git a/ts/components/session/settings/SessionSettings.tsx b/ts/components/session/settings/SessionSettings.tsx
index 7291185fb..095988036 100644
--- a/ts/components/session/settings/SessionSettings.tsx
+++ b/ts/components/session/settings/SessionSettings.tsx
@@ -99,9 +99,9 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
             const description = setting.description || '';
 
             const comparisonValue = setting.comparisonValue || null;
-            const value = 
+            const value =
               window.getSettingValue(setting.id, comparisonValue) ||
-              setting.content && setting.content.defaultValue;
+              (setting.content && setting.content.defaultValue);
 
             const sliderFn =
               setting.type === SessionSettingType.Slider
@@ -115,7 +115,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
                 this.updateSetting(setting);
               });
 
-
             return (
               <div key={setting.id}>
                 {shouldRenderSettings &&
@@ -150,7 +149,6 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
     );
   }
 
-
   public setOptionsSetting(settingID: string) {
     const selectedValue = $(`#${settingID} .session-radio input:checked`).val();
     window.setSettingValue(settingID, selectedValue);
@@ -175,7 +173,7 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
       if (item.type === SessionSettingType.Toggle) {
         // If no custom afterClick function given, alter values in storage here
         // Switch to opposite state
-        const newValue = ! window.getSettingValue(item.id);
+        const newValue = !window.getSettingValue(item.id);
         window.setSettingValue(item.id, newValue);
       }
     }
@@ -275,7 +273,8 @@ export class SettingsView extends React.Component<SettingsViewProps, State> {
         content: {
           options: {
             group: 'notification-setting',
-            initalItem: window.getSettingValue('notification-setting') || 'message',
+            initalItem:
+              window.getSettingValue('notification-setting') || 'message',
             items: [
               {
                 label: window.i18n('nameAndMessage'),
diff --git a/ts/components/session/settings/SessionSettingsHeader.tsx b/ts/components/session/settings/SessionSettingsHeader.tsx
index aeeada08e..538d7f8a0 100644
--- a/ts/components/session/settings/SessionSettingsHeader.tsx
+++ b/ts/components/session/settings/SessionSettingsHeader.tsx
@@ -61,12 +61,13 @@ export class SettingsHeader extends React.Component<SettingsViewProps, any> {
     return (
       <div className="session-settings-header">
         <div className="session-settings-header-title">{categoryTitle}</div>
-        {showSearch && <SessionIconButton
-          iconType={SessionIconType.Search}
-          iconSize={SessionIconSize.Huge}
-          onClick={this.focusSearch}
-        />
-          }
+        {showSearch && (
+          <SessionIconButton
+            iconType={SessionIconType.Search}
+            iconSize={SessionIconSize.Huge}
+            onClick={this.focusSearch}
+          />
+        )}
         {showAddDevice && (
           <SessionButton
             text={window.i18n('linkNewDevice')}