diff --git a/includes/html/pages/services-templates.inc.php b/includes/html/pages/services-templates.inc.php
index 0c9730f35b..cb4c5aa566 100644
--- a/includes/html/pages/services-templates.inc.php
+++ b/includes/html/pages/services-templates.inc.php
@@ -131,7 +131,7 @@ require_once 'includes/html/modal/delete_service_template.inc.php';
 
                         if (Auth::user()->hasGlobalAdmin()) {
                             echo "<td>
-                                    <button type='button' class='btn btn-warning btn-sm' aria-label='Apply' data-toggle='modal' data-target='#discover-service-template' data-service_template_id='{$service_template['service_template_id']}' data-device_group_id='{device_group['device_group_id']}' name='discover-service-template'><i class='fa fa-pencil' aria-hidden='true'></i></button>
+                                    <button type='button' class='btn btn-warning btn-sm' aria-label='Apply' data-toggle='modal' data-target='#discover-service-template' data-device_group_id='{device_group['device_group_id']}' data-service_template_id='{$service_template['service_template_id']}' name='discover-service-template'><i class='fa fa-retweet' aria-hidden='true'></i></button>
                                     <button type='button' class='btn btn-primary btn-sm' aria-label='Edit' data-toggle='modal' data-target='#create-service-template' data-service_template_id='{$service_template['service_template_id']}' name='edit-service-template'><i class='fa fa-pencil' aria-hidden='true'></i></button>
                                     <button type='button' class='btn btn-danger btn-sm' aria-label='Delete' data-toggle='modal' data-target='#confirm-delete' data-service_template_id='{$service_template['service_template_id']}' name='delete-service-template'><i class='fa fa-trash' aria-hidden='true'></i></button>
                                     </td>";
diff --git a/includes/services.inc.php b/includes/services.inc.php
index 43111dc503..93031ce702 100644
--- a/includes/services.inc.php
+++ b/includes/services.inc.php
@@ -182,7 +182,7 @@ function delete_service_template($service_template = null)
 
 function discover_service_template($device_group_id, $service_template_id)
 {
-    if (! dbFetchCell('SELECT COUNT(service_template_id) FROM `services_template` WHERE `service_template_type`= ? AND `device_group_id` = ?', array($service_template_id, $device_group['device_group_id']))) {
+    if (! dbFetchCell('SELECT COUNT(service_template_id) FROM `services` WHERE `service_type`= ? AND `device_group_id` = ?', array($service_template_id, $device_group['device_group_id']))) {
         $service=service_template_get($device_group_id, $service_template_id);
         $device_ids = dbFetchColumn("SELECT `device_id` FROM `device_group_device` WHERE `device_group_id`=" . $_POST['device_group_id']);
         foreach ($device_ids as $device) {