diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index bffabb1fa..de38a20d7 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -344,11 +344,14 @@ class UserNarocila{
 
         // Ni nobenega paketa
         if(mysqli_num_rows($sqlA) == 0){
-            $package_string = $lang['paket_opis_1ka'].' ('.$lang['srv_access_package_free'].')</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button>';
+
+            $package_string = '<div class="setting_holder">'.$lang['paket_opis_1ka'].' ('.$lang['srv_access_package_free'].')</div>';
+            $package_string .= '<div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button></div>';
         }
         else{
+
             $userAccess = UserAccess::getInstance($global_user_id);
-            $package_name = $userAccess->getPackageName($rowA['package_id']);
+            $package_name = $userAccess->getPackageName($rowA['package_id']);  
 
             // Ce ima paket 2 ali 3
             if($rowA['package_id'] == '2' || $rowA['package_id'] == '3'){
@@ -356,12 +359,11 @@ class UserNarocila{
                 // Ce je paket ze potekel
                 if(strtotime($rowA['time_expire']) < time()){
 
-                    $package_string = '<span>';
-                    $package_string .= $package_name;
-                    $package_string .= ' ('.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).')';
-                    $package_string .= '</span>';
-                    
-                    $package_string .= '</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/\';">'.$lang['srv_narocila_extend'].'</button>';
+                    $package_string = '<div class="setting_holder">'.$package_name.'</div>';
+                    $package_string .= '<div class="setting_holder">'.date("d.m.Y", strtotime($rowA['time_activate'])).'</div>';
+                    $package_string .= '<div class="setting_holder">'.$lang['srv_access_package_expire'].' '.date("d.m.Y", strtotime($rowA['time_expire'])).'</div>';
+
+                    $package_string .= '<div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.'izvedi-nakup/'.$rowA['package_id'].'/podatki/\';">'.$lang['srv_narocila_extend'].'</button></div>';
                 }
                 else{
                     $package_string = '<div class="setting_holder">'.$package_name.'</div>';
@@ -372,10 +374,8 @@ class UserNarocila{
                 }
             }
             else{
-                $package_string = $package_name;
-                $package_string .= ' ('.$lang['srv_access_package_free'].')';
-                
-                $package_string .= '</div><div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button>';
+                $package_string = '<div class="setting_holder">'.$package_name.' ('.$lang['srv_access_package_free'].')</div>';
+                $package_string .= '<div class="setting_holder"><button class="medium yellow" type="button" onClick="window.location.href=\''.$drupal_url.''.$lang['srv_narocila_buyurl'].'\';">'.$lang['srv_narocila_buy'].'</button></div>';
             }
         }
         echo $package_string;
@@ -416,37 +416,55 @@ class UserNarocila{
         echo '  <thead>';
         echo '      <tr>';
 
-        echo '          <th>'.$lang['srv_narocilo_paket'].'</th>';
-        echo '          <th>'.$lang['srv_narocilo_trajanje'].' ('.$lang['srv_narocilo_trajanje_mesecev'].')</th>';
         echo '          <th>'.$lang['srv_narocilo_cas'].'</th>';
-        echo '          <th>'.$lang['srv_narocilo_nacin_placila'].'</th>';
-        echo '          <th>'.$lang['srv_narocilo_cena'].'</th>';
+        echo '          <th>'.$lang['srv_narocilo_paket'].'</th>';
+        echo '          <th>'.$lang['srv_narocilo_veljavnodo'].'</th>';
+        echo '          <th>'.$lang['srv_narocilo_samo_cena'].'</th>';
         echo '          <th>'.$lang['srv_narocilo_status'].'</th>';
-        echo '          <th>'.$lang['srv_narocilo_pdf'].'</th>';
-
+        echo '          <th class="center">'.$lang['srv_narocilo_pdf_predracun'].'</th>';
+        echo '          <th class="center">'.$lang['srv_narocilo_pdf_racun'].'</th>';
         echo '      </tr>';
         echo '  </thead>';
 
         // Vsebina tabele
         echo '  <tbody>';
 
+        $userAccess = UserAccess::getInstance($global_user_id);
+
         foreach($data as $usr_id => $data_row){
 
+        $package_name = $userAccess->getPackageName($data_row['package_id']);
+
             echo '<tr>';   
 
-            echo '<td>'.$data_row['package_name'].'</td>';
-            echo '<td>'.$data_row['trajanje'].'</td>';
             echo '<td>'.date("j.n.Y H:i", strtotime($data_row['time'])).'</td>';
-            echo '<td>'.$data_row['payment_method'].'</td>';
+
+            //Sklanjanje za število mesecev
+            if ($data_row['trajanje'] == 1)
+                    $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_1'];
+            else if ($data_row['trajanje'] == 2)
+                $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_2'];
+            else if ($data_row['trajanje'] == 3 || $data_row['trajanje'] == 4)
+                $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_3_4'];
+            else
+                $trajanje = $data_row['trajanje'] .' '. $lang['srv_narocilo_trajanje_5'];
+
+            echo '<td>'.$package_name.' ('.$trajanje.')</td>';
+
+            //Veljavnost paketa
+            $meseci = $data_row['trajanje'];
+            $veljaven_do = date("j.n.Y H:i", strtotime("+$meseci months", strtotime($data_row['time'])));
+            
+            echo '<td>'.$veljaven_do.'</td>';
 
             // Cena
             $cena = $this->getPrice($data_row['package_name'], $data_row['trajanje'], $data_row['discount'], $data_row['time']);
 
             // Zavezanec iz tujine nima ddv-ja
             if($this->isWithoutDDV($data_row['id']))
-                echo '<td>'.$cena['final_without_tax'].'</td>';
+                echo '<td>'.$cena['final_without_tax'].'€</td>';
             else
-                echo '<td>'.$cena['final'].'</td>';
+                echo '<td>'.$cena['final'].'€</td>';
 
             if($data_row['status'] == '0')
                 $status_color = 'red';
@@ -457,12 +475,13 @@ class UserNarocila{
             echo '<td class="'.$status_color.'">'.$lang['srv_narocilo_status_'.$data_row['status']].'</td>';
 
             // PDF
-            echo '<td>';
-            echo '<span class="pointer as_link" onClick="getNarociloPredracun(\''.$data_row['id'].'\')">'.$lang['srv_narocilo_pdf_predracun'].'</span>';
+            echo '<td class="center"><span class="faicon pdf empty red pointer" onClick="getNarociloPredracun(\''.$data_row['id'].'\')"></span></td>';
+            
             if($data_row['status'] == '1'){
-                echo ' | <span class="pointer as_link" onClick="getNarociloRacun(\''.$data_row['id'].'\')">'.$lang['srv_narocilo_pdf_racun'].'</span>';
+                echo '<td class="center"><span class="faicon pdf empty red pointer" onClick="getNarociloRacun(\''.$data_row['id'].'\')"></span></td>';
             }
-            echo '</td>';
+            else
+            echo '<td></td>';
 
             echo '</tr>';
         }
diff --git a/lang/1.php b/lang/1.php
index ae090a806..a020a0c06 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7632,8 +7632,14 @@ $lang = array (
     'srv_narocilo_paket'                => "Paket",
     'srv_narocilo_trajanje'             => "Trajanje",
     'srv_narocilo_trajanje_mesecev'     => "mesecev",
+	'srv_narocilo_trajanje_1'     => "mesec",
+    'srv_narocilo_trajanje_2'     => "meseca",
+    'srv_narocilo_trajanje_3_4'     => "meseci",
+    'srv_narocilo_trajanje_5'     => "mesecev",
+    'srv_narocilo_veljavnodo'     => "Paket veljaven do:",
     'srv_narocilo_cena_brez_popusta'    => "Cena brez popusta",
     'srv_narocilo_cena'                 => "Končna cena",
+    'srv_narocilo_samo_cena'                 => "Cena",
     'srv_narocilo_popust'               => "Popust",
     'srv_narocilo_nacin_placila'        => "Način plačila",
     'srv_narocilo_nacin_placila_1'      => "Bančno nakazilo",
diff --git a/lang/2.php b/lang/2.php
index 178cb8210..e032a49ff 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7520,9 +7520,15 @@ $lang = array (
     'srv_narocilo_paket'                => "Package",
     'srv_narocilo_trajanje'             => "Duration",
     'srv_narocilo_trajanje_mesecev'     => "months",
+	'srv_narocilo_trajanje_1'     => "month",
+    'srv_narocilo_trajanje_2'     => "months",
+    'srv_narocilo_trajanje_3_4'     => "months",
+    'srv_narocilo_trajanje_5'     => "months",
+    'srv_narocilo_veljavnodo'     => "Package valid until:",
     'srv_narocilo_cena_brez_popusta'    => "Price without discount",
     'srv_narocilo_popust'               => "Discount",
     'srv_narocilo_cena'                 => "Final price",
+    'srv_narocilo_samo_cena'            => "Price",
     'srv_narocilo_nacin_placila'        => "Payment method",
     'srv_narocilo_nacin_placila_1'      => "Bank Transfer",
     'srv_narocilo_nacin_placila_2'      => "PayPal",
diff --git a/resources/sass/admin_new/basic/icons/icons.scss b/resources/sass/admin_new/basic/icons/icons.scss
index 8fb1f4573..949adf9de 100644
--- a/resources/sass/admin_new/basic/icons/icons.scss
+++ b/resources/sass/admin_new/basic/icons/icons.scss
@@ -55,6 +55,9 @@ a.faicon{
     &.green {
         color: $green;
     }
+    &.red {
+        $color: $red;
+    }
 
     //STACKING
     &.fa-stack {