diff --git a/submodules/strategy/strategy.css b/submodules/strategy/strategy.css
index 8ece855..38eb472 100644
--- a/submodules/strategy/strategy.css
+++ b/submodules/strategy/strategy.css
@@ -536,7 +536,7 @@
 	margin-left: 20px;
 }
 #strategy_menu_popup .menu-block .title {
-	color: #22ccff;
+	color: #22a5ff;
 	font-size: 22px;
 	font-weight: 600;
 	padding: 15px 0;
@@ -557,7 +557,7 @@
 #strategy_menu_popup .menu-block .menu-line .number-text {
 	width: 32px;
 	text-align: center;
-	color: #22ccff;
+	color: #22a5ff;
 	font-size: 18px;
 	font-weight: bold;
 	cursor: pointer;
@@ -588,7 +588,7 @@
 }
 
 #strategy_menu_popup .menu-block .add-menu-line a {
-	color: #22ccff;
+	color: #22a5ff;
 	text-decoration: underline;
 }
 
@@ -597,17 +597,25 @@
 }
 
 #strategy_menu_popup .action-block .cancel-link {
-    line-height: 30px;
-    margin-right: 40px;
-    color: #22ccff;
+	line-height: 30px;
+	margin-right: 40px;
+	color: #22a5ff;
+}
+
+#strategy_menu_popup_accordion .greeting-option {
+	border-color: #c0c0c9;
+}
+
+#strategy_menu_popup_accordion .greeting-option.active {
+	border-color: #22a5ff;
 }
 
 #strategy_menu_popup_accordion .greeting-option:not(:last-of-type) {
-    margin-bottom: 15px;
+	margin-bottom: 15px;
 }
 
 #strategy_menu_popup_accordion .greeting-option.active .greeting-option-header i {
-	color: #7FFF55 !important;
+	color: #22a5ff !important;
 }
 
 #strategy_menu_popup_accordion .greeting-option-header {
@@ -615,11 +623,16 @@
 	font-weight: bold;
 	border-radius: 4px;
 	cursor: pointer;
+	background-color: #e0e0e9;
+}
+
+#strategy_menu_popup_accordion .greeting-option-header:not(.collapsed) {
+	border-bottom-left-radius: none;
+	border-bottom-right-radius: none;
 }
 
 #strategy_menu_popup_accordion .greeting-option-header i {
 	vertical-align: middle;
-	text-shadow: 0 0 1px #000;
 }
 
 #strategy_menu_popup_accordion .greeting-option-content {
diff --git a/views/strategy-menuPopup.html b/views/strategy-menuPopup.html
index e6e8c5d..912ca89 100644
--- a/views/strategy-menuPopup.html
+++ b/views/strategy-menuPopup.html
@@ -16,10 +16,10 @@
 			<div class="content">
 				<div id="strategy_menu_popup_accordion">
 					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'tts'}}active{{/compare}}">
-						<div class="greeting-option-header btn-primary" data-toggle="collapse" 
+						<div class="greeting-option-header" data-toggle="collapse" 
 							 data-parent="#strategy_menu_popup_accordion" 
 							 data-target="#strategy_menu_popup_tts_greeting">
-							<div class="pull-right"><i class="icon-comment icon-white"></i></div>
+							<div class="pull-right"><i class="icon-comment"></i></div>
 							<div>{{i18n.strategy.popup.ttsGreetingTitle}}</div>
 						</div>
 						<div class="collapse" id="strategy_menu_popup_tts_greeting">
@@ -28,34 +28,34 @@
 									{{#compare greeting.media_source '===' 'tts'}}{{greeting.tts.text}}{{/compare}}
 								</textarea>
 								<div class="greeting-option-actions clearfix">
-									<button class="update-greeting pull-right btn btn-mini btn-primary">{{i18n.update}}</button>
-									<button class="cancel-greeting pull-right btn btn-mini">{{i18n.cancel}}</button>
+									<button class="update-greeting pull-right monster-button-mini monster-button-primary">{{i18n.update}}</button>
+									<button class="cancel-greeting pull-right monster-button-mini">{{i18n.cancel}}</button>
 								</div>
 							</div>
 						</div>
 					</div>
 					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'upload'}}active{{/compare}}">
-						<div class="greeting-option-header btn-primary" data-toggle="collapse" 
+						<div class="greeting-option-header" data-toggle="collapse" 
 							 data-parent="#strategy_menu_popup_accordion" 
 							 data-target="#strategy_menu_popup_upload_greeting">
-							<div class="pull-right"><i class="icon-upload-alt icon-white"></i></div>
+							<div class="pull-right"><i class="icon-upload-alt"></i></div>
 							<div>{{i18n.strategy.popup.uploadGreetingTitle}}</div>
 						</div>
 						<div class="collapse" id="strategy_menu_popup_upload_greeting">
 							<div class="greeting-option-content">
 								<input type="file">
 								<div class="greeting-option-actions clearfix">
-									<button class="update-greeting pull-right btn btn-mini btn-primary">{{i18n.update}}</button>
-									<button class="cancel-greeting pull-right btn btn-mini">{{i18n.cancel}}</button>
+									<button class="update-greeting pull-right monster-button-mini monster-button-primary">{{i18n.update}}</button>
+									<button class="cancel-greeting pull-right monster-button-mini">{{i18n.cancel}}</button>
 								</div>
 							</div>
 						</div>
 					</div>
-					<div class="greeting-option accordion-group">
-						<div class="greeting-option-header btn-primary" data-toggle="collapse" 
+					<div class="greeting-option accordion-group {{#compare greeting.media_source '===' 'recording'}}active{{/compare}}">
+						<div class="greeting-option-header" data-toggle="collapse" 
 							 data-parent="#strategy_menu_popup_accordion" 
 							 data-target="#strategy_menu_popup_record_greeting">
-							<div class="pull-right"><i class="icon-info-sign icon-white"></i></div>
+							<div class="pull-right"><i class="icon-info-sign"></i></div>
 							<div>{{i18n.strategy.popup.recordGreetingTitle}}</div>
 						</div>
 						<div class="collapse" id="strategy_menu_popup_record_greeting">