diff --git a/layouts/basic/modules/OSSMailView/widgets.tpl b/layouts/basic/modules/OSSMailView/widgets.tpl
index b55e967e9e2..38e7d1c8474 100644
--- a/layouts/basic/modules/OSSMailView/widgets.tpl
+++ b/layouts/basic/modules/OSSMailView/widgets.tpl
@@ -55,7 +55,7 @@
 										'confirm' => \App\Language::translate('LBL_REMOVE_RELATION_CONFIRMATION'), 'id' => $ROW['id'], 'url'=> $RELATION_MODEL->getDeleteUrl($ROW['id'])
 										]
 										])}
-										{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) MODULE=$MODULE_NAME}
+										{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='' MODULE=$MODULE_NAME}
 									{/if}
 									{if  \App\Privilege::isPermitted($MODULE_NAME, 'Delete', $ROW['id'])}
 										{assign var=LINK value=Vtiger_Link_Model::getInstanceFromValues(['dataUrl' => "index.php?module={$MODULE_NAME}&action=Delete&record={$ROW['id']}",
@@ -65,7 +65,7 @@
 										'linkdata' => ['confirm' => \App\Language::translate('LBL_DELETE_RECORD_COMPLETELY_DESC')],
 										'linkclass' => 'btn-xs btn-dark relationDelete entityStateBtn'
 										])}
-										{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) MODULE=$MODULE_NAME}
+										{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='' MODULE=$MODULE_NAME}
 									{/if}
 								{/if}
 							</div>
diff --git a/layouts/basic/modules/Settings/Profiles/ListViewContents.tpl b/layouts/basic/modules/Settings/Profiles/ListViewContents.tpl
index 830808e4bb8..6b6b26660f0 100644
--- a/layouts/basic/modules/Settings/Profiles/ListViewContents.tpl
+++ b/layouts/basic/modules/Settings/Profiles/ListViewContents.tpl
@@ -30,7 +30,7 @@
 								</td>
 								<td nowrap class="{$WIDTHTYPE} rightRecordActions listButtons {$WIDTHTYPE}">
 									{assign var=LINKS value=$LISTVIEW_ENTRY->getRecordLinks()}
-									{if count($LINKS) > 0}
+									{if !empty($LINKS) > 0}
 										<div class="actions">
 											<div class="float-right">
 												{foreach from=$LINKS item=LINK}
diff --git a/layouts/basic/modules/Settings/Vtiger/EditViewActions.tpl b/layouts/basic/modules/Settings/Vtiger/EditViewActions.tpl
index bdc7202c7c9..b36276ee991 100644
--- a/layouts/basic/modules/Settings/Vtiger/EditViewActions.tpl
+++ b/layouts/basic/modules/Settings/Vtiger/EditViewActions.tpl
@@ -4,17 +4,14 @@
 		{assign var=SINGLE_MODULE_NAME value='SINGLE_'|cat:$MODULE}
 		<button class="btn btn-success js-form-submit-btn" type="submit">
 			<span class="fas fa-check mr-1"></span>
-			<strong>{\App\Language::translate('LBL_SAVE', $MODULE)}</strong>
+			<strong>{\App\Language::translate('LBL_SAVE', $QUALIFIED_MODULE)}</strong>
 		</button>
 		<button class="btn btn-danger ml-2" type="reset" onclick="javascript:window.history.back();">
 			<span class="fas fa-times mr-1"></span>
-			<strong>{\App\Language::translate('LBL_CANCEL', $MODULE)}</strong>
+			<strong>{\App\Language::translate('LBL_CANCEL', $QUALIFIED_MODULE)}</strong>
 		</button>
-		ffff
 		{if isset($EDITVIEW_LINKS['EDIT_VIEW_HEADER'])}
-			{foreach item=LINK from=$EDITVIEW_LINKS['EDIT_VIEW_HEADER']}
-				{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='editViewHeader'}
-			{/foreach}
+			{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$EDITVIEW_LINKS['EDIT_VIEW_HEADER'] BUTTON_VIEW='editViewHeader' MODULE=$QUALIFIED_MODULE SKIP_GROUP=true}
 		{/if}
 	</div>
 	</form>
diff --git a/layouts/basic/modules/Settings/Vtiger/ListViewContents.tpl b/layouts/basic/modules/Settings/Vtiger/ListViewContents.tpl
index 6fa6bb56249..16672e79b32 100644
--- a/layouts/basic/modules/Settings/Vtiger/ListViewContents.tpl
+++ b/layouts/basic/modules/Settings/Vtiger/ListViewContents.tpl
@@ -49,9 +49,7 @@
 									{if count($LINKS) > 0}
 										<div class="actions">
 											<div class="float-right">
-												{foreach from=$LINKS item=LINK}
-													{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='listViewBasic' MODULE_NAME=$QUALIFIED_MODULE MODULE=$QUALIFIED_MODULE}
-												{/foreach}
+												{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$QUALIFIED_MODULE}
 											</div>
 										</div>
 									{/if}
diff --git a/layouts/basic/modules/Settings/WebserviceUsers/ListViewContents.tpl b/layouts/basic/modules/Settings/WebserviceUsers/ListViewContents.tpl
index f040e2a0f52..557e56ff73b 100644
--- a/layouts/basic/modules/Settings/WebserviceUsers/ListViewContents.tpl
+++ b/layouts/basic/modules/Settings/WebserviceUsers/ListViewContents.tpl
@@ -11,9 +11,7 @@
 	<div class="editViewContainer tab-pane active mt-2" id="{$TYPE_API}" data-type="{$TYPE_API}">
 		<div class="listViewActionsDiv row">
 			<div class="col-md-8 tn-toolbar">
-				{foreach item=LINK from=$LISTVIEW_LINKS['LISTVIEWBASIC']}
-					{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-				{/foreach}
+				{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LISTVIEW_LINKS['LISTVIEWBASIC'] BUTTON_VIEW='listViewBasic' MODULE=$QUALIFIED_MODULE SKIP_GROUP=true}
 			</div>
 			<div class="col-md-4 ">
 				<div class="float-right">
diff --git a/layouts/basic/modules/Settings/WidgetsManagement/WidgetConfig.tpl b/layouts/basic/modules/Settings/WidgetsManagement/WidgetConfig.tpl
index 99855dd866e..6e393ba943f 100644
--- a/layouts/basic/modules/Settings/WidgetsManagement/WidgetConfig.tpl
+++ b/layouts/basic/modules/Settings/WidgetsManagement/WidgetConfig.tpl
@@ -15,9 +15,9 @@
 				</div>
 				<div class="actions col-3">
 					<div class="float-right pr-1">
-						{foreach item=LINK from=$WIDGET_MODEL->getSettingsLinks()}
-							{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $QUALIFIED_MODULE) BUTTON_VIEW='' BTN_CLASS=""}
-						{/foreach}
+						{if !empty($WIDGET_MODEL->getSettingsLinks())}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$WIDGET_MODEL->getSettingsLinks() MODULE=$QUALIFIED_MODULE  SKIP_GROUP=true}
+						{/if}
 					</div>
 				</div>
 				</span>
diff --git a/layouts/basic/modules/Users/ListViewContents.tpl b/layouts/basic/modules/Users/ListViewContents.tpl
index c81ba0aa8c8..3feb082d575 100644
--- a/layouts/basic/modules/Users/ListViewContents.tpl
+++ b/layouts/basic/modules/Users/ListViewContents.tpl
@@ -44,9 +44,7 @@
 			{assign var=ONLY_ONE value=count($LINKS) eq 1}
 			<div class="actions">
 				{if $ONLY_ONE}
-					{foreach from=$LINKS item=LINK}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$QUALIFIED_MODULE}
 				{else}
 					<div class="dropright u-remove-dropdown-icon">
 						<button class="btn btn-sm btn-light toolsAction dropdown-toggle" type="button"
@@ -55,9 +53,9 @@
 							<span class="sr-only">{\App\Language::translate('LBL_ACTIONS')}</span>
 						</button>
 						<div class="dropdown-menu" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
-							{foreach from=$LINKS item=LINK}
-								{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-							{/foreach}
+							{if !empty($LINKS)}
+								{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $QUALIFIED_MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$QUALIFIED_MODULE SKIP_GROUP=true}
+							{/if}
 						</div>
 					</div>
 				{/if}
@@ -116,7 +114,7 @@
 									{assign var="SEARCH_INFO" value=[]}
 								{/if}
 								{include file=\App\Layout::getTemplatePath($FIELD_UI_TYPE_MODEL->getListSearchTemplateName(), $MODULE_NAME)
-													FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$SEARCH_INFO USER_MODEL=$USER_MODEL}
+																																					FIELD_MODEL= $LISTVIEW_HEADER SEARCH_INFO=$SEARCH_INFO USER_MODEL=$USER_MODEL}
 							</td>
 						{/foreach}
 					</tr>
diff --git a/layouts/basic/modules/Users/PreferenceDetailViewHeader.tpl b/layouts/basic/modules/Users/PreferenceDetailViewHeader.tpl
index ca769842272..9b77cfc06f9 100644
--- a/layouts/basic/modules/Users/PreferenceDetailViewHeader.tpl
+++ b/layouts/basic/modules/Users/PreferenceDetailViewHeader.tpl
@@ -39,9 +39,9 @@
 			</div>
 			<div class="mr-0 pl-1 py-2 mt-0 detailViewButtoncontainer d-flex justify-content-center">
 				<div class="btn-group btn-toolbar flex-md-nowrap u-w-sm-down-100">
-					{foreach item=LINK from=$DETAILVIEW_LINKS['DETAILVIEWPREFERENCE']}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='detailViewBasic' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
-					{/foreach}
+					{if !empty($DETAILVIEW_LINKS['DETAILVIEWPREFERENCE'])}
+						{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$DETAILVIEW_LINKS['DETAILVIEWPREFERENCE'] BUTTON_VIEW='detailViewBasic' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
+					{/if}
 					{if $DETAILVIEW_LINKS['DETAIL_VIEW_BASIC']|@count gt 0}
 						{include file=\App\Layout::getTemplatePath('ButtonViewLinks.tpl') TEXT_HOLDER='LBL_MORE' LINKS=$DETAILVIEW_LINKS['DETAIL_VIEW_BASIC'] CLASS='c-btn-link--responsive btn-group' BTN_CLASS=' btn-outline-dark'}
 					{/if}
diff --git a/layouts/basic/modules/Users/RecordPopover.tpl b/layouts/basic/modules/Users/RecordPopover.tpl
index d43d8a050c2..e9c491c4dfd 100644
--- a/layouts/basic/modules/Users/RecordPopover.tpl
+++ b/layouts/basic/modules/Users/RecordPopover.tpl
@@ -10,9 +10,7 @@
 			<span class="mb-1 u-text-ellipsis--no-hover" title="{$RECORD->getDisplayName()}">{$RECORD->getDisplayName()}</span>
 			{if $HEADER_LINKS}
 				<div class="c-popover--link__header__buttons btn-group">
-					{foreach item=LINK from=$HEADER_LINKS}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='recordPopover'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$HEADER_LINKS BUTTON_VIEW='recordPopover' MODULE=$MODULE_NAME SKIP_GROUP=true}
 				</div>
 			{/if}
 		</h5>
diff --git a/layouts/basic/modules/Users/UserViewHeader.tpl b/layouts/basic/modules/Users/UserViewHeader.tpl
index dc2dc6b78f9..ee5a8d34b5f 100644
--- a/layouts/basic/modules/Users/UserViewHeader.tpl
+++ b/layouts/basic/modules/Users/UserViewHeader.tpl
@@ -10,70 +10,67 @@
 ********************************************************************************/
 -->*}
 {strip}
-{assign var="MODULE_NAME" value=$MODULE_MODEL->get('name')}
-<input id="recordId" type="hidden" value="{$RECORD->getId()}"/>
-<div class="tpl-Users-UserViewHeader detailViewContainer">
-	<div class="detailViewTitle pt-md-0 pt-1" id="userPageHeader">
-		<div class="o-breadcrumb widget_header row"
-			 data-js="container">
-			<div class="col-12 d-flex flex-wrap justify-content-between">
-				{include file=\App\Layout::getTemplatePath('BreadCrumbs.tpl', $MODULE_NAME)}
-				<div class="my-auto o-header-toggle__actions js-header-toggle__actions d-flex flex-column flex-md-row" id="o-view-actions__container">
-					<div class="detailViewButtoncontainer">
-						<div class="btn-toolbar btn-group">
-							{if isset($DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL'])}
-								{foreach item=LINK from=$DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL']}
-									{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='detailViewBasic' CLASS='c-btn-link--responsive'}
-								{/foreach}
-							{/if}
-							{if $DETAILVIEW_LINKS['DETAIL_VIEW_BASIC']|@count gt 0}
-								<div class="btn-group c-btn-link--responsive dropdown">
-									<button class="btn btn-outline-dark dropdown-toggle" id="more-actions-button"
+	{assign var="MODULE_NAME" value=$MODULE_MODEL->get('name')}
+	<input id="recordId" type="hidden" value="{$RECORD->getId()}" />
+	<div class="tpl-Users-UserViewHeader detailViewContainer">
+		<div class="detailViewTitle pt-md-0 pt-1" id="userPageHeader">
+			<div class="o-breadcrumb widget_header row"
+				data-js="container">
+				<div class="col-12 d-flex flex-wrap justify-content-between">
+					{include file=\App\Layout::getTemplatePath('BreadCrumbs.tpl', $MODULE_NAME)}
+					<div class="my-auto o-header-toggle__actions js-header-toggle__actions d-flex flex-column flex-md-row" id="o-view-actions__container">
+						<div class="detailViewButtoncontainer">
+							<div class="btn-toolbar btn-group">
+								{if isset($DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL'])}
+									{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL'] BUTTON_VIEW='detailViewBasic' CLASS='c-btn-link--responsive'}
+								{/if}
+								{if $DETAILVIEW_LINKS['DETAIL_VIEW_BASIC']|@count gt 0}
+									<div class="btn-group c-btn-link--responsive dropdown">
+										<button class="btn btn-outline-dark dropdown-toggle" id="more-actions-button"
 											data-toggle="dropdown" href="javascript:void(0);"
 											aria-haspopup="true" aria-expanded="false">
-										<strong>{\App\Language::translate('LBL_MORE', $MODULE_NAME)}</strong>
-									</button>
-									<div class="dropdown-menu" aria-labelledby="more-actions-button">
-										{foreach item=DETAIL_VIEW_LINK from=$DETAILVIEW_LINKS['DETAIL_VIEW_BASIC']}
-											{if $DETAIL_VIEW_LINK->getLabel() eq 'Delete'}
-												{if $USER_MODEL->isAdminUser() && $USER_MODEL->getId() neq $RECORD->getId()}
-													<a class="dropdown-item"
-													   id="{$MODULE_NAME}_detailView_moreAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DETAIL_VIEW_LINK->getLabel())}"
-													   href={$DETAIL_VIEW_LINK->getUrl()}>
+											<strong>{\App\Language::translate('LBL_MORE', $MODULE_NAME)}</strong>
+										</button>
+										<div class="dropdown-menu" aria-labelledby="more-actions-button">
+											{foreach item=DETAIL_VIEW_LINK from=$DETAILVIEW_LINKS['DETAIL_VIEW_BASIC']}
+												{if $DETAIL_VIEW_LINK->getLabel() eq 'Delete'}
+													{if $USER_MODEL->isAdminUser() && $USER_MODEL->getId() neq $RECORD->getId()}
+														<a class="dropdown-item"
+															id="{$MODULE_NAME}_detailView_moreAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DETAIL_VIEW_LINK->getLabel())}"
+															href={$DETAIL_VIEW_LINK->getUrl()}>
+															<span>
+																{\App\Language::translate($DETAIL_VIEW_LINK->getLabel(), $MODULE_NAME)}</span></a>
+													{/if}
+												{else}
+													<a class="dropdown-item {$DETAIL_VIEW_LINK->getClassName()}"
+														id="{$MODULE_NAME}_detailView_moreAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DETAIL_VIEW_LINK->getLabel())}"
+														href="#"
+														data-url="{if !empty($DETAIL_VIEW_LINK->linkdata['url'])}{$DETAIL_VIEW_LINK->linkdata['url']}{/if}"
+														onclick="{$DETAIL_VIEW_LINK->linkurl}">
+														<span class="{$DETAIL_VIEW_LINK->linkicon} mr-1"></span>
 														<span>
-														{\App\Language::translate($DETAIL_VIEW_LINK->getLabel(), $MODULE_NAME)}</span></a>
+															{\App\Language::translate($DETAIL_VIEW_LINK->getLabel(), $MODULE_NAME)}</span>
+													</a>
 												{/if}
-											{else}
-												<a class="dropdown-item {$DETAIL_VIEW_LINK->getClassName()}"
-												   id="{$MODULE_NAME}_detailView_moreAction_{Vtiger_Util_Helper::replaceSpaceWithUnderScores($DETAIL_VIEW_LINK->getLabel())}"
-												   href="#"
-												   data-url="{if !empty($DETAIL_VIEW_LINK->linkdata['url'])}{$DETAIL_VIEW_LINK->linkdata['url']}{/if}"
-												   onclick="{$DETAIL_VIEW_LINK->linkurl}"
-												>
-													<span class="{$DETAIL_VIEW_LINK->linkicon} mr-1"></span>
-													<span>
-													{\App\Language::translate($DETAIL_VIEW_LINK->getLabel(), $MODULE_NAME)}</span>
-												</a>
-											{/if}
-										{/foreach}
+											{/foreach}
+										</div>
 									</div>
-								</div>
-							{/if}
+								{/if}
+							</div>
 						</div>
 					</div>
 				</div>
 			</div>
 		</div>
 	</div>
-</div>
-<div class="detailViewInfo userPreferences row">
-	<div class="details col-md-12">
-		<a class="btn btn-outline-dark d-md-none o-header-toggle__actions-btn js-header-toggle__actions-btn mb-1" href="#" data-js="click" role="button"
-		   aria-expanded="false" aria-controls="o-view-actions__container">
-							<span class="fas fa-ellipsis-h fa-fw"
-								  title="{\App\Language::translate('LBL_ACTION_MENU')}"></span>
-		</a>
-		<form id="detailView"
-			  data-name-fields="{\App\Purifier::encodeHtml(\App\Json::encode($MODULE_MODEL->getNameFields()))}">
-			<div class="contents">
-				{/strip}
+	<div class="detailViewInfo userPreferences row">
+		<div class="details col-md-12">
+			<a class="btn btn-outline-dark d-md-none o-header-toggle__actions-btn js-header-toggle__actions-btn mb-1" href="#" data-js="click" role="button"
+				aria-expanded="false" aria-controls="o-view-actions__container">
+				<span class="fas fa-ellipsis-h fa-fw"
+					title="{\App\Language::translate('LBL_ACTION_MENU')}"></span>
+			</a>
+			<form id="detailView"
+				data-name-fields="{\App\Purifier::encodeHtml(\App\Json::encode($MODULE_MODEL->getNameFields()))}">
+				<div class="contents">
+{/strip}
diff --git a/layouts/basic/modules/Vtiger/ButtonLinks.tpl b/layouts/basic/modules/Vtiger/ButtonLinks.tpl
index 2a8d3d029e1..64b67b0db9f 100644
--- a/layouts/basic/modules/Vtiger/ButtonLinks.tpl
+++ b/layouts/basic/modules/Vtiger/ButtonLinks.tpl
@@ -11,7 +11,7 @@
 		{assign var=BREAKPOINT value=''}
 	{/if}
 	{assign var=COUNT_LINKS value=count($LINKS)}
-	<div class="c-btn-link {if ($COUNT_LINKS > 1 && $USER_MODEL->get('rowheight') eq 'narrow') && !isset($SKIP_GROUP)}btn-group-sm{elseif $COUNT_LINKS > 1 && !isset($SKIP_GROUP)}btn-group{/if} {$CLASS}">
+	<div class="c-btn-link {if ($COUNT_LINKS > 1 && $USER_MODEL->get('rowheight') eq 'narrow') && !isset($SKIP_GROUP)}btn-group-sm{elseif $COUNT_LINKS > 1 && !isset($SKIP_GROUP)}btn-group{/if} {$CLASS} {if !empty($CLASS) && $CLASS eq 'c-btn-link--responsive'}d-inline-block d-md-inline-flex{/if}">
 		{foreach item=LINK from=$LINKS}
 			{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW=$BUTTON_VIEW MODULE_NAME=$MODULE BREAKPOINT=$BREAKPOINT}
 		{/foreach}
diff --git a/layouts/basic/modules/Vtiger/Comment.tpl b/layouts/basic/modules/Vtiger/Comment.tpl
index 84d042577fb..62a08c80d17 100644
--- a/layouts/basic/modules/Vtiger/Comment.tpl
+++ b/layouts/basic/modules/Vtiger/Comment.tpl
@@ -63,10 +63,8 @@
 											</button>
 										{/if}
 										{assign var=LINKS value=$COMMENT->getCommentLinks()}
-										{if count($LINKS) > 0}
-											{foreach from=$LINKS item=LINK}
-												{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='comment' MODULE=$MODULE_NAME  BTN_CLASS='btn-sm'}
-											{/foreach}
+										{if !empty($LINKS)}
+											{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) BUTTON_VIEW='comment' MODULE=$MODULE_NAME  BTN_CLASS='btn-sm'}
 										{/if}
 									{/if}
 									{assign var=CHILD_COMMENTS_COUNT value=$COMMENT->getChildCommentsCount()}
diff --git a/layouts/basic/modules/Vtiger/CommentThreadList.tpl b/layouts/basic/modules/Vtiger/CommentThreadList.tpl
index d1fbe9cdb4d..3e8bdf80c97 100644
--- a/layouts/basic/modules/Vtiger/CommentThreadList.tpl
+++ b/layouts/basic/modules/Vtiger/CommentThreadList.tpl
@@ -94,10 +94,8 @@
 							</button>
 						{/if}
 						{assign var=LINKS value=$COMMENT->getCommentLinks()}
-						{if count($LINKS) > 0}
-							{foreach from=$LINKS item=LINK}
-								{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='comment'  MODULE=$MODULE_NAME}
-							{/foreach}
+						{if !empty($LINKS)}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$LINKS BUTTON_VIEW='comment' MODULE=$MODULE_NAME}
 						{/if}
 					</span>
 				</div>
diff --git a/layouts/basic/modules/Vtiger/Detail/HeaderButtons.tpl b/layouts/basic/modules/Vtiger/Detail/HeaderButtons.tpl
index 8c2f9bc96b3..2448d30efef 100644
--- a/layouts/basic/modules/Vtiger/Detail/HeaderButtons.tpl
+++ b/layouts/basic/modules/Vtiger/Detail/HeaderButtons.tpl
@@ -12,23 +12,17 @@
 			id="o-view-actions__container">
 			{if isset($DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL'])}
 				<div class="btn-group btn-toolbar mr-md-2 flex-md-nowrap d-block d-md-flex">
-					{foreach item=LINK from=$DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL']}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='detailViewAdditional' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$DETAILVIEW_LINKS['DETAIL_VIEW_ADDITIONAL'] BUTTON_VIEW='detailViewAdditional' BREAKPOINT='md' MODULE=$MODULE_NAME CLASS='c-btn-link--responsive'}
 				</div>
 			{/if}
 			{if isset($DETAILVIEW_LINKS['DETAIL_VIEW_BASIC'])}
 				<div class="btn-group btn-toolbar mr-md-2 flex-md-nowrap d-block d-md-flex">
-					{foreach item=LINK from=$DETAILVIEW_LINKS['DETAIL_VIEW_BASIC']}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='detailViewBasic' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$DETAILVIEW_LINKS['DETAIL_VIEW_BASIC'] BUTTON_VIEW='detailViewBasic' BREAKPOINT='md' MODULE=$MODULE_NAME CLASS='c-btn-link--responsive'}
 				</div>
 			{/if}
 			{if isset($DETAILVIEW_LINKS['DETAIL_VIEW_EXTENDED'])}
 				<div class="btn-group btn-toolbar mr-md-2 flex-md-nowrap d-block d-md-flex">
-					{foreach item=LINK from=$DETAILVIEW_LINKS['DETAIL_VIEW_EXTENDED']}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='detailViewExtended' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$DETAILVIEW_LINKS['DETAIL_VIEW_EXTENDED'] BUTTON_VIEW='detailViewExtended' BREAKPOINT='md' MODULE=$MODULE_NAME CLASS='c-btn-link--responsive'}
 				</div>
 			{/if}
 		</div>
diff --git a/layouts/basic/modules/Vtiger/Detail/ProcessWizard.tpl b/layouts/basic/modules/Vtiger/Detail/ProcessWizard.tpl
index 1588bc1e227..709e6106719 100644
--- a/layouts/basic/modules/Vtiger/Detail/ProcessWizard.tpl
+++ b/layouts/basic/modules/Vtiger/Detail/ProcessWizard.tpl
@@ -56,9 +56,9 @@
 			{/foreach}
 		</div>
 		<div class="process-actions mt-3 mb-1 text-center">
-			{foreach item=LINK from=$PROCESS_WIZARD->getActions()}
-				{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='detailViewProcessWizard' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
-			{/foreach}
+			{if !empty($PROCESS_WIZARD->getActions())}
+				{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$PROCESS_WIZARD->getActions() BUTTON_VIEW='detailViewProcessWizard' BREAKPOINT='md' MODULE=$MODULE_NAME SKIP_GROUP=true CLASS='c-btn-link--responsive'}
+			{/if}
 		</div>
 	{/if}
 	<!-- /tpl-Base-Detail-ProcessWizard -->
diff --git a/layouts/basic/modules/Vtiger/Detail/Widget/Basic.tpl b/layouts/basic/modules/Vtiger/Detail/Widget/Basic.tpl
index 0a63484d141..51e40784f1d 100644
--- a/layouts/basic/modules/Vtiger/Detail/Widget/Basic.tpl
+++ b/layouts/basic/modules/Vtiger/Detail/Widget/Basic.tpl
@@ -94,9 +94,7 @@
 											</button>
 										{/if}
 										{if !empty($WIDGET['buttonHeader'])}
-											{foreach from=$WIDGET['buttonHeader'] item=$LINK}
-												{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='detailViewBasic' MODULE=$MODULE_NAME}
-											{/foreach}
+											{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$WIDGET['buttonHeader'] BUTTON_VIEW='detailViewBasic' MODULE=$MODULE_NAME SKIP_GROUP=true}
 										{/if}
 									{/if}
 								</div>
diff --git a/layouts/basic/modules/Vtiger/EditViewActions.tpl b/layouts/basic/modules/Vtiger/EditViewActions.tpl
index e544ae91af9..44987a80260 100644
--- a/layouts/basic/modules/Vtiger/EditViewActions.tpl
+++ b/layouts/basic/modules/Vtiger/EditViewActions.tpl
@@ -12,9 +12,7 @@
 			<strong>{\App\Language::translate('LBL_CANCEL', $MODULE_NAME)}</strong>
 		</button>
 		{if isset($EDITVIEW_LINKS['EDIT_VIEW_HEADER'])}
-			{foreach item=LINK from=$EDITVIEW_LINKS['EDIT_VIEW_HEADER']}
-				{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='editViewHeader'}
-			{/foreach}
+			{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$EDITVIEW_LINKS['EDIT_VIEW_HEADER'] BUTTON_VIEW='editViewHeader' MODULE=$MODULE_NAME SKIP_GROUP=true}
 		{/if}
 		{if \App\Privilege::isPermitted($MODULE_NAME, 'RecordCollector') && !empty($EDITVIEW_LINKS['EDIT_VIEW_RECORD_COLLECTOR'])}
 			{include file=\App\Layout::getTemplatePath('Edit/RecordCollectors.tpl', $MODULE_NAME) RECORD_COLLECTOR=$EDITVIEW_LINKS['EDIT_VIEW_RECORD_COLLECTOR']}
diff --git a/layouts/basic/modules/Vtiger/ListViewHeader.tpl b/layouts/basic/modules/Vtiger/ListViewHeader.tpl
index f75c19a65ba..491586dd32b 100644
--- a/layouts/basic/modules/Vtiger/ListViewHeader.tpl
+++ b/layouts/basic/modules/Vtiger/ListViewHeader.tpl
@@ -27,9 +27,9 @@
 							{include file=\App\Layout::getTemplatePath('TilesSize.tpl')}
 						{/if}
 						{include file=\App\Layout::getTemplatePath('ButtonViewLinks.tpl') LINKS=$LINKS TEXT_HOLDER='LBL_ACTIONS' BTN_ICON='fa fa-list' CLASS='listViewMassActions mr-sm-1 mb-1 mb-sm-0 c-btn-block-sm-down'}
-						{foreach item=LINK from=$LISTVIEW_LINKS['LISTVIEWBASIC']}
-							{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listView' CLASS='mr-sm-1 mb-1 c-btn-block-sm-down'}
-						{/foreach}
+						{if !empty($LISTVIEW_LINKS['LISTVIEWBASIC'])}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LISTVIEW_LINKS['LISTVIEWBASIC'] BUTTON_VIEW='listView' MODULE=$MODULE CLASS='mr-sm-1 mb-1 c-btn-block-sm-down'}
+						{/if}
 					</div>
 					<div class="customFilterMainSpan ml-auto mx-xl-auto">
 						{if $CUSTOM_VIEWS|@count gt 0}
diff --git a/layouts/basic/modules/Vtiger/ListViewLeftSide.tpl b/layouts/basic/modules/Vtiger/ListViewLeftSide.tpl
index a0da2c158af..93d07ec27c4 100644
--- a/layouts/basic/modules/Vtiger/ListViewLeftSide.tpl
+++ b/layouts/basic/modules/Vtiger/ListViewLeftSide.tpl
@@ -10,18 +10,14 @@
 			{assign var=ONLY_ONE value=count($LINKS) eq 1}
 			<div class="actions">
 				{if $ONLY_ONE}
-					{foreach from=$LINKS item=LINK}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' BREAKPOINT='md' MODULE=$MODULE}
 				{else}
 					<div class="dropright u-remove-dropdown-icon">
 						<button class="btn btn-sm btn-light toolsAction dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 							<span class="fas fa-wrench" title="{\App\Language::translate('LBL_ACTIONS')}"></span>
 						</button>
 						<div class="dropdown-menu" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
-							{foreach from=$LINKS item=LINK}
-								{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-							{/foreach}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' BREAKPOINT='md' MODULE=$MODULE SKIP_GROUP=true}
 						</div>
 					</div>
 				{/if}
diff --git a/layouts/basic/modules/Vtiger/ListViewPreProcess.tpl b/layouts/basic/modules/Vtiger/ListViewPreProcess.tpl
index 13942c7786a..f13846282aa 100644
--- a/layouts/basic/modules/Vtiger/ListViewPreProcess.tpl
+++ b/layouts/basic/modules/Vtiger/ListViewPreProcess.tpl
@@ -10,30 +10,28 @@
 ********************************************************************************/
 -->*}
 {strip}
-<!-- tpl-Base-ListViewPreProcess -->
-{include file=\App\Layout::getTemplatePath('PageHeader.tpl', $MODULE_NAME)}
-<div class="bodyContents">
-	<div class="mainContainer pt-md-0 pt-1">
-	{assign var="BREADCRUMBS_ACTIVE" value=\App\Config::layout('breadcrumbs')}
-		{if $BREADCRUMBS_ACTIVE || $HEADER_LINKS['LIST_VIEW_HEADER']}
-		<div class="o-breadcrumb widget_header mb-2 d-flex justify-content-between px-2" data-js="container">
-			<div class="o-breadcrumb__container">
-				{include file=\App\Layout::getTemplatePath('BreadCrumbs.tpl', $MODULE_NAME)}
-			</div>
-			<div class="my-auto o-header-toggle__actions js-header-toggle__actions" id="o-view-actions__container">
-				<div class="btn-toolbar btn-group flex-md-nowrap">
-					{foreach item=LINK from=$HEADER_LINKS['LIST_VIEW_HEADER']}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewHeader' BREAKPOINT='md' CLASS='c-btn-link--responsive'}
-					{/foreach}
+	<!-- tpl-Base-ListViewPreProcess -->
+	{include file=\App\Layout::getTemplatePath('PageHeader.tpl', $MODULE_NAME)}
+	<div class="bodyContents">
+		<div class="mainContainer pt-md-0 pt-1">
+			{assign var="BREADCRUMBS_ACTIVE" value=\App\Config::layout('breadcrumbs')}
+			{if $BREADCRUMBS_ACTIVE || $HEADER_LINKS['LIST_VIEW_HEADER']}
+				<div class="o-breadcrumb widget_header mb-2 d-flex justify-content-between px-2" data-js="container">
+					<div class="o-breadcrumb__container">
+						{include file=\App\Layout::getTemplatePath('BreadCrumbs.tpl', $MODULE_NAME)}
+					</div>
+					<div class="my-auto o-header-toggle__actions js-header-toggle__actions" id="o-view-actions__container">
+						{if !empty($HEADER_LINKS['LIST_VIEW_HEADER'])}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$HEADER_LINKS['LIST_VIEW_HEADER'] BUTTON_VIEW='listViewHeader' BREAKPOINT='md' MODULE=$MODULE CLASS='c-btn-link--responsive'}
+						{/if}
+					</div>
 				</div>
-			</div>
-		</div>
-		{/if}
-		<div class="contentsDiv{if !$BREADCRUMBS_ACTIVE || !$HEADER_LINKS['LIST_VIEW_HEADER']} pt-2{/if}">
-			<a class="btn btn-outline-dark d-md-none o-header-toggle__actions-btn js-header-toggle__actions-btn mb-1" href="#" data-js="click" role="button"
-			   aria-expanded="false" aria-controls="o-view-actions__container">
-				 <span class="fas fa-ellipsis-h fa-fw" title="{\App\Language::translate('LBL_ACTION_MENU')}"></span>
-			</a>
-			{include file=\App\Layout::getTemplatePath('ListViewHeader.tpl', $MODULE)}
-			<!-- /tpl-Base-ListViewPreProcess -->
-			{/strip}
+			{/if}
+			<div class="contentsDiv{if !$BREADCRUMBS_ACTIVE || !$HEADER_LINKS['LIST_VIEW_HEADER']} pt-2{/if}">
+				<a class="btn btn-outline-dark d-md-none o-header-toggle__actions-btn js-header-toggle__actions-btn mb-1" href="#" data-js="click" role="button"
+					aria-expanded="false" aria-controls="o-view-actions__container">
+					<span class="fas fa-ellipsis-h fa-fw" title="{\App\Language::translate('LBL_ACTION_MENU')}"></span>
+				</a>
+				{include file=\App\Layout::getTemplatePath('ListViewHeader.tpl', $MODULE)}
+				<!-- /tpl-Base-ListViewPreProcess -->
+{/strip}
diff --git a/layouts/basic/modules/Vtiger/ListViewRightSide.tpl b/layouts/basic/modules/Vtiger/ListViewRightSide.tpl
index 65fd547d964..cb6bca90f85 100644
--- a/layouts/basic/modules/Vtiger/ListViewRightSide.tpl
+++ b/layouts/basic/modules/Vtiger/ListViewRightSide.tpl
@@ -5,9 +5,7 @@
 		{assign var=ONLY_ONE value=count($LINKS) eq 1}
 		<div class="actions">
 			{if $ONLY_ONE}
-				{foreach from=$LINKS item=LINK}
-					{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-				{/foreach}
+				{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$MODULE }
 			{else}
 				<div class="dropleft u-remove-dropdown-icon">
 					<button class="btn btn-sm btn-light toolsAction dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
@@ -15,9 +13,7 @@
 						<span class="sr-only">{\App\Language::translate('LBL_ACTIONS')}</span>
 					</button>
 					<div class="dropdown-menu" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
-						{foreach from=$LINKS item=LINK}
-							{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-						{/foreach}
+						{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$MODULE }
 					</div>
 				</div>
 			{/if}
diff --git a/layouts/basic/modules/Vtiger/Modals/QuickDetailModal.tpl b/layouts/basic/modules/Vtiger/Modals/QuickDetailModal.tpl
index de280275710..4c92b510463 100644
--- a/layouts/basic/modules/Vtiger/Modals/QuickDetailModal.tpl
+++ b/layouts/basic/modules/Vtiger/Modals/QuickDetailModal.tpl
@@ -15,9 +15,9 @@
 				</script>
 				<div class="modal-body col-md-12 js-scrollbar" data-js="perfectscrollbar">
 					<div class="float-right text-xl-right">
-						{foreach item=LINK from=$LINKS}
-							{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW=''}
-						{/foreach}
+						{if !empty($LINKS)}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$LINKS MODULE=$MODULE_NAME SKIP_GROUP=true CLASS='d-inline-block'}
+						{/if}
 						<button class="cancelLink btn btn-sm btn-danger" data-dismiss="modal" type="button" title="{\App\Language::translate('LBL_CLOSE')}">
 							<span class="fas fa-times"></span>
 						</button>
diff --git a/layouts/basic/modules/Vtiger/Modals/QuickEditHeader.tpl b/layouts/basic/modules/Vtiger/Modals/QuickEditHeader.tpl
index 22c6d1f5c56..59f989b47d4 100644
--- a/layouts/basic/modules/Vtiger/Modals/QuickEditHeader.tpl
+++ b/layouts/basic/modules/Vtiger/Modals/QuickEditHeader.tpl
@@ -32,14 +32,12 @@
 								</span>
 							</h5>
 						</div>
-						<div class="col-xl-6 col-12 text-center text-xl-right">
+						<div class="col-xl-6 col-12 d-xl-flex justify-content-xl-end justify-content-center text-center">
 							{if \App\Privilege::isPermitted($MODULE_NAME, 'RecordCollector') && !empty($QUICKCREATE_LINKS['EDIT_VIEW_RECORD_COLLECTOR'])}
 								{include file=\App\Layout::getTemplatePath('Edit/RecordCollectors.tpl', $MODULE) SHOW_BTN_LABEL=1 RECORD_COLLECTOR=$QUICKCREATE_LINKS['EDIT_VIEW_RECORD_COLLECTOR']}
 							{/if}
 							{if !empty($QUICKCREATE_LINKS['QUICKEDIT_VIEW_HEADER'])}
-								{foreach item=LINK from=$QUICKCREATE_LINKS['QUICKEDIT_VIEW_HEADER']}
-									{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='quickcreateViewHeader' CLASS='display-block-md' TABINDEX=Vtiger_Field_Model::$tabIndexLastSeq}
-								{/foreach}
+								{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$QUICKCREATE_LINKS['QUICKEDIT_VIEW_HEADER'] BUTTON_VIEW='quickcreateViewHeader' MODULE=$MODULE   TABINDEX=Vtiger_Field_Model::$tabIndexLastSeq CLASS='px-1'}
 							{/if}
 							<button class="btn btn-success mr-1" type="submit" tabindex="{Vtiger_Field_Model::$tabIndexLastSeq}" title="{\App\Language::translate('LBL_SAVE', $MODULE)}">
 								<strong><span class="fas fa-check"></span></strong>
diff --git a/layouts/basic/modules/Vtiger/QuickCreate.tpl b/layouts/basic/modules/Vtiger/QuickCreate.tpl
index 0ca266a5124..4050949216f 100644
--- a/layouts/basic/modules/Vtiger/QuickCreate.tpl
+++ b/layouts/basic/modules/Vtiger/QuickCreate.tpl
@@ -63,9 +63,7 @@
 							{/if}
 							{assign var="EDIT_VIEW_URL" value=$MODULE_MODEL->getCreateRecordUrl()}
 							{if !empty($QUICKCREATE_LINKS['QUICKCREATE_VIEW_HEADER'])}
-								{foreach item=LINK from=$QUICKCREATE_LINKS['QUICKCREATE_VIEW_HEADER']}
-									{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='quickcreateViewHeader' CLASS='display-block-md' TABINDEX=Vtiger_Field_Model::$tabIndexLastSeq}
-								{/foreach}
+								{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$QUICKCREATE_LINKS['QUICKCREATE_VIEW_HEADER'] BUTTON_VIEW='quickcreateViewHeader' MODULE=$MODULE  TABINDEX=Vtiger_Field_Model::$tabIndexLastSeq CLASS='d-inline-block'}
 							{/if}
 							<button class="btn btn-success mr-1" type="submit" tabindex="{Vtiger_Field_Model::$tabIndexLastSeq}" title="{\App\Language::translate('LBL_SAVE', $MODULE)}">
 								<strong><span class="fas fa-check"></span></strong>
diff --git a/layouts/basic/modules/Vtiger/RecordPopover.tpl b/layouts/basic/modules/Vtiger/RecordPopover.tpl
index aace5500403..2abcc4fa9a8 100644
--- a/layouts/basic/modules/Vtiger/RecordPopover.tpl
+++ b/layouts/basic/modules/Vtiger/RecordPopover.tpl
@@ -25,9 +25,7 @@
 			{/if}
 			{if $HEADER_LINKS}
 				<div class="c-popover--link__header__buttons btn-group">
-					{foreach item=LINK from=$HEADER_LINKS}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='recordPopover'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$HEADER_LINKS BUTTON_VIEW='recordPopover' MODULE=$MODULE_NAME}
 				</div>
 			{/if}
 		</h5>
diff --git a/layouts/basic/modules/Vtiger/RelatedList.tpl b/layouts/basic/modules/Vtiger/RelatedList.tpl
index 4e469745e68..0aa1ae0c965 100644
--- a/layouts/basic/modules/Vtiger/RelatedList.tpl
+++ b/layouts/basic/modules/Vtiger/RelatedList.tpl
@@ -97,9 +97,7 @@
 							{/foreach}
 						{/if}
 						{if isset($RELATED_LIST_LINKS['RELATEDLIST_BASIC'])}
-							{foreach item=LINK from=$RELATED_LIST_LINKS['RELATEDLIST_BASIC']}
-								{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='relatedListView' CLASS='mr-sm-1 c-btn-block-sm-down'}
-							{/foreach}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$RELATED_LIST_LINKS['RELATEDLIST_BASIC'] BUTTON_VIEW='relatedListView' MODULE=$MODULE CLASS='mr-sm-1 c-btn-block-sm-down'}
 						{/if}
 					</div>
 					{if $CUSTOM_VIEW_LIST}
diff --git a/layouts/basic/modules/Vtiger/RelatedListLeftSide.tpl b/layouts/basic/modules/Vtiger/RelatedListLeftSide.tpl
index 85f6e4b8663..d60e61e59c5 100644
--- a/layouts/basic/modules/Vtiger/RelatedListLeftSide.tpl
+++ b/layouts/basic/modules/Vtiger/RelatedListLeftSide.tpl
@@ -17,9 +17,7 @@
 			{assign var=ONLY_ONE value=count($LINKS) eq 1}
 			<div class="actions">
 				{if $ONLY_ONE}
-					{foreach from=$LINKS item=LINK}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$MODULE}
 				{else}
 					<div class="dropright u-remove-dropdown-icon">
 						<button class="btn btn-sm btn-light toolsAction dropdown-toggle" type="button"
@@ -28,9 +26,7 @@
 							<span class="sr-only">{\App\Language::translate('LBL_ACTIONS')}</span>
 						</button>
 						<div class="dropdown-menu" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
-							{foreach from=$LINKS item=LINK}
-								{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE) BUTTON_VIEW='listViewBasic'}
-							{/foreach}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$MODULE SKIP_GROUP=true}
 						</div>
 					</div>
 				{/if}
diff --git a/layouts/basic/modules/Vtiger/TilesActions.tpl b/layouts/basic/modules/Vtiger/TilesActions.tpl
index 63e885f1786..97300fa59dd 100644
--- a/layouts/basic/modules/Vtiger/TilesActions.tpl
+++ b/layouts/basic/modules/Vtiger/TilesActions.tpl
@@ -10,18 +10,14 @@
 			{assign var=ONLY_ONE value=count($LINKS) eq 1}
 			<div class="actions">
 				{if $ONLY_ONE}
-					{foreach from=$LINKS item=LINK}
-						{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='listViewBasic'}
-					{/foreach}
+					{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$MODULE_NAME}
 				{else}
 					<div class="dropright u-remove-dropdown-icon">
 						<button class="btn btn-xs  toolsAction dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
 							<span class="fas fa-wrench" title="{\App\Language::translate('LBL_ACTIONS')}"></span>
 						</button>
 						<div class="dropdown-menu p-1" aria-label="{\App\Language::translate('LBL_ACTIONS')}">
-							{foreach from=$LINKS item=LINK}
-								{include file=\App\Layout::getTemplatePath('ButtonLink.tpl', $MODULE_NAME) BUTTON_VIEW='listViewBasic' BTN_CLASS='btn-xs'}
-							{/foreach}
+							{include file=\App\Layout::getTemplatePath('ButtonLinks.tpl', $MODULE_NAME) LINKS=$LINKS BUTTON_VIEW='listViewBasic' MODULE=$MODULE_NAME BTN_CLASS='btn-xs' SKIP_GROUP=true}
 						</div>
 					</div>
 				{/if}