diff --git a/CHANGES.rst b/CHANGES.rst
index 9ae1bc4d6e..b9c6068cd0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,7 @@ Changelog
 
 **Added**
 
+- #1498 Moved all viewlets from senaite.lims to senaite.core
 - #1505 Display partition link in analyses listing
 - #1491 Enable Audit-logging for Dexterity Contents
 - #1489 Support Multiple Catalogs for Dexterity Contents
diff --git a/bika/lims/browser/viewlets/__init__.py b/bika/lims/browser/viewlets/__init__.py
index 6914da2f2f..ed905a536c 100644
--- a/bika/lims/browser/viewlets/__init__.py
+++ b/bika/lims/browser/viewlets/__init__.py
@@ -18,9 +18,17 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
+from analysisrequest import *  # noqa
 from attachments import AttachmentsViewlet  # noqa
 from attachments import WorksheetAttachmentsViewlet  # noqa
-from document_actions import DocumentActionsViewlet  # noqa
-from path_bar import PathBarViewlet  # noqa
 from authenticator import AuthenticatorViewlet  # noqa
+from colophon import ColophonViewlet  # noqa
+from content_views import ContentViewsViewlet  # noqa
+from document_actions import DocumentActionsViewlet  # noqa
+from footer import FooterViewlet  # noqa
 from instruments import InstrumentQCFailuresViewlet  # noqa
+from logo import LogoViewlet  # noqa
+from path_bar import PathBarViewlet  # noqa
+from personal_bar import PersonalBarViewlet  # noqa
+from sections import GlobalSectionsDropdownViewlet  # noqa
+from site_actions import SiteActionsViewlet  # noqa
diff --git a/bika/lims/browser/viewlets/colophon.py b/bika/lims/browser/viewlets/colophon.py
new file mode 100644
index 0000000000..e6e5571805
--- /dev/null
+++ b/bika/lims/browser/viewlets/colophon.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from plone.app.layout.viewlets.common import ViewletBase
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
+
+class ColophonViewlet(ViewletBase):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.colophon.pt")
diff --git a/bika/lims/browser/viewlets/configure.zcml b/bika/lims/browser/viewlets/configure.zcml
index 180908b0c5..c39054797e 100644
--- a/bika/lims/browser/viewlets/configure.zcml
+++ b/bika/lims/browser/viewlets/configure.zcml
@@ -2,6 +2,43 @@
            xmlns:browser="http://namespaces.zope.org/browser"
            i18n_domain="senaite.core">
 
+  <!-- Content Views Viewlet (Tabs) -->
+  <browser:viewlet
+      name="plone.contentviews"
+      manager="plone.app.layout.viewlets.interfaces.IContentViews"
+      class=".content_views.ContentViewsViewlet"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- Colophon Viewlet -->
+  <browser:viewlet
+      name="plone.colophon"
+      manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
+      class=".colophon.ColophonViewlet"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- Language Selector -->
+  <browser:viewlet
+      name="plone.app.i18n.locales.languageselector"
+      manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
+      class="plone.app.i18n.locales.browser.selector.LanguageSelector"
+      permission="zope2.View"
+      template="templates/plone.app.i18n.locales.browser.languageselector.pt"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- Personal bar -->
+  <browser:viewlet
+      name="plone.personal_bar"
+      manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
+      class=".personal_bar.PersonalBarViewlet"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
   <!-- AR Attachments Viewlet -->
   <browser:viewlet
       for="bika.lims.interfaces.IAnalysisRequest"
@@ -22,19 +59,40 @@
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
-  <!-- Hide BreadCrumbs for root views -->
+  <!-- Instrument QC Failures Viewlet -->
+  <browser:viewlet
+      for="*"
+      name="bika.lims.instrument_qc_failures_viewlet"
+      class="bika.lims.browser.viewlets.InstrumentQCFailuresViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/instrument_qc_failures_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- Site Actions -->
+  <browser:viewlet
+      name="plone.site_actions"
+      manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
+      class=".site_actions.SiteActionsViewlet"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- Path Bar -->
+
+  <!-- Standard Breadcrumbs -->
   <browser:viewlet
-      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       name="plone.path_bar"
       manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-      template="templates/blank.pt"
+      class=".path_bar.PathBarViewlet"
       permission="zope2.View"
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
-  <!-- Hide BreadCrumbs for other stuff -->
+  <!-- Hide BreadCrumbs for root view -->
   <browser:viewlet
-      for="bika.lims.interfaces.IHaveNoBreadCrumbs"
+      for="Products.CMFPlone.interfaces.IPloneSiteRoot"
       name="plone.path_bar"
       manager="plone.app.layout.viewlets.interfaces.IAboveContent"
       template="templates/blank.pt"
@@ -42,62 +100,67 @@
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
-  <!-- Translated breadcrumbs -->
+  <!-- Hide BreadCrumbs for contents providing the `IHaveNoBreadCrumbs` interface -->
   <browser:viewlet
-      for="*"
+      for="bika.lims.interfaces.IHaveNoBreadCrumbs"
       name="plone.path_bar"
       manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-      template="templates/path_bar.pt"
-      class="bika.lims.browser.viewlets.path_bar.PathBarViewlet"
+      template="templates/blank.pt"
       permission="zope2.View"
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
-  <!-- Hide ByLine for everything -->
+  <!-- /Path Bar -->
+
+  <!-- Global Sections Dropdown -->
   <browser:viewlet
-      for="*"
-      name="plone.belowcontenttitle.documentbyline"
-      manager="plone.app.layout.viewlets.interfaces.IBelowContentTitle"
-      template="templates/blank.pt"
+      name="senaite.sections_dropdown"
+      manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
+      class=".sections.GlobalSectionsDropdownViewlet"
       permission="zope2.View"
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
-  <!-- Make document actions beautiful -->
+  <!-- Global sections
+       NOTE: This viewlet only renders a horizontal line
+       All sections are located inside the sections dropdown
+  -->
   <browser:viewlet
-      name="plone.abovecontenttitle.documentactions"
-      manager="plone.app.layout.viewlets.interfaces.IBelowContentBody"
-      template="templates/blank.pt"
+      name="plone.global_sections"
+      manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
+      class=".sections.GlobalSectionsViewlet"
       permission="zope2.View"
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
+  <!-- Document actions -->
   <browser:viewlet
       name="plone.abovecontenttitle.documentactions"
       manager="plone.app.layout.viewlets.interfaces.IAboveContentTitle"
-      class="bika.lims.browser.viewlets.document_actions.DocumentActionsViewlet"
+      class=".document_actions.DocumentActionsViewlet"
       permission="zope2.View"
       layer="bika.lims.interfaces.IBikaLIMS"
       />
 
+  <!-- Logo Viewlet -->
   <browser:viewlet
-      name="plone.footer"
-      manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
-      class="plone.app.layout.viewlets.common.FooterViewlet"
-      template="templates/footer.pt"
-      for="*"
-      layer="bika.lims.interfaces.IBikaLIMS"
+      name="plone.logo"
+      manager="plone.app.layout.viewlets.interfaces.IPortalHeader"
+      class=".logo.LogoViewlet"
       permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
       />
+
+  <!-- Footer Viewlet -->
   <browser:viewlet
-      name="plone.colophon"
+      name="plone.footer"
       manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
-      template="templates/colophon.pt"
-      for="*"
-      layer="bika.lims.interfaces.IBikaLIMS"
+      class=".footer.FooterViewlet"
       permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
       />
 
+  <!-- Authenticator Viewlet -->
   <browser:viewlet
       name="bika.lims.authenticator"
       manager="plone.app.layout.viewlets.interfaces.IPortalFooter"
@@ -105,91 +168,81 @@
       permission="zope2.View"
       />
 
-    <!-- Show Instrument QC failures viewlet -->
-    <browser:viewlet
-        for="*"
-        name="bika.lims.instrument_qc_failures_viewlet"
-        class="bika.lims.browser.viewlets.InstrumentQCFailuresViewlet"
-        manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-        template="templates/instrument_qc_failures_viewlet.pt"
-        permission="zope2.View"
-        layer="bika.lims.interfaces.IBikaLIMS"
-    />
-
   <!-- Invalid Analysis Request viewlet -->
   <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequest"
-    name="bika.lims.invalid_ar_viewlet"
-    class=".analysisrequest.InvalidAnalysisRequestViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/invalid_ar_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
+      for="bika.lims.interfaces.IAnalysisRequest"
+      name="bika.lims.invalid_ar_viewlet"
+      class=".analysisrequest.InvalidAnalysisRequestViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/invalid_ar_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
 
   <!-- Retest Analysis Request viewlet -->
   <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequest"
-    name="bika.lims.retest_ar_viewlet"
-    class=".analysisrequest.RetestAnalysisRequestViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/retest_ar_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
+      for="bika.lims.interfaces.IAnalysisRequest"
+      name="bika.lims.retest_ar_viewlet"
+      class=".analysisrequest.RetestAnalysisRequestViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/retest_ar_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
 
   <!-- Primary Analysis Request viewlet -->
   <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequest"
-    name="bika.lims.primary_ar_viewlet"
-    class=".analysisrequest.PrimaryAnalysisRequestViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/primary_ar_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
+      for="bika.lims.interfaces.IAnalysisRequest"
+      name="bika.lims.primary_ar_viewlet"
+      class=".analysisrequest.PrimaryAnalysisRequestViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/primary_ar_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
 
   <!-- Partition Analysis Request viewlet -->
   <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequest"
-    name="bika.lims.partition_ar_viewlet"
-    class=".analysisrequest.PartitionAnalysisRequestViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/partition_ar_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
-
-  <!-- Dettached partition viewlet -->
-  <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequest"
-    name="bika.lims.detached_partition_viewlet"
-    class=".analysisrequest.DetachedPartitionViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/detached_partition_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
+      for="bika.lims.interfaces.IAnalysisRequest"
+      name="bika.lims.partition_ar_viewlet"
+      class=".analysisrequest.PartitionAnalysisRequestViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/partition_ar_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
+  <!-- Detached Partition Viewlet -->
+  <browser:viewlet
+      for="bika.lims.interfaces.IAnalysisRequest"
+      name="bika.lims.detached_partition_viewlet"
+      class=".analysisrequest.DetachedPartitionViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/detached_partition_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
 
   <!-- Secondary Analysis Request viewlet -->
   <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequestSecondary"
-    name="bika.lims.secondary_ar_viewlet"
-    class=".analysisrequest.SecondaryAnalysisRequestViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/secondary_ar_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
+      for="bika.lims.interfaces.IAnalysisRequestSecondary"
+      name="bika.lims.secondary_ar_viewlet"
+      class=".analysisrequest.SecondaryAnalysisRequestViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/secondary_ar_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
 
   <!-- Rejected Analysis Request viewlet -->
   <browser:viewlet
-    for="bika.lims.interfaces.IAnalysisRequest"
-    name="bika.lims.rejected_ar_viewlet"
-    class=".analysisrequest.RejectedAnalysisRequestViewlet"
-    manager="plone.app.layout.viewlets.interfaces.IAboveContent"
-    template="templates/rejected_ar_viewlet.pt"
-    permission="zope2.View"
-    layer="bika.lims.interfaces.IBikaLIMS"
-  />
+      for="bika.lims.interfaces.IAnalysisRequest"
+      name="bika.lims.rejected_ar_viewlet"
+      class=".analysisrequest.RejectedAnalysisRequestViewlet"
+      manager="plone.app.layout.viewlets.interfaces.IAboveContent"
+      template="templates/rejected_ar_viewlet.pt"
+      permission="zope2.View"
+      layer="bika.lims.interfaces.IBikaLIMS"
+      />
+
 </configure>
diff --git a/bika/lims/browser/viewlets/content_views.py b/bika/lims/browser/viewlets/content_views.py
new file mode 100644
index 0000000000..61945cb089
--- /dev/null
+++ b/bika/lims/browser/viewlets/content_views.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from plone.app.layout.viewlets.common import ContentViewsViewlet as Base
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
+
+class ContentViewsViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.contentviews.pt")
diff --git a/bika/lims/browser/viewlets/document_actions.py b/bika/lims/browser/viewlets/document_actions.py
index 2d94907af2..38f18cc385 100644
--- a/bika/lims/browser/viewlets/document_actions.py
+++ b/bika/lims/browser/viewlets/document_actions.py
@@ -18,25 +18,10 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
-from Products.CMFCore.utils import getToolByName
+from plone.app.layout.viewlets.content import DocumentActionsViewlet as Base
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from plone.app.layout.viewlets.common import ViewletBase
 
 
-class DocumentActionsViewlet(ViewletBase):
-    """Overload the default to print pretty icons
-    """
-
-    index = ViewPageTemplateFile("templates/document_actions.pt")
-
-    def render(self):
-        portal_factory = getToolByName(self.context, 'portal_factory')
-        if portal_factory.isTemporary(self.context):
-            return self.index()
-        self.actions = []
-        portal_actions = getToolByName(self.context, 'portal_actions')
-        actions = portal_actions.listFilteredActionsFor(self.context)
-        if 'document_actions' in actions:
-            for action in actions['document_actions']:
-                self.actions.append(action)
-        return self.index()
+class DocumentActionsViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.documentactions.pt")
diff --git a/bika/lims/browser/viewlets/footer.py b/bika/lims/browser/viewlets/footer.py
new file mode 100644
index 0000000000..3babd0e731
--- /dev/null
+++ b/bika/lims/browser/viewlets/footer.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from plone.app.layout.viewlets.common import FooterViewlet as Base
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
+
+class FooterViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.footer.pt")
diff --git a/bika/lims/browser/viewlets/logo.py b/bika/lims/browser/viewlets/logo.py
new file mode 100644
index 0000000000..09cbdc2f53
--- /dev/null
+++ b/bika/lims/browser/viewlets/logo.py
@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+
+from plone.app.layout.viewlets.common import LogoViewlet as Base
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
+
+class LogoViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.logo.pt")
+
+    def update(self):
+        super(Base, self).update()
+
+        portal = self.portal_state.portal()
+        bprops = portal.restrictedTraverse("base_properties", None)
+        if bprops is not None:
+            logoName = bprops.logoName
+        else:
+            logoName = "logo.jpg"
+
+        logoTitle = self.portal_state.portal_title()
+        self.logo_tag = portal.restrictedTraverse(logoName).tag(
+            title=logoTitle, alt=logoTitle, scale=0.5)
+        self.navigation_root_title = self.portal_state.navigation_root_title()
diff --git a/bika/lims/browser/viewlets/path_bar.py b/bika/lims/browser/viewlets/path_bar.py
index 3ae550a2a0..9cad7ae451 100644
--- a/bika/lims/browser/viewlets/path_bar.py
+++ b/bika/lims/browser/viewlets/path_bar.py
@@ -18,19 +18,10 @@
 # Copyright 2018-2019 by it's authors.
 # Some rights reserved, see README and LICENSE.
 
+from plone.app.layout.viewlets.common import PathBarViewlet as Base
 from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
-from plone.app.layout.viewlets.common import ViewletBase
-from zope.component import getMultiAdapter
 
 
-class PathBarViewlet(ViewletBase):
-    index = ViewPageTemplateFile('templates/path_bar.pt')
-
-    def update(self):
-        super(PathBarViewlet, self).update()
-
-        self.is_rtl = self.portal_state.is_rtl()
-
-        breadcrumbs_view = getMultiAdapter((self.context, self.request),
-                                           name='breadcrumbs_view')
-        self.breadcrumbs = breadcrumbs_view.breadcrumbs()
+class PathBarViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.path_bar.pt")
diff --git a/bika/lims/browser/viewlets/personal_bar.py b/bika/lims/browser/viewlets/personal_bar.py
new file mode 100644
index 0000000000..9216c4dffa
--- /dev/null
+++ b/bika/lims/browser/viewlets/personal_bar.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from plone.app.layout.viewlets.common import PersonalBarViewlet as Base
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
+
+class PersonalBarViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.personal_bar.pt")
diff --git a/bika/lims/browser/viewlets/sections.py b/bika/lims/browser/viewlets/sections.py
new file mode 100644
index 0000000000..2e37b3b05c
--- /dev/null
+++ b/bika/lims/browser/viewlets/sections.py
@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+
+from cgi import escape
+
+from plone.app.layout.viewlets.common import GlobalSectionsViewlet as Base
+from Products.CMFPlone.utils import safe_unicode
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+from zope.component import getMultiAdapter
+
+
+class GlobalSectionsDropdownViewlet(Base):
+    index = ViewPageTemplateFile("templates/sections_dropdown.pt")
+
+    def update(self):
+        super(GlobalSectionsDropdownViewlet, self).update()
+        portal_state = getMultiAdapter((self.context, self.request),
+                                       name=u"plone_portal_state")
+        self.navigation_root_url = portal_state.navigation_root_url()
+        self.portal_title = escape(
+            safe_unicode(portal_state.navigation_root_title()))
+
+
+class GlobalSectionsViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.sections.pt")
+
+    def update(self):
+        super(GlobalSectionsViewlet, self).update()
+        portal_state = getMultiAdapter((self.context, self.request),
+                                       name=u"plone_portal_state")
+        self.navigation_root_url = portal_state.navigation_root_url()
+        self.portal_title = escape(
+            safe_unicode(portal_state.navigation_root_title()))
diff --git a/bika/lims/browser/viewlets/site_actions.py b/bika/lims/browser/viewlets/site_actions.py
new file mode 100644
index 0000000000..84c9ce1aec
--- /dev/null
+++ b/bika/lims/browser/viewlets/site_actions.py
@@ -0,0 +1,9 @@
+# -*- coding: utf-8 -*-
+
+from plone.app.layout.viewlets.common import SiteActionsViewlet as Base
+from Products.Five.browser.pagetemplatefile import ViewPageTemplateFile
+
+
+class SiteActionsViewlet(Base):
+    index = ViewPageTemplateFile(
+        "templates/plone.app.layout.viewlets.site_actions.pt")
diff --git a/bika/lims/browser/viewlets/templates/attachments.pt b/bika/lims/browser/viewlets/templates/attachments.pt
index 48c2d10657..95ae66237a 100644
--- a/bika/lims/browser/viewlets/templates/attachments.pt
+++ b/bika/lims/browser/viewlets/templates/attachments.pt
@@ -1,43 +1,50 @@
-<div class="attachments"
-     tal:define="attachments_view python:view.get_attachments_view()"
+<div id="ar-attachments"
+     class="attachments"
      i18n:domain="senaite.core">
 
-  <script type="text/javascript">
-   jQuery(document).ready(function($) {
-       $("#attachments_update_table tbody").sortable();
-   });
-  </script>
+  <p>
+    <button type="button"
+            class="btn btn-default"
+            data-toggle="collapse"
+            data-target="#ar-attachments-panel">
+      <i class="fa fa-paperclip" aria-hidden="true"></i>
+      <span i18n:translate="">Attachments</span>
+    </button>
+  </p>
 
-  <style type="text/css">
-   #attachments_update {
-       margin-bottom: 2em;
-   }
-   .formHelp {
-       margin-bottom: 1em;
-   }
-   #attachments_update_table tr {
-       cursor: ns-resize;
-   }
-   .attachment-delete {
-       text-align: center;
-   }
-  </style>
 
-  <!-- Attachments Viewlet -->
-  <dl class="collapsible collapsedOnLoad">
-    <dt class="attachments collapsibleHeader">
-      <img src='++resource++bika.lims.images/attachment.png'
-           title='Attachment'
-           i18n:attributes="title"/>
-      <span i18n:translate="">Attachments</span>
-    </dt>
+  <div id="ar-attachments-panel"
+       class="collapse panel panel-default"
+       tal:define="attachments_view python:view.get_attachments_view()">
+
+    <script type="text/javascript">
+    jQuery(document).ready(function($) {
+        $("#attachments_update_table tbody").sortable();
+    });
+    </script>
+
+    <style type="text/css">
+    #attachments_update {
+        margin-bottom: 2em;
+    }
+    .formHelp {
+        margin-bottom: 1em;
+    }
+    #attachments_update_table tr {
+        cursor: ns-resize;
+    }
+    .attachment-delete {
+        text-align: center;
+    }
+    </style>
 
-    <dd class="collapsibleContent">
+    <!-- Attachments Viewlet -->
+    <div class="panel-body">
 
       <!-- Attachments List -->
       <div id="attachments_update"
-           class="ar_attachments_list"
-           tal:define="attachments attachments_view/get_sorted_attachments">
+            class="ar_attachments_list"
+            tal:define="attachments attachments_view/get_sorted_attachments">
 
         <!-- Update Attachment Form -->
         <form action="attachments_view/update"
@@ -61,8 +68,8 @@
                 <th i18n:translate=''>Keywords</th>
                 <th i18n:translate=''>Report Option</th>
                 <!-- Please do not move this column to be the first, because the
-                     :records converter will somehow offset the True/False value of
-                     the checkbox by -1 (the record before will be deleted) -->
+                      :records converter will somehow offset the True/False value of
+                      the checkbox by -1 (the record before will be deleted) -->
                 <th tal:condition="attachments_view/user_can_delete_attachments">Delete</th>
               </tr>
             </thead>
@@ -72,12 +79,10 @@
 
                 <td class="attachment-link">
                   <!-- Icon and Attachment download link -->
-                  <img tal:condition="icon"
-                       tal:define="icon attachment/Icon | nothing;"
-                       tal:attributes="src string:${here/portal_url}/$icon"/>
+                  <i class="fa fa-paperclip" aria-hidden="true"></i>
                   <a title="Click to download"
-                     tal:attributes="href string:${attachment/absolute_url}/at_download/AttachmentFile"
-                     tal:content="attachment/name">name</a>
+                      tal:attributes="href string:${attachment/absolute_url}/at_download/AttachmentFile"
+                      tal:content="attachment/name">name</a>
 
                   <!-- Attachment UID -->
                   <input type="hidden" tal:attributes="name string:attachments.UID:records;
@@ -101,7 +106,7 @@
                     </tal:item>
                   </select>
                 </td>
-                <td class="attachment-fiel-size">
+                <td class="attachment-field-size">
                   <!-- File Size -->
                   <span class="filesize" tal:content="attachment/size"></span>
                 </td>
@@ -112,13 +117,14 @@
                 <td class="attachment-keywords">
                   <!-- Attachment Keywords -->
                   <input name="AttachmentKeys"
-                         tal:attributes="name string:attachments.AttachmentKeys:records;
-                                         value attachment/keywords;"/>
+                          tal:attributes="name string:attachments.AttachmentKeys:records;
+                                          value attachment/keywords;"/>
                 </td>
                 <td class="attachment-report-option">
                   <!-- Attachment Report Option
-                       i=Ignore in Report (default)
-                       r=Render in Report
+                        a=Attach to Report (default)
+                        i=Ignore in Report
+                        r=Render in Report
                     -->
                   <select name="ReportOption"
                           tal:attributes="name string:attachments.ReportOption:records;
@@ -136,8 +142,8 @@
 
                   <!-- Delete Attachment -->
                   <input type="checkbox"
-                         tal:attributes="name string:attachments.delete:records:boolean;
-                                         value python:True;"/>
+                          tal:attributes="name string:attachments.delete:records:boolean;
+                                          value python:True;"/>
                     <input type="hidden"
                           tal:attributes="name string:attachments.delete:records:boolean:default;
                                           value python:False;"/>
@@ -157,13 +163,13 @@
           </div>
 
           <!-- Update attachments button.
-               This will send the values to the `attachmetns_view` endpoint. -->
+                This will send the values to the `attachmetns_view` endpoint. -->
           <input class="context"
-                 id="updateButton"
-                 type="submit"
-                 name="updateARAttachment"
-                 value="Update Attachments"
-                 i18n:attributes="value"/>
+                  id="updateButton"
+                  type="submit"
+                  name="updateARAttachment"
+                  value="Update Attachments"
+                  i18n:attributes="value"/>
 
         </form>
         <!-- /Update Form -->
@@ -171,7 +177,7 @@
 
       <!-- Add Attachments -->
       <div id="attachments_add"
-           class="ar_attachments_list">
+            class="ar_attachments_list">
 
         <!-- Add Form -->
         <form action="attachments_view"
@@ -198,9 +204,9 @@
                 <td>
                   <!-- Attachment File Upload -->
                   <input type="file"
-                         id="AttachmentFile_file"
-                         name="AttachmentFile_file"
-                         onchange="string:document.getElementById('addARButton').disabled=false"/>
+                          id="AttachmentFile_file"
+                          name="AttachmentFile_file"
+                          onchange="string:document.getElementById('addARButton').disabled=false"/>
                 </td>
                 <td>
                   <!-- Attachment type selection dropdown -->
@@ -230,7 +236,7 @@
                                 tal:condition="attachments_view/global_ar_attachments_allowed"
                                 tal:attributes="value python:None">
                           <span tal:omit-tag="python:True"
-                                i18n:translate="">Attach to Sample</span>
+                                i18n:translate="">Attach to Analysis Request</span>
                         </option>
                         <tal:a tal:repeat="item a_analyses">
                           <option tal:attributes="value item/UID;"
@@ -267,10 +273,10 @@
                 </td>
                 <td>
                 <!-- Attachment Report Option
-                     a=Attach to Report (default)
-                     i=Ignore in Report
-                     r=Render in Report
-                   -->
+                      a=Attach to Report (default)
+                      i=Ignore in Report
+                      r=Render in Report
+                    -->
                   <select name="ReportOption">
                     <tal:item repeat="item attachments_view/get_attachment_report_options">
                       <option tal:attributes="value python:item[0];"
@@ -284,7 +290,7 @@
             </tbody>
           </table>
 
-          <!-- short help description -->
+          <!-- short help desrciption -->
           <div class="formHelp discreet">
             <p i18n:translate="">
               You can use the browse button to select and upload a new attachment.
@@ -292,20 +298,17 @@
           </div>
 
           <!-- Add Button.
-               This will send the new attachment record to the `analysis_view` endpoint -->
+                This will send the new attachment record to the `analysis_view` endpoint -->
           <input disabled
-                 class="context"
-                 id="addARButton"
-                 type="submit"
-                 name="addARAttachment"
-                 value="Add Attachment"
-                 i18n:attributes="value"/>
+                  class="context"
+                  id="addARButton"
+                  type="submit"
+                  name="addARAttachment"
+                  value="Add Attachment"
+                  i18n:attributes="value"/>
 
-        </form>
-        <!-- /Add Attachment Form -->
+        </form> <!-- /Add Attachment Form -->
       </div>
-
-    </dd> <!-- Collapsible content -->
-  </dl>
-
+    </div>
+  </div> <!-- Collapsible content -->
 </div>
diff --git a/bika/lims/browser/viewlets/templates/colophon.pt b/bika/lims/browser/viewlets/templates/colophon.pt
deleted file mode 100644
index 9800271226..0000000000
--- a/bika/lims/browser/viewlets/templates/colophon.pt
+++ /dev/null
@@ -1,11 +0,0 @@
-<div id="senaite-colophon"
-     i18n:domain="senaite">
-
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12">
-      </div>
-    </div>
-  </div>
-
-</div>
diff --git a/bika/lims/browser/viewlets/templates/document_actions.pt b/bika/lims/browser/viewlets/templates/document_actions.pt
deleted file mode 100644
index 07ac4f296c..0000000000
--- a/bika/lims/browser/viewlets/templates/document_actions.pt
+++ /dev/null
@@ -1,35 +0,0 @@
-<div tal:omit-tag=""
-     i18n:domain="plone">
-
-  <div class="visualClear"><!-- --></div>
-
-  <div class="documentActions"
-       tal:define="normalizeString nocall: context/@@plone/normalizeString">
-
-    <tal:docactions tal:condition="view/actions|nothing">
-
-      <h5 class="hiddenStructure" i18n:translate="">
-        Document Actions
-      </h5>
-
-      <h1>
-        <span tal:repeat="daction view/actions" tal:omit-tag="python:True">
-          <a    class="context_action_link"
-                href=""
-                tal:attributes="href daction/url|daction/action;
-                       title daction/description">
-            <img tal:condition="daction/icon"
-                 tal:attributes="
-                                src python:daction.get('icon');
-                                alt python:daction.get('title');
-                                title python:daction.get('title')"/>
-            <span tal:condition="not:daction/icon"
-                  tal:content="python:daction.get('id')"/>
-          </a>
-        </span>
-      </h1>
-
-    </tal:docactions>
-
-  </div>
-</div>
diff --git a/bika/lims/browser/viewlets/templates/footer.pt b/bika/lims/browser/viewlets/templates/footer.pt
deleted file mode 100644
index 12778969e1..0000000000
--- a/bika/lims/browser/viewlets/templates/footer.pt
+++ /dev/null
@@ -1,26 +0,0 @@
-<footer i18n:domain="senaite"
-        id="portal-footer">
-
-  <div class="container-fluid">
-    <div class="row">
-      <div class="col-md-12">
-        <div class="text-muted center">
-          <span i18n:translate="description_copyright" tal:omit-tag="">
-            <abbr title="Copyright" i18n:name="copyright" i18n:attributes="title title_copyright;">&copy;</abbr>
-            2017-<tal:year i18n:name="current_year" tal:content="view/year" />
-            <span i18n:name="senaitefoundation" tal:omit-tag="">
-              <a href="http://senaite.com"
-                 i18n:translate="label_senaite">SENAITE</a>
-            </span>
-          </span>
-        </div>
-        <div class="text-muted center">
-          <p i18n:translate="">Join our <a href="https://gitter.im/senaite" title="Gitter" target="_blank">
-            Gitter Chatroom</a> to get in direct contact with the Community.
-          </p>
-        </div>
-      </div>
-    </div>
-  </div>
-
-</footer>
diff --git a/bika/lims/browser/viewlets/templates/instrument_qc_failures_viewlet.pt b/bika/lims/browser/viewlets/templates/instrument_qc_failures_viewlet.pt
index d881fda86f..ba7a090ab8 100644
--- a/bika/lims/browser/viewlets/templates/instrument_qc_failures_viewlet.pt
+++ b/bika/lims/browser/viewlets/templates/instrument_qc_failures_viewlet.pt
@@ -2,87 +2,101 @@
      tal:condition="python:view.nr_failed > 0"
      i18n:domain="senaite.core">
 
-    <div class="visualClear"><!-- --></div>
+  <div class="visualClear"><!-- --></div>
 
-    <div id="portal-alert"
-            tal:define="items python:view.failed['out-of-date'];"
-            tal:condition="python: len(items) > 0">
-         <div class="portlet-alert-item" tal:condition="python:len(items) > 0">
-            <p class="title" tal:condition="python:len(items) == 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instrument's calibration certificate expired:</span>
-            </p>
-            <p class="title" tal:condition="python:len(items) > 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instruments' calibration certificates expired:</span>
-            </p>
-            <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
-        </div>
+  <div id="portal-alert"
+       tal:define="items python:view.failed['out-of-date'];"
+       tal:condition="python: len(items) > 0">
+    <div class="portlet-alert-item alert alert-warning alert-dismissible" tal:condition="python:len(items) > 0">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <p class="title" tal:condition="python:len(items) == 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instrument's calibration certificate expired:</span>
+      </p>
+      <p class="title" tal:condition="python:len(items) > 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instruments' calibration certificates expired:</span>
+      </p>
+      <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
     </div>
+  </div>
 
-    <div id="portal-alert"
-            tal:define="items python:view.failed['qc-fail'];"
-            tal:condition="python: len(items) > 0">
-        <div class="portlet-alert-item" tal:condition="python:len(items) > 0">
-            <p class="title" tal:condition="python:len(items) == 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instrument disabled until successful calibration:</span>
-            </p>
-            <p class="title" tal:condition="python:len(items) > 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instruments disabled until successful calibration:</span>
-            </p>
-            <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
-        </div>
+  <div id="portal-alert"
+       tal:define="items python:view.failed['qc-fail'];"
+       tal:condition="python: len(items) > 0">
+    <div class="portlet-alert-item alert alert-warning alert-dismissible" tal:condition="python:len(items) > 0">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <p class="title" tal:condition="python:len(items) == 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instrument disabled until successful calibration:</span>
+      </p>
+      <p class="title" tal:condition="python:len(items) > 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instruments disabled until successful calibration:</span>
+      </p>
+      <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
     </div>
+  </div>
 
-    <div id="portal-alert"
-            tal:define="items python:view.failed['next-test'];"
-            tal:condition="python: len(items) > 0">
-        <div class="portlet-alert-item" tal:condition="python:len(items) > 0">
-            <p class="title" tal:condition="python:len(items) == 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instrument disposed until new calibration tests being done:</span>
-            </p>
-            <p class="title" tal:condition="python:len(items) > 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instruments disposed until new calibration tests being done:</span>
-            </p>
-            <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
-        </div>
+  <div id="portal-alert"
+       tal:define="items python:view.failed['next-test'];"
+       tal:condition="python: len(items) > 0">
+    <div class="portlet-alert-item alert alert-warning alert-dismissible" tal:condition="python:len(items) > 0">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <p class="title" tal:condition="python:len(items) == 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instrument disposed until new calibration tests being done:</span>
+      </p>
+      <p class="title" tal:condition="python:len(items) > 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instruments disposed until new calibration tests being done:</span>
+      </p>
+      <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
     </div>
+  </div>
 
-    <div id="portal-alert"
-            tal:define="items python:view.failed['validation'];"
-            tal:condition="python: len(items) > 0">
-        <div class="portlet-alert-item" tal:condition="python:len(items) > 0">
-            <p class="title" tal:condition="python:len(items) == 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instrument in validation progress:</span>
-            </p>
-            <p lass="title" tal:condition="python:len(items) > 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instruments in validation progress:</span>
-            </p>
-            <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
-        </div>
+  <div id="portal-alert"
+       tal:define="items python:view.failed['validation'];"
+       tal:condition="python: len(items) > 0">
+    <div class="portlet-alert-item alert alert-warning alert-dismissible" tal:condition="python:len(items) > 0">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <p class="title" tal:condition="python:len(items) == 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instrument in validation progress:</span>
+      </p>
+      <p lass="title" tal:condition="python:len(items) > 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instruments in validation progress:</span>
+      </p>
+      <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
     </div>
+  </div>
 
-    <div id="portal-alert"
-            tal:define="items python:view.failed['calibration'];"
-            tal:condition="python: len(items) > 0">
-        <div class="portlet-alert-item" tal:condition="python:len(items) > 0">
-            <p class="title" tal:condition="python:len(items) == 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instrument in calibration progress:</span>
-            </p>
-            <p class="title" tal:condition="python:len(items) > 1">
-                <span tal:content="python:len(items)"/>
-                <span i18n:translate="">Instruments in calibration progress:</span>
-            </p>
-            <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
-        </div>
+  <div id="portal-alert"
+       tal:define="items python:view.failed['calibration'];"
+       tal:condition="python: len(items) > 0">
+    <div class="portlet-alert-item alert alert-warning alert-dismissible" tal:condition="python:len(items) > 0">
+      <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+        <span aria-hidden="true">&times;</span>
+      </button>
+      <p class="title" tal:condition="python:len(items) == 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instrument in calibration progress:</span>
+      </p>
+      <p class="title" tal:condition="python:len(items) > 1">
+        <span tal:content="python:len(items)"/>
+        <span i18n:translate="">Instruments in calibration progress:</span>
+      </p>
+      <p tal:content="structure python:', '.join([i['link'] for i in items])"/>
     </div>
-
+  </div>
 
 </div>
diff --git a/bika/lims/browser/viewlets/templates/path_bar.pt b/bika/lims/browser/viewlets/templates/path_bar.pt
deleted file mode 100644
index e720351fb9..0000000000
--- a/bika/lims/browser/viewlets/templates/path_bar.pt
+++ /dev/null
@@ -1,41 +0,0 @@
-<div id="portal-breadcrumbs"
-     i18n:domain="plone"
-     tal:define="breadcrumbs view/breadcrumbs;
-                 is_rtl view/is_rtl">
-
-    <span id="breadcrumbs-you-are-here" i18n:translate="you_are_here">You
-are here:</span>
-    <span id="breadcrumbs-home">
-        <a i18n:translate="tabs_home"
-           tal:attributes="href view/navigation_root_url">Home</a>
-        <span tal:condition="breadcrumbs" class="breadcrumbSeparator">
-            <tal:ltr condition="not: is_rtl">&rsaquo;</tal:ltr>
-            <tal:rtl condition="is_rtl">&lsaquo;</tal:rtl>
-        </span>
-    </span>
-    <span tal:repeat="crumb breadcrumbs"
-          tal:attributes="dir python:is_rtl and 'rtl' or 'ltr';
-                          id string:breadcrumbs-${repeat/crumb/number}">
-        <tal:item tal:define="is_last repeat/crumb/end;
-                              url crumb/absolute_url;
-                              title crumb/Title">
-            <a href="#"
-               tal:omit-tag="not: url"
-               tal:condition="python:not is_last"
-               tal:attributes="href url"
-               i18n:translate=""
-               tal:content="title">
-                crumb
-            </a>
-            <span class="breadcrumbSeparator" tal:condition="not: is_last">
-                <tal:ltr condition="not: is_rtl">&rsaquo;</tal:ltr>
-                <tal:rtl condition="is_rtl">&lsaquo;</tal:rtl>
-            </span>
-            <span id="breadcrumbs-current"
-                  tal:condition="is_last"
-                  i18n:translate=""
-                  tal:content="title">crumb</span>
-         </tal:item>
-    </span>
-
-</div>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.i18n.locales.browser.languageselector.pt b/bika/lims/browser/viewlets/templates/plone.app.i18n.locales.browser.languageselector.pt
new file mode 100644
index 0000000000..be728d4f89
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.i18n.locales.browser.languageselector.pt
@@ -0,0 +1,44 @@
+<tal:language tal:condition="view/available">
+  <div id="portal-languageselector"
+       class="dropdown pull-right"
+       style="padding-left: 1em;"
+       i18n:domain="plone">
+
+    <!-- Language Button -->
+    <button class="btn btn-default dropdown-toggle"
+            type="button"
+            data-toggle="dropdown"
+            aria-haspopup="true"
+            aria-expanded="false">
+      <span class="glyphicon glyphicon-globe" aria-hidden="true"></span>
+      <span class="caret"></span>
+    </button>
+
+    <!-- Available Languages -->
+    <ul class="dropdown-menu"
+        role="menu"
+        aria-labelledby="portal-languageselector"
+        tal:define="languages view/languages;
+                    base_url context/@@plone_context_state/current_base_url;">
+      <tal:language repeat="lang languages">
+        <li tal:define="code lang/code;
+                        qs request/QUERY_STRING;
+                        params python:filter(lambda x: x and not x.startswith('set_language'), qs.split('&'));
+                        lang_param string:set_language=${code};
+                        new_params python:'&'.join(params + [lang_param]);
+                        selected lang/selected;
+                        codeclass string:language-${code};
+                        current python: selected and 'currentLanguage active ' or '';"
+            tal:attributes="class string:${current}${codeclass}">
+          <a href="#"
+             tal:define="name lang/native|lang/name;"
+             tal:attributes="href string:${base_url}?${new_params};
+                             class string:${current} dropdown-item;
+                             title name">
+            <span tal:content="name"/>
+          </a>
+        </li>
+      </tal:language>
+    </ul>
+  </div>
+</tal:language>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.colophon.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.colophon.pt
new file mode 100644
index 0000000000..c844715a94
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.colophon.pt
@@ -0,0 +1,27 @@
+<div id="senaite-colophon"
+     i18n:domain="senaite.core">
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-12">
+
+        <div class="text-center text-muted">
+          <ul class="list-inline">
+            <li i18n:translate="label_powered_by">
+              SENAITE is powered by:
+            </li>
+            <li>
+              <a href="http://plone.org"
+                 title="This site was built using the Plone Open Source CMS/WCM."
+                 i18n:attributes="title title_built_with_plone;"
+                 i18n:translate="label_powered_by_plone">
+                Plone &amp; Python</a>
+            </li>
+          </ul>
+        </div>
+
+      </div>
+    </div>
+  </div>
+
+</div>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.contentviews.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.contentviews.pt
new file mode 100755
index 0000000000..39448379af
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.contentviews.pt
@@ -0,0 +1,32 @@
+<div i18n:domain="plone"
+     tal:omit-tag=""
+     tal:define="ploneview context/@@plone;"
+     tal:condition="ploneview/showEditableBorder">
+
+  <tal:block define="view_actions view/prepareObjectTabs;">
+    <p class="hidden"
+       tal:condition="view_actions"
+       i18n:translate="heading_views">Views</p>
+
+    <ul class="nav nav-tabs pull-left col-md-12"
+        id="edit-content-views"
+        i18n:domain="plone">
+
+      <tal:views repeat="action view_actions">
+        <li tal:define="selected action/selected|nothing;"
+            tal:attributes="id string:contentview-${action/id};
+                            class python:selected and 'active' or 'plain'">
+          <a href=""
+             tal:content="action/title"
+             tal:attributes="href action/url;
+                   target action/link_target|nothing;"
+             i18n:translate="">
+            View name
+          </a>
+        </li>
+      </tal:views>
+
+    </ul>
+  </tal:block>
+  <div class="clearfix"></div>
+</div>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.documentactions.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.documentactions.pt
new file mode 100644
index 0000000000..0221eb1f77
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.documentactions.pt
@@ -0,0 +1,35 @@
+<div tal:omit-tag=""
+     i18n:domain="plone">
+
+  <div class="visualClear"><!-- --></div>
+
+  <div class="documentActions">
+    <tal:docactions tal:condition="view/actions">
+
+      <p class="hiddenStructure" i18n:translate="heading_document_actions">
+        Document Actions
+      </p>
+
+      <ul class="nav nav-pills pull-right"
+          tal:define="normalizeString nocall: context/@@plone/normalizeString">
+        <li tal:repeat="daction view/actions"
+            tal:attributes="id python:'document-action-' + normalizeString(daction['id'])">
+          <a href=""
+             tal:attributes="href daction/url;
+                             target daction/link_target|nothing;
+                             title daction/description">
+            <img tal:condition="daction/icon"
+                 tal:attributes="src python:daction.get('icon');
+                                 alt python:daction.get('title');
+                                 title python:daction.get('title')"/>
+          <span tal:condition="not:daction/icon"
+                tal:content="python:daction.get('id')"/>
+          </a>
+        </li>
+      </ul>
+    </tal:docactions>
+
+    <div tal:replace="structure provider:plone.documentactions" />
+
+  </div>
+</div>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.footer.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.footer.pt
new file mode 100644
index 0000000000..1801aa90be
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.footer.pt
@@ -0,0 +1,32 @@
+<footer i18n:domain="senaite.core"
+        id="senaite-footer">
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-12">
+        <hr/>
+        <div class="pull-left text-muted">
+          <span i18n:translate="description_copyright" tal:omit-tag="">
+            <abbr title="Copyright" i18n:name="copyright" i18n:attributes="title title_copyright;">&copy;</abbr>
+            2017-<tal:year i18n:name="current_year" tal:content="view/year" />
+            <span i18n:name="senaitelims" tal:omit-tag="">
+              <a href="https://www.senaite.com"
+                 target="_blank"
+                 i18n:translate="label_senaite">SENAITE LIMS</a>
+            </span>
+          </span>
+        </div>
+        <div class="pull-right text-muted">
+          <ul class="nav nav-pills social-icon">
+            <li><a href="https://www.senaite.com" title="Visit the Website" target="_blank"><i class="fa fa-globe"></i></a></li>
+            <li><a href="https://www.senaite.com/docs/quickstart.html" title="Browse the Docs" target="_blank"><i class="fa fa-book"></i></a></li>
+            <li><a href="https://github.com/senaite/senaite.lims" title="Browse the code on GitHub" target="_blank"><i class="fa fa-github"></i></a></li>
+            <li><a href="https://twitter.com/senaitelims" title="Spread the word on Twitter" target="_blank"><i class="fa fa-twitter"></i></a></li>
+            <li><a href="https://gitter.im/senaite" title="Talk with us on Gitter" target="_blank"><i class="fa fa-comments"></i></a></li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+</footer>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.logo.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.logo.pt
new file mode 100755
index 0000000000..929fa37b5f
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.logo.pt
@@ -0,0 +1,12 @@
+<a metal:define-macro="portal_logo"
+   id="portal-logo"
+   class="brand"
+   title="Home"
+   accesskey="1"
+   tal:attributes="href view/navigation_root_url;
+                   title view/navigation_root_title | nothing"
+   i18n:domain="plone"
+   i18n:attributes="title">
+  <img src="logo.jpg" alt=""
+       tal:replace="structure view/logo_tag"/>
+</a>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.path_bar.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.path_bar.pt
new file mode 100755
index 0000000000..3402bd30cb
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.path_bar.pt
@@ -0,0 +1,29 @@
+<ol class="breadcrumb"
+    tal:define="breadcrumbs view/breadcrumbs;
+                is_rtl view/is_rtl"
+    tal:attributes="dir python:is_rtl and 'rtl' or 'ltr'"
+    i18n:domain="plone">
+
+  <li id="breadcrumbs-home">
+    <a href="#" i18n:translate="Home" tal:attributes="href view/navigation_root_url">Home</a>
+  </li>
+
+  <tal:crumb tal:repeat="crumb breadcrumbs">
+      <tal:item tal:define="is_last repeat/crumb/end;
+                            url crumb/absolute_url;
+                            title crumb/Title">
+        <li tal:attributes="class python: is_last and 'active' or '';
+                            id string:breadcrumbs-${repeat/crumb/number};">
+            <a href="#"
+               tal:omit-tag="not: url"
+               tal:condition="python:not is_last"
+               tal:attributes="href url"
+               tal:content="title">
+                crumb
+            </a>
+            <tal:last tal:content="title" tal:condition="is_last" />
+        </li>
+      </tal:item>
+  </tal:crumb>
+
+</ol>
\ No newline at end of file
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.personal_bar.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.personal_bar.pt
new file mode 100755
index 0000000000..4d1fb9f55c
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.personal_bar.pt
@@ -0,0 +1,68 @@
+<div id="portal-personaltools-wrapper"
+     class="dropdown pull-right"
+     style="padding-left: 1em;"
+     i18n:domain="plone">
+
+<p class="hiddenStructure" i18n:translate="heading_personal_tools">Personal tools</p>
+
+<tal:logged
+    tal:condition="python:view.user_actions and not view.anonymous">
+
+    <a id="user-name"
+       class="btn btn-info dropdown-toggle"
+       data-toggle="dropdown"
+       tal:attributes="href view/homelink_url">
+       <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+       <span tal:replace="view/user_name">John</span>
+      <span class="caret"></span>
+    </a>
+    <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel">
+        <li tal:repeat="action view/user_actions"
+            tal:attributes="id string:personaltools-${action/id}">
+            <a href=""
+               tal:attributes="href action/url;
+                               target action/link_target|nothing"
+               tal:content="action/title"
+               i18n:translate="">
+                action title
+            </a>
+        </li>
+    </ul>
+</tal:logged>
+<tal:anon
+  tal:condition="python:view.user_actions and view.anonymous"
+  tal:define="actions view/user_actions;
+              action python:len(actions)!= 0 and actions[0] or None;
+              other_actions python:len(actions) > 1 and actions[1:] or []">
+      <a id="user-name"
+          class="btn btn-info dropdown-toggle"
+          data-target="#"
+          data-toggle="dropdown"
+          tal:attributes="href action/url;
+                          id string:personaltools-${action/id};
+                          target action/link_target|nothing;
+                          class python:other_actions and 'btn btn-info dropdown-toggle' or 'btn btn-info';
+                          data-toggle python:other_actions and 'dropdown' or None"
+          tal:content="action/title"
+          i18n:translate="">
+              action title
+      </a>
+      <ul class="dropdown-menu" role="menu" aria-labelledby="dLabel"
+          tal:condition="other_actions"
+          id="portal-personaltools"
+          >
+        <li id="anon-personalbar">
+          <tal:actions repeat="action other_actions">
+              <a href=""
+                 tal:attributes="href action/url;
+                                 id string:personaltools-${action/id};
+                                 target action/link_target|nothing;"
+                 tal:content="action/title"
+                 i18n:translate="">
+                  action title
+              </a>
+          </tal:actions>
+        </li>
+      </ul>
+</tal:anon>
+</div>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.sections.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.sections.pt
new file mode 100644
index 0000000000..ee8a24adaa
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.sections.pt
@@ -0,0 +1,64 @@
+<hr />
+
+<tal:hidden condition="python:False">
+  <!-- NOTE: All Items located in the sections dropdown!
+
+       This viewlet can be probably removed in Plone 5
+  -->
+
+  <nav class="topbar-nav navbar navbar-default">
+    <div class="container-fluid">
+      <!-- Brand and toggle get grouped for better mobile display -->
+      <div class="navbar-header">
+        <button type="button"
+                class="navbar-toggle collapsed"
+                data-toggle="collapse"
+                data-target="#senaite-navbar-collapse"
+                aria-expanded="false">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+
+        <a class="nav-brand senaite-navbar-brand"
+          tal:attributes="href view/navigation_root_url;
+                          title view/portal_title | nothing">
+          &#11041;
+        </a>
+      </div>
+
+      <div class="collapse navbar-collapse" id="senaite-navbar-collapse">
+        <tal:sections tal:define="portal_tabs view/portal_tabs"
+                      tal:condition="portal_tabs"
+                      i18n:domain="plone">
+
+          <p class="hiddenStructure" i18n:translate="heading_sections">Navigation</p>
+          <ul id="senaite-portal-globalnav"
+              class="nav navbar-nav"
+              tal:define="selected_tab python:view.selected_portal_tab">
+
+            <tal:tabs tal:repeat="tab portal_tabs">
+              <li tal:define="tid tab/id"
+                  tal:attributes="id string:portaltab-${tid};
+                              class python:selected_tab==tid and 'active' or ''">
+                <a href=""
+                  tal:content="tab/name"
+                  tal:attributes="href tab/url;
+                        title tab/description|nothing;
+                        target tab/link_target|nothing;">
+                  Tab Name
+                </a>
+              </li>
+            </tal:tabs>
+          </ul>
+        </tal:sections>
+
+        <!-- Below Navbar Sections Viewlet Manager -->
+        <div tal:replace="structure provider:senaite.belownavbarsections" />
+
+      </div>
+
+    </div>
+  </nav>
+</tal:hidden>
diff --git a/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.site_actions.pt b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.site_actions.pt
new file mode 100644
index 0000000000..e6776fdb55
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/plone.app.layout.viewlets.site_actions.pt
@@ -0,0 +1,35 @@
+<div i18n:domain="senaite"
+     id="portal-siteactions-footer">
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-md-12 text-center">
+        <ul class="list-inline"
+            tal:define="accesskeys python: {'sitemap' : '3', 'accessibility' : '0', 'contact' : '9'};"
+            tal:condition="view/site_actions"
+            i18n:domain="plone">
+
+          <li tal:repeat="saction view/site_actions"
+              tal:attributes="id string:siteaction-${saction/id}">
+            <a href=""
+               class=""
+               tal:define="title saction/title;
+                           id saction/id;
+                           accesskey python: accesskeys.get(id, '');"
+               i18n:attributes="title"
+               i18n:translate=""
+               tal:content="title"
+               tal:attributes="href saction/url;
+                              target saction/link_target|nothing;
+                              title title;
+                              accesskey accesskey;">
+              Site action
+            </a>
+          </li>
+        </ul>
+
+      </div>
+    </div>
+  </div>
+
+</div>
diff --git a/bika/lims/browser/viewlets/templates/sections_dropdown.pt b/bika/lims/browser/viewlets/templates/sections_dropdown.pt
new file mode 100644
index 0000000000..e2e036e739
--- /dev/null
+++ b/bika/lims/browser/viewlets/templates/sections_dropdown.pt
@@ -0,0 +1,41 @@
+<tal:sections tal:define="portal_tabs view/portal_tabs"
+              tal:condition="portal_tabs"
+              i18n:domain="plone">
+
+  <div id="senaite-sections"
+       class="dropdown pull-right"
+       style="padding-left: 1em;"
+       i18n:domain="plone">
+
+    <button class="btn btn-default dropdown-toggle"
+            type="button"
+            data-toggle="dropdown"
+            aria-haspopup="true"
+            aria-expanded="false">
+      <span tal:omit-tag="" i18n:translate="">
+        <span class="glyphicon glyphicon-th" aria-hidden="true"></span>
+      </span>
+      <span class="caret"></span>
+    </button>
+
+  <ul id="senaite-portal-globalnav"
+      class="dropdown-menu"
+      tal:define="selected_tab python:view.selected_portal_tab">
+
+    <tal:tabs tal:repeat="tab portal_tabs">
+      <li tal:define="tid tab/id"
+          tal:attributes="id string:portaltab-${tid};
+                          class python:selected_tab==tid and 'active' or ''">
+        <a href=""
+           tal:content="tab/name"
+           tal:attributes="href tab/url;
+                 title tab/description|nothing;
+                 target tab/link_target|nothing;">
+          Tab Name
+        </a>
+      </li>
+    </tal:tabs>
+  </ul>
+
+  </div>
+</tal:sections>
diff --git a/bika/lims/browser/viewlets/templates/worksheet_attachments.pt b/bika/lims/browser/viewlets/templates/worksheet_attachments.pt
index 6c71f2b3b8..14f4518edc 100644
--- a/bika/lims/browser/viewlets/templates/worksheet_attachments.pt
+++ b/bika/lims/browser/viewlets/templates/worksheet_attachments.pt
@@ -1,17 +1,23 @@
-<div class="attachments"
-     tal:define="attachments_view python:view.get_attachments_view()"
+<div id="ws-attachments"
+     class="attachments"
      i18n:domain="senaite.core">
 
-  <!-- Attachments Viewlet -->
-  <dl class="collapsible collapsedOnLoad">
-    <dt class="attachments collapsibleHeader">
-      <img src='++resource++bika.lims.images/attachment.png'
-           title='Attachment'
-           i18n:attributes="title"/>
+  <p>
+    <button type="button"
+            class="btn btn-default"
+            data-toggle="collapse"
+            data-target="#ws-attachments-panel">
+      <i class="fa fa-paperclip" aria-hidden="true"></i>
       <span i18n:translate="">Attachments</span>
-    </dt>
+    </button>
+  </p>
 
-    <dd class="collapsibleContent">
+  <div id="ws-attachments-panel"
+       class="collapse panel panel-default"
+       tal:define="attachments_view python:view.get_attachments_view()">
+
+    <!-- Attachments Viewlet -->
+    <div class="panel-body">
 
       <!-- Add Attachments -->
       <div class="ws_attachments_add">
@@ -90,10 +96,8 @@
                  name="addWSAttachment"
                  value="Add"
                  i18n:attributes="value"/>
-        </form>
+        </form> <!-- /Add Attachment Form -->
       </div>
-
-    </dd> <!-- Collapsible content -->
-  </dl>
-
+    </div>
+  </div> <!-- Collapsible content -->
 </div>
diff --git a/bika/lims/profiles/default/viewlets.xml b/bika/lims/profiles/default/viewlets.xml
index 0268bbee4a..f013d42d95 100644
--- a/bika/lims/profiles/default/viewlets.xml
+++ b/bika/lims/profiles/default/viewlets.xml
@@ -1,12 +1,35 @@
 <?xml version="1.0"?>
-<!-- This file holds the setup configuration of the viewlet managers
-     for the "bika" skin.
-     -->
-
 <object>
 
-    <order manager="plone.portalfooter" skinname="bika" based-on="Plone Default">
-        <viewlet name="bika.lims.authenticator" insert-before="plone.colophon"/>
-    </order>
+  <!-- Hidden vielets in plone.portalheader -->
+  <hidden manager="plone.portalheader" skinname="*" purge="True">
+    <viewlet name="plone.searchbox"/>
+  </hidden>
+
+  <!-- Order vielets in plone.portalheader -->
+  <order manager="plone.portalheader" skinname="*" purge="True">
+    <viewlet name="plone.skip_links"/>
+    <viewlet name="plone.personal_bar"/>
+    <viewlet name="senaite.setupbutton"/>
+    <viewlet name="senaite.sections_dropdown"/>
+    <viewlet name="plone.app.i18n.locales.languageselector"/>
+    <viewlet name="plone.searchbox"/>
+    <viewlet name="plone.logo"/>
+    <viewlet name="plone.global_sections"/>
+  </order>
+
+  <!-- Hidden vielets in plone.belowcontenttitle -->
+  <hidden manager="plone.belowcontenttitle" skinname="*" purge="True">
+    <viewlet name="plone.belowcontenttitle.documentbyline"/>
+  </hidden>
+
+  <!-- Hidden vielets in plone.belowcontentbody -->
+  <hidden manager="plone.belowcontentbody" skinname="*" purge="True">
+    <viewlet name="plone.abovecontenttitle.documentactions"/>
+  </hidden>
+
+  <!-- Hidden vielets in plone.portalfooter -->
+  <hidden manager="plone.portalfooter" skinname="*" purge="True">
+  </hidden>
 
 </object>
diff --git a/bika/lims/upgrade/v01_03_003.py b/bika/lims/upgrade/v01_03_003.py
index 03bd53b29b..4823fb0f3c 100644
--- a/bika/lims/upgrade/v01_03_003.py
+++ b/bika/lims/upgrade/v01_03_003.py
@@ -243,10 +243,14 @@ def upgrade(tool):
 
     # -------- ADD YOUR STUFF BELOW --------
 
+    # Moved all Viewlets from senaite.lims to senaite.core
+    setup.runImportStepFromProfile(profile, "viewlets")
+
     # https://github.com/senaite/senaite.core/issues/1504
     remove_cascaded_analyses_of_root_samples(portal)
 
     # Add additional JavaScripts to registry
+    # https://github.com/senaite/senaite.core/pull/1502
     setup.runImportStepFromProfile(profile, "jsregistry")
 
     # Fix Site Properties Generic Setup Export Step
@@ -446,6 +450,7 @@ def reindex_client_fields(portal):
 
     logger.info("Reindexing client fields ... [DONE]")
 
+
 def cleanup_indexes_and_metadata(portal):
     # Remove stale indexes and metadata
     remove_stale_indexes(portal)