diff --git a/addons/event/event_view.xml b/addons/event/event_view.xml
index ecd40e05531..68742754166 100644
--- a/addons/event/event_view.xml
+++ b/addons/event/event_view.xml
@@ -116,30 +116,28 @@
                             <label for="name" class="oe_edit_only"/>
                             <h1><field name="name"/></h1>
                         </div>
-                        <div>
+                        <group>
                             <group>
-                                <group>
-                                    <label for="address_id" string="Location"/>
-                                    <div>
-                                        <field name="address_id" on_change="on_change_address_id(address_id)" />
-                                        <field name="street" placeholder="Street..."/>
-                                        <field name="street2"/>
-                                        <div class="address_format">
-                                            <field name="city" placeholder="City" style="width: 40%%"/>
-                                            <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": True}'/>
-                                            <field name="zip" placeholder="ZIP" style="width: 20%%"/>
-                                        </div>
-                                        <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": True}'/>
-                                    </div>
-                                </group>
-                                <group>
-                                    <field name="type" on_change="onchange_event_type(type,context)"/>
-                                    <field name="date_begin"/>
-                                    <field name="date_end"/>
-                                    <field name="company_id" groups="base.group_multi_company"/>
-                                </group>
+                                <label for="address_id" string="Location"/>
+                                   <div>
+                                       <field name="address_id" on_change="on_change_address_id(address_id)" />
+                                       <field name="street" placeholder="Street..."/>
+                                       <field name="street2"/>
+                                       <div class="address_format">
+                                           <field name="city" placeholder="City" style="width: 40%%"/>
+                                           <field name="state_id" class="oe_no_button" placeholder="State" style="width: 37%%" options='{"no_open": true}'/>
+                                           <field name="zip" placeholder="ZIP" style="width: 20%%"/>
+                                       </div>    
+                                       <field name="country_id" placeholder="Country" class="oe_no_button" options='{"no_open": true}'/>
+                                   </div>
                             </group>
-                        </div>
+                            <group>
+                                <field name="type" on_change="onchange_event_type(type,context)" />
+                                <field name="date_begin"/>
+                                <field name="date_end"/>
+                                <field name="company_id" groups="base.group_multi_company"/>
+                            </group>
+                        </group>
                         <notebook>
                             <page string="Email Configuration" groups="base.group_no_one">
                                 <group>
@@ -284,13 +282,13 @@
                             <t t-if="record.register_avail.raw_value != 0">
                               <t t-if="!record.is_subscribed.raw_value">
                                 <input t-att-id="record.id.raw_value" type="text" name="subscribe" class="no_of_seats" value="1" onchange="document.getElementById('btn_sub' +this.id).setAttribute('data-context',JSON.stringify({'ticket':this.value}))"/>
-                                <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_mail_button_follow">
+                                <button t-att-id="'btn_sub'+record.id.raw_value" type="object" name="subscribe_to_event" class="oe_subscribe_button">
                                     <span >Subscribe</span>
                                 </button>
                               </t>
                             </t>
                             <t t-if="record.is_subscribed.raw_value">
-                              <button type="object" name="unsubscribe_to_event" class="oe_mail_button_unfollow">
+                              <button type="object" name="unsubscribe_to_event" class="oe_unsubscribe_button ">
                                 <span>Subscribed</span>
                                 <span class="unsubscribe">Unsubscribe</span>
                               </button>
diff --git a/addons/event/static/src/css/event.css b/addons/event/static/src/css/event.css
index 8602ea24d53..f49f5474fa6 100644
--- a/addons/event/static/src/css/event.css
+++ b/addons/event/static/src/css/event.css
@@ -42,4 +42,10 @@
     width:256px;
     border: 1px solid #eeeeee;
 }
+.oe_unsubscribe, .oe_unsubscribe_button:hover span {
+   display: none;
+ }
+.oe_unsubscribe_button:hover .oe_unsubscribe {
+   display: inline;
+ }