diff --git a/lua/browser.lua b/lua/browser.lua
index f8f87a6a..31cb9b54 100644
--- a/lua/browser.lua
+++ b/lua/browser.lua
@@ -58,7 +58,7 @@ return screen:new{
             flex = {
                 flex_direction = "row",
                 flex_wrap = "wrap",
-                justify_content = "center",
+                justify_content = "space-between",
                 align_items = "center",
                 align_content = "center"
             },
diff --git a/lua/settings.lua b/lua/settings.lua
index ff8a6e7f..3e0817e4 100644
--- a/lua/settings.lua
+++ b/lua/settings.lua
@@ -496,11 +496,12 @@ local DatabaseSettings = SettingsScreen:new {
       flex = {
         flex_direction = "row",
         justify_content = "flex-start",
-        align_items = "flex-start",
+        align_items = "center",
         align_content = "flex-start",
       },
       w = lvgl.PCT(100),
       h = lvgl.SIZE_CONTENT,
+      pad_bottom = 4,
     }
     auto_update_container:add_style(styles.list_item)
     auto_update_container:Label { text = "Auto update", flex_grow = 1 }
diff --git a/lua/theme_light.lua b/lua/theme_light.lua
index 9e35cf9e..ce728c7c 100644
--- a/lua/theme_light.lua
+++ b/lua/theme_light.lua
@@ -37,16 +37,18 @@ local theme_light = {
   },
   button = {
     {lvgl.PART.MAIN, lvgl.Style {
-      pad_left = 2,
-      pad_right = 2,
-      pad_top = 1,
-      pad_bottom = 1,
+      pad_left = 1,
+      pad_right = 1,
+      margin_all = 1,
       bg_color = background_color,
       image_recolor_opa = 180,
       image_recolor = highlight_color,
       radius = 4,
       border_color = border_color,
       border_width = 1,
+      border_side = 9,
+      outline_color = border_color,
+      outline_width = 1,
     }},
     {lvgl.PART.MAIN | lvgl.STATE.FOCUSED, lvgl.Style {
       bg_opa = lvgl.OPA(100),
@@ -88,6 +90,9 @@ local theme_light = {
       bg_color = background_muted,
       border_color = border_color,
       border_width = 1,
+      border_side = 9,
+      outline_color = border_color,
+      outline_width = 1,
     }},
     {lvgl.PART.MAIN | lvgl.STATE.FOCUSED, lvgl.Style {
       bg_color = background_muted,
@@ -148,6 +153,9 @@ local theme_light = {
       bg_color = background_muted,
       border_color = border_color,
       border_width = 1,
+      border_side = 9,
+      outline_color = border_color,
+      outline_width = 1,
     }},
     {lvgl.PART.KNOB | lvgl.STATE.FOCUSED, lvgl.Style {
       bg_color = highlight_color,
@@ -157,10 +165,12 @@ local theme_light = {
     {lvgl.PART.MAIN, lvgl.Style{
       radius = 2, 
       pad_all = 2,
-      border_width = 1,
-      border_color = border_color,
-      border_side = 15, -- LV_BORDER_SIDE_FULL
       bg_color = background_color,
+      border_color = border_color,
+      border_width = 1,
+      border_side = 9,
+      outline_color = border_color,
+      outline_width = 1,
     }},
     {lvgl.PART.MAIN | lvgl.STATE.FOCUSED, lvgl.Style {
       border_color = highlight_color,
@@ -228,9 +238,6 @@ local theme_light = {
     {lvgl.PART.MAIN, lvgl.Style {
       bg_opa = lvgl.OPA(100),
       radius = 32767, -- LV_RADIUS_CIRCLE = 0x7fff
-      border_width = 1,
-      border_color = border_color,
-      border_side = 15, -- LV_BORDER_SIDE_FULL
     }},
   },
   menu_icon = {
diff --git a/lua/widgets.lua b/lua/widgets.lua
index 2eab3af6..4e83393e 100644
--- a/lua/widgets.lua
+++ b/lua/widgets.lua
@@ -226,10 +226,6 @@ function widgets.IconBtn(parent, icon, text)
     },
     w = lvgl.SIZE_CONTENT,
     h = lvgl.SIZE_CONTENT,
-    pad_top = 1,
-    pad_bottom = 1,
-    pad_left = 1,
-    pad_column = 1
   }
   btn:Image {
     src = icon