@@ -349,7 +349,7 @@
 					</OnLoad>
 					<OnEnter>
 						GameTooltip:SetOwner(self, "ANCHOR_TOPRIGHT");
-						GameTooltip:SetText(OPTION_TOOLTIP_SOUND_OUTPUT, nil, nil, nil, nil, 1);
+						GameTooltip:SetText(OPTION_TOOLTIP_SOUND_OUTPUT, nil, nil, nil, nil, true);
 						GameTooltip:Show();
 					</OnEnter>
 					<OnLeave function="GameTooltip_Hide"/>
@@ -382,7 +382,7 @@
 					</OnLoad>
 					<OnEnter>
 						GameTooltip:SetOwner(self, "ANCHOR_TOPRIGHT");
-						GameTooltip:SetText(OPTION_TOOLTIP_SOUND_CHANNELS, nil, nil, nil, nil, 1);
+						GameTooltip:SetText(OPTION_TOOLTIP_SOUND_CHANNELS, nil, nil, nil, nil, true);
 						GameTooltip:Show();
 					</OnEnter>
 					<OnLeave function="GameTooltip_Hide"/>
@@ -404,7 +404,7 @@
 				</Scripts>
 			</CheckButton>-->
 			<Frame name="$parentVolume" inherits="OptionsBoxTemplate">
-				<Size x="186" y="144"/>
+				<Size x="186" y="174"/>
 				<Anchors>
 					<Anchor point="TOPLEFT" relativeTo="$parentHardware" relativePoint="BOTTOMLEFT">
 						<Offset x="0" y="-16"/>
@@ -464,10 +464,10 @@
 						if ( self:IsEnabled() ) then
 							if ( self.tooltipText ) then
 								GameTooltip:SetOwner(self, self.tooltipOwnerPoint or "ANCHOR_RIGHT");
-								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, 1);
+								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, true);
 							end
 							if (not AudioOptionsSoundPanelEnableSound:GetChecked()) then								
-								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, 1.0, 1);
+								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, true);
 								GameTooltip:Show();
 							end							
 						end
@@ -522,10 +522,10 @@
 						if ( self:IsEnabled() ) then
 							if ( self.tooltipText ) then
 								GameTooltip:SetOwner(self, self.tooltipOwnerPoint or "ANCHOR_RIGHT");
-								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, 1);
+								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, true);
 							end
 							if (not AudioOptionsSoundPanelSoundEffects:GetChecked()) then								
-								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, 1.0, 1);
+								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, true);
 								GameTooltip:Show();
 							end							
 						end
@@ -576,10 +576,10 @@
 						if ( self:IsEnabled() ) then
 							if ( self.tooltipText ) then
 								GameTooltip:SetOwner(self, self.tooltipOwnerPoint or "ANCHOR_RIGHT");
-								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, 1);
+								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, true);
 							end
 							if (not AudioOptionsSoundPanelMusic:GetChecked()) then								
-								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, 1.0, 1);
+								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, true);
 								GameTooltip:Show();
 							end							
 						end
@@ -630,16 +630,66 @@
 						if ( self:IsEnabled() ) then
 							if ( self.tooltipText ) then
 								GameTooltip:SetOwner(self, self.tooltipOwnerPoint or "ANCHOR_RIGHT");
-								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, 1);
+								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, true);
 							end
 							if (not AudioOptionsSoundPanelAmbientSounds:GetChecked()) then								
-								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, 1.0, 1);
+								GameTooltip:AddLine(MUTED, 1.0, 0.0, 0.0, true);
 								GameTooltip:Show();
 							end							
 						end
 					</OnEnter>
 				</Scripts>
 			</Slider>
+			<Slider name="$parentDialogVolume" inherits="OptionsSliderTemplate">
+				<Size x="100" y="17"/>
+				<Anchors>
+					<Anchor point="TOPRIGHT" relativeTo="$parentAmbienceVolume" relativePoint="BOTTOMRIGHT">
+						<Offset>
+							<AbsDimension x="0" y="-10"/>
+						</Offset>
+					</Anchor>
+				</Anchors>
+				<Layers>
+					<Layer level="ARTWORK">
+						<FontString name="$parentLabel" inherits="GameFontNormalSmallLeft" text="DIALOG_VOLUME">
+							<Size x="64" y="14"/>
+							<Anchors>
+								<Anchor point="RIGHT" relativePoint="LEFT">
+									<Offset>
+										<AbsDimension x="-4" y="1"/>
+									</Offset>
+								</Anchor>
+							</Anchors>
+						</FontString>
+					</Layer>
+				</Layers>
+				<Scripts>
+					<OnLoad>
+						local name = self:GetName();
+						_G[name.."Low"]:Hide();
+						_G[name.."High"]:Hide();
+						_G[name.."Text"]:Hide();
+						self.type = CONTROLTYPE_SLIDER;
+						self.cvar = "Sound_DialogVolume";
+						BlizzardOptionsPanel_RegisterControl(self, self:GetParent());
+					</OnLoad>
+					<OnValueChanged>
+						self.value = value;
+						BlizzardOptionsPanel_SetCVarSafe(self.cvar, value);
+						if (self:IsVisible()) then
+							PlaySound("igMainMenuOptionCheckBoxOn", "Dialog");
+						end
+					</OnValueChanged>
+					<OnEnter>
+						if ( self:IsEnabled() ) then
+							if ( self.tooltipText ) then
+								GameTooltip:SetOwner(self);
+								GameTooltip:SetText(self.tooltipText, nil, nil, nil, nil, true);
+							end
+						end
+					</OnEnter>
+				</Scripts>
+			</Slider>
 		</Frames>
 		<Scripts>
 			<OnLoad function="AudioOptionsSoundPanel_OnLoad"/>
@@ -693,7 +743,7 @@
 						GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
 						local stringChoice;
 						stringChoice = VOICECHAT_DISABLED_TEXT;
-						GameTooltip:SetText(stringChoice, nil, nil, nil, nil, 1);
+						GameTooltip:SetText(stringChoice, nil, nil, nil, nil, true);
 					</OnEnter>
 					<OnLeave>
 						GameTooltip:Hide();
@@ -762,7 +812,7 @@
 					<OnEnter>
 						if ( UIDropDownMenu_IsEnabled(self) ) then
 							GameTooltip:SetOwner(self, "ANCHOR_TOPRIGHT");
-							GameTooltip:SetText(OPTION_TOOLTIP_VOICE_INPUT, nil, nil, nil, nil, 1);
+							GameTooltip:SetText(OPTION_TOOLTIP_VOICE_INPUT, nil, nil, nil, nil, true);
 							GameTooltip:Show();
 						end
 					</OnEnter>
@@ -862,7 +912,7 @@
 							</OnLoad>
 							<OnEnter>
 								GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-								GameTooltip:SetText(VOICE_MIC_TEST_RECORD, nil, nil, nil, nil, 1);
+								GameTooltip:SetText(VOICE_MIC_TEST_RECORD, nil, nil, nil, nil, true);
 								_G[self:GetName().."Texture"]:SetVertexColor(1, 1, 1);
 							</OnEnter>
 							<OnClick>
@@ -907,7 +957,7 @@
 							</OnLoad>
 							<OnEnter>
 								GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-								GameTooltip:SetText(VOICE_MIC_TEST_PLAY, nil, nil, nil, nil, 1);
+								GameTooltip:SetText(VOICE_MIC_TEST_PLAY, nil, nil, nil, nil, true);
 								_G[self:GetName().."Texture"]:SetVertexColor(1, 1, 1);
 							</OnEnter>
 							<OnClick>
@@ -993,7 +1043,7 @@
 					<OnEnter>
 						if ( UIDropDownMenu_IsEnabled(self) and self.tooltip ) then
 							GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-							GameTooltip:SetText(self.tooltip, nil, nil, nil, nil, 1);
+							GameTooltip:SetText(self.tooltip, nil, nil, nil, nil, true);
 							GameTooltip:Show();
 						end
 					</OnEnter>
@@ -1169,7 +1219,7 @@
 					<OnEnter>
 						if ( UIDropDownMenu_IsEnabled(self) ) then
 							GameTooltip:SetOwner(self, "ANCHOR_RIGHT");
-							GameTooltip:SetText(OPTION_TOOLTIP_VOICE_OUTPUT, nil, nil, nil, nil, 1);
+							GameTooltip:SetText(OPTION_TOOLTIP_VOICE_OUTPUT, nil, nil, nil, nil, true);
 							GameTooltip:Show();
 						end
 					</OnEnter>