diff --git a/lib/ui/app/list_scaffold.dart b/lib/ui/app/list_scaffold.dart
index b5358f5ea..c82ed765a 100644
--- a/lib/ui/app/list_scaffold.dart
+++ b/lib/ui/app/list_scaffold.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
@@ -56,8 +54,7 @@ class ListScaffold extends StatelessWidget {
     } else if (isSettings) {
       leading = isMobile(context)
           ? IconButton(
-              icon: Icon(
-                  Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back),
+              icon: Icon(Icons.arrow_back),
               onPressed: () => Navigator.pop(context),
             )
           : IconButton(
diff --git a/lib/ui/app/menu_drawer.dart b/lib/ui/app/menu_drawer.dart
index c04bf74a4..bc5d1eba8 100644
--- a/lib/ui/app/menu_drawer.dart
+++ b/lib/ui/app/menu_drawer.dart
@@ -592,8 +592,7 @@ class SidebarFooter extends StatelessWidget {
                     }),
               ),
             /*
-          if (!Platform.isIOS &&
-              isHosted(context) &&
+          if (isHosted(context) &&
               !isPaidAccount(context)) ...[
             Spacer(),
             FlatButton(
diff --git a/lib/ui/app/upgrade_dialog.dart b/lib/ui/app/upgrade_dialog.dart
index ea501eda3..634704c2d 100644
--- a/lib/ui/app/upgrade_dialog.dart
+++ b/lib/ui/app/upgrade_dialog.dart
@@ -53,9 +53,7 @@ class _UpgradeDialogState extends State<UpgradeDialog> {
     final data = {
       'order_id': purchase.purchaseID,
       'product_id': purchase.productID,
-      'timestamp': Platform.isIOS
-          ? (int.parse(purchase.transactionDate) / 1000).floor()
-          : purchase.transactionDate,
+      'timestamp': (int.parse(purchase.transactionDate) / 1000).floor(),
     };
 
     try {
diff --git a/lib/ui/app/view_scaffold.dart b/lib/ui/app/view_scaffold.dart
index fdfbcbdff..35792e2a0 100644
--- a/lib/ui/app/view_scaffold.dart
+++ b/lib/ui/app/view_scaffold.dart
@@ -1,5 +1,3 @@
-import 'dart:io';
-
 import 'package:flutter/material.dart';
 import 'package:flutter_redux/flutter_redux.dart';
 import 'package:invoiceninja_flutter/data/models/entities.dart';
@@ -33,6 +31,7 @@ class ViewScaffold extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
+
     final localization = AppLocalization.of(context);
     final store = StoreProvider.of<AppState>(context);
     final state = store.state;
@@ -60,7 +59,7 @@ class ViewScaffold extends StatelessWidget {
         );
       } else if (isSettings) {
         leading = IconButton(
-          icon: Icon(Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back),
+          icon: Icon(Icons.arrow_back),
           onPressed: () => onBackPressed != null
               ? onBackPressed()
               : store.dispatch(UpdateCurrentRoute(state.uiState.previousRoute)),
diff --git a/lib/ui/auth/login_view.dart b/lib/ui/auth/login_view.dart
index b3969235b..259957a8d 100644
--- a/lib/ui/auth/login_view.dart
+++ b/lib/ui/auth/login_view.dart
@@ -1,5 +1,4 @@
 import 'dart:async';
-import 'dart:io';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter/cupertino.dart';
@@ -386,7 +385,7 @@ class _LoginState extends State<LoginView> {
                                 });
                               },
                             ),
-                          if (!_isSelfHosted && !Platform.isIOS)
+                          if (!_isSelfHosted)
                             _ToggleButtons(
                               tabLabels: [
                                 'Google',
diff --git a/lib/utils/pdf.dart b/lib/utils/pdf.dart
index a833e0119..b3a341ec7 100644
--- a/lib/utils/pdf.dart
+++ b/lib/utils/pdf.dart
@@ -1,7 +1,6 @@
 import 'dart:async';
 import 'dart:convert';
 import 'dart:io' as file;
-import 'dart:io';
 import 'package:flutter_share/flutter_share.dart';
 import 'package:http/http.dart' as http;
 import 'package:flutter/material.dart';
@@ -94,7 +93,7 @@ class _PDFScaffoldState extends State<PDFScaffold> {
       appBar: AppBar(
         centerTitle: false,
         leading: IconButton(
-          icon: Icon(Platform.isIOS ? Icons.arrow_back_ios : Icons.arrow_back),
+          icon: Icon(Icons.arrow_back),
           onPressed: () => Navigator.of(context).pop(),
         ),
         title: Text(localization.invoice + ' ' + (invoice.number ?? '')),