diff --git a/app/Ninja/Repositories/InvoiceRepository.php b/app/Ninja/Repositories/InvoiceRepository.php
index 44ce5d4c9a4c..7bcf9c710e53 100644
--- a/app/Ninja/Repositories/InvoiceRepository.php
+++ b/app/Ninja/Repositories/InvoiceRepository.php
@@ -144,7 +144,7 @@ class InvoiceRepository extends BaseRepository
         if ((isset($data['set_default_terms']) && $data['set_default_terms'])
             || (isset($data['set_default_footer']) && $data['set_default_footer'])) {
             if (isset($data['set_default_terms']) && $data['set_default_terms']) {
-                $account->{"{$entityType}_terms"} = trim($data['terms']);
+                $account->{"{$invoice->getEntityType()}_terms"} = trim($data['terms']);
             }
             if (isset($data['set_default_footer']) && $data['set_default_footer']) {
                 $account->invoice_footer = trim($data['invoice_footer']);
diff --git a/public/js/built.js b/public/js/built.js
index 7e1ea06b3edf..06371208b549 100644
--- a/public/js/built.js
+++ b/public/js/built.js
@@ -31571,6 +31571,16 @@ function truncate(string, length){
       return string;
    }
 };
+
+function actionListHandler() {
+    $('tbody tr').mouseover(function() {
+        $(this).closest('tr').find('.tr-action').css('display', 'inline-block');
+        $(this).closest('tr').find('.tr-status').css('display', 'none');
+    }).mouseout(function() {
+        $(this).closest('tr').find('.tr-action').css('display', 'none');
+        $(this).closest('tr').find('.tr-status').css('display', 'inline-block');
+    });
+}
 var NINJA = NINJA || {};
 
 NINJA.TEMPLATES = {
diff --git a/public/js/script.js b/public/js/script.js
index da30e0d4c4ac..98970a373ecb 100644
--- a/public/js/script.js
+++ b/public/js/script.js
@@ -1692,4 +1692,14 @@ function truncate(string, length){
    } else {
       return string;
    }
-};
\ No newline at end of file
+};
+
+function actionListHandler() {
+    $('tbody tr').mouseover(function() {
+        $(this).closest('tr').find('.tr-action').css('display', 'inline-block');
+        $(this).closest('tr').find('.tr-status').css('display', 'none');
+    }).mouseout(function() {
+        $(this).closest('tr').find('.tr-action').css('display', 'none');
+        $(this).closest('tr').find('.tr-status').css('display', 'inline-block');
+    });
+}
\ No newline at end of file
diff --git a/resources/lang/en/texts.php b/resources/lang/en/texts.php
index 5d0993ebad58..c528f6f98674 100644
--- a/resources/lang/en/texts.php
+++ b/resources/lang/en/texts.php
@@ -911,6 +911,7 @@ return array(
 
     'before' => 'Before',
     'after' => 'After',
+    'reset_terms_help' => 'Reset to the default account terms',
+    'reset_footer_help' => 'Reset to the default account footer',
 
-    
 );
diff --git a/resources/views/accounts/api_tokens.blade.php b/resources/views/accounts/api_tokens.blade.php
index d9e4b4498bee..efbd41e283e1 100644
--- a/resources/views/accounts/api_tokens.blade.php
+++ b/resources/views/accounts/api_tokens.blade.php
@@ -37,21 +37,14 @@
       ->render('datatable') !!}
 
   <script>
-  window.onDatatableReady = function() {
-    $('tbody tr').mouseover(function() {
-      $(this).closest('tr').find('.tr-action').css('visibility','visible');
-    }).mouseout(function() {
-      $dropdown = $(this).closest('tr').find('.tr-action');
-      if (!$dropdown.hasClass('open')) {
-        $dropdown.css('visibility','hidden');
-      }
-    });
-  }
+
+    window.onDatatableReady = actionListHandler;
 
     function setTrashVisible() {
         var checked = $('#trashed').is(':checked');
         window.location = '{!! URL::to('view_archive/token') !!}' + (checked ? '/true' : '/false');
     }
+    
   </script>
 
 @stop
diff --git a/resources/views/accounts/payments.blade.php b/resources/views/accounts/payments.blade.php
index 096d29fb0541..18ae1a638b97 100644
--- a/resources/views/accounts/payments.blade.php
+++ b/resources/views/accounts/payments.blade.php
@@ -27,16 +27,7 @@
       ->render('datatable') !!}
 
   <script>
-  window.onDatatableReady = function() {
-    $('tbody tr').mouseover(function() {
-      $(this).closest('tr').find('.tr-action').css('visibility','visible');
-    }).mouseout(function() {
-      $dropdown = $(this).closest('tr').find('.tr-action');
-      if (!$dropdown.hasClass('open')) {
-        $dropdown.css('visibility','hidden');
-      }
-    });
-  }
-  </script>
+    window.onDatatableReady = actionListHandler;
+  </script>  
 
 @stop
\ No newline at end of file
diff --git a/resources/views/accounts/products.blade.php b/resources/views/accounts/products.blade.php
index a44a6292c591..03a465413fe5 100644
--- a/resources/views/accounts/products.blade.php
+++ b/resources/views/accounts/products.blade.php
@@ -42,16 +42,7 @@
       ->render('datatable') !!}
 
   <script>
-  window.onDatatableReady = function() {        
-    $('tbody tr').mouseover(function() {
-      $(this).closest('tr').find('.tr-action').css('visibility','visible');
-    }).mouseout(function() {
-      $dropdown = $(this).closest('tr').find('.tr-action');
-      if (!$dropdown.hasClass('open')) {
-        $dropdown.css('visibility','hidden');
-      }     
-    });
-  }
+    window.onDatatableReady = actionListHandler;
   </script>  
 
 
diff --git a/resources/views/accounts/tax_rates.blade.php b/resources/views/accounts/tax_rates.blade.php
index 09df9b04dad4..2079d72f2155 100644
--- a/resources/views/accounts/tax_rates.blade.php
+++ b/resources/views/accounts/tax_rates.blade.php
@@ -65,16 +65,7 @@
       ->render('datatable') !!}
 
   <script>
-  window.onDatatableReady = function() {        
-    $('tbody tr').mouseover(function() {
-      $(this).closest('tr').find('.tr-action').css('visibility','visible');
-    }).mouseout(function() {
-      $dropdown = $(this).closest('tr').find('.tr-action');
-      if (!$dropdown.hasClass('open')) {
-        $dropdown.css('visibility','hidden');
-      }     
-    });
-  } 
+    window.onDatatableReady = actionListHandler;
   </script>  
 
 
diff --git a/resources/views/accounts/user_management.blade.php b/resources/views/accounts/user_management.blade.php
index ed63482f8ae5..f3930c677338 100644
--- a/resources/views/accounts/user_management.blade.php
+++ b/resources/views/accounts/user_management.blade.php
@@ -34,16 +34,8 @@
       ->render('datatable') !!}
 
   <script>
-  window.onDatatableReady = function() {
-    $('tbody tr').mouseover(function() {
-      $(this).closest('tr').find('.tr-action').css('visibility','visible');
-    }).mouseout(function() {
-      $dropdown = $(this).closest('tr').find('.tr-action');
-      if (!$dropdown.hasClass('open')) {
-        $dropdown.css('visibility','hidden');
-      }
-    });
-  }
+    
+    window.onDatatableReady = actionListHandler;
 
     function setTrashVisible() {
         var checked = $('#trashed').is(':checked');
diff --git a/resources/views/invoices/edit.blade.php b/resources/views/invoices/edit.blade.php
index fd6d654a68cc..e48c42c11b01 100644
--- a/resources/views/invoices/edit.blade.php
+++ b/resources/views/invoices/edit.blade.php
@@ -251,7 +251,9 @@
                                         <label>
                                             <input name="set_default_terms" type="checkbox" style="width: 24px" data-bind="checked: set_default_terms"/>'.trans('texts.save_as_default_terms').'
                                         </label>
-                                        <div class="pull-right"><a href="#" onclick="return resetTerms()">' . trans("texts.reset_terms") . '</a></div>
+                                        <div class="pull-right" data-bind="visible: showResetTerms()">
+                                            <a href="#" onclick="return resetTerms()" title="'. trans('texts.reset_terms_help') .'">' . trans("texts.reset_terms") . '</a>
+                                        </div>
                                     </div>') !!}
                         </div>
                         <div role="tabpanel" class="tab-pane" id="footer">
@@ -261,7 +263,9 @@
                                         <label>
                                             <input name="set_default_footer" type="checkbox" style="width: 24px" data-bind="checked: set_default_footer"/>'.trans('texts.save_as_default_footer').'
                                         </label>
-                                        <div class="pull-right"><a href="#" onclick="return resetFooter()">' . trans("texts.reset_footer") . '</a></div>
+                                        <div class="pull-right" data-bind="visible: showResetFooter()">
+                                            <a href="#" onclick="return resetFooter()" title="'. trans('texts.reset_footer_help') .'">' . trans("texts.reset_footer") . '</a>
+                                        </div>
                                     </div>') !!}
                         </div>
                     </div>
diff --git a/resources/views/invoices/knockout.blade.php b/resources/views/invoices/knockout.blade.php
index 4bf11e84cc8f..a66c2fcfe135 100644
--- a/resources/views/invoices/knockout.blade.php
+++ b/resources/views/invoices/knockout.blade.php
@@ -514,6 +514,14 @@ function InvoiceModel(data) {
     self.onDragged = function(item) {
         refreshPDF(true);
     }
+
+    self.showResetTerms = function() {
+        return self.default_terms() && self.terms() != self.default_terms();
+    }
+
+    self.showResetFooter = function() {
+        return self.default_footer() && self.invoice_footer() != self.default_footer();
+    }
 }
 
 function ClientModel(data) {
diff --git a/resources/views/list.blade.php b/resources/views/list.blade.php
index 7bed68513938..63efac9b5998 100644
--- a/resources/views/list.blade.php
+++ b/resources/views/list.blade.php
@@ -134,21 +134,8 @@
                 }
             });
 
-            $('tbody tr').mouseover(function() {
-                $(this).closest('tr').find('.tr-action').css('display', 'inline-block');
-                $(this).closest('tr').find('.tr-status').css('display', 'none');
-            }).mouseout(function() {
-                //$(this).closest('tr').find('.tr-action').css('display', 'none');
-                
-                $dropdown = $(this).closest('tr').find('.tr-action');
-                if (!$dropdown.hasClass('open')) {
-                    $dropdown.css('display', 'none');
-                    $(this).closest('tr').find('.tr-status').css('display', 'inline-block');
-                }
-                
-            });
-
-        }   
+            actionListHandler();
+        }
 
         $('.archive, .invoice').prop('disabled', true);
         $('.archive:not(.dropdown-toggle)').click(function() {