diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ecfe23c8e7c01a1edf38ada32400e5c237cf5a6..9d69ee037e691ffee9a76cdfd430eac37ce6fa4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.1
+
+-   Fix top bar buttons color
+
 ## 0.6.0
 
 -   Add application navigation widgets
diff --git a/lib/nav/application_navigation_definition.dart b/lib/nav/application_navigation_definition.dart
index 5e5809e69b950606468eeb35072df81f3925b301..9f021ae63c4f60e5fce0bc736cd6d8833e5adeaa 100644
--- a/lib/nav/application_navigation_definition.dart
+++ b/lib/nav/application_navigation_definition.dart
@@ -75,6 +75,18 @@ class AppBarButton {
     this.onPressed,
     this.onLongPress,
   });
+
+  Widget render(BuildContext context) {
+    return ElevatedButton(
+      onPressed: () => onPressed!(context),
+      onLongPress: () => onLongPress!(context),
+      style: ElevatedButton.styleFrom(
+        shape: const CircleBorder(),
+        iconColor: Theme.of(context).colorScheme.onSurface,
+      ),
+      child: icon,
+    );
+  }
 }
 
 /// Navigation configuration for application
diff --git a/lib/nav/ui/global_app_bar.dart b/lib/nav/ui/global_app_bar.dart
index 86d42a47f95dd6aed83c05837dc2d7bea998a3fe..7aaab29e446517c29664ae97c9b8c5e862ec45ab 100644
--- a/lib/nav/ui/global_app_bar.dart
+++ b/lib/nav/ui/global_app_bar.dart
@@ -71,12 +71,7 @@ class GlobalAppBar extends StatelessWidget implements PreferredSizeWidget {
     // add buttons
     final List<AppBarButton> buttons = builder(context);
     for (AppBarButton button in buttons) {
-      menuActions.add(ElevatedButton(
-        onPressed: () => button.onPressed!(context),
-        onLongPress: () => button.onLongPress!(context),
-        style: ElevatedButton.styleFrom(shape: const CircleBorder()),
-        child: button.icon,
-      ));
+      menuActions.add(button.render(context));
     }
 
     // standard right pushed "quit activity" button
diff --git a/pubspec.yaml b/pubspec.yaml
index 883ba0bd428ba33f3bc40c91c2207021a0979bd0..2bff66da2d77bdcf60627004d4c788ec0b818ebe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -3,7 +3,7 @@ description: "Flutter custom toolbox for org.benoitharrault.* projects."
 
 publish_to: "none"
 
-version: 0.6.0
+version: 0.6.1
 
 homepage: https://git.harrault.fr/android/flutter-toolbox