diff --git a/nitrokeyapp/ui/credential.ui b/nitrokeyapp/ui/credential.ui
new file mode 100644
index 00000000..217a1c46
--- /dev/null
+++ b/nitrokeyapp/ui/credential.ui
@@ -0,0 +1,326 @@
+
+
+ CredentialTab
+
+
+
+ 0
+ 0
+ 516
+ 576
+
+
+
+
+ 0
+ 0
+
+
+
+ Form
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 303
+ 17
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 298
+ 20
+
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ Comment:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ false
+
+
+ Qt::LeftToRight
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ Login:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ CredentialName
+
+
+ true
+
+
+
+ -
+
+
+ Password:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ algor_Name:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ false
+
+
+ Qt::LeftToRight
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ Protect with PIN:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ Required with Touch:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 8
+ 0
+
+
+
+ QLineEdit::Normal
+
+
+ false
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QLineEdit::Password
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ 30
+
+
+ 30
+
+
+ true
+
+
+ true
+
+
+ %v s
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 10
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 165
+
+
+
+
+ -
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 202
+ 20
+
+
+
+
+ -
+
+
+ Edit
+
+
+
+ :/icons/edit_FILL0_wght400_GRAD0_opsz24.png:/icons/edit_FILL0_wght400_GRAD0_opsz24.png
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nitrokeyapp/ui/credential_edit.ui b/nitrokeyapp/ui/credential_edit.ui
new file mode 100644
index 00000000..67f50670
--- /dev/null
+++ b/nitrokeyapp/ui/credential_edit.ui
@@ -0,0 +1,344 @@
+
+
+ CredentialTab
+
+
+
+ 0
+ 0
+ 484
+ 576
+
+
+
+
+ 0
+ 0
+
+
+
+ Form
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+ true
+
+
+
+ -
+
+
+ Login:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 8
+ 0
+
+
+
+ QLineEdit::Normal
+
+
+ false
+
+
+ false
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 298
+ 20
+
+
+
+
+ -
+
+
+ false
+
+
+ Qt::LeftToRight
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 10
+
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ QLineEdit::Password
+
+
+ true
+
+
+ false
+
+
+
+ -
+
+
+ false
+
+
+ Qt::LeftToRight
+
+
+
+
+
+ true
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ Required with Touch:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ Comment:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 303
+ 17
+
+
+
+
+ -
+
+
+ CredentialName
+
+
+
+ -
+
+
+ Qt::LeftToRight
+
+
+ Protect with PIN:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ Password:
+
+
+ Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
+
+
+
+ -
+
+
+ 30
+
+
+ 30
+
+
+ true
+
+
+ true
+
+
+ %v s
+
+
+
+ -
+
+
+ Qt::RightToLeft
+
+
+ false
+
+
+ OTP
+
+
+ 0
+
+
-
+
+ OTP
+
+
+ -
+
+ HOTP
+
+
+
+
+
+
+
+ -
+
+
+ Qt::Vertical
+
+
+
+ 20
+ 165
+
+
+
+
+ -
+
+
+
-
+
+
+ Qt::Horizontal
+
+
+
+ 202
+ 20
+
+
+
+
+ -
+
+
+ Delete
+
+
+
+ :/icons/delete_FILL0_wght500_GRAD0_opsz40.png:/icons/delete_FILL0_wght500_GRAD0_opsz40.png
+
+
+
+ -
+
+
+ Save
+
+
+
+ :/icons/save_FILL0_wght400_GRAD0_opsz24.png:/icons/save_FILL0_wght400_GRAD0_opsz24.png
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/nitrokeyapp/ui/icons/content_copy_FILL0_wght400_GRAD0_opsz24.png b/nitrokeyapp/ui/icons/content_copy_FILL0_wght400_GRAD0_opsz24.png
new file mode 100644
index 00000000..3f1b6b0f
Binary files /dev/null and b/nitrokeyapp/ui/icons/content_copy_FILL0_wght400_GRAD0_opsz24.png differ
diff --git a/nitrokeyapp/ui/icons/content_copy_FILL0_wght400_GRAD0_opsz24.svg b/nitrokeyapp/ui/icons/content_copy_FILL0_wght400_GRAD0_opsz24.svg
new file mode 100644
index 00000000..d875c844
--- /dev/null
+++ b/nitrokeyapp/ui/icons/content_copy_FILL0_wght400_GRAD0_opsz24.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/nitrokeyapp/ui/icons/done_FILL0_wght400_GRAD0_opsz24.png b/nitrokeyapp/ui/icons/done_FILL0_wght400_GRAD0_opsz24.png
new file mode 100644
index 00000000..b3fd4f32
Binary files /dev/null and b/nitrokeyapp/ui/icons/done_FILL0_wght400_GRAD0_opsz24.png differ
diff --git a/nitrokeyapp/ui/icons/edit_FILL0_wght400_GRAD0_opsz24.png b/nitrokeyapp/ui/icons/edit_FILL0_wght400_GRAD0_opsz24.png
new file mode 100644
index 00000000..d81d7d19
Binary files /dev/null and b/nitrokeyapp/ui/icons/edit_FILL0_wght400_GRAD0_opsz24.png differ
diff --git a/nitrokeyapp/ui/icons/refresh_FILL0_wght400_GRAD0_opsz24.svg b/nitrokeyapp/ui/icons/refresh_FILL0_wght400_GRAD0_opsz24.svg
new file mode 100644
index 00000000..a7a6bc80
--- /dev/null
+++ b/nitrokeyapp/ui/icons/refresh_FILL0_wght400_GRAD0_opsz24.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/nitrokeyapp/ui/icons/save_FILL0_wght400_GRAD0_opsz24.png b/nitrokeyapp/ui/icons/save_FILL0_wght400_GRAD0_opsz24.png
new file mode 100644
index 00000000..d7a46e83
Binary files /dev/null and b/nitrokeyapp/ui/icons/save_FILL0_wght400_GRAD0_opsz24.png differ
diff --git a/nitrokeyapp/ui/icons/visibility_FILL0_wght400_GRAD0_opsz24.svg b/nitrokeyapp/ui/icons/visibility_FILL0_wght400_GRAD0_opsz24.svg
new file mode 100644
index 00000000..8fe45d09
--- /dev/null
+++ b/nitrokeyapp/ui/icons/visibility_FILL0_wght400_GRAD0_opsz24.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/nitrokeyapp/ui/icons/visibility_off_FILL0_wght400_GRAD0_opsz24.svg b/nitrokeyapp/ui/icons/visibility_off_FILL0_wght400_GRAD0_opsz24.svg
new file mode 100644
index 00000000..d98cf8d9
--- /dev/null
+++ b/nitrokeyapp/ui/icons/visibility_off_FILL0_wght400_GRAD0_opsz24.svg
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/nitrokeyapp/ui/resources.qrc b/nitrokeyapp/ui/resources.qrc
index 59cf2027..9a364781 100644
--- a/nitrokeyapp/ui/resources.qrc
+++ b/nitrokeyapp/ui/resources.qrc
@@ -1,11 +1,18 @@
+ icons/visibility_FILL0_wght400_GRAD0_opsz24.svg
+ icons/visibility_off_FILL0_wght400_GRAD0_opsz24.svg
+ icons/refresh_FILL0_wght400_GRAD0_opsz24.svg
+ icons/save_FILL0_wght400_GRAD0_opsz24.png
+ icons/edit_FILL0_wght400_GRAD0_opsz24.png
+ icons/done_FILL0_wght400_GRAD0_opsz24.png
+ icons/content_copy_FILL0_wght400_GRAD0_opsz24.png
+ icons/home_FILL0_wght500_GRAD0_opsz40.png
icons/add_circle_FILL0_wght500_GRAD0_opsz40.png
icons/delete_FILL0_wght500_GRAD0_opsz40.png
icons/down_arrow.png
icons/encrypted_FILL0_wght500_GRAD0_opsz40.png
icons/help_FILL0_wght500_GRAD0_opsz40.png
- icons/home_FILL0_wght500_GRAD0_opsz40 (1).png
icons/icon_Logo_App.svg
icons/icon_NK.svg
icons/info_FILL0_wght500_GRAD0_opsz40.png
diff --git a/nitrokeyapp/ui/secrets_tab.ui b/nitrokeyapp/ui/secrets_tab.ui
index 8eb7348a..bca3e6af 100644
--- a/nitrokeyapp/ui/secrets_tab.ui
+++ b/nitrokeyapp/ui/secrets_tab.ui
@@ -6,8 +6,8 @@
0
0
- 500
- 477
+ 641
+ 578
@@ -22,290 +22,101 @@
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
- -
-
-
- 0
+
+
-
+
+
+ true
-
- 1
+
+
+ 14
+ 0
+
-
-
-
-
-
-
- Please update the firmware on the device to use this feature.
-
-
- true
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
- -
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
-
- 0
- 0
-
-
-
-
- -
-
-
- Show Protected Passwords
-
-
-
- -
-
-
-
- 0
-
-
- 0
-
-
- 0
-
-
- 0
-
-
-
-
-
- Add
-
-
-
- -
-
-
- false
-
-
- Delete
-
-
-
- -
-
-
- Refresh
-
-
-
-
-
-
-
-
-
- -
-
-
- true
-
-
-
-
- 0
- 0
- 218
- 457
-
-
-
-
-
-
-
- Metadata
-
-
-
- 20
-
-
-
-
-
- Name
-
-
-
- -
-
-
- true
-
-
- ?
-
-
-
- -
-
-
- false
-
-
- Protect with PIN
-
-
- true
-
-
-
-
-
-
- -
-
-
- One-Time Password
-
-
-
-
-
-
- Algorithm
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- OTP
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- true
-
-
-
- -
-
-
- 30
-
-
- 30
-
-
- true
-
-
- true
-
-
- %v s
-
-
-
- -
-
-
- Generate
-
-
-
- -
-
-
- Copy to Clipboard
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
-
-
-
-
-
-
-
+
+ QFrame::StyledPanel
+
+
+ QFrame::Raised
+
+
+ -
+
+
+
-
+
+
+ Refresh
+
+
+
+ :/icons/refresh_FILL0_wght400_GRAD0_opsz24.svg:/icons/refresh_FILL0_wght400_GRAD0_opsz24.svg
+
+
+
+ -
+
+
+ Qt::Horizontal
+
+
+
+ 63
+ 20
+
+
+
+
+ -
+
+
+ Add
+
+
+
+ :/icons/add_circle_FILL0_wght500_GRAD0_opsz40.png:/icons/add_circle_FILL0_wght500_GRAD0_opsz40.png
+
+
+
+
+
+
+ -
+
+
+
+ 20
+ 0
+
+
+
+
+
+ -
+
+
+ Show Protected Passwords
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+
+
-
+
+
+