diff --git a/lib/api.dart b/lib/api.dart
index 7777b1a4..22b9b288 100644
--- a/lib/api.dart
+++ b/lib/api.dart
@@ -262,12 +262,7 @@ class InvenTreeAPI {
 
     response = await get("", expectedStatusCode: 200);
 
-    // Response was invalid for some reason
-    if (!response.isValid()) {
-      return false;
-    }
-
-    if (response.statusCode != 200) {
+    if (!response.successful()) {
       showStatusCodeError(response.statusCode);
       return false;
     }
@@ -319,11 +314,7 @@ class InvenTreeAPI {
     response = await get(_URL_GET_TOKEN);
 
     // Invalid response
-    if (!response.isValid()) {
-      return false;
-    }
-
-    if (response.statusCode != 200) {
+    if (!response.successful()) {
 
       switch (response.statusCode) {
         case 401:
@@ -419,7 +410,7 @@ class InvenTreeAPI {
 
     var response = await get(_URL_GET_ROLES, expectedStatusCode: 200);
 
-    if (!response.isValid() || response.statusCode != 200) {
+    if (!response.successful()) {
       return;
     }
 
diff --git a/lib/api_form.dart b/lib/api_form.dart
index 51366c13..88ffa885 100644
--- a/lib/api_form.dart
+++ b/lib/api_form.dart
@@ -144,7 +144,7 @@ class APIFormField {
       params: filters,
     );
 
-    if (response.isValid()) {
+    if (response.successful()) {
       initial_data = response.data;
     }
   }
diff --git a/lib/widget/stock_item_test_results.dart b/lib/widget/stock_item_test_results.dart
index bb189980..5c8ce974 100644
--- a/lib/widget/stock_item_test_results.dart
+++ b/lib/widget/stock_item_test_results.dart
@@ -37,6 +37,18 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
   @override
   String getAppBarTitle(BuildContext context) => L10().testResults;
 
+  @override
+  List<Widget> getAppBarActions(BuildContext context) {
+    return [
+      IconButton(
+          icon: FaIcon(FontAwesomeIcons.plusCircle),
+          onPressed: () {
+              addTestResult(context);
+          }
+      ),
+    ];
+  }
+
   @override
   Future<void> request() async {
     await item.getTestTemplates();
@@ -220,14 +232,4 @@ class _StockItemTestResultDisplayState extends RefreshableState<StockItemTestRes
       ).toList()
     );
   }
-
-  @override
-  Widget getFab(BuildContext context) {
-    return FloatingActionButton(
-      child: Icon(FontAwesomeIcons.plus),
-      onPressed: () {
-        addTestResult(context);
-      },
-    );
-  }
 }
\ No newline at end of file
diff --git a/pubspec.lock b/pubspec.lock
index 3d466777..ec8f908f 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -235,13 +235,6 @@ packages:
       url: "https://pub.dartlang.org"
     source: hosted
     version: "2.0.2"
-  flutter_speed_dial:
-    dependency: "direct main"
-    description:
-      name: flutter_speed_dial
-      url: "https://pub.dartlang.org"
-    source: hosted
-    version: "3.0.5"
   flutter_test:
     dependency: "direct dev"
     description: flutter
diff --git a/pubspec.yaml b/pubspec.yaml
index cbfddded..6b006df6 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -28,7 +28,6 @@ dependencies:
   package_info_plus: ^1.0.4               # App information introspection
   device_info_plus: ^2.1.0                # Information about the device
   font_awesome_flutter: ^9.1.0            # FontAwesome icon set
-  flutter_speed_dial: ^3.0.5              # FAB menu elements
   sentry_flutter: 5.0.0                   # Error reporting
   image_picker: ^0.8.3                    # Select or take photos
   file_picker: ^4.0.0                     # Select files from the device