diff --git a/lib/core/search_delegate.dart b/lib/core/search_delegate.dart
index c479f95..b22c57e 100644
--- a/lib/core/search_delegate.dart
+++ b/lib/core/search_delegate.dart
@@ -1,4 +1,5 @@
 import 'package:flutter/material.dart';
+import 'theme.dart';
 
 class ExerciseSearchDelegate extends SearchDelegate {
   final List<Map<String, dynamic>> records;
@@ -13,9 +14,10 @@ class ExerciseSearchDelegate extends SearchDelegate {
 
   @override
   List<Widget> buildActions(BuildContext context) {
+    final ThemeData theme = Theme.of(context);
     return [
       IconButton(
-        icon: Icon(Icons.clear),
+        icon: Icon(Icons.clear, color: theme.iconTheme.color),
         onPressed: () {
           query = '';
         },
@@ -25,8 +27,9 @@ class ExerciseSearchDelegate extends SearchDelegate {
 
   @override
   Widget buildLeading(BuildContext context) {
+    final ThemeData theme = Theme.of(context);
     return IconButton(
-      icon: Icon(Icons.arrow_back),
+      icon: Icon(Icons.arrow_back, color: theme.iconTheme.color),
       onPressed: () {
         close(context, null);
       },
diff --git a/lib/widgets/records.dart b/lib/widgets/records.dart
index 24ab490..afbebdb 100644
--- a/lib/widgets/records.dart
+++ b/lib/widgets/records.dart
@@ -133,6 +133,7 @@ class _RecordsTabState extends State<RecordsTab> {
     final isDarkMode = Theme.of(context).brightness == Brightness.dark;
     final arrowColor = isDarkMode ? Colors.purple : null;
     final textColor = isDarkMode ? Colors.white : Colors.black;
+    final ThemeData theme = Theme.of(context);
 
     return Scaffold(
       appBar: AppBar(
@@ -151,14 +152,14 @@ class _RecordsTabState extends State<RecordsTab> {
             : Text('Records'),
         leading: _isSearching
             ? IconButton(
-                icon: Icon(Icons.arrow_back),
+                icon: Icon(Icons.arrow_back, color: theme.iconTheme.color),
                 onPressed: _stopSearch,
               )
             : null,
         actions: _isSearching
             ? [
                 IconButton(
-                  icon: Icon(Icons.clear),
+                  icon: Icon(Icons.clear, color: theme.iconTheme.color),
                   onPressed: () {
                     _searchController.clear();
                     _filterRecords('');
@@ -167,7 +168,7 @@ class _RecordsTabState extends State<RecordsTab> {
               ]
             : [
                 IconButton(
-                  icon: Icon(Icons.search),
+                  icon: Icon(Icons.search, color: theme.iconTheme.color),
                   onPressed: _startSearch,
                 ),
               ],
diff --git a/pubspec.yaml b/pubspec.yaml
index 541db0a..2cf71f4 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -16,7 +16,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
 # In Windows, build-name is used as the major, minor, and patch parts
 # of the product and file versions while build-number is used as the build suffix.
-version: 0.8.5+41
+version: 0.8.6+42
 
 environment:
   sdk: '>=3.4.3 <4.0.0'