diff --git a/doc/migrating-libhandy-1-4-to-libadwaita.md b/doc/migrating-libhandy-1-4-to-libadwaita.md
index a6360dd530fe787d7da4f17fd0423a000d153dba..8fa4c2a02a836bc8a5959769577d4ca03c35a321 100644
--- a/doc/migrating-libhandy-1-4-to-libadwaita.md
+++ b/doc/migrating-libhandy-1-4-to-libadwaita.md
@@ -343,10 +343,10 @@ If you were using `@theme_selected_bg_color` as a text color, use
 The `.sidebar` style class doesn't provide a border by default. Instead, use a
 [class@Gtk.Separator] with the style class `.sidebar` manually.
 
-#### Adapt to Header Bar, Action Bar and Toolbar Style Changes
+#### Adapt to Header Bar, Action Bar, Search Bar and Toolbar Style Changes
 
-When possible, buttons in [class@Gtk.HeaderBar] and [class@Gtk.ActionBar] will
-use flat appearance by default.
+When possible, buttons in [class@Gtk.HeaderBar], [class@Gtk.ActionBar] and
+[class@Gtk.SearchBar] will use flat appearance by default.
 
 The following rules are used when deciding when to make buttons flat or not:
 
diff --git a/src/stylesheet/widgets/_toolbars.scss b/src/stylesheet/widgets/_toolbars.scss
index a3f1f20c65f7d022b9f1959342a517331373b739..39ae44b6a768199a9a86959d63cf90b67c706ce2 100644
--- a/src/stylesheet/widgets/_toolbars.scss
+++ b/src/stylesheet/widgets/_toolbars.scss
@@ -129,8 +129,9 @@
  ****************/
 
 searchbar > revealer > box {
-  padding: 6px 6px 7px 6px;
+  padding: 0px 6px 1px 6px;
   border-spacing: 6px;
+  @extend %toolbar;
 
   background-color: $dark_fill;
   box-shadow: inset 0 -1px $borders_color;