diff --git a/.vagrant-puppet/files/etc/icingaweb/menu.ini b/.vagrant-puppet/files/etc/icingaweb/menu.ini
index 40ee6e4cd..e33950bb9 100644
--- a/.vagrant-puppet/files/etc/icingaweb/menu.ini
+++ b/.vagrant-puppet/files/etc/icingaweb/menu.ini
@@ -1,15 +1,18 @@
 [Dashboard]
-title       = "Dashboard"
-url         = "dashboard"
-icon        = "img/icons/dashboard.png"
-priority    = 10
+title    = "Dashboard"
+url      = "dashboard"
+icon     = "img/icons/dashboard.png"
+priority = 10
 
 [System]
 icon = img/icons/configuration.png
 priority = 200
 
 [System.Configuration]
-title       = "Configuration"
-url         = "config/index"
+title = "Configuration"
+url   = "config"
 
+[System.Preferences]
+title = "Preferences"
+url  = "preference"
 
diff --git a/application/controllers/PreferenceController.php b/application/controllers/PreferenceController.php
index 12ec8fe38..3393226e7 100644
--- a/application/controllers/PreferenceController.php
+++ b/application/controllers/PreferenceController.php
@@ -49,9 +49,8 @@ class PreferenceController extends BasePreferenceController
     public static function createProvidedTabs()
     {
         return array(
-            'preference' => new Tab(
+            'general' => new Tab(
                 array(
-                    'name'      => 'general',
                     'title'     => 'General settings',
                     'url'       => Url::fromPath('/preference')
                 )
@@ -65,6 +64,7 @@ class PreferenceController extends BasePreferenceController
     public function indexAction()
     {
         $form = new GeneralForm();
+        $this->getTabs()->activate('general');
         $form->setConfiguration(IcingaConfig::app())
             ->setRequest($this->getRequest());
         if ($form->isSubmittedAndValid()) {
diff --git a/application/forms/Preference/GeneralForm.php b/application/forms/Preference/GeneralForm.php
index 5b671e3b2..6485db402 100644
--- a/application/forms/Preference/GeneralForm.php
+++ b/application/forms/Preference/GeneralForm.php
@@ -256,7 +256,7 @@ class GeneralForm extends Form
         $this->addTimezoneSelection($global);
         $this->addDateFormatSettings($global);
 
-        $this->setSubmitLabel('{{SAVE_ICON}} Save Changes');
+        $this->setSubmitLabel('Save Changes');
 
         $this->addElement(
             'checkbox',
diff --git a/application/views/scripts/preference/index.phtml b/application/views/scripts/preference/index.phtml
index 0a3749eb8..256f8623c 100644
--- a/application/views/scripts/preference/index.phtml
+++ b/application/views/scripts/preference/index.phtml
@@ -1,15 +1,7 @@
+<div class="controls">
 <?= $this->tabs->render($this); ?>
-
-<?php if (isset($this->successMessage)) : ?>
-<div class="alert alert-success">
-  <h4>{{SUCCESS_ICON}} <?= $this->successMessage ?></h4>
 </div>
-<?php endif; ?>
 
-<?php if (isset($this->exceptionMessage)): ?>
-<div class="alert alert-danger">
-  <h4>Could not update preferences due to an internal exception (<?= $this->exceptionMessage ?>)</h4>
+<div class="content">
+<?= $this->form ?>
 </div>
-<?php endif; ?>
-
-<?= $this->form ?>
\ No newline at end of file
diff --git a/config/menu.ini b/config/menu.ini
index 40ee6e4cd..e33950bb9 100644
--- a/config/menu.ini
+++ b/config/menu.ini
@@ -1,15 +1,18 @@
 [Dashboard]
-title       = "Dashboard"
-url         = "dashboard"
-icon        = "img/icons/dashboard.png"
-priority    = 10
+title    = "Dashboard"
+url      = "dashboard"
+icon     = "img/icons/dashboard.png"
+priority = 10
 
 [System]
 icon = img/icons/configuration.png
 priority = 200
 
 [System.Configuration]
-title       = "Configuration"
-url         = "config/index"
+title = "Configuration"
+url   = "config"
 
+[System.Preferences]
+title = "Preferences"
+url  = "preference"