diff --git a/app/services/app_languages.php b/app/services/app_languages.php
index 827a334d0d..1ec57cb27e 100644
--- a/app/services/app_languages.php
+++ b/app/services/app_languages.php
@@ -26,6 +26,11 @@
 	Philippe Rioual <bhouba@gmail.com>
 */
 
+	$text['confirm-delete']['en-us'] = "Do you really want to delete this?";
+	$text['confirm-delete']['es-cl'] = "¿Realmente desea eliminar esto?";
+	$text['confirm-delete']['fr-fr'] = "Voulez-vous vraiment supprimer cela?";
+	$text['confirm-delete']['pt-pt'] = "Tem a certeza que pretende remover isto?";
+
 	$text['message-delete']['en-us'] = "Delete Complete";
 	$text['message-delete']['es-cl'] = "Eliminación Completada";
 	$text['message-delete']['pt-pt'] = "Remoção Efectuada";
@@ -111,10 +116,10 @@
 	$text['description-start']['pt-pt'] = "Introduza o comando para arrancar o serviço.";
 	$text['description-start']['fr-fr'] = "Entrer la commande pour démarrer le service.";
 
-	$text['label-stop']['en-us'] = "Stop Comand";
-	$text['label-stop']['es-cl'] = "Comando para Detener";
-	$text['label-stop']['pt-pt'] = "Comando para Parar";
-	$text['label-stop']['fr-fr'] = "Comande d'arrêt";
+	$text['label-stop']['en-us'] = "Stop Command:";
+	$text['label-stop']['es-cl'] = "Comando para Detener:";
+	$text['label-stop']['pt-pt'] = "Comando para Parar:";
+	$text['label-stop']['fr-fr'] = "Comande d'arrêt:";
 
 	$text['description-stop']['en-us'] = "Enter the command to stop the service.";
 	$text['description-stop']['es-cl'] = "Ingrese el comando para detener el servicio.";
diff --git a/app/services/services.php b/app/services/services.php
index c654adb864..b4e01968e7 100644
--- a/app/services/services.php
+++ b/app/services/services.php
@@ -141,9 +141,9 @@ if (strlen($_GET["a"]) > 0) {
 	echo th_order_by('service_description', 'Description', $order_by, $order);
 	echo "<th>Status</th>\n";
 	echo "<th>Action</th>\n";
-	echo "<td align='right' width='42'>\n";
+	echo "<td class='list_control_icons'>";
 	if (permission_exists('service_add')) {
-		echo "	<a href='service_edit.php' alt='add'>$v_link_label_add</a>\n";
+		echo "<a href='service_edit.php' alt='add'>$v_link_label_add</a>";
 	}
 	echo "</td>\n";
 	echo "<tr>\n";
@@ -173,12 +173,12 @@ if (strlen($_GET["a"]) > 0) {
 				echo "		<a href='services.php?id=".$row[service_uuid]."&a=start' alt='start'>Start</a>";
 			}
 			echo "</td>\n";
-			echo "	<td valign='top' align='right'>\n";
+			echo "	<td class='list_control_icons'>";
 			if (permission_exists('service_edit')) {
-				echo "		<a href='service_edit.php?id=".$row[service_uuid]."' alt='edit'>$v_link_label_edit</a>\n";
+				echo "<a href='service_edit.php?id=".$row[service_uuid]."' alt='edit'>$v_link_label_edit</a>";
 			}
 			if (permission_exists('service_delete')) {
-				echo "		<a href='service_delete.php?id=".$row[service_uuid]."' alt='delete' onclick=\"return confirm('Do you really want to delete this?')\">$v_link_label_delete</a>\n";
+				echo "<a href='service_delete.php?id=".$row[service_uuid]."' alt='delete' onclick=\"return confirm('".$text['confirm-delete']."')\">$v_link_label_delete</a>";
 			}
 			echo "	</td>\n";
 			echo "</tr>\n";
@@ -193,9 +193,9 @@ if (strlen($_GET["a"]) > 0) {
 	echo "	<tr>\n";
 	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
 	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
-	echo "		<td width='33.3%' align='right'>\n";
+	echo "		<td class='list_control_icons'>";
 	if (permission_exists('service_add')) {
-		echo "			<a href='service_edit.php' alt='add'>$v_link_label_add</a>\n";
+		echo 		"<a href='service_edit.php' alt='add'>$v_link_label_add</a>";
 	}
 	echo "		</td>\n";
 	echo "	</tr>\n";