diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_01_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_01_variables.scss
index 00576b58826..e65a367379e 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_body_01_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_body_01_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-font-number: 1; // Note: this is the default
diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss
index f94c25093ae..ab959cd7a6d 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_body_02_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-font-number: 2;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss
index 81f19ea6cdd..882e72a0b72 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_body_03_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-font-number: 3;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss
index 8ab4cd6ff0e..5340d78012c 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_body_04_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-font-number: 4;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss
index 7741683e685..31723e664c0 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_body_05_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-font-number: 5;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss
index 013d43d9be7..66abf12c21c 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_body_06_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-font-number: 6;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_01_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_01_variables.scss
new file mode 100644
index 00000000000..945a94bb0a2
--- /dev/null
+++ b/addons/website/static/src/scss/options/fonts/option_font_button_01_variables.scss
@@ -0,0 +1 @@
+$o-theme-buttons-font-number: 1; // Note: this is the default
diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss
new file mode 100644
index 00000000000..2d804021980
--- /dev/null
+++ b/addons/website/static/src/scss/options/fonts/option_font_button_02_variables.scss
@@ -0,0 +1 @@
+$o-theme-buttons-font-number: 2;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss
new file mode 100644
index 00000000000..1c614fd35d0
--- /dev/null
+++ b/addons/website/static/src/scss/options/fonts/option_font_button_03_variables.scss
@@ -0,0 +1 @@
+$o-theme-buttons-font-number: 3;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss
new file mode 100644
index 00000000000..8ef0852a1ff
--- /dev/null
+++ b/addons/website/static/src/scss/options/fonts/option_font_button_04_variables.scss
@@ -0,0 +1 @@
+$o-theme-buttons-font-number: 4;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss
new file mode 100644
index 00000000000..0adadb1e9c4
--- /dev/null
+++ b/addons/website/static/src/scss/options/fonts/option_font_button_05_variables.scss
@@ -0,0 +1 @@
+$o-theme-buttons-font-number: 5;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss
new file mode 100644
index 00000000000..fa00777d716
--- /dev/null
+++ b/addons/website/static/src/scss/options/fonts/option_font_button_06_variables.scss
@@ -0,0 +1 @@
+$o-theme-buttons-font-number: 6;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_01_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_01_variables.scss
index 18a5b3e9533..0628cd2ecba 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_title_01_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_title_01_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-headings-font-number: 1; // Note: this is the default
diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss
index 656cf14811e..690e1b1c3a6 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_title_02_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-headings-font-number: 2;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss
index feca6a8a29a..c68022bb4da 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_title_03_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-headings-font-number: 3;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss
index 325ac7de1ab..37b5a9b328f 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_title_04_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-headings-font-number: 4;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss
index 192cee4410f..ca1848f61ed 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_title_05_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-headings-font-number: 5;
diff --git a/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss b/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss
index c7d1d8d72c3..572800b17ec 100644
--- a/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss
+++ b/addons/website/static/src/scss/options/fonts/option_font_title_06_variables.scss
@@ -1,2 +1 @@
-
 $o-theme-headings-font-number: 6;
diff --git a/addons/website/static/src/scss/primary_variables.scss b/addons/website/static/src/scss/primary_variables.scss
index 2b6aedf7d3a..d533b9212c4 100644
--- a/addons/website/static/src/scss/primary_variables.scss
+++ b/addons/website/static/src/scss/primary_variables.scss
@@ -60,3 +60,4 @@ $o-theme-font-names: (
 ) !default;
 $o-theme-font-number: 1 !default;
 $o-theme-headings-font-number: 1 !default;
+$o-theme-buttons-font-number: 1 !default;
diff --git a/addons/website/static/src/scss/website.scss b/addons/website/static/src/scss/website.scss
index 5d46eeee438..ffbb01e7e68 100644
--- a/addons/website/static/src/scss/website.scss
+++ b/addons/website/static/src/scss/website.scss
@@ -6,12 +6,18 @@ $-theme-font: nth($o-theme-font-urls, $o-theme-font-number);
 @if $-theme-font {
     @import url("https://fonts.googleapis.com/css?family=#{unquote($-theme-font)}");
 }
-@if $o-theme-font-number != $o-theme-headings-font-number {
+@if $o-theme-headings-font-number != $o-theme-font-number {
     $-theme-font: nth($o-theme-font-urls, $o-theme-headings-font-number);
     @if $-theme-font {
         @import url("https://fonts.googleapis.com/css?family=#{unquote($-theme-font)}");
     }
 }
+@if $o-theme-buttons-font-number != $o-theme-font-number and $o-theme-buttons-font-number != $o-theme-headings-font-number {
+    $-theme-font: nth($o-theme-font-urls, $o-theme-buttons-font-number);
+    @if $-theme-font {
+        @import url("https://fonts.googleapis.com/css?family=#{unquote($-theme-font)}");
+    }
+}
 
 #wrapwrap {
     background-size: cover;
@@ -62,6 +68,11 @@ h5, h6 {
 h6 {
     color: color('h6');
 }
+.btn {
+    @if ($o-theme-buttons-font-number != $o-theme-font-number) {
+        font-family: nth($o-theme-fonts, $o-theme-buttons-font-number);
+    }
+}
 
 // Texts
 font[style*='background'],
diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 171c38b8cc6..10bea3f44ab 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -518,6 +518,14 @@
                 <opt id="option_font_body_05" data-xmlid="website.option_font_body_05_variables" data-font="5"/>
                 <opt id="option_font_body_06" data-xmlid="website.option_font_body_06_variables" data-font="6"/>
             </list>
+            <list string="Button">
+                <opt id="option_font_button_01" data-xmlid="website.option_font_button_01_variables" data-font="1"/>
+                <opt id="option_font_button_02" data-xmlid="website.option_font_button_02_variables" data-font="2"/>
+                <opt id="option_font_button_03" data-xmlid="website.option_font_button_03_variables" data-font="3"/>
+                <opt id="option_font_button_04" data-xmlid="website.option_font_button_04_variables" data-font="4"/>
+                <opt id="option_font_button_05" data-xmlid="website.option_font_button_05_variables" data-font="5"/>
+                <opt id="option_font_button_06" data-xmlid="website.option_font_button_06_variables" data-font="6"/>
+            </list>
         </content>
     </div>
 </template>
@@ -673,6 +681,38 @@
     </xpath>
 </template>
 
+<!-- Button font options -->
+<template id="option_font_button_01_variables" inherit_id="website._assets_primary_variables" active="True">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/fonts/option_font_button_01_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_font_button_02_variables" inherit_id="website._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/fonts/option_font_button_02_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_font_button_03_variables" inherit_id="website._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/fonts/option_font_button_03_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_font_button_04_variables" inherit_id="website._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/fonts/option_font_button_04_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_font_button_05_variables" inherit_id="website._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/fonts/option_font_button_05_variables.scss"/>
+    </xpath>
+</template>
+<template id="option_font_button_06_variables" inherit_id="website._assets_primary_variables" active="False">
+    <xpath expr="//link[last()]" position="after">
+        <link rel="stylesheet" type="text/scss" href="/website/static/src/scss/options/fonts/option_font_button_06_variables.scss"/>
+    </xpath>
+</template>
+
 <template id="kanban">
     <t t-set="step"><t t-esc="step or 0"/></t>
     <t t-set="scope"><t t-esc="scope or 0"/></t>