diff --git a/src/app/browser/window/tab/item/page/content/text/search.rs b/src/app/browser/window/tab/item/page/content/text/search.rs
index 50dd7d65..dda11870 100644
--- a/src/app/browser/window/tab/item/page/content/text/search.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search.rs
@@ -33,7 +33,7 @@ impl Search {
 
         // Init main container
         let g_box = Box::builder()
-            .css_classes(["app-notification"])
+            .css_classes(["osd"])
             .orientation(Orientation::Horizontal)
             .visible(false)
             .build();
diff --git a/src/app/browser/window/tab/item/page/content/text/search/close.rs b/src/app/browser/window/tab/item/page/content/text/search/close.rs
index facf8bcd..11c2ecf5 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/close.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/close.rs
@@ -6,8 +6,10 @@ pub fn new() -> Button {
     Button::builder()
         .cursor(&Cursor::from_name("default", None).unwrap())
         .icon_name("window-close-symbolic")
+        .margin_bottom(MARGIN)
         .margin_end(MARGIN)
         .margin_start(MARGIN)
+        .margin_top(MARGIN)
         .tooltip_text("Close find bar")
         .build()
 }
diff --git a/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs b/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs
index 4f4506f5..b5943276 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/navigation/back.rs
@@ -1,5 +1,7 @@
 use gtk::{gdk::Cursor, prelude::WidgetExt, Button};
 
+const MARGIN: i32 = 6;
+
 pub struct Back {
     pub button: Button,
 }
@@ -13,6 +15,8 @@ impl Back {
             button: Button::builder()
                 .cursor(&Cursor::from_name("default", None).unwrap())
                 .icon_name("go-up-symbolic")
+                .margin_bottom(MARGIN)
+                .margin_top(MARGIN)
                 .sensitive(false)
                 .tooltip_text("Back")
                 .build(),
diff --git a/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs b/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs
index 79608ea6..99f69d3e 100644
--- a/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs
+++ b/src/app/browser/window/tab/item/page/content/text/search/navigation/forward.rs
@@ -1,4 +1,7 @@
 use gtk::{gdk::Cursor, prelude::WidgetExt, Button};
+
+const MARGIN: i32 = 6;
+
 pub struct Forward {
     pub button: Button,
 }
@@ -12,6 +15,8 @@ impl Forward {
             button: Button::builder()
                 .cursor(&Cursor::from_name("default", None).unwrap())
                 .icon_name("go-down-symbolic")
+                .margin_bottom(MARGIN)
+                .margin_top(MARGIN)
                 .sensitive(false)
                 .tooltip_text("Forward")
                 .build(),
diff --git a/src/app/browser/window/tab/item/page/input/response/control/send/widget.rs b/src/app/browser/window/tab/item/page/input/response/control/send/widget.rs
index d8b376c4..66cfd60e 100644
--- a/src/app/browser/window/tab/item/page/input/response/control/send/widget.rs
+++ b/src/app/browser/window/tab/item/page/input/response/control/send/widget.rs
@@ -4,6 +4,8 @@ use gtk::{
     Button,
 };
 
+const MARGIN: i32 = 6;
+
 pub struct Widget {
     pub button: Button,
 }
@@ -15,6 +17,7 @@ impl Widget {
         let button = Button::builder()
             //.css_classes(["accent"])
             .label("Send")
+            .margin_bottom(MARGIN)
             .build();
 
         // Init events
diff --git a/src/app/browser/window/tab/item/page/input/widget.rs b/src/app/browser/window/tab/item/page/input/widget.rs
index 56723676..97c9e753 100644
--- a/src/app/browser/window/tab/item/page/input/widget.rs
+++ b/src/app/browser/window/tab/item/page/input/widget.rs
@@ -9,7 +9,7 @@ impl Widget {
     // Construct
     pub fn new() -> Self {
         let clamp = Clamp::builder()
-            .css_classes(["app-notification"])
+            .css_classes(["osd"])
             .maximum_size(800)
             .visible(false)
             .build();