diff --git a/indra/newview/llavatarlistitem.h b/indra/newview/llavatarlistitem.h
index 8e359f16b304add7351f8fdcdde9461aa50358cc..79303b55cc3466c8812f289429ead15330eb93ba 100644
--- a/indra/newview/llavatarlistitem.h
+++ b/indra/newview/llavatarlistitem.h
@@ -114,6 +114,8 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
 	 */
 	LLOutputMonitorCtrl* mSpeakingIndicator;
 
+	LLAvatarIconCtrl* mAvatarIcon;
+
 private:
 
 	typedef enum e_online_status {
@@ -133,7 +135,6 @@ class LLAvatarListItem : public LLPanel, public LLFriendObserver
 	typedef std::map<EItemStyle, LLColor4> icon_color_map_t;
 	static icon_color_map_t& getItemIconColorMap();
 
-	LLAvatarIconCtrl* mAvatarIcon;
 	LLTextBox* mAvatarName;
 	LLTextBox* mLastInteractionTime;
 	LLStyle::Params mAvatarNameStyle;
diff --git a/indra/newview/llcallfloater.cpp b/indra/newview/llcallfloater.cpp
index 581890c4fd8636529a244b5fc5a5f7e10e81d9d2..1b4c274bfb817224503661c08ad9ce22a8ff263b 100644
--- a/indra/newview/llcallfloater.cpp
+++ b/indra/newview/llcallfloater.cpp
@@ -40,6 +40,7 @@
 
 #include "llagent.h"
 #include "llagentdata.h" // for gAgentID
+#include "llavatariconctrl.h"
 #include "llavatarlist.h"
 #include "llbottomtray.h"
 #include "llimfloater.h"
@@ -67,6 +68,8 @@ class LLNonAvatarCaller : public LLAvatarListItem
 			showLastInteractionTime(false);
 			setShowProfileBtn(false);
 			setShowInfoBtn(false);
+			mAvatarIcon->setValue("Avaline_Icon");
+			mAvatarIcon->setToolTip(std::string(""));
 		}
 		return rv;
 	}
diff --git a/indra/newview/llimview.cpp b/indra/newview/llimview.cpp
index 388e0c8d8d9ef57310ca367900b4f32d4a5b58d3..37ab144934b673785fd2f96185be6ea78070d2e3 100644
--- a/indra/newview/llimview.cpp
+++ b/indra/newview/llimview.cpp
@@ -1712,7 +1712,14 @@ BOOL LLIncomingCallDialog::postBuild()
 	LLUICtrl* caller_name_widget = getChild<LLUICtrl>("caller name");
 	caller_name_widget->setValue(caller_name + " " + call_type);
 	LLAvatarIconCtrl* icon = getChild<LLAvatarIconCtrl>("avatar_icon");
-	icon->setValue(caller_id);
+	if (is_avatar)
+	{
+		icon->setValue(caller_id);
+	}
+	else
+	{
+		icon->setValue("Avaline_Icon");
+	}
 
 	childSetAction("Accept", onAccept, this);
 	childSetAction("Reject", onReject, this);
diff --git a/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..3bb7f7183cd751eddcabd75da8b9f1dc9e86f0f3
Binary files /dev/null and b/indra/newview/skins/default/textures/icons/avaline_default_icon.jpg differ
diff --git a/indra/newview/skins/default/textures/textures.xml b/indra/newview/skins/default/textures/textures.xml
index 8a9126208a3093332d3a819f51522ca920d591df..95db84cb32754a4aff5e511975d926c82181beda 100644
--- a/indra/newview/skins/default/textures/textures.xml
+++ b/indra/newview/skins/default/textures/textures.xml
@@ -70,6 +70,8 @@ with the same filename but different name
   <texture name="Audio_Over" file_name="icons/Audio_Over.png" preload="false" />
   <texture name="Audio_Press" file_name="icons/Audio_Press.png" preload="false" />
 
+  <texture name="Avaline_Icon" file_name="icons/avaline_default_icon.jpg" preload="true" />
+  
   <texture name="BackArrow_Disabled" file_name="icons/BackArrow_Disabled.png" preload="false" />
   <texture name="BackArrow_Off" file_name="icons/BackArrow_Off.png" preload="false" />
   <texture name="BackArrow_Press" file_name="icons/BackArrow_Press.png" preload="false" />