diff --git a/packages/rocketchat-channel-settings/client/views/channelSettings.html b/packages/rocketchat-channel-settings/client/views/channelSettings.html
index c1d0c15fd79..8cf5bfb3a3f 100644
--- a/packages/rocketchat-channel-settings/client/views/channelSettings.html
+++ b/packages/rocketchat-channel-settings/client/views/channelSettings.html
@@ -18,7 +18,7 @@
 												{{#if editing $key}}
 													<input type="text" name="{{$key}}" value="{{value}}" class="editing" />
 												{{else}}
-													<span>{{value}}</span>
+													<span class='current-setting'>{{value}}</span>
 												{{/if}}
 											{{/if}}
 
@@ -26,7 +26,7 @@
 												{{#if editing $key}}
 													<input type="text" name="{{$key}}" value="{{unscape value}}" class="editing" />
 												{{else}}
-													<span>{{{RocketChatMarkdown value}}}</span>
+													<span class='current-setting'>{{{RocketChatMarkdown value}}}</span>
 												{{/if}}
 											{{/if}}
 
@@ -39,7 +39,7 @@
 														</label>
 													{{/each}}
 												{{else}}
-													<span>{{_ (valueOf $value.options value)}}</span>
+													<span class='current-setting'>{{_ (valueOf $value.options value)}}</span>
 												{{/if}}
 											{{/if}}
 
@@ -55,9 +55,9 @@
 													</label>
 												{{else}}
 													{{#if value}}
-														<span>{{_ 'True'}}</span>
+														<span class='current-setting'>{{_ 'True'}}</span>
 													{{else}}
-														<span>{{_ 'False'}}</span>
+														<span class='current-setting'>{{_ 'False'}}</span>
 													{{/if}}
 												{{/if}}
 											{{/if}}
diff --git a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html
index ba6bf8ef28b..e22986fb704 100644
--- a/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html
+++ b/packages/rocketchat-push-notifications/client/views/pushNotificationsFlexTab.html
@@ -23,7 +23,7 @@
 								<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
 								<button type="button" class="button primary save">{{_ "Save"}}</button>
 							{{else}}
-								<span>{{subValue 'desktopNotifications'}} <i class="icon-pencil" data-edit="desktopNotifications"></i></span>
+								<span class="current-setting">{{subValue 'desktopNotifications'}} <i class="icon-pencil" data-edit="desktopNotifications"></i></span>
 							{{/if}}
 						</div>
 					</li>
@@ -31,7 +31,7 @@
 					<li>
 						<label>{{_ "Desktop_Notifications_Duration"}}</label>
 						<div>
-							<span>{{#if desktopNotificationDuration}}{{desktopNotificationDuration}} {{_"seconds"}}{{else}}{{_ "Use_User_Preferences_or_Global_Settings"}}{{/if}}</span>
+							<span class="current-setting">{{#if desktopNotificationDuration}}{{desktopNotificationDuration}} {{_"seconds"}}{{else}}{{_ "Use_User_Preferences_or_Global_Settings"}}{{/if}}</span>
 						</div>
 					</li>
 					{{/unless}}
@@ -45,7 +45,7 @@
 								<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
 								<button type="button" class="button primary save">{{_ "Save"}}</button>
 							{{else}}
-								<span>{{subValue 'mobilePushNotifications'}} <i class="icon-pencil" data-edit="mobilePushNotifications"></i></span>
+								<span class="current-setting">{{subValue 'mobilePushNotifications'}} <i class="icon-pencil" data-edit="mobilePushNotifications"></i></span>
 							{{/if}}
 						</div>
 					</li>
@@ -62,7 +62,7 @@
 								<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
 								<button type="button" class="button primary save">{{_ "Save"}}</button>
 							{{else}}
-								<span>{{subValue 'emailNotifications'}} <i class="icon-pencil" data-edit="emailNotifications"></i></span>
+								<span class="current-setting">{{subValue 'emailNotifications'}} <i class="icon-pencil" data-edit="emailNotifications"></i></span>
 							{{/if}}
 						</div>
 					</li>
@@ -83,7 +83,7 @@
 								<button type="button" class="button secondary cancel">{{_ "Cancel"}}</button>
 								<button type="button" class="button primary save">{{_ "Save"}}</button>
 							{{else}}
-								<span>{{unreadAlertText}} <i class="icon-pencil" data-edit="unreadAlert"></i></span>
+								<span class="current-setting">{{unreadAlertText}} <i class="icon-pencil" data-edit="unreadAlert"></i></span>
 							{{/if}}
 						</div>
 					</li>