diff --git a/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php b/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php
index 99189604a6b..1c12c6af7f2 100644
--- a/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php
+++ b/application/extensions/admin/grid/MassiveActionsWidget/MassiveActionsWidget.php
@@ -25,7 +25,11 @@ class massiveActionsWidget extends CWidget
             'yes-no-lg',
             'empty-lg',
             'cancel-apply',
-            'cancel-delete'
+            'cancel-resend',
+            'cancel-add',
+            'cancel-save',
+            'cancel-delete',
+            'cancel-export',
         ];
 
         // Selector variables
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php
new file mode 100644
index 00000000000..14027685ac5
--- /dev/null
+++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-add.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_canceladd');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-export.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-export.php
new file mode 100644
index 00000000000..183a798fcf4
--- /dev/null
+++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-export.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_cancelexport');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-resend.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-resend.php
new file mode 100644
index 00000000000..04225ea7fcd
--- /dev/null
+++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-resend.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_cancelresend');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-save.php b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-save.php
new file mode 100644
index 00000000000..cd32aa98109
--- /dev/null
+++ b/application/extensions/admin/grid/MassiveActionsWidget/views/modals/cancel-save.php
@@ -0,0 +1,80 @@
+<?php
+
+if (isset($aAction['showSelected'])) {
+    $showSelected = $aAction['showSelected'];
+} else {
+    $showSelected = 'no';
+}
+
+if (isset($aAction['selectedUrl'])) {
+    $selectedUrl = $aAction['selectedUrl'];
+} else {
+    $selectedUrl = '#';
+}
+
+if (isset($aAction['largeModalView']) && $aAction['largeModalView']) {
+    $largeModalView = 'modal-lg';
+}else{
+    $largeModalView = '';
+}
+?>
+
+<!-- Modal confirmation for <?php
+echo $aAction['action']; ?> -->
+
+<div id="massive-actions-modal-<?php
+echo $this->gridid; ?>-<?php
+echo $aAction['action']; ?>-<?php
+echo $key; ?>"
+     class="modal fade"
+     role="dialog"
+     data-keepopen="<?php echo $aAction['keepopen']; ?>"
+     data-show-selected="<?php echo $showSelected; ?>"
+     data-selected-url="<?php echo $selectedUrl ?>"
+>
+    <div class="modal-dialog <?php echo $largeModalView?>">
+        <!-- Modal content-->
+        <div class="modal-content" style="text-align:left; color:#000">
+            <?php
+            Yii::app()->getController()->renderPartial(
+                '/layouts/partial_modals/modal_header',
+                ['modalTitle' => $aAction['sModalTitle']]
+            );
+            ?>
+            <div class="modal-body">
+                <div class='modal-body-text'><?php
+                    echo $aAction['htmlModalBody']; ?></div>
+
+                <!-- shows list of selected items in the modal-->
+                <div class="selected-items-list"></div>
+
+                <?php
+                if (isset($aAction['aCustomDatas'])) { ?>
+                    <!--
+                        Custom datas needed for action defined directly in the widget call.
+                        Always hidden in Yes/No case.
+                        For specific input (like text, selector, etc) that should be filled by user
+                        parse a form to htmlModalBody and attribute to the wanted input the class "custom-data"
+                    -->
+                    <div class="custom-modal-datas hidden">
+                        <?php
+                        foreach ($aAction['aCustomDatas'] as $aCustomData) { ?>
+                            <input
+                                    class="custom-data"
+                                    type="hidden"
+                                    name="<?php
+                                    echo $aCustomData['name']; ?>"
+                                    value="<?php
+                                    echo $aCustomData['value']; ?>"/>
+                        <?php
+                        } ?>
+                    </div>
+                <?php
+                } ?>
+            </div>
+            <?php
+            Yii::app()->getController()->renderPartial('/layouts/partial_modals/modal_footer_cancelsave');
+            ?>
+        </div>
+    </div>
+</div>
diff --git a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php
index c410dee6436..49172d5c750 100644
--- a/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php
+++ b/application/extensions/admin/survey/ListSurveysWidget/views/massive_actions/_selector.php
@@ -106,7 +106,7 @@
 
                     // modal
                     'actionType'  => 'modal',
-                    'modalType'   => 'cancel-apply',
+                    'modalType'   => 'cancel-export',
                     'keepopen'    => 'yes',
                     'showSelected'  => 'yes',
                     'selectedUrl'   => App()->createUrl('/surveyAdministration/renderItemsSelected/'),
@@ -126,7 +126,7 @@
 
                     // modal
                     'actionType'  => 'modal',
-                    'modalType'   => 'cancel-apply',
+                    'modalType'   => 'cancel-export',
                     'keepopen'    => 'yes',
                     'showSelected'  => 'yes',
                     'selectedUrl'   => App()->createUrl('/surveyAdministration/renderItemsSelected/'),
@@ -144,7 +144,7 @@
                     'text'        =>  gT("Printable survey (*.html)"),
                     // modal
                     'actionType'  => 'modal',
-                    'modalType'   => 'cancel-apply',
+                    'modalType'   => 'cancel-export',
                     'keepopen'    => 'yes',
                     'showSelected'  => 'yes',
                     'selectedUrl'   => App()->createUrl('/surveyAdministration/renderItemsSelected/'),
diff --git a/application/views/admin/emailtemplates/emailtemplates_view.php b/application/views/admin/emailtemplates/emailtemplates_view.php
index 841f2c9fcf1..50ded2ed43f 100644
--- a/application/views/admin/emailtemplates/emailtemplates_view.php
+++ b/application/views/admin/emailtemplates/emailtemplates_view.php
@@ -75,7 +75,7 @@
     <div class="modal-content">
       <div class="modal-header">
         <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
-        <h4 class="modal-title"><?=gT("Choose file")?></h4>
+        <h4 class="modal-title"><?=gT("Choose file to add")?></h4>
       </div>
       <div class="modal-body" style="padding: 0;">
         <iframe frameBorder="0" style="min-height: 600px; height:100%; width: 100%;" src="about:blank"></iframe>
@@ -101,7 +101,7 @@
             </div>
             <div class='modal-footer'>
                 <button type="button" class='btn btn-default' data-dismiss='modal'><?php eT("Close");?></button>
-                <button type="button" class='btn btn-success'><?php eT("Apply");?></button>
+                <button type="button" class='btn btn-success'><?php eT("Add");?></button>
             </div>
         </div>
     </div>
diff --git a/application/views/admin/participants/massive_actions/_selector.php b/application/views/admin/participants/massive_actions/_selector.php
index b5da1bea2a1..9a15cece91b 100644
--- a/application/views/admin/participants/massive_actions/_selector.php
+++ b/application/views/admin/participants/massive_actions/_selector.php
@@ -51,10 +51,9 @@
                 'grid-reload' => 'yes',
                 //modal
                 'actionType' => 'modal',
-                'modalType' => 'cancel-apply',
+                'modalType' => 'cancel-save',
                 'keepopen' => 'yes',
-                'yes' => gT('Apply'),
-                'no' => gT('Cancel'),
+        
                 'sModalTitle' => gT('Batch edit the participants'),
                 'htmlModalBody' => $this->renderPartial('./participants/massive_actions/_update', [], true)
             ],
diff --git a/application/views/admin/participants/modal_subviews/_addToSurvey.php b/application/views/admin/participants/modal_subviews/_addToSurvey.php
index 4f7f905c388..ac894ff0d9a 100644
--- a/application/views/admin/participants/modal_subviews/_addToSurvey.php
+++ b/application/views/admin/participants/modal_subviews/_addToSurvey.php
@@ -38,7 +38,6 @@
                     <?php eT('Display survey participant table after addition?'); ?>
                 </label>
                 <div class='col-sm-8'>
-                    <!--<input type='checkbox' name='redirect' />-->
                     <input name='redirect' type='checkbox' data-size='small' data-on-color='primary' data-off-color='warning' data-off-text='<?php eT('No'); ?>' data-on-text='<?php eT('Yes'); ?>' class='ls-bootstrap-switch' />
                 </div>
             </div>
@@ -47,6 +46,6 @@
 
     <div class="modal-footer">
         <button type="button" class="btn btn-default" data-dismiss="modal"><?php eT('Cancel') ?></button>
-        <input type="submit" class="btn btn-primary action_save_modal_shareparticipant" value='<?php eT('Apply')?>' />
+        <input type="submit" class="btn btn-primary action_save_modal_shareparticipant" value='<?php eT('Add')?>' />
     </div>
 <?php $this->endWidget('CActiveForm'); ?>
diff --git a/application/views/admin/participants/modal_subviews/_editParticipant.php b/application/views/admin/participants/modal_subviews/_editParticipant.php
index df45948abe3..b3d8f8da8d2 100644
--- a/application/views/admin/participants/modal_subviews/_editParticipant.php
+++ b/application/views/admin/participants/modal_subviews/_editParticipant.php
@@ -1,8 +1,10 @@
 <?php
 if ($editType == 'add'){
     $modalTitle = gT('Add participant');
+    $buttonTitle = gT('Add');
 }else{
     $modalTitle = gT('Edit participant');
+    $buttonTitle = gT('Save');
 }
 
 Yii::app()->getController()->renderPartial(
@@ -74,10 +76,6 @@
                     ),
                     'onLabel'=>gT('Yes'),
                     'offLabel'=>gT('No'),
-                    /*
-                    'onColor'=> 'warning',
-                    'offColor'=> 'primary'
-                    */
                     'onColor'=> 'primary',
                     'offColor'=> 'warning'
                 )
@@ -141,7 +139,7 @@
 </div>
 <div class="modal-footer">
     <button type="button" class="btn btn-cancel" data-dismiss="modal"><?php eT('Cancel') ?></button>
-    <button type="button" class="btn btn-primary action_save_modal_editParticipant"><?php eT("Save")?></button>
+    <button type="button" class="btn btn-primary action_save_modal_editParticipant"><?php echo $buttonTitle; ?></button>
 </div>
 <script>
 $('#editPartcipantActiveForm .bootstrap-switch').bootstrapSwitch();
diff --git a/application/views/admin/participants/modal_subviews/_exportCSV.php b/application/views/admin/participants/modal_subviews/_exportCSV.php
index f47145d52bb..dfc9137f8dd 100644
--- a/application/views/admin/participants/modal_subviews/_exportCSV.php
+++ b/application/views/admin/participants/modal_subviews/_exportCSV.php
@@ -29,7 +29,7 @@
             </div>
             <div class="modal-footer">
                 <button type="button" class="btn btn-cancel" data-dismiss="modal"><?php eT('Cancel'); ?></button>
-                <button type="button" class="btn btn-success exportButton"><?php eT('Apply'); ?></button>
+                <button type="button" class="btn btn-success exportButton"><?php eT('Export'); ?></button>
             </div>
         </div>
     </div>
diff --git a/application/views/admin/participants/modal_subviews/_shareParticipant.php b/application/views/admin/participants/modal_subviews/_shareParticipant.php
index 20f2e14c127..fd3a2fa66b1 100644
--- a/application/views/admin/participants/modal_subviews/_shareParticipant.php
+++ b/application/views/admin/participants/modal_subviews/_shareParticipant.php
@@ -59,6 +59,6 @@
 </div>
 <div class="modal-footer">
     <button type="button" class="btn btn-cancel" data-dismiss="modal"><?php eT('Cancel') ?></button>
-    <button type="button" class="btn btn-primary action_save_modal_shareparticipant"><?php eT("Apply")?></button>
+    <button type="button" class="btn btn-primary action_save_modal_shareparticipant"><?php eT("Share")?></button>
 </div>
 <?php $this->endWidget(); ?>
diff --git a/application/views/admin/surveymenu/massive_action/_selector.php b/application/views/admin/surveymenu/massive_action/_selector.php
index e3b1f89405a..236f03babfa 100644
--- a/application/views/admin/surveymenu/massive_action/_selector.php
+++ b/application/views/admin/surveymenu/massive_action/_selector.php
@@ -41,9 +41,9 @@
             'grid-reload' => 'yes',
             //modal
             'actionType' => 'modal',
-            'modalType'     => 'cancel-apply',
+            'modalType'     => 'cancel-save',
             'keepopen'      => 'yes',
-            'yes'           => gT('Apply'),
+            'yes'           => gT('Save'),
             'no'            => gT('Cancel'),
             'sModalTitle'   => gT('Batch edit the menus'),
             'htmlModalBody' => $this->renderPartial('./surveymenu/massive_action/_update', [], true)
diff --git a/application/views/admin/surveymenu_entries/massive_action/_selector.php b/application/views/admin/surveymenu_entries/massive_action/_selector.php
index a5e60a8759d..9649f820837 100644
--- a/application/views/admin/surveymenu_entries/massive_action/_selector.php
+++ b/application/views/admin/surveymenu_entries/massive_action/_selector.php
@@ -40,9 +40,9 @@
             'grid-reload' => 'yes',
             //modal
             'actionType' => 'modal',
-            'modalType'     => 'cancel-apply',
+            'modalType'     => 'cancel-save',
             'keepopen'      => 'yes',
-            'yes'           => gT('Apply'),
+            'yes'           => gT('Save'),
             'no'            => gT('Cancel'),
             'sModalTitle'   => gT('Batch edit the menus'),
             'htmlModalBody' => $this->renderPartial('./surveymenu_entries/massive_action/_update', [], true),
diff --git a/application/views/admin/token/massive_actions/_selector.php b/application/views/admin/token/massive_actions/_selector.php
index 2e1b183cbd2..08a1a005659 100644
--- a/application/views/admin/token/massive_actions/_selector.php
+++ b/application/views/admin/token/massive_actions/_selector.php
@@ -27,7 +27,7 @@
                     'grid-reload' => 'yes',
                     // modal
                     'actionType'    => 'modal',
-                    'modalType'     => 'cancel-apply',
+                    'modalType'     => 'cancel-save',
                     'keepopen'      => 'yes',
                     'sModalTitle'   => gT('Batch-edit participants'),
                     'htmlModalBody' => $this->renderPartial('./token/massive_actions/_update', array('dateformatdetails' => getDateFormatData(Yii::app()->session['dateformat']), 'aLanguages' => $aLanguages), true),
diff --git a/application/views/assessment/assessments_edit.php b/application/views/assessment/assessments_edit.php
index 22d22fac86d..93cc998bb21 100644
--- a/application/views/assessment/assessments_edit.php
+++ b/application/views/assessment/assessments_edit.php
@@ -142,7 +142,7 @@
           </div>
           <div class="modal-footer">
             <button type="button" class="btn btn-cancel" data-dismiss="modal"><?php eT("Cancel");?></button>
-            <button type="button" class="btn btn-success" id="selector__assessments-save-modal"><?php eT('Save'); ?></button>
+            <button type="button" class="btn btn-success" id="selector__assessments-save-modal"><?php eT('Add'); ?></button>
           </div>
           </form>
       </div>
diff --git a/application/views/layouts/partial_modals/modal_footer_canceladd.php b/application/views/layouts/partial_modals/modal_footer_canceladd.php
new file mode 100644
index 00000000000..e72dc13ec3b
--- /dev/null
+++ b/application/views/layouts/partial_modals/modal_footer_canceladd.php
@@ -0,0 +1,13 @@
+<?php
+?>
+
+<div class="modal-footer modal-footer-buttons">
+    <button type="button" class="btn btn-cancel" data-dismiss="modal">
+        <?php
+        eT("Cancel"); ?>
+    </button>
+    <a class="btn btn-primary btn-ok">
+        <?php
+        eT("Add"); ?>
+    </a>
+</div>
diff --git a/application/views/layouts/partial_modals/modal_footer_cancelexport.php b/application/views/layouts/partial_modals/modal_footer_cancelexport.php
new file mode 100644
index 00000000000..debbe8060d5
--- /dev/null
+++ b/application/views/layouts/partial_modals/modal_footer_cancelexport.php
@@ -0,0 +1,13 @@
+<?php
+?>
+
+<div class="modal-footer modal-footer-buttons">
+    <button type="button" class="btn btn-cancel" data-dismiss="modal">
+        <?php
+        eT("Cancel"); ?>
+    </button>
+    <a class="btn btn-primary btn-ok">
+        <?php
+        eT("Export"); ?>
+    </a>
+</div>
diff --git a/application/views/layouts/partial_modals/modal_footer_cancelresend.php b/application/views/layouts/partial_modals/modal_footer_cancelresend.php
new file mode 100644
index 00000000000..1298e8be9f5
--- /dev/null
+++ b/application/views/layouts/partial_modals/modal_footer_cancelresend.php
@@ -0,0 +1,13 @@
+<?php
+?>
+
+<div class="modal-footer modal-footer-buttons">
+    <button type="button" class="btn btn-cancel" data-dismiss="modal">
+        <?php
+        eT("Cancel"); ?>
+    </button>
+    <a class="btn btn-primary btn-ok">
+        <?php
+        eT("Resend"); ?>
+    </a>
+</div>
diff --git a/application/views/layouts/partial_modals/modal_footer_cancelsave.php b/application/views/layouts/partial_modals/modal_footer_cancelsave.php
new file mode 100644
index 00000000000..e31a2ee3781
--- /dev/null
+++ b/application/views/layouts/partial_modals/modal_footer_cancelsave.php
@@ -0,0 +1,13 @@
+<?php
+?>
+
+<div class="modal-footer modal-footer-buttons">
+    <button type="button" class="btn btn-cancel" data-dismiss="modal">
+        <?php
+        eT("Cancel"); ?>
+    </button>
+    <a class="btn btn-primary btn-ok">
+        <?php
+        eT("Save"); ?>
+    </a>
+</div>
diff --git a/application/views/questionAdministration/modals.twig b/application/views/questionAdministration/modals.twig
index b4a00039476..a0a3ffe998f 100644
--- a/application/views/questionAdministration/modals.twig
+++ b/application/views/questionAdministration/modals.twig
@@ -10,7 +10,7 @@
         <div class="modal-content">
             <div class="modal-header">
                 <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span >&times;</span></button>
-                <h4 class="modal-title">{{ gT('Enter your labels:') }}</h4>
+                <h4 class="modal-title">{{ gT('quick-add labels') }}</h4>
             </div>
 
             <div class="modal-body">
diff --git a/application/views/themeOptions/import_modal.php b/application/views/themeOptions/import_modal.php
index 516b72e2842..026534a34a6 100644
--- a/application/views/themeOptions/import_modal.php
+++ b/application/views/themeOptions/import_modal.php
@@ -22,7 +22,7 @@
             <?php
             Yii::app()->getController()->renderPartial(
                 '/layouts/partial_modals/modal_header',
-                ['modalTitle' => gT("Upload theme file")]
+                ['modalTitle' => gT("Upload and install theme file")]
             );
             ?>
                 <div class="modal-body">
diff --git a/application/views/userManagement/massiveAction/_selector.php b/application/views/userManagement/massiveAction/_selector.php
index ff1ef521128..dd0ec79e934 100644
--- a/application/views/userManagement/massiveAction/_selector.php
+++ b/application/views/userManagement/massiveAction/_selector.php
@@ -34,7 +34,7 @@
             'text'          =>  gT('Resend login data'),
             'grid-reload'   => 'yes',
             'actionType'    => 'modal',
-            'modalType'     => 'cancel-apply',
+            'modalType'     => 'cancel-resend',
             'keepopen'      => 'yes',
             'showSelected'  => 'yes',
             'selectedUrl'   => App()->createUrl('userManagement/renderSelectedItems/'),
@@ -75,7 +75,7 @@
         'grid-reload'   => 'yes',
         //modal
         'actionType'    => 'modal',
-        'modalType'     => 'cancel-apply',
+        'modalType'     => 'cancel-add',
         'keepopen'      => 'yes',
         'showSelected'  => 'yes',
         'selectedUrl'   => App()->createUrl('userManagement/renderSelectedItems/'),
@@ -95,7 +95,7 @@
         'grid-reload'       => 'yes',
         //modal
         'actionType'        => 'modal',
-        'modalType'         => 'cancel-apply',
+        'modalType'         => 'cancel-add',
         'keepopen'          => 'yes',
         'showSelected'      => 'yes',
         'selectedUrl'       => App()->createUrl('userManagement/renderSelectedItems/'),
diff --git a/application/views/userManagement/partial/adddummyuser.php b/application/views/userManagement/partial/adddummyuser.php
index fc52fd1a69e..fdcb4b3ba79 100644
--- a/application/views/userManagement/partial/adddummyuser.php
+++ b/application/views/userManagement/partial/adddummyuser.php
@@ -2,7 +2,7 @@
 <?php
 Yii::app()->getController()->renderPartial(
     '/layouts/partial_modals/modal_header',
-    ['modalTitle' => gT('Adding anonymous users')]
+    ['modalTitle' => gT('Add dummy users')]
 );
 ?>
 <?=TbHtml::formTb(null, App()->createUrl('userManagement/runAddDummyUser'), 'post', ["id"=>"UserManagement--modalform"])?>
@@ -31,6 +31,6 @@
 
 <div class="modal-footer modal-footer-buttons">
     <button id="exitForm" class="btn btn-cancel  "><?=gT('Cancel')?></button>
-    <button class="btn btn-success" id="submitForm"><?=gT('Create')?></button>
+    <button class="btn btn-success" id="submitForm"><?=gT('Add')?></button>
 </div>
 </form>
diff --git a/application/views/userManagement/partial/addedituser.php b/application/views/userManagement/partial/addedituser.php
index dbc0855db56..9115f3bb776 100644
--- a/application/views/userManagement/partial/addedituser.php
+++ b/application/views/userManagement/partial/addedituser.php
@@ -102,6 +102,6 @@
 
 <div class="modal-footer modal-footer-buttons" style="margin-top: 15px;" >
     <button class="btn btn-cancel" id="exitForm"><?=gT('Cancel')?></button>
-    <button class="btn btn-success" id="submitForm"><?=gT('Save')?></button>
+    <button class="btn btn-success" id="submitForm"><?=gT('Add')?></button>
 </div>
 <?php $this->endWidget(); ?>
diff --git a/application/views/userManagement/partial/importuser.php b/application/views/userManagement/partial/importuser.php
index 50210dcef2e..4ebfdc9efb5 100644
--- a/application/views/userManagement/partial/importuser.php
+++ b/application/views/userManagement/partial/importuser.php
@@ -48,6 +48,6 @@
 
 <div class="modal-footer modal-footer-buttons">
     <button class="btn btn-cancel" id="exitForm"><?=gT('Cancel')?></button>
-    <button class="btn btn-success " id="submitForm"><?=gT('Save')?></button>
+    <button class="btn btn-success " id="submitForm"><?=gT('Import')?></button>
 </div>
 </form>
diff --git a/application/views/userRole/partials/_form.php b/application/views/userRole/partials/_form.php
index faeb2832bc1..f5a3f297485 100644
--- a/application/views/userRole/partials/_form.php
+++ b/application/views/userRole/partials/_form.php
@@ -6,8 +6,10 @@
 
 if ($model->isNewRecord) {
     $modalTitle =  gT('Create permission role');
+    $buttonTitle = gT('Create');
 } else {
-    $modalTitle = sprintf(gT('Update permission role %s'), $model->name);
+    $modalTitle = sprintf(gT('Edit permission role *%s*'), $model->name);
+    $buttonTitle = gT('Save');
 }
 Yii::app()->getController()->renderPartial(
     '/layouts/partial_modals/modal_header',
@@ -50,6 +52,6 @@
 </div>
 <div class="modal-footer modal-footer-buttons" style="margin-top: 15px; ">
     <button class="btn btn-error " id="exitForm"><?=gT('Cancel')?></button>
-    <button type="submit" class="btn btn-success " id="submitForm"><?=gT('Save')?></button>
+    <button type="submit" class="btn btn-success " id="submitForm"><?php echo $buttonTitle; ?></button>
 </div>
 <?php $this->endWidget(); ?>
diff --git a/application/views/userRole/partials/_import.php b/application/views/userRole/partials/_import.php
index 2e9d2355e5c..12df93dc6b4 100644
--- a/application/views/userRole/partials/_import.php
+++ b/application/views/userRole/partials/_import.php
@@ -30,6 +30,6 @@
 
 <div class="modal-footer modal-footer-buttons" style="margin-top: 15px; ">
     <button class="btn btn-cancel" id="exitForm"><?=gT('Cancel')?></button>
-    <button class="btn btn-success" id="submitForm"><?=gT('Save')?></button>
+    <button class="btn btn-success" id="submitForm"><?=gT('Import')?></button>
 </div>
 </form>