diff --git a/src/styles/messages.css b/src/styles/messages.css
index 1da7dd190..39b415b93 100644
--- a/src/styles/messages.css
+++ b/src/styles/messages.css
@@ -348,15 +348,31 @@
 
 .tool-inline-toggle {
   background: none;
-  border: none;
-  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 6px;
+  padding: 2px 4px;
   cursor: pointer;
   text-align: left;
+  align-self: flex-start;
+  max-width: 100%;
+  align-items: center;
+  font: inherit;
+  color: inherit;
+  line-height: 1.2;
+  transition: background 0.15s ease, border-color 0.15s ease, color 0.15s ease;
+}
+
+.tool-inline-toggle:hover:not(:disabled) {
+  background: var(--surface-hover);
+  border-color: var(--border-subtle);
+  box-shadow: none;
+  transform: none;
 }
 
 .tool-inline-toggle:focus-visible {
-  outline: 1px solid var(--border-strong);
-  border-radius: 6px;
+  outline: none;
+  background: var(--surface-hover);
+  border-color: var(--border-strong);
 }
 
 .tool-inline-bar-toggle {
diff --git a/src/styles/sidebar.css b/src/styles/sidebar.css
index 009ccf9c3..8a6897338 100644
--- a/src/styles/sidebar.css
+++ b/src/styles/sidebar.css
@@ -35,12 +35,21 @@
 
 .subtitle-button {
   background: none;
-  border: none;
-  padding: 0;
+  border: 1px solid transparent;
+  border-radius: 12px;
+  padding: 4px 8px;
   color: inherit;
   font: inherit;
   cursor: pointer;
   -webkit-app-region: no-drag;
+  transition: background 0.15s ease, border-color 0.15s ease, color 0.15s ease;
+}
+
+.subtitle-button:hover {
+  background: var(--surface-hover);
+  border-color: var(--border-strong);
+  box-shadow: none;
+  transform: none;
 }
 
 .sidebar-nav-icon {