diff --git a/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js b/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
index a130cb05..7172b303 100644
--- a/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
+++ b/app/javascript/gabsocial/components/modal/pro_upgrade_modal.js
@@ -1,57 +1,101 @@
 import { defineMessages, injectIntl } from 'react-intl'
 import ImmutablePureComponent from 'react-immutable-pure-component'
+import {
+  URL_GAB_PRO,
+  DEFAULT_THEME,
+} from '../../constants'
 import Button from '../button'
 import Text from '../text'
+import Icon from '../icon'
+import Image from '../image'
 import ModalLayout from './modal_layout'
 
 const messages = defineMessages({
   title: { id: 'promo.gab_pro', defaultMessage: 'Upgrade to GabPRO' },
+  upgrade: { id: 'promo.upgrade', defaultMessage: 'Upgrade' },
+  learnMore: { id: 'promo.learn_more', defaultMessage: 'Learn more' },
   text: { id: 'pro_upgrade_modal.text', defaultMessage: 'Gab is fully funded by people like you. Please consider supporting us on our mission to defend free expression online for all people.' },
-  benefits: { id: 'pro_upgrade_modal.benefits', defaultMessage: 'Here are just some of the benefits that thousands of GabPRO members receive:' },
+  benefits: { id: 'pro_upgrade_modal.benefits', defaultMessage: 'Here are some benefits that GabPRO members receive:' },
+})
+
+const mapStateToProps = (state) => ({
+  theme: state.getIn(['settings', 'displayOptions', 'theme'], DEFAULT_THEME),
 })
 
 export default
 @injectIntl
+@connect(mapStateToProps)
 class ProUpgradeModal extends ImmutablePureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
     onClose: PropTypes.func.isRequired,
+    theme: PropTypes.string.isRequired,
   }
 
   render() {
-    const { intl, onClose } = this.props
+    const {
+      intl,
+      onClose,
+      theme,
+    } = this.props
+
+    const imgSuffix = (theme === 'light' || !theme) ? 'light' : 'dark'
+
+    const title = (
+      <span className={[_s.default, _s.flexRow, _s.justifyContentCenter, _s.alignItemsCenter].join(' ')}>
+        <span className={[_s.default, _s.mr2].join(' ')}>
+          Upgrade to Gab
+        </span>
+        <span className={[_s.bgPro, _s.colorBlack, _s.radiusSmall, _s.px5, _s.py5].join(' ')}>PRO</span>
+      </span>
+    )
 
     return (
       <ModalLayout
-        title={intl.formatMessage(messages.title)}
-        width={460}
+        title={title}
+        width={540}
         onClose={onClose}
       >
-        <Text>
+        <Text size='medium' weight='medium' className={_s.mb10}>
           {intl.formatMessage(messages.text)}
         </Text>
-        <Text>
+        <Text size='medium' color='secondary'>
           {intl.formatMessage(messages.benefits)}
         </Text>
 
         <div className={[_s.default, _s.my10].join(' ')}>
-          <Text>• Schedule Posts</Text>
-          <Text>• Get Verified</Text>
-          <Text>• Create Groups</Text>
-          <Text>• Larger Video and Image Uploads</Text>
-          <Text>• Receive the PRO Badge</Text>
-          <Text>• Remove in-feed promotions</Text>
-          <Text>• Compose Rich Text posts (Bold, Italic, Underline and more)</Text>
+          <Image
+            src={`/headers/pro-features-${imgSuffix}.png`}
+            width='100%'
+            height='auto'
+            fit='cover'
+            className={_s.heightMin320PX}
+          />
         </div>
 
-        <Button
-          href='https://pro.gab.com'
-        >
-          <Text color='inherit' weight='bold' align='center'>
-            {intl.formatMessage(messages.title)}
-          </Text>
-        </Button>
+        <div className={[_s.default, _s.flexRow, _s.py10].join(' ')}>
+          <Button
+            isOutline
+            color='brand'
+            backgroundColor='none'
+            href={URL_GAB_PRO}
+            className={[_s.flexRow, _s.alignItemsCenter, _s.justifyContentCenter, _s.mr10].join(' ')}
+          >
+            <Text color='inherit' weight='medium' align='center'>
+              {intl.formatMessage(messages.learnMore)}
+            </Text>
+          </Button>
+          <Button
+            href={URL_GAB_PRO}
+            className={[_s.flexRow, _s.flexGrow1, _s.alignItemsCenter, _s.justifyContentCenter].join(' ')}
+          >
+            <Text color='inherit' size='large' weight='bold' align='center'>
+              {intl.formatMessage(messages.upgrade)}
+            </Text>
+            <Icon id='arrow-right' size='20px' className={[_s.fillWhite, _s.ml5].join(' ')} />
+          </Button>
+        </div>
 
       </ModalLayout>
     )
diff --git a/public/headers/pro-features-dark.png b/public/headers/pro-features-dark.png
new file mode 100644
index 00000000..9c8550ca
Binary files /dev/null and b/public/headers/pro-features-dark.png differ
diff --git a/public/headers/pro-features-light.png b/public/headers/pro-features-light.png
new file mode 100644
index 00000000..718c269b
Binary files /dev/null and b/public/headers/pro-features-light.png differ