diff --git a/src/elements/common/nav-button/BackButton.js b/src/elements/common/nav-button/BackButton.js.flow
similarity index 97%
rename from src/elements/common/nav-button/BackButton.js
rename to src/elements/common/nav-button/BackButton.js.flow
index a1431b87a1..bc64777613 100644
--- a/src/elements/common/nav-button/BackButton.js
+++ b/src/elements/common/nav-button/BackButton.js.flow
@@ -15,7 +15,7 @@ import './BackButton.scss';
 
 type Props = {
     className?: string,
-    to?: Location,
+    to?: Location | string,
 };
 
 const BackButton = ({ className, to, ...rest }: Props) => (
diff --git a/src/elements/common/nav-button/BackButton.tsx b/src/elements/common/nav-button/BackButton.tsx
new file mode 100644
index 0000000000..16784a9355
--- /dev/null
+++ b/src/elements/common/nav-button/BackButton.tsx
@@ -0,0 +1,35 @@
+import * as React from 'react';
+import classNames from 'classnames';
+import { FormattedMessage } from 'react-intl';
+import { Route } from 'react-router-dom';
+import type { Location } from 'history';
+import IconNavigateLeft from '../../../icons/general/IconNavigateLeft';
+import PlainButton from '../../../components/plain-button';
+import messages from '../messages';
+import { ButtonType } from '../../../components/button';
+import './BackButton.scss';
+
+export interface BackButtonProps {
+    className?: string;
+    to?: string | Location;
+}
+
+const BackButton = ({ className, to, ...rest }: BackButtonProps) => (
+    <Route>
+        {({ history }) => (
+            <PlainButton
+                className={classNames('bdl-BackButton', className)}
+                onClick={() => (to ? history.push(to) : history.goBack())}
+                type={ButtonType.BUTTON}
+                {...rest}
+            >
+                <IconNavigateLeft height={24} width={24} />
+                <span className="accessibility-hidden">
+                    <FormattedMessage {...messages.back} />
+                </span>
+            </PlainButton>
+        )}
+    </Route>
+);
+
+export default BackButton;
diff --git a/src/elements/common/nav-button/NavButton.js b/src/elements/common/nav-button/NavButton.js.flow
similarity index 94%
rename from src/elements/common/nav-button/NavButton.js
rename to src/elements/common/nav-button/NavButton.js.flow
index 5f3b0f936d..682005d306 100644
--- a/src/elements/common/nav-button/NavButton.js
+++ b/src/elements/common/nav-button/NavButton.js.flow
@@ -11,6 +11,12 @@ import type { Match, Location } from 'react-router-dom';
 import PlainButton from '../../../components/plain-button';
 import { isLeftClick } from '../../../utils/dom';
 
+// Custom Location type that makes hash optional
+type CustomLocation = {
+    ...Location,
+    hash?: string,
+};
+
 type Props = {
     activeClassName?: string,
     children: React.Node,
@@ -22,7 +28,7 @@ type Props = {
     onClick?: (event: SyntheticEvent<>) => void,
     replace?: boolean,
     strict?: boolean,
-    to: string | Location,
+    to: string | CustomLocation,
 };
 
 const NavButton = React.forwardRef<Props, React.Ref<any>>((props: Props, ref: React.Ref<any>) => {
diff --git a/src/elements/common/nav-button/NavButton.tsx b/src/elements/common/nav-button/NavButton.tsx
new file mode 100644
index 0000000000..3876660365
--- /dev/null
+++ b/src/elements/common/nav-button/NavButton.tsx
@@ -0,0 +1,77 @@
+import * as React from 'react';
+import classNames from 'classnames';
+import { Route } from 'react-router-dom';
+import type { match } from 'react-router';
+import type { Location } from 'history';
+import PlainButton, { PlainButtonProps } from '../../../components/plain-button';
+import { isLeftClick } from '../../../utils/dom';
+
+export interface NavButtonProps {
+    activeClassName?: string;
+    children: React.ReactNode;
+    className?: string;
+    component?: React.ComponentType<PlainButtonProps & { ref?: React.Ref<HTMLButtonElement> }>;
+    exact?: boolean;
+    isActive?: (match: match, location: Location) => boolean;
+    isDisabled?: boolean;
+    onClick?: (event: React.SyntheticEvent) => void;
+    replace?: boolean;
+    strict?: boolean;
+    to: string | Location;
+}
+
+const NavButton = React.forwardRef<HTMLButtonElement, NavButtonProps>(
+    (props: NavButtonProps, ref: React.Ref<HTMLButtonElement>) => {
+        const {
+            activeClassName = 'bdl-is-active',
+            children,
+            className = 'bdl-NavButton',
+            component: Component = PlainButton,
+            exact,
+            isActive,
+            isDisabled,
+            onClick,
+            replace,
+            strict,
+            to,
+            ...rest
+        } = props;
+        const path = typeof to === 'object' ? to.pathname : to;
+
+        const disabledClassName = 'bdl-is-disabled';
+
+        return (
+            <Route exact={exact} path={path} strict={strict}>
+                {({ history, location, match }) => {
+                    const isActiveValue = !!(isActive ? isActive(match, location) : match);
+
+                    return (
+                        <Component
+                            className={classNames(className, {
+                                [activeClassName]: isActiveValue,
+                                [disabledClassName]: isDisabled,
+                            })}
+                            isDisabled={isDisabled}
+                            onClick={event => {
+                                if (onClick) {
+                                    onClick(event);
+                                }
+
+                                if (!event.defaultPrevented && isLeftClick(event)) {
+                                    const method = replace ? history.replace : history.push;
+                                    method(to);
+                                }
+                            }}
+                            ref={ref}
+                            {...rest}
+                        >
+                            {children}
+                        </Component>
+                    );
+                }}
+            </Route>
+        );
+    },
+);
+
+export default NavButton;
diff --git a/src/elements/common/nav-button/index.js b/src/elements/common/nav-button/index.js.flow
similarity index 91%
rename from src/elements/common/nav-button/index.js
rename to src/elements/common/nav-button/index.js.flow
index e7cb60159d..b186704aee 100644
--- a/src/elements/common/nav-button/index.js
+++ b/src/elements/common/nav-button/index.js.flow
@@ -1,2 +1,3 @@
+// @flow
 export { default as BackButton } from './BackButton';
 export { default } from './NavButton';
diff --git a/src/elements/common/nav-button/index.ts b/src/elements/common/nav-button/index.ts
new file mode 100644
index 0000000000..ddd3595f9d
--- /dev/null
+++ b/src/elements/common/nav-button/index.ts
@@ -0,0 +1,4 @@
+export { default as BackButton } from './BackButton';
+export { default } from './NavButton';
+export type { BackButtonProps } from './BackButton';
+export type { NavButtonProps } from './NavButton';