diff --git a/po/POTFILES.in b/po/POTFILES.in
index 463ffd7..ef62a9d 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,18 +1,9 @@
 src/app/browser.cpp
-src/app/browser.hpp
 src/app/browser/header.cpp
-src/app/browser/header.hpp
 src/app/browser/header/menu.cpp
-src/app/browser/header/menu.hpp
 src/app/browser/header/tab.cpp
-src/app/browser/header/tab.hpp
 src/app/browser/main.cpp
-src/app/browser/main.hpp
 src/app/browser/main/tab.cpp
-src/app/browser/main/tab.hpp
 src/lib/database.cpp
-src/lib/database.hpp
 src/lib/database/session.cpp
-src/lib/database/session.hpp
 src/main.cpp
-src/main.hpp
\ No newline at end of file
diff --git a/src/app/browser.cpp b/src/app/browser.cpp
index 6f551c1..7c9ec12 100644
--- a/src/app/browser.cpp
+++ b/src/app/browser.cpp
@@ -10,12 +10,12 @@ Browser::Browser(
 ) {
     // Init window
     set_title(
-        TITLE
+        _("Yoda")
     );
 
     set_default_size(
-        WIDTH,
-        HEIGHT
+        640,
+        480
     );
 
     // Init header widget
diff --git a/src/app/browser.hpp b/src/app/browser.hpp
index 4c0911e..06c02d3 100644
--- a/src/app/browser.hpp
+++ b/src/app/browser.hpp
@@ -26,10 +26,6 @@ namespace app
 
         public:
 
-            const char * TITLE = _("Yoda");
-            const int WIDTH = 640;
-            const int HEIGHT = 480;
-
             Browser(
                 //const Glib::RefPtr<Gtk::Application> & app,
                 //const std::shared_ptr<lib::Database> & db
diff --git a/src/app/browser/header.cpp b/src/app/browser/header.cpp
index 1fdd4be..0c9f75f 100644
--- a/src/app/browser/header.cpp
+++ b/src/app/browser/header.cpp
@@ -8,7 +8,7 @@ Header::Header()
 {
     // Init header bar
     set_show_title_buttons(
-        SHOW_TITLE_BUTTONS
+        true
     );
 
     // Init menu
diff --git a/src/app/browser/header.hpp b/src/app/browser/header.hpp
index 9b5098a..9969c66 100644
--- a/src/app/browser/header.hpp
+++ b/src/app/browser/header.hpp
@@ -20,8 +20,6 @@ namespace app::browser
 
         public:
 
-            const bool SHOW_TITLE_BUTTONS = true;
-
             Header();
 
             ~Header();
diff --git a/src/app/browser/header/menu.cpp b/src/app/browser/header/menu.cpp
index 47bfac0..5030f3d 100644
--- a/src/app/browser/header/menu.cpp
+++ b/src/app/browser/header/menu.cpp
@@ -6,7 +6,7 @@ Menu::Menu()
 {
     // Set widget defaults
     set_tooltip_text(
-        TOOLTIP
+        _("Menu")
     );
 
     // Build tab submenu model
diff --git a/src/app/browser/header/menu.hpp b/src/app/browser/header/menu.hpp
index 7a2778d..3550625 100644
--- a/src/app/browser/header/menu.hpp
+++ b/src/app/browser/header/menu.hpp
@@ -18,8 +18,6 @@ namespace app::browser::header
 
         public:
 
-            const char* TOOLTIP = _("Menu");
-
             Menu();
 
             ~Menu();
diff --git a/src/app/browser/header/tab.cpp b/src/app/browser/header/tab.cpp
index 967b49d..5136672 100644
--- a/src/app/browser/header/tab.cpp
+++ b/src/app/browser/header/tab.cpp
@@ -5,15 +5,15 @@ using namespace app::browser::header;
 Tab::Tab()
 {
     set_action_name(
-        ACTION
+        "win.tab_append"
     );
 
-    set_tooltip_text(
-        TOOLTIP
+    set_icon_name(
+        "tab-new-symbolic"
     );
 
-    set_icon_name(
-        ICON
+    set_tooltip_text(
+        _("New tab")
     );
 }
 
diff --git a/src/app/browser/header/tab.hpp b/src/app/browser/header/tab.hpp
index 2bf23d2..b62561c 100644
--- a/src/app/browser/header/tab.hpp
+++ b/src/app/browser/header/tab.hpp
@@ -10,10 +10,6 @@ namespace app::browser::header
     {
         public:
 
-            const char* ACTION = "win.tab_append";
-            const char* ICON = "tab-new-symbolic";
-            const char* TOOLTIP = _("New tab");
-
             Tab();
 
             ~Tab();