diff --git a/res/drawable/btn_checkbox_star.xml b/res/drawable/btn_checkbox_star.xml
deleted file mode 100644
index 08a8699..0000000
--- a/res/drawable/btn_checkbox_star.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_checked="true"
-          android:drawable="@drawable/ic_bookmark_on_holo_dark" />
-    <item android:state_checked="false"
-          android:drawable="@drawable/ic_bookmark_off_holo_dark" />
-</selector>
diff --git a/res/drawable/btn_imageview_star.xml b/res/drawable/btn_imageview_star.xml
deleted file mode 100644
index c1bfb5d..0000000
--- a/res/drawable/btn_imageview_star.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:state_activated="true"
-          android:drawable="@drawable/ic_bookmark_on_holo_dark" />
-    <item android:state_activated="false"
-          android:drawable="@drawable/ic_bookmark_off_holo_dark" />
-</selector>
diff --git a/res/drawable/ic_action_close.xml b/res/drawable/ic_action_close.xml
new file mode 100644
index 0000000..bda0783
--- /dev/null
+++ b/res/drawable/ic_action_close.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are
+     met:
+         * Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+         * Redistributions in binary form must reproduce the above
+           copyright notice, this list of conditions and the following
+           disclaimer in the documentation and/or other materials provided
+           with the distribution.
+         * Neither the name of The Linux Foundation nor the names of its
+           contributors may be used to endorse or promote products derived
+           from this software without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+     ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="true" android:state_pressed="true"
+        android:drawable="@drawable/ic_action_stop_active" />
+
+    <item android:state_enabled="true" android:state_selected="true"
+        android:drawable="@drawable/ic_action_stop_active" />
+
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_action_stop_disabled" />
+
+    <item android:drawable="@drawable/ic_action_stop_normal" />
+
+</selector>
diff --git a/res/drawable/ic_action_close_inverted.xml b/res/drawable/ic_action_close_inverted.xml
new file mode 100644
index 0000000..da99880
--- /dev/null
+++ b/res/drawable/ic_action_close_inverted.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+     Copyright (c) 2014, The Linux Foundation. All rights reserved.
+
+     Redistribution and use in source and binary forms, with or without
+     modification, are permitted provided that the following conditions are
+     met:
+         * Redistributions of source code must retain the above copyright
+           notice, this list of conditions and the following disclaimer.
+         * Redistributions in binary form must reproduce the above
+           copyright notice, this list of conditions and the following
+           disclaimer in the documentation and/or other materials provided
+           with the distribution.
+         * Neither the name of The Linux Foundation nor the names of its
+           contributors may be used to endorse or promote products derived
+           from this software without specific prior written permission.
+
+     THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED
+     WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+     MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT
+     ARE DISCLAIMED.  IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS
+     BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+     CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+     SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+     BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+     WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+     OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+     IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+-->
+
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item android:state_enabled="true" android:state_pressed="true"
+        android:drawable="@drawable/ic_action_stop_active" />
+
+    <item android:state_enabled="true" android:state_selected="true"
+        android:drawable="@drawable/ic_action_stop_active" />
+
+    <item android:state_enabled="false"
+        android:drawable="@drawable/ic_action_stop_disabled" />
+
+    <item android:drawable="@drawable/ic_action_stop_normal_inverted" />
+
+</selector>
diff --git a/res/drawable/ic_querybuilder.xml b/res/drawable/ic_action_querybuilder.xml
similarity index 75%
rename from res/drawable/ic_querybuilder.xml
rename to res/drawable/ic_action_querybuilder.xml
index 9522945..8a81e22 100644
--- a/res/drawable/ic_querybuilder.xml
+++ b/res/drawable/ic_action_querybuilder.xml
@@ -17,18 +17,18 @@
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
 
     <item android:state_enabled="false"
-        android:drawable="@drawable/ic_querybuilder_disabled" />
+        android:drawable="@drawable/ic_action_querybuilder_disabled" />
 
     <item android:state_enabled="true" android:state_pressed="true"
-        android:drawable="@drawable/ic_querybuilder_pressed" />
+        android:drawable="@drawable/ic_action_querybuilder_active" />
 
     <item android:state_enabled="true" android:state_focused="true"
         android:state_window_focused="true"
-        android:drawable="@drawable/ic_querybuilder_pressed" />
+        android:drawable="@drawable/ic_action_querybuilder_active" />
 
     <item android:state_enabled="true" android:state_selected="true"
-        android:drawable="@drawable/ic_querybuilder_pressed" />
+        android:drawable="@drawable/ic_action_querybuilder_active" />
 
     <item android:state_enabled="true"
-        android:drawable="@drawable/ic_querybuilder_normal" />
+        android:drawable="@drawable/ic_action_querybuilder_normal" />
 </selector>