diff --git a/admin/export.php b/admin/export.php
index 3dedeb28..a1ec0899 100644
--- a/admin/export.php
+++ b/admin/export.php
@@ -38,6 +38,7 @@ require(HESK_PATH . 'inc/admin_functions.inc.php');
 require(HESK_PATH . 'inc/reporting_functions.inc.php');
 require(HESK_PATH . 'inc/status_functions.inc.php');
 require(HESK_PATH . 'inc/mail_functions.inc.php');
+require(HESK_PATH . 'inc/custom_fields.inc.php');
 hesk_load_database_functions();
 
 hesk_session_start();
@@ -69,23 +70,23 @@ $is_all_time = 0;
 // Default this month to date
 $date_from = date('Y-m-d', mktime(0, 0, 0, date("m"), 1, date("Y")));
 $date_to = date('Y-m-d');
-$input_datefrom = date('m/d/Y', strtotime('last month'));
-$input_dateto = date('m/d/Y');
+$input_datefrom = date('Y-m-d', strtotime('last month'));
+$input_dateto = date('Y-m-d');
 
 /* Date */
 if (!empty($_GET['w'])) {
     $df = preg_replace('/[^0-9]/', '', hesk_GET('datefrom'));
     if (strlen($df) == 8) {
-        $date_from = substr($df, 4, 4) . '-' . substr($df, 0, 2) . '-' . substr($df, 2, 2);
-        $input_datefrom = substr($df, 0, 2) . '/' . substr($df, 2, 2) . '/' . substr($df, 4, 4);
+        $date_from = substr($df, 0, 4) . '-' . substr($df, 4, 2) . '-' . substr($df, 6, 2);
+        $input_datefrom = $date_from;
     } else {
         $date_from = date('Y-m-d', strtotime('last month'));
     }
 
     $dt = preg_replace('/[^0-9]/', '', hesk_GET('dateto'));
     if (strlen($dt) == 8) {
-        $date_to = substr($dt, 4, 4) . '-' . substr($dt, 0, 2) . '-' . substr($dt, 2, 2);
-        $input_dateto = substr($dt, 0, 2) . '/' . substr($dt, 2, 2) . '/' . substr($dt, 4, 4);
+        $date_to = substr($dt, 0, 4) . '-' . substr($dt, 4, 2) . '-' . substr($dt, 6, 2);
+        $input_dateto = $date_to;
     } else {
         $date_to = date('Y-m-d');
     }
@@ -422,15 +423,7 @@ if (isset($_GET['w'])) {
 
     foreach ($hesk_settings['custom_fields'] as $k => $v) {
         if ($v['use']) {
-            switch ($v['type']) {
-                case 'date':
-                    $tmp_dt = hesk_custom_date_display_format($ticket[$k], 'Y-m-d\T00:00:00.000');
-                    $tmp .= strlen($tmp_dt) ? '<Cell ss:StyleID="s63"><Data ss:Type="DateTime">'.$tmp_dt : '<Cell><Data ss:Type="String">';
-                    $tmp .= "</Data></Cell> \n";
-                    break;
-                default:
-                    $tmp .= '<Cell><Data ss:Type="String"><![CDATA['.hesk_msgToPlain($ticket[$k], 1, 0).']]></Data></Cell>  ' . "\n";
-            }
+            $tmp .= '<Column ss:AutoFitWidth="0" ss:Width="80"/>' . "\n";
         }
     }
 
@@ -454,10 +447,6 @@ if (isset($_GET['w'])) {
 
     foreach ($hesk_settings['custom_fields'] as $k => $v) {
         if ($v['use']) {
-            if ($modsForHesk_settings['custom_field_setting']) {
-                $v['name'] = $hesklang[$v['name']];
-            }
-
             $tmp .= '<Cell><Data ss:Type="String">' . $v['name'] . '</Data></Cell>' . "\n";
         }
     }
@@ -520,14 +509,17 @@ if (isset($_GET['w'])) {
 ';
 
         // Add custom fields
-        foreach ($hesk_settings['custom_fields'] as $k => $v) {
+        foreach ($hesk_settings['custom_fields'] as $k=>$v) {
             if ($v['use']) {
-                $output = $ticket[$k];
-                if ($v['type'] == 'date' && !empty($ticket[$k])) {
-                    $dt = date('Y-m-d', $ticket[$k]);
-                    $output = hesk_dateToString($dt, 0);
+                switch ($v['type']) {
+                    case 'date':
+                        $tmp_dt = hesk_custom_date_display_format($ticket[$k], 'Y-m-d\T00:00:00.000');
+                        $tmp .= strlen($tmp_dt) ? '<Cell ss:StyleID="s63"><Data ss:Type="DateTime">'.$tmp_dt : '<Cell><Data ss:Type="String">';
+                        $tmp .= "</Data></Cell> \n";
+                        break;
+                    default:
+                        $tmp .= '<Cell><Data ss:Type="String"><![CDATA['.hesk_msgToPlain($ticket[$k], 1, 0).']]></Data></Cell>  ' . "\n";
                 }
-                $tmp .= '<Cell><Data ss:Type="String"><![CDATA[' . hesk_msgToPlain($output, 1, 0) . ']]></Data></Cell>  ' . "\n";
             }
         }
 
@@ -702,10 +694,11 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                 <div class="form-group">
                     <label for="time" class="control-label col-sm-2"><?php echo $hesklang['dtrg']; ?>:</label>
 
-                    <div class="col-sm-10">
+                    <div class="col-sm-10 form-inline">
                         <!-- START DATE -->
                         <input type="radio" name="w" value="0" id="w0" <?php echo $selected['w'][0]; ?> />
                         <select name="time" onclick="document.getElementById('w0').checked = true"
+                                class="form-control"
                                 onfocus="document.getElementById('w0').checked = true"
                                 style="margin-top:5px;margin-bottom:5px;">
                             <option value="1" <?php echo $selected['time'][1]; ?>><?php echo $hesklang['r1']; ?>
@@ -736,16 +729,16 @@ require_once(HESK_PATH . 'inc/show_admin_nav.inc.php');
                             <option value="12" <?php echo $selected['time'][12]; ?>><?php echo $hesklang['r12']; ?></option>
                         </select>
 
-                        <br/>
+                        <br>
 
                         <input type="radio" name="w" value="1" id="w1" <?php echo $selected['w'][1]; ?> />
                         <?php echo $hesklang['from']; ?> <input type="text" name="datefrom"
                                                                 value="<?php echo $input_datefrom; ?>" id="datefrom"
-                                                                class="tcal" size="10"
+                                                                class="datepicker form-control" size="10"
                                                                 onclick="document.getElementById('w1').checked = true"
                                                                 onfocus="document.getElementById('w1').checked = true;this.focus;"/>
                         <?php echo $hesklang['to']; ?> <input type="text" name="dateto" value="<?php echo $input_dateto; ?>"
-                                                              id="dateto" class="tcal" size="10"
+                                                              id="dateto" class="datepicker form-control" size="10"
                                                               onclick="document.getElementById('w1').checked = true"
                                                               onfocus="document.getElementById('w1').checked = true; this.focus;"/>
                         <!-- END DATE -->