diff --git a/appconfig/src/main/java/nl/rijksoverheid/ctr/appconfig/AppLockedFragment.kt b/appconfig/src/main/java/nl/rijksoverheid/ctr/appconfig/AppLockedFragment.kt
index d4f94dc9b..5787242d6 100644
--- a/appconfig/src/main/java/nl/rijksoverheid/ctr/appconfig/AppLockedFragment.kt
+++ b/appconfig/src/main/java/nl/rijksoverheid/ctr/appconfig/AppLockedFragment.kt
@@ -10,7 +10,6 @@ package nl.rijksoverheid.ctr.appconfig
 
 import android.annotation.SuppressLint
 import android.content.Intent
-import android.net.Uri
 import android.os.Bundle
 import android.view.View
 import androidx.annotation.DrawableRes
@@ -52,17 +51,13 @@ class AppLockedFragment : Fragment(R.layout.fragment_app_locked) {
                     R.string.app_status_deactivated_action,
                     R.drawable.illustration_app_status_deactivated
                 ) {
-                    startActivity(
-                        Intent(
-                            Intent.ACTION_VIEW, Uri.parse(
-                                getString(
-                                    if (isVerifierApp(requireContext())) {
-                                        R.string.verifier_deactivation_url
-                                    } else {
-                                        R.string.holder_deactivation_url
-                                    }
-                                )
-                            )
+                    intentUtil.openUrl(
+                        requireContext(), getString(
+                            if (isVerifierApp(requireContext())) {
+                                R.string.verifier_deactivation_url
+                            } else {
+                                R.string.holder_deactivation_url
+                            }
                         )
                     )
                 }
@@ -78,10 +73,16 @@ class AppLockedFragment : Fragment(R.layout.fragment_app_locked) {
                 }
             }
             is AppStatus.LaunchError -> {
-                val helpdeskPhoneNumber = cachedAppConfigUseCase.getCachedAppConfig().contactInfo.phoneNumber
+                val helpdeskPhoneNumber =
+                    cachedAppConfigUseCase.getCachedAppConfig().contactInfo.phoneNumber
                 binding.bind(
                     R.string.appstatus_launchError_title,
-                    getString(R.string.appstatus_launchError_body, helpdeskPhoneNumber, helpdeskPhoneNumber, appStatus.errorMessage),
+                    getString(
+                        R.string.appstatus_launchError_body,
+                        helpdeskPhoneNumber,
+                        helpdeskPhoneNumber,
+                        appStatus.errorMessage
+                    ),
                     R.string.appstatus_launchError_button,
                     R.drawable.illustration_app_status_launch_error
                 ) {
diff --git a/appconfig/src/main/res/drawable-night/illustration_app_status_deactivated.xml b/appconfig/src/main/res/drawable-night/illustration_app_status_deactivated.xml
index 643e4aa96..2080371f0 100644
--- a/appconfig/src/main/res/drawable-night/illustration_app_status_deactivated.xml
+++ b/appconfig/src/main/res/drawable-night/illustration_app_status_deactivated.xml
@@ -4,186 +4,189 @@
     android:viewportWidth="375"
     android:viewportHeight="260">
   <path
-      android:pathData="M223.62,64.64a10.46,8.17 90,1 1,-16.34 0a10.46,8.17 90,1 1,16.34 0z"
-      android:fillColor="#002B42"/>
-  <path
-      android:pathData="M141,245.22C141,246.72 171.2,247.91 196.91,247.91C222.62,247.91 236.27,246.62 236.27,245.22C236.27,243.83 222.42,242.53 196.81,242.53C171.2,242.53 141,243.73 141,245.22Z"
+      android:pathData="M186.3,251C219.99,251 247.3,249.75 247.3,248.2C247.3,246.66 219.99,245.4 186.3,245.4C152.61,245.4 125.3,246.66 125.3,248.2C125.3,249.75 152.61,251 186.3,251Z"
       android:fillColor="#053157"/>
   <path
-      android:pathData="M192.42,93.84L181.06,110.09L175.48,94.44L168.71,94.24C168.71,94.24 170.5,109.19 175.08,117.56C177.38,121.65 180.76,121.95 183.45,120.25C190.93,115.37 196.11,106.7 196.11,106.7L192.42,93.84Z"
-      android:fillColor="#CCA819"/>
-  <path
-      android:pathData="M217.34,129.12C217.34,129.12 229.5,138.89 224.41,158.52C223.91,160.41 223.62,162.3 223.52,164.2L222.62,193.3H176.48L192.12,128.62L217.34,129.12Z"
-      android:fillColor="#CCA819"/>
-  <path
-      android:pathData="M217.24,70.12L214.45,88.26L202.59,88.56L208.97,74.01L217.24,70.12Z"
-      android:fillColor="#C26E5E"/>
-  <path
-      android:pathData="M205.88,81.19L207.27,77.9L212.06,77.4L205.88,81.19Z"
-      android:fillColor="#A95643"/>
-  <path
-      android:pathData="M208.67,78.29C214.05,77.79 219.43,73.31 219.43,67.93C219.53,62.45 215.15,58.06 209.76,58.06C207.07,58.06 204.68,59.16 202.99,61.05C202.39,61.65 201.89,62.45 201.39,63.24C200.6,64.64 200,66.23 199.8,67.93C198.8,74.51 202.49,78.89 208.67,78.29Z"
-      android:fillColor="#C26E5E"/>
-  <path
-      android:pathData="M209.78,65.14L206.79,64.56C206.69,64.57 206.58,64.47 206.67,64.35C206.65,64.23 206.74,64.11 206.85,64.21L209.84,64.79C209.94,64.78 210.05,64.88 209.96,65C209.98,65.12 209.88,65.13 209.78,65.14Z"
-      android:fillColor="#002031"/>
+      android:pathData="M195.34,84.8H188.34C188.34,84.2 188.84,83.7 189.44,83.7H194.14C194.74,83.6 195.34,84.1 195.34,84.8Z"
+      android:fillColor="#104A4A"/>
   <path
-      android:pathData="M203.75,64.73L201.36,65.06C201.26,65.09 201.14,65.02 201.11,64.92C201.09,64.83 201.15,64.7 201.25,64.68L203.65,64.34C203.74,64.32 203.87,64.39 203.89,64.48C203.92,64.58 203.85,64.7 203.75,64.73Z"
-      android:fillColor="#002031"/>
+      android:pathData="M198.74,80.2H192.54C191.84,80.2 191.34,80.9 191.54,81.5L192.54,85.4L197.44,84.7L198.74,80.2Z"
+      android:fillColor="#237978"/>
   <path
-      android:pathData="M204.44,73C204.54,73 204.44,73 204.44,73L207.74,72.4C207.84,72.4 207.94,72.3 207.94,72.2C207.94,72.1 207.84,72 207.74,72L204.44,72.6C204.34,72.6 204.24,72.7 204.24,72.8C204.34,72.9 204.34,73 204.44,73Z"
-      android:fillColor="#002031"/>
+      android:pathData="M190.64,143.6L191.14,128.5L206.44,131.2L206.04,144.3L190.64,143.6Z"
+      android:fillColor="#59ACF5"/>
   <path
-      android:pathData="M201.69,62.85C201.69,62.85 209.07,62.45 209.86,61.75L203.19,61.05C202.49,61.65 202.09,62.05 201.69,62.85Z"
-      android:fillColor="#A95643"/>
+      android:pathData="M152.94,68.7L158.64,66.6L158.54,66.3L159.64,66.4C159.64,66.4 159.64,66.4 159.74,66.4H159.84C160.64,66.5 161.34,67 161.64,67.8L167.34,84.1C167.74,85.2 167.14,86.5 166.04,86.9L160.14,89C159.04,89.4 157.74,88.8 157.34,87.7L151.64,71.4C151.24,70.3 151.84,69.1 152.94,68.7Z"
+      android:fillColor="#0C268D"/>
   <path
-      android:pathData="M201.49,52.68C201.79,52.98 201.99,53.28 201.99,53.28C201.99,53.28 202.69,50.99 203.78,50.69C204.18,50.59 204.68,50.49 205.08,50.69C205.98,50.89 206.67,51.19 207.57,51.89C208.17,52.28 209.26,51.49 210.36,51.29C212.45,50.99 213.05,52.98 214.55,53.58C215.24,53.88 215.84,54.18 216.44,54.58C216.84,54.87 217.14,55.17 217.44,55.47C217.54,55.67 217.74,55.77 217.74,55.97C217.84,56.37 217.64,56.67 217.44,56.97C216.84,57.86 212.35,61.15 210.26,61.55C208.17,62.05 206.08,61.95 203.98,61.55C203.19,61.45 202.39,61.25 201.59,60.85C200.79,60.56 200.2,59.96 199.7,59.26C199.3,58.56 199.3,57.86 199.1,57.07C199.1,56.87 199.3,54.78 199.6,53.08C199.8,52.38 200.89,52.08 201.49,52.68Z"
-      android:fillColor="#002B42"/>
+      android:pathData="M164.74,86.8L158.84,88.9C157.74,89.3 156.44,88.7 156.04,87.6L150.34,71.3C149.94,70.2 150.54,68.9 151.64,68.5L157.54,66.4C158.64,66 159.94,66.6 160.34,67.7L166.04,84C166.44,85.2 165.84,86.4 164.74,86.8Z"
+      android:fillColor="#1540EB"/>
   <path
-      android:pathData="M188.54,101.82C189.23,96.73 192.92,93.54 196.51,89.46C197.51,88.26 198.8,87.36 200.3,86.87L202.39,86.17C202.89,86.07 203.29,85.87 203.68,85.57C204.78,83.58 205.88,81.29 205.88,81.29L215.54,81.68L215.24,83.68C215.15,84.87 215.94,86.07 217.14,86.47L221.62,87.66H221.52C227.1,87.96 230.89,92.94 229.99,98.82L227.7,105.9L223.82,106.5C223.82,106.5 219.03,115.27 217.74,129.52L192.22,129.22C192.62,125.83 187.84,106.8 188.54,101.82Z"
-      android:fillColor="#CCA819"/>
+      android:pathData="M158.34,76.6L152.24,79.9C150.44,81 149.64,83.2 150.24,85.2L152.94,94.3L160.64,91.3L158.84,85.8L162.04,83.1L158.34,76.6Z"
+      android:fillColor="#C8915C"/>
   <path
-      android:pathData="M242.05,113.28C231.69,109.39 221.12,105.81 210.46,102.62C203.88,100.62 197.11,98.73 190.03,97.23L190.13,97.13C190.73,96.14 191.33,95.24 192.02,94.44L192.42,93.95V94.05C192.92,93.45 193.42,92.85 193.92,92.25C200.2,93.65 206.27,95.44 212.05,97.13C215.15,98.03 218.33,99.03 221.42,100.03C213.65,95.74 205.78,91.75 197.71,88.17C198.4,87.67 199.2,87.17 200.1,86.87L202.19,86.17C202.69,86.07 203.09,85.87 203.49,85.57C204.58,83.58 205.68,81.29 205.68,81.29L207.07,81.39C209.76,82.09 212.45,82.88 215.15,83.68V83.78C215.04,84.98 215.84,86.17 217.04,86.57L221.52,87.77H221.42C225.31,87.97 228.4,90.56 229.49,94.05C229.79,94.44 230.09,94.94 230.49,95.54C225.01,93.35 219.43,91.25 213.75,89.46C220.53,92.75 227.3,96.54 233.78,100.42C236.97,105.31 240.56,110.89 242.05,113.28Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M180.84,88.8L167.14,108.6L160.24,90.4L151.74,90.7C151.74,90.7 155.04,108.7 159.34,117.4C161.84,122.6 168.14,122.3 171.44,120.2C180.54,114.2 187.54,107.4 187.54,107.4L180.84,88.8Z"
+      android:fillColor="#237978"/>
   <path
-      android:pathData="M180.26,107.9L181.06,110.09L182.36,108.3C195.01,110.99 207.27,114.97 219.33,119.16C218.93,120.95 218.53,122.85 218.23,124.94C209.07,121.75 199.8,118.66 190.33,116.17C190.23,115.67 190.13,115.17 190.03,114.68C189.63,115.07 189.23,115.47 188.93,115.87C186.04,115.17 183.15,114.47 180.26,113.88C182.76,114.97 185.15,116.07 187.54,117.17C186.24,118.26 184.95,119.36 183.55,120.36C183.05,120.65 182.56,120.85 182.06,121.05C179.87,120.06 177.67,119.06 175.38,118.06C175.28,117.96 175.18,117.76 175.18,117.66C173.69,114.47 172.19,111.39 171,105.81C173.89,106.2 177.18,107.3 180.26,107.9Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M187.74,92H186.54L187.34,90.7L187.74,92Z"
+      android:fillColor="#F48D91"/>
   <path
-      android:pathData="M214.95,193.2H207.17C206.27,192.41 205.28,191.61 204.18,190.81C196.71,185.33 188.74,180.55 180.66,175.86L182.66,167.49C194.02,171.38 205.18,175.96 215.94,181.35C208.87,175.96 201.39,171.18 193.52,167.09C190.33,165.5 187.14,163.9 183.85,162.41L186.54,151.35C197.71,154.84 208.77,158.92 219.53,163.61C210.06,157.23 200.2,151.55 190.03,146.57C189.33,146.27 188.64,145.87 187.94,145.57L189.33,139.79C190.43,140.29 191.53,140.79 192.52,141.28C203.49,146.57 213.95,152.74 224.01,159.62C223.71,161.01 223.52,162.51 223.42,164.01L223.22,171.58C211.66,166.3 199.7,161.61 187.54,157.73C190.43,159.12 193.32,160.52 196.11,162.01C205.68,166.99 214.55,172.87 222.92,179.65L222.52,191.51C222.02,191.21 221.52,191.01 221.02,190.71L220.93,190.61C213.35,186.43 205.58,182.74 197.6,179.35C200.89,181.45 204.18,183.74 207.37,186.03C210.36,188.22 213.05,190.51 214.95,193.2Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M155.74,80.9C155.64,80.9 155.64,80.9 155.54,80.8C155.44,80.7 155.54,80.6 155.64,80.5L159.24,78.3C159.34,78.2 159.44,78.3 159.54,78.4C159.64,78.5 159.54,78.6 159.44,78.7L155.84,80.9C155.84,80.9 155.74,80.9 155.74,80.9Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M191.33,131.91C200.89,134.51 210.36,137.69 219.53,141.28C210.56,135.6 201.29,130.42 191.82,125.74C191.63,123.84 191.13,121.35 190.63,118.66C203.09,124.64 215.04,131.42 226.6,138.89C225.71,139.69 224.91,140.38 224.41,140.88C225.11,143.47 225.61,146.46 225.51,149.85C213.85,145.17 201.99,140.68 189.83,137.49L191.33,131.91Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M157.24,83.2C157.14,83.2 157.14,83.2 157.04,83.1C156.94,83 157.04,82.9 157.14,82.8L160.54,80.5C160.64,80.4 160.74,80.5 160.84,80.6C160.94,80.7 160.84,80.8 160.74,80.9L157.34,83.2C157.34,83.2 157.34,83.2 157.24,83.2Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M177.18,99.33C175.48,98.73 171.4,95.44 171.1,94.45H175.48L177.18,99.33Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M217.84,131.8C217.84,131.8 218.54,139.4 218.74,153.1C218.94,166.8 219.74,236.9 219.74,236.9L210.24,238.5L198.34,131.3L217.84,131.8Z"
+      android:fillColor="#2793F2"/>
   <path
-      android:pathData="M231.69,119.86L229,116.77C233.38,119.36 237.57,122.05 241.75,124.84C241.45,125.14 241.26,125.44 240.96,125.74C239.86,126.93 237.67,128.93 235.28,131.12L230.69,129.42C228.5,128.63 226.31,127.83 224.11,127.03L231.69,119.86Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M200.84,143.3L163.74,238.1L157.14,242.1L153.74,237.2L184.14,131.1L196.24,130.3C196.34,130.3 200.74,131.2 200.84,143.3Z"
+      android:fillColor="#2793F2"/>
   <path
-      android:pathData="M177.87,187.62L179.27,181.94C184.35,183.74 189.23,185.93 194.02,188.02C198,189.82 202.09,191.61 206.27,193.2H191.33C186.74,191.21 182.36,189.22 177.87,187.62Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M190.04,84.7H218.54C223.94,84.7 230.04,89.5 229.24,95.1L227.14,101.7L223.54,102.3L218.84,131.9L185.34,131.6C184.04,131.6 183.04,130.6 182.94,129.3C182.64,123.3 181.94,107.2 181.74,99.5C181.64,96.5 179.54,94.2 179.64,93.3C180.04,86.8 184.94,84.7 190.04,84.7Z"
+      android:fillColor="#237978"/>
   <path
-      android:pathData="M219.53,117.96C208.87,111.98 197.8,106.8 186.44,102.32L189.83,97.43C200.6,101.72 211.06,106.7 221.22,112.28C220.73,113.88 220.13,115.77 219.53,117.96Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M152.54,234.8L145.04,240.2L140.54,242.4C138.34,243.6 138.34,245.7 138.34,245.7H167.04L165.84,236.4C165.64,235.7 164.34,235.6 164.14,236.2C163.64,237.5 161.54,238.3 159.74,238.4C157.14,238.5 156.24,236.7 154.84,235.2C154.24,234.6 153.34,234.4 152.54,234.8Z"
+      android:fillColor="#FFCC00"/>
   <path
-      android:pathData="M214.15,140.18C214.35,140.18 214.45,140.08 214.45,139.88L216.34,107.1C217.04,93.34 219.73,89.26 221.82,88.26C223.32,87.56 224.61,88.46 224.71,88.46C224.91,88.56 225.11,88.56 225.21,88.36C225.31,88.16 225.31,87.96 225.11,87.86C225.01,87.86 223.52,86.67 221.52,87.56C218.13,89.16 216.24,95.74 215.64,107L213.75,139.78C213.75,139.98 213.95,140.18 214.15,140.18Z"
+      android:pathData="M165.44,248.8H140.04C139.04,248.8 138.24,248 138.24,247V245.6H167.14L167.24,246.8C167.34,247.9 166.54,248.8 165.44,248.8Z"
       android:fillColor="#EDEDED"/>
   <path
-      android:pathData="M231.79,139.28L235.08,154.53L215.64,154.63L212.75,138.58L231.79,139.28Z"
-      android:fillColor="#478F8E"/>
+      android:pathData="M148.84,241L145.64,240L145.84,239.4L149.04,240.4L148.84,241Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M207.57,154.63L210.96,138.58H212.75L215.64,154.63H207.57Z"
-      android:fillColor="#104A4A"/>
+      android:pathData="M148.1,237.81L147.93,238.38L151.19,239.35L151.36,238.77L148.1,237.81Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M224.91,148.55L232.19,139.48C232.29,139.38 232.29,139.08 232.09,138.98C231.99,138.88 231.69,138.88 231.59,139.08L224.81,147.65L213.55,138.59C213.45,138.49 213.15,138.49 213.05,138.68C212.95,138.78 212.95,139.08 213.15,139.18L224.91,148.55Z"
+      android:pathData="M220.84,234.8L225.34,240.2L228.04,242.4C230.34,243.6 230.34,245.7 230.34,245.7H208.64L209.04,237.4C209.04,237.4 211.84,237.5 214.34,237.5C214.34,237.5 214.84,236.2 216.34,234.8C217.04,234.1 219.84,233.4 220.84,234.8Z"
+      android:fillColor="#FFCC00"/>
+  <path
+      android:pathData="M210.34,248.8H228.44C229.54,248.8 230.34,247.9 230.44,246.9V245.7H208.44L208.34,246.8C208.34,247.9 209.24,248.8 210.34,248.8Z"
       android:fillColor="#EDEDED"/>
   <path
-      android:pathData="M217.34,134.9L214.75,136.69C212.26,138.39 210.86,141.28 210.96,144.27L211.26,152.14H217.84L219.93,146.26L222.12,143.27L222.82,141.08L224.51,138.98L217.34,134.9Z"
-      android:fillColor="#C26E5E"/>
+      android:pathData="M222.14,239.3L222.12,240L225.72,240.09L225.74,239.39L222.14,239.3Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M204.98,70.62C205.08,70.62 205.28,70.52 205.28,70.32C205.28,70.12 205.18,70.02 205.08,69.92C204.88,69.92 204.38,69.72 204.28,69.43C204.18,69.23 204.68,68.23 204.98,67.73C205.18,67.23 205.48,66.83 205.58,66.54C205.68,66.34 205.58,66.14 205.38,66.14C205.18,66.14 204.98,66.14 204.98,66.34C204.88,66.64 204.68,67.03 204.48,67.43C203.88,68.53 203.59,69.23 203.78,69.72C203.88,70.32 204.78,70.62 204.98,70.62C204.88,70.62 204.98,70.62 204.98,70.62Z"
+      android:pathData="M219.77,237.44L219.75,238.14L223.94,238.29L223.97,237.59L219.77,237.44Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M210.16,137.19L216.44,135.6L216.24,138.79L210.16,138.59V137.19Z"
-      android:fillColor="#C26E5E"/>
+      android:pathData="M221.94,134.8L220.64,135.6C219.44,136.3 217.94,136.3 216.74,135.7L215.14,134.9L209.04,137.5C208.44,137.8 207.74,137.7 207.24,137.3L205.54,135.9C204.84,135.3 204.84,134.2 205.54,133.6C206.64,132.6 207.94,131.4 207.84,131.4C207.74,131.5 206.04,131.9 205.04,132.2C204.54,132.3 204.04,132 203.94,131.6C203.84,131.1 204.04,130.7 204.44,130.5L210.04,128.3C211.44,127.6 212.84,127.8 214.44,128.2L217.34,128.7L221.94,134.8Z"
+      android:fillColor="#C8915C"/>
   <path
-      android:pathData="M216.64,135.3C216.64,135.3 218.13,140.98 221.22,144.37L221.92,143.37L222.62,141.18L222.82,140.88L216.64,135.3Z"
-      android:fillColor="#A95643"/>
+      android:pathData="M206.94,137.3C206.84,137.3 206.84,137.3 206.74,137.2C206.64,137.1 206.74,137 206.84,136.9L212.64,133.3C212.74,133.2 212.84,133.3 212.94,133.4C213.04,133.5 212.94,133.6 212.84,133.7L207.04,137.3C206.94,137.3 206.94,137.3 206.94,137.3Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M215.64,148.06l-0.7,0l-0,4.09l0.7,0z"
+      android:pathData="M205.64,136C205.54,136 205.54,136 205.44,135.9C205.34,135.8 205.44,135.7 205.44,135.6L210.64,131.8C210.74,131.7 210.84,131.8 210.94,131.8C211.04,131.9 210.94,132 210.94,132.1L205.74,135.9C205.74,135.9 205.64,136 205.64,136Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M228.4,92.05C228.4,92.05 239.96,109.69 242.35,113.68C244.74,117.66 244.54,122.05 241.06,125.64C237.57,129.22 223.82,141.48 223.82,141.48L216.24,134.7L231.79,119.66L218.33,104.01L228.4,92.05Z"
-      android:fillColor="#CCA819"/>
+      android:pathData="M226.44,88.1C226.44,88.1 240.14,103.5 243.24,107.4C246.14,111.1 245.74,115.4 241.94,118.8C238.54,121.8 221.74,135.1 221.74,135.1L216.04,127.1L230.44,112.3L213.44,96.3L226.44,88.1Z"
+      android:fillColor="#237978"/>
   <path
-      android:pathData="M213.66,152.16l-0.01,-5.58l-0.7,0l0.01,5.58z"
+      android:pathData="M231.94,114.1L229.64,111.5L233.54,112.3L233.44,113L231.44,112.5L232.44,113.6L231.94,114.1Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M202.29,66.64m0.6,0a0.6,0.6 0,1 0,-1.2 0a0.6,0.6 0,1 0,1.2 0"
+      android:pathData="M220.85,102.8L220.43,103.23L224,106.74L224.42,106.31L220.85,102.8Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M207.77,66.93m0.6,0a0.6,0.6 0,1 0,-1.2 0a0.6,0.6 0,1 0,1.2 0"
-      android:fillColor="#002031"/>
+      android:pathData="M195.34,84.8L191.84,93.1L194.74,131.6L202.84,131.7L206.14,84.5L195.34,84.8Z"
+      android:fillColor="#FE6F43"/>
   <path
-      android:pathData="M190.03,116.17C190.33,116.17 190.43,115.97 190.33,115.77L188.64,106.8C188.54,106.3 188.44,105.8 188.44,105.31C188.14,101.62 189.43,97.83 191.82,94.94C191.93,94.84 191.93,94.54 191.82,94.44C191.73,94.34 191.43,94.34 191.33,94.44C188.74,97.53 187.44,101.42 187.74,105.31C187.74,105.9 187.84,106.4 187.94,106.9L189.63,115.87C189.73,116.07 189.83,116.17 190.03,116.17Z"
-      android:fillColor="#141415"/>
+      android:pathData="M205.54,93.3L205.64,92.4H205.54C201.04,94.3 196.54,96.6 192.34,99.2L192.44,100.1C196.54,97.5 200.94,95.2 205.54,93.3Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M219.93,193.2L217.54,229.18L209.17,229.27L207.07,193.2H219.93Z"
-      android:fillColor="#C26E5E"/>
+      android:pathData="M204.34,110.1L204.44,109.3C202.44,109.7 200.54,110.3 198.64,110.8C196.94,111.3 195.14,111.8 193.34,112.2L193.44,113C195.24,112.6 197.14,112.1 198.84,111.5C200.64,111 202.44,110.5 204.34,110.1Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M194.52,193.2L182.86,228.28L173.49,228.68L181.46,193.2H194.52Z"
-      android:fillColor="#C26E5E"/>
+      android:pathData="M204.04,113C200.44,114.5 197.04,116.3 193.64,118.3L193.74,119.2C193.84,119.2 193.84,119.1 193.94,119.1C197.14,117.2 200.54,115.4 204.04,113.9V113Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M226.8,93.94L228.4,92.05C228.4,92.05 229.3,93.35 230.59,95.34C229.3,94.84 228.1,94.44 226.8,93.94Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M191.84,93.9C196.24,92.1 200.94,90.9 205.74,90.3L205.84,89.5C201.04,90.1 196.34,91.3 191.84,93.1V93.9Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M231.69,119.86L229,116.77C233.38,119.36 237.57,122.05 241.75,124.84C241.45,125.14 241.26,125.44 240.96,125.74C239.86,126.93 237.67,128.92 235.28,131.12L230.69,129.42C228.5,128.63 226.31,127.83 224.11,127.03L231.69,119.86Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M203.04,127.9C200.44,129.4 197.64,130.2 194.64,130.4L194.74,131.2C197.64,131 200.44,130.2 202.94,128.8L203.04,127.9Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M219.33,105.4L218.23,104.21L225.41,95.64C228.2,97.23 230.99,98.83 233.78,100.52C236.87,105.3 240.46,110.89 242.05,113.38C234.58,110.49 226.9,107.89 219.33,105.4Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M194.44,127.6L194.54,128.5C197.44,126.7 200.34,125.1 203.34,123.6L203.44,122.7C200.34,124.2 197.34,125.8 194.44,127.6Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M216.14,134.9L217.74,133.31C220.73,135.1 223.71,137 226.71,138.99C224.91,140.59 223.71,141.68 223.71,141.68L216.14,134.9Z"
-      android:fillColor="#FEDE6A"/>
+      android:pathData="M192.54,102.7L192.64,103.5C195.84,103 198.94,102.1 202.04,101.1C203.04,100.8 204.04,100.5 205.14,100.2L205.24,99.4C204.14,99.7 203.04,100.1 201.84,100.4C198.74,101.3 195.64,102.2 192.54,102.7Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M183.65,228.28L172.69,227.88L172.09,234.06L166.71,242.23L162.73,243.13C161.93,243.33 161.43,244.13 161.63,244.82C161.73,245.52 162.43,246.02 163.12,246.02H173.49C173.89,246.02 174.29,245.82 174.49,245.42L177.97,239.84V246.02H180.76L183.35,237.65L182.16,233.76L183.65,228.28Z"
-      android:fillColor="#59ACF5"/>
+      android:pathData="M198.84,121.6C200.44,121 201.94,120.4 203.64,119.9L203.74,119.1C202.04,119.6 200.34,120.3 198.64,120.9C197.14,121.5 195.64,122 194.14,122.5L194.24,123.3C195.74,122.8 197.24,122.2 198.84,121.6Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M208.37,229.27L218.43,229.18L217.74,235.45L219.83,243.13L221.42,243.43C222.12,243.53 222.62,244.02 222.62,244.72C222.62,245.42 222.02,246.02 221.32,246.02H215.24C214.55,246.02 213.95,245.62 213.75,244.92L212.15,241.04L211.76,246.02H209.66L208.47,238.15L209.46,235.75L208.37,229.27Z"
-      android:fillColor="#59ACF5"/>
+      android:pathData="M193.04,109.2L193.14,110.1C195.04,108.8 197.24,107.8 199.24,106.9L204.84,104.3L204.94,103.4L199.04,106.2C197.04,107 194.94,108 193.04,109.2Z"
+      android:fillColor="#FE9C7E"/>
   <path
-      android:pathData="M217.84,243.23H220.23C220.33,243.23 220.43,243.13 220.43,243.03C220.43,242.93 220.33,242.83 220.23,242.83H217.84C217.74,242.83 217.64,242.93 217.64,243.03C217.64,243.13 217.74,243.23 217.84,243.23Z"
-      android:fillColor="#141415"/>
+      android:pathData="M209.84,67.3L208.74,84.6L200.34,88.1L197.44,84.8L200.94,72L209.84,67.3Z"
+      android:fillColor="#C8915C"/>
   <path
-      android:pathData="M221.92,54.78m6.78,0a6.78,6.78 0,1 0,-13.55 0a6.78,6.78 0,1 0,13.55 0"
+      android:pathData="M211.24,56.6C211.54,56 210.84,54.3 209.04,53.1C207.44,51.9 205.14,51.5 203.04,51.6C198.44,52 196.54,54.1 196.54,54.1C196.54,54.1 195.04,54 194.74,54.7C194.14,56.1 194.84,57 195.24,57.3C195.34,57.3 195.34,57.4 195.44,57.4C195.64,57.4 195.74,57.5 195.74,57.6C198.44,59.3 202.54,61.2 205.24,61.9L210.74,63.4C211.24,63.5 212.44,63.6 212.44,63.1C213.04,57 211.94,56.6 211.24,56.6Z"
       android:fillColor="#002B42"/>
   <path
-      android:pathData="M221.02,69.42a2.29,1.99 90,1 1,-3.99 0a2.29,1.99 90,1 1,3.99 0z"
-      android:fillColor="#C26E5E"/>
+      android:pathData="M212.34,64.3C211.84,69.9 207.44,74.9 201.94,75.8C195.64,76.9 191.54,72.6 192.04,65.7C192.54,59.6 196.54,53.3 202.14,52.9C207.84,52.6 213.04,56.8 212.34,64.3Z"
+      android:fillColor="#C8915C"/>
   <path
-      android:pathData="M216.94,68.63C216.74,69.13 216.64,69.73 216.14,69.73C215.74,69.73 215.44,67.83 215.44,67.43C213.65,67.13 212.45,66.24 211.26,64.84C210.16,63.45 209.56,61.55 209.66,59.76C209.66,59.56 209.66,59.36 209.86,59.26C209.96,59.16 210.06,59.16 210.16,59.06C211.96,58.26 213.85,57.47 215.64,56.57C216.84,57.77 218.04,59.06 219.13,60.46C219.93,61.55 220.73,62.75 220.93,64.04C221.02,64.54 221.02,65.14 220.83,65.54C220.83,65.54 220.43,67.03 219.63,67.13C218.73,67.23 217.34,67.43 216.94,68.63Z"
+      android:pathData="M209.74,68L209.54,71.3C210.24,70.4 210.84,69.4 211.34,68.4L209.74,68Z"
+      android:fillColor="#002031"/>
+  <path
+      android:pathData="M208.24,67.7L208.14,67.8L208.24,67.7Z"
+      android:fillColor="#002031"/>
+  <path
+      android:pathData="M192.54,63.4L192.44,66.6C192.44,67.5 193.14,68.2 194.04,68.2H194.34C194.84,67.8 195.44,67.6 196.14,67.6L199.84,67.8C200.84,67.8 201.74,68.3 202.34,69.1L202.44,69.3C203.04,70 203.84,70.3 204.74,70.3C205.74,70.2 206.54,69.6 206.94,68.8L209.04,64.4L211.04,66.9L208.94,72.2C207.84,75.1 205.64,76.7 201.64,76.7H196.34C191.94,76.7 190.64,72.5 191.34,69.8L192.54,63.4Z"
       android:fillColor="#002B42"/>
   <path
-      android:pathData="M222.52,60.16C222.72,60.16 222.82,59.96 222.82,59.86C222.82,59.86 222.72,55.27 217.04,54.08C216.84,54.08 216.64,54.18 216.64,54.38C216.64,54.58 216.74,54.78 216.94,54.78C222.12,55.87 222.22,59.76 222.22,59.96C222.22,60.06 222.32,60.16 222.52,60.16Z"
-      android:fillColor="#141415"/>
+      android:pathData="M182.02,101.89L181.42,101.92L182.05,115.61L182.65,115.58L182.02,101.89Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M232.29,121.75L232.88,121.45L232.19,120.35L234.28,120.75L234.38,120.15L231.59,119.65C231.49,119.65 231.39,119.65 231.29,119.75C231.19,119.85 231.19,119.95 231.29,120.05L232.29,121.75Z"
+      android:pathData="M195.75,64.18C196.08,64.13 196.3,63.78 196.24,63.4C196.18,63.02 195.87,62.75 195.54,62.8C195.21,62.85 194.99,63.2 195.05,63.58C195.11,63.96 195.42,64.23 195.75,64.18Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M224.05,110.43l-4.48,-5.22l-0.45,0.39l4.48,5.22z"
+      android:pathData="M201.15,64.48C201.48,64.43 201.7,64.08 201.64,63.7C201.58,63.32 201.27,63.05 200.94,63.1C200.62,63.15 200.4,63.5 200.46,63.88C200.51,64.26 200.83,64.53 201.15,64.48Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M169.22,74.22L174.62,72.22L174.52,72.02L175.52,72.12C175.52,72.12 175.52,72.12 175.62,72.12H175.72C176.52,72.22 177.12,72.72 177.42,73.52L182.82,88.92C183.22,90.02 182.62,91.22 181.52,91.52L175.92,93.52C174.82,93.92 173.62,93.32 173.32,92.22L167.92,76.82C167.62,75.82 168.22,74.62 169.22,74.22Z"
-      android:fillColor="#0C268D"/>
+      android:pathData="M198.14,67.5C198.04,67.5 197.14,67.4 196.84,66.8C196.64,66.4 196.84,65.7 197.34,64.6C197.54,64.1 197.64,63.7 197.74,63.4C197.74,63.3 197.84,63.2 197.94,63.2C198.04,63.2 198.14,63.3 198.14,63.4C198.04,63.7 197.94,64.2 197.74,64.7C197.54,65.4 197.14,66.4 197.24,66.6C197.44,66.9 198.04,67.1 198.24,67.1C198.34,67.1 198.44,67.2 198.44,67.3C198.34,67.4 198.24,67.5 198.14,67.5Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M180.42,91.42L174.82,93.42C173.72,93.82 172.52,93.22 172.22,92.12L166.82,76.72C166.42,75.62 167.02,74.42 168.12,74.12L173.72,72.12C174.82,71.72 176.02,72.32 176.32,73.42L181.72,88.82C182.02,89.92 181.42,91.02 180.42,91.42Z"
-      android:fillColor="#1540EB"/>
+      android:pathData="M199.64,69.9L196.24,69.4C196.14,69.4 196.04,69.3 196.04,69.2C196.04,69.1 196.14,69 196.24,69L199.54,69.5C199.64,69.5 199.74,69.6 199.74,69.7C199.84,69.8 199.74,69.9 199.64,69.9Z"
+      android:fillColor="#EDEDED"/>
+  <path
+      android:pathData="M203.14,62.5L200.54,62.1C200.34,62.1 200.24,61.9 200.34,61.8C200.34,61.6 200.54,61.5 200.64,61.6L203.14,62C203.34,62 203.44,62.2 203.34,62.3C203.44,62.4 203.34,62.5 203.14,62.5Z"
+      android:fillColor="#002B42"/>
   <path
-      android:pathData="M174.93,82L169.8,85.22C168.3,86.33 167.59,88.34 168.12,90.25L168.94,94.5H175.44L174.44,91.5L177.94,88.24L174.93,82Z"
-      android:fillColor="#C26E5E"/>
+      android:pathData="M194.44,61.6C194.34,61.6 194.14,61.5 194.14,61.4C194.14,61.2 194.24,61.1 194.34,61L196.84,60.5C197.04,60.5 197.14,60.6 197.24,60.7C197.24,60.9 197.14,61 197.04,61.1L194.44,61.6C194.54,61.6 194.54,61.6 194.44,61.6Z"
+      android:fillColor="#002B42"/>
   <path
-      android:pathData="M171.92,85.92C171.82,85.92 171.72,85.92 171.72,85.82C171.62,85.72 171.72,85.52 171.82,85.52L175.32,83.42C175.42,83.32 175.62,83.42 175.62,83.52C175.72,83.62 175.62,83.82 175.52,83.82L172.02,85.92H171.92Z"
+      android:pathData="M202.24,52.6C199.44,52.6 196.94,54.8 195.24,57.3C196.04,57.9 197.34,58.4 199.04,58.6C200.64,58.8 206.54,58.4 207.74,58.2C208.34,58.1 210.24,57.9 210.24,57.9C210.24,57.9 208.54,58.9 208.24,59.8C207.44,62.9 208.54,64.8 209.24,66.3C210.04,68 210.44,68.8 211.24,68.6C211.84,67.3 212.24,65.8 212.34,64.4C213.34,55.6 208.34,52.6 202.24,52.6Z"
+      android:fillColor="#002B42"/>
+  <path
+      android:pathData="M208.64,70.3C210.24,70.7 211.84,69.8 212.24,68.3C212.64,66.7 211.74,65.1 210.24,64.7L208.64,70.3Z"
+      android:fillColor="#C8915C"/>
+  <path
+      android:pathData="M200.24,155L199.24,145.5H194.44V144.8H199.84L200.94,155H200.24Z"
+      android:fillColor="#002031"/>
+  <path
+      android:pathData="M211.74,80.2H206.54C205.84,80.2 205.34,80.8 205.44,81.5L206.04,85.7L213.14,85.4V81.5C213.14,80.8 212.54,80.2 211.74,80.2Z"
+      android:fillColor="#237978"/>
+  <path
+      android:pathData="M241.64,119C239.74,116.6 239.04,114.2 239.44,112.1C240.04,108.9 242.84,107.2 243.04,107.2L243.34,107.8C243.34,107.8 240.64,109.4 240.14,112.3C239.74,114.3 240.44,116.5 242.14,118.7L241.64,119Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M173.32,88.13C173.22,88.13 173.12,88.13 173.12,88.03C173.02,87.93 173.12,87.73 173.22,87.73L176.42,85.53C176.52,85.43 176.72,85.53 176.72,85.63C176.82,85.73 176.72,85.93 176.62,85.93L173.42,88.13C173.42,88.03 173.42,88.13 173.32,88.13Z"
+      android:pathData="M171.24,120.4C169.74,118.4 168.04,117.3 166.04,117C162.84,116.5 160.14,118.6 160.14,118.6L159.74,118.1C159.84,118 162.64,115.9 166.14,116.4C168.24,116.7 170.14,117.9 171.74,120.1L171.24,120.4Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M149.97,48.97m-17.97,0a17.97,17.97 0,1 1,35.94 0a17.97,17.97 0,1 1,-35.94 0"
-      android:fillColor="#053157"/>
+      android:pathData="M218.64,84.8H211.64C211.64,84.2 212.14,83.7 212.74,83.7H217.44C218.14,83.6 218.64,84.1 218.64,84.8Z"
+      android:fillColor="#104A4A"/>
+  <path
+      android:pathData="M196.74,80.2L195.34,84.8H197.44L198.74,80.2H196.74Z"
+      android:fillColor="#104A4A"/>
   <path
-      android:pathData="M167.52,62.76L165.43,56.07L160.84,60.67L167.52,62.76Z"
+      android:pathData="M217.04,129L215.64,127.1L220.14,122.4L220.64,122.9L216.44,127.1L217.54,128.6L217.04,129Z"
+      android:fillColor="#002031"/>
+  <path
+      android:pathData="M164.94,45L162.34,43.9C162.34,42.7 162.04,41.4 161.74,40.2L163.84,38.4C164.64,37.7 164.74,36.6 164.24,35.7L163.04,33.7C162.54,32.8 161.44,32.5 160.44,32.9L157.84,34C156.94,33.2 155.94,32.4 154.84,31.9L154.94,29.1C155.04,28.1 154.34,27.1 153.34,26.9L151.04,26.4C150.04,26.2 149.04,26.7 148.64,27.7L147.54,30.3C146.34,30.3 145.04,30.6 143.94,30.9L142.14,28.8C141.44,28 140.34,27.9 139.44,28.4L137.44,29.6C136.54,30.2 136.24,31.2 136.64,32.2L137.64,34.8C136.84,35.7 136.04,36.7 135.54,37.8L132.74,37.7C131.74,37.6 130.84,38.3 130.54,39.3L130.04,41.6C129.84,42.6 130.34,43.6 131.24,44L133.84,45.1C133.84,46.3 134.14,47.6 134.44,48.8L132.34,50.6C131.54,51.3 131.44,52.4 131.94,53.3L133.14,55.3C133.64,56.2 134.74,56.5 135.74,56.1L138.34,55C139.24,55.8 140.24,56.6 141.34,57.1L141.24,59.9C141.14,60.9 141.84,61.9 142.84,62.1L145.14,62.6C146.14,62.8 147.14,62.3 147.54,61.3L148.64,58.7C149.84,58.7 151.14,58.4 152.24,58.1L154.04,60.1C154.74,60.9 155.84,61 156.74,60.5L158.74,59.3C159.64,58.8 159.94,57.7 159.54,56.7L158.54,54.1C159.34,53.2 160.14,52.2 160.64,51.1L163.44,51.2C164.44,51.3 165.34,50.6 165.64,49.6L166.14,47.3C166.44,46.4 165.84,45.4 164.94,45ZM154.24,45.9C153.44,49.3 150.14,51.4 146.74,50.6C143.34,49.8 141.24,46.5 142.04,43.1C142.84,39.7 146.14,37.6 149.54,38.4C152.84,39.1 154.94,42.5 154.24,45.9Z"
       android:fillColor="#053157"/>
   <path
-      android:pathData="M150.11,40V49.51"
-      android:strokeLineJoin="round"
-      android:strokeWidth="4.22636"
-      android:fillColor="#00000000"
-      android:strokeColor="#141415"
-      android:strokeLineCap="round"/>
-  <path
-      android:pathData="M150.11,56.91m-1.06,0a1.06,1.06 0,1 1,2.11 0a1.06,1.06 0,1 1,-2.11 0"
-      android:strokeWidth="2.11318"
-      android:fillColor="#ffffff"
-      android:strokeColor="#141415"/>
+      android:pathData="M187.24,27.9L187.14,26C187.14,25.2 186.54,24.5 185.74,24.4L183.74,24.1C183.34,22.9 182.64,21.9 181.74,21L182.34,19.1C182.64,18.3 182.24,17.5 181.54,17.1L179.94,16.2C179.24,15.8 178.34,16 177.84,16.7L176.64,18.2C175.44,18 174.14,18 172.94,18.3L171.64,16.8C171.14,16.2 170.24,16.1 169.54,16.5L167.94,17.5C167.24,17.9 166.94,18.8 167.24,19.6L168.04,21.5C167.24,22.5 166.64,23.6 166.34,24.8L164.34,25.2C163.54,25.4 162.94,26.1 163.04,26.9L163.14,28.7C163.14,29.5 163.74,30.2 164.54,30.3L166.54,30.6C166.94,31.8 167.64,32.8 168.54,33.7L167.94,35.6C167.74,36.4 168.04,37.2 168.74,37.6L170.34,38.5C171.04,38.9 171.94,38.7 172.44,38L173.64,36.4C174.84,36.6 176.14,36.6 177.34,36.3L178.64,37.8C179.14,38.4 180.04,38.5 180.74,38.1L182.34,37.1C183.04,36.7 183.34,35.8 183.04,35L182.34,33.2C183.14,32.2 183.74,31.1 184.04,29.9L185.94,29.5C186.64,29.4 187.24,28.7 187.24,27.9ZM176.94,30.3C176.94,30.3 176.94,30.4 176.94,30.3C175.24,31.3 173.14,30.8 172.14,29.2C171.14,27.6 171.64,25.4 173.24,24.4C174.84,23.4 177.04,23.9 178.04,25.5C179.14,27.1 178.64,29.3 176.94,30.3Z"
+      android:fillColor="#053157"/>
 </vector>
diff --git a/appconfig/src/main/res/drawable-night/illustration_app_status_launch_error.xml b/appconfig/src/main/res/drawable-night/illustration_app_status_launch_error.xml
index 2080371f0..643e4aa96 100644
--- a/appconfig/src/main/res/drawable-night/illustration_app_status_launch_error.xml
+++ b/appconfig/src/main/res/drawable-night/illustration_app_status_launch_error.xml
@@ -4,189 +4,186 @@
     android:viewportWidth="375"
     android:viewportHeight="260">
   <path
-      android:pathData="M186.3,251C219.99,251 247.3,249.75 247.3,248.2C247.3,246.66 219.99,245.4 186.3,245.4C152.61,245.4 125.3,246.66 125.3,248.2C125.3,249.75 152.61,251 186.3,251Z"
+      android:pathData="M223.62,64.64a10.46,8.17 90,1 1,-16.34 0a10.46,8.17 90,1 1,16.34 0z"
+      android:fillColor="#002B42"/>
+  <path
+      android:pathData="M141,245.22C141,246.72 171.2,247.91 196.91,247.91C222.62,247.91 236.27,246.62 236.27,245.22C236.27,243.83 222.42,242.53 196.81,242.53C171.2,242.53 141,243.73 141,245.22Z"
       android:fillColor="#053157"/>
   <path
-      android:pathData="M195.34,84.8H188.34C188.34,84.2 188.84,83.7 189.44,83.7H194.14C194.74,83.6 195.34,84.1 195.34,84.8Z"
-      android:fillColor="#104A4A"/>
+      android:pathData="M192.42,93.84L181.06,110.09L175.48,94.44L168.71,94.24C168.71,94.24 170.5,109.19 175.08,117.56C177.38,121.65 180.76,121.95 183.45,120.25C190.93,115.37 196.11,106.7 196.11,106.7L192.42,93.84Z"
+      android:fillColor="#CCA819"/>
   <path
-      android:pathData="M198.74,80.2H192.54C191.84,80.2 191.34,80.9 191.54,81.5L192.54,85.4L197.44,84.7L198.74,80.2Z"
-      android:fillColor="#237978"/>
+      android:pathData="M217.34,129.12C217.34,129.12 229.5,138.89 224.41,158.52C223.91,160.41 223.62,162.3 223.52,164.2L222.62,193.3H176.48L192.12,128.62L217.34,129.12Z"
+      android:fillColor="#CCA819"/>
   <path
-      android:pathData="M190.64,143.6L191.14,128.5L206.44,131.2L206.04,144.3L190.64,143.6Z"
-      android:fillColor="#59ACF5"/>
+      android:pathData="M217.24,70.12L214.45,88.26L202.59,88.56L208.97,74.01L217.24,70.12Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M152.94,68.7L158.64,66.6L158.54,66.3L159.64,66.4C159.64,66.4 159.64,66.4 159.74,66.4H159.84C160.64,66.5 161.34,67 161.64,67.8L167.34,84.1C167.74,85.2 167.14,86.5 166.04,86.9L160.14,89C159.04,89.4 157.74,88.8 157.34,87.7L151.64,71.4C151.24,70.3 151.84,69.1 152.94,68.7Z"
-      android:fillColor="#0C268D"/>
-  <path
-      android:pathData="M164.74,86.8L158.84,88.9C157.74,89.3 156.44,88.7 156.04,87.6L150.34,71.3C149.94,70.2 150.54,68.9 151.64,68.5L157.54,66.4C158.64,66 159.94,66.6 160.34,67.7L166.04,84C166.44,85.2 165.84,86.4 164.74,86.8Z"
-      android:fillColor="#1540EB"/>
+      android:pathData="M205.88,81.19L207.27,77.9L212.06,77.4L205.88,81.19Z"
+      android:fillColor="#A95643"/>
   <path
-      android:pathData="M158.34,76.6L152.24,79.9C150.44,81 149.64,83.2 150.24,85.2L152.94,94.3L160.64,91.3L158.84,85.8L162.04,83.1L158.34,76.6Z"
-      android:fillColor="#C8915C"/>
+      android:pathData="M208.67,78.29C214.05,77.79 219.43,73.31 219.43,67.93C219.53,62.45 215.15,58.06 209.76,58.06C207.07,58.06 204.68,59.16 202.99,61.05C202.39,61.65 201.89,62.45 201.39,63.24C200.6,64.64 200,66.23 199.8,67.93C198.8,74.51 202.49,78.89 208.67,78.29Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M180.84,88.8L167.14,108.6L160.24,90.4L151.74,90.7C151.74,90.7 155.04,108.7 159.34,117.4C161.84,122.6 168.14,122.3 171.44,120.2C180.54,114.2 187.54,107.4 187.54,107.4L180.84,88.8Z"
-      android:fillColor="#237978"/>
-  <path
-      android:pathData="M187.74,92H186.54L187.34,90.7L187.74,92Z"
-      android:fillColor="#F48D91"/>
+      android:pathData="M209.78,65.14L206.79,64.56C206.69,64.57 206.58,64.47 206.67,64.35C206.65,64.23 206.74,64.11 206.85,64.21L209.84,64.79C209.94,64.78 210.05,64.88 209.96,65C209.98,65.12 209.88,65.13 209.78,65.14Z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M155.74,80.9C155.64,80.9 155.64,80.9 155.54,80.8C155.44,80.7 155.54,80.6 155.64,80.5L159.24,78.3C159.34,78.2 159.44,78.3 159.54,78.4C159.64,78.5 159.54,78.6 159.44,78.7L155.84,80.9C155.84,80.9 155.74,80.9 155.74,80.9Z"
+      android:pathData="M203.75,64.73L201.36,65.06C201.26,65.09 201.14,65.02 201.11,64.92C201.09,64.83 201.15,64.7 201.25,64.68L203.65,64.34C203.74,64.32 203.87,64.39 203.89,64.48C203.92,64.58 203.85,64.7 203.75,64.73Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M157.24,83.2C157.14,83.2 157.14,83.2 157.04,83.1C156.94,83 157.04,82.9 157.14,82.8L160.54,80.5C160.64,80.4 160.74,80.5 160.84,80.6C160.94,80.7 160.84,80.8 160.74,80.9L157.34,83.2C157.34,83.2 157.34,83.2 157.24,83.2Z"
+      android:pathData="M204.44,73C204.54,73 204.44,73 204.44,73L207.74,72.4C207.84,72.4 207.94,72.3 207.94,72.2C207.94,72.1 207.84,72 207.74,72L204.44,72.6C204.34,72.6 204.24,72.7 204.24,72.8C204.34,72.9 204.34,73 204.44,73Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M217.84,131.8C217.84,131.8 218.54,139.4 218.74,153.1C218.94,166.8 219.74,236.9 219.74,236.9L210.24,238.5L198.34,131.3L217.84,131.8Z"
-      android:fillColor="#2793F2"/>
+      android:pathData="M201.69,62.85C201.69,62.85 209.07,62.45 209.86,61.75L203.19,61.05C202.49,61.65 202.09,62.05 201.69,62.85Z"
+      android:fillColor="#A95643"/>
   <path
-      android:pathData="M200.84,143.3L163.74,238.1L157.14,242.1L153.74,237.2L184.14,131.1L196.24,130.3C196.34,130.3 200.74,131.2 200.84,143.3Z"
-      android:fillColor="#2793F2"/>
+      android:pathData="M201.49,52.68C201.79,52.98 201.99,53.28 201.99,53.28C201.99,53.28 202.69,50.99 203.78,50.69C204.18,50.59 204.68,50.49 205.08,50.69C205.98,50.89 206.67,51.19 207.57,51.89C208.17,52.28 209.26,51.49 210.36,51.29C212.45,50.99 213.05,52.98 214.55,53.58C215.24,53.88 215.84,54.18 216.44,54.58C216.84,54.87 217.14,55.17 217.44,55.47C217.54,55.67 217.74,55.77 217.74,55.97C217.84,56.37 217.64,56.67 217.44,56.97C216.84,57.86 212.35,61.15 210.26,61.55C208.17,62.05 206.08,61.95 203.98,61.55C203.19,61.45 202.39,61.25 201.59,60.85C200.79,60.56 200.2,59.96 199.7,59.26C199.3,58.56 199.3,57.86 199.1,57.07C199.1,56.87 199.3,54.78 199.6,53.08C199.8,52.38 200.89,52.08 201.49,52.68Z"
+      android:fillColor="#002B42"/>
   <path
-      android:pathData="M190.04,84.7H218.54C223.94,84.7 230.04,89.5 229.24,95.1L227.14,101.7L223.54,102.3L218.84,131.9L185.34,131.6C184.04,131.6 183.04,130.6 182.94,129.3C182.64,123.3 181.94,107.2 181.74,99.5C181.64,96.5 179.54,94.2 179.64,93.3C180.04,86.8 184.94,84.7 190.04,84.7Z"
-      android:fillColor="#237978"/>
+      android:pathData="M188.54,101.82C189.23,96.73 192.92,93.54 196.51,89.46C197.51,88.26 198.8,87.36 200.3,86.87L202.39,86.17C202.89,86.07 203.29,85.87 203.68,85.57C204.78,83.58 205.88,81.29 205.88,81.29L215.54,81.68L215.24,83.68C215.15,84.87 215.94,86.07 217.14,86.47L221.62,87.66H221.52C227.1,87.96 230.89,92.94 229.99,98.82L227.7,105.9L223.82,106.5C223.82,106.5 219.03,115.27 217.74,129.52L192.22,129.22C192.62,125.83 187.84,106.8 188.54,101.82Z"
+      android:fillColor="#CCA819"/>
   <path
-      android:pathData="M152.54,234.8L145.04,240.2L140.54,242.4C138.34,243.6 138.34,245.7 138.34,245.7H167.04L165.84,236.4C165.64,235.7 164.34,235.6 164.14,236.2C163.64,237.5 161.54,238.3 159.74,238.4C157.14,238.5 156.24,236.7 154.84,235.2C154.24,234.6 153.34,234.4 152.54,234.8Z"
-      android:fillColor="#FFCC00"/>
+      android:pathData="M242.05,113.28C231.69,109.39 221.12,105.81 210.46,102.62C203.88,100.62 197.11,98.73 190.03,97.23L190.13,97.13C190.73,96.14 191.33,95.24 192.02,94.44L192.42,93.95V94.05C192.92,93.45 193.42,92.85 193.92,92.25C200.2,93.65 206.27,95.44 212.05,97.13C215.15,98.03 218.33,99.03 221.42,100.03C213.65,95.74 205.78,91.75 197.71,88.17C198.4,87.67 199.2,87.17 200.1,86.87L202.19,86.17C202.69,86.07 203.09,85.87 203.49,85.57C204.58,83.58 205.68,81.29 205.68,81.29L207.07,81.39C209.76,82.09 212.45,82.88 215.15,83.68V83.78C215.04,84.98 215.84,86.17 217.04,86.57L221.52,87.77H221.42C225.31,87.97 228.4,90.56 229.49,94.05C229.79,94.44 230.09,94.94 230.49,95.54C225.01,93.35 219.43,91.25 213.75,89.46C220.53,92.75 227.3,96.54 233.78,100.42C236.97,105.31 240.56,110.89 242.05,113.28Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M165.44,248.8H140.04C139.04,248.8 138.24,248 138.24,247V245.6H167.14L167.24,246.8C167.34,247.9 166.54,248.8 165.44,248.8Z"
-      android:fillColor="#EDEDED"/>
+      android:pathData="M180.26,107.9L181.06,110.09L182.36,108.3C195.01,110.99 207.27,114.97 219.33,119.16C218.93,120.95 218.53,122.85 218.23,124.94C209.07,121.75 199.8,118.66 190.33,116.17C190.23,115.67 190.13,115.17 190.03,114.68C189.63,115.07 189.23,115.47 188.93,115.87C186.04,115.17 183.15,114.47 180.26,113.88C182.76,114.97 185.15,116.07 187.54,117.17C186.24,118.26 184.95,119.36 183.55,120.36C183.05,120.65 182.56,120.85 182.06,121.05C179.87,120.06 177.67,119.06 175.38,118.06C175.28,117.96 175.18,117.76 175.18,117.66C173.69,114.47 172.19,111.39 171,105.81C173.89,106.2 177.18,107.3 180.26,107.9Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M148.84,241L145.64,240L145.84,239.4L149.04,240.4L148.84,241Z"
-      android:fillColor="#002031"/>
+      android:pathData="M214.95,193.2H207.17C206.27,192.41 205.28,191.61 204.18,190.81C196.71,185.33 188.74,180.55 180.66,175.86L182.66,167.49C194.02,171.38 205.18,175.96 215.94,181.35C208.87,175.96 201.39,171.18 193.52,167.09C190.33,165.5 187.14,163.9 183.85,162.41L186.54,151.35C197.71,154.84 208.77,158.92 219.53,163.61C210.06,157.23 200.2,151.55 190.03,146.57C189.33,146.27 188.64,145.87 187.94,145.57L189.33,139.79C190.43,140.29 191.53,140.79 192.52,141.28C203.49,146.57 213.95,152.74 224.01,159.62C223.71,161.01 223.52,162.51 223.42,164.01L223.22,171.58C211.66,166.3 199.7,161.61 187.54,157.73C190.43,159.12 193.32,160.52 196.11,162.01C205.68,166.99 214.55,172.87 222.92,179.65L222.52,191.51C222.02,191.21 221.52,191.01 221.02,190.71L220.93,190.61C213.35,186.43 205.58,182.74 197.6,179.35C200.89,181.45 204.18,183.74 207.37,186.03C210.36,188.22 213.05,190.51 214.95,193.2Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M148.1,237.81L147.93,238.38L151.19,239.35L151.36,238.77L148.1,237.81Z"
-      android:fillColor="#002031"/>
+      android:pathData="M191.33,131.91C200.89,134.51 210.36,137.69 219.53,141.28C210.56,135.6 201.29,130.42 191.82,125.74C191.63,123.84 191.13,121.35 190.63,118.66C203.09,124.64 215.04,131.42 226.6,138.89C225.71,139.69 224.91,140.38 224.41,140.88C225.11,143.47 225.61,146.46 225.51,149.85C213.85,145.17 201.99,140.68 189.83,137.49L191.33,131.91Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M220.84,234.8L225.34,240.2L228.04,242.4C230.34,243.6 230.34,245.7 230.34,245.7H208.64L209.04,237.4C209.04,237.4 211.84,237.5 214.34,237.5C214.34,237.5 214.84,236.2 216.34,234.8C217.04,234.1 219.84,233.4 220.84,234.8Z"
-      android:fillColor="#FFCC00"/>
+      android:pathData="M177.18,99.33C175.48,98.73 171.4,95.44 171.1,94.45H175.48L177.18,99.33Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M210.34,248.8H228.44C229.54,248.8 230.34,247.9 230.44,246.9V245.7H208.44L208.34,246.8C208.34,247.9 209.24,248.8 210.34,248.8Z"
-      android:fillColor="#EDEDED"/>
+      android:pathData="M231.69,119.86L229,116.77C233.38,119.36 237.57,122.05 241.75,124.84C241.45,125.14 241.26,125.44 240.96,125.74C239.86,126.93 237.67,128.93 235.28,131.12L230.69,129.42C228.5,128.63 226.31,127.83 224.11,127.03L231.69,119.86Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M222.14,239.3L222.12,240L225.72,240.09L225.74,239.39L222.14,239.3Z"
-      android:fillColor="#002031"/>
+      android:pathData="M177.87,187.62L179.27,181.94C184.35,183.74 189.23,185.93 194.02,188.02C198,189.82 202.09,191.61 206.27,193.2H191.33C186.74,191.21 182.36,189.22 177.87,187.62Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M219.77,237.44L219.75,238.14L223.94,238.29L223.97,237.59L219.77,237.44Z"
-      android:fillColor="#002031"/>
+      android:pathData="M219.53,117.96C208.87,111.98 197.8,106.8 186.44,102.32L189.83,97.43C200.6,101.72 211.06,106.7 221.22,112.28C220.73,113.88 220.13,115.77 219.53,117.96Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M221.94,134.8L220.64,135.6C219.44,136.3 217.94,136.3 216.74,135.7L215.14,134.9L209.04,137.5C208.44,137.8 207.74,137.7 207.24,137.3L205.54,135.9C204.84,135.3 204.84,134.2 205.54,133.6C206.64,132.6 207.94,131.4 207.84,131.4C207.74,131.5 206.04,131.9 205.04,132.2C204.54,132.3 204.04,132 203.94,131.6C203.84,131.1 204.04,130.7 204.44,130.5L210.04,128.3C211.44,127.6 212.84,127.8 214.44,128.2L217.34,128.7L221.94,134.8Z"
-      android:fillColor="#C8915C"/>
+      android:pathData="M214.15,140.18C214.35,140.18 214.45,140.08 214.45,139.88L216.34,107.1C217.04,93.34 219.73,89.26 221.82,88.26C223.32,87.56 224.61,88.46 224.71,88.46C224.91,88.56 225.11,88.56 225.21,88.36C225.31,88.16 225.31,87.96 225.11,87.86C225.01,87.86 223.52,86.67 221.52,87.56C218.13,89.16 216.24,95.74 215.64,107L213.75,139.78C213.75,139.98 213.95,140.18 214.15,140.18Z"
+      android:fillColor="#EDEDED"/>
   <path
-      android:pathData="M206.94,137.3C206.84,137.3 206.84,137.3 206.74,137.2C206.64,137.1 206.74,137 206.84,136.9L212.64,133.3C212.74,133.2 212.84,133.3 212.94,133.4C213.04,133.5 212.94,133.6 212.84,133.7L207.04,137.3C206.94,137.3 206.94,137.3 206.94,137.3Z"
-      android:fillColor="#002031"/>
+      android:pathData="M231.79,139.28L235.08,154.53L215.64,154.63L212.75,138.58L231.79,139.28Z"
+      android:fillColor="#478F8E"/>
   <path
-      android:pathData="M205.64,136C205.54,136 205.54,136 205.44,135.9C205.34,135.8 205.44,135.7 205.44,135.6L210.64,131.8C210.74,131.7 210.84,131.8 210.94,131.8C211.04,131.9 210.94,132 210.94,132.1L205.74,135.9C205.74,135.9 205.64,136 205.64,136Z"
-      android:fillColor="#002031"/>
+      android:pathData="M207.57,154.63L210.96,138.58H212.75L215.64,154.63H207.57Z"
+      android:fillColor="#104A4A"/>
   <path
-      android:pathData="M226.44,88.1C226.44,88.1 240.14,103.5 243.24,107.4C246.14,111.1 245.74,115.4 241.94,118.8C238.54,121.8 221.74,135.1 221.74,135.1L216.04,127.1L230.44,112.3L213.44,96.3L226.44,88.1Z"
-      android:fillColor="#237978"/>
+      android:pathData="M224.91,148.55L232.19,139.48C232.29,139.38 232.29,139.08 232.09,138.98C231.99,138.88 231.69,138.88 231.59,139.08L224.81,147.65L213.55,138.59C213.45,138.49 213.15,138.49 213.05,138.68C212.95,138.78 212.95,139.08 213.15,139.18L224.91,148.55Z"
+      android:fillColor="#EDEDED"/>
   <path
-      android:pathData="M231.94,114.1L229.64,111.5L233.54,112.3L233.44,113L231.44,112.5L232.44,113.6L231.94,114.1Z"
-      android:fillColor="#002031"/>
+      android:pathData="M217.34,134.9L214.75,136.69C212.26,138.39 210.86,141.28 210.96,144.27L211.26,152.14H217.84L219.93,146.26L222.12,143.27L222.82,141.08L224.51,138.98L217.34,134.9Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M220.85,102.8L220.43,103.23L224,106.74L224.42,106.31L220.85,102.8Z"
+      android:pathData="M204.98,70.62C205.08,70.62 205.28,70.52 205.28,70.32C205.28,70.12 205.18,70.02 205.08,69.92C204.88,69.92 204.38,69.72 204.28,69.43C204.18,69.23 204.68,68.23 204.98,67.73C205.18,67.23 205.48,66.83 205.58,66.54C205.68,66.34 205.58,66.14 205.38,66.14C205.18,66.14 204.98,66.14 204.98,66.34C204.88,66.64 204.68,67.03 204.48,67.43C203.88,68.53 203.59,69.23 203.78,69.72C203.88,70.32 204.78,70.62 204.98,70.62C204.88,70.62 204.98,70.62 204.98,70.62Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M195.34,84.8L191.84,93.1L194.74,131.6L202.84,131.7L206.14,84.5L195.34,84.8Z"
-      android:fillColor="#FE6F43"/>
-  <path
-      android:pathData="M205.54,93.3L205.64,92.4H205.54C201.04,94.3 196.54,96.6 192.34,99.2L192.44,100.1C196.54,97.5 200.94,95.2 205.54,93.3Z"
-      android:fillColor="#FE9C7E"/>
-  <path
-      android:pathData="M204.34,110.1L204.44,109.3C202.44,109.7 200.54,110.3 198.64,110.8C196.94,111.3 195.14,111.8 193.34,112.2L193.44,113C195.24,112.6 197.14,112.1 198.84,111.5C200.64,111 202.44,110.5 204.34,110.1Z"
-      android:fillColor="#FE9C7E"/>
-  <path
-      android:pathData="M204.04,113C200.44,114.5 197.04,116.3 193.64,118.3L193.74,119.2C193.84,119.2 193.84,119.1 193.94,119.1C197.14,117.2 200.54,115.4 204.04,113.9V113Z"
-      android:fillColor="#FE9C7E"/>
-  <path
-      android:pathData="M191.84,93.9C196.24,92.1 200.94,90.9 205.74,90.3L205.84,89.5C201.04,90.1 196.34,91.3 191.84,93.1V93.9Z"
-      android:fillColor="#FE9C7E"/>
+      android:pathData="M210.16,137.19L216.44,135.6L216.24,138.79L210.16,138.59V137.19Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M203.04,127.9C200.44,129.4 197.64,130.2 194.64,130.4L194.74,131.2C197.64,131 200.44,130.2 202.94,128.8L203.04,127.9Z"
-      android:fillColor="#FE9C7E"/>
+      android:pathData="M216.64,135.3C216.64,135.3 218.13,140.98 221.22,144.37L221.92,143.37L222.62,141.18L222.82,140.88L216.64,135.3Z"
+      android:fillColor="#A95643"/>
   <path
-      android:pathData="M194.44,127.6L194.54,128.5C197.44,126.7 200.34,125.1 203.34,123.6L203.44,122.7C200.34,124.2 197.34,125.8 194.44,127.6Z"
-      android:fillColor="#FE9C7E"/>
+      android:pathData="M215.64,148.06l-0.7,0l-0,4.09l0.7,0z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M192.54,102.7L192.64,103.5C195.84,103 198.94,102.1 202.04,101.1C203.04,100.8 204.04,100.5 205.14,100.2L205.24,99.4C204.14,99.7 203.04,100.1 201.84,100.4C198.74,101.3 195.64,102.2 192.54,102.7Z"
-      android:fillColor="#FE9C7E"/>
+      android:pathData="M228.4,92.05C228.4,92.05 239.96,109.69 242.35,113.68C244.74,117.66 244.54,122.05 241.06,125.64C237.57,129.22 223.82,141.48 223.82,141.48L216.24,134.7L231.79,119.66L218.33,104.01L228.4,92.05Z"
+      android:fillColor="#CCA819"/>
   <path
-      android:pathData="M198.84,121.6C200.44,121 201.94,120.4 203.64,119.9L203.74,119.1C202.04,119.6 200.34,120.3 198.64,120.9C197.14,121.5 195.64,122 194.14,122.5L194.24,123.3C195.74,122.8 197.24,122.2 198.84,121.6Z"
-      android:fillColor="#FE9C7E"/>
+      android:pathData="M213.66,152.16l-0.01,-5.58l-0.7,0l0.01,5.58z"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M193.04,109.2L193.14,110.1C195.04,108.8 197.24,107.8 199.24,106.9L204.84,104.3L204.94,103.4L199.04,106.2C197.04,107 194.94,108 193.04,109.2Z"
-      android:fillColor="#FE9C7E"/>
+      android:pathData="M202.29,66.64m0.6,0a0.6,0.6 0,1 0,-1.2 0a0.6,0.6 0,1 0,1.2 0"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M209.84,67.3L208.74,84.6L200.34,88.1L197.44,84.8L200.94,72L209.84,67.3Z"
-      android:fillColor="#C8915C"/>
+      android:pathData="M207.77,66.93m0.6,0a0.6,0.6 0,1 0,-1.2 0a0.6,0.6 0,1 0,1.2 0"
+      android:fillColor="#002031"/>
   <path
-      android:pathData="M211.24,56.6C211.54,56 210.84,54.3 209.04,53.1C207.44,51.9 205.14,51.5 203.04,51.6C198.44,52 196.54,54.1 196.54,54.1C196.54,54.1 195.04,54 194.74,54.7C194.14,56.1 194.84,57 195.24,57.3C195.34,57.3 195.34,57.4 195.44,57.4C195.64,57.4 195.74,57.5 195.74,57.6C198.44,59.3 202.54,61.2 205.24,61.9L210.74,63.4C211.24,63.5 212.44,63.6 212.44,63.1C213.04,57 211.94,56.6 211.24,56.6Z"
-      android:fillColor="#002B42"/>
+      android:pathData="M190.03,116.17C190.33,116.17 190.43,115.97 190.33,115.77L188.64,106.8C188.54,106.3 188.44,105.8 188.44,105.31C188.14,101.62 189.43,97.83 191.82,94.94C191.93,94.84 191.93,94.54 191.82,94.44C191.73,94.34 191.43,94.34 191.33,94.44C188.74,97.53 187.44,101.42 187.74,105.31C187.74,105.9 187.84,106.4 187.94,106.9L189.63,115.87C189.73,116.07 189.83,116.17 190.03,116.17Z"
+      android:fillColor="#141415"/>
   <path
-      android:pathData="M212.34,64.3C211.84,69.9 207.44,74.9 201.94,75.8C195.64,76.9 191.54,72.6 192.04,65.7C192.54,59.6 196.54,53.3 202.14,52.9C207.84,52.6 213.04,56.8 212.34,64.3Z"
-      android:fillColor="#C8915C"/>
+      android:pathData="M219.93,193.2L217.54,229.18L209.17,229.27L207.07,193.2H219.93Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M209.74,68L209.54,71.3C210.24,70.4 210.84,69.4 211.34,68.4L209.74,68Z"
-      android:fillColor="#002031"/>
+      android:pathData="M194.52,193.2L182.86,228.28L173.49,228.68L181.46,193.2H194.52Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M208.24,67.7L208.14,67.8L208.24,67.7Z"
-      android:fillColor="#002031"/>
+      android:pathData="M226.8,93.94L228.4,92.05C228.4,92.05 229.3,93.35 230.59,95.34C229.3,94.84 228.1,94.44 226.8,93.94Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M192.54,63.4L192.44,66.6C192.44,67.5 193.14,68.2 194.04,68.2H194.34C194.84,67.8 195.44,67.6 196.14,67.6L199.84,67.8C200.84,67.8 201.74,68.3 202.34,69.1L202.44,69.3C203.04,70 203.84,70.3 204.74,70.3C205.74,70.2 206.54,69.6 206.94,68.8L209.04,64.4L211.04,66.9L208.94,72.2C207.84,75.1 205.64,76.7 201.64,76.7H196.34C191.94,76.7 190.64,72.5 191.34,69.8L192.54,63.4Z"
-      android:fillColor="#002B42"/>
+      android:pathData="M231.69,119.86L229,116.77C233.38,119.36 237.57,122.05 241.75,124.84C241.45,125.14 241.26,125.44 240.96,125.74C239.86,126.93 237.67,128.92 235.28,131.12L230.69,129.42C228.5,128.63 226.31,127.83 224.11,127.03L231.69,119.86Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M182.02,101.89L181.42,101.92L182.05,115.61L182.65,115.58L182.02,101.89Z"
-      android:fillColor="#002031"/>
+      android:pathData="M219.33,105.4L218.23,104.21L225.41,95.64C228.2,97.23 230.99,98.83 233.78,100.52C236.87,105.3 240.46,110.89 242.05,113.38C234.58,110.49 226.9,107.89 219.33,105.4Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M195.75,64.18C196.08,64.13 196.3,63.78 196.24,63.4C196.18,63.02 195.87,62.75 195.54,62.8C195.21,62.85 194.99,63.2 195.05,63.58C195.11,63.96 195.42,64.23 195.75,64.18Z"
-      android:fillColor="#002031"/>
+      android:pathData="M216.14,134.9L217.74,133.31C220.73,135.1 223.71,137 226.71,138.99C224.91,140.59 223.71,141.68 223.71,141.68L216.14,134.9Z"
+      android:fillColor="#FEDE6A"/>
   <path
-      android:pathData="M201.15,64.48C201.48,64.43 201.7,64.08 201.64,63.7C201.58,63.32 201.27,63.05 200.94,63.1C200.62,63.15 200.4,63.5 200.46,63.88C200.51,64.26 200.83,64.53 201.15,64.48Z"
-      android:fillColor="#002031"/>
+      android:pathData="M183.65,228.28L172.69,227.88L172.09,234.06L166.71,242.23L162.73,243.13C161.93,243.33 161.43,244.13 161.63,244.82C161.73,245.52 162.43,246.02 163.12,246.02H173.49C173.89,246.02 174.29,245.82 174.49,245.42L177.97,239.84V246.02H180.76L183.35,237.65L182.16,233.76L183.65,228.28Z"
+      android:fillColor="#59ACF5"/>
   <path
-      android:pathData="M198.14,67.5C198.04,67.5 197.14,67.4 196.84,66.8C196.64,66.4 196.84,65.7 197.34,64.6C197.54,64.1 197.64,63.7 197.74,63.4C197.74,63.3 197.84,63.2 197.94,63.2C198.04,63.2 198.14,63.3 198.14,63.4C198.04,63.7 197.94,64.2 197.74,64.7C197.54,65.4 197.14,66.4 197.24,66.6C197.44,66.9 198.04,67.1 198.24,67.1C198.34,67.1 198.44,67.2 198.44,67.3C198.34,67.4 198.24,67.5 198.14,67.5Z"
-      android:fillColor="#002031"/>
+      android:pathData="M208.37,229.27L218.43,229.18L217.74,235.45L219.83,243.13L221.42,243.43C222.12,243.53 222.62,244.02 222.62,244.72C222.62,245.42 222.02,246.02 221.32,246.02H215.24C214.55,246.02 213.95,245.62 213.75,244.92L212.15,241.04L211.76,246.02H209.66L208.47,238.15L209.46,235.75L208.37,229.27Z"
+      android:fillColor="#59ACF5"/>
   <path
-      android:pathData="M199.64,69.9L196.24,69.4C196.14,69.4 196.04,69.3 196.04,69.2C196.04,69.1 196.14,69 196.24,69L199.54,69.5C199.64,69.5 199.74,69.6 199.74,69.7C199.84,69.8 199.74,69.9 199.64,69.9Z"
-      android:fillColor="#EDEDED"/>
+      android:pathData="M217.84,243.23H220.23C220.33,243.23 220.43,243.13 220.43,243.03C220.43,242.93 220.33,242.83 220.23,242.83H217.84C217.74,242.83 217.64,242.93 217.64,243.03C217.64,243.13 217.74,243.23 217.84,243.23Z"
+      android:fillColor="#141415"/>
   <path
-      android:pathData="M203.14,62.5L200.54,62.1C200.34,62.1 200.24,61.9 200.34,61.8C200.34,61.6 200.54,61.5 200.64,61.6L203.14,62C203.34,62 203.44,62.2 203.34,62.3C203.44,62.4 203.34,62.5 203.14,62.5Z"
+      android:pathData="M221.92,54.78m6.78,0a6.78,6.78 0,1 0,-13.55 0a6.78,6.78 0,1 0,13.55 0"
       android:fillColor="#002B42"/>
   <path
-      android:pathData="M194.44,61.6C194.34,61.6 194.14,61.5 194.14,61.4C194.14,61.2 194.24,61.1 194.34,61L196.84,60.5C197.04,60.5 197.14,60.6 197.24,60.7C197.24,60.9 197.14,61 197.04,61.1L194.44,61.6C194.54,61.6 194.54,61.6 194.44,61.6Z"
-      android:fillColor="#002B42"/>
+      android:pathData="M221.02,69.42a2.29,1.99 90,1 1,-3.99 0a2.29,1.99 90,1 1,3.99 0z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M202.24,52.6C199.44,52.6 196.94,54.8 195.24,57.3C196.04,57.9 197.34,58.4 199.04,58.6C200.64,58.8 206.54,58.4 207.74,58.2C208.34,58.1 210.24,57.9 210.24,57.9C210.24,57.9 208.54,58.9 208.24,59.8C207.44,62.9 208.54,64.8 209.24,66.3C210.04,68 210.44,68.8 211.24,68.6C211.84,67.3 212.24,65.8 212.34,64.4C213.34,55.6 208.34,52.6 202.24,52.6Z"
+      android:pathData="M216.94,68.63C216.74,69.13 216.64,69.73 216.14,69.73C215.74,69.73 215.44,67.83 215.44,67.43C213.65,67.13 212.45,66.24 211.26,64.84C210.16,63.45 209.56,61.55 209.66,59.76C209.66,59.56 209.66,59.36 209.86,59.26C209.96,59.16 210.06,59.16 210.16,59.06C211.96,58.26 213.85,57.47 215.64,56.57C216.84,57.77 218.04,59.06 219.13,60.46C219.93,61.55 220.73,62.75 220.93,64.04C221.02,64.54 221.02,65.14 220.83,65.54C220.83,65.54 220.43,67.03 219.63,67.13C218.73,67.23 217.34,67.43 216.94,68.63Z"
       android:fillColor="#002B42"/>
   <path
-      android:pathData="M208.64,70.3C210.24,70.7 211.84,69.8 212.24,68.3C212.64,66.7 211.74,65.1 210.24,64.7L208.64,70.3Z"
-      android:fillColor="#C8915C"/>
+      android:pathData="M222.52,60.16C222.72,60.16 222.82,59.96 222.82,59.86C222.82,59.86 222.72,55.27 217.04,54.08C216.84,54.08 216.64,54.18 216.64,54.38C216.64,54.58 216.74,54.78 216.94,54.78C222.12,55.87 222.22,59.76 222.22,59.96C222.22,60.06 222.32,60.16 222.52,60.16Z"
+      android:fillColor="#141415"/>
   <path
-      android:pathData="M200.24,155L199.24,145.5H194.44V144.8H199.84L200.94,155H200.24Z"
+      android:pathData="M232.29,121.75L232.88,121.45L232.19,120.35L234.28,120.75L234.38,120.15L231.59,119.65C231.49,119.65 231.39,119.65 231.29,119.75C231.19,119.85 231.19,119.95 231.29,120.05L232.29,121.75Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M211.74,80.2H206.54C205.84,80.2 205.34,80.8 205.44,81.5L206.04,85.7L213.14,85.4V81.5C213.14,80.8 212.54,80.2 211.74,80.2Z"
-      android:fillColor="#237978"/>
-  <path
-      android:pathData="M241.64,119C239.74,116.6 239.04,114.2 239.44,112.1C240.04,108.9 242.84,107.2 243.04,107.2L243.34,107.8C243.34,107.8 240.64,109.4 240.14,112.3C239.74,114.3 240.44,116.5 242.14,118.7L241.64,119Z"
+      android:pathData="M224.05,110.43l-4.48,-5.22l-0.45,0.39l4.48,5.22z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M171.24,120.4C169.74,118.4 168.04,117.3 166.04,117C162.84,116.5 160.14,118.6 160.14,118.6L159.74,118.1C159.84,118 162.64,115.9 166.14,116.4C168.24,116.7 170.14,117.9 171.74,120.1L171.24,120.4Z"
-      android:fillColor="#002031"/>
+      android:pathData="M169.22,74.22L174.62,72.22L174.52,72.02L175.52,72.12C175.52,72.12 175.52,72.12 175.62,72.12H175.72C176.52,72.22 177.12,72.72 177.42,73.52L182.82,88.92C183.22,90.02 182.62,91.22 181.52,91.52L175.92,93.52C174.82,93.92 173.62,93.32 173.32,92.22L167.92,76.82C167.62,75.82 168.22,74.62 169.22,74.22Z"
+      android:fillColor="#0C268D"/>
   <path
-      android:pathData="M218.64,84.8H211.64C211.64,84.2 212.14,83.7 212.74,83.7H217.44C218.14,83.6 218.64,84.1 218.64,84.8Z"
-      android:fillColor="#104A4A"/>
+      android:pathData="M180.42,91.42L174.82,93.42C173.72,93.82 172.52,93.22 172.22,92.12L166.82,76.72C166.42,75.62 167.02,74.42 168.12,74.12L173.72,72.12C174.82,71.72 176.02,72.32 176.32,73.42L181.72,88.82C182.02,89.92 181.42,91.02 180.42,91.42Z"
+      android:fillColor="#1540EB"/>
   <path
-      android:pathData="M196.74,80.2L195.34,84.8H197.44L198.74,80.2H196.74Z"
-      android:fillColor="#104A4A"/>
+      android:pathData="M174.93,82L169.8,85.22C168.3,86.33 167.59,88.34 168.12,90.25L168.94,94.5H175.44L174.44,91.5L177.94,88.24L174.93,82Z"
+      android:fillColor="#C26E5E"/>
   <path
-      android:pathData="M217.04,129L215.64,127.1L220.14,122.4L220.64,122.9L216.44,127.1L217.54,128.6L217.04,129Z"
+      android:pathData="M171.92,85.92C171.82,85.92 171.72,85.92 171.72,85.82C171.62,85.72 171.72,85.52 171.82,85.52L175.32,83.42C175.42,83.32 175.62,83.42 175.62,83.52C175.72,83.62 175.62,83.82 175.52,83.82L172.02,85.92H171.92Z"
       android:fillColor="#002031"/>
   <path
-      android:pathData="M164.94,45L162.34,43.9C162.34,42.7 162.04,41.4 161.74,40.2L163.84,38.4C164.64,37.7 164.74,36.6 164.24,35.7L163.04,33.7C162.54,32.8 161.44,32.5 160.44,32.9L157.84,34C156.94,33.2 155.94,32.4 154.84,31.9L154.94,29.1C155.04,28.1 154.34,27.1 153.34,26.9L151.04,26.4C150.04,26.2 149.04,26.7 148.64,27.7L147.54,30.3C146.34,30.3 145.04,30.6 143.94,30.9L142.14,28.8C141.44,28 140.34,27.9 139.44,28.4L137.44,29.6C136.54,30.2 136.24,31.2 136.64,32.2L137.64,34.8C136.84,35.7 136.04,36.7 135.54,37.8L132.74,37.7C131.74,37.6 130.84,38.3 130.54,39.3L130.04,41.6C129.84,42.6 130.34,43.6 131.24,44L133.84,45.1C133.84,46.3 134.14,47.6 134.44,48.8L132.34,50.6C131.54,51.3 131.44,52.4 131.94,53.3L133.14,55.3C133.64,56.2 134.74,56.5 135.74,56.1L138.34,55C139.24,55.8 140.24,56.6 141.34,57.1L141.24,59.9C141.14,60.9 141.84,61.9 142.84,62.1L145.14,62.6C146.14,62.8 147.14,62.3 147.54,61.3L148.64,58.7C149.84,58.7 151.14,58.4 152.24,58.1L154.04,60.1C154.74,60.9 155.84,61 156.74,60.5L158.74,59.3C159.64,58.8 159.94,57.7 159.54,56.7L158.54,54.1C159.34,53.2 160.14,52.2 160.64,51.1L163.44,51.2C164.44,51.3 165.34,50.6 165.64,49.6L166.14,47.3C166.44,46.4 165.84,45.4 164.94,45ZM154.24,45.9C153.44,49.3 150.14,51.4 146.74,50.6C143.34,49.8 141.24,46.5 142.04,43.1C142.84,39.7 146.14,37.6 149.54,38.4C152.84,39.1 154.94,42.5 154.24,45.9Z"
+      android:pathData="M173.32,88.13C173.22,88.13 173.12,88.13 173.12,88.03C173.02,87.93 173.12,87.73 173.22,87.73L176.42,85.53C176.52,85.43 176.72,85.53 176.72,85.63C176.82,85.73 176.72,85.93 176.62,85.93L173.42,88.13C173.42,88.03 173.42,88.13 173.32,88.13Z"
+      android:fillColor="#002031"/>
+  <path
+      android:pathData="M149.97,48.97m-17.97,0a17.97,17.97 0,1 1,35.94 0a17.97,17.97 0,1 1,-35.94 0"
       android:fillColor="#053157"/>
   <path
-      android:pathData="M187.24,27.9L187.14,26C187.14,25.2 186.54,24.5 185.74,24.4L183.74,24.1C183.34,22.9 182.64,21.9 181.74,21L182.34,19.1C182.64,18.3 182.24,17.5 181.54,17.1L179.94,16.2C179.24,15.8 178.34,16 177.84,16.7L176.64,18.2C175.44,18 174.14,18 172.94,18.3L171.64,16.8C171.14,16.2 170.24,16.1 169.54,16.5L167.94,17.5C167.24,17.9 166.94,18.8 167.24,19.6L168.04,21.5C167.24,22.5 166.64,23.6 166.34,24.8L164.34,25.2C163.54,25.4 162.94,26.1 163.04,26.9L163.14,28.7C163.14,29.5 163.74,30.2 164.54,30.3L166.54,30.6C166.94,31.8 167.64,32.8 168.54,33.7L167.94,35.6C167.74,36.4 168.04,37.2 168.74,37.6L170.34,38.5C171.04,38.9 171.94,38.7 172.44,38L173.64,36.4C174.84,36.6 176.14,36.6 177.34,36.3L178.64,37.8C179.14,38.4 180.04,38.5 180.74,38.1L182.34,37.1C183.04,36.7 183.34,35.8 183.04,35L182.34,33.2C183.14,32.2 183.74,31.1 184.04,29.9L185.94,29.5C186.64,29.4 187.24,28.7 187.24,27.9ZM176.94,30.3C176.94,30.3 176.94,30.4 176.94,30.3C175.24,31.3 173.14,30.8 172.14,29.2C171.14,27.6 171.64,25.4 173.24,24.4C174.84,23.4 177.04,23.9 178.04,25.5C179.14,27.1 178.64,29.3 176.94,30.3Z"
+      android:pathData="M167.52,62.76L165.43,56.07L160.84,60.67L167.52,62.76Z"
       android:fillColor="#053157"/>
+  <path
+      android:pathData="M150.11,40V49.51"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4.22636"
+      android:fillColor="#00000000"
+      android:strokeColor="#141415"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M150.11,56.91m-1.06,0a1.06,1.06 0,1 1,2.11 0a1.06,1.06 0,1 1,-2.11 0"
+      android:strokeWidth="2.11318"
+      android:fillColor="#ffffff"
+      android:strokeColor="#141415"/>
 </vector>
diff --git a/appconfig/src/main/res/layout/fragment_app_locked.xml b/appconfig/src/main/res/layout/fragment_app_locked.xml
index f16e22210..8e8baef49 100644
--- a/appconfig/src/main/res/layout/fragment_app_locked.xml
+++ b/appconfig/src/main/res/layout/fragment_app_locked.xml
@@ -71,7 +71,7 @@
 
         <Button
             android:id="@+id/action"
-            style="@style/Widget.App.Button.Small"
+            style="@style/Widget.App.Button.Small.DayNight"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="16dp"
diff --git a/design/src/main/java/nl/rijksoverheid/ctr/design/widgets/HtmlTextViewWidget.kt b/design/src/main/java/nl/rijksoverheid/ctr/design/widgets/HtmlTextViewWidget.kt
index d4c909f1e..d40a96443 100644
--- a/design/src/main/java/nl/rijksoverheid/ctr/design/widgets/HtmlTextViewWidget.kt
+++ b/design/src/main/java/nl/rijksoverheid/ctr/design/widgets/HtmlTextViewWidget.kt
@@ -23,6 +23,9 @@ import nl.rijksoverheid.ctr.design.ext.getAttrColor
 import nl.rijksoverheid.ctr.design.ext.isHeading
 import nl.rijksoverheid.ctr.design.ext.separated
 import nl.rijksoverheid.ctr.design.spans.BulletPointSpan
+import nl.rijksoverheid.ctr.shared.utils.WebsiteEnvironmentUtil
+import org.koin.core.component.KoinComponent
+import org.koin.core.component.inject
 
 private const val HTML_LINKS_ENABLED = false
 private const val PARAGRAPH_MARGIN_MULTIPLIER = 1.0f
@@ -45,7 +48,9 @@ class HtmlTextViewWidget @JvmOverloads constructor(
     attrs: AttributeSet? = null,
     defStyle: Int = 0,
     defStyleRes: Int = 0
-) : LinearLayout(context, attrs, defStyle, defStyleRes) {
+) : LinearLayout(context, attrs, defStyle, defStyleRes), KoinComponent {
+
+    private val websiteEnvironmentUtil: WebsiteEnvironmentUtil by inject()
 
     private val textColor by lazy {
         context.getColor(R.color.primary_text)
@@ -131,7 +136,12 @@ class HtmlTextViewWidget @JvmOverloads constructor(
         splitHtmlText: Boolean = false
     ) {
         val text = context.getString(htmlText)
-        setHtmlText(text, htmlLinksEnabled = htmlLinksEnabled, splitHtmlText = splitHtmlText, textIsSelectable = textIsSelectable)
+        setHtmlText(
+            text,
+            htmlLinksEnabled = htmlLinksEnabled,
+            splitHtmlText = splitHtmlText,
+            textIsSelectable = textIsSelectable
+        )
     }
 
     /**
@@ -157,10 +167,11 @@ class HtmlTextViewWidget @JvmOverloads constructor(
         if (htmlText.isEmpty()) {
             return
         }
-        this.text = htmlText
+
+        val adjustedHtmlText = websiteEnvironmentUtil.adjust(htmlText)
 
         // Step 1: Parse the given String into a Spannable
-        val spannable = getSpannableFromHtml(htmlText)
+        val spannable = getSpannableFromHtml(adjustedHtmlText)
         this.spannable = spannable
 
         // Step 2: Separate the Spannable on each paragraph if
diff --git a/design/src/main/res/values-night/styles.xml b/design/src/main/res/values-night/styles.xml
index 84b721eec..ad92134ef 100644
--- a/design/src/main/res/values-night/styles.xml
+++ b/design/src/main/res/values-night/styles.xml
@@ -50,7 +50,6 @@
     <style name="Widget.App.Button.Small.DayNight" parent="Widget.App.Button.Small.Night" />
     <style name="Widget.App.Button.Small.Night" parent="Widget.App.Button.Small">
         <item name="android:textColor">@color/cta_text_color</item>
-        <item name="android:backgroundTint">@color/neutral_white</item>
     </style>
 
     <style name="Widget.App.Button.DayNight" parent="Widget.App.Button.Night" />
diff --git a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainActivity.kt b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainActivity.kt
index f355b7594..8269d2a04 100644
--- a/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainActivity.kt
+++ b/holder/src/main/java/nl/rijksoverheid/ctr/holder/HolderMainActivity.kt
@@ -170,7 +170,7 @@ class HolderMainActivity : AppCompatActivity() {
         val isAppStatusFragment =
             navController.currentBackStackEntry?.destination?.id == R.id.nav_app_locked
         if (isAppStatusFragment) {
-            navController.popBackStack()
+            navController.navigate(RootNavDirections.actionMain())
         }
     }
 
diff --git a/holder/src/main/res/values-en/strings.xml b/holder/src/main/res/values-en/strings.xml
index 0f3b95fef..b6c3539a1 100644
--- a/holder/src/main/res/values-en/strings.xml
+++ b/holder/src/main/res/values-en/strings.xml
@@ -496,7 +496,7 @@
   <string name="refresh_eu_items_toolbar_title">Renew vaccination certificate</string>
   <string name="dashboard_item_refreshed_eu_vaccinations_text">Your international vaccination certificate has been renewed</string>
   <string name="refreshed_eu_items_title">Renewed vaccination certificate</string>
-  <string name="refreshed_eu_items_description"><![CDATA[We have renewed everyone\'s vaccination certificate. From now on, you have access to QR codes of earlier vaccinations.<br/><br/>This can be useful for people who want to go to a place where their latest vaccination is not yet valid.<br/><br/><a href=\"https://coronacheck.nl/en/faq/3-5-waarom-heb-ik-voor-elke-prik-een-internationale-QR-code/\">Read more about your renewed vaccination certificate here</a>.]]></string>
+  <string name="refreshed_eu_items_description"><![CDATA[We have renewed everyone\'s vaccination certificate. From now on, you have access to QR codes of earlier vaccinations.<br/><br/>This can be useful for people who want to go to a place where their latest vaccination is not yet valid.<br/><br/><a href=\"https://coronacheck.nl/en/faq-in-app/3-5-waarom-heb-ik-voor-elke-prik-een-internationale-QR-code/\">Read more about your renewed vaccination certificate here</a>.]]></string>
   <string name="config_warning_card_message">Please connect to the internet soon</string>
   <string name="config_warning_page_title">Please connect to the internet</string>
   <string name="config_warning_page_message"><![CDATA[Every now and then, the CoronaCheck app needs an internet connection to keep working. Without internet, your app will keep working until %1s. Open the app once you have an internet connection. It will automatically work again.<br/><br/>Please connect regularly to prevent any problems.]]></string>
@@ -529,9 +529,9 @@
   <string name="certificate_created_toolbar_title">Certificate created</string>
   <string name="certificate_created_vaccination_recovery_description"><![CDATA[A Dutch vaccination certificate has been created.<br><br>Your positive test result was suitable for creating a recovery certificate as well.]]></string>
   <string name="certificate_created_recovery_title">Created only a recovery certificate</string>
-  <string name="certificate_created_recovery_description"><![CDATA[You tested positive after your first vaccination. Your test result is therefore not suitable for creating a Dutch vaccination certificate. However, a recovery certificate has been created.<br><br>Check the <a href=\"https://coronacheck.nl/en/faq/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">the frequently asked questions</a> for more information.]]></string>
+  <string name="certificate_created_recovery_description"><![CDATA[You tested positive after your first vaccination. Your test result is therefore not suitable for creating a Dutch vaccination certificate. However, a recovery certificate has been created.<br><br>Check the <a href=\"https://coronacheck.nl/en/faq-in-app/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">the frequently asked questions</a> for more information.]]></string>
   <string name="certificate_created_recovery_unsuitable_title">Positive test result is not suitable</string>
-  <string name="certificate_created_recovery_unsuitable_description"><![CDATA[You were tested positive after your first vaccination. Your test result is therefore not suitable for creating a Dutch certificate.<br><br>Check the <a href=\"https://coronacheck.nl/en/faq/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">frequently asked questions</a> for more information.]]></string>
+  <string name="certificate_created_recovery_unsuitable_description"><![CDATA[You were tested positive after your first vaccination. Your test result is therefore not suitable for creating a Dutch certificate.<br><br>Check the <a href=\"https://coronacheck.nl/en/faq-in-app/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">frequently asked questions</a> for more information.]]></string>
   <string name="retrieve_test_result_toolbar_title">Retrieve test result</string>
   <string name="retrieve_test_result_title">Retrieve details about your positive test</string>
   <string name="retrieve_test_result_description">Log in with DigiD. Details about your positive test will be retrieved automatically.</string>
@@ -716,7 +716,7 @@ Read more on <a href=\"https://www.government.nl/entry-pass-visitors-cc\">www.go
   <string name="holder_storedEvents_title">My stored data</string>
   <string name="holder_storedEvents_message">The data below is stored on your phone and is used by CoronaCheck to create your coronavirus pass.</string>
   <string name="holder_storedEvents_button_handleData">How does Coronacheck handle my data?</string>
-  <string name="holder_storedEvents_url">https://coronacheck.nl/en/privacy</string>
+  <string name="holder_storedEvents_url">https://coronacheck.nl/en/privacy-in-app</string>
   <string name="holder_storedEvents_button_removeEvents">Remove from the app</string>
   <string name="holder_storedEvents_list_noEvents">No stored data</string>
   <string name="holder_storedEvents_listHeader_fetchedFromProvider">Retrieved at %s</string>
@@ -763,9 +763,9 @@ Read more on <a href=\"https://www.government.nl/entry-pass-visitors-cc\">www.go
   <string name="holder_qr_code_expired_explanation_title">Expired QR code</string>
   <string name="holder_qr_code_expired_explanation_description"><![CDATA[If your QR code has expired it means your vaccination is still valid, but the certificate that you’ve added isn\'t. You can request a new certificate with QR code and add it to the app again.<br/><br/>Do you have a more recent vaccination in the app? Then you can also use that QR code.]]></string>
   <string name="holder_qr_code_expired_explanation_action">Read more on CoronaCheck.nl</string>
-  <string name="holder_qr_code_expired_explanation_url">https://coronacheck.nl/en/faq/1-12-de-qr-code-van-mijn-vaccinatie-is-verlopen-wat-moet-ik-doen/</string>
+  <string name="holder_qr_code_expired_explanation_url">https://coronacheck.nl/en/faq-in-app/1-12-de-qr-code-van-mijn-vaccinatie-is-verlopen-wat-moet-ik-doen/</string>
   <string name="holder_qr_code_hidden_explanation_action">Read more on CoronaCheck.nl</string>
-  <string name="holder_qr_code_hidden_explanation_url">https://coronacheck.nl/en/faq/1-11-mijn-qr-code-is-verborgen-wat-betekent-dit/</string>
+  <string name="holder_qr_code_hidden_explanation_url">https://coronacheck.nl/en/faq-in-app/1-11-mijn-qr-code-is-verborgen-wat-betekent-dit/</string>
   <string name="holder_showQR_euAboutVaccination_daysSince">Days since vaccination:</string>
   <plurals name="general_days">
     <item quantity="one">day</item>
diff --git a/holder/src/main/res/values/strings.xml b/holder/src/main/res/values/strings.xml
index f9dc649e5..4315b3ec7 100644
--- a/holder/src/main/res/values/strings.xml
+++ b/holder/src/main/res/values/strings.xml
@@ -496,7 +496,7 @@
   <string name="refresh_eu_items_toolbar_title">Bewijs vernieuwen</string>
   <string name="dashboard_item_refreshed_eu_vaccinations_text">Jouw vaccinatiebewijs is vernieuwd</string>
   <string name="refreshed_eu_items_title">Vernieuwd vaccinatiebewijs</string>
-  <string name="refreshed_eu_items_description"><![CDATA[We hebben voor iedereen het vaccinatiebewijs vernieuwd. Je hebt nu ook toegang tot QR-codes van eerdere prikken.<br/><br/>Dat is bijvoorbeeld handig voor mensen die ergens heen willen waar hun laatste prik nog niet geldig is.<br/><br/><a href=\"https://coronacheck.nl/nl/faq/3-5-waarom-heb-ik-voor-elke-prik-een-internationale-QR-code/\">Lees hier meer over je vernieuwde vaccinatiebewijs</a>.]]></string>
+  <string name="refreshed_eu_items_description"><![CDATA[We hebben voor iedereen het vaccinatiebewijs vernieuwd. Je hebt nu ook toegang tot QR-codes van eerdere prikken.<br/><br/>Dat is bijvoorbeeld handig voor mensen die ergens heen willen waar hun laatste prik nog niet geldig is.<br/><br/><a href=\"https://coronacheck.nl/nl/faq-in-app/3-5-waarom-heb-ik-voor-elke-prik-een-internationale-QR-code/\">Lees hier meer over je vernieuwde vaccinatiebewijs</a>.]]></string>
   <string name="config_warning_card_message">Maak binnenkort verbinding met het internet</string>
   <string name="config_warning_page_title">Maak verbinding met het internet</string>
   <string name="config_warning_page_message"><![CDATA[De CoronaCheck-app heeft af en toe internet nodig om te blijven werken. Zonder internetverbinding werkt jouw app nog tot %1s. Open de app zodra je internet hebt. Dan doet deze het gewoon weer.<br/><br/>Maak regelmatig verbinding om problemen te voorkomen.]]></string>
@@ -529,9 +529,9 @@
   <string name="certificate_created_toolbar_title">Bewijs gemaakt</string>
   <string name="certificate_created_vaccination_recovery_description"><![CDATA[Er is een Nederlands vaccinatiebewijs gemaakt.<br><br>Van je positieve testuitslag kon ook een herstelbewijs gemaakt worden.]]></string>
   <string name="certificate_created_recovery_title">Alleen een herstelbewijs gemaakt</string>
-  <string name="certificate_created_recovery_description"><![CDATA[Je bent positief getest ná je eerste vaccinatie. Daardoor is je testuitslag niet geschikt om een Nederlands vaccinatiebewijs van te maken. Er is wel een herstelbewijs gemaakt.<br><br>Kijk voor meer informatie bij de <a href=\"https://coronacheck.nl/nl/faq/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">meestgestelde vragen</a>.]]></string>
+  <string name="certificate_created_recovery_description"><![CDATA[Je bent positief getest ná je eerste vaccinatie. Daardoor is je testuitslag niet geschikt om een Nederlands vaccinatiebewijs van te maken. Er is wel een herstelbewijs gemaakt.<br><br>Kijk voor meer informatie bij de <a href=\"https://coronacheck.nl/nl/faq-in-app/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">meestgestelde vragen</a>.]]></string>
   <string name="certificate_created_recovery_unsuitable_title">Positieve testuitslag is niet geschikt</string>
-  <string name="certificate_created_recovery_unsuitable_description"><![CDATA[Je bent positief getest ná je eerste vaccinatie. Daardoor is je testuitslag niet geschikt om een Nederlands vaccinatiebewijs van te maken. Er is wel een herstelbewijs gemaakt.<br><br>Kijk voor meer informatie bij de <a href=\"https://coronacheck.nl/nl/faq/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">meestgestelde vragen</a>.]]></string>
+  <string name="certificate_created_recovery_unsuitable_description"><![CDATA[Je bent positief getest ná je eerste vaccinatie. Daardoor is je testuitslag niet geschikt om een Nederlands vaccinatiebewijs van te maken. Er is wel een herstelbewijs gemaakt.<br><br>Kijk voor meer informatie bij de <a href=\"https://coronacheck.nl/nl/faq-in-app/2-4-ik-heb-wel-een-internationale-qr-code-maar-geen-nederlandse/\">meestgestelde vragen</a>.]]></string>
   <string name="retrieve_test_result_toolbar_title">Testuitslag ophalen</string>
   <string name="retrieve_test_result_title">Gegevens van je positieve test ophalen</string>
   <string name="retrieve_test_result_description">Log in met DigiD. De gegevens van je positieve test worden dan automatisch opgehaald.</string>
@@ -716,7 +716,7 @@ Lees meer op <a href=\"https://www.rijksoverheid.nl/ctb-bezoekers-cc\">www.rijks
   <string name="holder_storedEvents_title">Mijn opgeslagen gegevens</string>
   <string name="holder_storedEvents_message">De gegevens hieronder staan opgeslagen op je telefoon en worden gebruikt door CoronaCheck om je coronabewijs te maken.</string>
   <string name="holder_storedEvents_button_handleData">Hoe gaat CoronaCheck met gegevens om?</string>
-  <string name="holder_storedEvents_url">https://coronacheck.nl/nl/privacy</string>
+  <string name="holder_storedEvents_url">https://coronacheck.nl/nl/privacy-in-app</string>
   <string name="holder_storedEvents_button_removeEvents">Uit de app verwijderen</string>
   <string name="holder_storedEvents_list_noEvents">Geen gegevens opgeslagen</string>
   <string name="holder_storedEvents_listHeader_fetchedFromProvider">Opgehaald bij %s</string>
@@ -763,9 +763,9 @@ Lees meer op <a href=\"https://www.rijksoverheid.nl/ctb-bezoekers-cc\">www.rijks
   <string name="holder_qr_code_expired_explanation_title">Verlopen QR-code</string>
   <string name="holder_qr_code_expired_explanation_description"><![CDATA[Als je QR-code is verlopen betekent dit dat je vaccinatie nog geldig is, maar het bewijs dat je hebt toegevoegd niet meer. Je kunt een nieuw bewijs met QR-code aanvragen en deze opnieuw toevoegen aan de app.<br/><br/>Heb je een nieuwere vaccinatie in de app staan? Dan kun je ook die QR-code gebruiken.]]></string>
   <string name="holder_qr_code_expired_explanation_action">Lees meer op CoronaCheck.nl</string>
-  <string name="holder_qr_code_expired_explanation_url">https://coronacheck.nl/nl/faq/1-12-de-qr-code-van-mijn-vaccinatie-is-verlopen-wat-moet-ik-doen/</string>
+  <string name="holder_qr_code_expired_explanation_url">https://coronacheck.nl/nl/faq-in-app/1-12-de-qr-code-van-mijn-vaccinatie-is-verlopen-wat-moet-ik-doen/</string>
   <string name="holder_qr_code_hidden_explanation_action">Lees meer op CoronaCheck.nl</string>
-  <string name="holder_qr_code_hidden_explanation_url">https://coronacheck.nl/nl/faq/1-11-mijn-qr-code-is-verborgen-wat-betekent-dit/</string>
+  <string name="holder_qr_code_hidden_explanation_url">https://coronacheck.nl/nl/faq-in-app/1-11-mijn-qr-code-is-verborgen-wat-betekent-dit/</string>
   <string name="holder_showQR_euAboutVaccination_daysSince">Dagen sinds vaccinatie / Days since vaccination:</string>
   <plurals name="general_days">
     <item quantity="one">dag</item>
diff --git a/shared/src/test/java/nl/rijksoverheid/ctr/shared/utils/WebsiteEnvironmentUtilImplTest.kt b/shared/src/test/java/nl/rijksoverheid/ctr/shared/utils/WebsiteEnvironmentUtilImplTest.kt
index 6233c0d91..79977f2df 100644
--- a/shared/src/test/java/nl/rijksoverheid/ctr/shared/utils/WebsiteEnvironmentUtilImplTest.kt
+++ b/shared/src/test/java/nl/rijksoverheid/ctr/shared/utils/WebsiteEnvironmentUtilImplTest.kt
@@ -38,4 +38,12 @@ class WebsiteEnvironmentUtilImplTest {
 
         assert(websiteEnvironmentUtil.adjust(url) == "https://www.coronacheck.nl/en/faq-in-app.html")
     }
+
+    @Test
+    fun `given a link in html text, when acc, then return acc web link`() {
+        every { context.packageName } returns "nl.rijksoverheid.ctr.holder.acc"
+
+        val adjustedUrlText = websiteEnvironmentUtil.adjust("In de <a href=\"https://coronacheck.nl/nl/privacy-in-app\">privacyverklaring</a> staat hoe de app omgaat met jouw gegevens. Dit zijn de belangrijkste punten:")
+        assert(adjustedUrlText.contains("acc"))
+    }
 }