diff --git a/application/controllers/admin/tokens.php b/application/controllers/admin/tokens.php
index 25e56a06298..028530141c6 100644
--- a/application/controllers/admin/tokens.php
+++ b/application/controllers/admin/tokens.php
@@ -1746,12 +1746,12 @@ function exportdialog($iSurveyId)
             $aData['aSettings']=array(
                 'tokenstatus'=>array(
                     'type'=>'select',
-                    'label'=>gT('Survey status'),
+                    'label'=>gT('Survey status:'),
                     'options'=>$aOptionsStatus,
                 ),
                 'invitationstatus'=>array(
                     'type'=>'select',
-                    'label'=>gT('Invitation status'),
+                    'label'=>gT('Invitation status:'),
                     'options'=>array(
                         '0'=>gT('All'),
                         '1'=>gT('Invited'),
@@ -1760,7 +1760,7 @@ function exportdialog($iSurveyId)
                 ),
                 'reminderstatus'=>array(
                     'type'=>'select',
-                    'label'=>gT('Reminder status'),
+                    'label'=>gT('Reminder status:'),
                     'options'=>array(
                         '0'=>gT('All'),
                         '1'=>gT('Reminder(s) sent'),
@@ -1769,17 +1769,17 @@ function exportdialog($iSurveyId)
                 ),
                 'tokenlanguage'=>array(
                     'type'=>'select',
-                    'label'=>gT('Filter by language'),
+                    'label'=>gT('Filter by language:'),
                     'options'=>$aFilterByLanguage,
                 ),
                 'filteremail'=>array(
                     'type'=>'string',
-                    'label'=>gT('Filter by email address'),
+                    'label'=>gT('Filter by email address:'),
                     'help'=>gT('Only export entries which contain this string in the email address.'),
                 ),
                 'tokendeleteexported'=>array(
                     'type'=>'checkbox',
-                    'label'=>gT('Delete exported tokens'),
+                    'label'=>gT('Delete exported tokens:'),
                     'help'=>'Attention: If selected the exported tokens are deleted permanently from the token table.',
                 ),
             );
diff --git a/application/views/admin/assessments_view.php b/application/views/admin/assessments_view.php
index c2944fa46a9..9d9800f7e0c 100644
--- a/application/views/admin/assessments_view.php
+++ b/application/views/admin/assessments_view.php
@@ -126,7 +126,7 @@
 
             <!-- Scope, Total, Group -->
             <div class='form-group'>
-                <label class='control-label col-sm-2'><?php eT("Scope");?></label>
+                <label class='control-label col-sm-2'><?php eT("Scope:");?></label>
                 <div class='col-sm-10'>
                     <div class='radio'>
                         <label class='radio-inline'><input class='' type='radio' id='radiototal' name='scope' value='T' <?php if (!isset($editdata) || $editdata['scope'] == "T") {echo "checked='checked' ";} ?>/><?php eT("Total"); ?></label>
@@ -140,7 +140,7 @@
 
             <!-- Question group -->
             <div class='form-group'>
-                <label class='control-label col-sm-2' for='gid'><?php eT("Question group");?></label>
+                <label class='control-label col-sm-2' for='gid'><?php eT("Question group:");?></label>
                 <div class='col-sm-4'>
                     <?php
                     if (isset($groups))
@@ -163,7 +163,7 @@
 
             <!-- Minimum -->
             <div class='form-group'>
-                <label class='control-label col-sm-2' for='minimum'><?php eT("Minimum");?></label>
+                <label class='control-label col-sm-2' for='minimum'><?php eT("Minimum:");?></label>
                 <div class='col-sm-4'>
                     <input class='form-control' type='text' id='minimum' name='minimum' class='numbersonly'<?php if (isset($editdata)) {echo " value='{$editdata['minimum']}' ";} ?>/>
                 </div>
@@ -172,7 +172,7 @@
 
             <!-- Maximum -->
             <div class='form-group'>
-                <label class='control-label col-sm-2' for='maximum'><?php eT("Maximum");?></label>
+                <label class='control-label col-sm-2' for='maximum'><?php eT("Maximum:");?></label>
                 <div class='col-sm-4'>
                     <input class='form-control' type='text' id='maximum' name='maximum' class='numbersonly'<?php if (isset($editdata)) {echo " value='{$editdata['maximum']}' ";} ?>/>
                 </div>
diff --git a/application/views/admin/token/bounce.php b/application/views/admin/token/bounce.php
index 1fd997cfb57..52315257c6e 100644
--- a/application/views/admin/token/bounce.php
+++ b/application/views/admin/token/bounce.php
@@ -10,7 +10,7 @@
                             <!-- Survey bounce email -->
                             <div class=" form-group setting control-group setting-email" data-name="bounce_email">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounce_email">
-                                    <?php eT('Survey bounce email'); ?>
+                                    <?php eT('Survey bounce email address:'); ?>
                                 </label>
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
                                     <input class='form-control' size="50" type="email" value="<?php echo $settings['bounce_email'];?>" name="bounce_email" id="bounce_email" />
@@ -20,7 +20,7 @@
                             <!-- Bounce settings to be used -->
                             <div class=" form-group setting control-group setting-select" data-name="bounceprocessing">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounceprocessing">
-                                    <?php eT('Bounce settings to be used');?>
+                                    <?php eT('Used bounce settings:');?>
                                 </label>
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
                                     <select id="bounceprocessing" name="bounceprocessing" class="form-control">
@@ -42,7 +42,7 @@
                             <!-- Server type -->
                             <div class=" form-group setting control-group setting-select" data-name="bounceaccounttype">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounceaccounttype">
-                                    <?php eT("Server type"); ?>
+                                    <?php eT("Server type:"); ?>
                                 </label>
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
                                     <select id="bounceaccounttype" name="bounceaccounttype" class="form-control">
@@ -60,7 +60,7 @@
                             <!-- Server name port -->
                             <div class=" form-group setting control-group setting-string" data-name="bounceaccounthost">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounceaccounthost">
-                                    <?php eT('Server name & port'); ?>
+                                    <?php eT('Server name & port:'); ?>
                                 </label>
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
                                     <input size="50" type="text" value="<?php echo $settings['bounceaccounthost']; ?>" name="bounceaccounthost" id="bounceaccounthost" />
@@ -73,7 +73,7 @@
                             <!-- User name -->
                             <div class=" form-group setting control-group setting-string" data-name="bounceaccountuser">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounceaccountuser">
-                                    <?php eT('User name'); ?>
+                                    <?php eT('User name:'); ?>
                                 </label>
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
                                     <input size="50" type="text" value="<?php echo $settings['bounceaccountuser'];?>" name="bounceaccountuser" id="bounceaccountuser" />
@@ -83,7 +83,7 @@
                             <!-- Password -->
                             <div class=" form-group setting control-group setting-password" data-name="bounceaccountpass">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounceaccountpass">
-                                    <?php eT('Password'); ?>
+                                    <?php eT('Password:'); ?>
                                 </label>
 
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
@@ -94,7 +94,7 @@
                             <!-- Encryption type  -->
                             <div class=" form-group setting control-group setting-select" data-name="bounceaccountencryption">
                                 <label class="default control-label col-lg-2 col-sm-5 col-md-7" for="bounceaccountencryption">
-                                    <?php eT('Encryption type'); ?>
+                                    <?php eT('Encryption type:'); ?>
                                 </label>
                                 <div class="default col-lg-4 col-sm-5 col-md-7 controls">
                                     <select id="bounceaccountencryption" name="bounceaccountencryption" class="form-control">