diff --git a/lib/pages/main/main.page.dart b/lib/pages/main/main.page.dart
index 814a6ae..2b8c670 100644
--- a/lib/pages/main/main.page.dart
+++ b/lib/pages/main/main.page.dart
@@ -415,7 +415,10 @@ class _MainPageState extends State<MainPage> with WidgetsBindingObserver, Ticker
         title: Text("Help"),
         onTap: () {
           Navigator.of(context).pop();
-          Launcher.launchURL("http://ha-client.app/docs");
+          Launcher.launchURLInCustomTab(
+            context: context,
+            url: "http://ha-client.app/help"
+          );
         },
       ),
       new ListTile(
diff --git a/lib/pages/settings/app_settings.page.dart b/lib/pages/settings/app_settings.page.dart
index 716c954..39b5d2c 100644
--- a/lib/pages/settings/app_settings.page.dart
+++ b/lib/pages/settings/app_settings.page.dart
@@ -48,25 +48,30 @@ class _AppSettingsPageState extends State<AppSettingsPage> {
   Widget build(BuildContext context) {
     Widget section;
     String title;
+    String helpUrl;
     switch (_currentSection) {
       case AppSettingsSection.menu: {
         section = _buildMenu(context);
         title = 'App settings';
+        helpUrl = 'https://ha-client.app/help/';
         break;
       }
       case AppSettingsSection.connectionSettings: {
         section = ConnectionSettingsPage();
         title = 'App settings - Connection';
+        helpUrl = 'https://ha-client.app/help/connection';
         break;
       }
       case AppSettingsSection.integrationSettings: {
         section = IntegrationSettingsPage();
         title = 'App settings - Integration';
+        helpUrl = 'https://ha-client.app/help/mobile_app_integration';
         break;
       }
       case AppSettingsSection.lookAndFeel: {
         section = LookAndFeelSettingsPage();
         title = 'App settings - Look&Feel';
+        helpUrl = 'https://ha-client.app/help/';
         break;
       }
       default:
@@ -86,6 +91,17 @@ class _AppSettingsPageState extends State<AppSettingsPage> {
             }
           }),
           title: Text(title),
+          actions: <Widget>[
+            IconButton(
+              icon: Icon(Icons.help),
+              onPressed: () {
+                Launcher.launchURLInCustomTab(
+                context: context,
+                url: helpUrl
+              );
+              },
+            )
+          ],
         ),
         body: section
       ),