diff --git a/account.php b/account.php
index dab91a7..d270157 100644
--- a/account.php
+++ b/account.php
@@ -56,10 +56,10 @@ template_header('Account', 'account', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$account_h2.' - '.$_GET['rowID'].'</h2>
-        <a href="index.php?page=accounts" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=accounts" class="btn alt mar-right-2">←</a>
 ';
 if ($update_allowed === 1){
-    $view .= '<a href="index.php?page=account_manage&rowID='.$_GET['rowID'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=account_manage&rowID='.$_GET['rowID'].'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
diff --git a/account_manage.php b/account_manage.php
index 211774d..23e2cc2 100644
--- a/account_manage.php
+++ b/account_manage.php
@@ -133,14 +133,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100"><?=$page?>'.$account_h2.'</h2>
-        <a href="'.$url .'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url .'" class="btn alt mar-right-2">←</a>
     ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this account?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this account?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
     
 $view .= '</div>';
diff --git a/accounts.php b/accounts.php
index 05514c1..e0aeb49 100644
--- a/accounts.php
+++ b/accounts.php
@@ -107,7 +107,6 @@ $view .= '
                     <th>'.$account_id.'</th>
                     <th>'.$account_status.'</th>
                     <th>'.$account_name.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -125,11 +124,10 @@ $view .= '
                 
                 $account_details = json_decode($response->accountdetails);
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=account&rowID='.$response->rowID.'\'" style="cursor: pointer;">
                     <td>'.$response->rowID.'</td>
                     <td>'.(($response->status == 'Customer')? '<span class="status enabled">'.$response->status:'<span class="status">'.$response->status).'</td>
                     <td>'.$account_details->billcompany.'</td>
-                    <td><a href="index.php?page=account&rowID='.$response->rowID.'" class="btn_link">'.$general_view .'</a></td>
                 </tr>
                 ';
                 }
diff --git a/assets/functions.php b/assets/functions.php
index 0b7d3d1..0370dc6 100644
--- a/assets/functions.php
+++ b/assets/functions.php
@@ -1812,7 +1812,6 @@ function serviceEvents ($messages,$page){
                     <th>'.$equipment_label3.'</th>
                     <th>'.$general_createdby.'</th>
                     <th>'.$general_created.'</th>
-                    <th>'.$view_asset_actions.'</th>
                 </tr>
                 </thead>
                 <tbody>';
@@ -1852,15 +1851,13 @@ function serviceEvents ($messages,$page){
                 $service_status = '<span class="status warranty">'.$service_report_outcome_good.'</span>';
             }
             
-            $view_data .= '<tr>
+            $view_data .= '<tr onclick="window.location.href=\'index.php?page=servicereport&equipmentID='.$message->equipmentID.'&historyID='.$message->historyID.'\'" style="cursor: pointer;">
                         <td>'.$TETS->serialnumber.'</td>
                         <td>'.$service_date.'</td>
                         <td>'.$service_renewal_date.'</td>
                         <td>'.$service_status.'</td>
                         <td>'.$message->createdby.'</td>
                         <td>'.getRelativeTime($message->created).'</td>
-                        <td><a href="index.php?page=servicereport&equipmentID='.$message->equipmentID.'&historyID='.$message->historyID.'" class="btn_link">'.$general_view.'</a></td>
-                        <td><a href="index.php?page=render_service_report&historyID='.$message->historyID.'" class="btn_link">PDF</a></td>
                     </tr>';
         }
   
diff --git a/buildtool.php b/buildtool.php
index e5c97d6..553a35c 100644
--- a/buildtool.php
+++ b/buildtool.php
@@ -42,7 +42,7 @@ $view = '
 
 $view .= '
     <div class="content-header responsive-flex-column pad-top-5">
-        <a href="index.php?page=dashboard" class="btn">'.$button_cancel.'</a>
+        <a href="index.php?page=dashboard" class="btn">←</a>
      </div>
 ';
 
diff --git a/cartest.php b/cartest.php
index 9db008a..2c768c1 100644
--- a/cartest.php
+++ b/cartest.php
@@ -58,11 +58,11 @@ template_header('Cartest', 'cartest', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$cartest_h2.' - '.$_GET['rowID'].'</h2>
-        <a href="index.php?page=cartests" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=cartests" class="btn alt mar-right-2">←</a>
 ';
 
 if ($update_allowed === 1 && $version != 0){
-    $view .= '<a href="index.php?page=cartest_manage&rowID='.$_GET['rowID'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=cartest_manage&rowID='.$_GET['rowID'].'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
diff --git a/cartest_manage.php b/cartest_manage.php
index a50c624..b58f819 100644
--- a/cartest_manage.php
+++ b/cartest_manage.php
@@ -174,14 +174,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100"><?=$page?>'.$cartest_h2.'</h2>
-        <a href="'.$url .'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url .'" class="btn alt mar-right-2">←</a>
     ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this cartest?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this cartest?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
     
 $view .= '</div>';
diff --git a/cartests.php b/cartests.php
index 985da3b..d946b36 100644
--- a/cartests.php
+++ b/cartests.php
@@ -122,7 +122,6 @@ $view .= '
                     <th>'.$cartest_carbrand.'</th>
                     <th>'.$cartest_cartype.'</th>
                     <th>'.$general_createdby.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -138,12 +137,11 @@ $view .= '
             else {
                 foreach ($responses as $response){
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=cartest&rowID='.$response->rowID.'\'" style="cursor: pointer;">
                     <td class="responsive-hidden">'.$response->rowID.'</td>
                     <td>'.$response->carbrand.'</td>
                     <td>'.$response->cartype.'</td>
                     <td>'.$response->createdby.'</td>
-                    <td><a href="index.php?page=cartest&rowID='.$response->rowID.'" class="btn_link">'.$general_view.'</a></td>
                 </tr>
                 ';
                 }
diff --git a/category.php b/category.php
index 33d728c..c0544b0 100644
--- a/category.php
+++ b/category.php
@@ -97,14 +97,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($categories_h2 ?? 'Categories').'</h2>
-        <a href="index.php?page=categories" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=categories" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this category?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this category?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/communication.php b/communication.php
index 8d8d721..9dd632d 100644
--- a/communication.php
+++ b/communication.php
@@ -99,14 +99,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$communication_h2.'</h2>
-        <a href="index.php?page=communications" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=communications" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this communication?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this communication?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/communication_send.php b/communication_send.php
index 4c210f6..c9823b2 100644
--- a/communication_send.php
+++ b/communication_send.php
@@ -37,7 +37,7 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$communication_send_firmware_h2.'</h2>
-        <a href="index.php?page=communications" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=communications" class="btn alt mar-right-2">←</a>
 ';
 
 if ($update_allowed === 1){
diff --git a/communications.php b/communications.php
index fb98e90..262a352 100644
--- a/communications.php
+++ b/communications.php
@@ -15,7 +15,7 @@ $prev_page = (isset($_SESSION['origin']) && $_SESSION['origin'] == 'equipments')
 $page = 'communications';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 
 //Check if allowed
@@ -124,7 +124,6 @@ $view .= '
                     <th>'.$communication_firmware.'</th>
                     <th>'.$communication_service.'</th>
                     <th>'.$communication_marketing.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -144,7 +143,7 @@ $view .= '
                     $type = 'coms_type_'.$response->coms_type;
 
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=communication&id='.$response->rowID.'\'" style="cursor: pointer;">
                     <td>'.(($response->status == 1)? '<span class="status enabled">'.$$status:'<span class="status">'.$$status).'</td>
                     <td>'.$$type.'</td>
                     <td>'.$response->partnerID.'</td>
@@ -152,7 +151,6 @@ $view .= '
                     <td><input type="checkbox" '.($response->type_1 == 1 ?' checked':'').'/></td>
                     <td><input type="checkbox" '.($response->type_2 == 1 ?' checked':'').'/></td>
                     <td><input type="checkbox" '.($response->type_3 == 1 ?' checked':'').'/></td>
-                    <td><a href="index.php?page=communication&id='.$response->rowID.'" class="btn_link">'.$general_view .'</a></td>
                 </tr>
                 ';
                 }
diff --git a/contract.php b/contract.php
index 8437f2a..0edcb8a 100644
--- a/contract.php
+++ b/contract.php
@@ -14,7 +14,7 @@ $prev_page = $_SESSION['prev_origin'] ?? '';
 $page = 'contract';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -79,7 +79,7 @@ template_header('Contract', 'contract', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$responses->rowID.'</h2>
-        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">←</a>
 ';
 
 
@@ -87,7 +87,7 @@ $view = '
 //
 //------------------------------------
 if ($update_allowed_edit === 1){
-    $view .= '<a href="index.php?page=contract_manage&rowID='.$_GET['rowID'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=contract_manage&rowID='.$_GET['rowID'].'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
diff --git a/contract_manage.php b/contract_manage.php
index d08f9cb..c097f9c 100644
--- a/contract_manage.php
+++ b/contract_manage.php
@@ -114,14 +114,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$contract_h2.'</h2>
-        <a href="'.$url.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url.'" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this contract?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this contract?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/contracts.php b/contracts.php
index 3de62d5..3447036 100644
--- a/contracts.php
+++ b/contracts.php
@@ -15,7 +15,7 @@ $page = $_SESSION['origin'] = 'contracts';
 $prev_page = ($_SESSION['origin'] == 'equipments') ? $_SESSION['prev_origin_equipment'] : (($_SESSION['origin'] == 'account')? $_SESSION['prev_origin'] :'');
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -119,7 +119,6 @@ $view .= '
                     <th>'.$contract_start_date.'</th>
                     <th>'.$contract_end_date.'</th>
                     <th>'.$contract_reference.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -144,7 +143,7 @@ $view .= '
                 $partner_data = json_decode($response->accounthierarchy);
 
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=contract&rowID='.$response->rowID.'\'" style="cursor: pointer;">
                     <td>'.$response->rowID.'</td>
                     <td>'.(($response->status == 1)? '<span class="status enabled">'.$$status: (($response->status == 3) ? '<span class="status disabled">'.$$status : '<span class="status">'.$$status)).'</td>
                     <td>'.$partner_data->soldto.'</td>
@@ -152,7 +151,6 @@ $view .= '
                     <td>'.$response->start_date.'</td>
                     <td>'.$date.'</td>
                     <td>'.$response->reference.'</td>
-                    <td><a href="index.php?page=contract&rowID='.$response->rowID.'" class="btn_link">'.$general_view .'</a></td>
                 </tr>
                 ';
                 }
diff --git a/dealer.php b/dealer.php
index 708ea34..504b682 100644
--- a/dealer.php
+++ b/dealer.php
@@ -55,14 +55,14 @@ template_header('Dealer', 'dealer', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($view_dealer_h2 ?? 'Dealer').' - '.$responses['rowID'].'</h2>
-        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].$_SESSION['search'].$_SESSION['partnerid'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].$_SESSION['search'].$_SESSION['partnerid'].'" class="btn alt mar-right-2">←</a>
 ';
 
 //------------------------------------
 // EDIT BUTTON
 //------------------------------------
 if ($update_allowed === 1){
-    $view .= '<a href="index.php?page=dealer_manage&rowID='.$responses['rowID'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=dealer_manage&rowID='.$responses['rowID'].'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
diff --git a/dealer_manage.php b/dealer_manage.php
index b96300d..7a4170d 100644
--- a/dealer_manage.php
+++ b/dealer_manage.php
@@ -141,14 +141,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($dealers_h2 ?? 'Dealer').' '.$responses['name'].'</h2>
-        <a href="'.$url.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url.'" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this dealer?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this dealer?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/dealers.php b/dealers.php
index 743e7dd..7ff341a 100644
--- a/dealers.php
+++ b/dealers.php
@@ -89,7 +89,6 @@ $view .= '
                     <td>'.($dealers_name ?? 'Name').'</td>
                     <td class="responsive-hidden"></td>
                     <td class="responsive-hidden">'.($dealers_created ?? 'Created').'</td>
-                    <td>'.$general_actions.'</td>
                 </tr>
             </thead>
             <tbody>';
@@ -105,13 +104,12 @@ $view .= '
                         $dealer_status = 'general_status_'.$dealer['status'];
                         
                         $view .= '
-                        <tr>
+                        <tr onclick="window.location.href=\'index.php?page=dealer&id='.$dealer['rowID'].'\'" style="cursor: pointer;">
                             <td>'.$dealer['rowID'].'</td>
                             <td>'.(${$dealer_status} ?? $dealer_status).'</td>
                             <td>'.$dealer['name'].'</td>  
                             <td class="responsive-hidden">'.(($dealer['full_path'] !='')?'<img style="border-radius: 4px;height: 50px;" src="'.$dealer['full_path'].'" alt="">' : '').'</td>                      
                             <td class="responsive-hidden">'.getRelativeTime($dealer['created']).'</td>
-                            <td><a href="index.php?page=dealer&id='.$dealer['rowID'].'" class="btn_link">'.$general_view.'</a></td>
                         </tr>';
                     }
                 }
diff --git a/discount.php b/discount.php
index 778fe37..6945376 100644
--- a/discount.php
+++ b/discount.php
@@ -113,14 +113,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($discounts_h2 ?? 'discounts').'</h2>
-        <a href="index.php?page=discounts" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=discounts" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this discount?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this discount?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/discounts.php b/discounts.php
index 154e660..b30eedc 100644
--- a/discounts.php
+++ b/discounts.php
@@ -92,7 +92,6 @@ $view .= '
                     <td>'.($discounts_value ?? 'Value').'</td>
                     <td class="responsive-hidden">'.($discounts_start_date ?? 'Start Date').'</td>
                     <td class="responsive-hidden">'.($discounts_end_date ?? 'End Date').'</td>
-                    <td>'.$general_actions.'</td>
                 </tr>
             </thead>
             <tbody>';
@@ -106,7 +105,7 @@ $view .= '
                         $current_date = strtotime((new DateTime())->format('Y-m-d H:i:s'));
 
                         $view .= '
-                        <tr>
+                        <tr onclick="window.location.href=\'index.php?page=discount&id='.$discount['id'].'\'" style="cursor: pointer;">
                             <td class="responsive-hidden">'.$discount['id'].'</td>
                             <td>'.$discount['discount_code'].'</td>
                             <td>'.(($current_date >= strtotime($discount['start_date']) && $current_date <= strtotime($discount['end_date'])) ? $general_yes : $general_no).'</td>
@@ -116,7 +115,6 @@ $view .= '
                             <td>'.$discount['discount_value'].'</td>
                             <td class="responsive-hidden">'.date('Y-m-d h:ia', strtotime($discount['start_date'])).'</td>
                             <td class="responsive-hidden">'.date('Y-m-d h:ia', strtotime($discount['end_date'])).'</td>
-                            <td><a href="index.php?page=discount&id='.$discount['id'].'" class="btn_link">'.$general_view.'</a></td>
                         </tr>';
                     }
 
diff --git a/equipment.php b/equipment.php
index c7db234..7008a36 100644
--- a/equipment.php
+++ b/equipment.php
@@ -126,7 +126,7 @@ template_header('Asset', 'asset', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$view_asset_h2.' - '.$responses->equipmentID.'</h2>
-        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].$_SESSION['status'].$_SESSION['sort'].$_SESSION['search'].$_SESSION['firmware'].$_SESSION['servicedate'].$_SESSION['warrantydate'].$_SESSION['partnerid'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].$_SESSION['status'].$_SESSION['sort'].$_SESSION['search'].$_SESSION['firmware'].$_SESSION['servicedate'].$_SESSION['warrantydate'].$_SESSION['partnerid'].'" class="btn alt mar-right-2">←</a>
 ';
 
 //------------------------------------
@@ -137,7 +137,7 @@ $equipment_owner = (($responses->createdby == $_SESSION['username'])? 1 : 0);
 //
 //------------------------------------
 if ($update_allowed_edit === 1 || $equipment_owner === 1){
-    $view .= '<a href="index.php?page=equipment_manage&equipmentID='.$responses->equipmentID.'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=equipment_manage&equipmentID='.$responses->equipmentID.'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
@@ -320,17 +320,15 @@ $view .= '<div class="content-block">
                         <th>'.$view_asset_data_rowID.'</th>
                         <th>'.$view_asset_data_historyid.'</th>
                         <th>'.$view_asset_data_ranking.'</th>
-                        <th>'.$general_actions.'</th>
                     </tr>
                 </thead>
                 <tbody>';
         foreach ($equipment_data as $data){
 
-            $view .= '<tr>
+            $view .= '<tr onclick="window.location.href=\'index.php?page=equipment_data&equipmentID='.$responses->equipmentID.'&rowID='.$data->rowID.'\'" style="cursor: pointer;">
                         <td>'.$data->rowID.'</td>
                         <td>'.(($view_history == 1)? '<a href="index.php?page=history&equipmentID='.$responses->equipmentID.'&historyid='.$data->historyid.'" class="btn2">'.$data->historyid.'</a>':$data->historyid).'</td>
-                        <td><span class="status '.(($data->healthindex >= 85) ?'enabled' : (($data->healthindex <= 50)? 'disabled' : 'id2')).'">'.$data->healthindex.'</span></td>
-                        <td><a href="index.php?page=equipment_data&equipmentID='.$responses->equipmentID.'&rowID='.$data->rowID.'" class="btn_link">'.$general_view.'</a></td>
+                        <td><span class="status '.(($data->healthindex >= 85) ?'enabled' : (($data->healthindex <= 50)? 'disabled' : 'id2')).'.">'.$data->healthindex.'</span></td>
                     </tr>';
         }
         $view .= '
diff --git a/equipment_data.php b/equipment_data.php
index 80e5577..69b9f40 100644
--- a/equipment_data.php
+++ b/equipment_data.php
@@ -43,7 +43,7 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$view_asset_data_text.'</h2>
-        <a href="index.php?page=equipment&equipmentID='.$equipmentID.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=equipment&equipmentID='.$equipmentID.'" class="btn alt mar-right-2">←</a>
 ';   
 $view .= '</div>';
 
diff --git a/equipment_manage.php b/equipment_manage.php
index e808157..85a3064 100644
--- a/equipment_manage.php
+++ b/equipment_manage.php
@@ -143,16 +143,16 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100"><?=$page?>'.$label_h2.'</h2>
-        <a href="'.$url.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url.'" class="btn alt mar-right-2">←</a>
 ';
 
 
 
 if ($delete_allowed === 1 || $equipment_owner === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this asset?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this asset?\')">';
 }
 if ($update_allowed === 1 || $equipment_owner === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/equipments.php b/equipments.php
index 1e341c6..75263e0 100644
--- a/equipments.php
+++ b/equipments.php
@@ -14,7 +14,7 @@ $prev_page = $_SESSION['prev_origin'] ?? '';
 $page = $_SESSION['origin'] = 'equipments';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -203,7 +203,6 @@ $view .= '
                     <th class="responsive-hidden"></th>
                     <th class="responsive-hidden">'.$general_location.'</th>
                     <th class="responsive-hidden">'.$general_section.'</th>
-                    <th>'.$view_asset_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -244,7 +243,7 @@ foreach ($media_responses as $media){
 
 $indicators = overviewIndicators($response->warranty_date,$response->service_date,$response->sw_version, $response->sw_version_latest);
 
-$view .= '<tr>
+$view .= '<tr onclick="window.location.href=\'index.php?page=equipment&equipmentID='.$response->equipmentID.'\'" style="cursor: pointer;">
             <td class="responsive-hidden">'.$indicators.'</td>
             <td>'.$response->serialnumber.'</td>
             <td><span class="status id'.$response->status.'">'.$$status_text.'</span></td>
@@ -252,7 +251,6 @@ $view .= '<tr>
             <td class="responsive-hidden">'.(($full_path !='')?'<img style="border-radius: 4px;height: 50px;" src="'.$full_path.'" alt="">' : '').'</td>
             <td class="responsive-hidden">'.$location.'</td>
             <td class="responsive-hidden">'.$section.'</td>
-            <td><a href="index.php?page=equipment&equipmentID='.$response->equipmentID.'" class="btn_link">'.$general_view .'</a></td>
         </tr>
       ';
  }
diff --git a/equipments_mass_update.php b/equipments_mass_update.php
index 8efae3a..f183148 100644
--- a/equipments_mass_update.php
+++ b/equipments_mass_update.php
@@ -144,7 +144,7 @@ template_header('Mass update', 'equipment_mass_update', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$mass_update_h2.'</h2>
-        <a href="index.php?page=equipments" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=equipments" class="btn alt mar-right-2">←</a>
 ';
 
 $view .= '</div>';
diff --git a/firmwaretool.php b/firmwaretool.php
index 835017e..4cdb3e2 100644
--- a/firmwaretool.php
+++ b/firmwaretool.php
@@ -36,7 +36,7 @@ if (isset($_GET['equipmentID'])){$returnpage = 'equipment&equipmentID='.$_GET['e
 if (isAllowed('dashboard',$_SESSION['profile'],$_SESSION['permission'],'R') != 0){
   $view .= '
       <div class="content-header responsive-flex-column pad-top-5">
-          <a href="index.php?page='.$returnpage.'" class="btn">'.$button_cancel.'</a>
+          <a href="index.php?page='.$returnpage.'" class="btn">←</a>
       </div>
   ';
 }
diff --git a/histories.php b/histories.php
index 2eedd58..5f56614 100644
--- a/histories.php
+++ b/histories.php
@@ -92,7 +92,6 @@ $view .= '
                     <th class="responsive-hidden">'.$history_label3.'</th>
                     <th class="responsive-hidden">'.$history_label4.'</th>
                     <th>'.$history_label5.'</th>
-                    <th>'.$view_asset_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -116,13 +115,12 @@ $view .= '
                 $description  = str_replace($search, $replace, $description);
 
 
-                $view .= '<tr>
+                $view .= '<tr onclick="window.location.href=\'index.php?page=equipment&equipmentID='.$response->equipmentID.'\'" style="cursor: pointer;">
                         <td class="responsive-hidden">'.$response->historyID.'</td>
                         <td>'.$response->type.'</td>
                         <td class="responsive-hidden">'.getRelativeTime($response->created).'</td>
                         <td class="responsive-hidden">'.$response->createdby.'</td>
                         <td><div style="overflow-y:scroll;height:200px !important;max-width:300px;"><pre>' . $description . '</pre><div></td>
-                        <td><a href="index.php?page=equipment&equipmentID='.$response->equipmentID.'" class="btn_link">'.$general_view .'</a></td>
                     </tr>
                     ';
                 }
diff --git a/history.php b/history.php
index 7b75b45..116b24f 100644
--- a/history.php
+++ b/history.php
@@ -79,7 +79,7 @@ if (isset($success_msg)){
 }
 $view .= '
 <div class="content-header responsive-flex-column pad-top-5">
-        <a href="index.php?page=equipment&equipmentID='.$_GET['equipmentID'].'" class="btn">'.$button_cancel.'</a>
+        <a href="index.php?page=equipment&equipmentID='.$_GET['equipmentID'].'" class="btn">←</a>
 ';
 
 $view .= '
@@ -120,12 +120,8 @@ $view .= '
                     <th>'.$history_label2.'</th>
                     <th class="responsive-hidden">'.$history_label3.'</th>
                     <th class="responsive-hidden">'.$history_label4.'</th>
-                    <th>'.$history_label5.'</th>';
-if ($update_allowed === 1){
-    $view .= '       <th>'.$view_asset_actions.'</th>';
-}
-
-    $view .= '     </tr>
+                    <th>'.$history_label5.'</th>
+                </tr>
             </thead>
             <tbody>
             ';
@@ -148,18 +144,16 @@ $search = ['{', '}', '"',':','[',']',','];
 $replace   = ['', '','','=','','',''];
 $description  = str_replace($search, $replace, $description);
 
-$view .= '<tr>
+$view .= '<tr';
+if ($update_allowed === 1){
+    $view .= ' onclick="window.location.href=\'index.php?page=history_manage&equipmentID='.$_GET['equipmentID'].'&rowID='.$response->historyID.'\'" style="cursor: pointer;"';
+}
+$view .= '>
             <td class="responsive-hidden">'.$response->historyID.'</td>
             <td>'.$response->type.' </td>
             <td class="responsive-hidden">'.$response->created.'</td>
             <td class="responsive-hidden">'.$response->createdby.'</td>
             <td><div style="overflow-y:scroll;height:200px !important;max-width:300px;"><pre>' . $description . '</pre><div></td>
-            ';
-if ($update_allowed === 1){
-    $view .= ' <td><a href="index.php?page=history_manage&equipmentID='.$_GET['equipmentID'].'&rowID='.$response->historyID.'" class="btn_link">'.$general_view .'</a></td>
-    ';
-}
-    $view .= '    
         </tr>
       ';
  }
diff --git a/history_manage.php b/history_manage.php
index 1ab9a6e..536912f 100644
--- a/history_manage.php
+++ b/history_manage.php
@@ -101,14 +101,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100"><?=$page?>'.$history_h2.'</h2>
-        <a href="'.$url .'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url .'" class="btn alt mar-right-2">←</a>
     ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this history?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this history?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
     
 $view .= '</div>';
diff --git a/language.php b/language.php
index b8deff5..9e754dc 100644
--- a/language.php
+++ b/language.php
@@ -33,7 +33,7 @@ if (isset($_GET['success_msg'])) {
 
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">Translations</h2>
-        <input type="submit" name="submit" value="Save" class="btn">
+        <input type="submit" name="submit" value="💾+" class="btn">
     </div>
 
     <?php if (isset($success_msg)): ?>
diff --git a/media_manage.php b/media_manage.php
index 095d5c8..dd3efb4 100644
--- a/media_manage.php
+++ b/media_manage.php
@@ -109,14 +109,14 @@ $view .='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($media_h2 ?? 'Media').'</h2>
-        <a href="index.php?page=translations" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=translations" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this media?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this media?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/media_scanner.php b/media_scanner.php
index d2f3d3d..a9e4a50 100644
--- a/media_scanner.php
+++ b/media_scanner.php
@@ -324,7 +324,7 @@ $view ='
 <body>
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">Media scanner</h2>
-        <a href="index.php?page='.$_SESSION['origin'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].'" class="btn alt mar-right-2">←</a>
     </div>
 
     <div class="container">
diff --git a/order.php b/order.php
index f63271e..19460e3 100644
--- a/order.php
+++ b/order.php
@@ -14,7 +14,7 @@ $prev_page = $_SESSION['prev_origin'] ?? '';
 $page = 'order';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -59,7 +59,7 @@ template_header('order', 'order', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$order['header']['id'].' - '.$order['header']['txn_id'].'</h2>
-        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">←</a>
 ';
 
 
@@ -67,7 +67,7 @@ $view = '
 //
 //------------------------------------
 if ($update_allowed_edit === 1){
-    $view .= '<a href="index.php?page=order_manage&id='.$_GET['id'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=order_manage&id='.$_GET['id'].'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
diff --git a/orders.php b/orders.php
index 9d73cee..18fc5c5 100644
--- a/orders.php
+++ b/orders.php
@@ -89,7 +89,6 @@ $view .= '
                     <td class="responsive-hidden">'.($orders_method ?? 'Method').'</td>
                     <td class="responsive-hidden">'.($orders_status ?? 'Status').'</td>
                     <td class="responsive-hidden">'.($orders_created ?? 'Created').'</td>
-                    <td>'.$general_actions.'</td>
                 </tr>
             </thead>
             <tbody>';
@@ -106,14 +105,13 @@ $view .= '
                         $payment_method = 'payment_method_'.$order['payment_method'];
                         
                         $view .= '
-                        <tr>
+                        <tr onclick="window.location.href=\'index.php?page=order&id='.$order['id'].'\'" style="cursor: pointer;">
                             <td>'.$order['id'].'</td>
                             <td>'.$order['first_name'].' '.$order['last_name'].'</td>
                             <td>'.number_format($order['payment_amount'], 2).'</td>
                             <td class="responsive-hidden">'.(${$payment_method} ?? $order['payment_method']).'</td>
                             <td class="responsive-hidden">'.(${$payment_status} ?? $order['payment_status']).'</td>
                             <td class="responsive-hidden">'.getRelativeTime($order['created']).'</td>
-                            <td><a href="index.php?page=order&id='.$order['id'].'" class="btn_link">'.$general_view.'</a></td>
                         </tr>';
                     }
                 }
diff --git a/partner.php b/partner.php
index 66d5dda..89693c9 100644
--- a/partner.php
+++ b/partner.php
@@ -106,14 +106,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$partner_h2.'</h2>
-        <a href="index.php?page=partners" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=partners" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this partner?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this partner?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/partners.php b/partners.php
index 3ffc7b3..d8f9faf 100644
--- a/partners.php
+++ b/partners.php
@@ -113,7 +113,6 @@ $view .= '
                     <th class="responsive-hidden">'.$partner_partnertype.'</th>
                     <th>'.$partner_partnername.'</th>
                     <th>'.$partner_salesID.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -136,12 +135,11 @@ $view .= '
 
 
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=partner&id='.$response->partnerID.'\'" style="cursor: pointer;">
                     <td class="responsive-hidden">'.$response->partnerID.'</td>
                     <td class="responsive-hidden">'.$response->partnertype.'</td>
                     <td>'.$response->partnername.'</td>
                     <td>'.$partner_hierarchy.'</td>
-                    <td><a href="index.php?page=partner&id='.$response->partnerID.'" class="btn_link">'.$general_view.'</a></td>
                 </tr>
                 ';
                 }
diff --git a/pricelists.php b/pricelists.php
index 14f3d53..a83b070 100644
--- a/pricelists.php
+++ b/pricelists.php
@@ -98,7 +98,6 @@ $view .= '
                     <th>'.($pricelists_status ?? 'status').'</th>
                     <th>'.($pricelists_name ?? 'name').'</th>
                     <th class="responsive-hidden">'.$general_created.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -114,12 +113,11 @@ $view .= '
             else {
                 foreach ($responses as $response){
                 $view .= '
-                <tr>  
+                <tr onclick="window.location.href=\'index.php?page=pricelists_manage&rowID='.$response['rowID'].'\'" style="cursor: pointer;">  
                     <td>'.$response['rowID'].'</td>  
                     <td>'.${'general_status_'.$response['status']}.'</td>
                     <td>'.$response['name'].'</td>
                     <td class="responsive-hidden">'.getRelativeTime($response['created']).'</td>
-                    <td><a href="index.php?page=pricelists_manage&rowID='.$response['rowID'].'" class="btn_link">'.$general_view .'</a></td>
                 </tr>';
 
                 
diff --git a/pricelists_manage.php b/pricelists_manage.php
index b083314..d0d18a1 100644
--- a/pricelists_manage.php
+++ b/pricelists_manage.php
@@ -165,14 +165,14 @@ $view .='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($pricelists_h2 ?? '').'</h2>
-        <a href="index.php?page=pricelists" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=pricelists" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this pricelist?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this pricelist?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/product.php b/product.php
index 0591ea6..6ad6dfe 100644
--- a/product.php
+++ b/product.php
@@ -14,7 +14,7 @@ $prev_page = $_SESSION['prev_origin'] ?? '';
 $page = 'product';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -150,7 +150,7 @@ template_header('Product', 'product', 'view');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$responses->productcode.' - '.(${$responses->productname} ?? $responses->productname).'</h2>
-        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">←</a>
 ';
 
 
@@ -158,7 +158,7 @@ $view = '
 //
 //------------------------------------
 if ($update_allowed_edit === 1){
-    $view .= '<a href="index.php?page=product_manage&id='.$_GET['rowID'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=product_manage&id='.$_GET['rowID'].'" class="btn">✏️</a>';
 }
 
 $view .= '</div>';
@@ -261,18 +261,16 @@ $view .= '<div class="content-block">
                                     <th>'.$product_status.'</th>
                                     <th>'.$product_version_version.'</th>
                                     <th>'.($product_version_config ?? 'Config').'</th>
-                                    <th>'.$general_actions.'</th>
                                 </tr>
                             </thead>
                             <tbody>';
                     foreach ($product_versions as $version){
                     
-                      $view .= '<tr>
+                      $view .= '<tr onclick="window.location.href=\'index.php?page=products_versions&productrowid='.$_GET['rowID'].'&rowID='.$version->rowID.'\'" style="cursor: pointer;">
                                     <td>'.$version->rowID.'</td>
                                     <td>'.(($version->status == 1)? '<span class="status enabled">'.$prod_status_1:'<span class="status">'.$prod_status_0).'</td>
                                     <td>'.$version->version.'</td>
                                     <td>'.(!empty($version->config) ? ($general_yes ?? 'Y') : ($general_no ?? 'N')).'</td>
-                                    <td><a href="index.php?page=products_versions&productrowid='.$_GET['rowID'].'&rowID='.$version->rowID.'" class="btn_link">'.$general_view.'</a></td>
                                 </tr>';
                     }
                     $view .= '
@@ -301,17 +299,15 @@ if ($responses->configurable == 1){
                                     <th>'.($product_configuration_version ?? 'Config-version').'</th>
                                     <th>'.($product_configuration_assignment ?? 'Code').'</th>
                                     <th>'.($product_configuration_assignment ?? 'Name').'</th>
-                                    <th>'.$general_actions.'</th>
                                 </tr>
                             </thead>
                             <tbody>';
                     foreach ($products_configurations as $product_config){
                     
-                      $view .= '<tr>
+                      $view .= '<tr onclick="window.location.href=\'index.php?page=products_configurations&productrowid='.$_GET['rowID'].'&rowID='.$product_config['rowID'].'\'" style="cursor: pointer;">
                                     <td>'.$product_config['version'].'</td>
                                     <td>'.$product_config['assignment'].'</td>
                                     <td>'.(${$product_config['assignment_name']} ?? $product_config['assignment_name']).'</td>
-                                    <td><a href="index.php?page=products_configurations&productrowid='.$_GET['rowID'].'&rowID='.$product_config['rowID'].'" class="btn_link">'.$general_view.'</a></td>
                                 </tr>';
                     }
                     $view .= '
diff --git a/product_manage.php b/product_manage.php
index 59d96c3..832d21a 100644
--- a/product_manage.php
+++ b/product_manage.php
@@ -145,14 +145,14 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$product_h2.'</h2>
-        <a href="'.$url.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url.'" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/products.php b/products.php
index e9bb024..129b453 100644
--- a/products.php
+++ b/products.php
@@ -111,7 +111,6 @@ $view .= '
                     <th>'.$product_parttype.'</th>
                     <th class="responsive-hidden"></th>
                     <th>'.$product_name.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -128,7 +127,7 @@ $view .= '
                 foreach ($responses as $response){
                                            
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=product&rowID='.$response->rowID.'\'" style="cursor: pointer;">
                     <td>'.$response->productcode.'</td>
                     <td>'.${'part_type'.$response->parttype}.'</td>
                     <td>'.${'product_category'.$response->product_category}.'</td>
@@ -136,7 +135,6 @@ $view .= '
                         '.(($response->full_path !='')?'<img style="border-radius: 4px;height: 50px;" src="'.$response->full_path.'" alt="">' : '').'
                     </td>
                     <td>'.(${$response->productname} ?? $response->productname).'</td>
-                    <td><a href="index.php?page=product&rowID='.$response->rowID.'" class="btn_link">'.$general_view .'</a></td>
                 </tr>
                 ';
                 }
diff --git a/products_attributes.php b/products_attributes.php
index 77413a4..ee85fea 100644
--- a/products_attributes.php
+++ b/products_attributes.php
@@ -101,7 +101,6 @@ $view .= '
                     <th>'.($products_attribute_group_name_internal ?? 'Internal name').'</th>
                     <th>'.($products_attribute_group_type ?? 'type').'</th>
                     <th class="responsive-hidden">'.$general_created.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -117,14 +116,13 @@ $view .= '
             else {
                 foreach ($responses as $response){
                 $view .= '
-                <tr>  
+                <tr onclick="window.location.href=\'index.php?page=products_attributes_manage&rowID='.$response['rowID'].'\'" style="cursor: pointer;">  
                     <td>'.$response['group_id'].'</td>  
                     <td>'.${'general_status_'.$response['group_status']}.'</td>
                     <td>'.(${$response['group_name']} ?? $response['group_name']).'</td>
                     <td>'.(${$response['group_name_internal']} ?? $response['group_name_internal']).'</td>
                     <td>'.(${'general_form_'.$response['group_type']} ?? $response['group_type'] ).'</td>
                     <td class="responsive-hidden">'.getRelativeTime($response['created']).'</td>
-                    <td><a href="index.php?page=products_attributes_manage&rowID='.$response['rowID'].'" class="btn_link">'.$general_view .'</a></td>
                 </tr>';
 
                 
diff --git a/products_attributes_manage.php b/products_attributes_manage.php
index 30f7364..8767555 100644
--- a/products_attributes_manage.php
+++ b/products_attributes_manage.php
@@ -162,14 +162,14 @@ $view .='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($products_attributes_h2 ?? '').'</h2>
-        <a href="index.php?page=products_attributes" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=products_attributes" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this variable?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this variable?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/products_configurations.php b/products_configurations.php
index 77c5de9..a736d21 100644
--- a/products_configurations.php
+++ b/products_configurations.php
@@ -127,14 +127,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($product_configuration ?? 'Product configuration').'</h2>
-        <a href="index.php?page=product&rowID='.$productrowid.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=product&rowID='.$productrowid.'" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/products_software.php b/products_software.php
index 0c69d6a..8211b86 100644
--- a/products_software.php
+++ b/products_software.php
@@ -174,14 +174,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$product_version_software.'</h2>
-        <a href="index.php?page=product&rowID='.$productrowid.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=product&rowID='.$productrowid.'" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/products_software_upgrade_paths_manage.php b/products_software_upgrade_paths_manage.php
index 88acf7a..46f3ca8 100644
--- a/products_software_upgrade_paths_manage.php
+++ b/products_software_upgrade_paths_manage.php
@@ -164,10 +164,10 @@ $view ='
 ';
 
 if ($delete_allowed === 1 && isset($_GET['id'])){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this upgrade path?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this upgrade path?\')">';
 }
 if (($update_allowed === 1 && isset($_GET['id'])) || ($create_allowed === 1 && !isset($_GET['id']))){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
 
 $view .= '</div>';
diff --git a/products_software_version.php b/products_software_version.php
index 6179792..b4da2e4 100644
--- a/products_software_version.php
+++ b/products_software_version.php
@@ -85,8 +85,8 @@ $view = '
         </div>
     </div>
     <div class="action">
-        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">'.$button_cancel.'</a>
-        '.($update_allowed_edit ? '<a href="index.php?page=products_software_version_manage&id='.$responses->rowID.'" class="btn">Edit</a>' : '').'
+        <a href="index.php?page='.$_SESSION['origin'].'&p='.$_SESSION['p'].'" class="btn alt mar-right-2">←</a>
+        '.($update_allowed_edit ? '<a href="index.php?page=products_software_version_manage&id='.$responses->rowID.'" class="btn">✏️</a>' : '').'
     </div>
 </div>
 
diff --git a/products_software_version_manage.php b/products_software_version_manage.php
index 598e062..02cb4da 100644
--- a/products_software_version_manage.php
+++ b/products_software_version_manage.php
@@ -123,10 +123,10 @@ $view ='
 ';
 
 if ($delete_allowed === 1 && isset($_GET['id'])){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this software version?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this software version?\')">';
 }
 if (($update_allowed === 1 && isset($_GET['id'])) || ($create_allowed === 1 && !isset($_GET['id']))){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/products_versions.php b/products_versions.php
index 598ecd9..f1b6e0d 100644
--- a/products_versions.php
+++ b/products_versions.php
@@ -96,14 +96,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$product_version_version.'</h2>
-        <a href="index.php?page=product&rowID='.$productrowid.'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=product&rowID='.$productrowid.'" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this product?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/profile.php b/profile.php
index f9e9d1b..66aa7ab 100644
--- a/profile.php
+++ b/profile.php
@@ -83,10 +83,10 @@ $view ='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$user_h2.'</h2>
-        <a href="index.php?page=dasboard" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=dasboard" class="btn alt mar-right-2">←</a>
 ';
 if ($update_allowed === 1 && $_SESSION['permission'] != 0){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/profiles.php b/profiles.php
index 6ae0f1d..e2ddf85 100644
--- a/profiles.php
+++ b/profiles.php
@@ -122,7 +122,7 @@ $view .= '
 
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">Profiles</h2>
-        <input type="submit" name="submit" value="Save" class="btn">
+        <input type="submit" name="submit" value="💾+" class="btn">
     </div>
 ';
 
diff --git a/report_contracts_billing.php b/report_contracts_billing.php
index ea1021d..cc31836 100644
--- a/report_contracts_billing.php
+++ b/report_contracts_billing.php
@@ -15,7 +15,7 @@ $page = $_SESSION['origin'] = 'report_contracts_billing';
 $prev_page = ($_SESSION['origin'] == 'equipments') ? $_SESSION['prev_origin_equipment'] : (($_SESSION['origin'] == 'account')? $_SESSION['prev_origin'] :'');
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -158,7 +158,6 @@ $view .= '
               <th>'.$contract_service_2.'</th>
               <th>'.$contract_overrun.'</th>
               <th>'.$contract_reference.'</th>
-              <th>'.$general_actions.'</th>
           </tr>
       </thead>
     <tbody>
@@ -175,7 +174,7 @@ $view .= '
                 foreach ($responses as $response){    
 
                     $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=contract&rowID='.$response['#'].'\'" style="cursor: pointer;">
                         <td>'.$response['#'].'</td>
                         <td>'.(($response['Status'] == $contract_status1)? '<span class="status enabled">'.$response['Status']: (($response['Status'] == $contract_status3) ? '<span class="status disabled">'.$response['Status'] : '<span class="status">'.$response['Status'])).'</span></td>
                         <td>'.$response['Account'].'</td>
@@ -188,7 +187,6 @@ $view .= '
                         <td>'.$response['Contracted'].' </td>
                         <td><span class="status '.(($response['Deviation'] < 100) ? 'enabled' : 'disabled').'">'.$response['Deviation'].'</span></td>
                         <td>'.$response['Period'].'</td>
-                        <td><a href="index.php?page=contract&rowID='.$response['#'].'" class="btn_link">'.$general_view .'</a></td>
                     </tr>
                     ';  
                 }
diff --git a/report_healthindex.php b/report_healthindex.php
index 4002fd4..c9c4f5c 100644
--- a/report_healthindex.php
+++ b/report_healthindex.php
@@ -14,7 +14,7 @@ $prev_page = $_SESSION['prev_origin'] ?? '';
 $page = $_SESSION['origin'] = 'report_healthindex';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -164,7 +164,6 @@ $view .= '
                     <th class="responsive-hidden"></th>  
                     <th class="responsive-hidden">'.$general_soldto.'</th>
                     <th class="responsive-hidden">'.$general_shipto.'</th>
-                    <th>'.$view_asset_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -190,7 +189,7 @@ $shipto = getPartnerName($partner_data->shipto) ?? $not_specified;
 $picture = glob("./assets/images/products/".$response->productcode.".{jpg,jpeg,png,gif}", GLOB_BRACE);
 $indicators = overviewIndicators($response->warranty_date,$response->service_date,$response->sw_version,$response->hw_version);
 
-$view .= '<tr>
+$view .= '<tr onclick="window.location.href=\'index.php?page=equipment&equipmentID='.$response->equipmentid.'\'" style="cursor: pointer;">
             <td class="responsive-hidden"><span class="status '.(($response->healthindex >= 85) ?'enabled' : (($response->healthindex <= 50)? 'disabled' : 'id2')).'">'.$response->healthindex.'</span></td>
             <td class="responsive-hidden">'.$indicators.'</td>
             <td>'.$response->serialnumber.'</td>
@@ -205,7 +204,7 @@ $view .= '  <td class="responsive-hidden">';
 $view .= ' </td>
             <td class="responsive-hidden">'.$soldto.'</td>
             <td class="responsive-hidden">'.$shipto.'</td>
-            <td><a href="index.php?page=equipment&equipmentID='.$response->equipmentid.'" class="btn_link">'.$general_view .'</a></td>
+
         </tr>
       ';
  }
diff --git a/rma.php b/rma.php
index 26e710f..9457f52 100644
--- a/rma.php
+++ b/rma.php
@@ -69,11 +69,11 @@ template_header('RMA', 'rma','manage');
 $view = '
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($rma_h2 ?? 'Return Material Request').' - '.$_GET['rowID'].'</h2>
-        <a href="index.php?page=rmas" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=rmas" class="btn alt mar-right-2">←</a>
 ';
 
 if ($update_allowed === 1){
-    $view .= '<a href="index.php?page=rma_manage&rowID='.$_GET['rowID'].'" class="btn">Edit</a>';
+    $view .= '<a href="index.php?page=rma_manage&rowID='.$_GET['rowID'].'" class="btn">✏️</a>';
 }
      
 $view .= '</div>';
@@ -126,7 +126,7 @@ $view .= '  <div class="content-block order-details">
                 $view .='
                     <div class="order-detail">
                         <h3>'.$servicereport_details.'</h3>
-                        <p><a href="index.php?page=servicereport&equipmentID='.$rma_questions['equipmentID'].'&historyID='.$rma_questions['historyID'].'" class="btn_link">'.$general_view.'</a></p>   
+                        <p><span onclick="window.location.href=\'index.php?page=servicereport&equipmentID='.$rma_questions['equipmentID'].'&historyID='.$rma_questions['historyID'].'\'" style="cursor: pointer;" class="btn_link">'.$general_view.'</span></p>   
                     </div>  
                 ';
                 }
diff --git a/rma_manage.php b/rma_manage.php
index 6968970..b092fe0 100644
--- a/rma_manage.php
+++ b/rma_manage.php
@@ -228,11 +228,11 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100"><?=$page?>'.($rma_h2 ?? 'Return Material Request').'</h2>
-        <a href="'.$url .'" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="'.$url .'" class="btn alt mar-right-2">←</a>
     ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this request?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this request?\')">';
 }
 if ($update_allowed === 1){
     $view .= '<input type="submit" name="save" value="Save" class="btn">';
diff --git a/rmas.php b/rmas.php
index a2233c1..2a0c6ef 100644
--- a/rmas.php
+++ b/rmas.php
@@ -123,7 +123,6 @@ $view .= '
                     <th>'.$general_created.'</th>
                     <th>'.$general_createdby.'</th>
                     <th>'.$general_updated.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -144,13 +143,12 @@ $view .= '
                     $status_text = 'rma_status'.$response['status'].'_text';
                 
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=rma&rowID='.$response['rowID'].'\'" style="cursor: pointer;">
                     <td class="responsive-hidden">'.$response['rowID'].'</td>
                     <td>'.$$status_text.'</td>
                     <td>'.getRelativeTime($response['created']).'</td>
                     <td>'.$response['createdby'].'</td>
                     <td>'.getRelativeTime($response['updated']).'</td>
-                    <td><a href="index.php?page=rma&rowID='.$response['rowID'].'" class="btn_link">'.$general_view.'</a></td>
                 </tr>
                 ';
                 }
diff --git a/servicereport.php b/servicereport.php
index 3733d4c..af91735 100644
--- a/servicereport.php
+++ b/servicereport.php
@@ -15,7 +15,7 @@ $prev_page = (isset($_SESSION['origin']) && $_SESSION['origin'] == 'equipments')
 $page = 'servicereport';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 
 //Check if allowed
@@ -44,6 +44,7 @@ $view = '
         </div>
     </div>
     '.$back_btn_orgin.'
+    <a href="index.php?page=render_service_report&historyID='.$_GET['historyID'].'" class="btn"><i class="fa-solid fa-file-pdf"></i></a>
 </div>';
 
 //Get all related service events
@@ -59,6 +60,7 @@ if (empty($history)){
 $view .= '<div class="content-block">
     <div class="block-header">
         <i class="fa-solid fa-bars fa-sm"></i>'.$servicereport_details.' - '.$_GET['historyID'].'
+        <a href="index.php?page=render_service_report&historyID='.$_GET['historyID'].'" class="btn">&#xf1c1;</a>
     </div>
     '.$service_events.'
 </div>
diff --git a/servicereports.php b/servicereports.php
index 7bc35c8..2dbf311 100644
--- a/servicereports.php
+++ b/servicereports.php
@@ -16,7 +16,7 @@ $prev_page = ((isset($_SESSION['prev_origin_equipment'])) ? $_SESSION['prev_orig
 $page = $_SESSION['origin'] = 'servicereports';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
diff --git a/settings.php b/settings.php
index aeb6764..b6b5cce 100644
--- a/settings.php
+++ b/settings.php
@@ -132,7 +132,7 @@ $view .= '
 
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">Settings</h2>
-        <input type="submit" name="submit" value="Save" class="btn">
+        <input type="submit" name="submit" value="💾+" class="btn">
     </div>
 ';
 
diff --git a/shipping.php b/shipping.php
index 7da0d7f..16982bc 100644
--- a/shipping.php
+++ b/shipping.php
@@ -96,7 +96,6 @@ $view .= '
                     <td class="responsive-hidden">'.($shipping_price ?? 'Price Range').'</td>
                     <td class="responsive-hidden">'.($shipping_weight ?? 'Weight Range').'</td>
                     <td>'.($shipping_price_total ?? 'Total price').'</td>
-                    <td>'.$general_actions.'</td>
                 </tr>
             </thead>
             <tbody>';
@@ -117,15 +116,14 @@ $view .= '
                         }
 
                         $view .= '
-                        <tr>
+                        <tr onclick="window.location.href=\'index.php?page=shipping_manage&id='.$shipment['id'].'\'" style="cursor: pointer;">
                             <td>'.$shipment['id'].'</td>
                             <td>'.$shipment['name'].'</td>
                             <td>'.($shipment['type'] == 0 ? ($shipping_type_standard ?? 'Standard' ) : ($shipping_type_express ?? 'Express')).'</td>
                             <td class="responsive-hidden" style="max-width:300px">'.$shipping_countries.'</td>
-                            <td class="responsive-hidden">'.number_format($shipment['price_from'], 2).' - '.number_format($shipment['price_to'], 2).'</td>
+                            <td class="responsive-hidden">'.number_format($shipment['price_from'], 2).' - '.number_format($shipment['price_to'], 2).' kg</td>
                             <td class="responsive-hidden">'.number_format($shipment['weight_from'], 2).' kg - '.number_format($shipment['weight_to'], 2).' kg</td>
                             <td><?=currency_code?>'.number_format($shipment['price'], 2).'</td>
-                            <td><a href="index.php?page=shipping_manage&id='.$shipment['id'].'" class="btn_link">'.$general_view.'</a></td>
                         </tr>';
                     }
                 }
diff --git a/shipping_manage.php b/shipping_manage.php
index ffc2ebd..0e279f8 100644
--- a/shipping_manage.php
+++ b/shipping_manage.php
@@ -97,14 +97,14 @@ $view ='
 <form action="" method="post" enctype="multipart/form-data">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($shipping_h2 ?? 'shipping').'</h2>
-        <a href="index.php?page=shipping" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=shipping" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this shipping?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this shipping?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/style/admin.css b/style/admin.css
index 641daef..a616525 100644
--- a/style/admin.css
+++ b/style/admin.css
@@ -15,7 +15,7 @@
 * {
   box-sizing: border-box;
   font-family: -apple-system, BlinkMacSystemFont, "segoe ui", roboto, oxygen, ubuntu, cantarell, "fira sans", "droid sans", "helvetica neue", Arial, sans-serif;
-  font-size: 16px;
+  font-size: 12px;
 }
 
 html {
@@ -138,7 +138,6 @@ aside h1 {
 
 aside > a {
   font-size: 14px;
-  font-weight: 600;
   text-decoration: none;
   color: var( --text-color-accent-2);
   padding: 15px 20px;
@@ -228,15 +227,13 @@ main.full {
 }
 
 main h2 {
-  font-size: 20px;
+  font-size: 18px;
   padding-bottom: 20px;
-  font-weight: 600;
 }
 
 main h2 span {
-  font-size: 16px;
+  font-size: 14px;
   margin-left: 5px;
-  font-weight: 600;
   color: #959faf;
 }
 
@@ -265,9 +262,9 @@ main .content-title .title i {
   align-items: center;
   background-color: var(--color-green);
   color: var(--color-white);
-  width: 52px;
-  height: 42px;
-  border-radius: 4px;
+  width: 40px;
+  height: 40px;
+  border-radius: 3px;
   margin-right: 12px;
 }
 
@@ -284,6 +281,7 @@ main .content-title .title p {
   font-size: 14px;
   color: var( --text-color-accent-2);
   font-weight: 500;
+  display: none;
 }
 
 main .msg {
@@ -1256,7 +1254,7 @@ background-color: var(--color-indicator-1);
   background: var(--color-green);
   color: var(--color-white);
   padding: 0 14px;
-  font-size: 14px;
+  font-size: 12px;
   font-weight: 600;
   border-radius: 4px;
   height: 38px;
@@ -1283,17 +1281,6 @@ background-color: var(--color-indicator-1);
   font-style: italic;
 }
 
-a.btn:after{
-  content: ' ';
-  display: inline-block;
-  border-bottom: 1px solid var(--color-white);
-  border-right: 1px solid var(--color-white);
-  height: 8px;
-  width: 8px;
-  transform: rotate(-45deg);
-  margin-left: 1rem;
-}
-
 .btn_link {
   display: inline-flex;
   align-items: center;
diff --git a/tax.php b/tax.php
index d616b08..1aa1be9 100644
--- a/tax.php
+++ b/tax.php
@@ -47,9 +47,9 @@ if (isset($_GET['id'])) {
         <h2 class="responsive-width-100"><?=$page?> Tax</h2>
         <a href="index.php?page=taxes" class="btn alt mar-right-2">Cancel</a>
         <?php if ($page == 'Edit'): ?>
-        <input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm('Are you sure you want to delete this tax?')">
+        <input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm('Are you sure you want to delete this tax?')">
         <?php endif; ?>
-        <input type="submit" name="submit" value="Save" class="btn">
+        <input type="submit" name="submit" value="💾+" class="btn">
     </div>
 
     <div class="content-block">
diff --git a/translation_manage.php b/translation_manage.php
index 2d4e89c..d2a41ec 100644
--- a/translation_manage.php
+++ b/translation_manage.php
@@ -167,14 +167,14 @@ $view .='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.($text_variables_h2 ?? '').'</h2>
-        <a href="index.php?page=translations" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=translations" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this variable?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this variable?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/translations.php b/translations.php
index 6afcc0a..8c8f0ca 100644
--- a/translations.php
+++ b/translations.php
@@ -97,7 +97,6 @@ $view .= '
                     <th>'.($text_variable_rowID ?? '').'</th>
                     <th>'.($text_variable_variable ?? '').'</th>
                     <th class="responsive-hidden">'.$general_created.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -113,11 +112,10 @@ $view .= '
             else {
                 foreach ($responses as $response){
                 $view .= '
-                <tr>  
+                <tr onclick="window.location.href=\'index.php?page=translation_manage&rowID='.$response['rowID'].'\'" style="cursor: pointer;">  
                     <td>'.$response['rowID'].'</td>  
                     <td>'.$response['variable'].'</td>
                     <td class="responsive-hidden">'.getRelativeTime($response['created']).'</td>
-                    <td><a href="index.php?page=translation_manage&rowID='.$response['rowID'].'" class="btn_link">'.$general_view .'</a></td>
                 </tr>';
 
                 
diff --git a/user.php b/user.php
index 9614f78..6b6d64d 100644
--- a/user.php
+++ b/user.php
@@ -171,14 +171,14 @@ $view .='
 <form action="" method="post">
     <div class="content-title responsive-flex-wrap responsive-pad-bot-3">
         <h2 class="responsive-width-100">'.$user_h2.': '.$user['username'].' '.(($user['login_count'] > 4)? '<span class="status disabled">'.$User_block:(($user['userkey'] &&  $user['userkey'] !='')? '<span class="status enabled">'.$enabled:'<span class="status">'.$disabled)).'</h2>
-        <a href="index.php?page=users" class="btn alt mar-right-2">'.$button_cancel.'</a>
+        <a href="index.php?page=users" class="btn alt mar-right-2">←</a>
 ';
 
 if ($delete_allowed === 1){
-    $view .= '<input type="submit" name="delete" value="Delete" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this user?\')">';
+    $view .= '<input type="submit" name="delete" value="X" class="btn red mar-right-2" onclick="return confirm(\'Are you sure you want to delete this user?\')">';
 }
 if ($update_allowed === 1){
-    $view .= '<input type="submit" name="submit" value="Save" class="btn">';
+    $view .= '<input type="submit" name="submit" value="💾+" class="btn">';
 }
    
 $view .= '</div>';
diff --git a/users.php b/users.php
index a22f749..589d9be 100644
--- a/users.php
+++ b/users.php
@@ -15,7 +15,7 @@ $prev_page = (isset($_SESSION['origin']) && $_SESSION['origin'] == 'equipments')
 $page = 'users';
 
 //create backbutton to prev_origin
-$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">'.$button_back.'</a>':'';
+$back_btn_orgin =  ($prev_page != '')? '<a href="'.$prev_page.'" class="btn alt mar-right-2">←</a>':'';
 
 //Check if allowed
 if (isAllowed($page,$_SESSION['profile'],$_SESSION['permission'],'R') === 0){
@@ -125,7 +125,6 @@ $view .= '
                     <th>'.$User_permission.'</th>
                     <th>'.$User_profile.'</th>
                     <th class="responsive-hidden">'.$User_lastlogin.'</th>
-                    <th>'.$general_actions.'</th>
                 </tr>
             </thead>
             <tbody>
@@ -148,7 +147,7 @@ $view .= '
 
                 $permission_user = 'permission'.$response->view;
                 $view .= ' 
-                    <tr>
+                    <tr onclick="window.location.href=\'index.php?page=user&id='.$response->id.'\'" style="cursor: pointer;">
                     <td class="responsive-hidden"></td>
                     <td class="responsive-hidden">'.(($response->login_count > 4)? '<span class="status disabled">'.$User_block:(($response->userkey &&  $response->userkey !='')? '<span class="status enabled">'.$enabled:'<span class="status">'.$disabled)).'</td>
                     <td class="responsive-hidden">'.(($response->service &&  $response->service !='')? '<span class="status enabled">'.$enabled:'<span class="status">'.$disabled).'</td>
@@ -157,7 +156,6 @@ $view .= '
                     <td>'.$$permission_user.'</td>
                     <td>'.$response->settings.'</td>
                     <td class="responsive-hidden">'.getRelativeTime($response->lastlogin).'</td>
-                    <td><a href="index.php?page=user&id='.$response->id.'" class="btn_link">'.$general_view .'</a></td>
                 </tr>
                 ';
                 }