diff --git a/addons/website/views/website_templates.xml b/addons/website/views/website_templates.xml
index 6d7ed2cd1f9..05bb3a8d018 100644
--- a/addons/website/views/website_templates.xml
+++ b/addons/website/views/website_templates.xml
@@ -162,16 +162,16 @@
                                                 <li><a href="/page/website.contactus">Contact us</a></li>
                                             </ul>
                                             <ul class="list-unstyled">
-                                                <li><i class="icon-phone"></i> <span t-field="res_company.phone"></span></li>
-                                                <li><i class="icon-envelope"></i>  <span t-field="res_company.email"></span></li>
+                                                <li><i class="fa fa-phone"></i> <span t-field="res_company.phone"></span></li>
+                                                <li><i class="fa fa-envelope"></i>  <span t-field="res_company.email"></span></li>
                                             </ul>
                                             <h2>
-                                                <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="icon-facebook-sign"/></a>
-                                                <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="icon-twitter-sign"/></a>
-                                                <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="icon-linkedin-sign"/></a>
-                                                <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="icon-youtube-sign"/></a>
-                                                <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="icon-google-plus-sign"/></a>
-                                                <a t-att-href="website.social_github" t-if="website.social_github"><i class="icon-github-sign"/></a>
+                                                <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                                                <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                                                <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                                                <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                                                <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                                                <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
                                             </h2>
                                         </div>
                                         <div class="col-md-5 col-lg-offset-1" name="about_us">
@@ -201,7 +201,7 @@
                                                 <li t-if="editable">
                                                     <t t-set="url_return" t-value="url_for(request.httprequest.path, '[lang]')"/>
                                                     <a t-attf-href="/web#action=base.action_view_base_language_install&amp;website_id=#{website.id}&amp;url_return=#{url_return}">
-                                                        <i class="icon-plus-sign"/>
+                                                        <i class="fa fa-plus-circle"/>
                                                         Add a language...
                                                     </a>
                                                 </li>
@@ -528,7 +528,7 @@ Sitemap: <t t-esc="url_root"/>sitemap.xml
                 <div t-field="res_company.partner_id">Name</div>
                 <br />
                 <div>&amp;#x2706; <span t-field="res_company.phone"></span></div>
-                <div class="icon-envelope" t-field="res_company.email"></div>
+                <div class="fa fa-envelope" t-field="res_company.email"></div>
             </address>
              <a t-att-href="res_company.google_map_link()" target="_BLANK">
                 <img class="thumbnail img-responsive" t-att-src="res_company.google_map_img()" />
diff --git a/addons/website_blog/views/website_blog_templates.xml b/addons/website_blog/views/website_blog_templates.xml
index 958f29c770a..15c4508d504 100644
--- a/addons/website_blog/views/website_blog_templates.xml
+++ b/addons/website_blog/views/website_blog_templates.xml
@@ -55,25 +55,25 @@
                                 <a t-href="/blogpost/#{ slug(blog) }?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}" t-field="blog.name"></a>
                                 <span t-if="not blog.website_published" class="text-warning">
                                     &amp;nbsp;
-                                    <span class="icon-warning-sign" title="Not published"/>
+                                    <span class="fa fa-warning" title="Not published"/>
                                 </span>
                             </h4>
                             <div class="text-muted">
-                                <span class="icon-calendar"> <span t-field="blog.create_date"/> &amp;nbsp;</span>
-                                <span class="icon-folder-open"> In
+                                <span class="fa fa-calendar"> <span t-field="blog.create_date"/> &amp;nbsp;</span>
+                                <span class="fa fa-folder-open"> In
                                     <a t-href="/blog/#{ slug(blog.category_id) }">
                                     <span t-field="blog.category_id"/>
                                     </a> &amp;nbsp;
                                 </span>
                             </div>
-                            <div class="text-muted icon-tags">
+                            <div class="text-muted fa fa-tags">
                                 <span t-field="blog.website_meta_keywords"/>
                                 <span t-if="editable and not blog.website_meta_keywords" class="label label-danger">
                                     No keywords defined!
                                 </span>
                             </div>
                             <div class="text-muted" t-if="len(blog.message_ids) &gt; 0">
-                                <span class="icon-comment">
+                                <span class="fa fa-comment-o">
                                     <a t-href="/blogpost/#{ slug(blog) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}#comment">
                                         <t t-if="len(blog.message_ids) &lt;= 1" ><t t-esc="len(blog.message_ids)"/> comment</t>
                                         <t t-if="len(blog.message_ids) > 1"><t t-esc="len(blog.message_ids)"/> comments</t>
@@ -112,8 +112,8 @@
                 <a t-href="/blogpost/#{ slug(blog_post) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}" t-field="blog_post.name"></a>
             </h2>
             <p class="post-meta text-muted text-center" name='blog_post_data'>
-                <span class="icon-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
-                <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment">
+                <span class="fa fa-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
+                <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o">
                     <a t-href="/blogpost/#{ slug(blog_post) }/?#{ tag and 'tag=%s' % tag.id or '' }#{tag and date and '&amp;' or ''}#{ date and 'date=%s' % date or ''}#comment">
                         <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
                         <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
@@ -132,8 +132,8 @@
     <!-- Options: Blog Post Summary: hide author -->
     <template id="opt_blog_post_short_author" name="Author"
             inherit_option_id="website_blog.blog_post_short">
-        <xpath expr="//span[@class='icon-calendar']" position="after">
-            <span class="icon-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
+        <xpath expr="//span[@class='fa-calendar']" position="after">
+            <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
         </xpath>
     </template>
 
@@ -142,7 +142,7 @@
             inherit_option_id="website_blog.blog_post_short" inherit_id="website_blog.blog_post_short">
         <xpath expr="//p[@name='blog_post_data']" position="after">
             <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
-                <span class="icon-tags"/>
+                <span class="fa fa-tags"/>
                 <t t-foreach="blog_post.tag_ids" t-as="tag">
                     <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
                 </t>
@@ -181,8 +181,8 @@
 
         <h1 class="text-center" t-field="blog_post.name"/>
         <p class="post-meta text-muted text-center" name="blog_post_data">
-            <span class="icon-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
-            <span t-if="len(blog_post.message_ids) &gt; 0" class="icon-comment"> With
+            <span class="fa fa-calendar"> <span t-field="blog_post.create_date"/> &amp;nbsp;</span>
+            <span t-if="len(blog_post.message_ids) &gt; 0" class="fa fa-comment-o"> With
                 <a t-attf-href="#comments">
                     <t t-if="len(blog_post.message_ids) &lt;= 1" ><t t-esc="len(blog_post.message_ids)"/> comment</t>
                     <t t-if="len(blog_post.message_ids) > 1"><t t-esc="len(blog_post.message_ids)"/> comments</t>
@@ -235,16 +235,16 @@
     <!-- Options: Blog Post: hide author -->
     <template id="opt_blog_post_complete_author" name="Authors"
             inherit_option_id="website_blog.blog_post_complete">
-        <xpath expr="//span[@class='icon-calendar']" position="after">
-            <span class="icon-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
+        <xpath expr="//span[@class='fa-calendar']" position="after">
+            <span class="fa fa-user"> By <span t-field="blog_post.create_uid"/> &amp;nbsp;</span>
         </xpath>
     </template>
 
     <!-- Options: Blog Post: show category -->
     <template id="opt_blog_post_complete_category" name="Blog Category"
             inherit_option_id="website_blog.blog_post_complete">
-        <xpath expr="//span[@class='icon-calendar']" position="after">
-            <span class="icon-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
+        <xpath expr="//span[@class='fa-calendar']" position="after">
+            <span class="fa fa-folder-open"> In <span t-field="blog_post.category_id"/> &amp;nbsp;</span>
         </xpath>
     </template>
 
@@ -253,7 +253,7 @@
             inherit_option_id="website_blog.blog_post_complete" inherit_id="website_blog.blog_post_complete">
         <xpath expr="//p[@name='blog_post_data']" position="after">
             <p class="post-meta text-muted text-center" t-if="len(blog_post.tag_ids)">
-                <span class="icon-tags"/>
+                <span class="fa fa-tags"/>
                 <t t-foreach="blog_post.tag_ids" t-as="tag">
                     <a t-href="/blog/#{ slug(category) }/tag/#{ slug(tag) }" t-esc="tag.name"/> &amp;nbsp;
                 </t>
@@ -358,12 +358,12 @@
                     Participate on our social stream.
                 </p>
                 <h2 class="mt4">
-                    <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="icon-facebook-sign"/></a>
-                    <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="icon-twitter-sign"/></a>
-                    <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="icon-linkedin-sign"/></a>
-                    <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="icon-youtube-sign"/></a>
-                    <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="icon-google-plus-sign"/></a>
-                    <a t-att-href="website.social_github" t-if="website.social_github"><i class="icon-github-sign"/></a>
+                    <a t-att-href="website.social_facebook" t-if="website.social_facebook"><i class="fa fa-facebook-square"/></a>
+                    <a t-att-href="website.social_twitter" t-if="website.social_twitter"><i class="fa fa-twitter"/></a>
+                    <a t-att-href="website.social_linkedin" t-if="website.social_linkedin"><i class="fa fa-linkedin"/></a>
+                    <a t-att-href="website.social_youtube" t-if="website.social_youtube"><i class="fa fa-youtube-play"/></a>
+                    <a t-att-href="website.social_googleplus" t-if="website.social_googleplus"><i class="fa fa-google-plus-square"/></a>
+                    <a t-att-href="website.social_github" t-if="website.social_github"><i class="fa fa-github"/></a>
                 </h2>
             </section>
         </xpath>
diff --git a/addons/website_crm/views/website_crm.xml b/addons/website_crm/views/website_crm.xml
index f97a3c20ea4..ed7d2b8c6a7 100644
--- a/addons/website_crm/views/website_crm.xml
+++ b/addons/website_crm/views/website_crm.xml
@@ -73,8 +73,8 @@
                                 If you have an emergency, do not hesitate to contact us by phone:
                             </p>
                             <ul class="list-unstyled">
-                                <li><i class="icon-phone"></i> : <span t-field="res_company.phone"/></li>
-                                <li><i class="icon-envelope"></i> : <span t-field="res_company.email"/></li>
+                                <li><i class="fa fa-phone"></i> : <span t-field="res_company.phone"/></li>
+                                <li><i class="fa fa-envelope"></i> : <span t-field="res_company.email"/></li>
                             </ul>
                         </div>
                         <div class="col-md-4">
diff --git a/addons/website_customer/views/website_customer.xml b/addons/website_customer/views/website_customer.xml
index 818d249196c..002039c84bf 100644
--- a/addons/website_customer/views/website_customer.xml
+++ b/addons/website_customer/views/website_customer.xml
@@ -134,10 +134,10 @@
                         <strong t-field="partner.name"/>
                         <p t-field="partner.commercial_partner_id"/>
                         <div t-if="partner.phone">
-                            <span class="icon-phone"/> <span t-field="partner.phone"/>
+                            <span class="fa fa-phone"/> <span t-field="partner.phone"/>
                         </div>
                         <div t-if="partner.email">
-                            <span class="icon-envelope"/>
+                            <span class="fa fa-envelope"/>
                             <a t-att-href="'mailto:'+partner.email">
                               <span t-field="partner.email"/>
                             </a>
diff --git a/addons/website_customer_crm_partner_assign/views/website_customer.xml b/addons/website_customer_crm_partner_assign/views/website_customer.xml
index 95de94c1167..0e65885f72c 100644
--- a/addons/website_customer_crm_partner_assign/views/website_customer.xml
+++ b/addons/website_customer_crm_partner_assign/views/website_customer.xml
@@ -17,10 +17,10 @@
                             <strong t-field="partner.assigned_partner_id.name"/>
                             <p t-field="partner.assigned_partner_id"/>
                             <div t-if="partner.assigned_partner_id.phone">
-                                <span class="icon-phone"/> <span t-field="partner.assigned_partner_id.phone"/>
+                                <span class="fa fa-phone"/> <span t-field="partner.assigned_partner_id.phone"/>
                             </div>
                             <div t-if="partner.assigned_partner_id.email">
-                                <span class="icon-envelope"/>
+                                <span class="fa fa-envelope"/>
                                 <a t-att-href="'mailto:'+partner.assigned_partner_id.email">
                                   <span t-field="partner.assigned_partner_id.email"/>
                                 </a>
diff --git a/addons/website_event/views/website_event.xml b/addons/website_event/views/website_event.xml
index 8b60165efaa..ccc929c0f2a 100644
--- a/addons/website_event/views/website_event.xml
+++ b/addons/website_event/views/website_event.xml
@@ -81,13 +81,13 @@
                                         </t>
                                     </div>
                                     <div>
-                                        <i class="icon-time"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.date_end"> </span>
+                                        <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span> <i>to</i> <span t-field="event.date_end"> </span>
                                     </div>
                                     <div t-if="event.country_id">
-                                        <i class="icon-map-marker"></i> <span t-field="event.city"/>, <span t-field="event.country_id"/>
+                                        <i class="fa fa-map-marker"></i> <span t-field="event.city"/>, <span t-field="event.country_id"/>
                                     </div>
                                     <div class="text-muted">
-                                        <i class="icon-tag"></i> <span t-field="event.type"/>
+                                        <i class="fa fa-tag"></i> <span t-field="event.type"/>
                                     </div>
                                 </div>
                             </li>
@@ -228,11 +228,11 @@
             <div class="container">
                 <h1 class="text-center" t-field="event.name"></h1>
                 <h4 class="text-center text-muted">
-                    <i class="icon-time"></i> <span t-field="event.date_begin"/> to
+                    <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"/> to
                     <span t-field="event.date_end"/>
                 </h4>
                 <h4 t-if="event.city and event.country_id" class="text-center text-muted">
-                    <i class="icon-map-marker"/>
+                    <i class="fa fa-map-marker"/>
                     <span t-field="event.city"/>,
                     <span t-field="event.country_id"/>
                 </h4>
@@ -326,10 +326,10 @@
                            <!--  <strong t-field="event.address_id"/>
                             <p t-field="event.address_id"/>
                             <div t-if="event.address_id.phone">
-                                <span class="icon-phone"/> <span t-field="event.address_id.phone"/>
+                                <span class="fa fa-phone"/> <span t-field="event.address_id.phone"/>
                             </div>
                             <div t-if="event.address_id.email">
-                                <span class="icon-envelope"/>
+                                <span class="fa fa-envelope"/>
                                 <a t-att-href="'mailto:'+event.address_id.email">
                                   <span t-field="event.address_id.email"/>
                                 </a>
@@ -343,8 +343,8 @@
                         <h4>When</h4>
                     </div>
                     <div class="panel-body">
-                        <i class="icon-time"></i> <span t-field="event.date_begin"> </span><br/>
-                        <i class="icon-time"></i> <span t-field="event.date_end"> </span>
+                        <i class="fa fa-clock-o"></i> <span t-field="event.date_begin"> </span><br/>
+                        <i class="fa fa-clock-o"></i> <span t-field="event.date_end"> </span>
                     </div>
                 </div>
 
@@ -355,10 +355,10 @@
                     <div class="panel-body" t-field="event.organizer_id">  <!-- TODO: use widget contact -->
                       <!--   <p><strong t-field="event.organizer_id.display_name"/></p>
                         <div t-if="event.phone">
-                            <span class="icon-phone"/> <span t-field="event.phone"/>
+                            <span class="fa fa-phone"/> <span t-field="event.phone"/>
                         </div>
                         <div t-if="event.email">
-                            <i class="icon-envelope"/> <span t-field="event.email"/>
+                            <i class="fa fa-envelope"/> <span t-field="event.email"/>
                         </div> -->
                     </div>
                 </div>
diff --git a/addons/website_hr_recruitment/views/website_hr_recruitment.xml b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
index 40b40ce1795..08f22e7b17c 100644
--- a/addons/website_hr_recruitment/views/website_hr_recruitment.xml
+++ b/addons/website_hr_recruitment/views/website_hr_recruitment.xml
@@ -68,14 +68,14 @@
                                             </h3>
 
                                             <div t-if="job.address_id">
-                                                <i class="icon-map-marker"/>
+                                                <i class="fa fa-map-marker"/>
                                                 <span t-field="job.address_id.city"/>
                                                 <span t-if="job.address_id.state_id" t-field="job.address_id.state_id"/>
                                                 , <span t-field="job.address_id.country_id.name"/>
                                                 <span t-if="not job.website_published" class="label label-danger">not published</span>
                                             </div>
                                             <div class="text-muted">
-                                                <i class="icon-time"/> <span t-field="job.write_date"/>
+                                                <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
                                             </div>
                                         </div>
                                     </li>
@@ -125,10 +125,10 @@
                 <div class="oe_structure" style="clear:both;">
                     <h1 class="text-center" t-field="job.name"/>
                     <h5 class="text-center">
-                        <i class="icon-map-marker"/> <span t-field="job.address_id.city"/> <span t-if="job.address_id.state_id" t-field="job.address_id.state_id.name"/>, <span t-field="job.address_id.country_id.name"/>
+                        <i class="fa fa-map-marker"/> <span t-field="job.address_id.city"/> <span t-if="job.address_id.state_id" t-field="job.address_id.state_id.name"/>, <span t-field="job.address_id.country_id.name"/>
                     </h5>
                     <h5 class="text-center text-muted">
-                        <i class="icon-time"/> <span t-field="job.write_date"/>
+                        <i class="fa fa-clock-o"/> <span t-field="job.write_date"/>
                     </h5>
                 </div>
                 <div t-field="job.website_description"/>
diff --git a/addons/website_project/views/website_project.xml b/addons/website_project/views/website_project.xml
index b968b415e22..88e048c8979 100644
--- a/addons/website_project/views/website_project.xml
+++ b/addons/website_project/views/website_project.xml
@@ -36,7 +36,7 @@
                     </span>
                 </div>
                 <small>
-                    <i class="icon-time"></i> <span t-field="object_id.date_start"/><br/>
+                    <i class="fa fa-clock-o"></i> <span t-field="object_id.date_start"/><br/>
                     <t t-if="object_id.date_end">Ending Date: <span t-field="object_id.date_end"/></t>
                 </small>
             </div>
diff --git a/addons/website_sale/views/website_sale.xml b/addons/website_sale/views/website_sale.xml
index 32d43f2dafa..e58adb9ab17 100644
--- a/addons/website_sale/views/website_sale.xml
+++ b/addons/website_sale/views/website_sale.xml
@@ -8,7 +8,7 @@
         <xpath expr="//header//ul[@id='top_menu']/li" position="before">
             <li t-att-class="(not website_sale_order or not website_sale_order.get_total_quantity()) and 'hidden' or ''">
                 <a href="/shop/mycart/">
-                    <i class="icon-shopping-cart"></i>
+                    <i class="fa fa-shopping-cart"></i>
                     My cart <sup t-attf-class="my_cart_quantity label label-primary"
                                   t-esc="website_sale_order and website_sale_order.get_total_quantity() or ''"/>
                 </a>
@@ -203,7 +203,7 @@
     <template id="add_to_basket" inherit_option_id="website_sale.products_cart" name="Add to Cart">
         <xpath expr="//div[@class='product_price']" position="inside">
             <a t-href="/shop/add_cart/?product_id=#{ product.id }" class="js_add_cart_json">
-                <span class="icon-shopping-cart"/>
+                <span class="fa fa-shopping-cart"/>
             </a>
         </xpath>
     </template>
@@ -423,14 +423,14 @@
                                         <div class="input-group">
                                             <span class="input-group-addon">
                                                 <a t-href="./add_cart/?remove=True&amp;order_line_id=#{ line.id }" class="mb8 js_add_cart_json">
-                                                    <span class="icon-minus"/>
+                                                    <span class="fa fa-minus-square"/>
                                                 </a>
                                             </span>
                                             <input type="text" class="js_quantity form-control"
                                                 t-att-data-id="line.id" t-att-value="int(line.product_uom_qty)"/>
                                             <span class="input-group-addon">
                                                 <a t-href="./add_cart/?order_line_id=#{ line.id }" class="mb8 float_left js_add_cart_json">
-                                                    <span class="icon-plus"/>
+                                                    <span class="fa fa-plus-square"/>
                                                 </a>
                                             </span>
                                         </div>
@@ -463,8 +463,8 @@
                             </thead>
                         </table>
                         <div class="clearfix"/>
-                        <a href="/shop" class="btn btn-default mb32"><span class="icon-long-arrow-left"/> Continue Shopping</a>
-                        <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="icon-long-arrow-right"/></a>
+                        <a href="/shop" class="btn btn-default mb32"><span class="fa fa-long-arrow-left"/> Continue Shopping</a>
+                        <a t-if="website_sale_order and website_sale_order.order_line" href="/shop/checkout/" class="btn btn-primary pull-right mb32">Process Checkout <span class="fa fa-long-arrow-right"/></a>
                         <div class="oe_structure"/>
                     </div>
                     <div class="col-lg-3 col-lg-offset-1 col-sm-3 text-muted" id="right_column">
@@ -749,10 +749,10 @@
                                 </select>
                             </div>
                         </div>
-                        <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="icon-long-arrow-right"/></button>
+                        <button type="submit" class="btn btn-default btn-primary pull-right mb32">Confirm <span class="fa fa-long-arrow-right"/></button>
                 </div>
                 <div class="col-lg-offset-1 col-lg-3 text-muted">
-                    <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="icon-arrow-right"/> change</a></small></h3>
+                    <h3 class="page-header mt16">Your Order <small><a href="/shop/mycart"><span class="fa fa-arrow-right"/> change</a></small></h3>
                     <div class="row">
                         <div class="col-sm-6 text-right">Subtotal:</div>
                         <div class="col-sm-6"><span t-esc="website_sale_order.amount_untaxed" t-field-options='{
@@ -866,13 +866,13 @@
                       <h4>Bill To:</h4>
                       <div t-field="website_sale_order.partner_invoice_id"/>
                       <div>
-                        <a href="/shop/checkout"><span class="icon-arrow-right"/> Change Address</a>
+                        <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
                       </div>
 
                       <h4 class="mt32">Ship To:</h4>
                       <div t-field="website_sale_order.partner_shipping_id"/>
                       <div>
-                        <a href="/shop/checkout"><span class="icon-arrow-right"/> Change Address</a>
+                        <a href="/shop/checkout"><span class="fa fa-arrow-right"/> Change Address</a>
                       </div>
 
                   </div>