diff --git a/indra/newview/llsidepanelinventory.cpp b/indra/newview/llsidepanelinventory.cpp
index 689734e36ab936d43c3d070fd16ee92eb7aa183d..ea7e6497927e8155e6520b69d177300311a035fe 100644
--- a/indra/newview/llsidepanelinventory.cpp
+++ b/indra/newview/llsidepanelinventory.cpp
@@ -564,6 +564,7 @@ void LLSidepanelInventory::updateVerbs()
 	mWearBtn->setEnabled(FALSE);
 	mPlayBtn->setVisible(FALSE);
 	mPlayBtn->setEnabled(FALSE);
+	mPlayBtn->setToolTip(std::string(""));
  	mTeleportBtn->setVisible(FALSE);
  	mTeleportBtn->setEnabled(FALSE);
  	mShopBtn->setVisible(TRUE);
@@ -588,11 +589,23 @@ void LLSidepanelInventory::updateVerbs()
 		 	mShopBtn->setVisible(FALSE);
 			break;
 		case LLInventoryType::IT_SOUND:
+			mPlayBtn->setVisible(TRUE);
+			mPlayBtn->setEnabled(TRUE);
+			mPlayBtn->setToolTip(LLTrans::getString("InventoryPlaySoundTooltip"));
+			mShopBtn->setVisible(FALSE);
+			break;
 		case LLInventoryType::IT_GESTURE:
+			mPlayBtn->setVisible(TRUE);
+			mPlayBtn->setEnabled(TRUE);
+			mPlayBtn->setToolTip(LLTrans::getString("InventoryPlayGestureTooltip"));
+			mShopBtn->setVisible(FALSE);
+			break;
 		case LLInventoryType::IT_ANIMATION:
 			mPlayBtn->setVisible(TRUE);
 			mPlayBtn->setEnabled(TRUE);
-		 	mShopBtn->setVisible(FALSE);
+			mPlayBtn->setEnabled(TRUE);
+			mPlayBtn->setToolTip(LLTrans::getString("InventoryPlayAnimationTooltip"));
+			mShopBtn->setVisible(FALSE);
 			break;
 		case LLInventoryType::IT_LANDMARK:
 			mTeleportBtn->setVisible(TRUE);
diff --git a/indra/newview/skins/default/xui/en/floater_gesture.xml b/indra/newview/skins/default/xui/en/floater_gesture.xml
index 200e9b9537c2228ad07e799201ce8c3b84b999d4..9f051d9f8d8de9daea1e4a6044543bc9392df032 100644
--- a/indra/newview/skins/default/xui/en/floater_gesture.xml
+++ b/indra/newview/skins/default/xui/en/floater_gesture.xml
@@ -119,6 +119,7 @@
      follows="left|bottom"
      height="23"
      label="Edit"
+     tool_tip="Open window for editing selected gesture."
      layout="topleft"
      left="6"
      name="edit_btn"
@@ -128,6 +129,7 @@
      follows="left|bottom"
      height="23"
      label="Play"
+     tool_tip="Execute selected gesture in-world."
      layout="topleft"
      left_pad="6"
      name="play_btn"
diff --git a/indra/newview/skins/default/xui/en/strings.xml b/indra/newview/skins/default/xui/en/strings.xml
index 823109e55fe12a968be266d6a75def91678a2809..90bd8ae3850d01bb19abd6ca5debf171b54050e2 100644
--- a/indra/newview/skins/default/xui/en/strings.xml
+++ b/indra/newview/skins/default/xui/en/strings.xml
@@ -2302,6 +2302,9 @@ For AI Character: Get the closest navigable point to the point provided.
 	<string name="MarketplaceURL_Dashboard">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/dashboard</string>
 	<string name="MarketplaceURL_Imports">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/merchants/store/imports</string>
 	<string name="MarketplaceURL_LearnMore">https://marketplace.[MARKETPLACE_DOMAIN_NAME]/learn_more</string>
+	<string name="InventoryPlayAnimationTooltip">Open window with Play options.</string>
+	<string name="InventoryPlayGestureTooltip">Execute selected gesture in-world.</string>
+	<string name="InventoryPlaySoundTooltip">Open window with Play options.</string>
 	<string name="InventoryOutboxNotMerchantTitle">Anyone can sell items on the Marketplace.</string>
 	<string name="InventoryOutboxNotMerchantTooltip"></string>
 	<string name="InventoryOutboxNotMerchant">