diff --git a/packages/files-ui/src/Components/Elements/InvoiceLines.tsx b/packages/files-ui/src/Components/Elements/InvoiceLines.tsx
index e4d12496a2..6749e9063e 100644
--- a/packages/files-ui/src/Components/Elements/InvoiceLines.tsx
+++ b/packages/files-ui/src/Components/Elements/InvoiceLines.tsx
@@ -56,9 +56,10 @@ const useStyles = makeStyles(
 
 interface  IInvoiceProps {
   lineNumber?: number
+  payInvoice?: () => void
 }
 
-const InvoiceLines = ({ lineNumber }: IInvoiceProps) => {
+const InvoiceLines = ({ lineNumber, payInvoice }: IInvoiceProps) => {
   const classes = useStyles()
   const { invoices, downloadInvoice } = useBilling()
   const invoicesToShow = useMemo(() => {
@@ -116,7 +117,7 @@ const InvoiceLines = ({ lineNumber }: IInvoiceProps) => {
                 </Button>
               )}
               {(status === "open") && (
-                <Button onClick={() => console.log("Not implemented")}>
+                <Button onClick={payInvoice}>
                   <Trans>Pay invoice</Trans>
                 </Button>
               )}
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCard/AddCardModal.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCard/AddCardModal.tsx
index 38a84a13dc..8a79993d32 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCard/AddCardModal.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCard/AddCardModal.tsx
@@ -3,7 +3,7 @@ import { createStyles, makeStyles } from "@chainsafe/common-theme"
 import { CSFTheme } from "../../../../../Themes/types"
 import CustomModal from "../../../../Elements/CustomModal"
 import { t, Trans } from "@lingui/macro"
-import AddCard from "./AddCard"
+import AddCard from "../Common/AddCard"
 import { Typography } from "@chainsafe/common-components"
 import { useBilling } from "../../../../../Contexts/BillingContext"
 
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/BillingHistory.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/BillingHistory.tsx
index 0139dc3ba8..53b84c059e 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/BillingHistory.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/BillingHistory.tsx
@@ -1,9 +1,11 @@
-import React from "react"
+import React, { useState } from "react"
 import { Typography, Link } from "@chainsafe/common-components"
 import { makeStyles, ITheme, createStyles } from "@chainsafe/common-theme"
 import { Trans } from "@lingui/macro"
 import { ROUTE_LINKS } from "../../../FilesRoutes"
 import InvoiceLines from "../../../Elements/InvoiceLines"
+import PayInvoiceModal from "./PayInvoice/PayInvoiceModal"
+import { useBilling } from "../../../../Contexts/BillingContext"
 
 const useStyles = makeStyles(({ constants }: ITheme) =>
   createStyles({
@@ -20,6 +22,8 @@ const useStyles = makeStyles(({ constants }: ITheme) =>
 
 const BillingHistory = () => {
   const classes = useStyles()
+  const [isPayInvoiceModalVisible, setPayInvoiceModalVisible] = useState(false)
+  const { isPendingInvoice } = useBilling()
 
   return (
     <div className={classes.container}>
@@ -29,6 +33,9 @@ const BillingHistory = () => {
       >
         <Trans>Billing history</Trans>
       </Typography>
+      {isPendingInvoice && <Typography>
+        <Trans>Please complete payment of the following outstanding invoices in order to avoid account suspension</Trans>
+      </Typography>}
       <Typography
         variant="body1"
         component="p"
@@ -38,7 +45,15 @@ const BillingHistory = () => {
           <Trans>All invoices</Trans>
         </Link>
       </Typography>
-      <InvoiceLines lineNumber={3}/>
+      <InvoiceLines
+        lineNumber={3}
+        payInvoice={() => setPayInvoiceModalVisible(true)}
+      />
+      {
+        isPayInvoiceModalVisible && <PayInvoiceModal
+          onClose={() => setPayInvoiceModalVisible(false)}
+        />
+      }
     </div>
   )
 }
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/ChangePlanModal.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/ChangePlanModal.tsx
index b67dcb5d23..c9b016fbbe 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/ChangePlanModal.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/ChangePlanModal.tsx
@@ -5,13 +5,13 @@ import { Modal } from "@chainsafe/common-components"
 import SelectPlan from "./SelectPlan"
 import PlanDetails from "./PlanDetails"
 import PaymentMethodSelector from "./PaymentMethodSelector"
-import ConfirmPlan from "./ConfirmPlan"
+import ConfirmPlan from "../Common/ConfirmPlan"
 import { useBilling } from "../../../../../Contexts/BillingContext"
 import { Product, ProductPrice, ProductPriceRecurringInterval } from "@chainsafe/files-api-client"
 import PlanSuccess from "./PlanSuccess"
 import DowngradeDetails from "./DowngradeDetails"
 import { PaymentMethod } from "../../../../../Contexts/BillingContext"
-import CryptoPayment from "./CryptoPayment"
+import CryptoPayment from "../Common/CryptoPayment"
 const useStyles = makeStyles(({ constants, breakpoints }: CSFTheme) =>
   createStyles({
     root: {
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PaymentMethodSelector.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PaymentMethodSelector.tsx
index f84e1b9c45..77a46ee123 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PaymentMethodSelector.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PaymentMethodSelector.tsx
@@ -3,7 +3,7 @@ import { makeStyles, createStyles } from "@chainsafe/common-theme"
 import { CSFTheme } from "../../../../../Themes/types"
 import { Button, Divider, RadioInput, Typography } from "@chainsafe/common-components"
 import { t, Trans } from "@lingui/macro"
-import AddCard from "../AddCard/AddCard"
+import AddCard from "../Common/AddCard"
 import { PaymentMethod, useBilling } from "../../../../../Contexts/BillingContext"
 import { ProductPrice } from "@chainsafe/files-api-client"
 
@@ -141,8 +141,7 @@ const PaymentMethodSelector = ({ selectedProductPrice, goBack, onSelectPaymentMe
           onChange={() => setPaymentMethod("crypto")}
           checked={paymentMethod === "crypto"}
           labelClassName={classes.radioLabel}
-          // TODO Revert once testing is finished
-          disabled={selectedProductPrice.recurring.interval !== "day"}
+          disabled={selectedProductPrice.recurring.interval !== "year"}
         />
       </>
       }
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PlanDetails.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PlanDetails.tsx
index 7fd1f5f7af..2b8bd2ed41 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PlanDetails.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/PlanDetails.tsx
@@ -73,8 +73,7 @@ interface IPlanDetails {
 const PlanDetails = ({ plan, goToSelectPlan, onSelectPlanPrice }: IPlanDetails) => {
   const classes = useStyles()
   const monthlyPrice = plan.prices.find((price) => price.recurring.interval === "month")
-  // TODO Revert this to year when testing is complete
-  const yearlyPrice = plan.prices.find((price) => price.recurring.interval === "day")
+  const yearlyPrice = plan.prices.find((price) => price.recurring.interval === "year")
   const currentPlanStorage = formatBytes(Number(monthlyPrice?.metadata?.storage_size_bytes), 2)
 
   const [billingPeriod, setBillingPeriod] = useState<"monthly" | "yearly">(monthlyPrice ? "monthly" : "yearly")
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/SelectPlan.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/SelectPlan.tsx
index b54badcbc5..dede29c899 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/SelectPlan.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/SelectPlan.tsx
@@ -150,7 +150,7 @@ interface ISelectPlan {
 
 const SelectPlan = ({ className, onSelectPlan, plans }: ISelectPlan) => {
   const classes = useStyles()
-  const { currentSubscription } = useBilling()
+  const { currentSubscription, isPendingInvoice } = useBilling()
   const { desktop } = useThemeSwitcher()
   const [tempSelectedPlan, setTempSelectedPlan] = useState<Product | undefined>()
 
@@ -259,7 +259,7 @@ const SelectPlan = ({ className, onSelectPlan, plans }: ISelectPlan) => {
             : (
               <div
                 className={clsx(classes.planBox, tempSelectedPlan?.id === plan.id && !isCurrentPlan && "active")}
-                onClick={() => isUpdateAllowed && !isCurrentPlan && setTempSelectedPlan(plan)}
+                onClick={() => !isPendingInvoice && isUpdateAllowed && !isCurrentPlan && setTempSelectedPlan(plan)}
                 key={`plan-${plan.id}`}
               >
                 <div className={classes.priceAndDescription}>
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCard/AddCard.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/AddCard.tsx
similarity index 100%
rename from packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/AddCard/AddCard.tsx
rename to packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/AddCard.tsx
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/ConfirmPlan.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/ConfirmPlan.tsx
similarity index 100%
rename from packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/ConfirmPlan.tsx
rename to packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/ConfirmPlan.tsx
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/CryptoPayment.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/CryptoPayment.tsx
similarity index 99%
rename from packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/CryptoPayment.tsx
rename to packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/CryptoPayment.tsx
index aa0af8bfa8..e94d96a7d8 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/ChangePlan/CryptoPayment.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/Common/CryptoPayment.tsx
@@ -238,8 +238,8 @@ const CryptoPayment = ({ planPrice }: ICryptoPayment) => {
   const debouncedSwitchCopiedDestinationAddress = debounce(() => setCopiedDestinationAddress(false), 3000)
   const debouncedSwitchCopiedAmount = debounce(() => setCopiedAmount(false), 3000)
   const pendingCryptoInvoice = useMemo(() =>
-    isPendingInvoice && invoices?.find((i) => i.payment_method === "crypto" && i.status === "open")
-  , [invoices, isPendingInvoice])
+    invoices?.find((i) => i.payment_method === "crypto" && i.status === "open")
+  , [invoices])
   const currencies = useMemo(() => cryptoPayment?.payment_methods.map(c => c.currency), [cryptoPayment])
   const [selectedCurrency, setSelectedCurrency] = useState<string | undefined>(undefined)
 
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/CurrentPlan.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/CurrentPlan.tsx
index 8d285e9e96..f336125e78 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/CurrentPlan.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/CurrentPlan.tsx
@@ -11,7 +11,7 @@ import { useFiles } from "../../../../Contexts/FilesContext"
 import { t, Trans } from "@lingui/macro"
 import clsx from "clsx"
 import { useBilling } from "../../../../Contexts/BillingContext"
-import ChangeProductModal from "./ChangePlan/ChangePlanModal"
+import ChangePlanModal from "./ChangePlan/ChangePlanModal"
 
 const useStyles = makeStyles(({ breakpoints, constants }: ITheme) =>
   createStyles({
@@ -58,7 +58,7 @@ interface ICurrentProduct {
   className?: string
 }
 
-const CurrentProduct = ({ className }: ICurrentProduct) => {
+const CurrentPlan = ({ className }: ICurrentProduct) => {
   const classes = useStyles()
   const { storageSummary } = useFiles()
   const { currentSubscription, isPendingInvoice } = useBilling()
@@ -115,7 +115,7 @@ const CurrentProduct = ({ className }: ICurrentProduct) => {
           </Button>
         </div>
         {
-          isChangeProductModalVisible && (<ChangeProductModal
+          isChangeProductModalVisible && (<ChangePlanModal
             onClose={() => setChangeProductModalVisible(false)}
           />)
         }
@@ -125,4 +125,4 @@ const CurrentProduct = ({ className }: ICurrentProduct) => {
   </section>)
 }
 
-export default CurrentProduct
\ No newline at end of file
+export default CurrentPlan
\ No newline at end of file
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/PayInvoice/PayInvoiceModal.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/PayInvoice/PayInvoiceModal.tsx
new file mode 100644
index 0000000000..fc8e4f42d3
--- /dev/null
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/PayInvoice/PayInvoiceModal.tsx
@@ -0,0 +1,52 @@
+import React from "react"
+import { makeStyles, createStyles, useThemeSwitcher } from "@chainsafe/common-theme"
+import { CSFTheme } from "../../../../../Themes/types"
+import { Modal } from "@chainsafe/common-components"
+import CryptoPayment from "../Common/CryptoPayment"
+
+const useStyles = makeStyles(({ constants, breakpoints }: CSFTheme) =>
+  createStyles({
+    root: {
+      "&:before": {
+        backgroundColor: constants.modalDefault.fadeBackground
+      }
+    },
+    inner: {
+      borderRadius: `${constants.generalUnit / 2}px`,
+      [breakpoints.up("sm")]: {
+        minWidth: 480
+      },
+      [breakpoints.down("sm")]: {
+        width: "100%"
+      }
+    }
+  })
+)
+
+interface IChangeProductModal {
+  onClose: () => void
+}
+
+const PayInvoiceModal = ({ onClose }: IChangeProductModal) => {
+  const classes = useStyles()
+  const { desktop } = useThemeSwitcher()
+
+  return (
+    <Modal
+      closePosition="right"
+      active={true}
+      maxWidth={desktop ? 800 : undefined}
+      width={desktop ? "max-content" : "100%"}
+      className={classes.root}
+      injectedClass={{
+        inner: classes.inner
+      }}
+      testId="pay-invoice"
+      onClose={onClose}
+    >
+      <CryptoPayment />
+    </Modal>
+  )
+}
+
+export default PayInvoiceModal
\ No newline at end of file
diff --git a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/index.tsx b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/index.tsx
index 8ba613a959..abca0c4601 100644
--- a/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/index.tsx
+++ b/packages/files-ui/src/Components/Modules/Settings/SubscriptionTab/index.tsx
@@ -6,7 +6,7 @@ import { Trans } from "@lingui/macro"
 import BillingHistory from "./BillingHistory"
 import { Elements } from "@stripe/react-stripe-js"
 import { loadStripe } from "@stripe/stripe-js"
-import CurrentProduct from "./CurrentPlan"
+import CurrentPlan from "./CurrentPlan"
 import { useBilling } from "../../../../Contexts/BillingContext"
 
 const useStyles = makeStyles(({ breakpoints, constants }: ITheme) =>
@@ -43,7 +43,7 @@ const PlanView: React.FC = () => {
           <Trans>Payment and Subscriptions</Trans>
         </Typography>
         <Divider />
-        <CurrentProduct />
+        <CurrentPlan />
         <CurrentCard />
         <BillingHistory />
       </div>
diff --git a/packages/files-ui/src/locales/de/messages.po b/packages/files-ui/src/locales/de/messages.po
index 610fa9f9c6..c08996a6d9 100644
--- a/packages/files-ui/src/locales/de/messages.po
+++ b/packages/files-ui/src/locales/de/messages.po
@@ -667,6 +667,9 @@ msgstr ""
 msgid "Plan changed successfully"
 msgstr ""
 
+msgid "Please complete payment of the following outstanding invoices in order to avoid account suspension"
+msgstr ""
+
 msgid "Please enter a file name"
 msgstr "Bitte geben Sie einen Dateinamen ein"
 
diff --git a/packages/files-ui/src/locales/en/messages.po b/packages/files-ui/src/locales/en/messages.po
index c5a1012975..bf2b1653a2 100644
--- a/packages/files-ui/src/locales/en/messages.po
+++ b/packages/files-ui/src/locales/en/messages.po
@@ -670,6 +670,9 @@ msgstr "Payment method"
 msgid "Plan changed successfully"
 msgstr "Plan changed successfully"
 
+msgid "Please complete payment of the following outstanding invoices in order to avoid account suspension"
+msgstr "Please complete payment of the following outstanding invoices in order to avoid account suspension"
+
 msgid "Please enter a file name"
 msgstr "Please enter a file name"
 
diff --git a/packages/files-ui/src/locales/es/messages.po b/packages/files-ui/src/locales/es/messages.po
index ddcff33156..d6e3d7d759 100644
--- a/packages/files-ui/src/locales/es/messages.po
+++ b/packages/files-ui/src/locales/es/messages.po
@@ -671,6 +671,9 @@ msgstr ""
 msgid "Plan changed successfully"
 msgstr ""
 
+msgid "Please complete payment of the following outstanding invoices in order to avoid account suspension"
+msgstr ""
+
 msgid "Please enter a file name"
 msgstr "Ingrese un nombre de archivo"
 
diff --git a/packages/files-ui/src/locales/fr/messages.po b/packages/files-ui/src/locales/fr/messages.po
index 6cbc8e1fec..f603bfaa95 100644
--- a/packages/files-ui/src/locales/fr/messages.po
+++ b/packages/files-ui/src/locales/fr/messages.po
@@ -671,6 +671,9 @@ msgstr "Méthode de paiement"
 msgid "Plan changed successfully"
 msgstr "Formule changée"
 
+msgid "Please complete payment of the following outstanding invoices in order to avoid account suspension"
+msgstr ""
+
 msgid "Please enter a file name"
 msgstr "Veuillez entrer un nom de fichier"
 
diff --git a/packages/files-ui/src/locales/no/messages.po b/packages/files-ui/src/locales/no/messages.po
index 1c1432d748..df59ce8291 100644
--- a/packages/files-ui/src/locales/no/messages.po
+++ b/packages/files-ui/src/locales/no/messages.po
@@ -667,6 +667,9 @@ msgstr ""
 msgid "Plan changed successfully"
 msgstr ""
 
+msgid "Please complete payment of the following outstanding invoices in order to avoid account suspension"
+msgstr ""
+
 msgid "Please enter a file name"
 msgstr "Skriv inn et filnavn"