diff --git a/plugins_tools/eid-viewer/gtk/gtkui.c b/plugins_tools/eid-viewer/gtk/gtkui.c
index e16a5933b..3d126c73c 100644
--- a/plugins_tools/eid-viewer/gtk/gtkui.c
+++ b/plugins_tools/eid-viewer/gtk/gtkui.c
@@ -419,6 +419,32 @@ void readers_changed(unsigned long nreaders, slotdesc* slots) {
 	g_message("readers changed");
 }
 
+void show_card_eu_start_date(char* doctype) {
+	//show card EU start date or card EU+ start date depending on doctype of the card
+	GValue *show_data, *show_label, *hide_label;
+	show_data = calloc(sizeof(GValue), 1);
+	g_value_init(show_data, G_TYPE_BOOLEAN);
+	g_value_set_boolean(show_data, TRUE);
+	show_label = calloc(sizeof(GValue), 1);
+	g_value_init(show_label, G_TYPE_BOOLEAN);
+	g_value_set_boolean(show_label, TRUE);
+	hide_label = calloc(sizeof(GValue), 1);
+	g_value_init(hide_label, G_TYPE_BOOLEAN);
+	g_value_set_boolean(hide_label, FALSE);
+	if(((doctype[0] == '3') && (doctype[1] == '1')) || ((doctype[0] == '6') && (doctype[1] == '1'))) {   //EU case
+		GObject* objEU = gtk_builder_get_object(builder, "cardEU_start_date");
+		g_object_set_threaded_gvalue(objEU, "visible", show_data, free);	
+		g_object_set_threaded_gvalue(gtk_builder_get_object(builder, "title_cardEU_start_date"), "visible", show_label, free);
+		g_object_set_threaded_gvalue(gtk_builder_get_object(builder, "title_cardEUPlus_start_date"), "visible", hide_label, free);
+	}
+	if(((doctype[0] == '3') && (doctype[1] == '2')) || ((doctype[0] == '6') && (doctype[1] == '2'))) {   //EU+ case
+		GObject* objEU = gtk_builder_get_object(builder, "cardEU_start_date");
+		g_object_set_threaded_gvalue(objEU, "visible", show_data, free);
+		g_object_set_threaded_gvalue(gtk_builder_get_object(builder, "title_cardEUPlus_start_date"), "visible", show_label, free);
+		g_object_set_threaded_gvalue(gtk_builder_get_object(builder, "title_cardEU_start_date"), "visible", hide_label, free);
+	}
+}
+
 void update_doctype(char* label G_GNUC_UNUSED, void* data, int length) {
 	static char doctype[2];
 	char* newtype = (char*)data;
@@ -448,6 +474,9 @@ void update_doctype(char* label G_GNUC_UNUSED, void* data, int length) {
 			if(!obj) {
 				continue;
 			}
+			if(toggles->label[i] == "cardEU_start_date") {
+				continue;
+			}
 			titlelabel = g_strdup_printf("title_%s", toggles->label[i]);
 			show_data = calloc(sizeof(GValue), 1);
 			g_value_init(show_data, G_TYPE_BOOLEAN);
@@ -459,5 +488,6 @@ void update_doctype(char* label G_GNUC_UNUSED, void* data, int length) {
 			g_object_set_threaded_gvalue(gtk_builder_get_object(builder, titlelabel), "visible", show_label, free);
 			g_free(titlelabel);
 		}
+		show_card_eu_start_date(doctype);
 	}
 }
diff --git a/plugins_tools/eid-viewer/gtk/gtkui.h b/plugins_tools/eid-viewer/gtk/gtkui.h
index 8da27a5af..ded92ba4a 100644
--- a/plugins_tools/eid-viewer/gtk/gtkui.h
+++ b/plugins_tools/eid-viewer/gtk/gtkui.h
@@ -28,6 +28,7 @@ void drag_data_get(GtkWidget * widget, GdkDragContext * ctx,
 #endif
 void validate_toggle(gpointer event_source, gpointer user_data);
 void auto_reader(GtkWidget * mi, gpointer user_data);
+void show_card_eu_start_date(char* doctype);
 void update_doctype(char* label, void* data, int length);
 extern gboolean is_foreigner;
 
diff --git a/plugins_tools/eid-viewer/gtk/po/de.po b/plugins_tools/eid-viewer/gtk/po/de.po
index aad9338ea..c3114b253 100644
--- a/plugins_tools/eid-viewer/gtk/po/de.po
+++ b/plugins_tools/eid-viewer/gtk/po/de.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eid-mw 4.1.1-v4.1.1.4.gc149158.dirty\n"
 "Report-Msgid-Bugs-To: servicedesk@bosa.fgov.be\n"
-"POT-Creation-Date: 2022-03-24 14:44+0200\n"
-"PO-Revision-Date: 2021-12-09 18:07+0200\n"
+"POT-Creation-Date: 2024-01-11 13:46+0100\n"
+"PO-Revision-Date: 2024-01-11 11:51+0100\n"
 "Last-Translator: Wouter Verhelst <wouter.verhelst@fedict.be>\n"
 "Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: plugins_tools/eid-viewer/gtk/main.c:98
 #, c-format
@@ -177,250 +177,258 @@ msgstr "Häufig gestellte Fragen..."
 msgid "eID Card Test Site..."
 msgstr "eID Test Site..."
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:279
+#: plugins_tools/eid-viewer/gtk/viewer.glade:277
 #: plugins_tools/eid-viewer/gtk/print.c:36
 msgid "Name:"
 msgstr "Name:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:298
+#: plugins_tools/eid-viewer/gtk/viewer.glade:293
 #: plugins_tools/eid-viewer/gtk/print.c:37
 msgid "Given names:"
 msgstr "Vornamen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:317
+#: plugins_tools/eid-viewer/gtk/viewer.glade:309
 #: plugins_tools/eid-viewer/gtk/print.c:38
 msgid "Place of birth:"
 msgstr "Geburtsort:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:336
+#: plugins_tools/eid-viewer/gtk/viewer.glade:325
 #: plugins_tools/eid-viewer/gtk/print.c:39
 msgid "Date of birth:"
 msgstr "Geburtsdatum:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:355
+#: plugins_tools/eid-viewer/gtk/viewer.glade:341
 #: plugins_tools/eid-viewer/gtk/print.c:40
 msgid "Sex:"
 msgstr "Geschlecht:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:374
+#: plugins_tools/eid-viewer/gtk/viewer.glade:357
 #: plugins_tools/eid-viewer/gtk/print.c:42
 msgid "National number:"
 msgstr "Nationale Nummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:393
+#: plugins_tools/eid-viewer/gtk/viewer.glade:373
 #: plugins_tools/eid-viewer/gtk/print.c:47
 msgid "Municipality:"
 msgstr "Gemeinde:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:412
+#: plugins_tools/eid-viewer/gtk/viewer.glade:389
 #: plugins_tools/eid-viewer/gtk/print.c:46
 msgid "Postal code:"
 msgstr "Postleitzahl:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:431
+#: plugins_tools/eid-viewer/gtk/viewer.glade:405
 #: plugins_tools/eid-viewer/gtk/print.c:45
 msgid "Street:"
 msgstr "Straße:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:464
+#: plugins_tools/eid-viewer/gtk/viewer.glade:435
 #: plugins_tools/eid-viewer/gtk/print.c:44
 msgid "Special status:"
 msgstr "Sonderstatus:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:483
+#: plugins_tools/eid-viewer/gtk/viewer.glade:451
 #: plugins_tools/eid-viewer/gtk/print.c:43
 msgid "Title:"
 msgstr "Titel:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:502
+#: plugins_tools/eid-viewer/gtk/viewer.glade:467
 #: plugins_tools/eid-viewer/gtk/print.c:41
 msgid "Nationality:"
 msgstr "Staatsangehörigkeit:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:733
+#: plugins_tools/eid-viewer/gtk/viewer.glade:491
 msgid "On-card photo of the holder"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:792
+#: plugins_tools/eid-viewer/gtk/viewer.glade:522
 #: plugins_tools/eid-viewer/gtk/print.c:60
 msgid "Date and country of international protection:"
 msgstr "Datum und Land des internationalen Schutzes:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:810
+#: plugins_tools/eid-viewer/gtk/viewer.glade:537
 #: plugins_tools/eid-viewer/gtk/print.c:62
 msgid "Employer's VAT/CBE number (1):"
 msgstr "Mehrwertsteuernummer/ZDU-Nummer des Arbeitgebers (1):"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:844
+#: plugins_tools/eid-viewer/gtk/viewer.glade:552
 #: plugins_tools/eid-viewer/gtk/print.c:63
 msgid "Employer's VAT/CBE number (2):"
 msgstr "Mehrwertsteuernummer/ZDU-Nummer des Arbeitgebers (2):"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:894
+#: plugins_tools/eid-viewer/gtk/viewer.glade:567
 #: plugins_tools/eid-viewer/gtk/print.c:61
 msgid "Access to the labour market:"
 msgstr "Zugang zum Arbeitsmarkt:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:928
+#: plugins_tools/eid-viewer/gtk/viewer.glade:582
 #: plugins_tools/eid-viewer/gtk/print.c:64
 msgid "Regional file number:"
 msgstr "Regionale Aktennummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:946
+#: plugins_tools/eid-viewer/gtk/viewer.glade:597
 #: plugins_tools/eid-viewer/gtk/print.c:57
 msgid "Family member:"
 msgstr "Familienangehöriger:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:980
+#: plugins_tools/eid-viewer/gtk/viewer.glade:612
 #: plugins_tools/eid-viewer/gtk/print.c:58
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:998
+#: plugins_tools/eid-viewer/gtk/viewer.glade:627
 #: plugins_tools/eid-viewer/gtk/print.c:59
 msgid "Duplicate:"
 msgstr "Duplikat:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1048
+#: plugins_tools/eid-viewer/gtk/viewer.glade:642
 #: plugins_tools/eid-viewer/gtk/print.c:65
 msgid "Brexit mentions:"
 msgstr "Brexit Erwähnungen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1091
+#: plugins_tools/eid-viewer/gtk/viewer.glade:655
 msgid "Mentions:"
 msgstr "Erwähnungen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1172
+#: plugins_tools/eid-viewer/gtk/viewer.glade:668
+msgid "Date of registration:"
+msgstr "Datum Anmeldung:"
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:681
+msgid "Date of permanent residence:"
+msgstr "Datum Daueraufenthalt:"
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1177
 msgid "Identity"
 msgstr "Identität"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1228
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1233
 #: plugins_tools/eid-viewer/gtk/print.c:48
 msgid "Card number:"
 msgstr "Kartennummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1245
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1250
 #: plugins_tools/eid-viewer/gtk/print.c:49
 msgid "Place of issue:"
 msgstr "Ausstellungsort:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1262
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1267
 #: plugins_tools/eid-viewer/gtk/print.c:50
 msgid "Chip number:"
 msgstr "Chipnummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1279
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1699
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1284
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1704
 #: plugins_tools/eid-viewer/gtk/print.c:51
 msgid "Valid from:"
 msgstr "Gültig ab:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1296
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1718
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1301
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1723
 #: plugins_tools/eid-viewer/gtk/print.c:52
 msgid "Valid until:"
 msgstr "Gültig bis:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1310
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1315
 msgid "Verify PIN"
 msgstr "PIN uberprufen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1326
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1331
 msgid "Change PIN"
 msgstr "PIN ändern"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1461
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1466
 msgid "Basic key:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1478
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1483
 #: plugins_tools/eid-viewer/gtk/print.c:53
 msgid "Contact chip:"
 msgstr "Kontaktchip:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1550
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1555
 msgid "Card/PIN"
 msgstr "Karte/PIN"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1576
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1581
 msgid "Contains a hierarchical view of the certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1737
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1742
 msgid "Usage:"
 msgstr "Verwendung:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1756
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1761
 msgid "Trust:"
 msgstr "Vertrauen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1887
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1892
 msgid "Always validate certificate trust"
 msgstr "Zuverlässigkeit der Zertifikate immer validieren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1897
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1902
 msgid ""
 "Enable this to disable the \"Validate now\" button and always validate "
 "certificates as soon as the card is read."
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1909
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1914
 msgid "Validate Now"
 msgstr "Jetzt validieren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1917
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1922
 msgid "Immediately checks validity of all certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1960
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1965
 msgid "Certificates"
 msgstr "Zertifikate"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2017
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2022
 msgid "Filter the log entries"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2029
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2034
 msgid "Clear Log"
 msgstr "Protokoll löschen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2043
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2048
 msgid "Copy Log To Clipboard"
 msgstr "Protokoll in Zwischenablage kopieren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2082
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2087
 msgid "Log"
 msgstr "Logbuch"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2147
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2152
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2163
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2168
 msgid "Show log tab"
 msgstr "Logbuch anzeigen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2192
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2197
 msgid "Check for update at startup"
 msgstr "Beim Starten auf Updates prüfen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2206
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2211
 msgid "Check for update now"
 msgstr "Jetzt nach Updates suchen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2225
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2230
 msgid "Update checks"
 msgstr "Updateprüfungen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2321
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2324
 msgid "Language"
 msgstr "Sprache"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2349
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2352
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2370
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2373
 msgid "Reader selection"
 msgstr "Leserauswahl"
 
diff --git a/plugins_tools/eid-viewer/gtk/po/eid-viewer.pot b/plugins_tools/eid-viewer/gtk/po/eid-viewer.pot
index d3dbadc32..d1bacabae 100644
--- a/plugins_tools/eid-viewer/gtk/po/eid-viewer.pot
+++ b/plugins_tools/eid-viewer/gtk/po/eid-viewer.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: eid-mw 5.1.2-v5.1.2.25.g299cdd95.dirty\n"
+"Project-Id-Version: eid-mw 5.1.8-v5.1.8mw.16.g3ed3494f.dirty\n"
 "Report-Msgid-Bugs-To: servicedesk@bosa.fgov.be\n"
-"POT-Creation-Date: 2022-03-24 14:44+0200\n"
+"POT-Creation-Date: 2024-01-11 13:46+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -177,250 +177,258 @@ msgstr ""
 msgid "eID Card Test Site..."
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:279
+#: plugins_tools/eid-viewer/gtk/viewer.glade:277
 #: plugins_tools/eid-viewer/gtk/print.c:36
 msgid "Name:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:298
+#: plugins_tools/eid-viewer/gtk/viewer.glade:293
 #: plugins_tools/eid-viewer/gtk/print.c:37
 msgid "Given names:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:317
+#: plugins_tools/eid-viewer/gtk/viewer.glade:309
 #: plugins_tools/eid-viewer/gtk/print.c:38
 msgid "Place of birth:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:336
+#: plugins_tools/eid-viewer/gtk/viewer.glade:325
 #: plugins_tools/eid-viewer/gtk/print.c:39
 msgid "Date of birth:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:355
+#: plugins_tools/eid-viewer/gtk/viewer.glade:341
 #: plugins_tools/eid-viewer/gtk/print.c:40
 msgid "Sex:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:374
+#: plugins_tools/eid-viewer/gtk/viewer.glade:357
 #: plugins_tools/eid-viewer/gtk/print.c:42
 msgid "National number:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:393
+#: plugins_tools/eid-viewer/gtk/viewer.glade:373
 #: plugins_tools/eid-viewer/gtk/print.c:47
 msgid "Municipality:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:412
+#: plugins_tools/eid-viewer/gtk/viewer.glade:389
 #: plugins_tools/eid-viewer/gtk/print.c:46
 msgid "Postal code:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:431
+#: plugins_tools/eid-viewer/gtk/viewer.glade:405
 #: plugins_tools/eid-viewer/gtk/print.c:45
 msgid "Street:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:464
+#: plugins_tools/eid-viewer/gtk/viewer.glade:435
 #: plugins_tools/eid-viewer/gtk/print.c:44
 msgid "Special status:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:483
+#: plugins_tools/eid-viewer/gtk/viewer.glade:451
 #: plugins_tools/eid-viewer/gtk/print.c:43
 msgid "Title:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:502
+#: plugins_tools/eid-viewer/gtk/viewer.glade:467
 #: plugins_tools/eid-viewer/gtk/print.c:41
 msgid "Nationality:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:733
+#: plugins_tools/eid-viewer/gtk/viewer.glade:491
 msgid "On-card photo of the holder"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:792
+#: plugins_tools/eid-viewer/gtk/viewer.glade:522
 #: plugins_tools/eid-viewer/gtk/print.c:60
 msgid "Date and country of international protection:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:810
+#: plugins_tools/eid-viewer/gtk/viewer.glade:537
 #: plugins_tools/eid-viewer/gtk/print.c:62
 msgid "Employer's VAT/CBE number (1):"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:844
+#: plugins_tools/eid-viewer/gtk/viewer.glade:552
 #: plugins_tools/eid-viewer/gtk/print.c:63
 msgid "Employer's VAT/CBE number (2):"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:894
+#: plugins_tools/eid-viewer/gtk/viewer.glade:567
 #: plugins_tools/eid-viewer/gtk/print.c:61
 msgid "Access to the labour market:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:928
+#: plugins_tools/eid-viewer/gtk/viewer.glade:582
 #: plugins_tools/eid-viewer/gtk/print.c:64
 msgid "Regional file number:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:946
+#: plugins_tools/eid-viewer/gtk/viewer.glade:597
 #: plugins_tools/eid-viewer/gtk/print.c:57
 msgid "Family member:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:980
+#: plugins_tools/eid-viewer/gtk/viewer.glade:612
 #: plugins_tools/eid-viewer/gtk/print.c:58
 msgid "Organization:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:998
+#: plugins_tools/eid-viewer/gtk/viewer.glade:627
 #: plugins_tools/eid-viewer/gtk/print.c:59
 msgid "Duplicate:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1048
+#: plugins_tools/eid-viewer/gtk/viewer.glade:642
 #: plugins_tools/eid-viewer/gtk/print.c:65
 msgid "Brexit mentions:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1091
+#: plugins_tools/eid-viewer/gtk/viewer.glade:655
 msgid "Mentions:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1172
+#: plugins_tools/eid-viewer/gtk/viewer.glade:668
+msgid "Date of registration:"
+msgstr ""
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:681
+msgid "Date of permanent residence:"
+msgstr ""
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1177
 msgid "Identity"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1228
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1233
 #: plugins_tools/eid-viewer/gtk/print.c:48
 msgid "Card number:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1245
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1250
 #: plugins_tools/eid-viewer/gtk/print.c:49
 msgid "Place of issue:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1262
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1267
 #: plugins_tools/eid-viewer/gtk/print.c:50
 msgid "Chip number:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1279
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1699
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1284
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1704
 #: plugins_tools/eid-viewer/gtk/print.c:51
 msgid "Valid from:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1296
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1718
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1301
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1723
 #: plugins_tools/eid-viewer/gtk/print.c:52
 msgid "Valid until:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1310
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1315
 msgid "Verify PIN"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1326
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1331
 msgid "Change PIN"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1461
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1466
 msgid "Basic key:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1478
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1483
 #: plugins_tools/eid-viewer/gtk/print.c:53
 msgid "Contact chip:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1550
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1555
 msgid "Card/PIN"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1576
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1581
 msgid "Contains a hierarchical view of the certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1737
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1742
 msgid "Usage:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1756
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1761
 msgid "Trust:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1887
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1892
 msgid "Always validate certificate trust"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1897
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1902
 msgid ""
 "Enable this to disable the \"Validate now\" button and always validate "
 "certificates as soon as the card is read."
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1909
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1914
 msgid "Validate Now"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1917
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1922
 msgid "Immediately checks validity of all certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1960
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1965
 msgid "Certificates"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2017
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2022
 msgid "Filter the log entries"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2029
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2034
 msgid "Clear Log"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2043
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2048
 msgid "Copy Log To Clipboard"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2082
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2087
 msgid "Log"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2147
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2152
 msgid "Preferences"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2163
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2168
 msgid "Show log tab"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2192
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2197
 msgid "Check for update at startup"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2206
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2211
 msgid "Check for update now"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2225
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2230
 msgid "Update checks"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2321
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2324
 msgid "Language"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2349
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2352
 msgid "Automatic"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2370
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2373
 msgid "Reader selection"
 msgstr ""
 
diff --git a/plugins_tools/eid-viewer/gtk/po/fr.po b/plugins_tools/eid-viewer/gtk/po/fr.po
index cbf4bb6d6..e86fd44b5 100644
--- a/plugins_tools/eid-viewer/gtk/po/fr.po
+++ b/plugins_tools/eid-viewer/gtk/po/fr.po
@@ -5,15 +5,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eid-mw 4.1.1-v4.1.1.4.gc149158.dirty\n"
 "Report-Msgid-Bugs-To: servicedesk@bosa.fgov.be\n"
-"POT-Creation-Date: 2022-03-24 14:44+0200\n"
-"PO-Revision-Date: 2021-12-09 18:04+0200\n"
+"POT-Creation-Date: 2024-01-11 13:46+0100\n"
+"PO-Revision-Date: 2024-01-11 11:47+0100\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: plugins_tools/eid-viewer/gtk/main.c:98
 #, c-format
@@ -175,250 +175,258 @@ msgstr "Foire aux questions..."
 msgid "eID Card Test Site..."
 msgstr "Site de test eID..."
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:279
+#: plugins_tools/eid-viewer/gtk/viewer.glade:277
 #: plugins_tools/eid-viewer/gtk/print.c:36
 msgid "Name:"
 msgstr "Nom:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:298
+#: plugins_tools/eid-viewer/gtk/viewer.glade:293
 #: plugins_tools/eid-viewer/gtk/print.c:37
 msgid "Given names:"
 msgstr "Prénoms:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:317
+#: plugins_tools/eid-viewer/gtk/viewer.glade:309
 #: plugins_tools/eid-viewer/gtk/print.c:38
 msgid "Place of birth:"
 msgstr "Lieu de naissance:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:336
+#: plugins_tools/eid-viewer/gtk/viewer.glade:325
 #: plugins_tools/eid-viewer/gtk/print.c:39
 msgid "Date of birth:"
 msgstr "Date de naissance:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:355
+#: plugins_tools/eid-viewer/gtk/viewer.glade:341
 #: plugins_tools/eid-viewer/gtk/print.c:40
 msgid "Sex:"
 msgstr "Sexe:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:374
+#: plugins_tools/eid-viewer/gtk/viewer.glade:357
 #: plugins_tools/eid-viewer/gtk/print.c:42
 msgid "National number:"
 msgstr "Numéro national:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:393
+#: plugins_tools/eid-viewer/gtk/viewer.glade:373
 #: plugins_tools/eid-viewer/gtk/print.c:47
 msgid "Municipality:"
 msgstr "Commune:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:412
+#: plugins_tools/eid-viewer/gtk/viewer.glade:389
 #: plugins_tools/eid-viewer/gtk/print.c:46
 msgid "Postal code:"
 msgstr "Code postal:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:431
+#: plugins_tools/eid-viewer/gtk/viewer.glade:405
 #: plugins_tools/eid-viewer/gtk/print.c:45
 msgid "Street:"
 msgstr "Rue:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:464
+#: plugins_tools/eid-viewer/gtk/viewer.glade:435
 #: plugins_tools/eid-viewer/gtk/print.c:44
 msgid "Special status:"
 msgstr "Statut spécial:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:483
+#: plugins_tools/eid-viewer/gtk/viewer.glade:451
 #: plugins_tools/eid-viewer/gtk/print.c:43
 msgid "Title:"
 msgstr "Titre:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:502
+#: plugins_tools/eid-viewer/gtk/viewer.glade:467
 #: plugins_tools/eid-viewer/gtk/print.c:41
 msgid "Nationality:"
 msgstr "Nationalité:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:733
+#: plugins_tools/eid-viewer/gtk/viewer.glade:491
 msgid "On-card photo of the holder"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:792
+#: plugins_tools/eid-viewer/gtk/viewer.glade:522
 #: plugins_tools/eid-viewer/gtk/print.c:60
 msgid "Date and country of international protection:"
 msgstr "Date et pays de protection internationale:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:810
+#: plugins_tools/eid-viewer/gtk/viewer.glade:537
 #: plugins_tools/eid-viewer/gtk/print.c:62
 msgid "Employer's VAT/CBE number (1):"
 msgstr "Numéro TVA/BCE de l'employeur (1):"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:844
+#: plugins_tools/eid-viewer/gtk/viewer.glade:552
 #: plugins_tools/eid-viewer/gtk/print.c:63
 msgid "Employer's VAT/CBE number (2):"
 msgstr "Numéro TVA/BCE de l'employeur (2):"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:894
+#: plugins_tools/eid-viewer/gtk/viewer.glade:567
 #: plugins_tools/eid-viewer/gtk/print.c:61
 msgid "Access to the labour market:"
 msgstr "Accès au marché du travail:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:928
+#: plugins_tools/eid-viewer/gtk/viewer.glade:582
 #: plugins_tools/eid-viewer/gtk/print.c:64
 msgid "Regional file number:"
 msgstr "Numéro de dossier régional:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:946
+#: plugins_tools/eid-viewer/gtk/viewer.glade:597
 #: plugins_tools/eid-viewer/gtk/print.c:57
 msgid "Family member:"
 msgstr "Membre de famille:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:980
+#: plugins_tools/eid-viewer/gtk/viewer.glade:612
 #: plugins_tools/eid-viewer/gtk/print.c:58
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:998
+#: plugins_tools/eid-viewer/gtk/viewer.glade:627
 #: plugins_tools/eid-viewer/gtk/print.c:59
 msgid "Duplicate:"
 msgstr "Duplicata:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1048
+#: plugins_tools/eid-viewer/gtk/viewer.glade:642
 #: plugins_tools/eid-viewer/gtk/print.c:65
 msgid "Brexit mentions:"
 msgstr "Mentions du Brexit:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1091
+#: plugins_tools/eid-viewer/gtk/viewer.glade:655
 msgid "Mentions:"
 msgstr "Mentions:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1172
+#: plugins_tools/eid-viewer/gtk/viewer.glade:668
+msgid "Date of registration:"
+msgstr "Date d'enregistrement:"
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:681
+msgid "Date of permanent residence:"
+msgstr "Date du séjour permanent:"
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1177
 msgid "Identity"
 msgstr "Identité"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1228
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1233
 #: plugins_tools/eid-viewer/gtk/print.c:48
 msgid "Card number:"
 msgstr "Numéro de carte:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1245
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1250
 #: plugins_tools/eid-viewer/gtk/print.c:49
 msgid "Place of issue:"
 msgstr "Lieu d'émission:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1262
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1267
 #: plugins_tools/eid-viewer/gtk/print.c:50
 msgid "Chip number:"
 msgstr "Numéro de puce:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1279
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1699
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1284
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1704
 #: plugins_tools/eid-viewer/gtk/print.c:51
 msgid "Valid from:"
 msgstr "Valable à partir du:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1296
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1718
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1301
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1723
 #: plugins_tools/eid-viewer/gtk/print.c:52
 msgid "Valid until:"
 msgstr "Valable jusqu'au:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1310
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1315
 msgid "Verify PIN"
 msgstr "Verifier le code PIN"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1326
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1331
 msgid "Change PIN"
 msgstr "Changer le code PIN"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1461
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1466
 msgid "Basic key:"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1478
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1483
 #: plugins_tools/eid-viewer/gtk/print.c:53
 msgid "Contact chip:"
 msgstr "Puce à contact:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1550
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1555
 msgid "Card/PIN"
 msgstr "Carte/PIN"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1576
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1581
 msgid "Contains a hierarchical view of the certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1737
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1742
 msgid "Usage:"
 msgstr "Utilisation:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1756
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1761
 msgid "Trust:"
 msgstr "Confiance:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1887
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1892
 msgid "Always validate certificate trust"
 msgstr "Toujours valider la fiabilité des certificats"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1897
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1902
 msgid ""
 "Enable this to disable the \"Validate now\" button and always validate "
 "certificates as soon as the card is read."
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1909
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1914
 msgid "Validate Now"
 msgstr "Valider maintenant"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1917
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1922
 msgid "Immediately checks validity of all certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1960
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1965
 msgid "Certificates"
 msgstr "Certificats"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2017
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2022
 msgid "Filter the log entries"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2029
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2034
 msgid "Clear Log"
 msgstr "Effacer le journal"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2043
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2048
 msgid "Copy Log To Clipboard"
 msgstr "Copier le journal dans le presse-papiers"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2082
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2087
 msgid "Log"
 msgstr "Journal"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2147
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2152
 msgid "Preferences"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2163
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2168
 msgid "Show log tab"
 msgstr "Afficher le journal"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2192
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2197
 msgid "Check for update at startup"
 msgstr "Rechercher des mises à jour au démarrage"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2206
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2211
 msgid "Check for update now"
 msgstr "Rechercher des mises à jour maintenant"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2225
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2230
 msgid "Update checks"
 msgstr "Contrôles de mise à jour"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2321
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2324
 msgid "Language"
 msgstr "Language"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2349
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2352
 msgid "Automatic"
 msgstr "Automatique"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2370
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2373
 msgid "Reader selection"
 msgstr "Sélection du lecteur"
 
diff --git a/plugins_tools/eid-viewer/gtk/po/nl.po b/plugins_tools/eid-viewer/gtk/po/nl.po
index 72908b468..856bc3259 100644
--- a/plugins_tools/eid-viewer/gtk/po/nl.po
+++ b/plugins_tools/eid-viewer/gtk/po/nl.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: eid-mw 4.1.1-v4.1.1.dirty\n"
 "Report-Msgid-Bugs-To: servicedesk@bosa.fgov.be\n"
-"POT-Creation-Date: 2022-03-24 14:44+0200\n"
-"PO-Revision-Date: 2021-12-09 18:05+0200\n"
+"POT-Creation-Date: 2024-01-11 13:46+0100\n"
+"PO-Revision-Date: 2024-01-11 11:49+0100\n"
 "Last-Translator: Wouter Verhelst <wouter.verhelst@fedict.be>\n"
 "Language-Team: \n"
 "Language: nl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Poedit 3.0\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: plugins_tools/eid-viewer/gtk/main.c:98
 #, c-format
@@ -180,250 +180,258 @@ msgstr "Veelgestelde vragen..."
 msgid "eID Card Test Site..."
 msgstr "Testsite voor eID..."
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:279
+#: plugins_tools/eid-viewer/gtk/viewer.glade:277
 #: plugins_tools/eid-viewer/gtk/print.c:36
 msgid "Name:"
 msgstr "Naam:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:298
+#: plugins_tools/eid-viewer/gtk/viewer.glade:293
 #: plugins_tools/eid-viewer/gtk/print.c:37
 msgid "Given names:"
 msgstr "Voornamen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:317
+#: plugins_tools/eid-viewer/gtk/viewer.glade:309
 #: plugins_tools/eid-viewer/gtk/print.c:38
 msgid "Place of birth:"
 msgstr "Geboorteplaats:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:336
+#: plugins_tools/eid-viewer/gtk/viewer.glade:325
 #: plugins_tools/eid-viewer/gtk/print.c:39
 msgid "Date of birth:"
 msgstr "Geboortedatum:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:355
+#: plugins_tools/eid-viewer/gtk/viewer.glade:341
 #: plugins_tools/eid-viewer/gtk/print.c:40
 msgid "Sex:"
 msgstr "Geslacht:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:374
+#: plugins_tools/eid-viewer/gtk/viewer.glade:357
 #: plugins_tools/eid-viewer/gtk/print.c:42
 msgid "National number:"
 msgstr "Nationaal nummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:393
+#: plugins_tools/eid-viewer/gtk/viewer.glade:373
 #: plugins_tools/eid-viewer/gtk/print.c:47
 msgid "Municipality:"
 msgstr "Gemeente:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:412
+#: plugins_tools/eid-viewer/gtk/viewer.glade:389
 #: plugins_tools/eid-viewer/gtk/print.c:46
 msgid "Postal code:"
 msgstr "Postcode:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:431
+#: plugins_tools/eid-viewer/gtk/viewer.glade:405
 #: plugins_tools/eid-viewer/gtk/print.c:45
 msgid "Street:"
 msgstr "Straat:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:464
+#: plugins_tools/eid-viewer/gtk/viewer.glade:435
 #: plugins_tools/eid-viewer/gtk/print.c:44
 msgid "Special status:"
 msgstr "Speciale status:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:483
+#: plugins_tools/eid-viewer/gtk/viewer.glade:451
 #: plugins_tools/eid-viewer/gtk/print.c:43
 msgid "Title:"
 msgstr "Titel:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:502
+#: plugins_tools/eid-viewer/gtk/viewer.glade:467
 #: plugins_tools/eid-viewer/gtk/print.c:41
 msgid "Nationality:"
 msgstr "Nationaliteit:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:733
+#: plugins_tools/eid-viewer/gtk/viewer.glade:491
 msgid "On-card photo of the holder"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:792
+#: plugins_tools/eid-viewer/gtk/viewer.glade:522
 #: plugins_tools/eid-viewer/gtk/print.c:60
 msgid "Date and country of international protection:"
 msgstr "Datum en land van internationale bescherming:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:810
+#: plugins_tools/eid-viewer/gtk/viewer.glade:537
 #: plugins_tools/eid-viewer/gtk/print.c:62
 msgid "Employer's VAT/CBE number (1):"
 msgstr "BTW/KBO-nummer van de werkgever (1):"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:844
+#: plugins_tools/eid-viewer/gtk/viewer.glade:552
 #: plugins_tools/eid-viewer/gtk/print.c:63
 msgid "Employer's VAT/CBE number (2):"
 msgstr "BTW/KBO-nummer van de werkgever (2):"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:894
+#: plugins_tools/eid-viewer/gtk/viewer.glade:567
 #: plugins_tools/eid-viewer/gtk/print.c:61
 msgid "Access to the labour market:"
 msgstr "Toegang tot de arbeidsmarkt:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:928
+#: plugins_tools/eid-viewer/gtk/viewer.glade:582
 #: plugins_tools/eid-viewer/gtk/print.c:64
 msgid "Regional file number:"
 msgstr "Gewestelijk dossiernummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:946
+#: plugins_tools/eid-viewer/gtk/viewer.glade:597
 #: plugins_tools/eid-viewer/gtk/print.c:57
 msgid "Family member:"
 msgstr "Gezinslid:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:980
+#: plugins_tools/eid-viewer/gtk/viewer.glade:612
 #: plugins_tools/eid-viewer/gtk/print.c:58
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:998
+#: plugins_tools/eid-viewer/gtk/viewer.glade:627
 #: plugins_tools/eid-viewer/gtk/print.c:59
 msgid "Duplicate:"
 msgstr "Duplicaat:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1048
+#: plugins_tools/eid-viewer/gtk/viewer.glade:642
 #: plugins_tools/eid-viewer/gtk/print.c:65
 msgid "Brexit mentions:"
 msgstr "Brexit vermeldingen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1091
+#: plugins_tools/eid-viewer/gtk/viewer.glade:655
 msgid "Mentions:"
 msgstr "Vermeldingen:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1172
+#: plugins_tools/eid-viewer/gtk/viewer.glade:668
+msgid "Date of registration:"
+msgstr "Datum van inschrijving:"
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:681
+msgid "Date of permanent residence:"
+msgstr "Datum van het duurzaam verblijf"
+
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1177
 msgid "Identity"
 msgstr "Identiteit"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1228
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1233
 #: plugins_tools/eid-viewer/gtk/print.c:48
 msgid "Card number:"
 msgstr "Kaartnummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1245
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1250
 #: plugins_tools/eid-viewer/gtk/print.c:49
 msgid "Place of issue:"
 msgstr "Plaats van afgifte:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1262
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1267
 #: plugins_tools/eid-viewer/gtk/print.c:50
 msgid "Chip number:"
 msgstr "Chip nummer:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1279
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1699
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1284
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1704
 #: plugins_tools/eid-viewer/gtk/print.c:51
 msgid "Valid from:"
 msgstr "Geldig vanaf:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1296
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1718
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1301
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1723
 #: plugins_tools/eid-viewer/gtk/print.c:52
 msgid "Valid until:"
 msgstr "Geldig tot:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1310
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1315
 msgid "Verify PIN"
 msgstr "Pincode testen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1326
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1331
 msgid "Change PIN"
 msgstr "Pincode wijzigen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1461
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1466
 msgid "Basic key:"
 msgstr "Basissleutel:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1478
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1483
 #: plugins_tools/eid-viewer/gtk/print.c:53
 msgid "Contact chip:"
 msgstr "Contactchip:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1550
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1555
 msgid "Card/PIN"
 msgstr "Kaart/PIN"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1576
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1581
 msgid "Contains a hierarchical view of the certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1737
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1742
 msgid "Usage:"
 msgstr "Gebruik:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1756
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1761
 msgid "Trust:"
 msgstr "Betrouwbaarheid:"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1887
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1892
 msgid "Always validate certificate trust"
 msgstr "Certificaatbetrouwbaarheid altijd valideren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1897
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1902
 msgid ""
 "Enable this to disable the \"Validate now\" button and always validate "
 "certificates as soon as the card is read."
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1909
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1914
 msgid "Validate Now"
 msgstr "Nu valideren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1917
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1922
 msgid "Immediately checks validity of all certificates on the card"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:1960
+#: plugins_tools/eid-viewer/gtk/viewer.glade:1965
 msgid "Certificates"
 msgstr "Certificaten"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2017
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2022
 msgid "Filter the log entries"
 msgstr ""
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2029
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2034
 msgid "Clear Log"
 msgstr "Log wissen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2043
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2048
 msgid "Copy Log To Clipboard"
 msgstr "Log naar klembord kopiëren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2082
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2087
 msgid "Log"
 msgstr "Logboek"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2147
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2152
 msgid "Preferences"
 msgstr "Voorkeuren"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2163
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2168
 msgid "Show log tab"
 msgstr "Logboek tonen"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2192
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2197
 msgid "Check for update at startup"
 msgstr "Controleren op updates bij het opstarten"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2206
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2211
 msgid "Check for update now"
 msgstr "Nu controleren op updates"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2225
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2230
 msgid "Update checks"
 msgstr "Updatecontroles"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2321
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2324
 msgid "Language"
 msgstr "Taal"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2349
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2352
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: plugins_tools/eid-viewer/gtk/viewer.glade:2370
+#: plugins_tools/eid-viewer/gtk/viewer.glade:2373
 msgid "Reader selection"
 msgstr "Selectie van lezer"
 
diff --git a/plugins_tools/eid-viewer/gtk/viewer.glade b/plugins_tools/eid-viewer/gtk/viewer.glade
index 6388f085b..bbc8335bb 100644
--- a/plugins_tools/eid-viewer/gtk/viewer.glade
+++ b/plugins_tools/eid-viewer/gtk/viewer.glade
@@ -207,14 +207,15 @@
             <property name="can-focus">True</property>
             <property name="scrollable">True</property>
             <child>
-              <object class="GtkBox" id="box3">
+              <object class="GtkBox" id="box13">
                 <property name="visible">True</property>
                 <property name="can-focus">False</property>
+                <property name="orientation">vertical</property>
                 <child>
-                  <object class="GtkDrawingArea" id="drawingarea1">
+                  <object class="GtkDrawingArea" id="drawingarea3">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="hexpand">True</property>
+                    <property name="vexpand">True</property>
                   </object>
                   <packing>
                     <property name="expand">False</property>
@@ -223,15 +224,27 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkBox" id="box4">
+                  <object class="GtkLabel" id="document_type">
+                    <property name="visible">True</property>
+                    <property name="sensitive">False</property>
+                    <property name="can-focus">False</property>
+                    <property name="label">-</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">1</property>
+                  </packing>
+                </child>
+                <child>
+                  <object class="GtkBox" id="box3">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
-                    <property name="orientation">vertical</property>
                     <child>
-                      <object class="GtkDrawingArea" id="drawingarea3">
+                      <object class="GtkDrawingArea" id="drawingarea1">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="vexpand">True</property>
+                        <property name="hexpand">True</property>
                       </object>
                       <packing>
                         <property name="expand">False</property>
@@ -243,30 +256,15 @@
                       <object class="GtkTable" id="table1">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
-                        <property name="n-rows">28</property>
-                        <property name="n-columns">4</property>
-                        <child>
-                          <object class="GtkLabel" id="document_type">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
-                            <property name="can-focus">False</property>
-                            <property name="label">-</property>
-                          </object>
-                          <packing>
-                            <property name="right-attach">4</property>
-                            <property name="x-options">GTK_FILL</property>
-                            <property name="y-options">GTK_FILL</property>
-                          </packing>
-                        </child>
+                        <property name="n-rows">27</property>
+                        <property name="n-columns">2</property>
                         <child>
                           <object class="GtkHSeparator" id="separator1">
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                           </object>
                           <packing>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">1</property>
-                            <property name="bottom-attach">2</property>
+                            <property name="right-attach">2</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -277,15 +275,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Name:</property>
-                            <accessibility>
-                              <relation type="label-for" target="surname"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">2</property>
-                            <property name="bottom-attach">3</property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">2</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -296,15 +291,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Given names:</property>
-                            <accessibility>
-                              <relation type="label-for" target="firstnames"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">3</property>
-                            <property name="bottom-attach">4</property>
+                            <property name="top-attach">2</property>
+                            <property name="bottom-attach">3</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -315,15 +307,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Place of birth:</property>
-                            <accessibility>
-                              <relation type="label-for" target="location_of_birth"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">4</property>
-                            <property name="bottom-attach">5</property>
+                            <property name="top-attach">3</property>
+                            <property name="bottom-attach">4</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -334,15 +323,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Date of birth:</property>
-                            <accessibility>
-                              <relation type="label-for" target="date_of_birth"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">5</property>
-                            <property name="bottom-attach">6</property>
+                            <property name="top-attach">4</property>
+                            <property name="bottom-attach">5</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -353,15 +339,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Sex:</property>
-                            <accessibility>
-                              <relation type="label-for" target="gender"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">6</property>
-                            <property name="bottom-attach">7</property>
+                            <property name="top-attach">5</property>
+                            <property name="bottom-attach">6</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -372,15 +355,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">National number:</property>
-                            <accessibility>
-                              <relation type="label-for" target="national_number"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">7</property>
-                            <property name="bottom-attach">8</property>
+                            <property name="top-attach">6</property>
+                            <property name="bottom-attach">7</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -391,15 +371,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Municipality:</property>
-                            <accessibility>
-                              <relation type="label-for" target="address_municipality"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">14</property>
-                            <property name="bottom-attach">15</property>
+                            <property name="top-attach">13</property>
+                            <property name="bottom-attach">14</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -410,15 +387,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Postal code:</property>
-                            <accessibility>
-                              <relation type="label-for" target="address_zip"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">13</property>
-                            <property name="bottom-attach">14</property>
+                            <property name="top-attach">12</property>
+                            <property name="bottom-attach">13</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -429,15 +403,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Street:</property>
-                            <accessibility>
-                              <relation type="label-for" target="address_street_and_number"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">12</property>
-                            <property name="bottom-attach">13</property>
+                            <property name="top-attach">11</property>
+                            <property name="bottom-attach">12</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -449,9 +420,9 @@
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">11</property>
-                            <property name="bottom-attach">12</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">10</property>
+                            <property name="bottom-attach">11</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -462,15 +433,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Special status:</property>
-                            <accessibility>
-                              <relation type="label-for" target="special_status"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">10</property>
-                            <property name="bottom-attach">11</property>
+                            <property name="top-attach">9</property>
+                            <property name="bottom-attach">10</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -481,15 +449,12 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Title:</property>
-                            <accessibility>
-                              <relation type="label-for" target="nobility"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">9</property>
-                            <property name="bottom-attach">10</property>
+                            <property name="top-attach">8</property>
+                            <property name="bottom-attach">9</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -500,208 +465,254 @@
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label" translatable="yes">Nationality:</property>
-                            <accessibility>
-                              <relation type="label-for" target="nationality"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">8</property>
-                            <property name="bottom-attach">9</property>
+                            <property name="top-attach">7</property>
+                            <property name="bottom-attach">8</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="surname">
+                          <object class="GtkEventBox" id="photobox">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="visible-window">False</property>
+                            <child>
+                              <object class="GtkImage" id="photo">
+                                <property name="visible">True</property>
+                                <property name="sensitive">False</property>
+                                <property name="can-focus">False</property>
+                                <property name="stock">gtk-file</property>
+                                <child internal-child="accessible">
+                                  <object class="AtkObject" id="photo-atkobject">
+                                    <property name="AtkObject::accessible-description" translatable="yes">On-card photo of the holder</property>
+                                  </object>
+                                </child>
+                              </object>
+                            </child>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">2</property>
-                            <property name="bottom-attach">3</property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">27</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="firstnames">
+                          <object class="GtkHSeparator" id="separator6">
                             <property name="visible">True</property>
-                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">3</property>
-                            <property name="top-attach">3</property>
-                            <property name="bottom-attach">4</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">14</property>
+                            <property name="bottom-attach">15</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="location_of_birth">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_date_and_country_of_protection">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Date and country of international protection:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">4</property>
-                            <property name="bottom-attach">5</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">18</property>
+                            <property name="bottom-attach">19</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="date_of_birth">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_employer_vat_1">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Employer's VAT/CBE number (1):</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">5</property>
-                            <property name="bottom-attach">6</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">20</property>
+                            <property name="bottom-attach">21</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="gender">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_employer_vat_2">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Employer's VAT/CBE number (2):</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">6</property>
-                            <property name="bottom-attach">7</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">21</property>
+                            <property name="bottom-attach">22</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="national_number">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_work_permit_mention">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Access to the labour market:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">7</property>
-                            <property name="bottom-attach">8</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">19</property>
+                            <property name="bottom-attach">20</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="nationality">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_regional_file_number">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Regional file number:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">8</property>
-                            <property name="bottom-attach">9</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">22</property>
+                            <property name="bottom-attach">23</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="nobility">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_member_of_family">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Family member:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">9</property>
-                            <property name="bottom-attach">10</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">15</property>
+                            <property name="bottom-attach">16</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="special_status">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_special_organization">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Organization:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">10</property>
-                            <property name="bottom-attach">11</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">16</property>
+                            <property name="bottom-attach">17</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="address_street_and_number">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_duplicata">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Duplicate:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">12</property>
-                            <property name="bottom-attach">13</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">17</property>
+                            <property name="bottom-attach">18</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="address_zip">
-                            <property name="visible">True</property>
-                            <property name="sensitive">False</property>
+                          <object class="GtkLabel" id="title_brexit_mention_1">
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label">-</property>
+                            <property name="label" translatable="yes">Brexit mentions:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">13</property>
-                            <property name="bottom-attach">14</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">23</property>
+                            <property name="bottom-attach">24</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="title_cardA_mention_1">
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Mentions:</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">24</property>
+                            <property name="bottom-attach">25</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="title_cardEU_start_date">
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Date of registration:</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">25</property>
+                            <property name="bottom-attach">26</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="title_cardEUPlus_start_date">
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label" translatable="yes">Date of permanent residence:</property>
+                          </object>
+                          <packing>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">26</property>
+                            <property name="bottom-attach">27</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkTable" id="table4">
+                        <property name="visible">True</property>
+                        <property name="can-focus">False</property>
+                        <property name="n-rows">27</property>
+                        <property name="n-columns">2</property>
+                        <child>
+                          <object class="GtkHSeparator" id="separator7">
+                            <property name="visible">True</property>
+                            <property name="can-focus">False</property>
+                          </object>
+                          <packing>
+                            <property name="right-attach">2</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="address_municipality">
+                          <object class="GtkLabel" id="surname">
                             <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
@@ -709,36 +720,24 @@
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">14</property>
-                            <property name="bottom-attach">15</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">1</property>
+                            <property name="bottom-attach">2</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkEventBox" id="photobox">
+                          <object class="GtkLabel" id="firstnames">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
-                            <property name="visible-window">False</property>
-                            <child>
-                              <object class="GtkImage" id="photo">
-                                <property name="visible">True</property>
-                                <property name="sensitive">False</property>
-                                <property name="can-focus">False</property>
-                                <property name="stock">gtk-file</property>
-                                <child internal-child="accessible">
-                                  <object class="AtkObject" id="photo-atkobject">
-                                    <property name="AtkObject::accessible-description" translatable="yes">On-card photo of the holder</property>
-                                  </object>
-                                </child>
-                              </object>
-                            </child>
+                            <property name="halign">start</property>
+                            <property name="label">-</property>
                           </object>
                           <packing>
                             <property name="top-attach">2</property>
-                            <property name="bottom-attach">28</property>
+                            <property name="bottom-attach">3</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -749,210 +748,194 @@
                             <property name="can-focus">False</property>
                           </object>
                           <packing>
-                            <property name="left-attach">3</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">3</property>
-                            <property name="bottom-attach">4</property>
+                            <property name="left-attach">1</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">2</property>
+                            <property name="bottom-attach">3</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkHSeparator" id="separator6">
+                          <object class="GtkLabel" id="location_of_birth">
                             <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">15</property>
-                            <property name="bottom-attach">16</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">3</property>
+                            <property name="bottom-attach">4</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="date_and_country_of_protection">
+                          <object class="GtkLabel" id="date_of_birth">
+                            <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">19</property>
-                            <property name="bottom-attach">20</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">4</property>
+                            <property name="bottom-attach">5</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_date_and_country_of_protection">
+                          <object class="GtkLabel" id="gender">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Date and country of international protection:</property>
-                            <accessibility>
-                              <relation type="label-for" target="date_and_country_of_protection"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">19</property>
-                            <property name="bottom-attach">20</property>
+                            <property name="top-attach">5</property>
+                            <property name="bottom-attach">6</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_employer_vat_1">
+                          <object class="GtkLabel" id="national_number">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Employer's VAT/CBE number (1):</property>
-                            <accessibility>
-                              <relation type="label-for" target="employer_vat_1"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">21</property>
-                            <property name="bottom-attach">22</property>
+                            <property name="top-attach">6</property>
+                            <property name="bottom-attach">7</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="employer_vat_1">
+                          <object class="GtkLabel" id="nationality">
+                            <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">21</property>
-                            <property name="bottom-attach">22</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">7</property>
+                            <property name="bottom-attach">8</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_employer_vat_2">
+                          <object class="GtkLabel" id="nobility">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Employer's VAT/CBE number (2):</property>
-                            <accessibility>
-                              <relation type="label-for" target="employer_vat_2"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">22</property>
-                            <property name="bottom-attach">23</property>
+                            <property name="top-attach">8</property>
+                            <property name="bottom-attach">9</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="employer_vat_2">
+                          <object class="GtkLabel" id="special_status">
+                            <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">22</property>
-                            <property name="bottom-attach">23</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">9</property>
+                            <property name="bottom-attach">10</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="regional_file_number">
-                            <property name="sensitive">False</property>
+                          <object class="GtkHSeparator" id="separator8">
+                            <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">23</property>
-                            <property name="bottom-attach">24</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">10</property>
+                            <property name="bottom-attach">11</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_work_permit_mention">
+                          <object class="GtkLabel" id="address_street_and_number">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Access to the labour market:</property>
-                            <accessibility>
-                              <relation type="label-for" target="work_permit_mention"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">20</property>
-                            <property name="bottom-attach">21</property>
+                            <property name="top-attach">11</property>
+                            <property name="bottom-attach">12</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="work_permit_mention">
+                          <object class="GtkLabel" id="address_zip">
+                            <property name="visible">True</property>
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">20</property>
-                            <property name="bottom-attach">21</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">12</property>
+                            <property name="bottom-attach">13</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_regional_file_number">
+                          <object class="GtkLabel" id="address_municipality">
+                            <property name="visible">True</property>
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Regional file number:</property>
-                            <accessibility>
-                              <relation type="label-for" target="regional_file_number"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">23</property>
-                            <property name="bottom-attach">24</property>
+                            <property name="top-attach">13</property>
+                            <property name="bottom-attach">14</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_member_of_family">
+                          <object class="GtkHSeparator" id="separator9">
+                            <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Family member:</property>
-                            <accessibility>
-                              <relation type="label-for" target="member_of_family"/>
-                            </accessibility>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">16</property>
-                            <property name="bottom-attach">17</property>
+                            <property name="top-attach">14</property>
+                            <property name="bottom-attach">15</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
@@ -961,29 +944,40 @@
                           <object class="GtkCheckButton" id="member_of_family">
                             <property name="label"> </property>
                             <property name="sensitive">False</property>
-                            <property name="can-focus">False</property>
+                            <property name="can-focus">True</property>
                             <property name="focus-on-click">False</property>
                             <property name="receives-default">False</property>
                             <property name="draw-indicator">True</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">15</property>
+                            <property name="bottom-attach">16</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkLabel" id="special_organization">
+                            <property name="sensitive">False</property>
+                            <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label">-</property>
+                          </object>
+                          <packing>
+                            <property name="right-attach">2</property>
                             <property name="top-attach">16</property>
                             <property name="bottom-attach">17</property>
+                            <property name="x-options">GTK_FILL</property>
+                            <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_special_organization">
+                          <object class="GtkLabel" id="duplicata">
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Organization:</property>
-                            <accessibility>
-                              <relation type="label-for" target="special_organization"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
                             <property name="top-attach">17</property>
                             <property name="bottom-attach">18</property>
@@ -992,16 +986,13 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_duplicata">
+                          <object class="GtkLabel" id="date_and_country_of_protection">
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Duplicate:</property>
-                            <accessibility>
-                              <relation type="label-for" target="duplicata"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
                             <property name="top-attach">18</property>
                             <property name="bottom-attach">19</property>
@@ -1010,95 +1001,87 @@
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="special_organization">
+                          <object class="GtkLabel" id="work_permit_mention">
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">17</property>
-                            <property name="bottom-attach">18</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">19</property>
+                            <property name="bottom-attach">20</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="duplicata">
+                          <object class="GtkLabel" id="employer_vat_1">
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">18</property>
-                            <property name="bottom-attach">19</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">20</property>
+                            <property name="bottom-attach">21</property>
                             <property name="x-options">GTK_FILL</property>
                             <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_brexit_mention_1">
+                          <object class="GtkLabel" id="employer_vat_2">
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">Brexit mentions:</property>
-                            <accessibility>
-                              <relation type="label-for" target="brexit_mention_1"/>
-                              <relation type="label-for" target="brexit_mention_2"/>
-                            </accessibility>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">24</property>
-                            <property name="bottom-attach">25</property>
+                            <property name="top-attach">21</property>
+                            <property name="bottom-attach">22</property>
+                            <property name="x-options">GTK_FILL</property>
+                            <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="brexit_mention_1">
+                          <object class="GtkLabel" id="regional_file_number">
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">3</property>
-                            <property name="top-attach">24</property>
-                            <property name="bottom-attach">25</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">22</property>
+                            <property name="bottom-attach">23</property>
+                            <property name="x-options">GTK_FILL</property>
+                            <property name="y-options">GTK_FILL</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="brexit_mention_2">
-                            <property name="visible">True</property>
+                          <object class="GtkLabel" id="brexit_mention_1">
+                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
+                            <property name="halign">start</property>
+                            <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">3</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">24</property>
-                            <property name="bottom-attach">25</property>
+                            <property name="top-attach">23</property>
+                            <property name="bottom-attach">24</property>
                           </packing>
                         </child>
                         <child>
-                          <object class="GtkLabel" id="title_cardA_mention_1">
+                          <object class="GtkLabel" id="brexit_mention_2">
+                            <property name="visible">True</property>
                             <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Mentions:</property>
-                            <accessibility>
-                              <relation type="label-for" target="brexit_mention_1"/>
-                              <relation type="label-for" target="brexit_mention_2"/>
-                            </accessibility>
                           </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">25</property>
-                            <property name="bottom-attach">26</property>
+                            <property name="top-attach">23</property>
+                            <property name="bottom-attach">24</property>
                           </packing>
                         </child>
                         <child>
@@ -1109,10 +1092,8 @@
                             <property name="label">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">3</property>
-                            <property name="top-attach">25</property>
-                            <property name="bottom-attach">26</property>
+                            <property name="top-attach">24</property>
+                            <property name="bottom-attach">25</property>
                           </packing>
                         </child>
                         <child>
@@ -1120,24 +1101,11 @@
                             <property name="visible">True</property>
                             <property name="can-focus">False</property>
                           </object>
-                          <packing>
-                            <property name="left-attach">3</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">25</property>
-                            <property name="bottom-attach">26</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="title_cardEU_start_date">
-                            <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Date of registration:</property>
-                          </object>
                           <packing>
                             <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">26</property>
-                            <property name="bottom-attach">27</property>
+                            <property name="top-attach">24</property>
+                            <property name="bottom-attach">25</property>
                           </packing>
                         </child>
                         <child>
@@ -1145,76 +1113,59 @@
                             <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">-</property>
-                          </object>
-                          <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">26</property>
-                            <property name="bottom-attach">27</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <object class="GtkLabel" id="title_cardEUPlus_start_date">
-                            <property name="can-focus">False</property>
-                            <property name="halign">start</property>
-                            <property name="label" translatable="yes">Date of permanent residence:</property>
                           </object>
                           <packing>
-                            <property name="left-attach">1</property>
                             <property name="right-attach">2</property>
-                            <property name="top-attach">27</property>
-                            <property name="bottom-attach">28</property>
+                            <property name="top-attach">25</property>
+                            <property name="bottom-attach">26</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="cardEUPlus_start_date">
-                            <property name="sensitive">False</property>
                             <property name="can-focus">False</property>
                             <property name="halign">start</property>
-                            <property name="label" translatable="yes">-</property>
                           </object>
                           <packing>
-                            <property name="left-attach">2</property>
-                            <property name="right-attach">4</property>
-                            <property name="top-attach">27</property>
-                            <property name="bottom-attach">28</property>
+                            <property name="right-attach">2</property>
+                            <property name="top-attach">26</property>
+                            <property name="bottom-attach">27</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">False</property>
                         <property name="fill">True</property>
-                        <property name="position">1</property>
+                        <property name="position">2</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkDrawingArea" id="drawingarea4">
+                      <object class="GtkDrawingArea" id="drawingarea2">
                         <property name="visible">True</property>
                         <property name="can-focus">False</property>
                       </object>
                       <packing>
                         <property name="expand">True</property>
                         <property name="fill">True</property>
-                        <property name="position">2</property>
+                        <property name="position">4</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">1</property>
+                    <property name="position">2</property>
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkDrawingArea" id="drawingarea2">
+                  <object class="GtkDrawingArea" id="drawingarea4">
                     <property name="visible">True</property>
                     <property name="can-focus">False</property>
+                    <property name="vexpand">True</property>
                   </object>
                   <packing>
-                    <property name="expand">True</property>
+                    <property name="expand">False</property>
                     <property name="fill">True</property>
-                    <property name="position">2</property>
+                    <property name="position">3</property>
                   </packing>
                 </child>
               </object>
@@ -2308,7 +2259,6 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
-                        <property name="active">True</property>
                         <property name="draw-indicator">True</property>
                       </object>
                       <packing>
@@ -2354,7 +2304,6 @@
                         <property name="visible">True</property>
                         <property name="can-focus">True</property>
                         <property name="receives-default">False</property>
-                        <property name="active">True</property>
                         <property name="draw-indicator">True</property>
                         <property name="group">language_de</property>
                       </object>