diff --git a/inc/themes/classic/account.inc b/inc/themes/classic/account.inc
index bfb58faf..df97c74e 100644
--- a/inc/themes/classic/account.inc
+++ b/inc/themes/classic/account.inc
@@ -13,7 +13,7 @@
                     <?php if ($showform): ?>
                         <input name="name" type="text" placeholder="<?php echo _('Nombre de cuenta'); ?>" required
                                maxlength="50"
-                               value="<?php echo ($gotData) ? $accountData->account_name : ''; ?>">
+                               value="<?php echo $gotData ? $accountData->account_name : ''; ?>">
                     <?php else: ?>
                         <?php echo $accountData->account_name; ?>
                     <?php endif; ?>
diff --git a/inc/themes/classic/search.inc b/inc/themes/classic/search.inc
index 63235f79..0151c9e4 100644
--- a/inc/themes/classic/search.inc
+++ b/inc/themes/classic/search.inc
@@ -73,7 +73,10 @@
                         <div class="field-name"><?php echo _('Nombre'); ?></div>
                         <?php if ($account['show'] && $accountLink): ?>
                             <a title="<?php echo _('Detalles de Cuenta'); ?>"
-                               OnClick="doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $account['id']; ?>)"><?php echo $account['name']; ?></a>
+                               class="btn-action"
+                               data-action-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>"
+                               data-next-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>"
+                               data-account-id="<?php echo $account['id']; ?>"><?php echo $account['name']; ?></a>
                         <?php else: ?>
                             <div class="field-text"><?php echo $account['name']; ?></div>
                         <?php endif; ?>
@@ -122,7 +125,7 @@
 
                             <?php if (isset($wikiFilter) && is_array($wikiFilter)): ?>
                                 <?php foreach ($wikiFilter as $filter): ?>
-                                    <?php if (preg_match("/^" . preg_quote($filter) . ".*/i", $account['name'])): ?>
+                                    <?php if (preg_match('/^' . preg_quote($filter) . '.*/i', $account['name'])): ?>
                                         <a href="<?php echo $wikiPageUrl, $account['name']; ?>" target="_blank">
                                             <img src="imgs/wiki.png" title="<?php echo _('Enlace a Wiki'); ?>"/>
                                         </a>
@@ -149,7 +152,7 @@
                                     <img src="imgs/clipboard.png"
                                          title="<?php echo _('Copiar Clave en Portapapeles'); ?>"
                                          data-account-id="<?php echo $account['id']; ?>"
-                                         class="clip-pass-button <?php echo ($optionalActions) ? '' : 'actions-optional'; ?>"/>
+                                         class="clip-pass-button <?php echo $optionalActions ? '' : 'actions-optional'; ?>"/>
                                 <?php endif; ?>
                             <?php endif ?>
 
@@ -160,7 +163,7 @@
 
                             <?php if ($account['showEdit']): ?>
                                 <img src="imgs/edit.png" title="<?php echo _('Modificar Cuenta'); ?>"
-                                     class="btn-action <?php echo ($optionalActions) ? '' : 'actions-optional'; ?>"
+                                     class="btn-action <?php echo $optionalActions ? '' : 'actions-optional'; ?>"
                                      data-action-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_EDIT; ?>"
                                      data-next-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>"
                                      data-account-id="<?php echo $account['id']; ?>"/>
@@ -168,7 +171,7 @@
 
                             <?php if ($account['showCopy']): ?>
                                 <img src="imgs/btn_copy.png" title="<?php echo _('Copiar Cuenta'); ?>"
-                                     class="btn-action <?php echo ($optionalActions) ? '' : 'actions-optional'; ?>"
+                                     class="btn-action <?php echo $optionalActions ? '' : 'actions-optional'; ?>"
                                      data-action-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_COPY; ?>"
                                      data-next-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>"
                                      data-account-id="<?php echo $account['id']; ?>"/>
@@ -176,7 +179,7 @@
 
                             <?php if ($account['showDel']): ?>
                                 <img src="imgs/delete.png" title="<?php echo _('Eliminar Cuenta'); ?>"
-                                     class="btn-action <?php echo ($optionalActions) ? '' : 'actions-optional'; ?>"
+                                     class="btn-action <?php echo $optionalActions ? '' : 'actions-optional'; ?>"
                                      data-action-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_DELETE; ?>"
                                      data-next-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>"
                                      data-account-id="<?php echo $account['id']; ?>"/>
diff --git a/inc/themes/material-blue/account.inc b/inc/themes/material-blue/account.inc
index 70d4b4d7..381f220f 100644
--- a/inc/themes/material-blue/account.inc
+++ b/inc/themes/material-blue/account.inc
@@ -17,7 +17,7 @@
                     <?php if ($showform): ?>
                         <div class="mdl-textfield mdl-js-textfield mdl-textfield--floating-label">
                             <input id="name" name="name" type="text" required class="mdl-textfield__input fg-blue100"
-                            maxlength="50" value="<?php echo ($gotData) ? $accountData->account_name : ''; ?>">
+                            maxlength="50" value="<?php echo $gotData ? $accountData->account_name : ''; ?>">
                             <label class="mdl-textfield__label" for="name"><?php echo _('Nombre de cuenta'); ?></label>
                         </div>
                     <?php else: ?>
diff --git a/inc/themes/material-blue/search.inc b/inc/themes/material-blue/search.inc
index a57906d0..ceca4a54 100644
--- a/inc/themes/material-blue/search.inc
+++ b/inc/themes/material-blue/search.inc
@@ -75,7 +75,10 @@
                         <div class="field-name"><?php echo _('Nombre'); ?></div>
                         <?php if ($account['show'] && $accountLink): ?>
                             <a title="<?php echo _('Detalles de Cuenta'); ?>"
-                               OnClick="sysPassUtil.Common.doAction(<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>,<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>,<?php echo $account['id']; ?>)"><?php echo $account['name']; ?></a>
+                               class="btn-action"
+                               data-action-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_VIEW; ?>"
+                               data-next-id="<?php echo \SP\Controller\ActionsInterface::ACTION_ACC_SEARCH; ?>"
+                               data-account-id="<?php echo $account['id']; ?>"><?php echo $account['name']; ?></a>
                         <?php else: ?>
                             <div class="field-text"><?php echo $account['name']; ?></div>
                         <?php endif; ?>
@@ -128,7 +131,7 @@
 
                             <?php if (isset($wikiFilter) && is_array($wikiFilter)): ?>
                                 <?php foreach ($wikiFilter as $filter): ?>
-                                    <?php if (preg_match("/^" . preg_quote($filter) . ".*/i", $account['name'])): ?>
+                                    <?php if (preg_match('/^' . preg_quote($filter) . '.*/i', $account['name'])): ?>
                                         <a href="<?php echo $wikiPageUrl, $account['name']; ?>" target="_blank">
                                             <i id="viewpass" class="material-icons"
                                                title="<?php echo _('Enlace a Wiki'); ?>">library_books</i>