diff --git a/src/Entity/Browser/Container/Page/Navbar/Base.php b/src/Entity/Browser/Container/Page/Navbar/Base.php
index ec2c054f..d506e2a4 100644
--- a/src/Entity/Browser/Container/Page/Navbar/Base.php
+++ b/src/Entity/Browser/Container/Page/Navbar/Base.php
@@ -6,7 +6,9 @@ namespace Yggverse\Yoda\Entity\Browser\Container\Page\Navbar;
 
 class Base extends \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button
 {
+    public const IMAGE = 'go-home-symbolic';
     public const LABEL = 'Base';
+    public const TOOLTIP = 'Base';
 
     protected function _onCLick(
         \GtkButton $entity
diff --git a/src/Entity/Browser/Container/Page/Navbar/Go.php b/src/Entity/Browser/Container/Page/Navbar/Go.php
index 3ced7b77..23b22b6e 100644
--- a/src/Entity/Browser/Container/Page/Navbar/Go.php
+++ b/src/Entity/Browser/Container/Page/Navbar/Go.php
@@ -8,7 +8,9 @@ use \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button;
 
 class Go extends Button
 {
+    public const IMAGE = 'view-refresh-symbolic';
     public const LABEL = 'Go';
+    public const TOOLTIP = 'Update';
 
     protected function _onCLick(
         \GtkButton $entity
diff --git a/src/Entity/Browser/Container/Page/Navbar/History/Back.php b/src/Entity/Browser/Container/Page/Navbar/History/Back.php
index 98c82888..d5bc0a1c 100644
--- a/src/Entity/Browser/Container/Page/Navbar/History/Back.php
+++ b/src/Entity/Browser/Container/Page/Navbar/History/Back.php
@@ -8,7 +8,9 @@ use \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button;
 
 class Back extends Button
 {
+    public const IMAGE = 'go-previous-symbolic';
     public const LABEL = 'Back';
+    public const TOOLTIP = 'Back';
 
     protected function _onCLick(
         \GtkButton $entity
diff --git a/src/Entity/Browser/Container/Page/Navbar/History/Forward.php b/src/Entity/Browser/Container/Page/Navbar/History/Forward.php
index 84e23517..fda1d1c7 100644
--- a/src/Entity/Browser/Container/Page/Navbar/History/Forward.php
+++ b/src/Entity/Browser/Container/Page/Navbar/History/Forward.php
@@ -8,7 +8,9 @@ use \Yggverse\Yoda\Abstract\Entity\Browser\Container\Page\Navbar\Button;
 
 class Forward extends Button
 {
+    public const IMAGE = 'go-next-symbolic';
     public const LABEL = 'Forward';
+    public const TOOLTIP = 'Forward';
 
     protected function _onCLick(
         \GtkButton $entity
diff --git a/src/Entity/Browser/Header/Tray/Tab.php b/src/Entity/Browser/Header/Tray/Tab.php
index b97fda4f..16651b71 100644
--- a/src/Entity/Browser/Header/Tray/Tab.php
+++ b/src/Entity/Browser/Header/Tray/Tab.php
@@ -15,7 +15,7 @@ class Tab
 
     // Defaults
     public const LABEL = '+';
-    public const IMAGE = 'tab-new';
+    public const IMAGE = 'tab-new-symbolic';
     public const TOOLTIP = 'New tab';
 
     public function __construct(
diff --git a/src/Entity/Browser/History/Container/Navbar/Delete.php b/src/Entity/Browser/History/Container/Navbar/Delete.php
index 8a5c3ae4..5401b289 100644
--- a/src/Entity/Browser/History/Container/Navbar/Delete.php
+++ b/src/Entity/Browser/History/Container/Navbar/Delete.php
@@ -8,7 +8,9 @@ use \Yggverse\Yoda\Abstract\Entity\Browser\History\Container\Navbar\Button;
 
 class Delete extends Button
 {
+    public const IMAGE = 'window-close-symbolic';
     public const LABEL = 'Delete';
+    public const TOOLTIP = 'Delete';
 
     protected function _onCLick(
         \GtkButton $entity