diff --git a/app/Plugin/ListFilter/View/Helper/ListFilterHelper.php b/app/Plugin/ListFilter/View/Helper/ListFilterHelper.php
index 72eb045076..e37cc9cdef 100755
--- a/app/Plugin/ListFilter/View/Helper/ListFilterHelper.php
+++ b/app/Plugin/ListFilter/View/Helper/ListFilterHelper.php
@@ -307,7 +307,7 @@ public function close($includeButton = true, $includeResetLink = true, $isPlugin
     public function button($title = null)
     {
         if (!$title) {
-            $title = __('list_filter.search');
+            $title = __('Filter');
         }
 
         return $this->Form->submit(__($title), ['div' => false, 'class' => 'btn btn-mini btn-primary']);
diff --git a/app/View/Acknowledgements/host.ctp b/app/View/Acknowledgements/host.ctp
index 76f7425c27..75850ce825 100644
--- a/app/View/Acknowledgements/host.ctp
+++ b/app/View/Acknowledgements/host.ctp
@@ -54,7 +54,7 @@
             <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -216,7 +216,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $AcknowledgementListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $AcknowledgementListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="acknowledgements_list" class="table table-striped table-bordered smart-form"
                                style="">
diff --git a/app/View/Acknowledgements/service.ctp b/app/View/Acknowledgements/service.ctp
index d304bfb904..e402096866 100644
--- a/app/View/Acknowledgements/service.ctp
+++ b/app/View/Acknowledgements/service.ctp
@@ -79,7 +79,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -242,7 +242,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $AcknowledgementListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $AcknowledgementListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="acknowledgements_list" class="table table-striped table-bordered smart-form"
                                style="">
diff --git a/app/View/Automaps/index.ctp b/app/View/Automaps/index.ctp
index b0de766263..348df4e96f 100644
--- a/app/View/Automaps/index.ctp
+++ b/app/View/Automaps/index.ctp
@@ -44,7 +44,7 @@
                     <header>
                         <div class="widget-toolbar" role="menu">
                             <?php echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']); ?>
-                            <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                            <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                             <?php
                             if ($isFilter):
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
diff --git a/app/View/Browsers/tenant_browser.ctp b/app/View/Browsers/tenant_browser.ctp
index 8b6280d6ef..20a9daa441 100644
--- a/app/View/Browsers/tenant_browser.ctp
+++ b/app/View/Browsers/tenant_browser.ctp
@@ -188,7 +188,7 @@
                                     <?php $order = $this->Paginator->param('order'); ?>
                                     <th class="select_datatable no-sort"><?php echo __('Hoststatus'); ?></th>
                                     <th class="no-sort text-center"><i class="fa fa-gear fa-lg"></i></th>
-                                    <th class="no-sort"><?php echo __('Hostname'); ?></th>
+                                    <th class="no-sort"><?php echo __('Host Name'); ?></th>
                                     <th class="no-sort"><?php echo __('IP address'); ?></th>
                                     <th class="no-sort"><?php echo __('State since'); ?></th>
                                     <th class="no-sort"><?php echo __('Last check'); ?></th>
diff --git a/app/View/Changelogs/index.ctp b/app/View/Changelogs/index.ctp
index 30bf3ff76b..ecc8c7384d 100755
--- a/app/View/Changelogs/index.ctp
+++ b/app/View/Changelogs/index.ctp
@@ -45,7 +45,7 @@
                 <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                     <header>
                         <div class="widget-toolbar" role="menu">
-                            <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                            <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                             <?php
                             if ($isFilter):
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -58,7 +58,7 @@
 
                     <!-- widget div-->
                     <div>
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> ' . __('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> ' . __('Filter'), false, false); ?>
                         <!-- widget edit box -->
                         <div class="jarviswidget-editbox">
                             <!-- This area used as dropdown edit box -->
diff --git a/app/View/Commands/handler.ctp b/app/View/Commands/handler.ctp
index a344b37fee..6bf3db3df9 100755
--- a/app/View/Commands/handler.ctp
+++ b/app/View/Commands/handler.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), Router::url(['action' => 'add', '_controller' => 'commands', '_action' => 'handler']), ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -91,7 +91,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>
diff --git a/app/View/Commands/hostchecks.ctp b/app/View/Commands/hostchecks.ctp
index 184abe6bf5..a20de55d36 100755
--- a/app/View/Commands/hostchecks.ctp
+++ b/app/View/Commands/hostchecks.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), Router::url(['action' => 'add', '_controller' => 'commands', '_action' => 'hostchecks']), ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML;
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -90,7 +90,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>
diff --git a/app/View/Commands/index.ctp b/app/View/Commands/index.ctp
index 9150ab1f4a..f903b627eb 100755
--- a/app/View/Commands/index.ctp
+++ b/app/View/Commands/index.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Hix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -90,7 +90,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>
diff --git a/app/View/Commands/notifications.ctp b/app/View/Commands/notifications.ctp
index 8a4a9cf757..c55b683390 100755
--- a/app/View/Commands/notifications.ctp
+++ b/app/View/Commands/notifications.ctp
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), Router::url(['action' => 'add', '_controller' => 'commands', '_action' => 'notifications']), ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -90,7 +90,7 @@
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="datatable_fixed_column" class="table table-striped table-bordered smart-form">
                                 <thead>
diff --git a/app/View/Contactgroups/edit.ctp b/app/View/Contactgroups/edit.ctp
index 662d308b90..9c356cd312 100755
--- a/app/View/Contactgroups/edit.ctp
+++ b/app/View/Contactgroups/edit.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-users fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Contactgroups'); ?>
+                <?php echo __('Contact Groups'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
diff --git a/app/View/Contactgroups/index.ctp b/app/View/Contactgroups/index.ctp
index 17ac15d4e8..5f1bed985d 100755
--- a/app/View/Contactgroups/index.ctp
+++ b/app/View/Contactgroups/index.ctp
@@ -31,7 +31,7 @@
             <i class="fa fa-users fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Contactgroups'); ?>
+                <?php echo __('Contact Groups'); ?>
 			</span>
         </h1>
     </div>
@@ -48,7 +48,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML;
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -62,7 +62,7 @@
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="1"><input
                                             type="checkbox" class="pull-left"/>
-                                    &nbsp; <?php echo __('Contactgroup name'); ?></a></li>
+                                    &nbsp; <?php echo __('Contact group name'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="2"><input
                                             type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Description'); ?>
@@ -77,11 +77,11 @@
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-users"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Contactgroups'); ?> </h2>
+                    <h2 class="hidden-mobile"><?php echo __('Contact Groups'); ?> </h2>
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="contactgroup_list" class="table table-striped table-bordered smart-form"
                                    style="">
@@ -91,7 +91,7 @@
                                     <th class="no-sort" style="width: 15px;"><i class="fa fa-check-square-o fa-lg"></i>
                                     </th>
                                     <th class="select_datatable no-sort"><?php echo $this->Utils->getDirection($order, 'Container.name');
-                                        echo $this->Paginator->sort('Container.name', __('Contactgroup name')); ?></th>
+                                        echo $this->Paginator->sort('Container.name', __('Contact group name')); ?></th>
                                     <th class="no-sort"><?php echo $this->Utils->getDirection($order, 'Contacts.description');
                                         echo $this->Paginator->sort('Contactgroup.description', __('Description')); ?></th>
                                     <th class="no-sort"><?php echo __('Contacts'); ?></th>
diff --git a/app/View/Contacts/index.ctp b/app/View/Contacts/index.ctp
index 9695d9c609..c5b2b527e0 100755
--- a/app/View/Contacts/index.ctp
+++ b/app/View/Contacts/index.ctp
@@ -51,7 +51,7 @@
                                 echo " "; //Fix HTML
                             endif;
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -98,7 +98,7 @@
 
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="contact_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
diff --git a/app/View/DeletedHosts/index.ctp b/app/View/DeletedHosts/index.ctp
index 82fe7d81f6..53040fed99 100644
--- a/app/View/DeletedHosts/index.ctp
+++ b/app/View/DeletedHosts/index.ctp
@@ -69,7 +69,7 @@ foreach ($this->params->named as $key => $value) {
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -125,7 +125,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
diff --git a/app/View/Downtimes/host.ctp b/app/View/Downtimes/host.ctp
index d538de43e5..c47fff08b2 100644
--- a/app/View/Downtimes/host.ctp
+++ b/app/View/Downtimes/host.ctp
@@ -74,7 +74,7 @@
                                 <?php endif; ?>
                             </ul>
                         </div>
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -272,7 +272,7 @@
                 <div>
 
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $DowntimeListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $DowntimeListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="hostdowntimes_list" class="table table-striped table-bordered smart-form"
                                    style="">
diff --git a/app/View/Downtimes/service.ctp b/app/View/Downtimes/service.ctp
index 597fe98719..b05f69febf 100644
--- a/app/View/Downtimes/service.ctp
+++ b/app/View/Downtimes/service.ctp
@@ -72,7 +72,7 @@
                                 <?php endif; ?>
                             </ul>
                         </div>
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -273,7 +273,7 @@
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $DowntimeListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $DowntimeListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="servicedowntimes_list" class="table table-striped table-bordered smart-form"
                                    style="">
diff --git a/app/View/Emails/html/template-itn-std-host.ctp b/app/View/Emails/html/template-itn-std-host.ctp
index 3eee3ecb6d..423d49eca9 100644
--- a/app/View/Emails/html/template-itn-std-host.ctp
+++ b/app/View/Emails/html/template-itn-std-host.ctp
@@ -528,7 +528,7 @@
                                     <td><?php echo date('H:i:s T'); ?></td>
                                 </tr>
                                 <tr>
-                                    <td><strong><?php echo __('Hostname'); ?>:</strong></td>
+                                    <td><strong><?php echo __('Host Name'); ?>:</strong></td>
                                     <td><?php echo h($parameters['hostname']); ?></td>
                                 </tr>
                                 <tr>
diff --git a/app/View/Emails/html/template-itn-std-service.ctp b/app/View/Emails/html/template-itn-std-service.ctp
index 6e81f6ebd3..6046a87ed3 100644
--- a/app/View/Emails/html/template-itn-std-service.ctp
+++ b/app/View/Emails/html/template-itn-std-service.ctp
@@ -525,7 +525,7 @@
                                     <td><?php echo date('H:i:s T'); ?></td>
                                 </tr>
                                 <tr>
-                                    <td><strong><?php echo __('Hostname'); ?>:</strong></td>
+                                    <td><strong><?php echo __('Host Name'); ?>:</strong></td>
                                     <td><?php echo h($parameters['hostname']); ?></td>
                                 </tr>
                                 <tr>
diff --git a/app/View/Graphgenerators/index.ctp b/app/View/Graphgenerators/index.ctp
index 25c63d3fb0..4ee0f967f1 100755
--- a/app/View/Graphgenerators/index.ctp
+++ b/app/View/Graphgenerators/index.ctp
@@ -36,7 +36,7 @@
             <i class="fa fa-area-chart fa-fw"></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Graphgenerator'); ?>
+                <?php echo __('Graph Generator'); ?>
 			</span>
         </h1>
     </div>
@@ -59,7 +59,7 @@
                     <div class="jarviswidget-ctrls" role="menu"></div>
                     <span class="widget-icon"><i class="fa fa-area-chart"></i></span>
 
-                    <h2 class="hidden-mobile hidden-tablet"><?php echo __('Graphgenerator'); ?></h2>
+                    <h2 class="hidden-mobile hidden-tablet"><?php echo __('Graph Generator'); ?></h2>
                     <ul class="nav nav-tabs pull-right padding-left-20" id="widget-tab-1">
                         <li<?php echo $is_config_loaded ? '' : ' class="active"' ?>>
                             <a href="/graphgenerators/index">
diff --git a/app/View/Graphgenerators/listing.ctp b/app/View/Graphgenerators/listing.ctp
index aee410fe32..3d1ff0f60e 100644
--- a/app/View/Graphgenerators/listing.ctp
+++ b/app/View/Graphgenerators/listing.ctp
@@ -69,7 +69,7 @@
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <!--						--><?php //echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> ' . __('search'), false, false); ?>
+                        <!--						--><?php //echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> ' . __('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered">
                                 <!--							<table id="host_list" class="table table-striped table-bordered smart-form">-->
diff --git a/app/View/Hostchecks/index.ctp b/app/View/Hostchecks/index.ctp
index bb7dfede6d..6a9b3f99e0 100644
--- a/app/View/Hostchecks/index.ctp
+++ b/app/View/Hostchecks/index.ctp
@@ -72,7 +72,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, [
@@ -237,7 +237,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $StatehistoryListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $StatehistoryListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="hostchecks_list" class="table table-striped table-bordered smart-form" style="">
                             <thead>
diff --git a/app/View/Hostdependencies/index.ctp b/app/View/Hostdependencies/index.ctp
index c7a3a29c76..ab413ff172 100644
--- a/app/View/Hostdependencies/index.ctp
+++ b/app/View/Hostdependencies/index.ctp
@@ -49,7 +49,7 @@
                                 echo " "; //Fix HTML if search is implemented
                             endif;
                             // TODO Implement Search
-                            //echo $this->Html->link(__('Search'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search'));
+                            //echo $this->Html->link(__('Filter'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter'));
                             if ($isFilter):
                                 echo " "; //Fix HTML
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
diff --git a/app/View/Hostescalations/edit.ctp b/app/View/Hostescalations/edit.ctp
index 897cab3262..0ee667f332 100755
--- a/app/View/Hostescalations/edit.ctp
+++ b/app/View/Hostescalations/edit.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-bomb fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Hostescalation'); ?>
+                <?php echo __('Host Escalation'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-bomb"></i> </span>
-        <h2><?php echo __('Edit Hostescalation'); ?></h2>
+        <h2><?php echo __('Edit Host Escalation'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php if ($this->Acl->hasPermission('delete')): ?>
                 <?php echo $this->Utils->deleteButton(null, $hostescalation['Hostescalation']['id']); ?>
diff --git a/app/View/Hostescalations/index.ctp b/app/View/Hostescalations/index.ctp
index 5f5345c54d..db0c6ff865 100755
--- a/app/View/Hostescalations/index.ctp
+++ b/app/View/Hostescalations/index.ctp
@@ -30,7 +30,7 @@
                 <i class="fa fa-bomb fa-fw"></i>
                 <?php echo __('Monitoring'); ?>
                 <span>>
-                    <?php echo __('Hostescalations'); ?>
+                    <?php echo __('Host Escalations'); ?>
 			</span>
             </h1>
         </div>
@@ -49,7 +49,7 @@
                                 //echo " "; //Fix HTML if search is implemented
                             endif;
                             // TODO: search functionallity
-                            //echo $this->Html->link(__('Search'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search'));
+                            //echo $this->Html->link(__('Filter'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter'));
 
                             if ($isFilter):
                                 echo " "; //Fix HTML
@@ -111,7 +111,7 @@
                         <div class="jarviswidget-ctrls" role="menu">
                         </div>
                         <span class="widget-icon hidden-mobile"> <i class="fa fa-bomb"></i> </span>
-                        <h2 class="hidden-mobile"><?php echo __('Hostescalations'); ?> </h2>
+                        <h2 class="hidden-mobile"><?php echo __('Host Escalations'); ?> </h2>
 
                     </header>
                     <div>
diff --git a/app/View/Hostgroups/add.ctp b/app/View/Hostgroups/add.ctp
index 26df141563..d955eb3e9f 100755
--- a/app/View/Hostgroups/add.ctp
+++ b/app/View/Hostgroups/add.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-sitemap fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Hostgroups'); ?>
+                <?php echo __('Host Groups'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-sitemap"></i> </span>
-        <h2><?php echo __('Add hostgroup'); ?></h2>
+        <h2><?php echo __('Add Host Group'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php echo $this->Utils->backButton(); ?>
         </div>
@@ -58,9 +58,9 @@
                 'label' => __('Container'),
                 'SelectionMode' => 'single',
             ]);
-            echo $this->Form->input('Container.name', ['label' => __('Hostgroup name')]);
+            echo $this->Form->input('Container.name', ['label' => __('Host Group Name')]);
             echo $this->Form->input('Hostgroup.description', ['label' => __('Description')]);
-            echo $this->Form->input('hostgroup_url', ['label' => __('Hostgroup URL')]);
+            echo $this->Form->input('hostgroup_url', ['label' => __('Host Group URL')]);
             echo $this->Form->input('Hostgroup.Host', [
                 'options' => $hosts,
                 'class' => 'chosen',
diff --git a/app/View/Hostgroups/edit.ctp b/app/View/Hostgroups/edit.ctp
index 940eb5df69..e01471f862 100755
--- a/app/View/Hostgroups/edit.ctp
+++ b/app/View/Hostgroups/edit.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-sitemap fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Hostgroups'); ?>
+                <?php echo __('Host Groups'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -39,7 +39,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-terminal"></i> </span>
-        <h2><?php echo __('Edit hostgroups'); ?></h2>
+        <h2><?php echo __('Edit Host Groups'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php if ($this->Acl->hasPermission('delete')): ?>
                 <?php echo $this->Utils->deleteButton(null, $hostgroup['Hostgroup']['id']); ?>
@@ -89,9 +89,9 @@
                     ]
                 );
             endif;
-            echo $this->Form->input('Container.name', ['label' => __('Hostgroup name'), 'value' => $this->request->data['Container']['name']]);
+            echo $this->Form->input('Container.name', ['label' => __('Host Group name'), 'value' => $this->request->data['Container']['name']]);
             echo $this->Form->input('Hostgroup.description', ['label' => __('Description'), 'value' => $this->request->data['Hostgroup']['description']]);
-            echo $this->Form->input('hostgroup_url', ['label' => __('Hostgroup URL'), 'value' => $this->request->data['Hostgroup']['hostgroup_url']]);
+            echo $this->Form->input('hostgroup_url', ['label' => __('Host Group URL'), 'value' => $this->request->data['Hostgroup']['hostgroup_url']]);
             echo $this->Form->input('Hostgroup.Host', [
                     'options'          => $hosts,
                     'class'            => 'chosen',
diff --git a/app/View/Hostgroups/extended.ctp b/app/View/Hostgroups/extended.ctp
index 017044b848..0f76287a71 100644
--- a/app/View/Hostgroups/extended.ctp
+++ b/app/View/Hostgroups/extended.ctp
@@ -44,7 +44,7 @@ use itnovum\openITCOCKPIT\Core\HumanTime;
             <i class="fa fa-sitemap fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Hostgroups'); ?>
+                <?php echo __('Host Groups'); ?>
 			</span>
         </h1>
     </div>
diff --git a/app/View/Hostgroups/index.ctp b/app/View/Hostgroups/index.ctp
index 4a7aac7939..32b3c674ca 100755
--- a/app/View/Hostgroups/index.ctp
+++ b/app/View/Hostgroups/index.ctp
@@ -30,7 +30,7 @@
             <i class="fa fa-sitemap fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Hostgroups'); ?>
+                <?php echo __('Host Groups'); ?>
             </span>
         </h1>
     </div>
@@ -47,7 +47,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -61,7 +61,7 @@
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="1"><input
                                             type="checkbox" class="pull-left"/>
-                                    &nbsp; <?php echo __('Hostgroup name'); ?></a></li>
+                                    &nbsp; <?php echo __('Host Group Name'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="2"><input
                                             type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Description'); ?>
@@ -76,7 +76,7 @@
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-sitemap"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Hostgroups'); ?></h2>
+                    <h2 class="hidden-mobile"><?php echo __('Host Groups'); ?></h2>
                     <?php if (!empty($all_hostgroups) && $this->Acl->hasPermission('extended')): ?>
                         <ul class="nav nav-tabs pull-right" id="widget-tab-1">
                             <li>
@@ -88,7 +88,7 @@
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="hostgroup_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
@@ -97,7 +97,7 @@
                                     <th class="no-sort" style="width: 15px;"><i class="fa fa-check-square-o fa-lg"></i>
                                     </th>
                                     <th class="select_datatable no-sort"><?php echo $this->Utils->getDirection($order, 'Container.name');
-                                        echo $this->Paginator->sort('Container.name', 'Hostgroup name'); ?></th>
+                                        echo $this->Paginator->sort('Container.name', 'Host Group Name'); ?></th>
                                     <th class="no-sort"><?php echo $this->Utils->getDirection($order, 'Hostgroup.description');
                                         echo $this->Paginator->sort('Hostgroup.description', 'Description'); ?></th>
                                     <th class="no-sort"><?php echo __('Hosts'); ?></th>
diff --git a/app/View/Hosts/add.ctp b/app/View/Hosts/add.ctp
index c295f85ce4..766f2e0fc8 100755
--- a/app/View/Hosts/add.ctp
+++ b/app/View/Hosts/add.ctp
@@ -127,7 +127,7 @@ $notification_settings = [
                                 'wrapInput'        => 'col col-xs-10 col-md-10 col-lg-10',
                             ]);
                             echo $this->Form->input('name', [
-                                'label'     => ['text' => __('Hostname'), 'class' => 'col-xs-1 col-md-1 col-lg-1'],
+                                'label'     => ['text' => __('Host Name'), 'class' => 'col-xs-1 col-md-1 col-lg-1'],
                                 'wrapInput' => 'col col-xs-10 col-md-10 col-lg-10',
                             ]);
                             echo $this->Form->input('description', [
diff --git a/app/View/Hosts/copy.ctp b/app/View/Hosts/copy.ctp
index 77a286c62f..6d2a5b1dc0 100644
--- a/app/View/Hosts/copy.ctp
+++ b/app/View/Hosts/copy.ctp
@@ -69,7 +69,7 @@
                                 $host_url = $host['Host']['host_url'];
                             endif;
 
-                            echo $this->Form->input('Host.'.$key.'.name', ['value' => $host['Host']['name'], 'label' => __('Hostname'), 'required' => true]);
+                            echo $this->Form->input('Host.'.$key.'.name', ['value' => $host['Host']['name'], 'label' => __('Host Name'), 'required' => true]);
                             echo $this->Form->input('Host.'.$key.'.description', ['value' => $description, 'label' => __('Description'), 'required' => false]);
                             echo $this->Form->input('Host.'.$key.'.address', ['value' => $host['Host']['address'], 'label' => __('Address'), 'required' => true]);
                             echo $this->Form->input('Host.'.$key.'.host_url', ['value' => $host_url, 'label' => __('Host URL'), 'required' => false]);
diff --git a/app/View/Hosts/disabled.ctp b/app/View/Hosts/disabled.ctp
index 1b542342ae..3d50faf5e8 100644
--- a/app/View/Hosts/disabled.ctp
+++ b/app/View/Hosts/disabled.ctp
@@ -50,9 +50,9 @@ foreach ($this->params->named as $key => $value) {
             <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php //echo $this->Html->link(__('Search'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search')); ?>
+                        <?php //echo $this->Html->link(__('Filter'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter')); ?>
                         <?php
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -96,7 +96,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
diff --git a/app/View/Hosts/edit.ctp b/app/View/Hosts/edit.ctp
index 9436c24074..b06c09cefb 100644
--- a/app/View/Hosts/edit.ctp
+++ b/app/View/Hosts/edit.ctp
@@ -212,7 +212,7 @@ $allowSharing = $hostSharingPermissions->allowSharing();
                             echo $this->Form->input(
                                 'name',
                                 [
-                                    'label' => ['text' => __('Hostname'), 'class' => 'col-xs-1 col-md-1 col-lg-1'],
+                                    'label' => ['text' => __('Host Name'), 'class' => 'col-xs-1 col-md-1 col-lg-1'],
                                     'value' => $host['Host']['name'],
                                     'wrapInput' => 'col col-xs-10 col-md-10 col-lg-10',
                                 ]
diff --git a/app/View/Hosts/index.ctp b/app/View/Hosts/index.ctp
index a4761f4a67..08be21c6fd 100644
--- a/app/View/Hosts/index.ctp
+++ b/app/View/Hosts/index.ctp
@@ -48,7 +48,9 @@ foreach ($this->params->named as $key => $value) {
         </h1>
     </div>
 </div>
+
 <?php echo $this->Flash->render('positive'); ?>
+
 <div id="error_msg"></div>
 
 <div class="alert alert-success alert-block" id="flashSuccess" style="display:none;">
@@ -78,7 +80,7 @@ foreach ($this->params->named as $key => $value) {
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Need a space for nice buttons
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
 
                         if ($isFilter):
                             echo " "; //Need a space for html
@@ -96,7 +98,7 @@ foreach ($this->params->named as $key => $value) {
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="4"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Graph'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="5"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Shared'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="6"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Passive'); ?></a></li>
-                            <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="7"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Hostname'); ?></a></li>
+                            <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="7"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Host Name'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="8"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('IP-Address'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="9"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('State since'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left" class="select_datatable text-left" my-column="10"><input type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Last check'); ?></a></li>
@@ -143,7 +145,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('Search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
diff --git a/app/View/Hosts/not_monitored.ctp b/app/View/Hosts/not_monitored.ctp
index d4f0f3674c..f1431f181f 100644
--- a/app/View/Hosts/not_monitored.ctp
+++ b/app/View/Hosts/not_monitored.ctp
@@ -56,7 +56,7 @@ foreach ($this->params->named as $key => $value) {
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Need a space for nice buttons
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Need a space for html
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -82,7 +82,7 @@ foreach ($this->params->named as $key => $value) {
                             </li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="5"><input
-                                            type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Hostname'); ?></a>
+                                            type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Host Name'); ?></a>
                             </li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="6"><input
@@ -146,7 +146,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
diff --git a/app/View/Hosttemplates/index.ctp b/app/View/Hosttemplates/index.ctp
index 2e5e7d16f3..79a6528290 100755
--- a/app/View/Hosttemplates/index.ctp
+++ b/app/View/Hosttemplates/index.ctp
@@ -47,7 +47,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; // Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -62,7 +62,7 @@
                     <div class="jarviswidget-editbox">
                     </div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
diff --git a/app/View/Locations/index.ctp b/app/View/Locations/index.ctp
index b3d69c8d6e..8995325651 100755
--- a/app/View/Locations/index.ctp
+++ b/app/View/Locations/index.ctp
@@ -48,7 +48,7 @@
                                 echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                                 echo " "; //Fix HTML
                             endif;
-                            echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                            echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                             if ($isFilter):
                                 echo " "; //Fix HTML
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -66,7 +66,7 @@
                     <div>
 
                         <div class="widget-body no-padding">
-                            <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                            <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                             <div class="mobile_table">
                                 <table id="location_list" class="table table-striped table-bordered smart-form"
                                        style="">
diff --git a/app/View/Logentries/index.ctp b/app/View/Logentries/index.ctp
index 78632beb0c..2c98343678 100644
--- a/app/View/Logentries/index.ctp
+++ b/app/View/Logentries/index.ctp
@@ -29,7 +29,7 @@ $this->Paginator->options(['url' => Hash::merge($this->params['named'], $this->p
     <div class="col-xs-12 col-sm-7 col-md-7 col-lg-4">
         <h1 class="page-title txt-color-blueDark">
             <i class="fa fa-file-text-o fa-fw"></i>
-            <?php echo __('Logentries'); ?>
+            <?php echo __('Log Entries'); ?>
             <span>
                 <?php echo __('Overview'); ?>
             </span>
@@ -48,7 +48,7 @@ $this->Paginator->options(['url' => Hash::merge($this->params['named'], $this->p
                 <header>
                     <div class="widget-toolbar" role="menu">
                         <?php
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
                         endif;
@@ -71,7 +71,7 @@ $this->Paginator->options(['url' => Hash::merge($this->params['named'], $this->p
                             </li>
                             <li style="width: 100%;">
                                 <a href="javascript:void(0)" class="select_datatable text-left" my-column="2">
-                                    <input type="checkbox" class="pull-left"/>&nbsp; <?php echo __('Logentry'); ?>
+                                    <input type="checkbox" class="pull-left"/>&nbsp; <?php echo __('Log Entry'); ?>
                                 </a>
                             </li>
                         </ul>
@@ -212,7 +212,7 @@ $this->Paginator->options(['url' => Hash::merge($this->params['named'], $this->p
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-file-text-o"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Logentries'); ?> </h2>
+                    <h2 class="hidden-mobile"><?php echo __('Log Entries'); ?> </h2>
 
                 </header>
 
@@ -220,7 +220,7 @@ $this->Paginator->options(['url' => Hash::merge($this->params['named'], $this->p
                 <div>
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $LogentiresListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $LogentiresListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="logentries_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
@@ -236,7 +236,7 @@ $this->Paginator->options(['url' => Hash::merge($this->params['named'], $this->p
                                     </th>
                                     <th class="no-sort">
                                         <?php echo $this->Utils->getDirection($order, 'logentry_data');
-                                        echo $this->Paginator->sort('logentry_data', __('Logentry')); ?>
+                                        echo $this->Paginator->sort('logentry_data', __('Log Entry')); ?>
                                     </th>
                                 </tr>
                                 </thead>
diff --git a/app/View/Notifications/host_notification.ctp b/app/View/Notifications/host_notification.ctp
index 995cbc76f1..dd7189f646 100644
--- a/app/View/Notifications/host_notification.ctp
+++ b/app/View/Notifications/host_notification.ctp
@@ -77,7 +77,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -209,7 +209,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], $ListsettingsUrlParams)), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], $ListsettingsUrlParams)), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="host_list" class="table table-striped table-bordered smart-form" style="">
                             <thead>
diff --git a/app/View/Notifications/index.ctp b/app/View/Notifications/index.ctp
index fee49b96a9..e6e8c3ed78 100644
--- a/app/View/Notifications/index.ctp
+++ b/app/View/Notifications/index.ctp
@@ -61,7 +61,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -264,7 +264,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $ListsettingsUrlParams)), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $ListsettingsUrlParams)), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="notification_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
diff --git a/app/View/Notifications/service_notification.ctp b/app/View/Notifications/service_notification.ctp
index 066259eff0..b943892f32 100644
--- a/app/View/Notifications/service_notification.ctp
+++ b/app/View/Notifications/service_notification.ctp
@@ -79,7 +79,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -214,7 +214,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], $ListsettingsUrlParams)), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], $ListsettingsUrlParams)), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="host_list" class="table table-striped table-bordered smart-form" style="">
                             <thead>
diff --git a/app/View/Search/host_macro.ctp b/app/View/Search/host_macro.ctp
index c403f61fb4..89a4b5a2f6 100644
--- a/app/View/Search/host_macro.ctp
+++ b/app/View/Search/host_macro.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-search fa-fw "></i>
             <?php echo __('Host macro') ?>
             <span>>
-                <?php echo __('search result'); ?>
+                <?php echo __('Search Result'); ?>
 			</span>
         </h1>
     </div>
@@ -45,7 +45,7 @@
                         <?php echo $this->Utils->backButton(__('Back'), '/search'); ?>
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-search"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Search result'); ?></h2>
+                    <h2 class="hidden-mobile"><?php echo __('Search Result'); ?></h2>
 
                 </header>
                 <div>
@@ -56,7 +56,7 @@
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
                                 <tr>
-                                    <th class="no-sort"><?php echo __('Hostname'); ?></th>
+                                    <th class="no-sort"><?php echo __('Host Name'); ?></th>
                                     <th class="no-sort"><?php echo __('IP-Address'); ?></th>
                                     <th class="no-sort text-center"><i class="fa fa-gear fa-lg"></i></th>
                                 </tr>
diff --git a/app/View/Search/index.ctp b/app/View/Search/index.ctp
index 77982743a8..5379b8b9c2 100644
--- a/app/View/Search/index.ctp
+++ b/app/View/Search/index.ctp
@@ -75,7 +75,7 @@
                                 <br/>
                                 <?php
                                 echo $this->Form->input('Hostname', [
-                                    'label' => __('Hostname'),
+                                    'label' => __('Host Name'),
                                     'help'  => __('This is a wildcard search, you don\'t need to add * or %'),
                                 ]);
 
diff --git a/app/View/Servicechecks/index.ctp b/app/View/Servicechecks/index.ctp
index 789974feb3..3bd0403827 100644
--- a/app/View/Servicechecks/index.ctp
+++ b/app/View/Servicechecks/index.ctp
@@ -79,7 +79,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -244,7 +244,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $ServicecheckListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $ServicecheckListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="servicechecks_list" class="table table-striped table-bordered smart-form" style="">
                             <thead>
diff --git a/app/View/Servicedependencies/index.ctp b/app/View/Servicedependencies/index.ctp
index f8d8dad637..5be50e94ca 100644
--- a/app/View/Servicedependencies/index.ctp
+++ b/app/View/Servicedependencies/index.ctp
@@ -49,7 +49,7 @@
                                 //echo " "; //Fix HTML if search is implemented
                             endif;
                             // TODO implement search
-                            //echo $this->Html->link(__('Search'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search'));
+                            //echo $this->Html->link(__('Filter'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter'));
                             if ($isFilter):
                                 echo " "; //Fix HTML
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
diff --git a/app/View/Serviceescalations/add.ctp b/app/View/Serviceescalations/add.ctp
index 1bb3ad29c6..d9ab9b5b8d 100644
--- a/app/View/Serviceescalations/add.ctp
+++ b/app/View/Serviceescalations/add.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-bomb fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Serviceescalation'); ?>
+                <?php echo __('Service Escalation'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-bomb"></i> </span>
-        <h2><?php echo __('Add Serviceescalation'); ?></h2>
+        <h2><?php echo __('Add Service Escalation'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php echo $this->Utils->backButton(); ?>
         </div>
@@ -86,7 +86,7 @@
                 'class'            => 'chosen',
                 'multiple'         => true,
                 'style'            => 'width:100%;',
-                'label'            => __('<i class="fa fa-plus-square text-success"></i> Servicegroups'),
+                'label'            => __('<i class="fa fa-plus-square text-success"></i> Service Groups'),
                 'data-placeholder' => __('Please choose a servicegroup'),
                 'wrapInput'        => [
                     'tag'   => 'div',
@@ -100,7 +100,7 @@
                 'class'            => 'chosen',
                 'multiple'         => true,
                 'style'            => 'width:100%;',
-                'label'            => __('<i class="fa fa-minus-square text-danger"></i> Servicegroups (excluded)'),
+                'label'            => __('<i class="fa fa-minus-square text-danger"></i> Service Groups (excluded)'),
                 'data-placeholder' => __('Please choose a servicegroup'),
                 'wrapInput'        => [
                     'tag'   => 'div',
@@ -133,7 +133,7 @@
                 'class'            => 'chosen',
                 'multiple'         => false,
                 'style'            => 'width:100%;',
-                'label'            => __('Timeperiod'),
+                'label'            => __('Time period'),
                 'data-placeholder' => __('Please choose a contact'),
             ]);
 
@@ -151,13 +151,13 @@
                 'class'            => 'chosen',
                 'multiple'         => true,
                 'style'            => 'width:100%;',
-                'label'            => __('Contactgroups'),
+                'label'            => __('Contact groups'),
                 'data-placeholder' => __('Please choose a contactgroup'),
             ]);
             ?>
             <fieldset>
                 <legend class="font-sm">
-                    <label><?php echo __('Serviceescalation options'); ?></label>
+                    <label><?php echo __('Service escalation options'); ?></label>
                     <?php if (isset($validation_service_notification)): ?>
                         <span class="text-danger"><?php echo $validation_service_notification; ?></span>
                     <?php endif; ?>
diff --git a/app/View/Serviceescalations/edit.ctp b/app/View/Serviceescalations/edit.ctp
index 628f4ae072..19bc17a556 100644
--- a/app/View/Serviceescalations/edit.ctp
+++ b/app/View/Serviceescalations/edit.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-bomb fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Serviceescalation'); ?>
+                <?php echo __('Service Escalation'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-bomb"></i> </span>
-        <h2><?php echo __('Edit Serviceescalation'); ?></h2>
+        <h2><?php echo __('Edit Service Escalation'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php if ($this->Acl->hasPermission('delete')): ?>
                 <?php echo $this->Utils->deleteButton(null, $serviceescalation['Serviceescalation']['id']); ?>
diff --git a/app/View/Serviceescalations/index.ctp b/app/View/Serviceescalations/index.ctp
index 3c4b059f90..6e7dc28aca 100644
--- a/app/View/Serviceescalations/index.ctp
+++ b/app/View/Serviceescalations/index.ctp
@@ -31,7 +31,7 @@
                 <i class="fa fa-bomb fa-fw"></i>
                 <?php echo __('Monitoring'); ?>
                 <span>>
-                    <?php echo __('Serviceescalations'); ?>
+                    <?php echo __('Service Escalations'); ?>
 			</span>
             </h1>
         </div>
@@ -51,7 +51,7 @@
                             endif;
 
                             //TODO: search functionallity
-                            //echo $this->Html->link(__('Search'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search'));
+                            //echo $this->Html->link(__('Filter'), 'javascript:', array('class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter'));
 
                             if ($isFilter):
                                 echo " ";
@@ -113,7 +113,7 @@
                         <div class="jarviswidget-ctrls" role="menu">
                         </div>
                         <span class="widget-icon hidden-mobile"> <i class="fa fa-bomb"></i> </span>
-                        <h2 class="hidden-mobile"><?php echo __('Serviceescalations'); ?> </h2>
+                        <h2 class="hidden-mobile"><?php echo __('Service Escalations'); ?> </h2>
 
                     </header>
                     <div>
diff --git a/app/View/Servicegroups/index.ctp b/app/View/Servicegroups/index.ctp
index 9524dc284b..c28b741360 100644
--- a/app/View/Servicegroups/index.ctp
+++ b/app/View/Servicegroups/index.ctp
@@ -30,7 +30,7 @@
             <i class="fa fa-cogs fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Servicegroups'); ?>
+                <?php echo __('Service Groups'); ?>
 			</span>
         </h1>
     </div>
@@ -47,7 +47,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fiox HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -60,7 +60,7 @@
                         <ul class="dropdown-menu arrow-box-up-right pull-right">
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         my-column="1"><input type="checkbox" class="pull-left"/>
-                                    &nbsp; <?php echo __('Servicegroup name'); ?></a></li>
+                                    &nbsp; <?php echo __('Service Group Name'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         my-column="2"><input type="checkbox" class="pull-left"/>
                                     &nbsp; <?php echo __('Description'); ?></a></li>
@@ -69,18 +69,18 @@
                                     &nbsp; <?php echo __('Services'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         my-column="4"><input type="checkbox" class="pull-left"/>
-                                    &nbsp; <?php echo __('Service templates'); ?></a></li>
+                                    &nbsp; <?php echo __('Service Templates'); ?></a></li>
                         </ul>
                         <div class="clearfix"></div>
                     </div>
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-cogs"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Servicegroups'); ?></h2>
+                    <h2 class="hidden-mobile"><?php echo __('Service Groups'); ?></h2>
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="servicegroup_list" class="table table-striped table-bordered smart-form"
                                    style="">
@@ -94,7 +94,7 @@
                                     <th class="no-sort"><?php echo $this->Utils->getDirection($order, 'Servicegroup.description');
                                         echo $this->Paginator->sort('Servicegroup.description', __('Description')); ?></th>
                                     <th class="no-sort"><?php echo __('Services'); ?></th>
-                                    <th class="no-sort"><?php echo __('Service templates'); ?></th>
+                                    <th class="no-sort"><?php echo __('Service Templates'); ?></th>
                                     <th class="no-sort"></th>
                                 </tr>
                                 </thead>
diff --git a/app/View/Services/disabled.ctp b/app/View/Services/disabled.ctp
index 61e08b9f19..20a4ba2fe8 100755
--- a/app/View/Services/disabled.ctp
+++ b/app/View/Services/disabled.ctp
@@ -48,7 +48,7 @@ foreach ($this->params->named as $key => $value) {
             <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -89,7 +89,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
diff --git a/app/View/Services/index.ctp b/app/View/Services/index.ctp
index fb6f277752..2167c881a9 100755
--- a/app/View/Services/index.ctp
+++ b/app/View/Services/index.ctp
@@ -45,6 +45,7 @@ foreach ($this->params->named as $key => $value) {
 </div>
 
 <?php echo $this->Flash->render('positive'); ?>
+
 <div id="error_msg"></div>
 
 <div class="alert alert-success alert-block" id="flashSuccess" style="display:none;">
@@ -73,7 +74,7 @@ foreach ($this->params->named as $key => $value) {
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Need a space for html
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Need a space for html
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -112,7 +113,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="service_list" class="table table-striped table-bordered smart-form" style="">
@@ -667,4 +668,4 @@ foreach ($this->params->named as $key => $value) {
 <input type="hidden" id="delete_message_h2"
        value="<?php echo __('Do you really want delete the selected services?'); ?>"/>
 <input type="hidden" id="message_yes" value="<?php echo __('Yes'); ?>"/>
-<input type="hidden" id="message_no" value="<?php echo __('No'); ?>"/>
\ No newline at end of file
+<input type="hidden" id="message_no" value="<?php echo __('No'); ?>"/>
diff --git a/app/View/Services/load_services.ctp b/app/View/Services/load_services.ctp
index d991ab2ec1..3113459c1e 100755
--- a/app/View/Services/load_services.ctp
+++ b/app/View/Services/load_services.ctp
@@ -59,7 +59,7 @@ if (!empty($services)):
                     <header>
                         <div class="widget-toolbar" role="menu">
                             <?php echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']); ?>
-                            <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                            <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                             <?php
                             /*if($isFilter):
                                 echo $this->ListFilter->resetLink(null, array('class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times'));
@@ -89,7 +89,7 @@ if (!empty($services)):
                                                                 class="select_datatable text-left"
                                                                 class="select_datatable text-left" my-column="4"><input
                                                     type="checkbox" class="pull-left"/>
-                                            &nbsp; <?php echo __('Hostname'); ?></a></li>
+                                            &nbsp; <?php echo __('Host Name'); ?></a></li>
                                     <li style="width: 100%;"><a href="javascript:void(0)"
                                                                 class="select_datatable text-left"
                                                                 class="select_datatable text-left" my-column="5"><input
@@ -134,7 +134,7 @@ if (!empty($services)):
 
                         <!-- widget content -->
                         <div class="widget-body no-padding">
-                            <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                            <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                             <table id="service_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
                                 <tr>
diff --git a/app/View/Services/not_monitored.ctp b/app/View/Services/not_monitored.ctp
index a1d9715b03..28cad0ffc2 100755
--- a/app/View/Services/not_monitored.ctp
+++ b/app/View/Services/not_monitored.ctp
@@ -53,7 +53,7 @@ foreach ($this->params->named as $key => $value) {
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Space for html
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Space for html
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -95,7 +95,7 @@ foreach ($this->params->named as $key => $value) {
                     <div class="widget-body no-padding">
                         <?php
                         $options = ['avoid_cut' => true];
-                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-search"></i> '.__('search'), false, false);
+                        echo $this->ListFilter->renderFilterbox($filters, $options, '<i class="fa fa-filter"></i> '.__('Filter'), false, false);
                         ?>
                         <div class="mobile_table">
                             <table id="host_list" class="table table-striped table-bordered smart-form" style="">
diff --git a/app/View/Servicetemplategroups/add.ctp b/app/View/Servicetemplategroups/add.ctp
index 1606624e07..4c3de8dc69 100644
--- a/app/View/Servicetemplategroups/add.ctp
+++ b/app/View/Servicetemplategroups/add.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-cogs fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Servicetemplategroup'); ?>
+                <?php echo __('Service Template Group'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-cogs"></i> </span>
-        <h2><?php echo __('Add Servicetemplategroup'); ?></h2>
+        <h2><?php echo __('Add Service Template Group'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php echo $this->Utils->backButton(); ?>
         </div>
@@ -54,8 +54,8 @@
             echo $this->Form->input('Container.parent_id', ['options'       => $this->Html->chosenPlaceholder($containers), 'class' => 'chosen', 'style' => 'width: 100%;', 'label' => __('Container'),
                                                             'SelectionMode' => 'single',
             ]);
-            echo $this->Form->input('Container.name', ['label' => __('Servicetemplategroup name')]);
-            echo $this->Form->input('Servicetemplategroup.Servicetemplate', ['options' => $servicetemplates, 'class' => 'chosen optgroup_show', 'multiple' => true, 'style' => 'width:100%;', 'label' => __('Servicetemplates'), 'data-placeholder' => __('Please choose a servicetemplate')]);
+            echo $this->Form->input('Container.name', ['label' => __('Service Template Group Name')]);
+            echo $this->Form->input('Servicetemplategroup.Servicetemplate', ['options' => $servicetemplates, 'class' => 'chosen optgroup_show', 'multiple' => true, 'style' => 'width:100%;', 'label' => __('Service Templates'), 'data-placeholder' => __('Please choose a service template')]);
             echo $this->Form->input('Servicetemplategroup.description', ['label' => __('Description')]);
             ?>
             <br/>
diff --git a/app/View/Servicetemplategroups/edit.ctp b/app/View/Servicetemplategroups/edit.ctp
index 9a8ee0c90f..3f53e3755c 100644
--- a/app/View/Servicetemplategroups/edit.ctp
+++ b/app/View/Servicetemplategroups/edit.ctp
@@ -74,7 +74,7 @@
             endif;
             echo $this->Form->input('Servicetemplategroup.id', ['type' => 'hidden', 'value' => $servicetemplategroup['Servicetemplategroup']['id']]);
             echo $this->Form->input('container_id', ['type' => 'hidden', 'value' => $servicetemplategroup['Servicetemplategroup']['container_id']]);
-            echo $this->Form->input('Container.name', ['label' => __('Servicetemplategroup name'), 'value' => $this->request->data['Container']['name']]);
+            echo $this->Form->input('Container.name', ['label' => __('Service Template Group Name'), 'value' => $this->request->data['Container']['name']]);
             echo $this->Form->input('Servicetemplategroup.Servicetemplate', ['options' => $servicetemplates, 'class' => 'chosen', 'multiple' => true, 'style' => 'width:100%;', 'label' => __('Servicetemplates'), 'data-placeholder' => __('Please choose a service'), 'selected' => $this->request->data['Servicetemplate']]);
             echo $this->Form->input('Servicetemplategroup.description', ['label' => __('Description'), 'value' => $this->request->data['Servicetemplategroup']['description']]);
             ?>
diff --git a/app/View/Servicetemplategroups/index.ctp b/app/View/Servicetemplategroups/index.ctp
index bcd255a343..98c13594e6 100644
--- a/app/View/Servicetemplategroups/index.ctp
+++ b/app/View/Servicetemplategroups/index.ctp
@@ -30,7 +30,7 @@
             <i class="fa fa-pencil-square-o fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Servicetemplategroups'); ?>
+                <?php echo __('Service Template Groups'); ?>
 			</span>
         </h1>
     </div>
@@ -47,7 +47,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -55,14 +55,14 @@
                         ?>
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-pencil-square-o"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Servicetemplategroups'); ?> </h2>
+                    <h2 class="hidden-mobile"><?php echo __('Service Template Groups'); ?> </h2>
 
                 </header>
                 <div>
                     <div class="jarviswidget-editbox">
                     </div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="service_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
diff --git a/app/View/Servicetemplates/add.ctp b/app/View/Servicetemplates/add.ctp
index 0dcac69ac2..647d83ed3a 100755
--- a/app/View/Servicetemplates/add.ctp
+++ b/app/View/Servicetemplates/add.ctp
@@ -44,7 +44,7 @@ $notification_settings = [
             <i class="fa fa-pencil-square-o fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Servicetemplate'); ?>
+                <?php echo __('Service Template'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
diff --git a/app/View/Servicetemplates/assign_group.ctp b/app/View/Servicetemplates/assign_group.ctp
index 742e669136..58a3b4da4b 100644
--- a/app/View/Servicetemplates/assign_group.ctp
+++ b/app/View/Servicetemplates/assign_group.ctp
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon hidden-mobile hidden-tablet"> <i class="fa fa-pencil-square-o"></i> </span>
-        <h2 class="hidden-mobile hidden-tablet"><?php echo __('Allocate to Servicetemplategroup'); ?></h2>
+        <h2 class="hidden-mobile hidden-tablet"><?php echo __('Allocate to Service template group'); ?></h2>
         <div class="widget-toolbar hidden-mobile hidden-tablet" role="menu">
             <?php echo $this->Utils->backButton(__('Back'), $back_url); ?>
         </div>
@@ -56,15 +56,15 @@
             <div class="form-group">
                 <div class="col col-xs-10 col-xs-offset-2">
                     <?= $this->Form->checkbox('new', ['id' => 'new-stgroup']); ?>
-                    <?= $this->Form->label('label-for-new', __('Create new Servicetemplategroup'), ['for' => 'new-stgroup']); ?>
+                    <?= $this->Form->label('label-for-new', __('Create new Service template group'), ['for' => 'new-stgroup']); ?>
                 </div>
             </div>
             <div id="new-to-holder" style="display:none">
-                <?= $this->Form->input('Container.name', ['type' => 'text', 'style' => 'width: 100%;', 'label' => __('Servicetemplategroup')]); ?>
+                <?= $this->Form->input('Container.name', ['type' => 'text', 'style' => 'width: 100%;', 'label' => __('Service template group')]); ?>
                 <?= $this->Form->input('Servicetemplategroup.description', ['label' => __('Description')]) ?>
             </div>
             <div id="assign-to-holder">
-                <?= $this->Form->input('Servicetemplategroup.id', ['options' => $servicetemplateGroupList, 'class' => 'chosen', 'style' => 'width: 100%;', 'label' => __('Servicetemplategroup')]); ?>
+                <?= $this->Form->input('Servicetemplategroup.id', ['options' => $servicetemplateGroupList, 'class' => 'chosen', 'style' => 'width: 100%;', 'label' => __('Service template group')]); ?>
             </div>
             <?= $this->Form->input('Servicetemplategroup.Servicetemplate', ['options' => $allServicetemplates, 'class' => 'chosen', 'multiple' => true, 'style' => 'width:100%;', 'label' => __('Servicetemplates'), 'data-placeholder' => __('Please choose a servicetemplate'), 'selected' => array_keys($myServiceTemplates)]); ?>
             <?= $this->Form->formActions(); ?>
diff --git a/app/View/Servicetemplates/copy.ctp b/app/View/Servicetemplates/copy.ctp
index fd7b6eb811..18c66a6b71 100644
--- a/app/View/Servicetemplates/copy.ctp
+++ b/app/View/Servicetemplates/copy.ctp
@@ -70,4 +70,4 @@
             <?php echo $this->Form->formActions(); ?>
         </div> <!-- close widget body -->
     </div>
-</div> <!-- end jarviswidget -->
\ No newline at end of file
+</div> <!-- end jarviswidget -->
diff --git a/app/View/Servicetemplates/edit.ctp b/app/View/Servicetemplates/edit.ctp
index 655c5562e1..4a9d131d8e 100644
--- a/app/View/Servicetemplates/edit.ctp
+++ b/app/View/Servicetemplates/edit.ctp
@@ -45,7 +45,7 @@ $notification_settings = [
             <i class="fa fa-pencil-square-o fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Servicetemplate'); ?>
+                <?php echo __('Service Template'); ?>
             </span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -56,7 +56,7 @@ $notification_settings = [
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-pencil-square-o"></i> </span>
-        <h2><?php echo __('Edit Servicetemplate'); ?></h2>
+        <h2><?php echo __('Edit Service template'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php if ($this->Acl->hasPermission('delete')): ?>
                 <?php echo $this->Utils->deleteButton(null, Hash::merge([$servicetemplate['Servicetemplate']['id']] ,$this->params['named']), [], true, __('All attached services will be deleted too.')); ?>
@@ -127,7 +127,7 @@ $notification_settings = [
                             echo $this->Form->input('template_name', [
                                 'value'     => $this->request->data['Servicetemplate']['template_name'],
                                 'label'     => ['text' => __('Template name'), 'class' => 'col-xs-1 col-md-1 col-lg-1'],
-                                'help'      => __('Servicetemplate name'),
+                                'help'      => __('Service template name'),
                                 'wrapInput' => 'col col-xs-10 col-md-10 col-lg-10',
                             ]);
                             echo $this->Form->input('name', [
diff --git a/app/View/Servicetemplates/index.ctp b/app/View/Servicetemplates/index.ctp
index d7f7c8800a..dcf60c0c77 100755
--- a/app/View/Servicetemplates/index.ctp
+++ b/app/View/Servicetemplates/index.ctp
@@ -30,7 +30,7 @@
                 <i class="fa fa-pencil-square-o fa-fw "></i>
                 <?php echo __('Monitoring'); ?>
                 <span>>
-                    <?php echo __('Servicetemplates'); ?>
+                    <?php echo __('Service Templates'); ?>
 			</span>
             </h1>
         </div>
@@ -47,7 +47,7 @@
                                 echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                                 echo " "; //Fix HTML
                             endif;
-                            echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                            echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                             if ($isFilter):
                                 echo " "; //Fix HTML
                                 echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -55,14 +55,14 @@
                             ?>
                         </div>
                         <span class="widget-icon hidden-mobile"> <i class="fa fa-pencil-square-o"></i> </span>
-                        <h2 class="hidden-mobile"><?php echo __('Servicestemplates'); ?> </h2>
-                        <?= $this->Form->hidden('same-contaner-text', ['value' => __('Servicetemplates must belong to the same container')]) ?>
+                        <h2 class="hidden-mobile"><?php echo __('Services Templates'); ?> </h2>
+                        <?= $this->Form->hidden('same-contaner-text', ['value' => __('Service templates must belong to the same container')]) ?>
                     </header>
                     <div>
                         <div class="jarviswidget-editbox">
                         </div>
                         <div class="widget-body no-padding">
-                            <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                            <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                             <div class="mobile_table">
                                 <table id="service_list" class="table table-striped table-bordered smart-form" style="">
                                     <thead>
@@ -70,7 +70,7 @@
                                         <?php $order = $this->Paginator->param('order'); ?>
                                         <th class="no-sort text-center"><i class="fa fa-check-square-o fa-lg"></i></th>
                                         <th class="no-sort col-xs-2 col-sm-2 col-md-2 col-lg-2"><?php echo $this->Utils->getDirection($order, 'template_name');
-                                            echo $this->Paginator->sort('template_name', __('Servicetemplate name')); ?></th>
+                                            echo $this->Paginator->sort('template_name', __('Service template name')); ?></th>
                                         <th class="no-sort col-xs-2 col-sm-2 col-md-2 col-lg-3"><?php echo $this->Utils->getDirection($order, 'name');
                                             echo $this->Paginator->sort('name', __('Service name')); ?></th>
                                         <th class="no-sort col-xs-4 col-sm-4 col-md-4 col-lg-4"><?php echo $this->Utils->getDirection($order, 'description');
diff --git a/app/View/Servicetemplates/used_by.ctp b/app/View/Servicetemplates/used_by.ctp
index c0136a3b5e..769f714e8a 100644
--- a/app/View/Servicetemplates/used_by.ctp
+++ b/app/View/Servicetemplates/used_by.ctp
@@ -28,7 +28,7 @@
     <div class="col-xs-12 col-sm-7 col-md-7 col-lg-4">
         <h1 class="page-title txt-color-blueDark">
             <i class="fa fa-code-fork fa-fw "></i>
-            <?php echo __('Servicetemplate'); ?>
+            <?php echo __('Service Template'); ?>
             <span>>
                 <?php echo __('used by...'); ?>
 			</span>
@@ -49,7 +49,7 @@
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon"> <i class="fa fa-code-fork"></i> </span>
-                    <h2><?php echo __('Servicetemplate'); ?>
+                    <h2><?php echo __('Service Template'); ?>
                         <strong><?php echo h($servicetemplate['Servicetemplate']['template_name']); ?></strong> <?php echo __('is used by the following'); ?> <?php echo $this->Utils->pluralize($all_hosts, __('host'), __('hosts')); ?>
                         (<?php echo sizeof($all_hosts); ?>):</h2>
 
diff --git a/app/View/Statehistories/host.ctp b/app/View/Statehistories/host.ctp
index 03152c6eac..3976905008 100644
--- a/app/View/Statehistories/host.ctp
+++ b/app/View/Statehistories/host.ctp
@@ -72,7 +72,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -258,7 +258,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $StatehistoryListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $StatehistoryListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="hoststatehistory_list" class="table table-striped table-bordered smart-form"
                                style="">
diff --git a/app/View/Statehistories/service.ctp b/app/View/Statehistories/service.ctp
index 6c6158ab5a..ad6982d5c0 100644
--- a/app/View/Statehistories/service.ctp
+++ b/app/View/Statehistories/service.ctp
@@ -79,7 +79,7 @@
                 -->
                 <header>
                     <div class="widget-toolbar" role="menu">
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -266,7 +266,7 @@
 
                     <!-- widget content -->
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $StatehistoryListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $StatehistoryListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
 
                         <table id="servicestatehistory_list" class="table table-striped table-bordered smart-form"
                                style="">
diff --git a/app/View/Statusmaps/click_host_status.ctp b/app/View/Statusmaps/click_host_status.ctp
index ad7ac7b733..6ab4e9e70e 100755
--- a/app/View/Statusmaps/click_host_status.ctp
+++ b/app/View/Statusmaps/click_host_status.ctp
@@ -57,7 +57,7 @@ if (isset($returnedServiceStatus) && $serviceAmount > 0) {
             <th colspan="2" class="h6"><?php echo __('Host'); ?></th>
         </tr>
         <tr>
-            <td class="col-md-3 col-xs-3"><?php echo __('Hostname'); ?></td>
+            <td class="col-md-3 col-xs-3"><?php echo __('Host Name'); ?></td>
             <td class="col-md-9 col-xs-9"><?php echo $returnedHoststatusfield[0]['name']; ?></td>
         </tr>
         <tr>
diff --git a/app/View/Systemdowntimes/index.ctp b/app/View/Systemdowntimes/index.ctp
index 86bac37d27..1327c7a6ff 100644
--- a/app/View/Systemdowntimes/index.ctp
+++ b/app/View/Systemdowntimes/index.ctp
@@ -73,7 +73,7 @@
                                 <?php endif; ?>
                             </ul>
                         </div>
-                        <?php echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']); ?>
+                        <?php echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']); ?>
                         <?php
                         if ($isFilter):
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -239,7 +239,7 @@
                 <div>
 
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $DowntimeListsettings])), 'merge' => false]], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, ['formActionParams' => ['url' => Router::url(Hash::merge($this->params['named'], $this->params['pass'], ['Listsettings' => $DowntimeListsettings])), 'merge' => false]], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="recurringdowntimes_list" class="table table-striped table-bordered smart-form"
                                    style="">
diff --git a/app/View/Systemfailures/add.ctp b/app/View/Systemfailures/add.ctp
index 96be8688af..ac967c47c4 100644
--- a/app/View/Systemfailures/add.ctp
+++ b/app/View/Systemfailures/add.ctp
@@ -29,7 +29,7 @@
             <i class="fa fa-pencil-square-o fa-fw "></i>
             <?php echo __('Administration'); ?>
             <span>>
-                <?php echo __('Systemfailure'); ?>
+                <?php echo __('System failure'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon hidden-mobile hidden-tablet"> <i class="fa fa-pencil-square-o"></i> </span>
-        <h2 class="hidden-mobile hidden-tablet"><?php echo __('Add Systemfailure'); ?></h2>
+        <h2 class="hidden-mobile hidden-tablet"><?php echo __('Add System failure'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php echo $this->Utils->backButton(__('Back'), $back_url); ?>
         </div>
@@ -114,4 +114,4 @@
         <?php echo $this->Form->formActions(); ?>
     </div> <!-- close widget body -->
 </div>
-</div> <!-- end jarviswidget -->
\ No newline at end of file
+</div> <!-- end jarviswidget -->
diff --git a/app/View/Systemfailures/index.ctp b/app/View/Systemfailures/index.ctp
index f0bc30f889..06fe6469b1 100644
--- a/app/View/Systemfailures/index.ctp
+++ b/app/View/Systemfailures/index.ctp
@@ -30,7 +30,7 @@
             <i class="fa fa-desktop fa-fw "></i>
             <?php echo __('Administration') ?>
             <span>>
-                <?php echo __('Systemfailure'); ?>
+                <?php echo __('System Failure'); ?>
 			</span>
         </h1>
     </div>
@@ -47,7 +47,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
 
                         if ($isFilter):
                             echo " "; //Fix HTML
@@ -59,12 +59,12 @@
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-desktop"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Systemfailure'); ?> </h2>
+                    <h2 class="hidden-mobile"><?php echo __('System failure'); ?> </h2>
 
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('Search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="systemfailure_list" class="table table-striped table-bordered smart-form"
                                    style="">
diff --git a/app/View/Systemsettings/index.ctp b/app/View/Systemsettings/index.ctp
index 8248cd5721..6c5034c1b1 100644
--- a/app/View/Systemsettings/index.ctp
+++ b/app/View/Systemsettings/index.ctp
@@ -27,7 +27,7 @@
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
         <h1 class="page-title txt-color-blueDark">
             <i class="fa fa-wrench fa-fw "></i>
-            <?php echo __('Systemsettings'); ?>
+            <?php echo __('System Settings'); ?>
         </h1>
     </div>
     <div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
@@ -47,7 +47,7 @@
             <div class="jarviswidget jarviswidget-color-blueDark" id="wid-id-1" data-widget-editbutton="false">
                 <header>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-wrench"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Systemsettings'); ?> </h2>
+                    <h2 class="hidden-mobile"><?php echo __('System settings'); ?> </h2>
 
                 </header>
                 <div>
diff --git a/app/View/Tenants/index.ctp b/app/View/Tenants/index.ctp
index 10df345b3f..d6f2b77a4a 100755
--- a/app/View/Tenants/index.ctp
+++ b/app/View/Tenants/index.ctp
@@ -49,7 +49,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -62,7 +62,7 @@
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="tab-content">
                             <div class="mobile_table">
                                 <table id="datatable_fixed_column"
diff --git a/app/View/Timeperiods/add.ctp b/app/View/Timeperiods/add.ctp
index 902089ffac..b6a6c1a538 100755
--- a/app/View/Timeperiods/add.ctp
+++ b/app/View/Timeperiods/add.ctp
@@ -30,7 +30,7 @@
             <i class="fa fa-clock-o fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Timeperiods'); ?>
+                <?php echo __('Time Periods'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
diff --git a/app/View/Timeperiods/edit.ctp b/app/View/Timeperiods/edit.ctp
index 2d4ea088aa..e6328c34f0 100755
--- a/app/View/Timeperiods/edit.ctp
+++ b/app/View/Timeperiods/edit.ctp
@@ -30,7 +30,7 @@
             <i class="fa fa-clock-o fa-fw "></i>
             <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Timeperiods'); ?>
+                <?php echo __('Time Periods'); ?>
 			</span>
             <div class="third_level"> <?php echo ucfirst($this->params['action']); ?></div>
         </h1>
@@ -40,7 +40,7 @@
 <div class="jarviswidget" id="wid-id-0">
     <header>
         <span class="widget-icon"> <i class="fa fa-clock-o"></i> </span>
-        <h2><?php echo $this->action == 'edit' ? 'Edit' : 'Add' ?><?php echo __('timeperiod'); ?></h2>
+        <h2><?php echo $this->action == 'edit' ? 'Edit ' : 'Add ' ?><?php echo __('time period'); ?></h2>
         <div class="widget-toolbar" role="menu">
             <?php if ($this->Acl->hasPermission('delete')): ?>
                 <?php echo $this->Utils->deleteButton(null, $timeperiod['Timeperiod']['id']); ?>
@@ -246,4 +246,4 @@
             <?php echo $this->Form->formActions(); ?>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/app/View/Timeperiods/index.ctp b/app/View/Timeperiods/index.ctp
index 6c41233df7..cc4dc74136 100755
--- a/app/View/Timeperiods/index.ctp
+++ b/app/View/Timeperiods/index.ctp
@@ -28,9 +28,9 @@
     <div class="col-xs-12 col-sm-7 col-md-7 col-lg-4">
         <h1 class="page-title txt-color-blueDark">
             <i class="fa fa-clock-o fa-fw "></i>
-            <?php echo __('System'); ?>
+            <?php echo __('Monitoring'); ?>
             <span>>
-                <?php echo __('Timeperiods'); ?>
+                <?php echo __('Time Periods'); ?>
 			</span>
         </h1>
     </div>
@@ -47,7 +47,7 @@
                             echo $this->Html->link(__('New'), '/'.$this->params['controller'].'/add', ['class' => 'btn btn-xs btn-success', 'icon' => 'fa fa-plus']);
                             echo " "; //Fix HTML
                         endif;
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -61,7 +61,7 @@
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="1"><input
                                             type="checkbox" class="pull-left"/>
-                                    &nbsp; <?php echo __('Timeperiod name'); ?></a></li>
+                                    &nbsp; <?php echo __('Time Period Name'); ?></a></li>
                             <li style="width: 100%;"><a href="javascript:void(0)" class="select_datatable text-left"
                                                         class="select_datatable text-left" my-column="2"><input
                                             type="checkbox" class="pull-left"/> &nbsp; <?php echo __('Description'); ?>
@@ -72,12 +72,12 @@
                     <div class="jarviswidget-ctrls" role="menu">
                     </div>
                     <span class="widget-icon hidden-mobile"> <i class="fa fa-clock-o"></i> </span>
-                    <h2 class="hidden-mobile"><?php echo __('Timeperiod'); ?></h2>
+                    <h2 class="hidden-mobile"><?php echo __('Time Periods'); ?></h2>
 
                 </header>
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="mobile_table">
                             <table id="timeperiod_list" class="table table-striped table-bordered smart-form" style="">
                                 <thead>
diff --git a/app/View/Users/index.ctp b/app/View/Users/index.ctp
index f8ba220544..ad52635e52 100644
--- a/app/View/Users/index.ctp
+++ b/app/View/Users/index.ctp
@@ -53,7 +53,7 @@
                             endif;
                         endif;
 
-                        echo $this->Html->link(__('Search'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-search']);
+                        echo $this->Html->link(__('Filter'), 'javascript:', ['class' => 'oitc-list-filter btn btn-xs btn-primary toggle', 'hide-on-render' => 'true', 'icon' => 'fa fa-filter']);
                         if ($isFilter):
                             echo " "; //Fix HTML
                             echo $this->ListFilter->resetLink(null, ['class' => 'btn-danger btn-xs', 'icon' => 'fa fa-times']);
@@ -67,7 +67,7 @@
                 <!-- widget div-->
                 <div>
                     <div class="widget-body no-padding">
-                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-search"></i> '.__('search'), false, false); ?>
+                        <?php echo $this->ListFilter->renderFilterbox($filters, [], '<i class="fa fa-filter"></i> '.__('Filter'), false, false); ?>
                         <div class="tab-content">
                             <!-- <form action="/nagios_module/commands/edit/" id="multiEditForm" method="post"> -->
                             <div class="mobile_table">