diff --git a/changelog.md b/changelog.md
index e2156567eb..2712ea3250 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,14 @@
All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
+## 5.5.8 (API 1.5.2) 2021-04-17
+
+### Fixed
+- [Issue 4656](https://github.com/firefly-iii/firefly-iii/issues/4656) [issue 4660](https://github.com/firefly-iii/firefly-iii/issues/4660) Various fixes in the v2 layout.
+- [Issue 4663](https://github.com/firefly-iii/firefly-iii/issues/4663) It was possible to assign a budget to a transfer.
+- [Issue 4664](https://github.com/firefly-iii/firefly-iii/issues/4664) Nullpointer in bulk editor
+- [Issue 4668](https://github.com/firefly-iii/firefly-iii/issues/4668) Inactive rule groups would not be listed.
+
## 5.5.7 (API 1.5.2) 2021-04-11
### Added
diff --git a/config/firefly.php b/config/firefly.php
index 839547424f..e69dfb966d 100644
--- a/config/firefly.php
+++ b/config/firefly.php
@@ -100,7 +100,7 @@ return [
'handle_debts' => true,
],
- 'version' => '5.5.7',
+ 'version' => '5.5.8',
'api_version' => '1.5.2',
'db_version' => 16,
'maxUploadSize' => 1073741824, // 1 GB
diff --git a/frontend/package.json b/frontend/package.json
index 8160756921..f8fa8a1aa8 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -11,6 +11,7 @@
},
"devDependencies": {
"axios": "^0.21",
+ "date-fns": "^2.21.1",
"laravel-mix": "^6.0.6",
"lodash": "^4.17.19",
"lodash.clonedeep": "^4.5.0",
diff --git a/frontend/src/components/dashboard/Calendar.vue b/frontend/src/components/dashboard/Calendar.vue
index 23439efca5..185705e82f 100644
--- a/frontend/src/components/dashboard/Calendar.vue
+++ b/frontend/src/components/dashboard/Calendar.vue
@@ -46,7 +46,8 @@
class="btn btn-secondary"
@click="resetDate"
>
-