diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40a25dc3ceb..46d5fa9ffef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,30 @@
 
 List of the most important changes for each release.
 
+## 0.17.3
+
+### Changed
+- Improve learn folder contents display by @rtibbles in https://github.com/learningequality/kolibri/pull/12737
+- Update KDS theme token by @AllanOXDi in https://github.com/learningequality/kolibri/pull/12742
+- Final token updates by @marcellamaki in https://github.com/learningequality/kolibri/pull/12754
+
+### Added
+- Add Fulfulde translations by @radinamatic in https://github.com/learningequality/kolibri/pull/12738
+- Update morango for conditional indexes on store to improve deserialization performance. by @rtibbles in https://github.com/learningequality/kolibri/pull/12747
+
+### Fixed
+- Settings is not correct after tzlocal update by @jredrejo in https://github.com/learningequality/kolibri/pull/12683
+- Add missing `indeterminate` states on Select All checkboxes by @nucleogenesis in https://github.com/learningequality/kolibri/pull/12587
+- Fix import channel in Postgresql  by @jredrejo in https://github.com/learningequality/kolibri/pull/12709
+- Branding tweaks by @rtibbles in https://github.com/learningequality/kolibri/pull/12736
+- Tweaks to CLI and message extraction utility function by @rtibbles in https://github.com/learningequality/kolibri/pull/12320
+- Delete resource from everywhere when force_delete is selected by @thesujai in https://github.com/learningequality/kolibri/pull/12680
+- Dont delete the entire channel when deleting a single content by @thesujai in https://github.com/learningequality/kolibri/pull/12740
+- Prevent access to undefined AttemptLogs while looking at reports by @LianaHarris360 in https://github.com/learningequality/kolibri/pull/12723
+- Update StorageNotification.vue to prevent undefined access if device plugin is disabled by @rtibbles in https://github.com/learningequality/kolibri/pull/12724
+- Update favicon to be available when the default theme is disabled by @marcellamaki in https://github.com/learningequality/kolibri/pull/12760
+- Fix on my own merge account KCheckbox issue by @AlexVelezLl in https://github.com/learningequality/kolibri/pull/12761
+
 ## 0.17.2
 
 ### Changed
diff --git a/kolibri/plugins/default_theme/static/assets/default_theme/logo.ico b/kolibri/core/static/assets/favicons/logo.ico
similarity index 100%
rename from kolibri/plugins/default_theme/static/assets/default_theme/logo.ico
rename to kolibri/core/static/assets/favicons/logo.ico
diff --git a/kolibri/core/templatetags/core_tags.py b/kolibri/core/templatetags/core_tags.py
index dc385bd08e3..3ba6f000203 100644
--- a/kolibri/core/templatetags/core_tags.py
+++ b/kolibri/core/templatetags/core_tags.py
@@ -65,7 +65,9 @@ def theme_favicon():
 
     # Choose the first available .ico file. It's unlikely there's more than
     # one specified in the theme.
-    favicon_url = favicon_urls[0] if favicon_urls else static("assets/logo.ico")
+    favicon_url = (
+        favicon_urls[0] if favicon_urls else static("assets/favicons/logo.ico")
+    )
 
     return format_html('<link rel="shortcut icon" href="{}">', favicon_url)
 
diff --git a/kolibri/plugins/default_theme/kolibri_plugin.py b/kolibri/plugins/default_theme/kolibri_plugin.py
index daf387b529d..a5559cf54ef 100644
--- a/kolibri/plugins/default_theme/kolibri_plugin.py
+++ b/kolibri/plugins/default_theme/kolibri_plugin.py
@@ -23,7 +23,7 @@ def theme(self):
             },
             "logos": [
                 {
-                    "src": static("assets/default_theme/logo.ico"),
+                    "src": static("assets/favicons/logo.ico"),
                     "content_type": "image/vnd.microsoft.icon",
                     "size": "32x32",
                 },
diff --git a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/ConfirmMerge.vue b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/ConfirmMerge.vue
index add3edf4b7a..e9ea852a1fc 100644
--- a/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/ConfirmMerge.vue
+++ b/kolibri/plugins/user_profile/assets/src/views/ChangeFacility/ConfirmMerge.vue
@@ -7,7 +7,7 @@
       <KCheckbox
         ref="kCheckbox"
         :label="$tr('consequences')"
-        :checked="false"
+        :checked="isConfirmed"
         @change="isConfirmed = !isConfirmed"
         @keydown.enter="handleContinue"
       />