diff --git a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
index b5f6048ae9f77e225cc3a393c6ae935316ad2a62..9a96978c33a69ac370b02a6be8449acc0d7cd8d6 100644
--- a/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
+++ b/layouts/v7/modules/Settings/Vtiger/ModuleHeader.tpl
@@ -139,13 +139,20 @@
 							{/if}
 							<li>
 								<div class="settingsIcon">
-									<button type="button" class="btn btn-default module-buttons dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-										<span class="fa fa-wrench" aria-hidden="true" title="{vtranslate('LBL_SETTINGS', $MODULE)}"></span>&nbsp; <span class="caret"></span>
+									<button type="button" class="btn btn-default module-buttons dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="{vtranslate('LBL_SETTINGS', $MODULE)}">
+										<span class="fa fa-wrench" aria-hidden="true"></span>&nbsp; <span class="caret"></span>
 									</button>
 									<ul class="detailViewSetting dropdown-menu">
 										{foreach item=SETTING from=$LISTVIEW_LINKS['LISTVIEWSETTING']}
-											<li id="{$MODULE}_setings_lisview_advancedAction_{$SETTING->getLabel()}"><a href="javascript:void(0);" onclick="{$SETTING->getUrl()};">{vtranslate($SETTING->getLabel(), $QUALIFIEDMODULE)}</a></li>
-											{/foreach}
+											<li id="{$MODULE}_setings_lisview_advancedAction_{$SETTING->getLabel()}">
+												<a	{if stripos($SETTING->getUrl(), 'javascript:') === 0}
+														onclick='{$SETTING->getUrl()|substr:strlen("javascript:")};'
+													{else}
+														onclick='window.location.href="{$SETTING->getUrl()}"'
+													{/if}>
+													{vtranslate($SETTING->getLabel(), $QUALIFIEDMODULE)}</a>
+											</li>
+										{/foreach}
 									</ul>
 								</div>
 							</li>
diff --git a/layouts/v7/modules/Vtiger/ModuleHeader.tpl b/layouts/v7/modules/Vtiger/ModuleHeader.tpl
index 1bcdfb3d0849b192b7cf3d3b21c43dab777f12ee..808a48899ccd93936ecc7249a1474b4e39d5d1a6 100644
--- a/layouts/v7/modules/Vtiger/ModuleHeader.tpl
+++ b/layouts/v7/modules/Vtiger/ModuleHeader.tpl
@@ -81,8 +81,8 @@
 						{if $MODULE_SETTING_ACTIONS|@count gt 0}
 							<li>
 								<div class="settingsIcon">
-									<button type="button" class="btn btn-default module-buttons dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-										<span class="fa fa-wrench" aria-hidden="true" title="{vtranslate('LBL_SETTINGS', $MODULE)}"></span>&nbsp;{vtranslate('LBL_CUSTOMIZE', 'Reports')}&nbsp; <span class="caret"></span>
+									<button type="button" class="btn btn-default module-buttons dropdown-toggle" data-toggle="dropdown" aria-expanded="false" title="{vtranslate('LBL_SETTINGS', $MODULE)}">
+										<span class="fa fa-wrench" aria-hidden="true"></span>&nbsp;{vtranslate('LBL_CUSTOMIZE', 'Reports')}&nbsp; <span class="caret"></span>
 									</button>
 									<ul class="detailViewSetting dropdown-menu">
 										{foreach item=SETTING from=$MODULE_SETTING_ACTIONS}
diff --git a/layouts/v7/skins/contact/style.css b/layouts/v7/skins/contact/style.css
index 10c540dda43aed0bd6609edb933bb1f258f2f4d3..14d9c5045a5b411d0e6a4c1686cb2caf95668481 100644
--- a/layouts/v7/skins/contact/style.css
+++ b/layouts/v7/skins/contact/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/inventory/style.css b/layouts/v7/skins/inventory/style.css
index 97819f2085edc244a9a7fffee5d7213bc02b7a50..92aeabc0cb41e29cca3262bb796083f520d51e02 100644
--- a/layouts/v7/skins/inventory/style.css
+++ b/layouts/v7/skins/inventory/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/marketing/style.css b/layouts/v7/skins/marketing/style.css
index e033570d97cb33f7108d4eec80e024ce4ed7187a..0c054715c8283c3040b4d0119075246d250377f2 100644
--- a/layouts/v7/skins/marketing/style.css
+++ b/layouts/v7/skins/marketing/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/marketing_and_sales/style.css b/layouts/v7/skins/marketing_and_sales/style.css
index d0e5f894d9fbab008a98d8d08fbc66f2f4564eaf..7d9dda0af24e774211773ce66e49a934d4657c41 100644
--- a/layouts/v7/skins/marketing_and_sales/style.css
+++ b/layouts/v7/skins/marketing_and_sales/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/project/style.css b/layouts/v7/skins/project/style.css
index 6103cbe01477e9e9f4de0f9695b1023c358739c3..2a919fdfeaedf8c11b6b938b7aba03cf97775988 100644
--- a/layouts/v7/skins/project/style.css
+++ b/layouts/v7/skins/project/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/sales/style.css b/layouts/v7/skins/sales/style.css
index 6cce81a4e75734d0657314a56dd3fba51d263e26..d46f53202bf8770ca73b948232656dbe190db047 100644
--- a/layouts/v7/skins/sales/style.css
+++ b/layouts/v7/skins/sales/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/support/style.css b/layouts/v7/skins/support/style.css
index 42c35b1af760aa2cd313f2ff6fd00b77caa03d9b..a027cb038d0901293fc097e60f57447f87aabd51 100644
--- a/layouts/v7/skins/support/style.css
+++ b/layouts/v7/skins/support/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }
diff --git a/layouts/v7/skins/tools/style.css b/layouts/v7/skins/tools/style.css
index 7f5ef093fbc668edf7b3d6e4ebece594145fba78..3a0106bd2718e1083ccd59421aabe9cc93f13598 100644
--- a/layouts/v7/skins/tools/style.css
+++ b/layouts/v7/skins/tools/style.css
@@ -1647,6 +1647,9 @@ input[type=checkbox]:checked {
 .detailViewButtoncontainer {
   padding-top: 5px;
 }
+.detailViewButtoncontainer button.btn {
+  margin: 0px 1px !important;
+}
 .detailview-header .recordBasicInfo > .info-row {
   margin-bottom: 4px;
 }