diff --git a/indra/newview/llvoiceremotectrl.cpp b/indra/newview/llvoiceremotectrl.cpp
index 7566db6b1..fb6988378 100644
--- a/indra/newview/llvoiceremotectrl.cpp
+++ b/indra/newview/llvoiceremotectrl.cpp
@@ -49,14 +49,7 @@ LLVoiceRemoteCtrl::LLVoiceRemoteCtrl (const std::string& name) : LLPanel(name)
 {
 	setIsChrome(TRUE);
 
-	if (gSavedSettings.getBOOL("ShowVoiceChannelPopup"))
-	{
-		LLUICtrlFactory::getInstance()->buildPanel(this, "panel_voice_remote_expanded.xml");
-	}
-	else
-	{
-		LLUICtrlFactory::getInstance()->buildPanel(this, "panel_voice_remote.xml");
-	}
+	LLUICtrlFactory::getInstance()->buildPanel(this, gSavedSettings.getBOOL("ShowVoiceChannelPopup") ? "panel_voice_remote_expanded.xml" : "panel_voice_remote.xml");
 
 	setFocusRoot(TRUE);
 }
@@ -73,7 +66,6 @@ BOOL LLVoiceRemoteCtrl::postBuild()
 	mTalkBtn->setMouseUpCallback(boost::bind(&LLVoiceRemoteCtrl::onBtnTalkReleased));
 
 	mTalkLockBtn = getChild<LLButton>("ptt_lock");
-	mTalkLockBtn->setClickedCallback(boost::bind(&LLVoiceRemoteCtrl::onBtnLock,this));
 
 	mSpeakersBtn = getChild<LLButton>("speakers_btn");
 	mSpeakersBtn->setClickedCallback(boost::bind(&LLVoiceRemoteCtrl::onClickSpeakers));
@@ -92,12 +84,12 @@ BOOL LLVoiceRemoteCtrl::postBuild()
 		voice_channel_bg->setClickedCallback(boost::bind(&LLVoiceRemoteCtrl::onClickVoiceChannel));
 
 	mVoiceVolIcon.connect(this,"voice_volume");
-	mShowChanBtn.connect(this,"show_channel");
 	return TRUE;
 }
 
 void LLVoiceRemoteCtrl::draw()
 {
+	// Singu TODO: I'm pretty sure voice channel changing can be done outside of draw call ~Liru
 	BOOL voice_active = FALSE;
 	LLVoiceChannel* channelp = LLVoiceChannel::getCurrentVoiceChannel();
 	if (channelp)
@@ -108,15 +100,13 @@ void LLVoiceRemoteCtrl::draw()
 	mTalkBtn->setEnabled(voice_active);
 	mTalkLockBtn->setEnabled(voice_active);
 
-	static LLCachedControl<bool> ptt_currently_enabled("PTTCurrentlyEnabled",false);
 	// propagate ptt state to button display,
 	if (!mTalkBtn->hasMouseCapture())
 	{
 		// not in push to talk mode, or push to talk is active means I'm talking
-		mTalkBtn->setToggleState(!ptt_currently_enabled || LLVoiceClient::getInstance()->getUserPTTState());
+		mTalkBtn->setToggleState(!mTalkLockBtn->getToggleState() || LLVoiceClient::getInstance()->getUserPTTState());
 	}
 	mSpeakersBtn->setToggleState(LLFloaterActiveSpeakers::instanceVisible(LLSD()));
-	mTalkLockBtn->setToggleState(!ptt_currently_enabled);
 
 	std::string talk_blip_image;
 	if (LLVoiceClient::getInstance()->getIsSpeaking(gAgent.getID()))
@@ -207,19 +197,6 @@ void LLVoiceRemoteCtrl::draw()
 		}
 	}
 
-	LLButton* expand_button = mShowChanBtn;
-	if (expand_button)
-	{
-		if (expand_button->getToggleState())
-		{
-			expand_button->setImageOverlay(std::string("arrow_down.tga"));
-		}
-		else
-		{
-			expand_button->setImageOverlay(std::string("arrow_up.tga"));
-		}
-	}
-
 	LLPanel::draw();
 }
 
@@ -250,27 +227,13 @@ void LLVoiceRemoteCtrl::onBtnTalkReleased()
 	}
 }
 
-void LLVoiceRemoteCtrl::onBtnLock(void* user_data)
-{
-	LLVoiceRemoteCtrl* remotep = (LLVoiceRemoteCtrl*)user_data;
-
-	gSavedSettings.setBOOL("PTTCurrentlyEnabled", !remotep->mTalkLockBtn->getToggleState());
-}
-
 //static
 void LLVoiceRemoteCtrl::onClickPopupBtn(void* user_data)
 {
 	LLVoiceRemoteCtrl* remotep = (LLVoiceRemoteCtrl*)user_data;
 
 	remotep->deleteAllChildren();
-	if (gSavedSettings.getBOOL("ShowVoiceChannelPopup"))
-	{
-		LLUICtrlFactory::getInstance()->buildPanel(remotep, "panel_voice_remote_expanded.xml");
-	}
-	else
-	{
-		LLUICtrlFactory::getInstance()->buildPanel(remotep, "panel_voice_remote.xml");
-	}
+	LLUICtrlFactory::getInstance()->buildPanel(remotep, gSavedSettings.getBOOL("ShowVoiceChannelPopup") ? "panel_voice_remote_expanded.xml" : "panel_voice_remote.xml");
 	gOverlayBar->layoutButtons();
 }
 
diff --git a/indra/newview/llvoiceremotectrl.h b/indra/newview/llvoiceremotectrl.h
index 69ea20ae1..f6ea33705 100644
--- a/indra/newview/llvoiceremotectrl.h
+++ b/indra/newview/llvoiceremotectrl.h
@@ -48,7 +48,6 @@ public:
 	/*virtual*/ BOOL postBuild();
 	/*virtual*/ void draw();
 
-	static void onBtnLock(void* user_data);
 	static void onBtnTalkHeld();
 	static void onBtnTalkReleased();
 	static void onBtnTalkClicked();
@@ -62,7 +61,6 @@ protected:
 	LLButton* mTalkLockBtn;
 	LLButton* mSpeakersBtn;
 	CachedUICtrl<LLIconCtrl> mVoiceVolIcon;
-	CachedUICtrl<LLButton> mShowChanBtn;
 };
 
 #endif // LL_LLVOICEREMOTECTRL_H
diff --git a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
index 29fdfd072..699328d39 100644
--- a/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_speaker_controls.xml
@@ -9,7 +9,7 @@
 			</combo_box>
 		</layout_panel>
 		<layout_panel auto_resize="true" bottom="0" can_resize="false" height="120" min_height="100" name="moderate_chat_panel" top_delta="0" user_resize="false" visible="true" width="140">
-			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="true" name="speakers_list" right="140" search_column="1" sort_column="2" top="113" menu_num="0">
+			<scroll_list bottom="78" can_resize="false" column_padding="0" draw_heading="true" draw_stripes="false" follows="left|top|bottom|right" left="0" multi_select="true" name="speakers_list" right="140" search_column="1" sort_column="2" top="113">
 				<column name="icon_speaking_status" sort="speaking_status" width="20"/>
 				<column dynamicwidth="true" label="Name" name="speaker_name"/>
 				<column label="" name="speaking_status" width="0"/>
diff --git a/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml b/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml
index 1d558c3c3..f57baf4a2 100644
--- a/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml
+++ b/indra/newview/skins/default/xui/en-us/panel_voice_controls.xml
@@ -9,11 +9,12 @@
 	     tab_stop="false" tool_tip="Hold the button to talk" width="60" />
 	<button bottom="-19" height="16" image_selected="ptt_lock_on.tga"
 	     image_unselected="ptt_lock_off.tga" label="" left_delta="4" name="ptt_lock"
-	     scale_image="false" toggle="true"
+	     scale_image="false" toggle="true" control_name="PTTCurrentlyEnabled"
 	     tool_tip="Click lock to switch to talk mode" width="16" />
 	<icon bottom="-19" height="16" image_name="icn_voice_ptt-off.tga" left_delta="42"
 	     name="voice_volume" width="16" />
 	<button bottom="-22" control_name="ShowVoiceChannelPopup" height="22" label=""
 	     left_delta="16" name="show_channel" scale_image="true" toggle="true"
+	     image_selected="arrow_down.tga" image_unselected="arrow_up.tga"
 	     tool_tip="Click to show current voice channel" width="22" />
 </panel>