diff --git a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
index ec98d9f28..df6e2b929 100644
--- a/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
+++ b/astrid/plugin-src/com/todoroo/astrid/actfm/TagUpdatesFragment.java
@@ -172,7 +172,7 @@ public class TagUpdatesFragment extends ListFragment {
     }
 
     private void resetPictureButton() {
-        pictureButton.setImageResource(R.drawable.camera_button_gray);
+        pictureButton.setImageResource(R.drawable.camera_button);
     }
 
     private void refreshUpdatesList() {
diff --git a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
index 2ebd523a7..a2b7cf3cf 100644
--- a/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
+++ b/astrid/plugin-src/com/todoroo/astrid/notes/EditNoteActivity.java
@@ -116,7 +116,7 @@ public class EditNoteActivity extends LinearLayout implements TimerActionListene
     }
 
     private int getDefaultCameraButton() {
-        return R.drawable.camera_button_gray;
+        return R.drawable.camera_button;
     }
 
     public void loadViewForTaskID(long t){
diff --git a/astrid/res/drawable/camera_button.xml b/astrid/res/drawable/camera_button.xml
new file mode 100644
index 000000000..82aaa4e11
--- /dev/null
+++ b/astrid/res/drawable/camera_button.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/camera_button_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/camera_button_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/camera_button_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/camera_button_gray.png b/astrid/res/drawable/camera_button_gray.png
deleted file mode 100644
index 1541e783f..000000000
Binary files a/astrid/res/drawable/camera_button_gray.png and /dev/null differ
diff --git a/astrid/res/drawable/camera_button_normal.png b/astrid/res/drawable/camera_button_normal.png
new file mode 100644
index 000000000..223e387e2
Binary files /dev/null and b/astrid/res/drawable/camera_button_normal.png differ
diff --git a/astrid/res/drawable/camera_button_pressed.png b/astrid/res/drawable/camera_button_pressed.png
new file mode 100644
index 000000000..51a43a480
Binary files /dev/null and b/astrid/res/drawable/camera_button_pressed.png differ
diff --git a/astrid/res/drawable/comment_blue.png b/astrid/res/drawable/comment_blue.png
deleted file mode 100644
index 25ede0224..000000000
Binary files a/astrid/res/drawable/comment_blue.png and /dev/null differ
diff --git a/astrid/res/drawable/comment_blue.xml b/astrid/res/drawable/comment_blue.xml
new file mode 100644
index 000000000..24b3265d3
--- /dev/null
+++ b/astrid/res/drawable/comment_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/comment_blue_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/comment_blue_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_blue_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/comment_blue_normal.png b/astrid/res/drawable/comment_blue_normal.png
new file mode 100644
index 000000000..e60f6108b
Binary files /dev/null and b/astrid/res/drawable/comment_blue_normal.png differ
diff --git a/astrid/res/drawable/comment_blue_pressed.png b/astrid/res/drawable/comment_blue_pressed.png
new file mode 100644
index 000000000..c061a5ddb
Binary files /dev/null and b/astrid/res/drawable/comment_blue_pressed.png differ
diff --git a/astrid/res/drawable/comment_dark_blue.xml b/astrid/res/drawable/comment_dark_blue.xml
new file mode 100644
index 000000000..d14da0ae3
--- /dev/null
+++ b/astrid/res/drawable/comment_dark_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/comment_dark_blue_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/comment_dark_blue_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_dark_blue_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/comment_dark_blue_normal.png b/astrid/res/drawable/comment_dark_blue_normal.png
new file mode 100644
index 000000000..1fcddd3dd
Binary files /dev/null and b/astrid/res/drawable/comment_dark_blue_normal.png differ
diff --git a/astrid/res/drawable/comment_dark_blue_pressed.png b/astrid/res/drawable/comment_dark_blue_pressed.png
new file mode 100644
index 000000000..786cfaf3a
Binary files /dev/null and b/astrid/res/drawable/comment_dark_blue_pressed.png differ
diff --git a/astrid/res/drawable/comment_red.png b/astrid/res/drawable/comment_red.png
deleted file mode 100644
index 2c942763f..000000000
Binary files a/astrid/res/drawable/comment_red.png and /dev/null differ
diff --git a/astrid/res/drawable/comment_red.xml b/astrid/res/drawable/comment_red.xml
new file mode 100644
index 000000000..9dc521aad
--- /dev/null
+++ b/astrid/res/drawable/comment_red.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/comment_red_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/comment_red_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/comment_red_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/comment_red_normal.png b/astrid/res/drawable/comment_red_normal.png
new file mode 100644
index 000000000..7b6c61db2
Binary files /dev/null and b/astrid/res/drawable/comment_red_normal.png differ
diff --git a/astrid/res/drawable/comment_red_pressed.png b/astrid/res/drawable/comment_red_pressed.png
new file mode 100644
index 000000000..2a45fe477
Binary files /dev/null and b/astrid/res/drawable/comment_red_pressed.png differ
diff --git a/astrid/res/drawable/mic_button_blue.png b/astrid/res/drawable/mic_button_blue.png
deleted file mode 100644
index 6fedb507d..000000000
Binary files a/astrid/res/drawable/mic_button_blue.png and /dev/null differ
diff --git a/astrid/res/drawable/mic_button_dark_blue.png b/astrid/res/drawable/mic_button_dark_blue.png
deleted file mode 100644
index ab3fd2e09..000000000
Binary files a/astrid/res/drawable/mic_button_dark_blue.png and /dev/null differ
diff --git a/astrid/res/drawable/mic_button_gray.png b/astrid/res/drawable/mic_button_gray.png
deleted file mode 100644
index 13c86b391..000000000
Binary files a/astrid/res/drawable/mic_button_gray.png and /dev/null differ
diff --git a/astrid/res/drawable/plus_button_blue.xml b/astrid/res/drawable/plus_button_blue.xml
new file mode 100644
index 000000000..72bb9269f
--- /dev/null
+++ b/astrid/res/drawable/plus_button_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/plus_button_blue_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/plus_button_blue_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_blue_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/plus_button_blue.png b/astrid/res/drawable/plus_button_blue_normal.png
similarity index 100%
rename from astrid/res/drawable/plus_button_blue.png
rename to astrid/res/drawable/plus_button_blue_normal.png
diff --git a/astrid/res/drawable/comment_dark_blue.png b/astrid/res/drawable/plus_button_blue_pressed.png
similarity index 87%
rename from astrid/res/drawable/comment_dark_blue.png
rename to astrid/res/drawable/plus_button_blue_pressed.png
index b8f8836b9..236adfc4b 100644
Binary files a/astrid/res/drawable/comment_dark_blue.png and b/astrid/res/drawable/plus_button_blue_pressed.png differ
diff --git a/astrid/res/drawable/plus_button_dark_blue.xml b/astrid/res/drawable/plus_button_dark_blue.xml
new file mode 100644
index 000000000..3d3eb1f22
--- /dev/null
+++ b/astrid/res/drawable/plus_button_dark_blue.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/plus_button_dark_blue_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/plus_button_dark_blue_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_dark_blue_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/plus_button_dark_blue.png b/astrid/res/drawable/plus_button_dark_blue_normal.png
similarity index 100%
rename from astrid/res/drawable/plus_button_dark_blue.png
rename to astrid/res/drawable/plus_button_dark_blue_normal.png
diff --git a/astrid/res/drawable/plus_button_dark_blue_pressed.png b/astrid/res/drawable/plus_button_dark_blue_pressed.png
new file mode 100644
index 000000000..fe6a1940d
Binary files /dev/null and b/astrid/res/drawable/plus_button_dark_blue_pressed.png differ
diff --git a/astrid/res/drawable/plus_button_red.xml b/astrid/res/drawable/plus_button_red.xml
new file mode 100644
index 000000000..a3b654a94
--- /dev/null
+++ b/astrid/res/drawable/plus_button_red.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item android:state_pressed="true" android:drawable="@drawable/plus_button_red_pressed"/>
+    <item android:state_focused="true" android:drawable="@drawable/plus_button_red_pressed"/>
+    <item android:state_pressed="false" android:state_focused="false" android:drawable="@drawable/plus_button_red_normal"/>
+</selector>
\ No newline at end of file
diff --git a/astrid/res/drawable/plus_button_red.png b/astrid/res/drawable/plus_button_red_normal.png
similarity index 100%
rename from astrid/res/drawable/plus_button_red.png
rename to astrid/res/drawable/plus_button_red_normal.png
diff --git a/astrid/res/drawable/mic_button_red.png b/astrid/res/drawable/plus_button_red_pressed.png
similarity index 82%
rename from astrid/res/drawable/mic_button_red.png
rename to astrid/res/drawable/plus_button_red_pressed.png
index e1718190d..253647193 100644
Binary files a/astrid/res/drawable/mic_button_red.png and b/astrid/res/drawable/plus_button_red_pressed.png differ
diff --git a/astrid/res/layout/header_nav_views.xml b/astrid/res/layout/header_nav_views.xml
index 1f2f8dc27..9ecf1979a 100644
--- a/astrid/res/layout/header_nav_views.xml
+++ b/astrid/res/layout/header_nav_views.xml
@@ -64,11 +64,11 @@
         android:layout_marginBottom="4dip"
         android:layout_marginTop="4dip"/>
 	
-	<ImageView 
+	<ImageButton 
 	    android:id="@+id/comments"
 	    android:layout_width="51dip"
 	    android:layout_height="fill_parent"
-	    android:padding="7dip"
+	    android:background="@android:color/transparent"
 	    android:src="?attr/asCommentButtonImg"
 	    android:scaleType="fitCenter"/>
 
diff --git a/astrid/res/layout/tag_updates_fragment.xml b/astrid/res/layout/tag_updates_fragment.xml
index ba565ebf4..f423d154b 100644
--- a/astrid/res/layout/tag_updates_fragment.xml
+++ b/astrid/res/layout/tag_updates_fragment.xml
@@ -42,12 +42,10 @@
             android:layout_gravity="top"
             android:layout_marginRight="3dip"
             android:layout_weight="1"
-            android:background="#00000000"
             android:paddingBottom="2dip"
-            android:paddingLeft="7dip"
-            android:paddingRight="7dip"
             android:scaleType="centerInside"
-            android:src="@drawable/camera_button_gray" />
+            android:background="@android:color/transparent"
+            android:src="@drawable/camera_button" />
 
         <!-- Quick Add Task -->
 
diff --git a/astrid/res/layout/task_edit_activity.xml b/astrid/res/layout/task_edit_activity.xml
index c1f2d38bf..2729cdfcc 100644
--- a/astrid/res/layout/task_edit_activity.xml
+++ b/astrid/res/layout/task_edit_activity.xml
@@ -137,12 +137,10 @@
             android:layout_gravity="top"
             android:layout_marginRight="3dip"
             android:layout_weight="1"
-            android:background="#00000000"
             android:paddingBottom="2dip"
-            android:paddingLeft="7dip"
-            android:paddingRight="7dip"
             android:scaleType="centerInside"
-            android:src="@drawable/camera_button_gray" />
+            android:background="@android:color/transparent"
+            android:src="@drawable/camera_button" />
 
         <!-- Quick Add Task -->
 
@@ -201,7 +199,8 @@
             android:layout_gravity="top"
             android:layout_marginLeft="3dip"
             android:layout_weight="1"
-            android:background="?attr/asAddButtonImg"
+            android:background="@android:color/transparent"
+            android:src="?attr/asAddButtonImg"
             android:scaleType="center"
             android:visibility="gone" />
     </LinearLayout>
diff --git a/astrid/res/layout/task_list_activity.xml b/astrid/res/layout/task_list_activity.xml
index 0718431b0..d4c031d7e 100644
--- a/astrid/res/layout/task_list_activity.xml
+++ b/astrid/res/layout/task_list_activity.xml
@@ -68,7 +68,8 @@
             android:layout_gravity="top"
             android:layout_marginRight="5dip"
             android:layout_weight="1"
-            android:background="?attr/asAddButtonImg"
+            android:background="@android:color/transparent"
+            android:src="?attr/asAddButtonImg"
             android:scaleType="center"/> 
 
     </LinearLayout>