diff --git a/admin/manage_categories.php b/admin/manage_categories.php
index dccfdb4f..2d642ad7 100644
--- a/admin/manage_categories.php
+++ b/admin/manage_categories.php
@@ -351,7 +351,7 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
                         ';
                         }
                     }
-                    echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="Edit"></i></a>';
+                    echo '<a href="javascript:;" class="category-modal-trigger" data-category-id="' . $mycat['id'] . '"><i class="fa fa-pencil icon-link orange" data-toggle="tooltip" title="' . $hesklang['edit'] . '"></i></a>';
                     echo $remove_code . '</td>
                 </tr>
                 ';
@@ -370,16 +370,16 @@ while ($mycat = hesk_dbFetchAssoc($res)) {
         <div class="modal-content">
             <div class="modal-header" style="cursor: move">
                 <button type="button" class="close cancel-callback" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-                <h4 class="modal-title" id="myModalLabel">Edit Category</h4>
+                <h4 class="modal-title" id="myModalLabel"><?php echo $hesklang['edit_category']; ?></h4>
             </div>
             <form action="manage_categories.php" class="form-horizontal" data-toggle="validator" method="post">
                 <div class="modal-body">
                     <div class="row">
                         <div class="col-md-12">
                             <div class="form-group">
-                                <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['name']; ?></label>
+                                <label for="name" class="col-sm-3 control-label"><?php echo $hesklang['cat_name']; ?></label>
                                 <div class="col-sm-9">
-                                    <input type="text" name="name" class="form-control" placeholder="<?php echo $hesklang['name']; ?>"
+                                    <input type="text" name="name" class="form-control" placeholder="<?php echo $hesklang['cat_name']; ?>"
                                            data-error="<?php echo htmlspecialchars($hesklang['this_field_is_required']); ?>"
                                            required>
                                     <div class="help-block with-errors"></div>
diff --git a/admin/manage_statuses.php b/admin/manage_statuses.php
index cdede0c0..09b1b7e1 100644
--- a/admin/manage_statuses.php
+++ b/admin/manage_statuses.php
@@ -132,7 +132,7 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                                     <table class="table table-hover">
                                         <thead>
                                         <tr>
-                                            <th><?php echo $hesklang['name']; ?></th>
+                                            <th><?php echo $hesklang['status_name_title']; ?></th>
                                             <th><?php echo $hesklang['closable_question']; ?></th>
                                             <th><?php echo $hesklang['closedQuestionMark']; ?></th>
                                             <th><?php echo $hesklang['actions']; ?></th>
diff --git a/language/en/text.php b/language/en/text.php
index 75a716f3..18aca4be 100644
--- a/language/en/text.php
+++ b/language/en/text.php
@@ -51,6 +51,7 @@ $hesklang['ticket_message_contents_exist'] = 'The ticket message is not empty. A
 $hesklang['resend_email_notification'] = 'Re-send Email Notification';
 $hesklang['email_notification_sent'] = 'Email notification sent!';
 $hesklang['email_notification_resend_failed'] = 'Error occurred when trying to send notification email.';
+$hesklang['edit_category'] = 'Edit Category';
 
 // ADDED OR MODIFIED IN Mods for HESK 3.0.0
 $hesklang['you_have_x_messages'] = 'You have %s new %s'; // %s: Number of new messages, "message" or "messages", depending on #