diff --git a/plone/app/layout/globals/layout.py b/plone/app/layout/globals/layout.py
index 9c7a85b0..e999d05b 100644
--- a/plone/app/layout/globals/layout.py
+++ b/plone/app/layout/globals/layout.py
@@ -186,23 +186,14 @@ def bodyClass(self, template, view):
             for role in user.getRolesInContext(self.context):
                 body_classes.append('userrole-' + role.lower().replace(' ', '-'))
 
+            registry = getUtility(IRegistry)
+            settings = registry.forInterface(ISiteSchema, prefix='plone')
+
             # toolbar classes
-            toolbar_state = self.request.cookies.get('plone-toolbar')
-            if toolbar_state:
-                if 'plone-toolbar-left' in toolbar_state:
-                    if 'expanded' in toolbar_state:
-                        body_classes.append('plone-toolbar-left-expanded')
-                    else:
-                        body_classes.append('plone-toolbar-left-default')
-                if 'plone-toolbar-top' in toolbar_state:
-                    if 'expanded' in toolbar_state:
-                        body_classes.append('plone-toolbar-top-expanded')
-                    else:
-                        body_classes.append('plone-toolbar-top-default')
-                if 'compressed' in toolbar_state:
-                    body_classes.append('plone-toolbar-compressed')
+            if settings.toolbar_position == 'side':
+                body_classes.append('plone-toolbar-left')
             else:
-                body_classes.append('plone-toolbar-left-default')
+                body_classes.append('plone-toolbar-top')
 
         # class for markspeciallinks pattern
         properties = getToolByName(context, "portal_properties")
diff --git a/plone/app/layout/viewlets/toolbar.pt b/plone/app/layout/viewlets/toolbar.pt
index dc82558d..1aeb1383 100644
--- a/plone/app/layout/viewlets/toolbar.pt
+++ b/plone/app/layout/viewlets/toolbar.pt
@@ -4,18 +4,16 @@
                      personal_bar python: view.get_personal_bar()"
          tal:condition="not: portal_state/anonymous"
          i18n:domain="plone">
-  <div id="edit-zone" role="toolbar" tal:attributes="class toolbar_class">
+  <div id="edit-zone" role="toolbar" class="pat-toolbar">
     <div class="plone-toolbar-container">
       <a class="plone-toolbar-logo">
         <img alt="Plone Toolbar" tal:attributes="src view/get_toolbar_logo" />
       </a>
       <a class="plone-toolbar-switcher" tal:condition="view/show_switcher"><span>Left-Top switcher</span></a>
       <nav role="navigation">
-        <ul class="plone-toolbar-main">
+        <ul>
           <div tal:replace="structure view/base_render">
           </div>
-        </ul>
-        <ul id="personal-bar-container">
           <li id="portal-personaltools" class="plone-toolbar-separator"
               tal:condition="personal_bar/user_actions">
             <a href="#"
diff --git a/plone/app/layout/viewlets/toolbar.py b/plone/app/layout/viewlets/toolbar.py
index 61e7766c..25025b73 100644
--- a/plone/app/layout/viewlets/toolbar.py
+++ b/plone/app/layout/viewlets/toolbar.py
@@ -33,14 +33,6 @@ def get_toolbar_logo(self):
         portal_url = self.portal_state.portal_url()
         return portal_url + settings.toolbar_logo
 
-    def get_toolbar_position(self):
-        registry = getUtility(IRegistry)
-        settings = registry.forInterface(ISiteSchema, prefix='plone')
-        if settings.toolbar_position == 'side':
-            return 'plone-toolbar-left pat-toolbar'
-        else:
-            return 'portal-toolbar-top pat-toolbar'
-
     def show_switcher(self):
         return False