diff --git a/khelo/lib/ui/flow/tournament/detail/tournament_detail_screen.dart b/khelo/lib/ui/flow/tournament/detail/tournament_detail_screen.dart
index 6eec4e8a..21cb19e4 100644
--- a/khelo/lib/ui/flow/tournament/detail/tournament_detail_screen.dart
+++ b/khelo/lib/ui/flow/tournament/detail/tournament_detail_screen.dart
@@ -247,15 +247,10 @@ class _TournamentDetailScreenState
   Widget _backButton(BuildContext context) {
     return actionButton(context,
         onPressed: context.pop,
-        icon: Container(
-          height: 28,
-          width: 28,
-          decoration: BoxDecoration(
-            shape: BoxShape.circle,
-            color: context.colorScheme.containerHighOnSurface
-                .withValues(alpha: 0.4),
-          ),
-          alignment: Alignment.center,
+        icon: CircleAvatar(
+          radius: 16,
+          backgroundColor:
+              context.colorScheme.containerHighOnSurface.withValues(alpha: 0.4),
           child: Icon(
             Platform.isIOS ? Icons.arrow_back_ios_new : Icons.arrow_back,
             size: 20,
@@ -268,15 +263,10 @@ class _TournamentDetailScreenState
     return actionButton(
       context,
       onPressed: onShareTap,
-      icon: Container(
-        height: 28,
-        width: 28,
-        decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color:
-              context.colorScheme.containerHighOnSurface.withValues(alpha: 0.4),
-        ),
-        alignment: Alignment.center,
+      icon: CircleAvatar(
+        radius: 16,
+        backgroundColor:
+            context.colorScheme.containerHighOnSurface.withValues(alpha: 0.4),
         child: Icon(
           Platform.isIOS ? Icons.share : Icons.share_outlined,
           size: 20,
diff --git a/style/lib/button/more_option_button.dart b/style/lib/button/more_option_button.dart
index bb06a7ec..4376d6b0 100644
--- a/style/lib/button/more_option_button.dart
+++ b/style/lib/button/more_option_button.dart
@@ -12,13 +12,9 @@ Widget moreOptionButton(
 }) {
   return actionButton(context,
       onPressed: onPressed,
-      icon: Container(
-        height: 28,
-        width: 28,
-        decoration: BoxDecoration(
-          shape: BoxShape.circle,
-          color: backgroundColor ?? Colors.transparent,
-        ),
+      icon: CircleAvatar(
+        radius: 16,
+        backgroundColor: backgroundColor ?? Colors.transparent,
         child: Icon(
           Platform.isIOS ? Icons.more_horiz_rounded : Icons.more_vert_rounded,
           size: size,