diff --git a/muk_web_theme/__manifest__.py b/muk_web_theme/__manifest__.py
index 84ebaa4..50a4c93 100644
--- a/muk_web_theme/__manifest__.py
+++ b/muk_web_theme/__manifest__.py
@@ -19,7 +19,7 @@
{
"name": "MuK Backend Theme",
"summary": "Odoo Community Backend Theme",
- "version": "12.0.1.5.1",
+ "version": "12.0.1.5.2",
"category": "Themes/Backend",
"license": "AGPL-3",
"author": "MuK IT",
diff --git a/muk_web_theme/static/src/js/views/form_renderer.js b/muk_web_theme/static/src/js/views/form_renderer.js
index 6bae403..e4ee8de 100644
--- a/muk_web_theme/static/src/js/views/form_renderer.js
+++ b/muk_web_theme/static/src/js/views/form_renderer.js
@@ -32,7 +32,7 @@ var QWeb = core.qweb;
FormRenderer.include({
_renderHeaderButtons: function () {
var $buttons = this._super.apply(this, arguments);
- if (config.device.isMobile) {
+ if (config.device.isMobile && this.state.model !== "res.config.settings") {
var $dropdown = $(QWeb.render('muk_web_theme.MenuStatusbarButtons'));
$buttons.addClass("dropdown-menu").appendTo($dropdown);
$buttons.children().addClass("dropdown-item");
diff --git a/muk_web_theme/static/src/scss/settings.scss b/muk_web_theme/static/src/scss/settings.scss
new file mode 100644
index 0000000..0f9ced6
--- /dev/null
+++ b/muk_web_theme/static/src/scss/settings.scss
@@ -0,0 +1,35 @@
+/**********************************************************************************
+*
+* Copyright (C) 2017 MuK IT GmbH
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Affero General Public License as
+* published by the Free Software Foundation, either version 3 of the
+* License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU Affero General Public License for more details.
+*
+* You should have received a copy of the GNU Affero General Public License
+* along with this program. If not, see .
+*
+**********************************************************************************/
+
+@include media-breakpoint-down(sm) {
+ .o_base_settings .o_statusbar_buttons {
+ .btn {
+ width: auto !important;
+ border: solid 1px transparent;
+ margin: 4px 3px 4px 0 !important;
+ padding: $btn-padding-y-sm $btn-padding-x-sm !important;
+ }
+ .btn-primary {
+ border-color: $o-brand-primary;
+ }
+ .btn-secondary {
+ border-color: $border-color;
+ }
+ }
+}
\ No newline at end of file
diff --git a/muk_web_theme/template/assets.xml b/muk_web_theme/template/assets.xml
index 87a9ef6..3121c19 100644
--- a/muk_web_theme/template/assets.xml
+++ b/muk_web_theme/template/assets.xml
@@ -54,6 +54,7 @@
+