diff --git a/i18n/en-US.json b/i18n/en-US.json
index 0a68220..5918c07 100644
--- a/i18n/en-US.json
+++ b/i18n/en-US.json
@@ -862,7 +862,8 @@
 			"title": "Custom Conference Greeting",
 			"link": "Custom Greeting",
 			"info": "Customize your conference greeting message using our Text-to-Speech feature. Simply type your greeting message in the input field below.",
-			"mainConfMissing": "Your Main Conference could not be found."
+			"mainConfMissing": "Your Main Conference could not be found.",
+			"tooltip": "Your Main Conference has a custom greeting message."
 		}
 	},
 
diff --git a/submodules/strategy/strategy.js b/submodules/strategy/strategy.js
index d745655..98944b2 100644
--- a/submodules/strategy/strategy.js
+++ b/submodules/strategy/strategy.js
@@ -203,6 +203,8 @@ define(function(require){
 						.empty()
 						.append(template);
 
+					monster.ui.tooltips(template);
+
 					if(!hasMainNumber) {
 						template.find('.element-container.strategy-hours,.element-container.strategy-holidays,.element-container.strategy-calls').hide();
 						template.find('.element-container.helper').css('display', 'block');
@@ -1036,7 +1038,8 @@ define(function(require){
 									confCallflow.flow.data.welcome_prompt = {
 										media_id: updatedGreeting.id
 									};
-									self.strategyUpdateCallflow(confCallflow, function() {
+									self.strategyUpdateCallflow(confCallflow, function(updatedCallflow) {
+										strategyData.callflows.MainConference = updatedCallflow;
 										greetingPopup.dialog('close').remove();
 										$('#strategy_container .custom-greeting-icon').show();
 									});
@@ -1044,7 +1047,8 @@ define(function(require){
 							} else {
 								if('welcome_prompt' in confCallflow.flow.data) {
 									delete confCallflow.flow.data.welcome_prompt;
-									self.strategyUpdateCallflow(confCallflow, function() {
+									self.strategyUpdateCallflow(confCallflow, function(updatedCallflow) {
+										strategyData.callflows.MainConference = updatedCallflow;
 										greetingPopup.dialog('close').remove();
 										$('#strategy_container .custom-greeting-icon').hide();
 									});
@@ -1054,7 +1058,6 @@ define(function(require){
 							}
 						});
 					});
-					
 				} else {
 					monster.ui.alert('error', self.i18n.active().strategy.customConferenceGreeting.mainConfMissing)
 				}
diff --git a/views/strategy-layout.html b/views/strategy-layout.html
index 755f617..9dc9feb 100644
--- a/views/strategy-layout.html
+++ b/views/strategy-layout.html
@@ -92,7 +92,7 @@
 					</span>
 					<i class="fa fa-play"></i>
 				</div>
-				<i class="fa fa-volume-up monster-blue custom-greeting-icon" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
+				<i class="fa fa-volume-up monster-blue custom-greeting-icon" data-original-title="{{i18n.strategy.customConferenceGreeting.tooltip}}" data-placement="top" data-toggle="tooltip" {{#unless customConfGreeting}}style="display:none"{{/unless}}></i>
 			</div>
 		</div>
 		<div class="element-content"></div>