diff --git a/lib/api_form.dart b/lib/api_form.dart
index c2814d99..432c2d75 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -330,7 +330,7 @@ class APIFormField {
           controller: controller,
         ),
         trailing: IconButton(
-          icon: FaIcon(FontAwesomeIcons.qrcode),
+          icon: Icon(Icons.qr_code),
           onPressed: () async {
             var handler = UniqueBarcodeHandler((String hash) {
               controller.text = hash;
diff --git a/lib/barcode.dart b/lib/barcode.dart
index aeeba495..aa1b6384 100644
--- a/lib/barcode.dart
+++ b/lib/barcode.dart
@@ -50,7 +50,7 @@ class BarcodeHandler {
       showSnackIcon(
         L10().barcodeNoMatch,
         success: false,
-        icon: FontAwesomeIcons.qrcode
+        icon: Icons.qr_code,
       );
     }
 
@@ -402,7 +402,7 @@ class UniqueBarcodeHandler extends BarcodeHandler {
     // If the barcode is known, we can"t assign it to the stock item!
     showSnackIcon(
         L10().barcodeInUse,
-        icon: FontAwesomeIcons.qrcode,
+        icon: Icons.qr_code,
         success: false
     );
   }
diff --git a/lib/settings/app_settings.dart b/lib/settings/app_settings.dart
index 07d6dfd3..4a79dd93 100644
--- a/lib/settings/app_settings.dart
+++ b/lib/settings/app_settings.dart
@@ -139,7 +139,7 @@ class _InvenTreeAppSettingsState extends State<InvenTreeAppSettingsWidget> {
             ListTile(
               title: Text(L10().barcodeTones),
               subtitle: Text(L10().soundOnBarcodeAction),
-              leading: FaIcon(FontAwesomeIcons.qrcode),
+              leading: Icon(Icons.qr_code),
               trailing: Switch(
                 value: barcodeSounds,
                 onChanged: setBarcodeSounds,
diff --git a/lib/settings/settings.dart b/lib/settings/settings.dart
index 663c07ea..81581ebd 100644
--- a/lib/settings/settings.dart
+++ b/lib/settings/settings.dart
@@ -6,7 +6,6 @@ import "package:inventree/settings/login.dart";
 import "package:flutter/material.dart";
 import "package:font_awesome_flutter/font_awesome_flutter.dart";
 import "package:inventree/l10.dart";
-import "package:inventree/widget/submit_feedback.dart";
 
 import "package:url_launcher/url_launcher.dart";
 
diff --git a/lib/widget/drawer.dart b/lib/widget/drawer.dart
index bb983c94..969b6470 100644
--- a/lib/widget/drawer.dart
+++ b/lib/widget/drawer.dart
@@ -82,7 +82,7 @@ class InvenTreeDrawer extends StatelessWidget {
                 ListTile(
                   title: Text(L10().scanBarcode),
                   onTap: _scan,
-                  leading: FaIcon(FontAwesomeIcons.barcode),
+                  leading: Icon(Icons.qr_code_scanner),
                 ),
                 ListTile(
                   title: Text(L10().search),
diff --git a/lib/widget/home.dart b/lib/widget/home.dart
index c72ebcae..7a3f37e7 100644
--- a/lib/widget/home.dart
+++ b/lib/widget/home.dart
@@ -205,7 +205,7 @@ class _InvenTreeHomePageState extends State<InvenTreeHomePage> {
       _iconButton(
           context,
           L10().scanBarcode,
-          FontAwesomeIcons.barcode,
+          Icons.qr_code_scanner,
           callback: () {
             _scan(context);
           }
diff --git a/lib/widget/location_display.dart b/lib/widget/location_display.dart
index 138d3f04..4de92c17 100644
--- a/lib/widget/location_display.dart
+++ b/lib/widget/location_display.dart
@@ -372,7 +372,7 @@ List<Widget> detailTiles() {
             ListTile(
               title: Text(L10().barcodeScanInItems),
               leading: FaIcon(FontAwesomeIcons.exchangeAlt, color: COLOR_CLICK),
-              trailing: FaIcon(FontAwesomeIcons.qrcode),
+              trailing: Icon(Icons.qr_code),
               onTap: () {
 
                 var _loc = location;
@@ -400,7 +400,7 @@ List<Widget> detailTiles() {
       ListTile(
         title: Text("Move Stock Location"),
         leading: FaIcon(FontAwesomeIcons.sitemap),
-        trailing: FaIcon(FontAwesomeIcons.qrcode),
+        trailing: Icon(Icons.qr_code),
       )
     );
      */
diff --git a/lib/widget/part_detail.dart b/lib/widget/part_detail.dart
index c31ecffe..1f7c16a1 100644
--- a/lib/widget/part_detail.dart
+++ b/lib/widget/part_detail.dart
@@ -453,7 +453,7 @@ class _PartDisplayState extends RefreshableState<PartDetailWidget> {
       ListTile(
         title: Text(L10().barcodeScanItem),
         leading: FaIcon(FontAwesomeIcons.box),
-        trailing: FaIcon(FontAwesomeIcons.qrcode),
+        trailing: Icon(Icons.qr_code),
         onTap: () {
           // TODO
         },
diff --git a/lib/widget/stock_detail.dart b/lib/widget/stock_detail.dart
index 9c746ad2..f038416f 100644
--- a/lib/widget/stock_detail.dart
+++ b/lib/widget/stock_detail.dart
@@ -798,7 +798,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
       ListTile(
         title: Text(L10().scanIntoLocation),
         leading: FaIcon(FontAwesomeIcons.exchangeAlt, color: COLOR_CLICK),
-        trailing: FaIcon(FontAwesomeIcons.qrcode),
+        trailing: Icon(Icons.qr_code),
         onTap: () {
           Navigator.push(
             context,
@@ -815,8 +815,8 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
       tiles.add(
         ListTile(
           title: Text(L10().barcodeAssign),
-          leading: FaIcon(FontAwesomeIcons.barcode, color: COLOR_CLICK),
-          trailing: FaIcon(FontAwesomeIcons.qrcode),
+          leading: Icon(Icons.qr_code),
+          trailing: Icon(Icons.qr_code_scanner),
           onTap: () {
 
             var handler = UniqueBarcodeHandler((String hash) {
@@ -831,7 +831,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
                   showSnackIcon(
                     L10().barcodeAssigned,
                     success: true,
-                    icon: FontAwesomeIcons.qrcode
+                    icon: Icons.qr_code,
                   );
 
                   refresh();
@@ -850,7 +850,7 @@ class _StockItemDisplayState extends RefreshableState<StockDetailWidget> {
       tiles.add(
         ListTile(
           title: Text(L10().barcodeUnassign),
-          leading: FaIcon(FontAwesomeIcons.barcode, color: COLOR_CLICK),
+          leading: Icon(Icons.qr_code, color: COLOR_CLICK),
           onTap: () {
             _unassignBarcode(context);
           }