diff --git a/app/src/main/res/drawable/ic_baseline_attach_email_24.xml b/app/src/main/res/drawable/ic_baseline_attach_email_24.xml
new file mode 100644
index 0000000000..d00a8a2d0f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_baseline_attach_email_24.xml
@@ -0,0 +1,6 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_excel.xml b/app/src/main/res/drawable/ic_excel.xml
new file mode 100644
index 0000000000..55e9fc151b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_excel.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_export_settings.xml b/app/src/main/res/drawable/ic_export_settings.xml
new file mode 100644
index 0000000000..dd105a822d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_export_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_import_settings.xml b/app/src/main/res/drawable/ic_import_settings.xml
new file mode 100644
index 0000000000..695eac7b1a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_import_settings.xml
@@ -0,0 +1,5 @@
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_log_delete.xml b/app/src/main/res/drawable/ic_log_delete.xml
new file mode 100644
index 0000000000..250e8e81f4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_log_delete.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_log_settings.xml b/app/src/main/res/drawable/ic_log_settings.xml
new file mode 100644
index 0000000000..04a3e7bd25
--- /dev/null
+++ b/app/src/main/res/drawable/ic_log_settings.xml
@@ -0,0 +1,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_microsoft_excel.xml b/app/src/main/res/drawable/ic_microsoft_excel.xml
new file mode 100644
index 0000000000..d8eba67bea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_microsoft_excel.xml
@@ -0,0 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_reset_database.xml b/app/src/main/res/drawable/ic_reset_database.xml
new file mode 100644
index 0000000000..a8b11df907
--- /dev/null
+++ b/app/src/main/res/drawable/ic_reset_database.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/drawable/ic_send_log.xml b/app/src/main/res/drawable/ic_send_log.xml
new file mode 100644
index 0000000000..7bd428085a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_send_log.xml
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout/maintenance_fragment.xml b/app/src/main/res/layout/maintenance_fragment.xml
index e059bf928c..ca0708a692 100644
--- a/app/src/main/res/layout/maintenance_fragment.xml
+++ b/app/src/main/res/layout/maintenance_fragment.xml
@@ -1,115 +1,237 @@
-
-
-
+ android:layout_gravity="center"
+ android:text="@string/unlock_settings" />
-
+ android:orientation="vertical">
-
+
-
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index b32bc5adac..ec5c8d5676 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -830,6 +830,8 @@
A treatment (insulin: %1$.2f, carbs: %2$d, at: %3$s) could not be added to treatments. Please check and manually add a record as appropriate.
eCarbs: %1$d g (%2$d h), delay: %3$d m
No autosens data available
+ Log files
+ Miscellaneous
Log settings
Reset to defaults
NSClient malfunction. Consider NS and NSClient restart.
diff --git a/icons/excel.svg b/icons/excel.svg
new file mode 100644
index 0000000000..4238ebe307
--- /dev/null
+++ b/icons/excel.svg
@@ -0,0 +1,22 @@
+
+
diff --git a/icons/export_settings.svg b/icons/export_settings.svg
new file mode 100644
index 0000000000..2206561e56
--- /dev/null
+++ b/icons/export_settings.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/icons/import_settings.svg b/icons/import_settings.svg
new file mode 100644
index 0000000000..9c823c7361
--- /dev/null
+++ b/icons/import_settings.svg
@@ -0,0 +1,18 @@
+
+
diff --git a/icons/log_delete.svg b/icons/log_delete.svg
new file mode 100644
index 0000000000..c8a76a64bc
--- /dev/null
+++ b/icons/log_delete.svg
@@ -0,0 +1,33 @@
+
+
diff --git a/icons/log_settings.svg b/icons/log_settings.svg
new file mode 100644
index 0000000000..ae3701f1e5
--- /dev/null
+++ b/icons/log_settings.svg
@@ -0,0 +1,38 @@
+
+
diff --git a/icons/reset_database.svg b/icons/reset_database.svg
new file mode 100644
index 0000000000..8434479428
--- /dev/null
+++ b/icons/reset_database.svg
@@ -0,0 +1,27 @@
+
+
diff --git a/icons/send_log.svg b/icons/send_log.svg
new file mode 100644
index 0000000000..f8dd4154e6
--- /dev/null
+++ b/icons/send_log.svg
@@ -0,0 +1,47 @@
+
+