diff --git a/indra/newview/llpanelavatar.cpp b/indra/newview/llpanelavatar.cpp
index 26e2f356f..85845e7f0 100644
--- a/indra/newview/llpanelavatar.cpp
+++ b/indra/newview/llpanelavatar.cpp
@@ -520,7 +520,7 @@ BOOL LLPanelAvatarSecondLife::postBuild(void)
 
 	getChild<LLUICtrl>("Add Friend...")->setCommitCallback(boost::bind(LLAvatarActions::requestFriendshipDialog, boost::bind(&LLPanelAvatar::getAvatarID, pa)));
 	getChild<LLUICtrl>("Pay...")->setCommitCallback(boost::bind(LLAvatarActions::pay, boost::bind(&LLPanelAvatar::getAvatarID, pa)));
-	childSetAction("Mute", LLPanelAvatar::onClickMute, pa);
+	getChild<LLUICtrl>("Mute")->setCommitCallback(boost::bind(LLAvatarActions::toggleBlock, boost::bind(&LLPanelAvatar::getAvatarID, pa)));
 
 	getChild<LLUICtrl>("Offer Teleport...")->setCommitCallback(boost::bind(static_cast<void(*)(const LLUUID&)>(LLAvatarActions::offerTeleport), boost::bind(&LLPanelAvatar::getAvatarID, pa)));
 
@@ -1727,26 +1727,6 @@ void LLPanelAvatar::onClickGetKey(void *userdata)
 	gViewerWindow->mWindow->copyTextToClipboard(utf8str_to_wstring(agent_id.asString()));
 }
 
-//-----------------------------------------------------------------------------
-// onClickMute()
-//-----------------------------------------------------------------------------
-void LLPanelAvatar::onClickMute(void *userdata)
-{
-	LLPanelAvatar* self = (LLPanelAvatar*) userdata;
-	
-	LLUUID agent_id = self->getAvatarID();
-
-	LLFloaterMute::showInstance();
-	if (LLAvatarActions::isBlocked(agent_id))
-	{
-		LLFloaterMute::getInstance()->selectMute(agent_id);
-	}
-	else
-	{
-		LLAvatarActions::toggleBlock(agent_id);
-	}
-}
-
 // static
 void LLPanelAvatar::onClickOK(void *userdata)
 {
diff --git a/indra/newview/llpanelavatar.h b/indra/newview/llpanelavatar.h
index ef9841992..a7c18e796 100644
--- a/indra/newview/llpanelavatar.h
+++ b/indra/newview/llpanelavatar.h
@@ -40,23 +40,11 @@
 #include "llavatarpropertiesprocessor.h"
 
 class LLAvatarName;
-class LLButton;
 class LLCheckBoxCtrl;
-class LLDropTarget;
-class LLInventoryItem;
 class LLLineEditor;
-class LLNameEditor;
 class LLPanelAvatar;
-class LLScrollListCtrl;
 class LLTabContainer;
-class LLTextBox;
-class LLTextEditor;
-class LLTextureCtrl;
-class LLUICtrl;
-class LLViewerTexture;
 class LLViewerObject;
-class LLMessageSystem;
-class LLIconCtrl;
 class LLMediaCtrl;
 class LLPanelPick;
 
@@ -328,7 +316,6 @@ public:
 	static void onClickGetKey(void *userdata);
 	static void onClickOK(		void *userdata);
 	static void onClickCancel(	void *userdata);
-	static void onClickMute(	void *userdata);
 
 private:
 	void enableOKIfReady();
diff --git a/indra/newview/skins/default/xui/en-us/panel_avatar.xml b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
index 3637ee8af..c4d6f0f97 100644
--- a/indra/newview/skins/default/xui/en-us/panel_avatar.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_avatar.xml
@@ -183,8 +183,8 @@
 			     label="Instant Message..." label_selected="Instant Message..."
 			     left_delta="71" mouse_opaque="true" name="Instant Message..."
 			     tool_tip="Instant Message (IM)" width="140" />
-			<button bottom="-470" ffont="SansSerif" halign="center" height="20" label="Mute"
-			     label_selected="Mute" left_delta="141" mouse_opaque="true" name="Mute"
+			<button bottom="-470" font="SansSerifSmall" halign="center" height="20" label="(Un)Mute"
+			     left_delta="141" mouse_opaque="true" name="Mute"
 			     width="60" />
 			<button bottom="-470" font="SansSerif" halign="center" height="20" label="Invite to Group"
 			     label_selected="Invite to Group" left_delta="61" mouse_opaque="true"