diff --git a/src/HospitalRun.tsx b/src/HospitalRun.tsx
index 2ccf0bccbf..0cd8e7799a 100644
--- a/src/HospitalRun.tsx
+++ b/src/HospitalRun.tsx
@@ -5,6 +5,8 @@ import { Toaster } from '@hospitalrun/components'
 import Appointments from 'scheduling/appointments/Appointments'
 import NewAppointment from 'scheduling/appointments/new/NewAppointment'
 import ViewAppointment from 'scheduling/appointments/view/ViewAppointment'
+import { ButtonBarProvider } from 'page-header/button-bar-context'
+import ButtonToolBar from 'page-header/ButtonToolBar'
 import Sidebar from './components/Sidebar'
 import Permissions from './model/Permissions'
 import Dashboard from './dashboard/Dashboard'
@@ -19,68 +21,72 @@ import PrivateRoute from './components/PrivateRoute'
 const HospitalRun = () => {
   const { title } = useSelector((state: RootState) => state.title)
   const { permissions } = useSelector((state: RootState) => state.user)
+
   return (
     <div>
       <Navbar />
       <div className="container-fluid">
         <Sidebar />
-        <div className="row">
-          <main role="main" className="col-md-9 ml-sm-auto col-lg-10 px-4">
-            <div className="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
-              <h1 className="h2">{title}</h1>
-            </div>
-            <div>
-              <Switch>
-                <Route exact path="/" component={Dashboard} />
-                <PrivateRoute
-                  isAuthenticated={permissions.includes(Permissions.ReadPatients)}
-                  exact
-                  path="/patients"
-                  component={Patients}
-                />
-                <PrivateRoute
-                  isAuthenticated={permissions.includes(Permissions.WritePatients)}
-                  exact
-                  path="/patients/new"
-                  component={NewPatient}
-                />
-                <PrivateRoute
-                  isAuthenticated={
-                    permissions.includes(Permissions.WritePatients) &&
-                    permissions.includes(Permissions.ReadPatients)
-                  }
-                  exact
-                  path="/patients/edit/:id"
-                  component={EditPatient}
-                />
-                <PrivateRoute
-                  isAuthenticated={permissions.includes(Permissions.ReadPatients)}
-                  path="/patients/:id"
-                  component={ViewPatient}
-                />
-                <PrivateRoute
-                  isAuthenticated={permissions.includes(Permissions.ReadAppointments)}
-                  exact
-                  path="/appointments"
-                  component={Appointments}
-                />
-                <PrivateRoute
-                  isAuthenticated={permissions.includes(Permissions.WriteAppointments)}
-                  exact
-                  path="/appointments/new"
-                  component={NewAppointment}
-                />
-                <PrivateRoute
-                  isAuthenticated={permissions.includes(Permissions.ReadAppointments)}
-                  exact
-                  path="/appointments/:id"
-                  component={ViewAppointment}
-                />
-              </Switch>
-            </div>
-            <Toaster autoClose={5000} hideProgressBar draggable />
-          </main>
-        </div>
+        <ButtonBarProvider>
+          <div className="row">
+            <main role="main" className="col-md-9 ml-sm-auto col-lg-10 px-4">
+              <div className="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+                <h1 className="h2">{title}</h1>
+                <ButtonToolBar />
+              </div>
+              <div>
+                <Switch>
+                  <Route exact path="/" component={Dashboard} />
+                  <PrivateRoute
+                    isAuthenticated={permissions.includes(Permissions.ReadPatients)}
+                    exact
+                    path="/patients"
+                    component={Patients}
+                  />
+                  <PrivateRoute
+                    isAuthenticated={permissions.includes(Permissions.WritePatients)}
+                    exact
+                    path="/patients/new"
+                    component={NewPatient}
+                  />
+                  <PrivateRoute
+                    isAuthenticated={
+                      permissions.includes(Permissions.WritePatients) &&
+                      permissions.includes(Permissions.ReadPatients)
+                    }
+                    exact
+                    path="/patients/edit/:id"
+                    component={EditPatient}
+                  />
+                  <PrivateRoute
+                    isAuthenticated={permissions.includes(Permissions.ReadPatients)}
+                    path="/patients/:id"
+                    component={ViewPatient}
+                  />
+                  <PrivateRoute
+                    isAuthenticated={permissions.includes(Permissions.ReadAppointments)}
+                    exact
+                    path="/appointments"
+                    component={Appointments}
+                  />
+                  <PrivateRoute
+                    isAuthenticated={permissions.includes(Permissions.WriteAppointments)}
+                    exact
+                    path="/appointments/new"
+                    component={NewAppointment}
+                  />
+                  <PrivateRoute
+                    isAuthenticated={permissions.includes(Permissions.ReadAppointments)}
+                    exact
+                    path="/appointments/:id"
+                    component={ViewAppointment}
+                  />
+                </Switch>
+              </div>
+              <Toaster autoClose={5000} hideProgressBar draggable />
+            </main>
+          </div>
+        </ButtonBarProvider>
       </div>
     </div>
   )
diff --git a/src/page-header/ButtonToolBar.tsx b/src/page-header/ButtonToolBar.tsx
new file mode 100644
index 0000000000..701ade5e85
--- /dev/null
+++ b/src/page-header/ButtonToolBar.tsx
@@ -0,0 +1,9 @@
+import React from 'react'
+import { useButtons } from './button-bar-context'
+
+const ButtonToolBar = () => {
+  const buttons = useButtons()
+  return <>{buttons.map((button) => button)}</>
+}
+
+export default ButtonToolBar
diff --git a/src/page-header/button-bar-context.tsx b/src/page-header/button-bar-context.tsx
new file mode 100644
index 0000000000..dcb076f584
--- /dev/null
+++ b/src/page-header/button-bar-context.tsx
@@ -0,0 +1,36 @@
+import React, { useState } from 'react'
+
+type Props = {
+  children: React.ReactNode
+}
+
+type ButtonUpdater = (buttons: React.ReactNode[]) => void
+
+const ButtonBarStateContext = React.createContext<React.ReactNode[]>([])
+const ButtonBarUpdateContext = React.createContext<ButtonUpdater>(() => {})
+
+function ButtonBarProvider(props: Props) {
+  const { children } = props
+  const [state, setState] = useState<React.ReactNode[]>([])
+  return (
+    <ButtonBarStateContext.Provider value={state}>
+      <ButtonBarUpdateContext.Provider value={setState}>{children}</ButtonBarUpdateContext.Provider>
+    </ButtonBarStateContext.Provider>
+  )
+}
+function useButtons() {
+  const context = React.useContext(ButtonBarStateContext)
+  if (context === undefined) {
+    throw new Error('useCountState must be used within a CountProvider')
+  }
+  return context
+}
+function useButtonToolbarSetter() {
+  const context = React.useContext(ButtonBarUpdateContext)
+  if (context === undefined) {
+    throw new Error('useCountDispatch must be used within a CountProvider')
+  }
+  return context
+}
+
+export { ButtonBarProvider, useButtons, useButtonToolbarSetter }
diff --git a/src/patients/list/Patients.tsx b/src/patients/list/Patients.tsx
index 307727e6ab..2ee672b656 100644
--- a/src/patients/list/Patients.tsx
+++ b/src/patients/list/Patients.tsx
@@ -3,6 +3,7 @@ import { useSelector, useDispatch } from 'react-redux'
 import { useHistory } from 'react-router'
 import { useTranslation } from 'react-i18next'
 import { Spinner, TextInput, Button, List, ListItem, Container, Row } from '@hospitalrun/components'
+import { useButtonToolbarSetter } from 'page-header/button-bar-context'
 import { RootState } from '../../store'
 import { fetchPatients, searchPatients } from '../patients-slice'
 import useTitle from '../../page-header/useTitle'
@@ -14,11 +15,27 @@ const Patients = () => {
   const dispatch = useDispatch()
   const { patients, isLoading } = useSelector((state: RootState) => state.patients)
 
+  const setButtonToolBar = useButtonToolbarSetter()
+  setButtonToolBar([
+    <Button
+      outlined
+      color="success"
+      icon="patient-add"
+      onClick={() => history.push('/patients/new')}
+    >
+      {t('patients.newPatient')}
+    </Button>,
+  ])
+
   const [searchText, setSearchText] = useState<string>('')
 
   useEffect(() => {
     dispatch(fetchPatients())
-  }, [dispatch])
+
+    return () => {
+      setButtonToolBar([])
+    }
+  }, [dispatch, setButtonToolBar])
 
   if (isLoading) {
     return <Spinner color="blue" loading size={[10, 25]} type="ScaleLoader" />
diff --git a/src/scheduling/appointments/Appointments.tsx b/src/scheduling/appointments/Appointments.tsx
index 7676b1beb9..e45b105bd6 100644
--- a/src/scheduling/appointments/Appointments.tsx
+++ b/src/scheduling/appointments/Appointments.tsx
@@ -1,11 +1,12 @@
 import React, { useEffect, useState } from 'react'
-import { Calendar } from '@hospitalrun/components'
+import { Calendar, Button } from '@hospitalrun/components'
 import useTitle from 'page-header/useTitle'
 import { useTranslation } from 'react-i18next'
 import { useSelector, useDispatch } from 'react-redux'
 import { RootState } from 'store'
 import { useHistory } from 'react-router'
 import PatientRepository from 'clients/db/PatientRepository'
+import { useButtonToolbarSetter } from 'page-header/button-bar-context'
 import { fetchAppointments } from './appointments-slice'
 
 interface Event {
@@ -23,10 +24,25 @@ const Appointments = () => {
   const dispatch = useDispatch()
   const { appointments } = useSelector((state: RootState) => state.appointments)
   const [events, setEvents] = useState<Event[]>([])
+  const setButtonToolBar = useButtonToolbarSetter()
+  setButtonToolBar([
+    <Button
+      outlined
+      color="success"
+      icon="appointment-add"
+      onClick={() => history.push('/appointments/new')}
+    >
+      New Appointment
+    </Button>,
+  ])
 
   useEffect(() => {
     dispatch(fetchAppointments())
-  }, [dispatch])
+
+    return () => {
+      setButtonToolBar([])
+    }
+  }, [dispatch, setButtonToolBar])
 
   useEffect(() => {
     const getAppointments = async () => {