diff --git a/lib/ui/app/app_drawer.dart b/lib/ui/app/app_drawer.dart
index 6e9c4805c..37be21846 100644
--- a/lib/ui/app/app_drawer.dart
+++ b/lib/ui/app/app_drawer.dart
@@ -162,13 +162,12 @@ class AppDrawer extends StatelessWidget {
                 : ListView(
                     shrinkWrap: true,
                     children: <Widget>[
-                      /*
-                      if (isHosted(context) && !isProAccount(context))
+                      if (isHosted(context) && !isPaidAccount(context))
                         Material(
                           color: Colors.green,
                           child: ListTile(
-                            leading: Icon(FontAwesomeIcons.superpowers),
-                            title: Text(localization.upgrade),
+                            leading: Icon(FontAwesomeIcons.superpowers, color: Colors.white,),
+                            title: Text(localization.upgrade, style: TextStyle(color: Colors.white)),
                             onTap: () => showDialog<UpgradeDialog>(
                                 context: context,
                                 builder: (BuildContext context) {
@@ -176,7 +175,6 @@ class AppDrawer extends StatelessWidget {
                                 }),
                           ),
                         ),
-                        */
                       DrawerTile(
                         company: company,
                         icon: FontAwesomeIcons.tachometerAlt,
@@ -482,6 +480,7 @@ class SidebarFooter extends StatelessWidget {
             icon: Icon(Icons.info_outline),
             onPressed: () => showAbout(),
           ),
+          /*
           if (isHosted(context) && !isPaidAccount(context)) ...[
             Spacer(),
             FlatButton(
@@ -495,6 +494,7 @@ class SidebarFooter extends StatelessWidget {
             ),
             SizedBox(width: 14)
           ],
+          */
         ],
       ),
     );
diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
index aa16811c2..e47efae7b 100644
--- a/lib/ui/app/upgrade_dialog.dart
+++ b/lib/ui/app/upgrade_dialog.dart
@@ -172,7 +172,24 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
         parseDouble(product1.price) > parseDouble(product2.price) ? 1 : -1);
 
     return SimpleDialog(
-      title: Text(localization.annualSubscription),
+      title: Column(
+        children: <Widget>[
+          Text(localization.annualSubscription),
+          if (Platform.isIOS)
+            Text('Payment will be charged to iTunes Account at confirmation of purchase. Subscription automatically renews unless auto-renew is turned off at least 24-hours before the end of the current period. Account will be charged for renewal within 24-hours prior to the end of the current period, and identify the cost of the renewal. Subscriptions may be managed by the user and auto-renewal may be turned off by going to the user\'s Account Settings after purchase.'),
+          Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: <Widget>[
+              FlatButton(
+                child: Text(localization.termsOfService),
+              ),
+              FlatButton(
+                child: Text(localization.privacyPolicy),
+              ),
+            ],
+          )
+        ],
+      ),
       contentPadding: const EdgeInsets.symmetric(horizontal: 8, vertical: 15),
       children: [
         if (_showPastPurchases)