diff --git a/BTCPayServer/Controllers/AppsController.PointOfSale.cs b/BTCPayServer/Controllers/AppsController.PointOfSale.cs
index ae2eeefeb..d348bddd8 100644
--- a/BTCPayServer/Controllers/AppsController.PointOfSale.cs
+++ b/BTCPayServer/Controllers/AppsController.PointOfSale.cs
@@ -55,12 +55,16 @@ namespace BTCPayServer.Controllers
                     "  custom: true";
                 EnableShoppingCart = false;
                 ShowCustomAmount = true;
+                ShowDiscount = true;
+                EnableTips = true;
             }
             public string Title { get; set; }
             public string Currency { get; set; }
             public string Template { get; set; }
             public bool EnableShoppingCart { get; set; }
             public bool ShowCustomAmount { get; set; }
+            public bool ShowDiscount { get; set; }
+            public bool EnableTips { get; set; }
 
             public const string BUTTON_TEXT_DEF = "Buy for {0}";
             public string ButtonText { get; set; } = BUTTON_TEXT_DEF;
@@ -89,6 +93,8 @@ namespace BTCPayServer.Controllers
                 Title = settings.Title,
                 EnableShoppingCart = settings.EnableShoppingCart,
                 ShowCustomAmount = settings.ShowCustomAmount,
+                ShowDiscount = settings.ShowDiscount,
+                EnableTips = settings.EnableTips,
                 Currency = settings.Currency,
                 Template = settings.Template,
                 ButtonText = settings.ButtonText ?? PointOfSaleSettings.BUTTON_TEXT_DEF,
@@ -160,6 +166,8 @@ namespace BTCPayServer.Controllers
                 Title = vm.Title,
                 EnableShoppingCart = vm.EnableShoppingCart,
                 ShowCustomAmount = vm.ShowCustomAmount,
+                ShowDiscount = vm.ShowDiscount,
+                EnableTips = vm.EnableTips,
                 Currency = vm.Currency.ToUpperInvariant(),
                 Template = vm.Template,
                 ButtonText = vm.ButtonText,
diff --git a/BTCPayServer/Controllers/AppsPublicController.cs b/BTCPayServer/Controllers/AppsPublicController.cs
index 9cf5f3bba..2f7049d5f 100644
--- a/BTCPayServer/Controllers/AppsPublicController.cs
+++ b/BTCPayServer/Controllers/AppsPublicController.cs
@@ -62,6 +62,8 @@ namespace BTCPayServer.Controllers
                 Step = step.ToString(CultureInfo.InvariantCulture),
                 EnableShoppingCart = settings.EnableShoppingCart,
                 ShowCustomAmount = settings.ShowCustomAmount,
+                ShowDiscount = settings.ShowDiscount,
+                EnableTips = settings.EnableTips,
                 CurrencyCode = settings.Currency,
                 CurrencySymbol = numberFormatInfo.CurrencySymbol,
                 CurrencyInfo = new ViewPointOfSaleViewModel.CurrencyInfoData()
diff --git a/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs b/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs
index 8f1c9a937..70366c251 100644
--- a/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs
+++ b/BTCPayServer/Models/AppViewModels/UpdatePointOfSaleViewModel.cs
@@ -17,6 +17,10 @@ namespace BTCPayServer.Models.AppViewModels
         public bool EnableShoppingCart { get; set; }
         [Display(Name = "User can input custom amount")]
         public bool ShowCustomAmount { get; set; }
+        [Display(Name = "User can input discount in %")]
+        public bool ShowDiscount { get; set; }
+        [Display(Name = "Enable tips")]
+        public bool EnableTips { get; set; }
         public string Example1 { get; internal set; }
         public string Example2 { get; internal set; }
         public string ExampleCallback { get; internal set; }
diff --git a/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs b/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs
index 802d74a9c..9d87769e2 100644
--- a/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs
+++ b/BTCPayServer/Models/AppViewModels/ViewPointOfSaleViewModel.cs
@@ -36,6 +36,8 @@ namespace BTCPayServer.Models.AppViewModels
 
         public bool EnableShoppingCart { get; set; }
         public bool ShowCustomAmount { get; set; }
+        public bool ShowDiscount { get; set; }
+        public bool EnableTips { get; set; }
         public string Step { get; set; }
         public string Title { get; set; }
         public Item[] Items { get; set; }
diff --git a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
index f7897f382..4ef85cad5 100644
--- a/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
+++ b/BTCPayServer/Views/Apps/UpdatePointOfSale.cshtml
@@ -57,6 +57,14 @@
                         <label asp-for="ShowCustomAmount"></label>
                         <input asp-for="ShowCustomAmount" type="checkbox" class="form-check" />
                     </div>
+                    <div class="form-group">
+                        <label asp-for="ShowDiscount"></label>
+                        <input asp-for="ShowDiscount" type="checkbox" class="form-check" />
+                    </div>
+                    <div class="form-group">
+                        <label asp-for="EnableTips"></label>
+                        <input asp-for="EnableTips" type="checkbox" class="form-check" />
+                    </div>
                     <div class="form-group">
                         <label asp-for="ButtonText" class="control-label"></label>*
                         <input asp-for="ButtonText" class="form-control" />
diff --git a/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml b/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
index 6e6369088..b7e58a1fe 100644
--- a/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
+++ b/BTCPayServer/Views/AppsPublic/ViewPointOfSale.cshtml
@@ -93,6 +93,8 @@
         </div>
     </td>
 </tr>
+@if (Model.ShowDiscount)
+{
 <tr>
     <td colspan="5" class="border-top-0">
         <div class="input-group">
@@ -106,9 +108,12 @@
         </div>
     </td>
 </tr>
+}
 </script>
 
 <script id="template-cart-tip" type="text/template">
+@if (Model.EnableTips)
+{
 <tr class="h5">
     <td colspan="5" class="border-top-0 pt-4">@Model.CustomTipText</td>
 </tr>
@@ -135,6 +140,7 @@
         </div>
     </td>
 </tr>
+}
 </script>
 
 <script id="template-cart-total" type="text/template">
@@ -170,18 +176,24 @@
                                     <span class="js-cart-summary-products text-nowrap"></span>
                                 </td>
                             </tr>
+                            @if (Model.ShowDiscount) 
+                            {
                             <tr class="h6">
                                 <td class="border-0 pb-y">Discount</td>
                                 <td align="right" class="border-0 pb-y">
                                     <span class="js-cart-summary-discount text-nowrap"></span>
                                 </td>
                             </tr>
+                            }
+                            @if (Model.EnableTips) 
+                            {
                             <tr class="h6">
                                 <td class="border-top-0 pt-0">Tip</td>
                                 <td align="right" class="border-top-0 pt-0">
                                     <span class="js-cart-summary-tip text-nowrap"></span>
                                 </td>
                             </tr>
+                            }
                             <tr class="h3 table-light">
                                 <td>Total</td>
                                 <td align="right">
diff --git a/BTCPayServer/wwwroot/cart/js/cart.js b/BTCPayServer/wwwroot/cart/js/cart.js
index a748ddf3a..3fa57a115 100644
--- a/BTCPayServer/wwwroot/cart/js/cart.js
+++ b/BTCPayServer/wwwroot/cart/js/cart.js
@@ -25,6 +25,10 @@ function Cart() {
 }
 
 Cart.prototype.setCustomAmount = function(amount) {
+    if (!srvModel.showCustomAmount) {
+        return 0;
+    }
+
     this.customAmount = this.toNumber(amount);
 
     if (this.customAmount > 0) {
@@ -36,10 +40,18 @@ Cart.prototype.setCustomAmount = function(amount) {
 }
 
 Cart.prototype.getCustomAmount = function() {
+    if (!srvModel.showCustomAmount) {
+        return 0;
+    }
+
     return this.toCents(this.customAmount);
 }
 
 Cart.prototype.setTip = function(amount) {
+    if (!srvModel.enableTips) {
+        return 0;
+    }
+
     this.tip = this.toNumber(amount);
 
     if (this.tip > 0) {
@@ -51,10 +63,18 @@ Cart.prototype.setTip = function(amount) {
 }
 
 Cart.prototype.getTip = function() {
+    if (!srvModel.enableTips) {
+        return 0;
+    }
+
     return this.toCents(this.tip);
 }
 
 Cart.prototype.setDiscount = function(amount) {
+    if (!srvModel.showDiscount) {
+        return 0;
+    }
+
     this.discount = this.toNumber(amount);
 
     if (this.discount > 0) {
@@ -66,10 +86,18 @@ Cart.prototype.setDiscount = function(amount) {
 }
 
 Cart.prototype.getDiscount = function() {
+    if (!srvModel.showDiscount) {
+        return 0;
+    }
+
     return this.toCents(this.discount);
 }
 
 Cart.prototype.getDiscountAmount = function(amount) {
+    if (!srvModel.showDiscount) {
+        return 0;
+    }
+
     return this.percentage(amount, this.getDiscount());
 }