diff --git a/changelog b/changelog
index b8a9465..5251553 100644
--- a/changelog
+++ b/changelog
@@ -3,13 +3,17 @@
 ---------------
 - add default groups when creating a database
 - improved the auto-type dialog (keyboard only usage, visual selection feedback)
+- automatically try to unlock db when global auto-type key has been pressed
 - fixed password encoding problem (Bug #1687864)
 - fixed sorting of date columns (Bugs #1861726, #1922311)
 - fixed problem when restoring window after auto-type (Bug #1978861)
 - don't use entries in 'Backup' group for global auto-type (Bug #1915664)
 - hide contents of search field while database is locked (Bug #1923554)
-- added missing menu accelerators
-- automatically try to unlock db when global auto-type key has been pressed
+- fixed: custom entry icons are not saved (Bug #1995561)
+- added new icons introduced in KeePass 1.11
+- improved format of date strings (Bug #1932394)
+- added missing menu accelerators (Bug #1955304)
+- fixed: line breaks are ignored in Entry Detail View (Bug #1942362)
 - master key transformations (rounds) are now computed in two threads (from KeePass 1.11)
 - added ability to measure the number of rounds that can be calculated in 1 second
 - increase and randomize the default key transformation number
diff --git a/src/Database.cpp b/src/Database.cpp
index aa549a0..5c306c8 100644
--- a/src/Database.cpp
+++ b/src/Database.cpp
@@ -76,7 +76,7 @@ bool KpxUuid::operator!=(const KpxUuid& other)const{
 QString KpxDateTime::toString(Qt::DateFormat format) const{
 	if (*this==Date_Never)
 		return QCoreApplication::translate("Database","Never");
-	else if (format==Qt::DefaultLocaleShortDate){
+	else if (format==Qt::SystemLocaleDate){
 		QString strFormat = QLocale::system().dateFormat(QLocale::ShortFormat);
 		if (!strFormat.contains("dd")) strFormat.replace("d", "dd");
 		if (!strFormat.contains("MM")) strFormat.replace("M", "MM");
@@ -94,7 +94,7 @@ QString KpxDateTime::toString(Qt::DateFormat format) const{
 QString KpxDateTime::dateToString(Qt::DateFormat format) const{
 	if (*this==Date_Never)
 		return QCoreApplication::translate("Database","Never");
-	else if (format==Qt::DefaultLocaleShortDate){
+	else if (format==Qt::SystemLocaleDate){
 		QString strFormat = QLocale::system().dateFormat(QLocale::ShortFormat);
 		if (!strFormat.contains("dd")) strFormat.replace("d", "dd");
 		if (!strFormat.contains("MM")) strFormat.replace("M", "MM");
diff --git a/src/dialogs/ExpiredEntriesDlg.cpp b/src/dialogs/ExpiredEntriesDlg.cpp
index c1bd252..9b7c344 100644
--- a/src/dialogs/ExpiredEntriesDlg.cpp
+++ b/src/dialogs/ExpiredEntriesDlg.cpp
@@ -30,7 +30,7 @@ ExpiredEntriesDialog::ExpiredEntriesDialog(QWidget* parent,IDatabase* database,c
 		item->setText(0,Entries[i]->group()->title());
 		item->setText(1,Entries[i]->title());
 		item->setText(2,Entries[i]->username());
-		item->setText(3,Entries[i]->expire().dateToString(Qt::DefaultLocaleShortDate));
+		item->setText(3,Entries[i]->expire().dateToString(Qt::SystemLocaleDate));
 		item->setIcon(0,database->icon(Entries[i]->group()->image()));
 		item->setIcon(1,database->icon(Entries[i]->image()));
 
diff --git a/src/lib/EntryView.cpp b/src/lib/EntryView.cpp
index f2d9e11..bfd47a0 100644
--- a/src/lib/EntryView.cpp
+++ b/src/lib/EntryView.cpp
@@ -183,13 +183,13 @@ void KeepassEntryView::updateEntry(EntryViewItem* item){
 	if (Columns.at(4)){
 		item->setText(j++,entry->comment().section('\n',0,0));}
 	if (Columns.at(5)){
-		item->setText(j++,entry->expire().dateToString(Qt::DefaultLocaleShortDate));}
+		item->setText(j++,entry->expire().dateToString(Qt::SystemLocaleDate));}
 	if (Columns.at(6)){
-		item->setText(j++,entry->creation().dateToString(Qt::DefaultLocaleShortDate));}
+		item->setText(j++,entry->creation().dateToString(Qt::SystemLocaleDate));}
 	if (Columns.at(7)){
-		item->setText(j++,entry->lastMod().dateToString(Qt::DefaultLocaleShortDate));}
+		item->setText(j++,entry->lastMod().dateToString(Qt::SystemLocaleDate));}
 	if (Columns.at(8)){
-		item->setText(j++,entry->lastAccess().dateToString(Qt::DefaultLocaleShortDate));}
+		item->setText(j++,entry->lastAccess().dateToString(Qt::SystemLocaleDate));}
 	if (Columns.at(9)){
 		item->setText(j++,entry->binaryDesc());}
 	if(Columns.at(10) && ViewMode==ShowSearchResults){
@@ -376,13 +376,13 @@ void KeepassEntryView::createItems(QList<IEntryHandle*>& entries){
 		if (Columns.at(4)){
 			item->setText(j++,entries[i]->comment().section('\n',0,0));}
 		if (Columns.at(5)){
-			item->setText(j++,entries[i]->expire().dateToString(Qt::DefaultLocaleShortDate));}
+			item->setText(j++,entries[i]->expire().dateToString(Qt::SystemLocaleDate));}
 		if (Columns.at(6)){
-			item->setText(j++,entries[i]->creation().dateToString(Qt::DefaultLocaleShortDate));}
+			item->setText(j++,entries[i]->creation().dateToString(Qt::SystemLocaleDate));}
 		if (Columns.at(7)){
-			item->setText(j++,entries[i]->lastMod().dateToString(Qt::DefaultLocaleShortDate));}
+			item->setText(j++,entries[i]->lastMod().dateToString(Qt::SystemLocaleDate));}
 		if (Columns.at(8)){
-			item->setText(j++,entries[i]->lastAccess().dateToString(Qt::DefaultLocaleShortDate));}
+			item->setText(j++,entries[i]->lastAccess().dateToString(Qt::SystemLocaleDate));}
 		if (Columns.at(9)){
 			item->setText(j++,entries[i]->binaryDesc());}
 		if(Columns.at(10) && ViewMode==ShowSearchResults){
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 5162e9a..9aeb38b 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -656,10 +656,10 @@ void KeepassMainWindow::updateDetailView(){
 	}
 	else templ.replace("%password%","****");
 	templ.replace("%url%",entry->url());
-	templ.replace("%creation%",entry->creation().toString(Qt::DefaultLocaleShortDate));
-	templ.replace("%lastmod%",entry->lastMod().toString(Qt::DefaultLocaleShortDate));
-	templ.replace("%lastaccess%",entry->lastAccess().toString(Qt::DefaultLocaleShortDate));
-	templ.replace("%expire%",entry->expire().toString(Qt::DefaultLocaleShortDate));
+	templ.replace("%creation%",entry->creation().toString(Qt::SystemLocaleDate));
+	templ.replace("%lastmod%",entry->lastMod().toString(Qt::SystemLocaleDate));
+	templ.replace("%lastaccess%",entry->lastAccess().toString(Qt::SystemLocaleDate));
+	templ.replace("%expire%",entry->expire().toString(Qt::SystemLocaleDate));
 	templ.replace("%comment%",entry->comment().replace("\n","<br/>"));
 	templ.replace("%attachment%",entry->binaryDesc());