diff --git a/res/layout/add_contacts_confirmation_dialog_body.xml b/res/layout/add_contacts_confirmation_dialog_body.xml
index 07f3d0f..54281e9 100644
--- a/res/layout/add_contacts_confirmation_dialog_body.xml
+++ b/res/layout/add_contacts_confirmation_dialog_body.xml
@@ -28,7 +28,7 @@
         android:layout_width="@dimen/conversation_list_contact_icon_size"
         android:layout_height="@dimen/conversation_list_contact_icon_size"
         android:importantForAccessibility="no"
-        app:iconSize="large"
+        app:contactIconSize="large"
         android:layout_gravity="center_vertical"
         android:clickable="true" />
 
diff --git a/res/layout/blocked_participant_list_item_view.xml b/res/layout/blocked_participant_list_item_view.xml
index 7ac0ec9..b3a7138 100644
--- a/res/layout/blocked_participant_list_item_view.xml
+++ b/res/layout/blocked_participant_list_item_view.xml
@@ -26,7 +26,7 @@
         android:layout_width="@dimen/contact_list_icon_size"
         android:layout_height="@dimen/contact_list_icon_size"
         android:importantForAccessibility="no"
-        app:iconSize="normal"
+        app:contactIconSize="normal"
         android:layout_gravity="center_vertical"/>
     <TextView
         android:id="@+id/name"
diff --git a/res/layout/compose_message_view.xml b/res/layout/compose_message_view.xml
index bf93e10..4ebb7fe 100644
--- a/res/layout/compose_message_view.xml
+++ b/res/layout/compose_message_view.xml
@@ -157,7 +157,7 @@
                         android:layout_width="@dimen/conversation_message_contact_icon_size"
                         android:layout_height="@dimen/conversation_message_contact_icon_size"
                         android:importantForAccessibility="no"
-                        app:iconSize="normal"
+                        app:contactIconSize="normal"
                         app:reveal="true"
                         android:clickable="true" />
                     <ImageButton
diff --git a/res/layout/contact_list_item_view.xml b/res/layout/contact_list_item_view.xml
index 24ca07c..b321a9a 100644
--- a/res/layout/contact_list_item_view.xml
+++ b/res/layout/contact_list_item_view.xml
@@ -44,7 +44,7 @@
             android:layout_width="@dimen/contact_list_icon_size"
             android:layout_height="@dimen/contact_list_icon_size"
             android:importantForAccessibility="no"
-            app:iconSize="normal"
+            app:contactIconSize="normal"
             android:clickable="true" />
 
         <ImageView
diff --git a/res/layout/conversation_list_item_view.xml b/res/layout/conversation_list_item_view.xml
index aa3e4e8..53ecd97 100644
--- a/res/layout/conversation_list_item_view.xml
+++ b/res/layout/conversation_list_item_view.xml
@@ -81,7 +81,7 @@
                     android:layout_height="@dimen/conversation_list_contact_icon_size"
                     android:importantForAccessibility="no"
                     android:contentDescription="@null"
-                    app:iconSize="large"
+                    app:contactIconSize="large"
                     android:clickable="true"
                     android:background="@android:color/transparent" />
                 <ImageView
diff --git a/res/layout/conversation_message_view.xml b/res/layout/conversation_message_view.xml
index 25d3840..8905ba3 100644
--- a/res/layout/conversation_message_view.xml
+++ b/res/layout/conversation_message_view.xml
@@ -25,7 +25,7 @@
         android:id="@+id/conversation_icon"
         android:layout_width="@dimen/conversation_message_contact_icon_size"
         android:layout_height="@dimen/conversation_message_contact_icon_size"
-        app:iconSize="normal"
+        app:contactIconSize="normal"
         android:clickable="true"
         android:layout_gravity="center_vertical"
         android:importantForAccessibility="no" />
diff --git a/res/layout/person_item_view.xml b/res/layout/person_item_view.xml
index 9645024..3ae31f7 100644
--- a/res/layout/person_item_view.xml
+++ b/res/layout/person_item_view.xml
@@ -26,7 +26,7 @@
         android:layout_width="@dimen/contact_list_icon_size"
         android:layout_height="@dimen/contact_list_icon_size"
         android:importantForAccessibility="no"
-        app:iconSize="normal"
+        app:contactIconSize="normal"
         android:layout_gravity="center_vertical" />
 
     <LinearLayout
diff --git a/res/layout/sim_selector_item_view.xml b/res/layout/sim_selector_item_view.xml
index a20c4a9..5a3462c 100644
--- a/res/layout/sim_selector_item_view.xml
+++ b/res/layout/sim_selector_item_view.xml
@@ -60,6 +60,6 @@
         android:importantForAccessibility="no"
         android:layout_gravity="center_vertical"
         android:elevation="3dp"
-        app:iconSize="normal" />
+        app:contactIconSize="normal" />
 
 </com.android.messaging.ui.conversation.SimSelectorItemView>
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 8405871..84d84ae 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -17,7 +17,7 @@
 -->
 <resources>
     <declare-styleable name="ContactIconView">
-        <attr name="iconSize">
+        <attr name="contactIconSize">
             <enum name="normal" value="0" />
             <enum name="large" value="1" />
             <enum name="small" value="2" />
diff --git a/src/com/android/messaging/ui/ContactIconView.java b/src/com/android/messaging/ui/ContactIconView.java
index 3817e11..333bec4 100644
--- a/src/com/android/messaging/ui/ContactIconView.java
+++ b/src/com/android/messaging/ui/ContactIconView.java
@@ -57,7 +57,7 @@ public class ContactIconView extends AsyncImageView {
         final Resources resources = context.getResources();
         final TypedArray a = context.obtainStyledAttributes(attrs, R.styleable.ContactIconView);
 
-        final int iconSizeId = a.getInt(R.styleable.ContactIconView_iconSize, 0);
+        final int iconSizeId = a.getInt(R.styleable.ContactIconView_contactIconSize, 0);
         switch (iconSizeId) {
             case NORMAL_ICON_SIZE_ID:
                 mIconSize = (int) resources.getDimension(