diff --git a/src/App.js b/src/App.js
index a2a969d651..52e7a84ae4 100644
--- a/src/App.js
+++ b/src/App.js
@@ -71,7 +71,7 @@ const App = ({ history, config, appReady, activateSessionTracker }) => {
   }
 
   if (isLoginMissing(config)) {
-    return <NoLogin logoutWasManual={config.get('logoutWasManual')} isTokenExpired={config.get('isTokenExpired')} />
+    return <div id='app-container'><NoLogin logoutWasManual={config.get('logoutWasManual')} isTokenExpired={config.get('isTokenExpired')} /></div>
   }
 
   return (
diff --git a/src/GlobalErrorBoundary.js b/src/GlobalErrorBoundary.js
index ea25711bb2..dd93ccb2bc 100644
--- a/src/GlobalErrorBoundary.js
+++ b/src/GlobalErrorBoundary.js
@@ -4,6 +4,8 @@ import { msg, MsgContext, createMessages, locale } from './intl'
 import { logout } from '_/actions'
 import AppConfiguration from '_/config'
 import ErrorContent from '_/components/ErrorContent'
+import Header from './components/Header'
+import { Page } from '@patternfly/react-core'
 import * as branding from '_/branding'
 
 class GlobalErrorBoundary extends React.Component {
@@ -60,33 +62,33 @@ class GlobalErrorBoundary extends React.Component {
     const { hasError, msgContextState: { msg } } = this.state
     const trackText = branding.fixedStrings.ISSUES_TRACKER_TEXT || 'Github Issue Tracker'
     const trackUrl = branding.fixedStrings.ISSUES_TRACKER_URL || 'https://github.com/oVirt/ovirt-web-ui/issues'
-    const descr = msg.globalErrorBoundaryDescription({
-      bugUrl: `<a href='${trackUrl}'>${trackText}</a>`,
-    })
+    const descr = (
+      <p dangerouslySetInnerHTML={{
+        __html: msg.globalErrorBoundaryDescription({
+          bugUrl: `<a href='${trackUrl}'>${trackText}</a>`,
+        }),
+      }}
+      />
+    )
 
     if (hasError) {
       return (
-        <div>
-          <nav className='navbar navbar-pf-vertical obrand_masthead'>
-            <div className='navbar-header'>
-              <a href='/' className='navbar-brand obrand_headerLogoLink' id='pageheader-logo'>
-                <img className='obrand_mastheadLogo' src={branding.resourcesUrls.clearGif} />
-              </a>
-            </div>
-          </nav>
-          <ErrorContent
-            title={msg.globalErrorBoundaryTitle()}
-            description={descr}
-            leftButton={{
-              href: '#',
-              onClick: this.doLogout,
-              title: msg.logOut(),
-            }}
-            rightButton={{
-              href: AppConfiguration.applicationURL,
-              title: msg.refresh(),
-            }}
-          />
+        <div id="app-container">
+          <Page header={<Header/>}>
+            <ErrorContent
+              title={msg.globalErrorBoundaryTitle()}
+              description={descr}
+              leftButton={{
+                href: '#',
+                onClick: this.doLogout,
+                title: msg.logOut(),
+              }}
+              rightButton={{
+                href: AppConfiguration.applicationURL,
+                title: msg.refresh(),
+              }}
+            />
+          </Page>
         </div>
       )
     }
diff --git a/src/components/ErrorContent/index.js b/src/components/ErrorContent/index.js
index cd28dbe811..7aed82a444 100644
--- a/src/components/ErrorContent/index.js
+++ b/src/components/ErrorContent/index.js
@@ -1,46 +1,43 @@
 import React from 'react'
 import PropTypes from 'prop-types'
+import {
+  Button,
+  EmptyState,
+  EmptyStateIcon,
+  EmptyStateBody,
+  EmptyStateSecondaryActions,
+  Title,
+} from '@patternfly/react-core'
 import * as branding from '_/branding'
-import styles from './style.css'
 
 const ErrorContent = ({ title, description, leftButton, rightButton }) => (
-  <div>
-    <div className={`container text-center ${styles.errorContentContainer}`}>
-      <img src={branding.resourcesUrls.errorImg} />
-      <h1 className='bolder'>{title}</h1>
-      <p className='h4' dangerouslySetInnerHTML={{ __html: description }} />
-      <div>
-        <a
-          href={leftButton.href}
-          className='btn'
-          onClick={
-            leftButton.onClick
-              ? e => {
-                e.preventDefault()
-                leftButton.onClick()
-              }
-              : null
-          }
-        >
-          {leftButton.title}
-        </a>
-        <a
-          href={rightButton.href}
-          className='btn-primary btn'
-          onClick={
-            rightButton.onClick
-              ? e => {
-                e.preventDefault()
-                rightButton.onClick()
-              }
-              : null
-          }
-        >
-          {rightButton.title}
-        </a>
-      </div>
-    </div>
-  </div>
+  <EmptyState>
+    <EmptyStateIcon icon={() => <img src={branding.resourcesUrls.errorImg} />} />
+    <Title headingLevel="h4" size="lg">
+      {title}
+    </Title>
+    <EmptyStateBody>
+      {description}
+    </EmptyStateBody>
+    <EmptyStateSecondaryActions>
+      <Button
+        component='a'
+        href={leftButton.href}
+        onClick={leftButton.onClick}
+        variant='secondary'
+      >
+        {leftButton.title}
+      </Button>
+      <Button
+        component='a'
+        href={rightButton.href}
+        onClick={rightButton.onClick}
+        variant='primary'
+      >
+        {rightButton.title}
+      </Button>
+    </EmptyStateSecondaryActions>
+  </EmptyState>
 )
 
 const buttonType = PropTypes.shape({
@@ -51,7 +48,7 @@ const buttonType = PropTypes.shape({
 
 ErrorContent.propTypes = {
   title: PropTypes.string.isRequired,
-  description: PropTypes.string.isRequired,
+  description: PropTypes.node.isRequired,
   leftButton: buttonType,
   rightButton: buttonType,
 }
diff --git a/src/components/ErrorContent/style.css b/src/components/ErrorContent/style.css
deleted file mode 100644
index b00811e91e..0000000000
--- a/src/components/ErrorContent/style.css
+++ /dev/null
@@ -1,8 +0,0 @@
-.errorContentContainer {
-    width: 40%;
-    margin-top: 10%;
-}
-
-.errorContentContainer a:global(.btn) {
-    margin: 5%;
-}
diff --git a/src/components/NoLogin/index.js b/src/components/NoLogin/index.js
index 9ebe719f03..34689dd1c7 100644
--- a/src/components/NoLogin/index.js
+++ b/src/components/NoLogin/index.js
@@ -1,7 +1,14 @@
 import React, { useContext } from 'react'
 import PropTypes from 'prop-types'
 
-import { Button } from '@patternfly/react-core'
+import {
+  Button,
+  EmptyState,
+  EmptyStateIcon,
+  EmptyStateBody,
+  Page,
+  Title,
+} from '@patternfly/react-core'
 import { MsgContext } from '_/intl'
 import AppConfiguration from '_/config'
 import Header from '../Header'
@@ -14,29 +21,31 @@ import style from './style.css'
 const NoLogin = ({ logoutWasManual = false, isTokenExpired = false }) => {
   const { msg } = useContext(MsgContext)
   return (
-    <div>
-      <Header />
-      <div className={`container text-center ${style['logout-container']}`}>
-        <img src={signOutIcon} className={style['logout-icon']} />
-        <h1>{msg.loggedOut()}</h1>
-        <div className={style['logout-description']}>
+    <Page header={<Header/>} >
+      <EmptyState>
+        <EmptyStateIcon icon={() => <img src={signOutIcon} className={style['logout-icon']} />} />
+        <Title headingLevel="h4" size="lg">
+          {msg.loggedOut()}
+        </Title>
+        <EmptyStateBody>
           { window.DEVELOPMENT && isTokenExpired && msg.logoutTokenExpiredMessage() }
           { window.DEVELOPMENT && !isTokenExpired && msg.logoutDeveloperMessage() }
           { !window.DEVELOPMENT && msg.logoutRedirected() }
-        </div>
-        <div>
-          <Button
-            component='a'
-            href={AppConfiguration.applicationURL}
-            variant='primary'
-          >
-            {msg.logBackIn()}
-          </Button>
-        </div>
-      </div>
-    </div>
+        </EmptyStateBody>
+
+        <Button
+          component='a'
+          href={AppConfiguration.applicationURL}
+          variant='primary'
+        >
+          {msg.logBackIn()}
+        </Button>
+      </EmptyState>
+
+    </Page>
   )
 }
+
 NoLogin.propTypes = {
   logoutWasManual: PropTypes.bool.isRequired,
   isTokenExpired: PropTypes.bool,
diff --git a/src/components/NoLogin/style.css b/src/components/NoLogin/style.css
index 1bd382f5c9..bd211239f2 100644
--- a/src/components/NoLogin/style.css
+++ b/src/components/NoLogin/style.css
@@ -4,15 +4,3 @@
     opacity: 0.25;
     margin-bottom: 50px;
 }
-
-.logout-container h1 {
-	font-weight: 600;
-}
-
-.logout-description {
-    margin: 25px 0px;
-    max-width: 500px;
-    display: inline-block;
-    font-size: 14px;
-    color: #72767b;
-}