fix: Always light status bar

2025-07-15 01:05:27 +08:00 · 2025-07-11 21:57:03 +07:00
25 changed files with 85 additions and 663 deletions
--- a/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/AppScaffold.kt
@ -6,6 +6,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
@ -21,7 +22,6 @@ import androidx.compose.ui.input.nestedscroll.nestedScroll
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -69,11 +69,7 @@ fun AppTopBar(
        scrollBehavior = scrollBehavior,
        navigationIcon = {
            if (onBackClick != null) {
-                TooltipIconButton(
-                    modifier = Modifier,
-                    onClick = onBackClick,
-                    tooltip = stringResource(R.string.back),
-                ) {
+                IconButton(onClick = onBackClick) {
                    backIcon()
                }
            }
@ -112,11 +108,7 @@ fun AppTopBar(
        scrollBehavior = scrollBehavior,
        navigationIcon = {
            if (onBackClick != null) {
-                TooltipIconButton(
-                    modifier = Modifier,
-                    onClick = onBackClick,
-                    tooltip = stringResource(R.string.back),
-                ) {
+                IconButton(onClick = onBackClick) {
                    backIcon()
                }
            }
--- a/app/src/main/java/app/revanced/manager/ui/component/ArrowButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ArrowButton.kt
@ -4,13 +4,13 @@ import androidx.compose.animation.core.animateFloatAsState
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.KeyboardArrowUp
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.ui.Modifier
 import androidx.compose.ui.draw.rotate
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@Composable
 fun ArrowButton(
@ -27,11 +27,7 @@ fun ArrowButton(
    )

    onClick?.let {
-        TooltipIconButton(
-            modifier = Modifier,
-            onClick = it,
-            tooltip = stringResource(description),
-        ) {
+        IconButton(onClick = it) {
            Icon(
                imageVector = Icons.Filled.KeyboardArrowUp,
                contentDescription = stringResource(description),
--- a/app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/ExceptionViewerDialog.kt
@ -9,6 +9,7 @@ import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material.icons.outlined.Share
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@ -17,7 +18,6 @@ import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.ui.component.bundle.BundleTopBar
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -39,8 +39,7 @@ fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {
                        )
                    },
                    actions = {
-                        TooltipIconButton(
-                            modifier = Modifier,
+                        IconButton(
                            onClick = {
                                val sendIntent: Intent = Intent().apply {
                                    action = Intent.ACTION_SEND
@ -53,8 +52,7 @@ fun ExceptionViewerDialog(text: String, onDismiss: () -> Unit) {

                                val shareIntent = Intent.createChooser(sendIntent, null)
                                context.startActivity(shareIntent)
-                            },
-                            tooltip = stringResource(R.string.share),
+                            }
                        ) {
                            Icon(
                                Icons.Outlined.Share,
--- a/app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/FullscreenDialog.kt
@ -1,6 +1,7 @@
 package app.revanced.manager.ui.component

 import android.view.WindowManager
+import androidx.compose.foundation.isSystemInDarkTheme
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.ui.graphics.Color
@ -9,6 +10,7 @@ import androidx.compose.ui.platform.LocalView
 import androidx.compose.ui.window.Dialog
 import androidx.compose.ui.window.DialogProperties
 import androidx.compose.ui.window.DialogWindowProvider
+import androidx.core.view.WindowCompat

 private val properties = DialogProperties(
    usePlatformDefaultWidth = false,
@ -22,11 +24,17 @@ fun FullscreenDialog(onDismissRequest: () -> Unit, content: @Composable () -> Un
        onDismissRequest = onDismissRequest,
        properties = properties
    ) {
-        val window = (LocalView.current.parent as DialogWindowProvider).window
-        LaunchedEffect(Unit) {
+        val view = LocalView.current
+        val isDarkTheme = isSystemInDarkTheme()
+        LaunchedEffect(isDarkTheme) {
+            val window = (view.parent as DialogWindowProvider).window
            window.statusBarColor = Color.Transparent.toArgb()
            window.navigationBarColor = Color.Transparent.toArgb()
            window.addFlags(WindowManager.LayoutParams.FLAG_LAYOUT_NO_LIMITS)
+
+            val insetsController = WindowCompat.getInsetsController(window, view)
+            insetsController.isAppearanceLightStatusBars = !isDarkTheme
+            insetsController.isAppearanceLightNavigationBars = !isDarkTheme
        }

        content()
--- a/app/src/main/java/app/revanced/manager/ui/component/NotificationCard.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/NotificationCard.kt
@ -14,6 +14,7 @@ import androidx.compose.material.icons.outlined.Close
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.runtime.Composable
@ -24,7 +25,6 @@ import androidx.compose.ui.graphics.vector.ImageVector
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
 import app.revanced.manager.R
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@Composable
 fun NotificationCard(
@ -138,11 +138,7 @@ fun NotificationCard(
                )
            }
            if (onDismiss != null) {
-                TooltipIconButton(
-                    modifier = modifier,
-                    onClick = onDismiss,
-                    tooltip = stringResource(R.string.close),
-                ) {
+                IconButton(onClick = onDismiss) {
                    Icon(
                        imageVector = Icons.Outlined.Close,
                        contentDescription = stringResource(R.string.close),
--- a/app/src/main/java/app/revanced/manager/ui/component/PasswordField.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/PasswordField.kt
@ -5,6 +5,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Visibility
 import androidx.compose.material.icons.outlined.VisibilityOff
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
@ -18,7 +19,6 @@ import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.text.input.PasswordVisualTransformation
 import androidx.compose.ui.text.input.VisualTransformation
 import app.revanced.manager.R
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@Composable
 fun PasswordField(modifier: Modifier = Modifier, value: String, onValueChange: (String) -> Unit, label: @Composable (() -> Unit)? = null, placeholder: @Composable (() -> Unit)? = null) {
@ -33,15 +33,9 @@ fun PasswordField(modifier: Modifier = Modifier, value: String, onValueChange: (
        label = label,
        modifier = modifier,
        trailingIcon = {
-            TooltipIconButton(
-                modifier = Modifier,
-                onClick = {
-                    visible = !visible
-                },
-                tooltip = if (visible) stringResource(R.string.show_password_field) else stringResource(
-                    R.string.hide_password_field
-                ),
-            ) {
+            IconButton(onClick = {
+                visible = !visible
+            }) {
                val (icon, description) = remember(visible) {
                    if (visible) Icons.Outlined.VisibilityOff to R.string.hide_password_field else Icons.Outlined.Visibility to R.string.show_password_field
                }
--- a/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/SearchView.kt
@ -5,6 +5,7 @@ import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.automirrored.filled.ArrowBack
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.SearchBar
 import androidx.compose.material3.SearchBarColors
@ -18,7 +19,6 @@ import androidx.compose.ui.focus.focusRequester
 import androidx.compose.ui.platform.LocalSoftwareKeyboardController
 import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -48,11 +48,7 @@ fun SearchView(
                onExpandedChange = onActiveChange,
                placeholder = placeholder,
                leadingIcon = {
-                    TooltipIconButton(
-                        modifier = Modifier,
-                        tooltip = stringResource(R.string.back),
-                        onClick = { onActiveChange(false) }
-                    ) {
+                    IconButton(onClick = { onActiveChange(false) }) {
                        Icon(
                            Icons.AutoMirrored.Filled.ArrowBack,
                            stringResource(R.string.back)
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleInformationDialog.kt
@ -22,7 +22,6 @@ import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.isDefaul
 import app.revanced.manager.domain.bundles.PatchBundleSource.Extensions.nameState
 import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.FullscreenDialog
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import kotlinx.coroutines.launch
 import org.koin.compose.koinInject

@ -74,11 +73,7 @@ fun BundleInformationDialog(
                    },
                    actions = {
                        if (!bundle.isDefault) {
-                            TooltipIconButton(
-                                modifier = Modifier,
-                                onClick = onDeleteRequest,
-                                tooltip = stringResource(R.string.delete),
-                            ) {
+                            IconButton(onClick = onDeleteRequest) {
                                Icon(
                                    Icons.Outlined.DeleteOutline,
                                    stringResource(R.string.delete)
@ -86,11 +81,7 @@ fun BundleInformationDialog(
                            }
                        }
                        if (!isLocal && hasNetwork) {
-                            TooltipIconButton(
-                                modifier = Modifier,
-                                onClick = onUpdate,
-                                tooltip = stringResource(R.string.refresh),
-                            ) {
+                            IconButton(onClick = onUpdate) {
                                Icon(
                                    Icons.Outlined.Update,
                                    stringResource(R.string.refresh)
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleTopBar.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/BundleTopBar.kt
@ -2,6 +2,7 @@ package app.revanced.manager.ui.component.bundle

 import androidx.compose.foundation.layout.RowScope
 import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBar
@ -9,11 +10,7 @@ import androidx.compose.material3.TopAppBarDefaults
 import androidx.compose.material3.TopAppBarScrollBehavior
 import androidx.compose.material3.surfaceColorAtElevation
 import androidx.compose.runtime.Composable
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.unit.dp
-import app.revanced.manager.R
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton

@OptIn(ExperimentalMaterial3Api::class)
@Composable
@ -36,11 +33,7 @@ fun BundleTopBar(
        scrollBehavior = scrollBehavior,
        navigationIcon = {
            if (onBackClick != null) {
-                TooltipIconButton(
-                    modifier = Modifier,
-                    tooltip = stringResource(R.string.back),
-                    onClick = onBackClick
-                ) {
+                IconButton(onClick = onBackClick) {
                    backIcon()
                }
            }
--- a/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/bundle/ImportBundleDialog.kt
@ -189,7 +189,6 @@ fun ImportBundleStep(
                        },
                        supportingContent = { Text(stringResource(if (patchBundle != null) R.string.file_field_set else R.string.file_field_not_set)) },
                        trailingContent = {
-                            // TODO: Determine if this button should be [TooltipWrap]'ped
                            IconButton(onClick = launchPatchActivity) {
                                Icon(imageVector = Icons.Default.Topic, contentDescription = null)
                            }
--- a/app/src/main/java/app/revanced/manager/ui/component/haptics/HapticSmallFloatingActionButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/haptics/HapticSmallFloatingActionButton.kt
@ -1,38 +0,0 @@
-package app.revanced.manager.ui.component.haptics
-
-import android.view.HapticFeedbackConstants
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.material3.FloatingActionButton
-import androidx.compose.material3.FloatingActionButtonDefaults
-import androidx.compose.material3.FloatingActionButtonElevation
-import androidx.compose.material3.SmallFloatingActionButton
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import app.revanced.manager.util.withHapticFeedback
-
-@Composable
-fun HapticSmallFloatingActionButton (
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    shape: Shape = FloatingActionButtonDefaults.smallShape,
-    containerColor: Color = FloatingActionButtonDefaults.containerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    content: @Composable () -> Unit,
-) {
-    SmallFloatingActionButton(
-        onClick = onClick.withHapticFeedback(HapticFeedbackConstants.VIRTUAL_KEY),
-        modifier = modifier,
-        shape = shape,
-        containerColor = containerColor,
-        contentColor = contentColor,
-        elevation = elevation,
-        interactionSource = interactionSource,
-        content = content
-    )
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/patches/OptionFields.kt
@ -14,6 +14,7 @@ import androidx.compose.foundation.layout.fillMaxHeight
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.lazy.LazyListItemInfo
 import androidx.compose.foundation.lazy.items
 import androidx.compose.foundation.lazy.itemsIndexed
 import androidx.compose.foundation.lazy.rememberLazyListState
@ -67,18 +68,19 @@ import app.revanced.manager.ui.component.LongInputDialog
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticRadioButton
 import app.revanced.manager.ui.component.haptics.HapticSwitch
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.util.isScrollingUp
 import app.revanced.manager.util.mutableStateSetOf
 import app.revanced.manager.util.saver.snapshotStateListSaver
 import app.revanced.manager.util.saver.snapshotStateSetSaver
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.transparentListItemColors
+import kotlinx.coroutines.CoroutineScope
 import kotlinx.parcelize.Parcelize
 import org.koin.compose.koinInject
 import org.koin.core.component.KoinComponent
 import org.koin.core.component.get
 import sh.calvin.reorderable.ReorderableItem
+import sh.calvin.reorderable.rememberReorderableLazyColumnState
 import sh.calvin.reorderable.rememberReorderableLazyListState
 import java.io.Serializable
 import kotlin.random.Random
@ -111,11 +113,7 @@ private interface OptionEditor<T : Any> {

    @Composable
    fun ListItemTrailingContent(scope: OptionEditorScope<T>) {
-        TooltipIconButton(
-            modifier = Modifier,
-            tooltip = stringResource(R.string.edit),
-            onClick = { clickAction(scope) }
-        ) {
+        IconButton(onClick = { clickAction(scope) }) {
            Icon(Icons.Outlined.Edit, stringResource(R.string.edit))
        }
    }
@ -251,12 +249,13 @@ private object StringOptionEditor : OptionEditor<String> {
                    },
                    trailingIcon = {
                        var showDropdownMenu by rememberSaveable { mutableStateOf(false) }
-                        TooltipIconButton(
-                            modifier = Modifier,
-                            tooltip = stringResource(R.string.string_option_menu_description),
+                        IconButton(
                            onClick = { showDropdownMenu = true }
                        ) {
-                            Icon(Icons.Outlined.MoreVert, stringResource(R.string.string_option_menu_description))
+                            Icon(
+                                Icons.Outlined.MoreVert,
+                                stringResource(R.string.string_option_menu_description)
+                            )
                        }

                        DropdownMenu(
@ -552,9 +551,7 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                        },
                        actions = {
                            if (deleteMode) {
-                                TooltipIconButton(
-                                    modifier = Modifier,
-                                    tooltip = stringResource(R.string.select_deselect_all),
+                                IconButton(
                                    onClick = {
                                        if (items.size == deletionTargets.size) deletionTargets.clear()
                                        else deletionTargets.addAll(items.map { it.key })
@ -565,9 +562,7 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                        stringResource(R.string.select_deselect_all)
                                    )
                                }
-                                TooltipIconButton(
-                                    modifier = Modifier,
-                                    tooltip = stringResource(R.string.delete),
+                                IconButton(
                                    onClick = {
                                        items.removeIf { it.key in deletionTargets }
                                        deletionTargets.clear()
@ -580,15 +575,8 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                    )
                                }
                            } else {
-                                TooltipIconButton(
-                                    modifier = Modifier,
-                                    tooltip = stringResource(R.string.reset),
-                                    onClick = items::clear
-                                ) {
-                                    Icon(
-                                        Icons.Outlined.Restore,
-                                        stringResource(R.string.reset)
-                                    )
+                                IconButton(onClick = items::clear) {
+                                    Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                                }
                            }
                        }
@ -655,10 +643,9 @@ private class ListOptionEditor<T : Serializable>(private val elementEditor: Opti
                                    ),
                                    tonalElevation = if (deleteMode && item.key in deletionTargets) 8.dp else 0.dp,
                                    leadingContent = {
-                                        TooltipIconButton(
+                                        IconButton(
                                            modifier = Modifier.draggableHandle(interactionSource = interactionSource),
-                                            tooltip = stringResource(R.string.delete),
-                                            onClick = { }
+                                            onClick = {},
                                        ) {
                                            Icon(
                                                Icons.Filled.DragHandle,
--- a/app/src/main/java/app/revanced/manager/ui/component/settings/IntegerItem.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/settings/IntegerItem.kt
@ -5,6 +5,7 @@ import androidx.compose.foundation.clickable
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.outlined.Edit
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@ -16,7 +17,6 @@ import androidx.compose.ui.res.stringResource
 import app.revanced.manager.R
 import app.revanced.manager.domain.manager.base.Preference
 import app.revanced.manager.ui.component.IntInputDialog
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch

@ -65,14 +65,10 @@ fun IntegerItem(
        headlineContent = stringResource(headline),
        supportingContent = stringResource(description),
        trailingContent = {
-            TooltipIconButton(
-                modifier = modifier,
-                onClick = { dialogOpen = true },
-                tooltip = stringResource(R.string.edit),
-            ) {
+            IconButton(onClick = { dialogOpen = true }) {
                Icon(
-                    imageVector = Icons.Outlined.Edit,
-                    contentDescription = stringResource(R.string.edit),
+                    Icons.Outlined.Edit,
+                    contentDescription = stringResource(R.string.edit)
                )
            }
        }
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipFloatingActionButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipFloatingActionButton.kt
@ -1,109 +0,0 @@
-package app.revanced.manager.ui.component.tooltip
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButtonDefaults
-import androidx.compose.material3.FloatingActionButtonElevation
-import androidx.compose.material3.TooltipDefaults
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.window.PopupPositionProvider
-import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
-
-/**
- * [HapticFloatingActionButton] with tooltip-specific params.
- *
- * @param tooltip [String] text to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [HapticFloatingActionButton]
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TooltipFloatingActionButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    shape: Shape = FloatingActionButtonDefaults.shape,
-    containerColor: Color = FloatingActionButtonDefaults.containerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    tooltip: String,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable (() -> Unit)
-) {
-    TooltipWrap(
-        modifier = modifier,
-        tooltip = tooltip,
-        positionProvider = positionProvider,
-        haptic = haptic,
-        hapticFeedbackType = hapticFeedbackType,
-    ) {
-        HapticFloatingActionButton(
-            onClick = onClick,
-            modifier = modifier,
-            shape = shape,
-            containerColor = containerColor,
-            contentColor = contentColor,
-            elevation = elevation,
-            interactionSource = interactionSource,
-            content = content,
-        )
-    }
-}
-
-/**
- * [HapticFloatingActionButton] with tooltip-specific params.
- *
- * @param tooltip [Int] or `id` string resource to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [HapticFloatingActionButton]
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TooltipFloatingActionButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    shape: Shape = FloatingActionButtonDefaults.shape,
-    containerColor: Color = FloatingActionButtonDefaults.containerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    @StringRes tooltip: Int,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable (() -> Unit)
-) {
-    TooltipWrap(
-        modifier = modifier,
-        tooltip = tooltip,
-        positionProvider = positionProvider,
-        haptic = haptic,
-        hapticFeedbackType = hapticFeedbackType,
-    ) {
-        HapticFloatingActionButton(
-            onClick = onClick,
-            modifier = modifier,
-            shape = shape,
-            containerColor = containerColor,
-            contentColor = contentColor,
-            elevation = elevation,
-            interactionSource = interactionSource,
-            content = content,
-        )
-    }
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipIconButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipIconButton.kt
@ -1,98 +0,0 @@
-package app.revanced.manager.ui.component.tooltip
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.IconButton
-import androidx.compose.material3.IconButtonColors
-import androidx.compose.material3.IconButtonDefaults
-import androidx.compose.material3.TooltipDefaults
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.window.PopupPositionProvider
-
-/**
- * [IconButton] with tooltip-specific params.
- *
- * @param tooltip [String] text to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [IconButton]
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TooltipIconButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    colors: IconButtonColors = IconButtonDefaults.iconButtonColors(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    tooltip: String,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable (() -> Unit),
-) {
-    TooltipWrap(
-        modifier = modifier,
-        tooltip = tooltip,
-        positionProvider = positionProvider,
-        haptic = haptic,
-        hapticFeedbackType = hapticFeedbackType,
-    ) {
-        IconButton(
-            onClick = onClick,
-            modifier = modifier,
-            enabled = enabled,
-            colors = colors,
-            interactionSource = interactionSource,
-            content = content,
-        )
-    }
-}
-
-/**
- * [IconButton] with tooltip-specific params.
- *
- * @param tooltip [Int] or `id` string resource to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [IconButton]
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TooltipIconButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    enabled: Boolean = true,
-    colors: IconButtonColors = IconButtonDefaults.iconButtonColors(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    @StringRes tooltip: Int,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable (() -> Unit),
-) {
-    TooltipWrap(
-        modifier = modifier,
-        tooltip = tooltip,
-        positionProvider = positionProvider,
-        haptic = haptic,
-        hapticFeedbackType = hapticFeedbackType,
-    ) {
-        IconButton(
-            onClick = onClick,
-            modifier = modifier,
-            enabled = enabled,
-            colors = colors,
-            interactionSource = interactionSource,
-            content = content,
-        )
-    }
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipSmallFloatingActionButton.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipSmallFloatingActionButton.kt
@ -1,109 +0,0 @@
-package app.revanced.manager.ui.component.tooltip
-
-import androidx.annotation.StringRes
-import androidx.compose.foundation.interaction.MutableInteractionSource
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.FloatingActionButtonDefaults
-import androidx.compose.material3.FloatingActionButtonElevation
-import androidx.compose.material3.TooltipDefaults
-import androidx.compose.material3.contentColorFor
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.remember
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.graphics.Shape
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.window.PopupPositionProvider
-import app.revanced.manager.ui.component.haptics.HapticSmallFloatingActionButton
-
-/**
- * [HapticSmallFloatingActionButton] with tooltip-specific params.
- *
- * @param tooltip [String] text to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [HapticSmallFloatingActionButton]
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TooltipSmallFloatingActionButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    shape: Shape = FloatingActionButtonDefaults.smallShape,
-    containerColor: Color = FloatingActionButtonDefaults.containerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    tooltip: String,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable (() -> Unit)
-) {
-    TooltipWrap(
-        modifier = modifier,
-        tooltip = tooltip,
-        positionProvider = positionProvider,
-        haptic = haptic,
-        hapticFeedbackType = hapticFeedbackType,
-    ) {
-        HapticSmallFloatingActionButton(
-            onClick = onClick,
-            modifier = modifier,
-            shape = shape,
-            containerColor = containerColor,
-            contentColor = contentColor,
-            elevation = elevation,
-            interactionSource = interactionSource,
-            content = content,
-        )
-    }
-}
-
-/**
- * [HapticSmallFloatingActionButton] with tooltip-specific params.
- *
- * @param tooltip [Int] or `id` string resource to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [HapticSmallFloatingActionButton]
- */
-@OptIn(ExperimentalMaterial3Api::class)
-@Composable
-fun TooltipSmallFloatingActionButton(
-    onClick: () -> Unit,
-    modifier: Modifier = Modifier,
-    shape: Shape = FloatingActionButtonDefaults.smallShape,
-    containerColor: Color = FloatingActionButtonDefaults.containerColor,
-    contentColor: Color = contentColorFor(containerColor),
-    elevation: FloatingActionButtonElevation = FloatingActionButtonDefaults.elevation(),
-    interactionSource: MutableInteractionSource = remember { MutableInteractionSource() },
-    @StringRes tooltip: Int,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable (() -> Unit)
-) {
-    TooltipWrap(
-        modifier = modifier,
-        tooltip = tooltip,
-        positionProvider = positionProvider,
-        haptic = haptic,
-        hapticFeedbackType = hapticFeedbackType,
-    ) {
-        HapticSmallFloatingActionButton(
-            onClick = onClick,
-            modifier = modifier,
-            shape = shape,
-            containerColor = containerColor,
-            contentColor = contentColor,
-            elevation = elevation,
-            interactionSource = interactionSource,
-            content = content,
-        )
-    }
-}
--- a/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipWrap.kt
+++ b/app/src/main/java/app/revanced/manager/ui/component/tooltip/TooltipWrap.kt
@ -1,96 +0,0 @@
-package app.revanced.manager.ui.component.tooltip
-
-import androidx.annotation.StringRes
-import androidx.compose.material3.ExperimentalMaterial3Api
-import androidx.compose.material3.PlainTooltip
-import androidx.compose.material3.Text
-import androidx.compose.material3.TooltipBox
-import androidx.compose.material3.TooltipDefaults
-import androidx.compose.material3.rememberTooltipState
-import androidx.compose.runtime.Composable
-import androidx.compose.runtime.LaunchedEffect
-import androidx.compose.ui.Modifier
-import androidx.compose.ui.hapticfeedback.HapticFeedbackType
-import androidx.compose.ui.platform.LocalHapticFeedback
-import androidx.compose.ui.res.stringResource
-import androidx.compose.ui.window.PopupPositionProvider
-
-/**
- * Wraps a composable with a tooltip.
- *
- * @param modifier the [Modifier] to applied to Tooltip.
- * @param tooltip [String] text to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param content The composable UI to wrapped with.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [TooltipBox]
- */
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun TooltipWrap(
-    modifier: Modifier,
-    tooltip: String,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable () -> Unit
-) {
-    val tooltipState = rememberTooltipState()
-    val localHaptic = LocalHapticFeedback.current
-
-    LaunchedEffect(tooltipState.isVisible) {
-        if (tooltipState.isVisible && haptic) {
-            localHaptic.performHapticFeedback(hapticFeedbackType)
-        }
-    }
-
-    TooltipBox(
-        modifier = modifier,
-        positionProvider = positionProvider,
-        tooltip = { PlainTooltip { Text(tooltip) } },
-        state = tooltipState,
-        content = content,
-    )
-}
-
-/**
- * Wraps a composable with a tooltip.
- *
- * @param modifier the [Modifier] to applied to tooltip.
- * @param tooltip [Int] or `id` string resource to show in a tooltip.
- * @param positionProvider [PopupPositionProvider] Anchor point for the tooltip.
- * @param content The composable UI to wrapped with.
- * @param haptic Whether to perform haptic feedback when the tooltip shown.
- * @param hapticFeedbackType The type of haptic feedback to perform.
- *
- * @see [TooltipBox]
- */
-@Composable
-@OptIn(ExperimentalMaterial3Api::class)
-fun TooltipWrap(
-    modifier: Modifier,
-    @StringRes tooltip: Int,
-    positionProvider: PopupPositionProvider = TooltipDefaults.rememberPlainTooltipPositionProvider(),
-    haptic: Boolean = true,
-    hapticFeedbackType: HapticFeedbackType = HapticFeedbackType.LongPress,
-    content: @Composable () -> Unit
-) {
-    val tooltipState = rememberTooltipState()
-    val localHaptic = LocalHapticFeedback.current
-
-    LaunchedEffect(tooltipState.isVisible) {
-        if (tooltipState.isVisible && haptic) {
-            localHaptic.performHapticFeedback(hapticFeedbackType)
-        }
-    }
-
-    TooltipBox(
-        modifier = modifier,
-        positionProvider = positionProvider,
-        tooltip = { PlainTooltip { Text(stringResource(tooltip)) } },
-        state = tooltipState,
-        content = content,
-    )
-}
--- a/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/AppSelectorScreen.kt
@ -16,6 +16,7 @@ import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.HorizontalDivider
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.ListItem
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.Scaffold
@ -43,7 +44,6 @@ import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.LoadingIndicator
 import app.revanced.manager.ui.component.NonSuggestedVersionDialog
 import app.revanced.manager.ui.component.SearchView
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.ui.model.SelectedApp
 import app.revanced.manager.ui.viewmodel.AppSelectorViewModel
 import app.revanced.manager.util.APK_MIMETYPE
@ -162,15 +162,8 @@ fun AppSelectorScreen(
                scrollBehavior = scrollBehavior,
                onBackClick = onBackClick,
                actions = {
-                    TooltipIconButton(
-                        modifier = Modifier,
-                        tooltip = stringResource(R.string.search_patches),
-                        onClick = { search = true }
-                    ) {
-                        Icon(
-                            Icons.Outlined.Search,
-                            stringResource(R.string.search)
-                        )
+                    IconButton(onClick = { search = true }) {
+                        Icon(Icons.Outlined.Search, stringResource(R.string.search))
                    }
                }
            )
--- a/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/DashboardScreen.kt
@ -62,13 +62,12 @@ import app.revanced.manager.ui.component.AlertDialogExtended
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.AutoUpdatesDialog
 import app.revanced.manager.ui.component.AvailableUpdateDialog
-import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.NotificationCard
+import app.revanced.manager.ui.component.ConfirmDialog
 import app.revanced.manager.ui.component.bundle.BundleTopBar
 import app.revanced.manager.ui.component.bundle.ImportPatchBundleDialog
+import app.revanced.manager.ui.component.haptics.HapticFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
-import app.revanced.manager.ui.component.tooltip.TooltipFloatingActionButton
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.ui.viewmodel.DashboardViewModel
 import app.revanced.manager.util.RequestInstallAppsContract
 import app.revanced.manager.util.toast
@ -184,25 +183,21 @@ fun DashboardScreen(
                        )
                    },
                    actions = {
-                        TooltipIconButton(
-                            modifier = Modifier,
+                        IconButton(
                            onClick = {
                                showDeleteConfirmationDialog = true
-                            },
-                            tooltip = stringResource(R.string.delete),
+                            }
                        ) {
                            Icon(
                                Icons.Outlined.DeleteOutline,
                                stringResource(R.string.delete)
                            )
                        }
-                        TooltipIconButton(
-                            modifier = Modifier,
+                        IconButton(
                            onClick = {
                                vm.selectedSources.forEach { vm.update(it) }
                                vm.cancelSourceSelection()
-                            },
-                            tooltip = stringResource(R.string.refresh),
+                            }
                        ) {
                            Icon(
                                Icons.Outlined.Refresh,
@ -216,10 +211,8 @@ fun DashboardScreen(
                    title = stringResource(R.string.app_name),
                    actions = {
                        if (!vm.updatedManagerVersion.isNullOrEmpty()) {
-                            TooltipIconButton(
-                                modifier = Modifier,
+                            IconButton(
                                onClick = onUpdateClick,
-                                tooltip = stringResource(R.string.update),
                            ) {
                                BadgedBox(
                                    badge = {
@ -230,18 +223,8 @@ fun DashboardScreen(
                                }
                            }
                        }
-                        TooltipIconButton(
-                            modifier = Modifier,
-                            onClick = onSettingsClick,
-                            tooltip = stringResource(R.string.settings),
-                        ) {
-                            BadgedBox(
-                                badge = {
-                                    Badge(modifier = Modifier.size(6.dp))
-                                }
-                            ) {
-                                Icon(Icons.Outlined.Settings, stringResource(R.string.settings))
-                            }
+                        IconButton(onClick = onSettingsClick) {
+                            Icon(Icons.Outlined.Settings, stringResource(R.string.settings))
                        }
                    },
                    applyContainerColor = true
@ -249,9 +232,7 @@ fun DashboardScreen(
            }
        },
        floatingActionButton = {
-            TooltipFloatingActionButton(
-                modifier = Modifier,
-                tooltip = stringResource(R.string.add),
+            HapticFloatingActionButton(
                onClick = {
                    vm.cancelSourceSelection()

@ -264,11 +245,11 @@ fun DashboardScreen(
                                        DashboardPage.BUNDLES.ordinal
                                    )
                                }
-                                return@TooltipFloatingActionButton
+                                return@HapticFloatingActionButton
                            }
                            if (vm.android11BugActive) {
                                showAndroid11Dialog = true
-                                return@TooltipFloatingActionButton
+                                return@HapticFloatingActionButton
                            }

                            onAppSelectorClick()
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatcherScreen.kt
@ -25,6 +25,7 @@ import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.BottomAppBar
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.LinearProgressIndicator
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
@ -50,7 +51,6 @@ import app.revanced.manager.ui.component.InstallerStatusDialog
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.patcher.InstallPickerDialog
 import app.revanced.manager.ui.component.patcher.Steps
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.ui.model.StepCategory
 import app.revanced.manager.ui.viewmodel.PatcherViewModel
 import app.revanced.manager.util.APK_MIMETYPE
@ -164,19 +164,15 @@ fun PatcherScreen(
        bottomBar = {
            BottomAppBar(
                actions = {
-                    TooltipIconButton(
-                        modifier = Modifier,
+                    IconButton(
                        onClick = { exportApkLauncher.launch("${viewModel.packageName}_${viewModel.version}_revanced_patched.apk") },
-                        enabled = patcherSucceeded == true,
-                        tooltip = stringResource(R.string.save_apk),
+                        enabled = patcherSucceeded == true
                    ) {
                        Icon(Icons.Outlined.Save, stringResource(id = R.string.save_apk))
                    }
-                    TooltipIconButton(
-                        modifier = Modifier,
+                    IconButton(
                        onClick = { viewModel.exportLogs(context) },
-                        enabled = patcherSucceeded != null,
-                        tooltip = stringResource(R.string.save_logs),
+                        enabled = patcherSucceeded != null
                    ) {
                        Icon(Icons.Outlined.PostAdd, stringResource(id = R.string.save_logs))
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/PatchesSelectorScreen.kt
@ -41,6 +41,7 @@ import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.ModalBottomSheet
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.ScrollableTabRow
+import androidx.compose.material3.SmallFloatingActionButton
 import androidx.compose.material3.Text
 import androidx.compose.material3.TextButton
 import androidx.compose.material3.surfaceColorAtElevation
@ -72,9 +73,6 @@ import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.haptics.HapticExtendedFloatingActionButton
 import app.revanced.manager.ui.component.haptics.HapticTab
 import app.revanced.manager.ui.component.patches.OptionItem
-import app.revanced.manager.ui.component.tooltip.TooltipFloatingActionButton
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
-import app.revanced.manager.ui.component.tooltip.TooltipSmallFloatingActionButton
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_INCOMPATIBLE
 import app.revanced.manager.ui.viewmodel.PatchesSelectorViewModel.Companion.SHOW_UNIVERSAL
@ -261,16 +259,14 @@ fun PatchesSelectorScreen(
                        animationSpec = tween(durationMillis = 400, easing = EaseInOut),
                        label = "SearchBar back button"
                    )
-                    TooltipIconButton(
-                        modifier = Modifier.rotate(rotation),
+                    IconButton(
                        onClick = {
                            if (searchExpanded) {
                                setSearchExpanded(false)
                            } else {
                                onBackClick()
                            }
-                        },
-                        tooltip = stringResource(R.string.back),
+                        }
                    ) {
                        Icon(
                            modifier = Modifier.rotate(rotation),
@ -286,11 +282,9 @@ fun PatchesSelectorScreen(
                        transitionSpec = { fadeIn() togetherWith fadeOut() }
                    ) { searchExpanded ->
                        if (searchExpanded) {
-                            TooltipIconButton(
-                                modifier = Modifier,
+                            IconButton(
                                onClick = { setQuery("") },
-                                enabled = query.isNotEmpty(),
-                                tooltip = stringResource(R.string.clear),
+                                enabled = query.isNotEmpty()
                            ) {
                                Icon(
                                    imageVector = Icons.Filled.Close,
@ -298,11 +292,7 @@ fun PatchesSelectorScreen(
                                )
                            }
                        } else {
-                            TooltipIconButton(
-                                modifier = Modifier,
-                                onClick = { showBottomSheet = true },
-                                tooltip = stringResource(R.string.more),
-                            ) {
+                            IconButton(onClick = { showBottomSheet = true }) {
                                Icon(
                                    imageVector = Icons.Outlined.FilterList,
                                    contentDescription = stringResource(R.string.more)
@ -364,20 +354,7 @@ fun PatchesSelectorScreen(
                    horizontalAlignment = Alignment.End,
                    verticalArrangement = Arrangement.spacedBy(4.dp)
                ) {
-                    TooltipSmallFloatingActionButton(
-                        modifier = Modifier,
-                        tooltip = stringResource(R.string.more),
-                        onClick = { showBottomSheet = true },
-                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
-                    ) {
-                        Icon(
-                            imageVector = Icons.Outlined.FilterList,
-                            contentDescription = stringResource(R.string.more)
-                        )
-                    }
-                    TooltipSmallFloatingActionButton(
-                        modifier = Modifier,
-                        tooltip = stringResource(R.string.reset),
+                    SmallFloatingActionButton(
                        onClick = viewModel::reset,
                        containerColor = MaterialTheme.colorScheme.tertiaryContainer
                    ) {
@ -540,7 +517,6 @@ private fun PatchItem(
    supportingContent = patch.description?.let { { Text(it) } },
    trailingContent = {
        if (patch.options?.isNotEmpty() == true) {
-            // TODO: Determine if this button should be [TooltipWrap]
            IconButton(onClick = onOptionsDialog, enabled = compatible) {
                Icon(Icons.Outlined.Settings, null)
            }
@ -564,11 +540,7 @@ fun ListHeader(
        },
        trailingContent = onHelpClick?.let {
            {
-                TooltipIconButton(
-                    modifier = Modifier,
-                    tooltip = stringResource(R.string.help),
-                    onClick = it
-                ) {
+                IconButton(onClick = it) {
                    Icon(
                        Icons.AutoMirrored.Outlined.HelpOutline,
                        stringResource(R.string.help)
@ -647,11 +619,7 @@ private fun OptionsDialog(
                title = patch.name,
                onBackClick = onDismissRequest,
                actions = {
-                    TooltipIconButton(
-                        modifier = Modifier,
-                        tooltip = stringResource(R.string.reset),
-                        onClick = reset
-                    ) {
+                    IconButton(onClick = reset) {
                        Icon(Icons.Outlined.Restore, stringResource(R.string.reset))
                    }
                }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AboutSettingsScreen.kt
@ -19,6 +19,7 @@ import androidx.compose.material.icons.outlined.MailOutline
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.FilledTonalButton
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedCard
 import androidx.compose.material3.Scaffold
@ -49,7 +50,6 @@ import app.revanced.manager.network.dto.ReVancedSocial
 import app.revanced.manager.ui.component.AppTopBar
 import app.revanced.manager.ui.component.ColumnWithScrollbar
 import app.revanced.manager.ui.component.settings.SettingsListItem
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.ui.model.navigation.Settings
 import app.revanced.manager.ui.viewmodel.AboutViewModel
 import app.revanced.manager.ui.viewmodel.AboutViewModel.Companion.DEVELOPER_OPTIONS_TAPS
@ -252,10 +252,9 @@ fun AboutSettingsScreen(
                horizontalArrangement = Arrangement.spacedBy(8.dp, Alignment.CenterHorizontally)
            ) {
                socialButtons.forEach { (icon, text, onClick) ->
-                    TooltipIconButton(
+                    IconButton(
+                        onClick = onClick,
                        modifier = Modifier.padding(end = 8.dp),
-                        tooltip = text,
-                        onClick = onClick
                    ) {
                        Icon(
                            icon,
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/AdvancedSettingsScreen.kt
@ -21,6 +21,7 @@ import androidx.compose.material.icons.outlined.Restore
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
 import androidx.compose.material3.OutlinedTextField
 import androidx.compose.material3.Scaffold
@ -51,7 +52,6 @@ import app.revanced.manager.ui.component.settings.BooleanItem
 import app.revanced.manager.ui.component.settings.IntegerItem
 import app.revanced.manager.ui.component.settings.SafeguardBooleanItem
 import app.revanced.manager.ui.component.settings.SettingsListItem
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.ui.viewmodel.AdvancedSettingsViewModel
 import app.revanced.manager.util.toast
 import app.revanced.manager.util.withHapticFeedback
@ -243,11 +243,7 @@ private fun APIUrlDialog(currentUrl: String, defaultUrl: String, onSubmit: (Stri
                    onValueChange = { url = it },
                    label = { Text(stringResource(R.string.api_url)) },
                    trailingIcon = {
-                        TooltipIconButton(
-                            modifier = Modifier,
-                            tooltip = stringResource(R.string.api_url_dialog_reset),
-                            onClick = { url = defaultUrl }
-                        ) {
+                        IconButton(onClick = { url = defaultUrl }) {
                            Icon(Icons.Outlined.Restore, stringResource(R.string.api_url_dialog_reset))
                        }
                    }
--- a/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
+++ b/app/src/main/java/app/revanced/manager/ui/screen/settings/DownloadsSettingsScreen.kt
@ -10,7 +10,6 @@ import androidx.compose.foundation.lazy.items
 import androidx.compose.material.icons.Icons
 import androidx.compose.material.icons.filled.Delete
 import androidx.compose.material.icons.outlined.Delete
-import androidx.compose.material.icons.outlined.Search
 import androidx.compose.material3.AlertDialog
 import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.material3.Icon
@ -46,10 +45,8 @@ import app.revanced.manager.ui.component.ExceptionViewerDialog
 import app.revanced.manager.ui.component.GroupHeader
 import app.revanced.manager.ui.component.LazyColumnWithScrollbar
 import app.revanced.manager.ui.component.ConfirmDialog
-import app.revanced.manager.ui.component.tooltip.TooltipWrap
 import app.revanced.manager.ui.component.haptics.HapticCheckbox
 import app.revanced.manager.ui.component.settings.SettingsListItem
-import app.revanced.manager.ui.component.tooltip.TooltipIconButton
 import app.revanced.manager.ui.viewmodel.DownloadsViewModel
 import org.koin.androidx.compose.koinViewModel
 import java.security.MessageDigest
@ -84,11 +81,7 @@ fun DownloadsSettingsScreen(
                onBackClick = onBackClick,
                actions = {
                    if (viewModel.appSelection.isNotEmpty()) {
-                        TooltipIconButton(
-                            modifier = Modifier,
-                            tooltip = stringResource(R.string.delete),
-                            onClick = { showDeleteConfirmationDialog = true }
-                        ) {
+                        IconButton(onClick = { showDeleteConfirmationDialog = true }) {
                            Icon(Icons.Default.Delete, stringResource(R.string.delete))
                        }
                    }
--- a/app/src/main/res/mipmap-anydpi/ic_launcher.xml
+++ b/app/src/main/res/mipmap-anydpi/ic_launcher.xml
@ -3,4 +3,4 @@
    <background android:drawable="@color/ic_launcher_background"/>
    <foreground android:drawable="@drawable/ic_launcher_foreground"/>
    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
-</adaptive-icon>
+</adaptive-icon>