diff --git a/include/class.format.php b/include/class.format.php
index 96764f2027126caa966f0bcad2b3119ff83030ef..05d8699881bfb67ea117b916bb22aa8f45fb8f96 100644
--- a/include/class.format.php
+++ b/include/class.format.php
@@ -907,17 +907,10 @@ class Format {
           return sprintf($timeDiff >= 0 ? __('%d hours ago') : __('in %d hours'), $absTimeDiff / 3600);
         }
 
-        // within 2 days
-        $days2 = 2 * 86400;
-        if ($absTimeDiff < $days2) {
-            // XXX: yesterday / tomorrow?
-          return $absTimeDiff >= 0 ? __('yesterday') : __('tomorrow');
-        }
-
         // within 29 days
         $days29 = 29 * 86400;
         if ($absTimeDiff < $days29) {
-          return sprintf($timeDiff >= 0 ? __('%d days ago') : __('in %d days'), $absTimeDiff / 86400);
+          return sprintf($timeDiff >= 0 ? __('%d days ago') : __('in %d days'), round($absTimeDiff / 86400));
         }
 
         // within 60 days
diff --git a/include/class.pdf.php b/include/class.pdf.php
index cc395f388999d1230b0da195747e9a9990ee22df..10398fd65d171a23231795f32dbb2288014d08da 100644
--- a/include/class.pdf.php
+++ b/include/class.pdf.php
@@ -90,6 +90,7 @@ class Ticket2PDF extends mPDFWithLocalImages
             return;
         $html = ob_get_clean();
 
+        $this->SetAutoFont();
         $this->WriteHtml($html, 0, true, true);
     }
 }
@@ -119,6 +120,7 @@ class Task2PDF extends mPDFWithLocalImages {
         ob_start();
         include STAFFINC_DIR.'templates/task-print.tmpl.php';
         $html = ob_get_clean();
+        $this->SetAutoFont();
         $this->WriteHtml($html, 0, true, true);
 
     }
diff --git a/include/mpdf/ttfonts/XB Riyaz.ttf b/include/mpdf/ttfonts/XB Riyaz.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..80e15803dc0aa7b0d8758e0e26793d10fa484ef1
Binary files /dev/null and b/include/mpdf/ttfonts/XB Riyaz.ttf differ
diff --git a/include/mpdf/ttfonts/XB RiyazBd.ttf b/include/mpdf/ttfonts/XB RiyazBd.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..e6cf58f93bb2d2093a9b858ab74393416537c46b
Binary files /dev/null and b/include/mpdf/ttfonts/XB RiyazBd.ttf differ
diff --git a/include/mpdf/ttfonts/XB RiyazBdIt.ttf b/include/mpdf/ttfonts/XB RiyazBdIt.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..19fba7887e965c9f331479862c53ec97f4caf22e
Binary files /dev/null and b/include/mpdf/ttfonts/XB RiyazBdIt.ttf differ
diff --git a/include/mpdf/ttfonts/XB RiyazIt.ttf b/include/mpdf/ttfonts/XB RiyazIt.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..cc9cc3ab2a7da6ee26b3d78b18f2c18de42474a4
Binary files /dev/null and b/include/mpdf/ttfonts/XB RiyazIt.ttf differ
diff --git a/include/mpdf/ttfonts/XB Zar Bd.ttf b/include/mpdf/ttfonts/XB Zar Bd.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..52a2e38f977989124e657b0d197cf78b5af7a8d8
Binary files /dev/null and b/include/mpdf/ttfonts/XB Zar Bd.ttf differ
diff --git a/include/mpdf/ttfonts/XB Zar BdIt.ttf b/include/mpdf/ttfonts/XB Zar BdIt.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..a7f19d97b7e85f5fa95ad99c58a6a847da78bd8e
Binary files /dev/null and b/include/mpdf/ttfonts/XB Zar BdIt.ttf differ
diff --git a/include/mpdf/ttfonts/XB Zar It.ttf b/include/mpdf/ttfonts/XB Zar It.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4365d1d78ec95f847d650c89f65c91105df71dd8
Binary files /dev/null and b/include/mpdf/ttfonts/XB Zar It.ttf differ
diff --git a/include/mpdf/ttfonts/XB Zar.ttf b/include/mpdf/ttfonts/XB Zar.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..7a168b6ee5eb76c3ef3731017c604e25ce30b995
Binary files /dev/null and b/include/mpdf/ttfonts/XB Zar.ttf differ