diff --git a/ConfigurablePdfFont/Model/Font.php b/ConfigurablePdfFont/Model/Font.php
index b6d4a2ac8..d95948c12 100644
--- a/ConfigurablePdfFont/Model/Font.php
+++ b/ConfigurablePdfFont/Model/Font.php
@@ -55,7 +55,7 @@ public function __construct(
         $this->name = $data['name'];
         $this->regular = $data['regular'];
         $this->bold = $data['bold'] ?? null;
-        $this->italic = $data['bold'] ?? null;
+        $this->italic = $data['italic'] ?? null;
     }
 
     /**
diff --git a/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html b/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html
index 4163bcd75..afcb12796 100644
--- a/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html
+++ b/JapaneseAddress/view/frontend/web/template/checkout/billing-address.html
@@ -17,16 +17,10 @@
     <!-- ko template: 'CommunityEngineering_JapaneseAddress/checkout/billing-address/details' --><!-- /ko -->
     <fieldset class="fieldset" data-bind="visible: !isAddressDetailsVisible()">
         <each args="getRegion('billing-address-list')" render="" />
-        <div class="actions-toolbar">
-            <div class="primary">
-                <button class="action action-update" type="button" data-bind="click: updateAddress">
-                    <span data-bind="i18n: 'Update'"></span>
-                </button>
-                <button class="action action-cancel" type="button" data-bind="click: cancelAddressEdit">
-                    <span data-bind="i18n: 'Cancel'"></span>
-                </button>
-            </div>
+        <div data-bind="fadeVisible: isAddressFormVisible">
+            <render args="formTemplate"/>
         </div>
+        <render args="actionsTemplate"/>
     </fieldset>
 
 </div>