diff --git a/calculatorpp/res/drawable/metro_blue_list_item.xml b/calculatorpp/res/drawable/metro_blue_list_item.xml
index 98ac6a1d..7eb23dca 100644
--- a/calculatorpp/res/drawable/metro_blue_list_item.xml
+++ b/calculatorpp/res/drawable/metro_blue_list_item.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- pressed -->
-    <item android:state_pressed="true"
-          android:drawable="@color/metro_blue_color"/>
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+    <!-- Non focused states -->
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="false" a:drawable="@android:color/transparent" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="false" a:drawable="@color/metro_blue_color" />
 
-    <!-- focused -->
-    <item android:state_focused="true"
-          android:drawable="@color/metro_blue_color"/>
+    <!-- Focused states -->
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/metro_blue_color" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="false" a:drawable="@color/metro_blue_color" />
 
-    <!-- default -->
-    <item android:drawable="@android:color/transparent"/>
+    <!-- Pressed -->
+    <!--    Non focused states -->
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_blue_color" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="true" a:drawable="@color/metro_blue_color" />
+
+    <!--    Focused states -->
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_blue_color" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="true" a:drawable="@color/metro_blue_color" />
 </selector>
diff --git a/calculatorpp/res/drawable/metro_green_list_item.xml b/calculatorpp/res/drawable/metro_green_list_item.xml
index 480a52ad..ee9aa3f8 100644
--- a/calculatorpp/res/drawable/metro_green_list_item.xml
+++ b/calculatorpp/res/drawable/metro_green_list_item.xml
@@ -1,15 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- pressed -->
-    <item android:state_pressed="true"
-          android:drawable="@color/metro_green_color"/>
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+    <!-- Non focused states -->
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="false" a:drawable="@android:color/transparent" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="false" a:drawable="@color/metro_green_color" />
 
-    <!-- focused -->
-    <item android:state_focused="true"
-          android:drawable="@color/metro_green_color"/>
+    <!-- Focused states -->
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/metro_green_color" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="false" a:drawable="@color/metro_green_color" />
+
+    <!-- Pressed -->
+    <!--    Non focused states -->
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_green_color" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="true" a:drawable="@color/metro_green_color" />
+
+    <!--    Focused states -->
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_green_color" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="true" a:drawable="@color/metro_green_color" />
 
-    <!-- default -->
-    <item android:drawable="@android:color/transparent"/>
 </selector>
diff --git a/calculatorpp/res/drawable/metro_purple_list_item.xml b/calculatorpp/res/drawable/metro_purple_list_item.xml
index 1dbafae0..4820331b 100644
--- a/calculatorpp/res/drawable/metro_purple_list_item.xml
+++ b/calculatorpp/res/drawable/metro_purple_list_item.xml
@@ -1,15 +1,21 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <!-- pressed -->
-    <item android:state_pressed="true"
-          android:drawable="@color/metro_purple_color"/>
+<selector xmlns:a="http://schemas.android.com/apk/res/android">
+    <!-- Non focused states -->
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="false" a:drawable="@android:color/transparent" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="false" a:drawable="@color/metro_purple_color" />
 
-    <!-- focused -->
-    <item android:state_focused="true"
-          android:drawable="@color/metro_purple_color"/>
+    <!-- Focused states -->
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="false" a:drawable="@color/metro_purple_color" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="false" a:drawable="@color/metro_purple_color" />
 
-    <!-- default -->
-    <item android:drawable="@android:color/transparent"/>
+    <!-- Pressed -->
+    <!--    Non focused states -->
+    <item a:state_focused="false" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_purple_color" />
+    <item a:state_focused="false" a:state_selected="true"  a:state_pressed="true" a:drawable="@color/metro_purple_color" />
+
+    <!--    Focused states -->
+    <item a:state_focused="true" a:state_selected="false" a:state_pressed="true" a:drawable="@color/metro_purple_color" />
+    <item a:state_focused="true" a:state_selected="true"  a:state_pressed="true" a:drawable="@color/metro_purple_color" />
 </selector>
diff --git a/calculatorpp/res/values/theme_metro_blue.xml b/calculatorpp/res/values/theme_metro_blue.xml
index 3d28c3ed..7b96b529 100644
--- a/calculatorpp/res/values/theme_metro_blue.xml
+++ b/calculatorpp/res/values/theme_metro_blue.xml
@@ -17,6 +17,7 @@
 	</style>
 
     <style name="metro_blue_fragment_list_view_item_style" parent="default_fragment_list_view_item_style">
+        <item name="background">@drawable/metro_blue_list_item</item>
         <item name="android:background">@drawable/metro_blue_list_item</item>
     </style>
 
diff --git a/calculatorpp/res/values/theme_metro_green.xml b/calculatorpp/res/values/theme_metro_green.xml
index 1e70dfcd..c72983a6 100644
--- a/calculatorpp/res/values/theme_metro_green.xml
+++ b/calculatorpp/res/values/theme_metro_green.xml
@@ -17,6 +17,7 @@
 	</style>
 
     <style name="metro_green_fragment_list_view_item_style" parent="default_fragment_list_view_item_style">
+        <item name="background">@drawable/metro_green_list_item</item>
         <item name="android:background">@drawable/metro_green_list_item</item>
     </style>
 
diff --git a/calculatorpp/res/values/theme_metro_purple.xml b/calculatorpp/res/values/theme_metro_purple.xml
index 40b6ee16..ace97bf1 100644
--- a/calculatorpp/res/values/theme_metro_purple.xml
+++ b/calculatorpp/res/values/theme_metro_purple.xml
@@ -17,6 +17,7 @@
 	</style>
 
     <style name="metro_purple_fragment_list_view_item_style" parent="default_fragment_list_view_item_style">
+        <item name="background">@drawable/metro_purple_list_item</item>
         <item name="android:background">@drawable/metro_purple_list_item</item>
     </style>