diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt
index 95d1caad8..61bca4d73 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/common/FavoritesTagSelector.kt
@@ -135,7 +135,6 @@ fun FavoritesTagSelector(
                 if (editButton) {
                     FilledTonalIconButton(
                         onClick = { sheetManager.showEditFavoritesSheet() },
-                        shapes = IconButtonDefaults.shapes(),
                     ) {
                         Icon(
                             painter = painterResource(R.drawable.edit_24px),
@@ -218,7 +217,6 @@ fun FavoritesTagSelector(
                     if (editButton) {
                         FilledTonalIconButton(
                             onClick = { sheetManager.showEditFavoritesSheet() },
-                            shapes = IconButtonDefaults.shapes(),
                         ) {
                             Icon(
                                 painter = painterResource(R.drawable.edit_24px),
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt
index bab3322b6..1c8f051ed 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/LauncherSearchBar.kt
@@ -86,7 +86,6 @@ fun LauncherSearchBar(
                     IconToggleButton(
                         checked = sheetManager.hiddenItemsSheetShown.value,
                         onCheckedChange = { if (it) sheetManager.showHiddenItemsSheet() },
-                        shapes = IconButtonDefaults.toggleableShapes(),
                     ) {
                         Icon(
                             painter = painterResource(
@@ -107,7 +106,6 @@ fun LauncherSearchBar(
                         onCheckedChange = {
                             searchVM.showFilters.value = it
                         },
-                        shapes = IconButtonDefaults.toggleableShapes(),
                     ) {
                         Box {
                             Icon(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt
index 309ab4b5f..7eff1501e 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/searchbar/SearchBarMenu.kt
@@ -49,7 +49,6 @@ fun RowScope.SearchBarMenu(
                 if (searchBarValue.isNotBlank()) onInputClear()
                 else showOverflowMenu = true
             },
-            shapes = IconButtonDefaults.shapes()
         ) {
             Icon(
                 painter = rememberAnimatedVectorPainter(
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
index cce7b9205..2198e3446 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/launcher/widgets/music/MusicWidget.kt
@@ -329,7 +329,6 @@ fun MusicWidget(widget: MusicWidget) {
                             onClick = {
                                 viewModel.skipPrevious()
                             },
-                            shapes = IconButtonDefaults.shapes(),
                         ) {
                             Icon(
                                 painter = painterResource(R.drawable.skip_previous_24px),
@@ -347,7 +346,6 @@ fun MusicWidget(widget: MusicWidget) {
                 ) {
                     FilledTonalIconToggleButton(
                         onCheckedChange = { viewModel.togglePause() },
-                        shapes = IconButtonDefaults.toggleableShapes(),
                         checked = playbackState == PlaybackState.Playing
                     ) {
                         AnimatedContent(
@@ -384,7 +382,6 @@ fun MusicWidget(widget: MusicWidget) {
                             onClick = {
                                 viewModel.skipNext()
                             },
-                            shapes = IconButtonDefaults.shapes(),
                         ) {
                             Icon(
                                 painter = painterResource(R.drawable.skip_next_24px),
@@ -485,7 +482,6 @@ fun CustomActions(
                 onClick = {
                     onActionSelected(action)
                 },
-                shapes = IconButtonDefaults.shapes(),
             ) {
                 CustomActionIcon(action, playerPackage)
             }
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemePreferenceCategory.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemePreferenceCategory.kt
index e094077ce..5c9d87fd2 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemePreferenceCategory.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/colorscheme/ColorSchemePreferenceCategory.kt
@@ -55,7 +55,6 @@ fun ColorSchemePreferenceCategory(
                 horizontalArrangement = Arrangement.spacedBy(ButtonGroupDefaults.ConnectedSpaceBetween),
             ) {
                 FilledTonalIconToggleButton(
-                    shapes = IconButtonDefaults.toggleableShapes(),
                     checked = !darkMode,
                     onCheckedChange = { onDarkModeChanged(false) }
                 ) {
@@ -65,7 +64,6 @@ fun ColorSchemePreferenceCategory(
                     )
                 }
                 FilledTonalIconToggleButton(
-                    shapes = IconButtonDefaults.toggleableShapes(),
                     checked = darkMode,
                     onCheckedChange = { onDarkModeChanged(true) }
                 ) {
diff --git a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/typography/TypographySettingsScreen.kt b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/typography/TypographySettingsScreen.kt
index 2922d827a..811fdbf71 100644
--- a/app/ui/src/main/java/de/mm20/launcher2/ui/settings/typography/TypographySettingsScreen.kt
+++ b/app/ui/src/main/java/de/mm20/launcher2/ui/settings/typography/TypographySettingsScreen.kt
@@ -1074,7 +1074,6 @@ private fun TextStylePreference(
                                 onCheckedChange = {
                                     if (it) fontFamily = name
                                 },
-                                shapes = IconButtonDefaults.toggleableShapes(),
                             ) {
                                 Text(
                                     text = previewTexts.ExtraShort,