diff --git a/app/src/main/res/layout/activity_digital_gold_buy.xml b/app/src/main/res/layout/activity_digital_gold_buy.xml
index 8bff91e4c7..d13cb07e76 100644
--- a/app/src/main/res/layout/activity_digital_gold_buy.xml
+++ b/app/src/main/res/layout/activity_digital_gold_buy.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright © 2022 by Navi Technologies Private Limited
-  ~  *  * All rights reserved. Strictly confidential
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
@@ -79,7 +80,6 @@
                     android:layout_marginHorizontal="@dimen/layout_dp_56"
                     android:fontFamily="@font/navi_regular"
                     android:gravity="center"
-                    android:textFontWeight="@integer/integer_400"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_digital_gold_home.xml b/app/src/main/res/layout/activity_digital_gold_home.xml
index 8b0e470700..e2593af2e9 100644
--- a/app/src/main/res/layout/activity_digital_gold_home.xml
+++ b/app/src/main/res/layout/activity_digital_gold_home.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright © 2022 by Navi Technologies Private Limited
-  ~  *  * All rights reserved. Strictly confidential
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout>
 
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -72,7 +73,6 @@
                     android:layout_marginHorizontal="@dimen/layout_dp_56"
                     android:fontFamily="@font/navi_regular"
                     android:gravity="center"
-                    android:textFontWeight="@integer/integer_400"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_digital_gold_sell.xml b/app/src/main/res/layout/activity_digital_gold_sell.xml
index 4cb4949cb4..7201fa3ec1 100644
--- a/app/src/main/res/layout/activity_digital_gold_sell.xml
+++ b/app/src/main/res/layout/activity_digital_gold_sell.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright © 2022 by Navi Technologies Private Limited
-  ~  *  * All rights reserved. Strictly confidential
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
@@ -57,7 +58,6 @@
                     android:layout_marginHorizontal="@dimen/layout_dp_56"
                     android:fontFamily="@font/navi_regular"
                     android:gravity="center"
-                    android:textFontWeight="@integer/integer_400"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_digital_gold_transaction.xml b/app/src/main/res/layout/activity_digital_gold_transaction.xml
index 104350d391..eef67c035e 100644
--- a/app/src/main/res/layout/activity_digital_gold_transaction.xml
+++ b/app/src/main/res/layout/activity_digital_gold_transaction.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright © 2022 by Navi Technologies Private Limited
-  ~  *  * All rights reserved. Strictly confidential
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout>
 
     <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -57,7 +58,6 @@
                     android:layout_marginHorizontal="@dimen/layout_dp_56"
                     android:fontFamily="@font/navi_regular"
                     android:gravity="center"
-                    android:textFontWeight="@integer/integer_400"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/activity_referral_home.xml b/app/src/main/res/layout/activity_referral_home.xml
index 1bdd731b09..57090aeb0b 100644
--- a/app/src/main/res/layout/activity_referral_home.xml
+++ b/app/src/main/res/layout/activity_referral_home.xml
@@ -80,7 +80,6 @@
                     android:layout_marginHorizontal="@dimen/layout_dp_56"
                     android:fontFamily="@font/navi_regular"
                     android:gravity="center"
-                    android:textFontWeight="@integer/integer_400"
                     app:layout_constraintBottom_toBottomOf="parent"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/bottom_sheet_info_v3.xml b/app/src/main/res/layout/bottom_sheet_info_v3.xml
index d64792bb24..24e3a94e88 100644
--- a/app/src/main/res/layout/bottom_sheet_info_v3.xml
+++ b/app/src/main/res/layout/bottom_sheet_info_v3.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  * Copyright © 2019 by Navi Technologies Private Limited
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
   ~  * All rights reserved. Strictly confidential
-  ~  */
+  ~
   -->
 
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
@@ -51,7 +53,6 @@
                 android:fontFamily="@font/navi_bold"
                 android:gravity="center"
                 android:textColor="@color/white"
-                android:textFontWeight="@integer/integer_700"
                 android:textSize="@dimen/font_small"
                 android:visibility="gone"
                 tools:text="Continue"
diff --git a/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml b/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml
index df8a8d0d33..2f5fb580a3 100644
--- a/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml
+++ b/app/src/main/res/layout/dashboard_insurance_bottomsheet.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
+  -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
@@ -63,7 +71,6 @@
                 android:text="@string/skip"
                 android:textAllCaps="false"
                 android:textColor="@color/outrageous_orange"
-                android:textFontWeight="@integer/integer_700"
                 android:textSize="@dimen/sp_14"
                 tools:text="Skip" />
 
@@ -82,7 +89,6 @@
                 android:text="@string/text_continue"
                 android:textAllCaps="false"
                 android:textColor="@color/white"
-                android:textFontWeight="@integer/integer_700"
                 android:textSize="@dimen/sp_14" />
             
         </LinearLayout>
diff --git a/app/src/main/res/layout/success_fragment.xml b/app/src/main/res/layout/success_fragment.xml
index 01956c5125..fcb74b0514 100644
--- a/app/src/main/res/layout/success_fragment.xml
+++ b/app/src/main/res/layout/success_fragment.xml
@@ -46,7 +46,6 @@
                 android:clipToPadding="false"
                 tools:fontFamily="@font/navi_bold"
                 android:gravity="center"
-                android:textFontWeight="@integer/integer_800"
                 tools:text="Payment successful"
                 tools:textSize="@dimen/_14dp" />
 
diff --git a/navi-common/src/main/res/values/styles.xml b/navi-common/src/main/res/values/styles.xml
index d17ca0ade6..53adc57fac 100644
--- a/navi-common/src/main/res/values/styles.xml
+++ b/navi-common/src/main/res/values/styles.xml
@@ -1,8 +1,8 @@
 <!--
-  ~ /*
-  ~  * Copyright © 2019 by Navi Technologies Private Limited
+  ~
+  ~  * Copyright © 2019-2022 by Navi Technologies Limited
   ~  * All rights reserved. Strictly confidential
-  ~  */
+  ~
   -->
 
 <resources xmlns:tools="http://schemas.android.com/tools">
@@ -15,7 +15,6 @@
 
     <style name="TitleTextStyle">
         <item name="android:fontFamily">@font/navi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_700</item>
         <item name="android:textSize">@dimen/font_medium_large</item>
         <item name="android:textColor">@color/title_color_one</item>
     </style>
diff --git a/navi-design/src/main/res/values/styles.xml b/navi-design/src/main/res/values/styles.xml
index c46910725d..6b0cca889e 100644
--- a/navi-design/src/main/res/values/styles.xml
+++ b/navi-design/src/main/res/values/styles.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  * Copyright © 2022 by Navi Technologies Private Limited
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
   ~  * All rights reserved. Strictly confidential
-  ~  */
+  ~
   -->
 
 <resources>
@@ -152,7 +154,6 @@
     <style name="TitleTextStyle1">
         <item name="android:textColor">@color/titleColor</item>
         <item name="android:fontFamily">@font/navi_semi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_400</item>
         <item name="android:textSize">@dimen/sp_14</item>
     </style>
 
@@ -236,7 +237,6 @@
     <style name="Body6TextStyle">
         <item name="android:textColor">@color/titleSecondaryColor</item>
         <item name="android:fontFamily">@font/navi_regular</item>
-        <item name="android:textFontWeight">@integer/integer_400</item>
         <item name="android:textSize">@dimen/sp_14</item>
     </style>
 
@@ -342,7 +342,6 @@
         <item name="android:textSize">@dimen/sp_12</item>
         <item name="android:letterSpacing">0.01</item>
         <item name="android:fontFamily">@font/navi_regular</item>
-        <item name="android:textFontWeight">@integer/integer_400</item>
     </style>
 
     <style name="OfferTextStyle">
diff --git a/navi-hl/src/main/res/layout/layout_improve_loan_offer_graph.xml b/navi-hl/src/main/res/layout/layout_improve_loan_offer_graph.xml
index df46f7b0ec..44545727e1 100644
--- a/navi-hl/src/main/res/layout/layout_improve_loan_offer_graph.xml
+++ b/navi-hl/src/main/res/layout/layout_improve_loan_offer_graph.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
+  -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android">
 
     <data>
@@ -43,7 +51,6 @@
                 android:layout_marginVertical="@dimen/dp_4"
                 android:fontFamily="@font/navi_semi_bold"
                 android:textColor="@color/description_grey_color_seven"
-                android:textFontWeight="@integer/integer_600"
                 android:text="@{graphData.lockedOfferLabel.text}"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
@@ -85,7 +92,6 @@
                 android:paddingEnd="@dimen/dp_100"
                 android:text="@{graphData.currentOfferLabel.text}"
                 android:textColor="@color/description_grey_color_seven"
-                android:textFontWeight="@integer/integer_600"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -101,7 +107,6 @@
                 android:paddingStart="@dimen/dp_0"
                 android:paddingEnd="@dimen/dp_8"
                 android:textColor="@color/descriptionColor4"
-                android:textFontWeight="@integer/integer_700"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
@@ -128,7 +133,6 @@
                 android:fontFamily="@font/navi_semi_bold"
                 android:text="@{graphData.maxOfferLabel.text}"
                 android:textColor="@color/description_grey_color_seven"
-                android:textFontWeight="@integer/integer_600"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
@@ -142,7 +146,6 @@
                 android:fontFamily="@font/navi_bold"
                 android:paddingEnd="@dimen/dp_8"
                 android:textColor="@color/highlightColor"
-                android:textFontWeight="@integer/integer_700"
                 android:textSize="@dimen/sp_12"
                 app:layout_constraintBottom_toBottomOf="parent"
                 app:layout_constraintEnd_toEndOf="parent"
diff --git a/navi-insurance/src/main/res/layout/two_grid_layout.xml b/navi-insurance/src/main/res/layout/two_grid_layout.xml
index bb6ccfe059..2156c5897e 100644
--- a/navi-insurance/src/main/res/layout/two_grid_layout.xml
+++ b/navi-insurance/src/main/res/layout/two_grid_layout.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
+  -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
@@ -29,7 +37,6 @@
                     android:layout_marginStart="@dimen/dp_8"
                     android:layout_gravity="center_vertical|start"
                     tools:fontFamily="@font/navi_regular"
-                    tools:textFontWeight="@integer/integer_400"
                     tools:textSize="@dimen/sp_12"
                     android:padding="@dimen/dp_16"
                     tools:text="For all 4 concerning issues" />
@@ -41,7 +48,6 @@
                     android:layout_below="@+id/title_left"
                     android:layout_gravity="center_vertical|end"
                     tools:fontFamily="@font/navi_bold"
-                    tools:textFontWeight="@integer/integer_700"
                     tools:textColor="@color/black"
                     tools:textSize="@dimen/sp_18"
                     android:padding="@dimen/dp_16"
@@ -96,7 +102,6 @@
                     android:padding="@dimen/dp_16"
                     android:lineSpacingExtra="@dimen/dp_8"
                     tools:fontFamily="@font/navi_semi_bold"
-                    tools:textFontWeight="@integer/integer_600"
                     tools:text="Save 95% of your medical \ncosts with insurance" />
 
                 <Button
diff --git a/navi-insurance/src/main/res/values/styles.xml b/navi-insurance/src/main/res/values/styles.xml
index f335f0923d..d56937966d 100644
--- a/navi-insurance/src/main/res/values/styles.xml
+++ b/navi-insurance/src/main/res/values/styles.xml
@@ -1,8 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  * Copyright © 2019 by Navi Technologies Private Limited
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2021-2022 by Navi Technologies Limited
   ~  * All rights reserved. Strictly confidential
-  ~  */
+  ~
   -->
 
 <resources>
@@ -38,7 +40,6 @@
         <item name="android:textSize">14sp</item>
         <item name="textAllCaps">false</item>
         <item name="android:fontFamily">@font/navi_semi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_600</item>
         <item name="android:textColor">@color/text_secondary_color</item>
         <item name="singleLine">true</item>
         <item name="android:ellipsize">end</item>
@@ -114,7 +115,6 @@
     <style name="SubtitleFontStyle">
         <item name="android:textColor">@color/textSecondaryColor</item>
         <item name="android:fontFamily">@font/navi_regular</item>
-        <item name="android:textFontWeight">@integer/integer_400</item>
         <item name="android:textSize">@dimen/sp_14</item>
     </style>
 
@@ -415,7 +415,6 @@
 
     <style name="TextDescMediumFontStyle3">
         <item name="android:fontFamily">@font/navi_semi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_600</item>
         <item name="android:textSize">@dimen/font_medium</item>
         <item name="android:textColor">@color/title_color_one</item>
     </style>
@@ -423,7 +422,6 @@
         <item name="android:textSize">12sp</item>
         <item name="textAllCaps">false</item>
         <item name="android:fontFamily">@font/navi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_700</item>
     </style>
 
     <style name="ChipOrangeBorderTextStyle">
diff --git a/navi-vkyc/src/main/res/layout/vkyc_footer_view.xml b/navi-vkyc/src/main/res/layout/vkyc_footer_view.xml
index fe27acd93a..90e11ee09a 100644
--- a/navi-vkyc/src/main/res/layout/vkyc_footer_view.xml
+++ b/navi-vkyc/src/main/res/layout/vkyc_footer_view.xml
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /**
-  ~  * Copyright (c) 2022 . All rights reserved @Navi
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout xmlns:tools="http://schemas.android.com/tools">
 
     <data>
@@ -141,7 +145,6 @@
             android:clickable="true"
             android:focusable="true"
             android:fontFamily="@font/navi_bold"
-            android:textFontWeight="@integer/integer_700"
             android:gravity="center"
             android:text="@{footer.backCta.title}"
             android:textColor="@color/outrageous_orange"
@@ -175,7 +178,6 @@
             android:clickable="true"
             android:focusable="true"
             android:fontFamily="@font/navi_bold"
-            android:textFontWeight="@integer/integer_700"
             android:gravity="center"
             android:text="@{footer.nextCta.title}"
             android:textColor="@color/white"
diff --git a/navi-vkyc/src/main/res/layout/vkyc_navi_header_view.xml b/navi-vkyc/src/main/res/layout/vkyc_navi_header_view.xml
index 58494952d0..d8d60de2a9 100644
--- a/navi-vkyc/src/main/res/layout/vkyc_navi_header_view.xml
+++ b/navi-vkyc/src/main/res/layout/vkyc_navi_header_view.xml
@@ -1,8 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /**
-  ~  * Copyright (c) 2022 . All rights reserved @Navi
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
 
@@ -35,7 +39,6 @@
             android:layout_marginEnd="@dimen/layout_dp_16"
             android:layout_marginBottom="@dimen/layout_dp_20"
             android:fontFamily="@font/navi_regular"
-            android:textFontWeight="@integer/integer_400"
             android:gravity="center"
             android:padding="@dimen/layout_dp_4"
             app:layout_constraintBottom_toBottomOf="parent"
diff --git a/navi-widgets/src/main/res/layout/layout_title_subtitle_selected_count_widget.xml b/navi-widgets/src/main/res/layout/layout_title_subtitle_selected_count_widget.xml
index 85b111db55..b3248b1c5c 100644
--- a/navi-widgets/src/main/res/layout/layout_title_subtitle_selected_count_widget.xml
+++ b/navi-widgets/src/main/res/layout/layout_title_subtitle_selected_count_widget.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
+  -->
+
 <layout>
 
     <data>
@@ -49,7 +56,6 @@
                 android:layout_height="wrap_content"
                 android:text="@{data.selectedCount}"
                 android:textColor="@color/textTertiaryColor"
-                android:textFontWeight="@integer/integer_600"
                 app:layout_constraintBaseline_toBaselineOf="@+id/open_loans_title"
                 app:layout_constraintEnd_toEndOf="parent"
                 android:textSize="@dimen/sp_12"
diff --git a/navi-widgets/src/main/res/layout/row_loan_detail_v2.xml b/navi-widgets/src/main/res/layout/row_loan_detail_v2.xml
index a3c5c46cc4..c51e533cb1 100644
--- a/navi-widgets/src/main/res/layout/row_loan_detail_v2.xml
+++ b/navi-widgets/src/main/res/layout/row_loan_detail_v2.xml
@@ -1,11 +1,12 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ /*
-  ~  *
-  ~  *  * Copyright © 2022 by Navi Technologies Private Limited
-  ~  *  * All rights reserved. Strictly confidential
-  ~  *
-  ~  */
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
   -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
@@ -30,7 +31,6 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/navi_semi_bold"
             android:textColor="@color/titleColor1"
-            android:textFontWeight="@integer/integer_600"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:setTextFieldData="@{data.key}"
@@ -43,7 +43,6 @@
             android:layout_height="wrap_content"
             android:fontFamily="@font/navi_semi_bold"
             android:textColor="@color/titleColor1"
-            android:textFontWeight="@integer/integer_600"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintTop_toTopOf="parent"
             app:setTextFieldData="@{data.value}"
diff --git a/navi-widgets/src/main/res/layout/widget_announcement_call_out.xml b/navi-widgets/src/main/res/layout/widget_announcement_call_out.xml
index c8fd1af862..d339310a6b 100644
--- a/navi-widgets/src/main/res/layout/widget_announcement_call_out.xml
+++ b/navi-widgets/src/main/res/layout/widget_announcement_call_out.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
+  -->
+
 <layout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools">
@@ -52,7 +60,6 @@
                     app:layout_constraintStart_toEndOf="@+id/primary_icon_card"
                     app:layout_constraintTop_toTopOf="@+id/primary_icon_card"
                     tools:fontFamily="@font/navi_bold"
-                    tools:textFontWeight="@integer/integer_700"
                     tools:text="Still have questions?"
                     tools:textColor="@color/black" />
 
@@ -66,7 +73,6 @@
                     app:layout_constraintStart_toEndOf="@+id/primary_icon_card"
                     app:layout_constraintTop_toBottomOf="@id/title"
                     tools:fontFamily="@font/navi_semi_bold"
-                    tools:textFontWeight="@integer/integer_600"
                     tools:text="Here are some answers to help"
                     tools:textColor="@color/black" />
 
diff --git a/navi-widgets/src/main/res/values/styles.xml b/navi-widgets/src/main/res/values/styles.xml
index 82b60a95f6..1a5d637179 100644
--- a/navi-widgets/src/main/res/values/styles.xml
+++ b/navi-widgets/src/main/res/values/styles.xml
@@ -1,4 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
+
+<!--
+  ~
+  ~  * Copyright © 2021-2022 by Navi Technologies Limited
+  ~  * All rights reserved. Strictly confidential
+  ~
+  -->
+
 <resources>
 
     <style name="Small_Bold_DescriptionColorOne">
@@ -22,7 +30,6 @@
     <style name="Small_SemiBold_Davy_gray">
         <item name="android:textSize">@dimen/font_small</item>
         <item name="android:fontFamily">@font/navi_semi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_600</item>
         <item name="android:textColor">@color/davyGrey</item>
     </style>
 
@@ -53,7 +60,6 @@
     <style name="Medium_Bold_DescriptionColorNine">
         <item name="android:textSize">@dimen/font_medium</item>
         <item name="android:fontFamily">@font/navi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_700</item>
         <item name="android:textColor">@color/descriptionColor9</item>
     </style>
 
@@ -114,21 +120,18 @@
     <style name="Medium_Large_Bold_Dark_Grey">
         <item name="android:textSize">@dimen/font_medium_large</item>
         <item name="android:fontFamily">@font/navi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_700</item>
         <item name="android:textColor">@color/dark_gray</item>
     </style>
 
     <style name="Extra_Small_PriorityColor_Bold">
         <item name="android:textSize">@dimen/font_extra_small</item>
         <item name="android:fontFamily">@font/navi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_700</item>
         <item name="android:textColor">@color/priorityColor</item>
     </style>
 
     <style name="Small_Regular_Grey_Charcoal">
         <item name="android:textSize">@dimen/font_small</item>
         <item name="android:fontFamily">@font/navi_regular</item>
-        <item name="android:textFontWeight">@integer/integer_400</item>
         <item name="android:textColor">@color/grey_charcoal</item>
     </style>
 
@@ -246,7 +249,6 @@
     <style name="SmallTextSemiBoldDescriptionColorSeven">
         <item name="android:textColor">@color/description_colour_seven</item>
         <item name="android:fontFamily">@font/navi_semi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_600</item>
         <item name="android:textSize">@dimen/font_extra_small</item>
     </style>
 
@@ -300,7 +302,6 @@
         <item name="android:textSize">@dimen/font_extra_small</item>
         <item name="android:textColor">@color/greyish_brown</item>
         <item name="android:fontFamily">@font/navi_semi_bold</item>
-        <item name="android:textFontWeight">@integer/integer_600</item>
         <item name="android:letterSpacing">0.02</item>
     </style>
 
@@ -328,7 +329,6 @@
     <style name="SmallExtraBoldNaviBlueStyle">
         <item name="android:textColor">@color/naviBlue</item>
         <item name="android:fontFamily">@font/navi_extra_bold</item>
-        <item name="android:textFontWeight">@integer/integer_800</item>
         <item name="android:textSize">@dimen/font_small</item>
     </style>