diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart
index 76d63a89c..ec1eb9687 100644
--- a/lib/ui/settings/settings_list.dart
+++ b/lib/ui/settings/settings_list.dart
@@ -17,6 +17,14 @@ class SettingsList extends StatelessWidget {
 
     return ListView(
       children: <Widget>[
+        Container(
+          color: Theme.of(context).backgroundColor,
+          padding: const EdgeInsets.only(left: 15, top: 15, bottom: 15),
+          child: Text(
+            localization.basicSettings,
+            style: Theme.of(context).textTheme.title,
+          ),
+        ),
         SettingsListTile(
           title: localization.companyDetails,
           viewModel: viewModel,
@@ -29,6 +37,66 @@ class SettingsList extends StatelessWidget {
           title: localization.localization,
           viewModel: viewModel,
         ),
+        SettingsListTile(
+          title: localization.onlinePayments,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.taxRates,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.products,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.notifications,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.importExport,
+          viewModel: viewModel,
+        ),
+        Container(
+          color: Theme.of(context).backgroundColor,
+          padding: const EdgeInsets.only(left: 15, top: 15, bottom: 15),
+          child: Text(
+            localization.advancedSettings,
+            style: Theme.of(context).textTheme.title,
+          ),
+        ),
+        SettingsListTile(
+          title: localization.invoiceSettings,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.invoiceDesign,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.clientPortal,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.buyNowButtons,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.emailSettings,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.templatesAndReminders,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.creditCardsAndBanks,
+          viewModel: viewModel,
+        ),
+        SettingsListTile(
+          title: localization.dataVisualizations,
+          viewModel: viewModel,
+        ),
       ],
     );
   }
diff --git a/lib/utils/i18n.dart b/lib/utils/i18n.dart
index ba11694ce..30d8a5216 100644
--- a/lib/utils/i18n.dart
+++ b/lib/utils/i18n.dart
@@ -14,6 +14,8 @@ abstract class LocaleCodeAware {
 mixin LocalizationsProvider on LocaleCodeAware {
   static final Map<String, Map<String, String>> _localizedValues = {
     'en': {
+      'basic_settings': 'Basic Settings',
+      'advanced_settings': 'Advanced Settings',
       'company_details': 'Company Details',
       'user_details': 'User Details',
       'localization': 'Localization',
@@ -14659,6 +14661,11 @@ mixin LocalizationsProvider on LocaleCodeAware {
   String get dataVisualizations =>
       _localizedValues[localeCode]['data_visualizations'];
 
+  String get basicSettings => _localizedValues[localeCode]['basic_settings'];
+
+  String get advancedSettings =>
+      _localizedValues[localeCode]['advanced_settings'];
+
   String lookup(String key) {
     final lookupKey = toSnakeCase(key);
     return _localizedValues[localeCode][lookupKey] ??