diff --git a/lib/ui/settings/custom_fields.dart b/lib/ui/settings/custom_fields.dart
index 1fe6fe280..f6fe5d11e 100644
--- a/lib/ui/settings/custom_fields.dart
+++ b/lib/ui/settings/custom_fields.dart
@@ -53,7 +53,6 @@ class _CustomFieldsState extends State<CustomFields>
       appBarBottom: TabBar(
         key: ValueKey(state.settingsUIState.updatedAt),
         controller: _controller,
-        //isScrollable: true,
         tabs: [
           Tab(
             text: localization.company,
diff --git a/lib/ui/settings/settings_list.dart b/lib/ui/settings/settings_list.dart
index e98977621..9ea954e3d 100644
--- a/lib/ui/settings/settings_list.dart
+++ b/lib/ui/settings/settings_list.dart
@@ -130,18 +130,16 @@ class SettingsList extends StatelessWidget {
           viewModel: viewModel,
           icon: FontAwesomeIcons.heading,
         ),
-        SettingsListTile(
-          section: kSettingsWorkflowSettings,
-          viewModel: viewModel,
-          icon: FontAwesomeIcons.codeBranch,
-        ),
-        /*
         SettingsListTile(
           section: kSettingsInvoiceDesign,
           viewModel: viewModel,
           icon: FontAwesomeIcons.paintBrush,
         ),
-        */
+        SettingsListTile(
+          section: kSettingsWorkflowSettings,
+          viewModel: viewModel,
+          icon: FontAwesomeIcons.codeBranch,
+        ),
         SettingsListTile(
           section: kSettingsClientPortal,
           viewModel: viewModel,
diff --git a/lib/ui/settings/workflow_settings.dart b/lib/ui/settings/workflow_settings.dart
index 00684bfa8..4f50b220d 100644
--- a/lib/ui/settings/workflow_settings.dart
+++ b/lib/ui/settings/workflow_settings.dart
@@ -93,13 +93,13 @@ class _WorkflowSettingsState extends State<WorkflowSettings>
               padding: const EdgeInsets.all(10),
               children: <Widget>[
                 SwitchListTile(
-                  secondary: Icon(FontAwesomeIcons.solidEnvelope),
+                  secondary: Icon(FontAwesomeIcons.fileInvoice),
                   activeColor: Theme.of(context).accentColor,
                   title: Text(localization.autoConvertQuote),
                   subtitle: Text(localization.autoConvertQuoteHelp),
                   value: settings.autoConvertQuote ?? false,
                   onChanged: (value) => viewModel.onSettingsChanged(
-                      settings.rebuild((b) => b..autoEmailInvoice = value)),
+                      settings.rebuild((b) => b..autoConvertQuote = value)),
                 ),
                 SwitchListTile(
                   secondary: Icon(FontAwesomeIcons.archive),