diff --git a/lib/screens/shared/user_icon.dart b/lib/screens/shared/user_icon.dart
index 3e2c06a..e42bcdd 100644
--- a/lib/screens/shared/user_icon.dart
+++ b/lib/screens/shared/user_icon.dart
@@ -57,7 +57,7 @@ class UserIcon extends ConsumerWidget {
               alignment: Alignment.center,
               children: [
                 ClipRRect(
-                  borderRadius: FladderTheme.defaultShape.borderRadius,
+                  borderRadius: FladderTheme.smallShape.borderRadius,
                   child: CachedNetworkImage(
                     imageUrl: user?.avatar ?? "",
                     progressIndicatorBuilder: (context, url, progress) => placeHolder(),
diff --git a/lib/widgets/shared/selectable_icon_button.dart b/lib/widgets/shared/selectable_icon_button.dart
index 725bcf8..5480aa8 100644
--- a/lib/widgets/shared/selectable_icon_button.dart
+++ b/lib/widgets/shared/selectable_icon_button.dart
@@ -53,10 +53,9 @@ class _SelectableIconButtonState extends ConsumerState<SelectableIconButton> {
       child: ElevatedButton(
         style: ButtonStyle(
           side: buttonState,
-          elevation: WidgetStatePropertyAll(
-              widget.backgroundColor != null ? (widget.backgroundColor!.a < 1 ? 0 : null) : null),
+          elevation: const WidgetStatePropertyAll(0),
           backgroundColor: WidgetStatePropertyAll(
-              widget.backgroundColor ?? (widget.selected ? theme.primaryContainer : theme.surfaceContainerHigh)),
+              widget.backgroundColor ?? (widget.selected ? theme.primaryContainer : theme.surfaceContainerLow)),
           iconColor: WidgetStatePropertyAll(widget.iconColor ?? (widget.selected ? theme.onPrimaryContainer : null)),
           foregroundColor:
               WidgetStatePropertyAll(widget.iconColor ?? (widget.selected ? theme.onPrimaryContainer : null)),