diff --git a/odex25_purchase/odex25_annual_purchase/views/addendum_views.xml b/odex25_purchase/odex25_annual_purchase/views/addendum_views.xml
index 93f4c7732..5b2d1b301 100644
--- a/odex25_purchase/odex25_annual_purchase/views/addendum_views.xml
+++ b/odex25_purchase/odex25_annual_purchase/views/addendum_views.xml
@@ -19,12 +19,12 @@
         <field name="arch" type="xml">
             <form>
                 <header>
-                    <button name="action_send" string="Send" type="object" states="draft" groups="purchase.group_purchase_user"/>
-                    <button name="action_ssd_approve" string="SSD Approve" type="object" states="ssd" groups="hr_base.group_services_manager"/>
-                    <button name="action_ssd_reject" string="SSD Reject" type="object" states="ssd" groups="hr_base.group_services_manager"/>
-                    <button name="action_gm_approve" string="GM Approve (Add to Agreement)" type="object" states="gm" groups="hr_base.group_general_manager"/>
-                    <button name="action_gm_reject" string="GM Reject" type="object" states="gm" groups="hr_base.group_general_manager"/>
-                    <button name="action_cancel" string="Cancel" type="object" states="draft,ssd,gm"/>
+                    <button name="action_send" string="Send" type="object" states="draft" groups="purchase.group_purchase_user" class="btn-primary" icon="fa-send"/>
+                    <button name="action_ssd_approve" string="SSD Approve" type="object" states="ssd" groups="hr_base.group_services_manager" class="btn-primary" icon="fa-check-circle"/>
+                    <button name="action_ssd_reject" string="SSD Reject" type="object" states="ssd" groups="hr_base.group_services_manager" class="btn-danger" icon="fa-times-circle"/>
+                    <button name="action_gm_approve" string="GM Approve (Add to Agreement)" type="object" states="gm" groups="hr_base.group_general_manager" class="btn-primary" icon="fa-check-circle"/>
+                    <button name="action_gm_reject" string="GM Reject" type="object" states="gm" groups="hr_base.group_general_manager" class="btn-danger" icon="fa-times-circle"/>
+                    <button name="action_cancel" string="Cancel" type="object" states="draft,ssd,gm" class="btn-secondary" icon="fa-ban"/>
                     <field name="state" widget="statusbar" statusbar_visible="draft,ssd,gm,approved,rejected,cancel"/>
                 </header>
 
diff --git a/odex25_purchase/odex25_annual_purchase/views/annual_request_views.xml b/odex25_purchase/odex25_annual_purchase/views/annual_request_views.xml
index a16505af5..18d657957 100644
--- a/odex25_purchase/odex25_annual_purchase/views/annual_request_views.xml
+++ b/odex25_purchase/odex25_annual_purchase/views/annual_request_views.xml
@@ -23,18 +23,18 @@
             <form string="Annual Purchase Request">
                 <header>
                     <field name="can_create_agreement" invisible="1"/>
-                    <button name="action_send" string="Send" type="object" states="draft" class="oe_highlight" groups="purchase.group_purchase_user"/>
-                    <button name="action_manager_approve" string="Approve" type="object"  class="oe_highlight" states="to_manager" groups="purchase.group_purchase_manager"/>
-                    <button name="action_manager_reject" string="Reject" type="object" states="to_manager" groups="purchase.group_purchase_manager"/>
-                    <button name="action_send_to_committee" string="Send to Committee" type="object" class="oe_highlight"  groups="purchase.group_purchase_user" attrs="{'invisible': ['|', ('committee_enabled','=',False), ('state','not in',['procurement','rejected_by_committee'])]}"/>
-                    <button name="action_create_rfq" string="Create RFQ" type="object" class="oe_highlight" states="procurement,rejected_by_committee" groups="purchase.group_purchase_user"/>
-                    <button name="action_cancel" string="Cancel" type="object" states="procurement,rejected_by_committee,committee" groups="purchase.group_purchase_user"/>
-                    <button name="action_ssd_approve" string="Approve" class="oe_highlight" type="object" states="ssd" groups="hr_base.group_services_manager"/>
-                    <button name="action_ssd_reject" string="Reject" type="object" states="ssd" groups="hr_base.group_services_manager"/>
-                    <button name="action_ceo_approve" string="Approve" class="oe_highlight" type="object" states="ceo" groups="hr_base.group_general_manager"/>
-                    <button name="action_ceo_reject" string="Reject" type="object" states="ceo" groups="hr_base.group_general_manager"/>
-                    <button name="action_create_agreement" string="Create Agreement" type="object"  states="purchase" class="oe_highlight"  groups="purchase.group_purchase_manager"/>
-                    <button name="action_to_draft" string="Back To Draft" type="object"  states="rejected" class="oe_highlight"  groups="odex25_annual_purchase.group_annual_to_draft" />
+                    <button name="action_send" string="Send" type="object" states="draft" class="btn-primary" groups="purchase.group_purchase_user" icon="fa-send"/>
+                    <button name="action_manager_approve" string="Approve" type="object"  class="btn-primary" states="to_manager" groups="purchase.group_purchase_manager" icon="fa-check-circle"/>
+                    <button name="action_manager_reject" string="Reject" type="object" states="to_manager" groups="purchase.group_purchase_manager" class="btn-danger" icon="fa-times-circle"/>
+                    <button name="action_send_to_committee" string="Send to Committee" type="object" class="btn-info"  groups="purchase.group_purchase_user" attrs="{'invisible': ['|', ('committee_enabled','=',False), ('state','not in',['procurement','rejected_by_committee'])]}" icon="fa-users"/>
+                    <button name="action_create_rfq" string="Create RFQ" type="object" class="btn-primary" states="procurement,rejected_by_committee" groups="purchase.group_purchase_user" icon="fa-file-text-o"/>
+                    <button name="action_cancel" string="Cancel" type="object" states="procurement,rejected_by_committee,committee" groups="purchase.group_purchase_user" class="btn-secondary" icon="fa-ban"/>
+                    <button name="action_ssd_approve" string="Approve" class="btn-primary" type="object" states="ssd" groups="hr_base.group_services_manager" icon="fa-check-circle"/>
+                    <button name="action_ssd_reject" string="Reject" type="object" states="ssd" groups="hr_base.group_services_manager" class="btn-danger" icon="fa-times-circle"/>
+                    <button name="action_ceo_approve" string="Approve" class="btn-primary" type="object" states="ceo" groups="hr_base.group_general_manager" icon="fa-check-circle"/>
+                    <button name="action_ceo_reject" string="Reject" type="object" states="ceo" groups="hr_base.group_general_manager" class="btn-danger" icon="fa-times-circle"/>
+                    <button name="action_create_agreement" string="Create Agreement" type="object"  states="purchase" class="btn-primary"  groups="purchase.group_purchase_manager" icon="fa-file-contract"/>
+                    <button name="action_to_draft" string="Back To Draft" type="object"  states="rejected" class="btn-secondary"  groups="odex25_annual_purchase.group_annual_to_draft" icon="fa-undo" />
                     <field name="state" widget="statusbar" statusbar_visible="draft,to_manager,procurement,committee,ssd,ceo,approved,rejected,cancel"/>
                 </header>
                 <sheet>
diff --git a/odex25_purchase/online_tendering/views/purchase_requsition_veiw.xml b/odex25_purchase/online_tendering/views/purchase_requsition_veiw.xml
index 4283f5cb4..2c4b8a44e 100644
--- a/odex25_purchase/online_tendering/views/purchase_requsition_veiw.xml
+++ b/odex25_purchase/online_tendering/views/purchase_requsition_veiw.xml
@@ -7,8 +7,8 @@
             <field name="inherit_id" ref="purchase_requisition.view_purchase_requisition_form"/>
             <field name="arch" type="xml">
                 <xpath expr="//button[@name='action_in_progress']" position="after">
-                    <button name="action_show_portal"  attrs="{'invisible':['|','|',('state' , '!=' , 'in_progress' ),('published_in_portal' , '=' , True),('publish_in_portal' , '!=' , True)]}"  string="Show in Portal" type="object" class="btn-primary"/>
-                    <button name="extend_availability" attrs="{'invisible':['|',('state' , '!=' , 'open' ),('published_in_portal' , '!=' , True)]}" type="object" string="Extend Availability" />
+                    <button name="action_show_portal"  attrs="{'invisible':['|','|',('state' , '!=' , 'in_progress' ),('published_in_portal' , '=' , True),('publish_in_portal' , '!=' , True)]}"  string="Show in Portal" type="object" class="btn-primary" icon="fa-globe"/>
+                    <button name="extend_availability" attrs="{'invisible':['|',('state' , '!=' , 'open' ),('published_in_portal' , '!=' , True)]}" type="object" string="Extend Availability" class="btn-info" icon="fa-clock-o" />
                 </xpath>
                 <xpath expr="//div[@class='oe_button_box']" position="inside">
                     <button name="application" type="object" class="oe_stat_button" icon="fa-globe"
diff --git a/odex25_purchase/online_tendering/views/tender_application.xml b/odex25_purchase/online_tendering/views/tender_application.xml
index aaf2e91e3..0a75f5112 100644
--- a/odex25_purchase/online_tendering/views/tender_application.xml
+++ b/odex25_purchase/online_tendering/views/tender_application.xml
@@ -7,8 +7,8 @@
             <field name="arch" type="xml">
                 <form string="Online Tender Configuration" create="false"  delete="false">
                     <header>
-                        <button name="action_tender" confirm="Are you sure you want to shortlisting this Request?" states="draft" string="Tender" type="object"/>
-                        <button name="action_reject"  states="draft" string="Reject" type="object"/>
+                        <button name="action_tender" confirm="Are you sure you want to shortlisting this Request?" states="draft" string="Tender" type="object" class="btn-primary" icon="fa-gavel"/>
+                        <button name="action_reject"  states="draft" string="Reject" type="object" class="btn-danger" icon="fa-times-circle"/>
                         <field name="state" widget="statusbar" statusbar_visible="draft,tender,contract"/>
                     </header>
                     <sheet>
@@ -61,7 +61,7 @@
                     <field name="reject_reason" required="1"/>
                     <footer>
                         <div>
-                            <button name="action_reject" string="Reject" type="object" default_focus="1" class="oe_highlight"/>
+                            <button name="action_reject" string="Reject" type="object" default_focus="1" class="btn-danger" icon="fa-times-circle"/>
                             or
                             <button string="Cancel" class="oe_link" special="cancel" />
                         </div>
diff --git a/odex25_purchase/purchase_custom_stock/views/purchase_request.xml b/odex25_purchase/purchase_custom_stock/views/purchase_request.xml
index 8fd66b4c1..93f74d338 100644
--- a/odex25_purchase/purchase_custom_stock/views/purchase_request.xml
+++ b/odex25_purchase/purchase_custom_stock/views/purchase_request.xml
@@ -47,9 +47,9 @@
                     </button>
                 </xpath>
                 <xpath expr="/form/header/button[@name='action_done']" position="replace">
-                    <button name="action_done" type="object" string="Delivery Done" class="oe_highlight"
+                    <button name="action_done" type="object" string="Delivery Done" class="btn-success"
                             groups="purchase_requisition_custom.create_purchase_request"
-                            attrs="{'invisible':[('show_emp_button' , '=' , False)]}"/>
+                            attrs="{'invisible':[('show_emp_button' , '=' , False)]}" icon="fa-check-circle"/>
                 </xpath>
                 <xpath expr="//field[@name='use_analytic']" position="attributes">
                     <attribute name="attrs">{'readonly':[('state','!=','draft')]}</attribute>
@@ -96,7 +96,7 @@
                             groups="stock.group_stock_user,stock.group_stock_manager"/>
                     <button name="action_refuse" type="object" string="Refuse" id="prs_request_refuse"
                             groups="stock.group_stock_manager"
-                            attrs="{'invisible' : [('state' , '!=' , 'warehouse')]}"/>
+                            attrs="{'invisible' : [('state' , '!=' , 'warehouse')]}" class="btn-danger" icon="fa-times-circle"/>
                 </xpath>
                 <xpath expr="//button[@name='action_draft']" position="before">
                     <button name="create_asset_custody_lines"
diff --git a/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po b/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
index bdaccf893..cffb1006a 100644
--- a/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
+++ b/odex25_purchase/purchase_requisition_custom/i18n/ar_001.po
@@ -27,7 +27,7 @@ msgstr "طلب عرض سعر"
 #: code:addons/purchase_requisition_custom/models/purchase_requisition_custom.py:0
 #, python-format
 msgid " No budget for this service "
-msgstr ""
+msgstr "لا توجد ميزانية لهذه الخدمة"
 
 #. module: purchase_requisition_custom
 #: model:ir.actions.report,print_report_name:purchase_requisition_custom.action_report_committee_meeting_minutes
@@ -102,13 +102,13 @@ msgstr "الموعد النهائي لاستقبال عروض الاسعار"
 #. module: purchase_requisition_custom
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_requisition__name
 msgid "Agreement Reference"
-msgstr ""
+msgstr "مرجع الاتفاقية"
 
 #. module: purchase_requisition_custom
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_order__requisition_type_exclusive
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_requisition__type_exclusive
 msgid "Agreement Selection Type"
-msgstr ""
+msgstr "نوع اختيار الاتفاقية"
 
 #. module: purchase_requisition_custom
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_request__type_id
@@ -124,7 +124,7 @@ msgstr "تاريخ توقيع الاتفاقية"
 #. module: purchase_requisition_custom
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_order__already_voted
 msgid "Already Voted"
-msgstr ""
+msgstr "تم التصويت بالفعل"
 
 #. module: purchase_requisition_custom
 #: model:ir.model.fields,field_description:purchase_requisition_custom.field_purchase_request_line__account_id
@@ -2981,6 +2981,11 @@ msgstr "أدخل ملاحظات إضافية..."
 msgid "Vendor and Accounting"
 msgstr "المورد والمحاسبة"
 
+#. module: purchase_custom_stock
+#: model_terms:ir.ui.view,arch_db:purchase_custom_stock.purchase_request_form_inherit
+msgid "Warehouse Management"
+msgstr "إدارة المستودعات"
+
 #. module: purchase_requisition_custom
 #: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_form
 msgid "Suggested vendor for this purchase request"
@@ -3001,6 +3006,21 @@ msgstr "تفاصيل أخرى"
 msgid "Warehouse Management"
 msgstr "إدارة المستودعات"
 
+#. module: purchase_requisition_custom
+#: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_requisition_custom_form_view
+msgid "Select"
+msgstr "اختيار"
+
+#. module: purchase_custom_stock
+#: model_terms:ir.ui.view,arch_db:purchase_custom_stock.purchase_request_form_inherit
+msgid "Delivery Done"
+msgstr "تم التسليم"
+
+#. module: purchase_custom_stock
+#: model_terms:ir.ui.view,arch_db:purchase_custom_stock.purchase_request_form_inherit
+msgid "Create Asset Custody"
+msgstr "إنشاء عهدة أصول"
+
 #. module: purchase_requisition_custom
 #: model_terms:ir.ui.view,arch_db:purchase_requisition_custom.purchase_request_form
 msgid "Request Lines"
diff --git a/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml b/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
index 08ecabbc6..054be2c34 100644
--- a/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
+++ b/odex25_purchase/purchase_requisition_custom/views/purchase_requisition_custom.xml
@@ -182,12 +182,12 @@
                     <button type="object" name="action_approve_po" string="Confirm Purchase" class="oe_highlight" invisible="1"/>
 
                     <button type="object" name="action_select" groups="purchase_requisition_custom.committe_member"
-                    attrs="{'invisible':['|', ('state','in',['done','purchase','waiting','cancel']),('can_committee_vote', '=', False)]}"
-                    string="Select" class="btn-primary"/>
+                            attrs="{'invisible':['|', ('state','in',['done','purchase','waiting','cancel']),('can_committee_vote', '=', False)]}"
+                            string="Select" class="btn-primary" icon="fa-check-circle"/>
 
                     <button type="object" name="action_refuse" groups="purchase_requisition_custom.committe_member"
                             attrs="{'invisible':['|',('state','in',['done','purchase','waiting','cancel']),('can_committee_vote', '=', False)]}"
-                            string="Refuse" class="btn-danger"/>
+                            string="Refuse" class="btn-danger" icon="fa-times-circle"/>
                     <button type="object" name="action_recommend"
                             groups="purchase_requisition_custom.group_select_recommended_offer"
                             confirm="Are you sure you want to process ?"
@@ -197,14 +197,14 @@
                     <button type="object" name="action_unsign"
                             groups="purchase_requisition_custom.group_unsign_purchase_order" string="UnSign"
                             states="sign"/>
-                    <button type="object" name="budget_resend" string="Resend To Budget Check" class="oe_highlight"
-                            states="budget_rejected"/>
-                    <button type="object" name="action_budget" string="Send To Budget Check" class="oe_highlight"
-                            attrs="{'invisible':[('hide_action_budget_button', '=', True)]}"/>
+                    <button type="object" name="budget_resend" string="Resend To Budget Check" class="btn-info"
+                            states="budget_rejected" icon="fa-refresh"/>
+                    <button type="object" name="action_budget" string="Send To Budget Check" class="btn-primary"
+                            attrs="{'invisible':[('hide_action_budget_button', '=', True)]}" icon="fa-send"/>
                     <button name="action_skip_budget" type="object" string="Skip Budget"
                             attrs="{'invisible':[('hide_action_budget_button', '=', True)]}"
                             groups="purchase_requisition_custom.group_skip_purchase_budget"
-                            class="btn-warning"/>
+                            class="btn-warning" icon="fa-forward"/>
 <!--                    <button name="button_draft" states="cancel" string="Set to Draft" type="object"/>-->
                 </xpath>
                 <xpath expr="//button[@name='button_approve']" position="replace">
@@ -389,12 +389,12 @@
                             class="btn-primary"/>
                     <button type="object" groups="purchase.group_purchase_user" name="action_budget"
                             string="Send To Budget" attrs="{'invisible':['|', ('state','!=', 'purchase_manager'),('is_purchase_budget','=',False)]}"
-                            class="btn-primary"/>
+                            class="btn-primary" icon="fa-send"/>
 
                     <button name="action_skip_purchase_budget" type="object" string="Skip Budget"
                             attrs="{'invisible':['|', ('state','!=', 'purchase_manager'),('is_purchase_budget','=',False)]}"
                             groups="purchase_requisition_custom.group_skip_purchase_budget"
-                            class="btn-warning"/>
+                            class="btn-warning" icon="fa-forward"/>
 
                     <button type="object" groups="purchase_requisition_custom.group_approve_purchase_requisition"
                             name="action_approve" string="Approve" states="checked" class="btn-primary"/>
@@ -621,8 +621,8 @@
                     <field name="origin" invisible="1"/>
                     <field name="reject_reason" required="1"/>
                     <footer>
-                        <button name="action_reject" string="Confirm" type="object" class="oe_highlight"/>
-                        <button string="Cancel" class="btn btn-default" special="cancel"/>
+                        <button name="action_reject" string="Confirm" type="object" class="btn-danger" icon="fa-times-circle"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times"/>
                     </footer>
                 </form>
             </field>
@@ -636,8 +636,8 @@
                     <field name="order_id" invisible="1"/>
                     <field name="select_reason" required="1"/>
                     <footer>
-                        <button name="action_select" string="Confirm" type="object" class="oe_highlight"/>
-                        <button string="Cancel" class="btn btn-default" special="cancel"/>
+                        <button name="action_select" string="Confirm" type="object" class="btn-primary" icon="fa-check-circle"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times"/>
                     </footer>
                 </form>
             </field>
@@ -653,8 +653,8 @@
                     <field name="order_id" invisible="1"/>
                     <field name="refuse_reason" required="1"/>
                     <footer>
-                        <button name="action_refuse" string="Confirm" type="object" class="oe_highlight"/>
-                        <button string="Cancel" class="btn btn-default" special="cancel"/>
+                        <button name="action_refuse" string="Confirm" type="object" class="btn-danger" icon="fa-times-circle"/>
+                        <button string="Cancel" class="btn-secondary" special="cancel" icon="fa-times"/>
                     </footer>
                 </form>
             </field>