diff --git a/views/res/mdpi/tab_btn_dark_up_focused_dark.9.png b/views/res/mdpi/tab_btn_dark_up_focused_dark.9.png
index a2fc896e..95d260aa 100644
Binary files a/views/res/mdpi/tab_btn_dark_up_focused_dark.9.png and b/views/res/mdpi/tab_btn_dark_up_focused_dark.9.png differ
diff --git a/views/res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png b/views/res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png
new file mode 100644
index 00000000..ab1492cb
Binary files /dev/null and b/views/res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png differ
diff --git a/views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png b/views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png
index 7f3015a9..44ed6f79 100644
Binary files a/views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png and b/views/res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png differ
diff --git a/views/res/mdpi/tab_btn_dark_up_hover_dark.9.png b/views/res/mdpi/tab_btn_dark_up_hover_dark.9.png
index 7373013c..41f9aebb 100644
Binary files a/views/res/mdpi/tab_btn_dark_up_hover_dark.9.png and b/views/res/mdpi/tab_btn_dark_up_hover_dark.9.png differ
diff --git a/views/res/mdpi/tab_btn_dark_up_normal_dark.9.png b/views/res/mdpi/tab_btn_dark_up_normal_dark.9.png
index 7ed73706..f57cbdc4 100644
Binary files a/views/res/mdpi/tab_btn_dark_up_normal_dark.9.png and b/views/res/mdpi/tab_btn_dark_up_normal_dark.9.png differ
diff --git a/views/res/mdpi/tab_btn_dark_up_selected_dark.9.png b/views/res/mdpi/tab_btn_dark_up_selected_dark.9.png
index 228659f1..8068462f 100644
Binary files a/views/res/mdpi/tab_btn_dark_up_selected_dark.9.png and b/views/res/mdpi/tab_btn_dark_up_selected_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_background_dark.9.png b/views/res/mdpi/toolbar_background_dark.9.png
index b07769c3..8612803a 100644
Binary files a/views/res/mdpi/toolbar_background_dark.9.png and b/views/res/mdpi/toolbar_background_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_host_background_dark.9.png b/views/res/mdpi/toolbar_host_background_dark.9.png
new file mode 100644
index 00000000..1f152901
Binary files /dev/null and b/views/res/mdpi/toolbar_host_background_dark.9.png differ
diff --git a/views/res/tab_btn_dark_up_dark.xml b/views/res/tab_btn_dark_up_dark.xml
index f60c84d2..57ed4e8e 100644
--- a/views/res/tab_btn_dark_up_dark.xml
+++ b/views/res/tab_btn_dark_up_dark.xml
@@ -3,6 +3,9 @@
   <item
     android:drawable="tab_btn_dark_up_focused_selected_dark"
     android:state_selected="true" android:state_window_focused="true" />
+  <item
+    android:drawable="tab_btn_dark_up_focused_hover_dark"
+    android:state_hovered="true" android:state_window_focused="true" />
   <item
     android:drawable="tab_btn_dark_up_focused_dark"
     android:state_window_focused="true" />
diff --git a/views/res/theme_dark.xml b/views/res/theme_dark.xml
index bf3c067d..f8305089 100644
--- a/views/res/theme_dark.xml
+++ b/views/res/theme_dark.xml
@@ -113,7 +113,7 @@
         backgroundImageId="tab_btn_dark_down_dark"
         />
     <style id="TAB_UP_DARK"
-        backgroundImageId="tab_up_background_theme_dark"
+        backgroundImageId="dock_window_caption_background_dark"
         >
     </style>
     <style id="TAB_UP_BUTTON_DARK"
@@ -204,6 +204,9 @@
     <style id="EDIT_BOX"
         backgroundImageId="editbox_background_dark"
         />
+    <style id="EDIT_BOX_NO_FRAME"
+        backgroundColor="#292929"
+        />
     <style id="STATUS_LINE"
         backgroundColor="#101010"
         />
@@ -230,7 +233,7 @@
         />
 
     <style id="TOOLBAR_HOST"
-        backgroundColor="#202325"
+        backgroundImageId="toolbar_host_background_dark"
         />
     <style id="TOOLTIP"
         backgroundImageId="tooltip_background_dark"
diff --git a/views/standard_resources.list b/views/standard_resources.list
index 95f221b8..78a33622 100644
--- a/views/standard_resources.list
+++ b/views/standard_resources.list
@@ -209,8 +209,9 @@ res/mdpi/tab_btn_dark_down_selected_dark.9.png
 res/mdpi/tab_btn_dark_up_focused.9.png
 res/mdpi/tab_btn_dark_up_focused_dark.9.png
 res/mdpi/tab_btn_dark_up_focused_selected.9.png
-res/mdpi/tab_btn_dark_up_focused_hover.9.png
 res/mdpi/tab_btn_dark_up_focused_selected_dark.9.png
+res/mdpi/tab_btn_dark_up_focused_hover.9.png
+res/mdpi/tab_btn_dark_up_focused_hover_dark.9.png
 res/mdpi/tab_btn_dark_up_hover.9.png
 res/mdpi/tab_btn_dark_up_hover_dark.9.png
 res/mdpi/tab_btn_dark_up_normal.9.png
@@ -227,6 +228,7 @@ res/mdpi/tab_up_background_dark_normal.9.png
 res/mdpi/tab_up_background_dark_normal_dark.9.png
 res/mdpi/text-plain.png
 res/mdpi/toolbar_host_background.9.png
+res/mdpi/toolbar_host_background_dark.9.png
 res/mdpi/toolbar_background.9.png
 res/mdpi/toolbar_background_dark.9.png
 res/mdpi/toolbar_button_hover.9.png