diff --git a/views/res/list_item_background_dark.xml b/views/res/list_item_background_dark.xml
index 31b659c2..a96e3f20 100644
--- a/views/res/list_item_background_dark.xml
+++ b/views/res/list_item_background_dark.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:drawable="btn_disabled"
+    android:drawable="btn_disabled_dark"
     android:state_enabled="false"
     android:state_focused="true" />
   <item
-    android:drawable="btn_pressed"
+    android:drawable="btn_pressed_dark"
     android:state_focused="true" />
   <item
-    android:drawable="btn_normal"
+    android:drawable="btn_normal_dark"
     android:state_selected="true" />
   <item
     android:drawable="#E04040FF"
diff --git a/views/res/main_menu_item_background_dark.xml b/views/res/main_menu_item_background_dark.xml
index 005b6fc7..64e897ab 100644
--- a/views/res/main_menu_item_background_dark.xml
+++ b/views/res/main_menu_item_background_dark.xml
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:drawable="main_menu_item_background_selected"
+    android:drawable="main_menu_item_background_selected_dark"
     android:state_selected="true" />
   <item
-    android:drawable="main_menu_item_background_hover"
+    android:drawable="main_menu_item_background_hover_dark"
     android:state_hovered="true" />
   <item
     android:drawable="@null" />
diff --git a/views/res/main_menu_item_background_hover_dark.9.png b/views/res/main_menu_item_background_hover_dark.9.png
index b3d29f1d..388c4b32 100644
Binary files a/views/res/main_menu_item_background_hover_dark.9.png and b/views/res/main_menu_item_background_hover_dark.9.png differ
diff --git a/views/res/main_menu_item_background_normal_dark.9.png b/views/res/main_menu_item_background_normal_dark.9.png
index 7f5c35ee..43cfcd00 100644
Binary files a/views/res/main_menu_item_background_normal_dark.9.png and b/views/res/main_menu_item_background_normal_dark.9.png differ
diff --git a/views/res/main_menu_item_background_selected_dark.9.png b/views/res/main_menu_item_background_selected_dark.9.png
index a8d98997..6b718ffd 100644
Binary files a/views/res/main_menu_item_background_selected_dark.9.png and b/views/res/main_menu_item_background_selected_dark.9.png differ
diff --git a/views/res/mdpi/popup_window_background_dark.9.png b/views/res/mdpi/popup_window_background_dark.9.png
index bf3f04b5..40ca23cb 100644
Binary files a/views/res/mdpi/popup_window_background_dark.9.png and b/views/res/mdpi/popup_window_background_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_background_3d_dark.9.png b/views/res/mdpi/toolbar_background_3d_dark.9.png
index 8b65deb3..70186345 100644
Binary files a/views/res/mdpi/toolbar_background_3d_dark.9.png and b/views/res/mdpi/toolbar_background_3d_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 c348ca45..52644fca 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_button_hover_dark.9.png b/views/res/mdpi/toolbar_button_hover_dark.9.png
index 97bdd49e..d6d831dd 100644
Binary files a/views/res/mdpi/toolbar_button_hover_dark.9.png and b/views/res/mdpi/toolbar_button_hover_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_button_pressed_dark.9.png b/views/res/mdpi/toolbar_button_pressed_dark.9.png
index 6e4bd8b7..23d380ff 100644
Binary files a/views/res/mdpi/toolbar_button_pressed_dark.9.png and b/views/res/mdpi/toolbar_button_pressed_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_control_disabled_dark.9.png b/views/res/mdpi/toolbar_control_disabled_dark.9.png
index 1ecea1bb..ed99fed9 100644
Binary files a/views/res/mdpi/toolbar_control_disabled_dark.9.png and b/views/res/mdpi/toolbar_control_disabled_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_control_normal_dark.9.png b/views/res/mdpi/toolbar_control_normal_dark.9.png
index fbfb7acb..f3cf0e64 100644
Binary files a/views/res/mdpi/toolbar_control_normal_dark.9.png and b/views/res/mdpi/toolbar_control_normal_dark.9.png differ
diff --git a/views/res/mdpi/toolbar_separator_dark.png b/views/res/mdpi/toolbar_separator_dark.png
index cfa5a1ac..4fd223d9 100644
Binary files a/views/res/mdpi/toolbar_separator_dark.png and b/views/res/mdpi/toolbar_separator_dark.png differ
diff --git a/views/res/mdpi/tooltip_background_dark.9.png b/views/res/mdpi/tooltip_background_dark.9.png
index 2fa29203..f194e00b 100644
Binary files a/views/res/mdpi/tooltip_background_dark.9.png and b/views/res/mdpi/tooltip_background_dark.9.png differ
diff --git a/views/res/menu_item_background_dark.xml b/views/res/menu_item_background_dark.xml
index 31b659c2..a96e3f20 100644
--- a/views/res/menu_item_background_dark.xml
+++ b/views/res/menu_item_background_dark.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:drawable="btn_disabled"
+    android:drawable="btn_disabled_dark"
     android:state_enabled="false"
     android:state_focused="true" />
   <item
-    android:drawable="btn_pressed"
+    android:drawable="btn_pressed_dark"
     android:state_focused="true" />
   <item
-    android:drawable="btn_normal"
+    android:drawable="btn_normal_dark"
     android:state_selected="true" />
   <item
     android:drawable="#E04040FF"
diff --git a/views/res/popup_menu_background_normal_dark.9.png b/views/res/popup_menu_background_normal_dark.9.png
index 3c322655..cd70dc64 100644
Binary files a/views/res/popup_menu_background_normal_dark.9.png and b/views/res/popup_menu_background_normal_dark.9.png differ
diff --git a/views/res/theme_dark.xml b/views/res/theme_dark.xml
index 1f35dfa2..e22fcc85 100644
--- a/views/res/theme_dark.xml
+++ b/views/res/theme_dark.xml
@@ -14,8 +14,8 @@
 	focusRectColors="#FFF"
         textFlags="UnderlineHotKeys"
         >
-        <state state_enabled="false" textColor="#80FFFFFF"/>
-        <state state_enabled="true" state_hovered="true" textColor="#80FFFF"/>
+        <state state_enabled="false" textColor="#60FFFFFF"/>
+        <state state_enabled="true" state_hovered="true" textColor="#FF0000"/>
     </style>
     <style id="BUTTON_TRANSPARENT"
         backgroundImageId="btn_background_transparent_dark"
@@ -27,8 +27,8 @@
         align="Left|VCenter"
         textFlags="UnderlineHotKeys"
         >
-        <state state_enabled="false" textColor="#80FFFFFF"/>
-        <state state_enabled="true" state_hovered="true" textColor="#80FFFF"/>
+        <state state_enabled="false" textColor="#60FFFFFF"/>
+        <state state_enabled="true" state_hovered="true" textColor="#FF0000"/>
     </style>
     <style id="BUTTON_IMAGE"
         margins="2,2,2,2"
@@ -186,20 +186,20 @@
         align="Left|VCenter"
         textFlags="UnderlineHotKeys"
         >
-        <state state_enabled="false" textColor="#80C0C0C0"/>
+        <state state_enabled="false" textColor="#60FFFFFF"/>
     </style>
     <style id="MAIN_MENU_LABEL"
         margins="4,2,4,2"
         align="Left|VCenter"
         textFlags="Parent"
         >
-        <state state_enabled="false" textColor="#80C0C0C0"/>
+        <state state_enabled="false" textColor="#60FFFFFF"/>
     </style>
     <style id="MENU_ACCEL"
         margins="4,2,4,2"
         align="Left|VCenter"
         >
-        <state state_enabled="false" textColor="#80C0C0C0"/>
+        <state state_enabled="false" textColor="#60FFFFFF"/>
     </style>
     <style id="TRANSPARENT_BUTTON_BACKGROUND"
         backgroundImageId="btn_background_transparent_dark"
diff --git a/views/res/toolbar_button_background_dark.xml b/views/res/toolbar_button_background_dark.xml
index f48d7a4d..1073de57 100644
--- a/views/res/toolbar_button_background_dark.xml
+++ b/views/res/toolbar_button_background_dark.xml
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_enabled="false"
     android:state_focused="true" />
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_hovered="true"
     android:state_focused="true" />
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_focused="true" 
   />
   <item
-    android:drawable="toolbar_button_pressed"
+    android:drawable="toolbar_button_pressed_dark"
     android:state_pressed="true" />
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_hovered="true" />
   <item
     android:drawable="@null" />
diff --git a/views/res/toolbar_control_background_dark.xml b/views/res/toolbar_control_background_dark.xml
index 4b0df5f7..a35d3245 100644
--- a/views/res/toolbar_control_background_dark.xml
+++ b/views/res/toolbar_control_background_dark.xml
@@ -1,23 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" >
   <item
-    android:drawable="toolbar_control_disabled"
+    android:drawable="toolbar_control_disabled_dark"
     android:state_enabled="false"
     android:state_focused="true" />
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_hovered="true"
     android:state_focused="true" />
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_focused="true" 
   />
   <item
-    android:drawable="toolbar_button_pressed"
+    android:drawable="toolbar_button_pressed_dark"
     android:state_pressed="true" />
   <item
-    android:drawable="toolbar_button_hover"
+    android:drawable="toolbar_button_hover_dark"
     android:state_hovered="true" />
   <item
-    android:drawable="toolbar_control_normal" />
+    android:drawable="toolbar_control_normal_dark" />
 </selector>