diff --git a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn
index 03bbf0d..fe5f3e3 100644
--- a/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn
+++ b/src/SharpIDE.Godot/Features/LeftSideBar/LeftSideBar.tscn
@@ -4,8 +4,6 @@
 [ext_resource type="ButtonGroup" uid="uid://c2nmo2x3va0gi" path="res://Features/LeftSideBar/LeftBottomSidebarButtonGroup.tres" id="2_1aad6"]
 [ext_resource type="Texture2D" uid="uid://ccj0dw81x3bkc" path="res://Features/LeftSideBar/Resources/SidebarFolder.svg" id="2_jg03n"]
 [ext_resource type="Texture2D" uid="uid://uukf1nwjhthv" path="res://Features/LeftSideBar/Resources/SidebarProblem.svg" id="4_prju6"]
-[ext_resource type="StyleBox" uid="uid://cosaurtj574yc" path="res://Features/LeftSideBar/Resources/LeftSideBarButtonStyleNormal.tres" id="4_umcfu"]
-[ext_resource type="StyleBox" uid="uid://d26wbe6o067ko" path="res://Features/LeftSideBar/Resources/LeftSideBarButtonStylePressed.tres" id="5_csqeq"]
 [ext_resource type="Texture2D" uid="uid://cre7q0efp4vrq" path="res://Features/LeftSideBar/Resources/SidebarRun.svg" id="5_jg03n"]
 [ext_resource type="Texture2D" uid="uid://b0170ypw8uf3a" path="res://Features/LeftSideBar/Resources/Terminal.svg" id="6_ddh6f"]
 [ext_resource type="Texture2D" uid="uid://butisxqww0boc" path="res://Features/LeftSideBar/Resources/SidebarDebug.svg" id="6_jg03n"]
@@ -42,9 +40,8 @@ layout_mode = 2
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_pressed = true
 text = "Explorer"
@@ -61,9 +58,8 @@ size_flags_vertical = 3
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_group = ExtResource("2_1aad6")
 text = "Problems"
@@ -76,9 +72,8 @@ expand_icon = true
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_pressed = true
 button_group = ExtResource("2_1aad6")
@@ -92,9 +87,8 @@ expand_icon = true
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_group = ExtResource("2_1aad6")
 text = "Debug"
@@ -107,9 +101,8 @@ expand_icon = true
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_group = ExtResource("2_1aad6")
 text = "Build"
@@ -123,9 +116,8 @@ unique_name_in_owner = true
 visible = false
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_group = ExtResource("2_1aad6")
 text = "IDE"
@@ -138,9 +130,8 @@ expand_icon = true
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_group = ExtResource("2_1aad6")
 text = "NuGet"
@@ -153,9 +144,8 @@ expand_icon = true
 unique_name_in_owner = true
 custom_minimum_size = Vector2(0, 50)
 layout_mode = 2
+theme_type_variation = &"IdeSidebarButton"
 theme_override_font_sizes/font_size = 13
-theme_override_styles/normal = ExtResource("4_umcfu")
-theme_override_styles/pressed = ExtResource("5_csqeq")
 toggle_mode = true
 button_group = ExtResource("2_1aad6")
 text = "Tests"
diff --git a/src/SharpIDE.Godot/Resources/DarkTheme.tres b/src/SharpIDE.Godot/Resources/DarkTheme.tres
index 0376c84..a62325b 100644
--- a/src/SharpIDE.Godot/Resources/DarkTheme.tres
+++ b/src/SharpIDE.Godot/Resources/DarkTheme.tres
@@ -38,6 +38,31 @@ corner_radius_bottom_right = 3
 corner_radius_bottom_left = 3
 corner_detail = 5
 
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_dsk6k"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0.1, 0.1, 0.1, 0.6)
+draw_center = false
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+
+[sub_resource type="StyleBoxFlat" id="StyleBoxFlat_njudc"]
+content_margin_left = 4.0
+content_margin_top = 4.0
+content_margin_right = 4.0
+content_margin_bottom = 4.0
+bg_color = Color(0, 0, 0, 0.39215687)
+corner_radius_top_left = 3
+corner_radius_top_right = 3
+corner_radius_bottom_right = 3
+corner_radius_bottom_left = 3
+corner_detail = 5
+
 [sub_resource type="StyleBoxFlat" id="StyleBoxFlat_3gh6f"]
 content_margin_left = 0.0
 content_margin_top = 0.0
@@ -85,6 +110,9 @@ Gray600Label/base_type = &"Label"
 Gray600Label/colors/font_color = Color(0.67058825, 0.67058825, 0.67058825, 1)
 Gray700Label/base_type = &"Label"
 Gray700Label/colors/font_color = Color(0.83137256, 0.83137256, 0.83137256, 1)
+IdeSidebarButton/base_type = &"Button"
+IdeSidebarButton/styles/normal = SubResource("StyleBoxFlat_dsk6k")
+IdeSidebarButton/styles/pressed = SubResource("StyleBoxFlat_njudc")
 Panel/styles/panel = SubResource("StyleBoxFlat_3gh6f")
 PanelContainer/styles/panel = SubResource("StyleBoxFlat_6e8is")
 PopupPanel/styles/panel = SubResource("StyleBoxFlat_amw38")