diff --git a/CHANGELOG.md b/CHANGELOG.md
index daade7ce2..870574c0f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@
 - Users may now change their display name and password (only email accounts) on the new profile page
 - Highlighted code blocks can now use line wrapping and line numbers at once
 - Images, videos, and other non-text content is now wider in View Mode
+- CodiMD instances can now be branded either with a '@ <custom string>' or '@ <custom logo>' after the CodiMD logo and text
 
 ### Changed
 
diff --git a/public/acme.png b/public/acme.png
new file mode 100644
index 000000000..a8ddbad5c
Binary files /dev/null and b/public/acme.png differ
diff --git a/public/api/v2/config b/public/api/v2/config
index a0ec2dcb8..c7c7992e4 100644
--- a/public/api/v2/config
+++ b/public/api/v2/config
@@ -13,6 +13,10 @@
     "email": true,
     "openid": true
   },
+  "branding": {
+    "name": "ACME Corp",
+    "logo": "http://localhost:3000/acme.png"
+  },
   "banner": {
       "text": "This is the test banner text",
       "timestamp": "2020-05-22T20:46:08.962Z"
diff --git a/src/api/backend-config/types.ts b/src/api/backend-config/types.ts
index 874861f79..844a4e334 100644
--- a/src/api/backend-config/types.ts
+++ b/src/api/backend-config/types.ts
@@ -1,12 +1,18 @@
 export interface BackendConfig {
   allowAnonymous: boolean,
   authProviders: AuthProvidersState,
+  branding: BrandingConfig,
   banner: BannerConfig,
   customAuthNames: CustomAuthNames,
   specialLinks: SpecialLinks,
   version: BackendVersion,
 }
 
+export interface BrandingConfig {
+  name: string,
+  logo: string,
+}
+
 export interface BannerConfig {
   text: string
   timestamp: string
diff --git a/src/components/common/branding/branding.scss b/src/components/common/branding/branding.scss
new file mode 100644
index 000000000..164f57f8e
--- /dev/null
+++ b/src/components/common/branding/branding.scss
@@ -0,0 +1,7 @@
+.regular-size {
+  height: 50px;
+}
+
+.inline-size {
+  height: 30px;
+}
diff --git a/src/components/common/branding/branding.tsx b/src/components/common/branding/branding.tsx
new file mode 100644
index 000000000..b31289e07
--- /dev/null
+++ b/src/components/common/branding/branding.tsx
@@ -0,0 +1,32 @@
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { ApplicationState } from '../../../redux'
+import { ShowIf } from '../show-if/show-if'
+import './branding.scss'
+
+export interface BrandingProps {
+  inline?: boolean
+}
+
+export const Branding: React.FC<BrandingProps> = ({ inline = false }) => {
+  const branding = useSelector((state: ApplicationState) => state.backendConfig.branding)
+  const showBranding = branding.name !== '' || branding.logo !== ''
+
+  console.log(branding.logo)
+
+  return (
+    <ShowIf condition={showBranding}>
+      <strong className={`mx-1 ${inline ? 'inline-size' : 'regular-size'}`} >@</strong>
+      {
+        branding.logo
+          ? <img
+            src={branding.logo}
+            alt={branding.name}
+            title={branding.name}
+            className={inline ? 'inline-size' : 'regular-size'}
+          />
+          : branding.name
+      }
+    </ShowIf>
+  )
+}
diff --git a/src/components/common/document-title/document-title.tsx b/src/components/common/document-title/document-title.tsx
new file mode 100644
index 000000000..3154dc5f4
--- /dev/null
+++ b/src/components/common/document-title/document-title.tsx
@@ -0,0 +1,13 @@
+import React, { useEffect } from 'react'
+import { useSelector } from 'react-redux'
+import { ApplicationState } from '../../../redux'
+
+export const DocumentTitle: React.FC = () => {
+  const branding = useSelector((state: ApplicationState) => state.backendConfig.branding)
+
+  useEffect(() => {
+    document.title = `CodiMD ${branding.name ? ` @ ${branding.name}` : ''}`
+  }, [branding])
+
+  return null
+}
diff --git a/src/components/editor/task-bar/task-bar.tsx b/src/components/editor/task-bar/task-bar.tsx
index d868cf646..5a57c0444 100644
--- a/src/components/editor/task-bar/task-bar.tsx
+++ b/src/components/editor/task-bar/task-bar.tsx
@@ -2,6 +2,7 @@ import React from 'react'
 import { Button, Nav, Navbar } from 'react-bootstrap'
 import { Trans, useTranslation } from 'react-i18next'
 import { Link } from 'react-router-dom'
+import { Branding } from '../../common/branding/branding'
 import { ForkAwesomeIcon } from '../../common/fork-awesome/fork-awesome-icon'
 import { ConnectionIndicator } from './connection-indicator'
 import { DarkModeButton } from './dark-mode-button'
@@ -15,8 +16,10 @@ const TaskBar: React.FC = () => {
     <Navbar bg={'light'}>
       <Nav className="mr-auto d-flex align-items-center">
         <Navbar.Brand>
-          <Link to="/intro" className="text-secondary">
-            <ForkAwesomeIcon icon="file-text"/> CodiMD
+          <Link to="/intro" className="text-secondary text-decoration-none d-flex align-items-center">
+            <ForkAwesomeIcon icon="file-text" className={'mr-2'}/>
+            <span>CodiMD</span>
+            <Branding inline={true}/>
           </Link>
         </Navbar.Brand>
         <EditorViewMode/>
diff --git a/src/components/landing/landing-layout.tsx b/src/components/landing/landing-layout.tsx
index 693e19eb1..5712d14d9 100644
--- a/src/components/landing/landing-layout.tsx
+++ b/src/components/landing/landing-layout.tsx
@@ -1,5 +1,6 @@
 import React from 'react'
 import { Container } from 'react-bootstrap'
+import { DocumentTitle } from '../common/document-title/document-title'
 import { Footer } from './layout/footer/footer'
 import { InfoBanner } from './layout/info-banner'
 import { HeaderBar } from './layout/navigation/header-bar/header-bar'
@@ -7,6 +8,7 @@ import { HeaderBar } from './layout/navigation/header-bar/header-bar'
 export const LandingLayout: React.FC = ({ children }) => {
   return (
     <Container className="text-white d-flex flex-column mvh-100">
+      <DocumentTitle/>
       <InfoBanner/>
       <HeaderBar/>
       <div className={'d-flex flex-column justify-content-between flex-fill text-center'}>
diff --git a/src/components/landing/pages/intro/intro.tsx b/src/components/landing/pages/intro/intro.tsx
index e52341a84..64fd7658c 100644
--- a/src/components/landing/pages/intro/intro.tsx
+++ b/src/components/landing/pages/intro/intro.tsx
@@ -1,5 +1,6 @@
 import React, { Fragment } from 'react'
 import { Trans, useTranslation } from 'react-i18next'
+import { Branding } from '../../../common/branding/branding'
 import { ForkAwesomeIcon } from '../../../common/fork-awesome/fork-awesome-icon'
 import { CoverButtons } from './cover-buttons/cover-buttons'
 import { FeatureLinks } from './feature-links'
@@ -10,8 +11,10 @@ const Intro: React.FC = () => {
 
   return (
     <Fragment>
-      <h1 dir='auto'>
-        <ForkAwesomeIcon icon="file-text"/> CodiMD
+      <h1 dir='auto' className={'align-items-center d-flex justify-content-center'}>
+        <ForkAwesomeIcon icon="file-text" className={'mr-2'}/>
+        <span>CodiMD</span>
+        <Branding/>
       </h1>
       <p className="lead mb-5">
         <Trans i18nKey="app.slogan"/>
diff --git a/src/redux/backend-config/reducers.ts b/src/redux/backend-config/reducers.ts
index e4c642ae9..11af19382 100644
--- a/src/redux/backend-config/reducers.ts
+++ b/src/redux/backend-config/reducers.ts
@@ -17,6 +17,10 @@ export const initialState: BackendConfig = {
     email: false,
     openid: false
   },
+  branding: {
+    name: '',
+    logo: ''
+  },
   banner: {
     text: '',
     timestamp: ''