diff --git a/res/layout/quickcontact_photo_container.xml b/res/layout/quickcontact_photo_container.xml
index 409b16e..723665f 100644
--- a/res/layout/quickcontact_photo_container.xml
+++ b/res/layout/quickcontact_photo_container.xml
@@ -25,7 +25,8 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scaleType="centerCrop"
-            android:clickable="true" />
+            android:clickable="true"
+            android:contentDescription="@string/description_contact_photo" />
         <View
             android:layout_width="match_parent"
             android:layout_height="1dip"
@@ -40,11 +41,10 @@
             android:layout_alignRight="@id/photo"
             android:layout_alignStart="@id/photo"
             android:layout_alignEnd="@id/photo"
-            android:background="@color/quickcontact_name_detail_background"/>
+            android:background="@color/quickcontact_name_detail_background" />
         <ImageView
             android:id="@+id/contact_details_image"
             android:src="@drawable/ic_contacts_holo_dark"
-            android:contentDescription="@null"
             android:layout_height="wrap_content"
             android:layout_width="wrap_content"
             android:layout_marginRight="16dip"
@@ -53,7 +53,8 @@
             android:layout_alignBottom="@id/photo_text_bar"
             android:layout_alignRight="@id/photo_text_bar"
             android:layout_alignEnd="@id/photo_text_bar"
-            android:clickable="true"/>
+            android:clickable="true"
+            android:contentDescription="@string/viewContactDesription" />
         <ImageView
             android:id="@+id/quickcontact_star_button"
             android:src="@drawable/ic_favorite_off_lt"
@@ -65,7 +66,8 @@
             android:layout_alignBottom="@id/photo_text_bar"
             android:layout_toLeftOf="@id/contact_details_image"
             android:layout_toStartOf="@id/contact_details_image"
-            android:clickable="true"/>
+            android:clickable="true"
+            android:contentDescription="@string/menu_addStar" />
         <TextView
             android:id="@+id/name"
             android:layout_width="match_parent"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 8326603..dd0406b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -451,10 +451,10 @@
     <!-- The button to add an organization field to a contact in the Raw Contact Editor [CHAR LIMIT=15] -->
     <string name="group_edit_field_hint_text">Group name</string>
 
-    <!-- Attbution of a contact status update, when the time of update is unknown -->
+    <!-- Attribution of a contact status update, when the time of update is unknown -->
     <string name="contact_status_update_attribution">via <xliff:g id="source" example="Google Talk">%1$s</xliff:g></string>
 
-    <!-- Attbution of a contact status update, when the time of update is known -->
+    <!-- Attribution of a contact status update, when the time of update is known -->
     <string name="contact_status_update_attribution_with_date"><xliff:g id="date" example="3 hours ago">%1$s</xliff:g> via <xliff:g id="source" example="Google Talk">%2$s</xliff:g></string>
 
     <!-- String describing the Star/Favorite checkbox
diff --git a/src/com/android/contacts/quickcontact/QuickContactActivity.java b/src/com/android/contacts/quickcontact/QuickContactActivity.java
index 15e119b..c7d6e51 100644
--- a/src/com/android/contacts/quickcontact/QuickContactActivity.java
+++ b/src/com/android/contacts/quickcontact/QuickContactActivity.java
@@ -375,8 +375,12 @@
         final boolean isStarred = data.getStarred();
         if (isStarred) {
             mStarImage.setImageResource(R.drawable.ic_favorite_on_lt);
+            mStarImage.setContentDescription(
+                getResources().getString(R.string.menu_removeStar));
         } else {
             mStarImage.setImageResource(R.drawable.ic_favorite_off_lt);
+            mStarImage.setContentDescription(
+                getResources().getString(R.string.menu_addStar));
         }
         final Uri lookupUri = data.getLookupUri();
 
