diff --git a/CHANGES.rst b/CHANGES.rst
index 4851a0d7ac..6a18fa9aa6 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -7,6 +7,7 @@ Changelog
 
 **Added**
 
+- #1534 Integrate browser resources from senaite.lims
 - #1529 Moved contentmenu provider into core
 - #1523 Moved Installation Screens into core
 - #1520 JavaScripts/CSS Integration and Cleanup
diff --git a/bika/lims/monkey/__init__.py b/bika/lims/monkey/__init__.py
index b54d2c0984..41a69c01d3 100644
--- a/bika/lims/monkey/__init__.py
+++ b/bika/lims/monkey/__init__.py
@@ -17,3 +17,5 @@
 #
 # Copyright 2018-2020 by it's authors.
 # Some rights reserved, see README and LICENSE.
+
+import add_senaite_site  # noqa
diff --git a/bika/lims/monkey/add_senaite_site.py b/bika/lims/monkey/add_senaite_site.py
new file mode 100644
index 0000000000..c8a9a35c31
--- /dev/null
+++ b/bika/lims/monkey/add_senaite_site.py
@@ -0,0 +1,57 @@
+# -*- coding: utf-8 -*-
+#
+# This file is part of SENAITE.CORE.
+#
+# SENAITE.CORE is free software: you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation, version 2.
+#
+# 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 General Public License for more
+# details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Copyright 2018-2020 by it's authors.
+# Some rights reserved, see README and LICENSE.
+
+from OFS.ObjectManager import ObjectManager
+
+ADD_SENAITE_SITE = """
+<dtml-if expr="_.len(this().getPhysicalPath()) == 1 and len(objectValues('Plone Site')) == 0">
+  <script type="text/javascript">
+    var url = location.href.replace(location.pathname, "/@@senaite-addsite?site_id=senaite")
+    location.href = url;
+  </script>
+</dtml-if>
+<dtml-if expr="_.len(this().getPhysicalPath()) == 1 and len(objectValues('Plone Site')) > 0">
+  <!-- Add Plone site action-->
+  <style type="text/css">
+   .form { margin: 1em auto; text-align:center; }
+   .button {padding:1em 3em;background-color:#337ab7;color:#fff;border-color:#2e6da4;cursor:pointer;font-weight:bold; }
+   input[value='Add Plone Site'] { display:none; }
+  </style>
+  <form class="form"
+        method="get"
+        action="&dtml-URL1;/@@senaite-addsite"
+        target="_top">
+    <input type="hidden" name="site_id" value="senaite" />
+    <input class="button" type="submit" value="Install SENAITE LIMS" />
+  </form>
+</dtml-if>
+"""
+
+main = ObjectManager.manage_main
+orig = main.read()
+pos = orig.find('<!-- Add object widget -->')
+
+
+# Add in our button html at the right position
+new = orig[:pos] + ADD_SENAITE_SITE + orig[pos:]
+
+# Modify the manage_main
+main.edited_source = new
+main._v_cooked = main.cook()
diff --git a/bika/lims/monkey/configure.zcml b/bika/lims/monkey/configure.zcml
index d071918756..9bc64bdfba 100644
--- a/bika/lims/monkey/configure.zcml
+++ b/bika/lims/monkey/configure.zcml
@@ -8,6 +8,13 @@
     xmlns:monkey="http://namespaces.plone.org/monkey"
     i18n_domain="senaite.core">
 
+  <!-- Make overlayhelpers.js compatible with jQuery > 1.9
+       https://github.com/senaite/senaite.lims/issues/21 -->
+  <browser:resource
+      name="plone.app.jquerytools.overlayhelpers.js"
+      file="overlayhelpers.js"
+      layer="bika.lims.interfaces.IBikaLIMS"/>
+
   <monkey:patch
       description="This adds the bika.lims category to controlpanel-overview."
       class="plone.app.controlpanel.overview.OverviewControlPanel"
diff --git a/bika/lims/monkey/overlayhelpers.js b/bika/lims/monkey/overlayhelpers.js
new file mode 100644
index 0000000000..f5ddf0bc62
--- /dev/null
+++ b/bika/lims/monkey/overlayhelpers.js
@@ -0,0 +1,674 @@
+/*****************
+
+   SENAITE
+   -------
+
+   - Removed `buildFragment` function call
+     https://github.com/senaite/senaite.lims/issues/21
+
+
+   jQuery Tools overlay helpers.
+
+   Copyright © 2010, The Plone Foundation
+   Licensed under the GPL, see LICENSE.txt for details.
+
+*****************/
+
+/*jslint browser: true */
+/*global jQuery, ajax_noresponse_message, close_box_message, window */
+
+// Name space object for pipbox
+var pb = {spinner: {}, overlay_counter: 1};
+
+jQuery.tools.overlay.conf.oneInstance = false;
+
+(function($) {
+    // override jqt default effect to take account of position
+    // of parent elements
+    jQuery.tools.overlay.addEffect('default',
+        function(pos, onLoad) {
+            var conf = this.getConf(),
+                 w = $(window),
+                 ovl = this.getOverlay(),
+                 op = ovl.parent().offsetParent().offset();
+
+            if (!conf.fixed)  {
+                pos.top += w.scrollTop() - op.top;
+                pos.left += w.scrollLeft() - op.left;
+            }
+
+            pos.position = conf.fixed ? 'fixed' : 'absolute';
+            ovl.css(pos).fadeIn(conf.speed, onLoad);
+
+        }, function(onClose) {
+            this.getOverlay().fadeOut(this.getConf().closeSpeed, onClose);
+        }
+    );
+
+    pb.spinner.show = function () {
+        $('body').css('cursor', 'wait');
+    };
+    pb.spinner.hide = function () {
+        $('body').css('cursor', '');
+    };
+}(jQuery));
+
+
+jQuery(function ($) {
+
+    /******
+        $.fn.prepOverlay jQuery plugin to inject overlay target into DOM and
+        annotate it with the data we'll need in order to display it.
+    ******/
+    $.fn.prepOverlay = function (pba) {
+        return this.each(function () {
+            var o, pbo, config, onBeforeLoad, onLoad, src, parts;
+
+            o = $(this);
+
+            // copy options so that it's not just a reference
+            // to the parameter.
+            pbo = $.extend(true, {'width':'60%'}, pba);
+
+            // set overlay configuration
+            config = pbo.config || {};
+
+            // set onBeforeLoad handler
+            onBeforeLoad = pb[pbo.subtype];
+            if (onBeforeLoad) {
+                config.onBeforeLoad = onBeforeLoad;
+            }
+            onLoad = config.onLoad;
+            config.onLoad = function () {
+                if (onLoad) {
+                    onLoad.apply(this, arguments);
+                }
+                pb.fi_focus(this.getOverlay());
+            };
+
+            // be promiscuous, pick up the url from
+            // href, src or action attributes
+            src = o.attr('href') || o.attr('src') || o.attr('action');
+
+            // translate url with config specifications
+            if (pbo.urlmatch) {
+                src = src.replace(new RegExp(pbo.urlmatch), pbo.urlreplace);
+            }
+
+            if (pbo.subtype === 'inline') {
+                // we're going to let tools' overlay do all the real
+                // work. Just get the markers in place.
+                src = src.replace(/^.+#/, '#');
+                $("[id='" + src.replace('#', '') + "']").addClass('overlay');
+                o.removeAttr('href').attr('rel', src);
+                // use overlay on the source (clickable) element
+                o.overlay();
+            } else {
+                // save various bits of information from the pbo options,
+                // and enable the overlay.
+
+                // this is not inline, so in one fashion or another
+                // we'll be loading it via the beforeLoad callback.
+                // create a unique id for a target element
+                pbo.nt = 'pb_' + pb.overlay_counter;
+                pb.overlay_counter += 1;
+
+                pbo.selector = pbo.filter || pbo.selector;
+                if (!pbo.selector) {
+                    // see if one's been supplied in the src
+                    parts = src.split(' ');
+                    src = parts.shift();
+                    pbo.selector = parts.join(' ');
+                }
+
+                pbo.src = src;
+                pbo.config = config;
+                pbo.source = o;
+
+                // remove any existing overlay and overlay handler
+                pb.remove_overlay(o);
+
+                // save options on trigger element
+                o.data('pbo', pbo);
+
+                // mark the source with a rel attribute so we can find
+                // the overlay, and a special class for styling
+                o.attr('rel', '#' + pbo.nt);
+                o.addClass('link-overlay');
+
+                // for some subtypes, we're setting click handlers
+                // and attaching overlay to the target element. That's
+                // so we'll know the dimensions early.
+                // Others, like iframe, just use overlay.
+
+                register_handler = function(evt, o, hnd) {
+                   switch (evt) {
+                      case undefined:
+                         o.click(hnd);
+                         break;
+                      case 'click':
+                         o.click(hnd);
+                         break;
+                      case 'hover':
+                         o.hover(hnd);
+                         break;
+                      case 'dblclick':
+                         o.dblclick(hnd);
+                         break;
+                      default:
+                         throw "Unsupported event";
+                   }
+                }
+
+                switch (pbo.subtype) {
+                case 'image':
+                    register_handler(pbo.event, o, pb.image_click);
+                    break;
+                case 'ajax':
+                    register_handler(pbo.event, o, pb.ajax_click);
+                    break;
+                case 'iframe':
+                    pb.create_content_div(pbo);
+                    o.overlay(config);
+                    break;
+                default:
+                    throw "Unsupported overlay type";
+                }
+
+                // in case the click source wasn't
+                // already a link.
+                o.css('cursor', 'pointer');
+            }
+        });
+    };
+
+
+    /******
+        pb.remove_overlay
+        Remove the overlay and handler associated with a jquery wrapped
+        trigger object
+    ******/
+    pb.remove_overlay = function (o) {
+        var old_data = o.data('pbo');
+        if (old_data) {
+            switch (old_data.subtype) {
+                case 'image':
+                    o.unbind('click', pb.image_click);
+                    break;
+                case 'ajax':
+                    o.unbind('click', pb.ajax_click);
+                    break;
+                default:
+                    // it's probably the jqt overlay click handler,
+                    // but we don't know the handler and are forced
+                    // to do a generic unbind of click handlers.
+                    o.unbind('click');
+                    break;
+            }
+            if (old_data.nt) {
+                $('#' + old_data.nt).remove();
+            }
+        }
+    };
+
+
+    /******
+        pb.create_content_div
+        create a div to act as an overlay; append it to
+        the body; return it
+    ******/
+    pb.create_content_div = function (pbo, trigger) {
+        var content,
+            close_message,
+            pbw = pbo.width;
+
+        if (typeof close_box_message === 'undefined') {
+            close_message = 'Close this box.';
+        } else {
+            close_message = close_box_message;
+        }
+
+        content = $(
+            '<div id="' + pbo.nt +
+            '" class="overlay overlay-' + pbo.subtype +
+            ' ' + (pbo.cssclass || '') +
+            '"><div class="close"><a href="#" class="hiddenStructure" title="Close this box">' +
+            close_message +
+            '</a></div></div>');
+
+        content.data('pbo', pbo);
+
+        // if a width option is specified, set it on the overlay div,
+        // computing against the window width if a % was specified.
+        if (pbw) {
+            if (pbw.indexOf('%') > 0) {
+                content.width(parseInt(pbw, 10) / 100 * $(window).width());
+            } else {
+                content.width(pbw);
+            }
+        }
+
+        // add the target element at the end of the body.
+        content.appendTo($("body"));
+
+        return content;
+    };
+
+
+    /******
+        pb.image_click
+        click handler for image loads
+    ******/
+    pb.image_click = function (event) {
+        var ethis, content, api, img, el, pbo;
+
+        ethis = $(this);
+        pbo = ethis.data('pbo');
+
+        // find target container
+        content = $(ethis.attr('rel'));
+        if (!content.length) {
+            content = pb.create_content_div(pbo);
+            content.overlay(pbo.config);
+        }
+        api = content.overlay();
+
+        // is the image loaded yet?
+        if (content.find('img').length === 0) {
+            // load the image.
+            if (pbo.src) {
+                pb.spinner.show();
+
+                // create the image and stuff it
+                // into our target
+                img = new Image();
+                img.src = pbo.src;
+                el = $(img);
+                content.append(el.addClass('pb-image'));
+
+                // Now, we'll cause the overlay to
+                // load when the image is loaded.
+                el.load(function () {
+                    pb.spinner.hide();
+                    api.load();
+                });
+
+            }
+        } else {
+            api.load();
+        }
+
+        return false;
+    };
+
+
+    /******
+        pb.fi_focus
+        First-input focus inside $ selection.
+    ******/
+    pb.fi_focus = function (jqo) {
+        if (! jqo.find("form div.error :input:first").focus().length) {
+            jqo.find("form :input:visible:first").focus();
+        }
+    };
+
+
+    /******
+        pb.ajax_error_recover
+        jQuery's ajax load function does not load error responses.
+        This routine returns the cooked error response.
+    ******/
+    pb.ajax_error_recover = function (responseText, selector) {
+        var tcontent = $('<div/>').append(
+                responseText.replace(/<script(.|\s)*?\/script>/gi, ""));
+        return selector ? tcontent.find(selector) : tcontent;
+    };
+
+
+    /******
+        pb.add_ajax_load
+        Adds a hidden ajax_load input to form
+    ******/
+    pb.add_ajax_load = function (form) {
+        if (form.find('input[name=ajax_load]').length === 0) {
+            form.prepend($('<input type="hidden" name="ajax_load" value="' +
+                (new Date().getTime()) +
+                '" />'));
+        }
+    };
+
+    /******
+        pb.prep_ajax_form
+        Set up form with ajaxForm, including success and error handlers.
+    ******/
+    pb.prep_ajax_form = function (form) {
+        var ajax_parent = form.closest('.pb-ajax'),
+            data_parent = ajax_parent.closest('.overlay-ajax'),
+            pbo = data_parent.data('pbo'),
+            formtarget = pbo.formselector,
+            closeselector = pbo.closeselector,
+            beforepost = pbo.beforepost,
+            afterpost = pbo.afterpost,
+            noform = pbo.noform,
+            api = data_parent.overlay(),
+            selector = pbo.selector,
+            options = {};
+
+        options.beforeSerialize = function () {
+            pb.spinner.show();
+        };
+
+        if (beforepost) {
+            options.beforeSubmit = function (arr, form, options) {
+                return beforepost(form, arr, options);
+            };
+        }
+        options.success = function (responseText, statusText, xhr, form) {
+            $(document).trigger('formOverlayStart', [this, responseText, statusText, xhr, form]);
+            // success comes in many forms, some of which are errors;
+            //
+
+            var el, myform, success, target, scripts = [], filteredResponseText;
+
+            success = statusText === "success" || statusText === "notmodified";
+
+            if (! success) {
+                // The responseText parameter is actually xhr
+                responseText = responseText.responseText;
+            }
+            // strip inline script tags
+            filteredResponseText = responseText.replace(/<script(.|\s)*?\/script>/gi, "");
+
+            // create a div containing the optionally filtered response
+            el = $('<div />').append(
+                selector ?
+                    // a lesson learned from the jQuery source: $(responseText)
+                    // will not work well unless responseText is well-formed;
+                    // appending to a div is more robust, and automagically
+                    // removes the html/head/body outer tagging.
+                    $('<div />').append(filteredResponseText).find(selector)
+                    :
+                    filteredResponseText
+                );
+
+            // afterpost callback
+            if (success && afterpost) {
+                afterpost(el, data_parent);
+            }
+
+            myform = el.find(formtarget);
+            if (success && myform.length) {
+                ajax_parent.empty().append(el);
+
+                // execute inline scripts
+
+                // try {
+                //     // jQuery 1.7
+                //     $.buildFragment([responseText], [document], scripts);
+                // } catch (e) {
+                //     // jQuery 1.9
+                //     $.buildFragment([responseText], document, scripts);
+                // }
+
+                if (scripts.length) {
+                    $.each(scripts, function() {
+                        $.globalEval( this.text || this.textContent || this.innerHTML || "" );
+                    });
+                }
+
+                // This may be a complex form.
+                if ($.fn.ploneTabInit) {
+                    el.ploneTabInit();
+                }
+                pb.fi_focus(ajax_parent);
+
+                pb.add_ajax_load(myform);
+                // attach submit handler with the same options
+                myform.ajaxForm(options);
+
+                // attach close to element id'd by closeselector
+                if (closeselector) {
+                    el.find(closeselector).click(function (event) {
+                        api.close();
+                        return false;
+                    });
+                }
+                $(document).trigger('formOverlayLoadSuccess', [this, myform, api, pb, ajax_parent]);
+            } else {
+                // there's no form in our new content or there's been an error
+                if (success) {
+                    if (typeof noform === "function") {
+                        // get action from callback
+                        noform = noform(el, pbo);
+                    }
+                } else {
+                    noform = statusText;
+                }
+
+
+                switch (noform) {
+                case 'close':
+                    api.close();
+                    break;
+                case 'reload':
+                    api.close();
+                    pb.spinner.show();
+                    // location.reload results in a repost
+                    // dialog in some browsers; very unlikely to
+                    // be what we want.
+                    location.replace(location.href);
+                    break;
+                case 'redirect':
+                    api.close();
+                    pb.spinner.show();
+                    target = pbo.redirect;
+                    if (typeof target === "function") {
+                        // get target from callback
+                        target = target(el, responseText, pbo);
+                    }
+                    location.replace(target);
+                    break;
+                default:
+                    if (el.children()) {
+                        // show what we've got
+                        ajax_parent.empty().append(el);
+                    } else {
+                        api.close();
+                    }
+                    break;
+                }
+                $(document).trigger('formOverlayLoadFailure', [this, myform, api, pb, ajax_parent, noform]);
+            }
+            pb.spinner.hide();
+        };
+        // error and success callbacks are the same
+        options.error = options.success;
+
+        pb.add_ajax_load(form);
+        form.ajaxForm(options);
+    };
+
+
+    /******
+        pb.ajax_click
+        Click handler for ajax sources. The job of this routine
+        is to do the ajax load of the overlay element, then
+        call the JQT overlay loader.
+    ******/
+    pb.ajax_click = function (event) {
+        var ethis = $(this),
+            pbo,
+            content,
+            api,
+            src,
+            el,
+            selector,
+            formtarget,
+            closeselector,
+            sep,
+            scripts = [],
+            e;
+
+        e = $.Event();
+        e.type = "beforeAjaxClickHandled";
+        $(document).trigger(e, [this, event]);
+        if (e.isDefaultPrevented()) { return false; }
+
+        pbo = ethis.data('pbo');
+
+        content = pb.create_content_div(pbo, ethis);
+        // pbo.config.top = $(window).height() * 0.1 - ethis.offsetParent().offset().top;
+        content.overlay(pbo.config, ethis);
+        api = content.overlay();
+        src = pbo.src;
+        selector = pbo.selector;
+        formtarget = pbo.formselector;
+        closeselector = pbo.closeselector;
+
+        pb.spinner.show();
+
+        // prevent double click warning for this form
+        $(this).find("input.submitting").removeClass('submitting');
+
+        el = $('div.pb-ajax', content);
+        if (el.length === 0) {
+            el = $('<div class="pb-ajax" />');
+            content.append(el);
+        }
+        if (api.getConf().fixed) {
+            // don't let it be over 75% of the viewport's height
+            el.css('max-height', Math.floor($(window).height() * 0.75));
+        }
+
+        // affix a random query argument to prevent
+        // loading from browser cache
+        sep = (src.indexOf('?') >= 0) ? '&': '?';
+        src += sep + "ajax_load=" + (new Date().getTime());
+
+        // add selector, if any
+        if (selector) {
+            src += ' ' + selector;
+        }
+
+        // set up callback to be used whenever new contents are loaded
+        // into the overlay, to prepare links and forms to stay within
+        // the overlay
+        el[0].handle_load_inside_overlay = function(responseText, errorText) {
+            var ele, target;
+            ele = $(this);
+
+            if (errorText === 'error') {
+                ele.append(pb.ajax_error_recover(responseText, selector));
+            } else if (!responseText.length) {
+                ele.append(ajax_noresponse_message || 'No response from server.');
+            }
+
+            // a non-semantic div here will make sure we can
+            // do enough formatting.
+            ele.wrapInner('<div />');
+
+            // add the submit handler if we've a formtarget
+            if (formtarget) {
+                target = ele.find(formtarget);
+                if (target.length > 0) {
+                    pb.prep_ajax_form(target);
+                }
+            }
+
+            // if a closeselector has been specified, tie it to the overlay's
+            // close method via closure
+            if (closeselector) {
+                ele.find(closeselector).click(function (event) {
+                    api.close();
+                    return false;
+                });
+            }
+
+            // execute inline scripts
+            // try {
+            //     // jQuery 1.7
+            //     $.buildFragment([responseText], [document], scripts);
+            // } catch (e) {
+            //     // jQuery 1.9
+            //     debugger
+            //     $.buildFragment([responseText], document, scripts);
+            // }
+
+            if (scripts.length) {
+                $.each(scripts, function() {
+                    $.globalEval( this.text || this.textContent || this.innerHTML || "" );
+                });
+            }
+
+            // This may be a complex form.
+            if ($.fn.ploneTabInit) {
+                ele.ploneTabInit();
+            }
+
+            // remove element on close so that it doesn't congest the DOM
+            api.onClose = function () {
+                content.remove();
+            };
+            $(document).trigger('loadInsideOverlay', [this, responseText, errorText, api]);
+        };
+
+        // and load the div
+        var data = null;
+        var form = $(pbo.source.context);
+        var method = form.attr('method');
+        if (method && method.toLowerCase() == 'post') {
+            data = form.serializeArray();
+        }
+        // load will do a POST instead of GET if data is not null
+        el.load(src, data, function (responseText, errorText) {
+            // post-process the overlay contents
+            el[0].handle_load_inside_overlay.apply(this, [responseText, errorText]);
+
+            // Now, it's all ready to display; hide the
+            // spinner and call JQT overlay load.
+            pb.spinner.hide();
+            api.load();
+
+            return true;
+        });
+
+        // don't do the default action
+        return false;
+    };
+
+
+    /******
+        pb.iframe
+        onBeforeLoad handler for iframe overlays.
+
+        Note that the spinner is handled a little differently
+        so that we can keep it displayed while the iframe's
+        content is loading.
+    ******/
+    pb.iframe = function () {
+        var content, pbo;
+
+        pb.spinner.show();
+
+        content = this.getOverlay();
+        pbo = this.getTrigger().data('pbo');
+
+        if (content.find('iframe').length === 0 && pbo.src) {
+            content.append(
+                '<iframe src="' + pbo.src + '" width="' +
+                 content.width() + '" height="' + content.height() +
+                 '" onload="pb.spinner.hide()"/>');
+        } else {
+            pb.spinner.hide();
+        }
+        return true;
+    };
+
+    // $('.newsImageContainer a')
+    //     .prepOverlay({
+    //          subtype: 'image',
+    //          urlmatch: '/image_view_fullscreen$',
+    //          urlreplace: '_preview'
+    //         });
+
+});
diff --git a/bika/lims/skins/bika/favicon.ico b/bika/lims/skins/bika/favicon.ico
index 2f99a30e9d..f823deab66 100644
Binary files a/bika/lims/skins/bika/favicon.ico and b/bika/lims/skins/bika/favicon.ico differ
diff --git a/bika/lims/skins/bika/global_statusmessage.pt b/bika/lims/skins/bika/global_statusmessage.pt
new file mode 100644
index 0000000000..b9426580db
--- /dev/null
+++ b/bika/lims/skins/bika/global_statusmessage.pt
@@ -0,0 +1,38 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      i18n:domain="plone">
+
+  <body>
+
+    <tal:block i18n:domain="plone" metal:define-macro="portal_message">
+
+      <tal:statusmsg tal:define="messages python:context.plone_utils.showPortalMessages()"
+                     tal:repeat="message messages">
+
+        <div class="alert alert-info"
+             tal:define="mtype message/type | nothing;
+                         mapping python:{'error': 'danger'};
+                         facility python:mapping.get(mtype, mtype);"
+             tal:attributes="class string:alert alert-dismissible alert-${facility};">
+
+          <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+            <span aria-hidden="true">&times;</span>
+          </button>
+
+          <strong tal:content="python:mtype.capitalize()" i18n:translate="">
+            Info
+          </strong>
+          <div tal:content="message/message | nothing" i18n:translate="">
+            The status message.
+          </div>
+
+        </div>
+
+      </tal:statusmsg>
+
+    </tal:block>
+
+  </body>
+</html>
diff --git a/bika/lims/skins/bika/login_form.cpt b/bika/lims/skins/bika/login_form.cpt
new file mode 100644
index 0000000000..4fa5b0d4fe
--- /dev/null
+++ b/bika/lims/skins/bika/login_form.cpt
@@ -0,0 +1,281 @@
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
+      xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      metal:use-macro="context/main_template/macros/master"
+      i18n:domain="plone">
+
+  <head>
+    <metal:js fill-slot="javascript_head_slot">
+      <script type="text/javascript" src=""
+              tal:attributes="src string:${context/portal_url}/login.js">
+      </script>
+    </metal:js>
+    <metal:block fill-slot="top_slot"
+                 tal:define="dummy python:request.set('disable_border',1);
+                             disable_column_one python:request.set('disable_plone.leftcolumn',1);
+                             disable_column_two python:request.set('disable_plone.rightcolumn',1);" />
+  </head>
+
+  <body>
+    <metal:main fill-slot="main">
+
+      <div id="content-core">
+        <metal:login define-macro="login"
+                     tal:define="auth nocall:context/acl_users/credentials_cookie_auth|context/cookie_authentication|nothing;
+                                 plone context/@@plone;
+                                 nav_root plone/navigationRootUrl;
+                                 isURLInPortal nocall:context/portal_url/isURLInPortal;
+                                 login_template_ids python:'login login_success login_password login_failed login_form logged_in logout logged_out registered mail_password mail_password_form register require_login member_search_results pwreset_finish localhost'.split();
+                                 came_from request/came_from|request/HTTP_REFERER|nothing;
+                                 came_from_template_id python:came_from and context.plone_utils.urlparse(came_from)[2].split('/')[-1];
+                                 came_from python:test(came_from is not None and isURLInPortal(came_from) and came_from_template_id not in login_template_ids, came_from, None);
+                                 next request/next|nothing;
+                                 next python:test(next is not None and isURLInPortal(next), next, None);
+                                 errors options/state/getErrors;
+                                 ac_name auth/name_cookie|string:__ac_name;
+                                 ac_password auth/pw_cookie|string:__ac_password;
+                                 ac_persist auth/persist_cookie|nothing;
+                                 login_name python:request.get('login_name', request.get(ac_name, ''));
+                                 checkPermission nocall: context/portal_membership/checkPermission;
+                                 site_properties context/portal_properties/site_properties;
+                                 use_email_as_login site_properties/use_email_as_login|nothing;
+                                 external_login_url site_properties/external_login_url|nothing;
+                                 external_login_iframe site_properties/external_login_iframe|nothing;
+                                 mail_password python:test(checkPermission('Mail forgotten password', context), nav_root + '/mail_password_form', '');
+                                 mail_password_url request/mail_password_url|nothing;
+                                 mail_password_url python:test(mail_password_url and isURLInPortal(mail_password_url), mail_password_url, mail_password);
+                                 join_actions python:context.portal_actions.listActionInfos('user/join', object=context) or [{}];
+                                 join python:join_actions[0].get('url');
+                                 join python:test(join and checkPermission('Add portal member', context), join, '');
+                                 join_url request/join_url|nothing;
+                                 join_url python:test(join_url is not None and isURLInPortal(join_url), join_url, join);
+                                 use_normal python:auth and not external_login_url;
+                                 use_iframe python:auth and external_login_url and external_login_iframe;
+                                 use_external python:auth and external_login_url and not external_login_iframe;
+                                 target request/target|nothing;
+                                 target python:test(target in ('_parent', '_top', '_blank', '_self'), target, None);
+                                 ztu modules/ZTUtils;">
+
+          <dl class="portalMessage error"
+              id="enable_cookies_message"
+              style="display:none">
+            <dt i18n:translate="">
+              Error
+            </dt>
+            <dd i18n:translate="enable_cookies_message_before_login">
+              Cookies are not enabled. You must enable cookies before you can log in.
+            </dd>
+          </dl>
+
+          <div tal:condition="python: not auth" i18n:translate="login_form_disabled">
+            Since cookie authentication is disabled, cookie-based login is not available.
+          </div>
+
+          <div class="col-md-12">
+            <form tal:attributes="action python:context.absolute_url()+'/'+template.id"
+                  method="post"
+                  id="login_form"
+                  tal:condition="use_normal">
+
+              <div id="login-form" class="col-md-offset-4 col-md-4 well">
+                <!-- Hidden fields -->
+                <input type="hidden" name="came_from" value="" tal:attributes="value came_from|nothing" />
+                <input type="hidden" name="next" value="" tal:attributes="value next|nothing" />
+                <input type="hidden" name="ajax_load" value="" tal:attributes="value request/ajax_load|nothing" />
+                <input type="hidden" name="ajax_include_head" value="" tal:attributes="value request/ajax_include_head|nothing" />
+                <input type="hidden" name="target" value="" tal:attributes="value request/target|nothing" />
+                <input type="hidden" name="mail_password_url" value="" tal:attributes="value request/mail_password_url|nothing" />
+                <input type="hidden" name="join_url" value="" tal:attributes="value request/join_url|nothing" />
+                <input type="hidden" name="form.submitted" value="1" />
+                <input type="hidden" name="js_enabled" id="js_enabled" value="0" />
+                <input type="hidden" name="cookies_enabled" id="cookies_enabled" value="" />
+                <input type="hidden" name="login_name" id="login_name" value="" />
+                <input type="hidden" name="pwd_empty" id="pwd_empty" value="0" />
+
+                <!-- Username -->
+                <div class="field form-group"
+                    tal:define="error python:errors.get(ac_name, None);"
+                    tal:attributes="class python:test(error, 'field error', 'field')">
+
+                  <label i18n:translate="label_login_name"
+                        class="form-control-label"
+                        tal:condition="not:use_email_as_login"
+                        tal:attributes="for ac_name">Login Name</label>
+
+                  <label i18n:translate="label_email"
+                        class="form-control-label"
+                        tal:condition="use_email_as_login"
+                        tal:attributes="for ac_name">E-mail</label>
+
+                  <div tal:condition="error"
+                      tal:content="error">Validation error output</div>
+
+
+                  <div class="form-group input-group">
+                    <span class="input-group-addon"><i class="glyphicon glyphicon-user"></i></span>
+                    <input type="text" size="15"
+                          class="form-control"
+                          tal:attributes="name ac_name;
+                                          id ac_name;
+                                          value login_name;" />
+                  </div>
+
+                </div>
+
+                <!-- Password -->
+                <div class="field form-group"
+                    tal:define="error python:errors.get(ac_password, None);"
+                    tal:attributes="class python:test(error, 'field error', 'field')">
+
+                  <label i18n:translate="label_password"
+                        class="form-control-label"
+                        tal:attributes="for ac_password">Password</label>
+
+                  <div tal:condition="error"
+                      tal:content="error">Validation error output</div>
+
+                  <div class="form-group input-group">
+                    <span class="input-group-addon"><i class="glyphicon glyphicon-lock"></i></span>
+                    <input type="password" size="15"
+                          class="form-control"
+                          tal:attributes="name ac_password;
+                                          id ac_password;" />
+                  </div>
+                </div>
+
+                <!-- Persist -->
+                <div class="field" tal:condition="ac_persist">
+
+                  <input type="checkbox"
+                        class="noborder formRememberName"
+                        value="1"
+                        checked="checked"
+                        id="cb_remember"
+                        tal:attributes="name ac_persist;
+                                        checked python:request.get(ac_name, '') and 'checked' or None;" />
+
+                  <tal:username tal:condition="not:use_email_as_login">
+                    <label for="cb_remember" i18n:translate="label_remember_my_name">Remember my name.</label>
+
+                    <div i18n:translate="help_remember_my_name"
+                        class="formHelp">
+                      Check this to have your user name filled in automatically when you log in later.
+                    </div>
+                  </tal:username>
+
+                  <tal:email tal:condition="use_email_as_login">
+                    <label for="cb_remember" i18n:translate="label_remember_my_email">Remember my email address.</label>
+                    <div i18n:translate="help_remember_my_email"
+                        class="formHelp">
+                      Check this to have your email address filled in automatically when you log in later.
+                    </div>
+                  </tal:email>
+
+                </div>
+
+                  <input class="btn btn-primary"
+                        type="submit"
+                        name="submit"
+                        value="Log in"
+                        i18n:attributes="value label_log_in;" />
+
+              </div> <!-- div#login-form -->
+
+            </form>
+          </div>
+          <!-- /Login form -->
+
+
+          <form tal:attributes="action external_login_url"
+                class="enableAutoFocus"
+                method="get"
+                id="login_form"
+                tal:condition="use_external">
+            <div id="login-form">
+              <input type="hidden"
+                     name="next"
+                     value=""
+                     tal:attributes="value string:${request/URL1}/logged_in" />
+              <div class="formControls">
+                <input class="context"
+                       type="submit"
+                       name="submit"
+                       value="Log in"
+                       i18n:attributes="value label_log_in;" />
+              </div>
+            </div>
+          </form>
+
+
+          <tal:use_iframe condition="use_iframe">
+            <form action="#"
+                  method="get"
+                  id="login_form"
+                  name="login_form"
+                  class="iframe-wrapper"
+                  tal:define="params python:dict(next=request.URL1+'/logged_in', target='_parent', ajax_load=True, ajax_include_head=True, mail_password_url=mail_password, join_url=join);
+                          dummy python:came_from and params.update(dict(came_from=came_from));
+                          src external_login_url"
+                  tal:attributes="action src">
+              <div id="login-form">
+                <iframe name="login-form-iframe"
+                        id="login-form-iframe"
+                        tal:attributes="src python:external_login_url+test(join_url.find('?')==-1, '?', '&amp;')+ztu.make_query(params);">
+                  <input tal:replace="structure python:ztu.make_hidden_input(params)" />
+                  <div class="formControls">
+                    <input class="context"
+                           type="submit"
+                           name="submit"
+                           value="Log in"
+                           i18n:attributes="value label_log_in;" />
+                  </div>
+                </iframe>
+              </div>
+            </form>
+          </tal:use_iframe>
+
+          <!-- Password fogotten -->
+          <div class="col-md-12">
+            <div id="login-forgotten-password"
+                 class="col-md-offset-4 col-md-4 well centered"
+                 tal:condition="python:mail_password_url and use_normal">
+              <strong i18n:translate="box_forgot_password_option">
+                Forgot your password?
+              </strong>
+              <p class="discreet"
+                 i18n:translate="help_password_retrieval">
+                If you have forgotten your password,
+                <span i18n:name="click_here">
+                  <a tal:define="mail_password_url python:mail_password_url+test(mail_password_url.find('?')==-1, '?', '&amp;')+ztu.make_query(userid=login_name)"
+                     tal:attributes="href mail_password_url; target target;"
+                     i18n:translate="label_click_here_to_retrieve">we can send you a new one</a></span>.
+              </p>
+            </div>
+
+            <div id="login-new-user"
+                 class="col-md-offset-4 col-md-4 well centered"
+                 tal:condition="python:join_url and use_normal">
+              <strong i18n:translate="heading_new_user">
+                New user?
+              </strong>
+
+              <p i18n:translate="description_no_account">
+                If you do not have an account here, head over to the
+                <span i18n:name="registration_form">
+                  <a href=""
+                     tal:define="join_url python:test(came_from, join_url+test(join_url.find('?')==-1, '?', '&amp;')+ztu.make_query(came_from=came_from), join_url);"
+                     tal:attributes="href join_url; target target;"
+                     i18n:translate="description_no_account_registration_linktext">
+                    registration form</a></span>.
+              </p>
+
+            </div>
+          </div>
+
+        </metal:login>
+      </div>
+
+    </metal:main>
+  </body>
+</html>
diff --git a/bika/lims/skins/bika/login_form.cpt.metadata b/bika/lims/skins/bika/login_form.cpt.metadata
new file mode 100644
index 0000000000..1c6a68f5cf
--- /dev/null
+++ b/bika/lims/skins/bika/login_form.cpt.metadata
@@ -0,0 +1,11 @@
+[default]
+title=Sign in
+border=None
+
+[validators]
+validators=login_form_validate
+
+[actions]
+action.success=traverse_to:string:logged_in
+action.failure=redirect_to:string:login_form
+action.failure_page=traverse_to:string:login_failed
diff --git a/bika/lims/skins/bika/logo.png b/bika/lims/skins/bika/logo.png
index 20cd2641d3..31569bd8fb 100644
Binary files a/bika/lims/skins/bika/logo.png and b/bika/lims/skins/bika/logo.png differ
diff --git a/bika/lims/skins/bika/logo_print.png b/bika/lims/skins/bika/logo_print.png
index 85a6721738..d0987df385 100644
Binary files a/bika/lims/skins/bika/logo_print.png and b/bika/lims/skins/bika/logo_print.png differ