4 files changed, 21 insertions, 5 deletions
diff --git a/app/components/HeaderBar.js b/app/components/HeaderBar.js
index 6e5864aa0f..6f44ff7a00 100644
--- a/app/components/HeaderBar.js
+++ b/app/components/HeaderBar.js
@@ -10,6 +10,7 @@ import {
 import Img from './Img';
 
 import styles from './HeaderBarStyles';
+import platformStyles from './HeaderBarPlatformStyles';
 
 export type HeaderBarStyle = 'default' | 'defaultDark' | 'error' | 'success';
 export type HeaderBarProps = {
@@ -31,7 +32,7 @@ export default class HeaderBar extends Component {
   render() {
     let containerClass = [
       styles['headerbar'],
-      styles[process.platform],
+      platformStyles[process.platform],
       styles['style_' + this.props.style]
     ];
 
@@ -50,7 +51,7 @@ export default class HeaderBar extends Component {
 
         {this.props.showSettings ?
           <Button style={ styles.settings } onPress={ this.props.onSettings } testName="headerbar__settings">
-            <Img height={24} width={24} source='icon-settings' style={ styles.settings_icon } hoverStyle={ styles.settings_icon_hover }/>
+            <Img height={24} width={24} source='icon-settings' style={[ styles.settings_icon, platformStyles.settings_icon ]} hoverStyle={ styles.settings_icon_hover }/>
           </Button>
           : null}
       </View>
diff --git a/app/components/HeaderBarPlatformStyles.android.js b/app/components/HeaderBarPlatformStyles.android.js
new file mode 100644
index 0000000000..f2f97beb65
--- /dev/null
+++ b/app/components/HeaderBarPlatformStyles.android.js
@@ -0,0 +1,2 @@
+import { createViewStyles } from '../lib/styles';
+export default { ...createViewStyles({}) };
diff --git a/app/components/HeaderBarPlatformStyles.js b/app/components/HeaderBarPlatformStyles.js
new file mode 100644
index 0000000000..241bdb1a60
--- /dev/null
+++ b/app/components/HeaderBarPlatformStyles.js
@@ -0,0 +1,16 @@
+// @flow
+import { createViewStyles } from '../lib/styles';
+
+export default {
+  ...createViewStyles({
+    darwin: {
+      paddingTop: 24,
+    },
+    linux: {
+      WebkitAppRegion: 'drag',
+    },
+    settings_icon: {
+      WebkitAppRegion: 'no-drag',
+    },
+  })
+};
diff --git a/app/components/HeaderBarStyles.js b/app/components/HeaderBarStyles.js
index 8c744ffcfb..c3e0e2ad5c 100644
--- a/app/components/HeaderBarStyles.js
+++ b/app/components/HeaderBarStyles.js
@@ -20,9 +20,6 @@ export default {
       paddingLeft: 0,
       paddingRight: 0,
     },
-    darwin: {
-      paddingTop: 24,
-    },
     style_defaultDark: {
       backgroundColor: colors.darkBlue,
     },