diff --git a/public/themes/luna-amber/theme.css b/public/themes/luna-amber/theme.css
index 2eebc2039..fbf4d6346 100644
--- a/public/themes/luna-amber/theme.css
+++ b/public/themes/luna-amber/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #191919;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #191919;
   background: #191919;
   color: #dedede;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #888888;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #dedede;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #ffe8b3;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/luna-green/theme.css b/public/themes/luna-green/theme.css
index fea7ca3ad..e0819289d 100644
--- a/public/themes/luna-green/theme.css
+++ b/public/themes/luna-green/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #191919;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #191919;
   background: #191919;
   color: #dedede;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #888888;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #dedede;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #88e9aa;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/luna-pink/theme.css b/public/themes/luna-pink/theme.css
index 6e8174c13..f817a80a7 100644
--- a/public/themes/luna-pink/theme.css
+++ b/public/themes/luna-pink/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #191919;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #191919;
   background: #191919;
   color: #dedede;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #888888;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #dedede;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #f1b6c8;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/nova-accent/theme.css b/public/themes/nova-accent/theme.css
index 508878cd8..6f959ca84 100644
--- a/public/themes/nova-accent/theme.css
+++ b/public/themes/nova-accent/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #c8c8c8;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #007ad9;
   background: #007ad9;
   color: #ffffff;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #ffffff;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #5ab7ff;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/nova-alt/theme.css b/public/themes/nova-alt/theme.css
index 14d2b3524..bbefaa658 100644
--- a/public/themes/nova-alt/theme.css
+++ b/public/themes/nova-alt/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #c8c8c8;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #333333;
   background: #333333;
   color: #ffffff;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #ffffff;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #b4b4b4;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/nova-vue/theme.css b/public/themes/nova-vue/theme.css
index f02f2bfa7..26cf2b401 100644
--- a/public/themes/nova-vue/theme.css
+++ b/public/themes/nova-vue/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #c8c8c8;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #c8c8c8;
   background: #f4f4f4;
   color: #333333;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #848484;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #333333;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #c2e9d8;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/nova/theme.css b/public/themes/nova/theme.css
index d17158d9c..96a7504fb 100644
--- a/public/themes/nova/theme.css
+++ b/public/themes/nova/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #c8c8c8;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #c8c8c8;
   background: #f4f4f4;
   color: #333333;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #848484;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #333333;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #8dcdff;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/rhea/theme.css b/public/themes/rhea/theme.css
index 2404962b4..a43d2df97 100644
--- a/public/themes/rhea/theme.css
+++ b/public/themes/rhea/theme.css
@@ -2279,7 +2279,7 @@
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.16);
   border: 1px solid #f1f1f1;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #7B95A3;
   background: #7B95A3;
   color: #ffffff;
@@ -2287,11 +2287,11 @@
   border-top-right-radius: 2px;
   border-top-left-radius: 2px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 700;
   font-size: 1rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: auto;
   height: auto;
   color: #ffffff;
@@ -2300,16 +2300,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ffffff;
   background: transparent;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #e4e9ec;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-blue/theme.css b/public/themes/saga-blue/theme.css
index e0fb4015f..c643bd589 100644
--- a/public/themes/saga-blue/theme.css
+++ b/public/themes/saga-blue/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #BBDEFB;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-cyan/theme.css b/public/themes/saga-cyan/theme.css
index 32f998f05..9ea777c61 100644
--- a/public/themes/saga-cyan/theme.css
+++ b/public/themes/saga-cyan/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #B2EBF2;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-deeppurple/theme.css b/public/themes/saga-deeppurple/theme.css
index a0dab308c..288b2c626 100644
--- a/public/themes/saga-deeppurple/theme.css
+++ b/public/themes/saga-deeppurple/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #D1C4E9;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-green/theme.css b/public/themes/saga-green/theme.css
index c140d12b0..71126d618 100644
--- a/public/themes/saga-green/theme.css
+++ b/public/themes/saga-green/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C8E6C9;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-indigo/theme.css b/public/themes/saga-indigo/theme.css
index 9c1b79fa5..64b224f88 100644
--- a/public/themes/saga-indigo/theme.css
+++ b/public/themes/saga-indigo/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #C5CAE9;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-orange/theme.css b/public/themes/saga-orange/theme.css
index 2275ed1fa..25433ab36 100644
--- a/public/themes/saga-orange/theme.css
+++ b/public/themes/saga-orange/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #FFECB3;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-purple/theme.css b/public/themes/saga-purple/theme.css
index 71cb0e542..4d52bcdef 100644
--- a/public/themes/saga-purple/theme.css
+++ b/public/themes/saga-purple/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #E1BEE7;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/saga-teal/theme.css b/public/themes/saga-teal/theme.css
index fc05c4a16..817b094d6 100644
--- a/public/themes/saga-teal/theme.css
+++ b/public/themes/saga-teal/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(0, 0, 0, 0.1);
   border: 0 none;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #dee2e6;
   background: #ffffff;
   color: #495057;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #9ba2aa;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #9ba2aa;
   background: #e9ecef;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.2rem #B2DFDB;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-blue/theme.css b/public/themes/vela-blue/theme.css
index f4e313637..8ee66af58 100644
--- a/public/themes/vela-blue/theme.css
+++ b/public/themes/vela-blue/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #BBDEFB;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-cyan/theme.css b/public/themes/vela-cyan/theme.css
index d63e067ce..5306067d0 100644
--- a/public/themes/vela-cyan/theme.css
+++ b/public/themes/vela-cyan/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #B2EBF2;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-deeppurple/theme.css b/public/themes/vela-deeppurple/theme.css
index ced8f698a..a8e363133 100644
--- a/public/themes/vela-deeppurple/theme.css
+++ b/public/themes/vela-deeppurple/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #D1C4E9;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-green/theme.css b/public/themes/vela-green/theme.css
index 5cee688ba..2432c2d76 100644
--- a/public/themes/vela-green/theme.css
+++ b/public/themes/vela-green/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #C8E6C9;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-indigo/theme.css b/public/themes/vela-indigo/theme.css
index c765bea65..a07fd1f69 100644
--- a/public/themes/vela-indigo/theme.css
+++ b/public/themes/vela-indigo/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #C5CAE9;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-orange/theme.css b/public/themes/vela-orange/theme.css
index 212284b01..2f1d1afcc 100644
--- a/public/themes/vela-orange/theme.css
+++ b/public/themes/vela-orange/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #FFECB3;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-purple/theme.css b/public/themes/vela-purple/theme.css
index 6cbc23f1c..67c7849ef 100644
--- a/public/themes/vela-purple/theme.css
+++ b/public/themes/vela-purple/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #E1BEE7;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/public/themes/vela-teal/theme.css b/public/themes/vela-teal/theme.css
index 539c47c28..568b9d1f1 100644
--- a/public/themes/vela-teal/theme.css
+++ b/public/themes/vela-teal/theme.css
@@ -2296,7 +2296,7 @@
   box-shadow: 0 0 14px 0 rgba(255, 255, 255, 0.3);
   border: 1px solid #2C3E50;
 }
-.p-dialog .p-dialog-titlebar {
+.p-dialog .p-dialog-header {
   border-bottom: 1px solid #2C3E50;
   background: #1C2833;
   color: #ebedef;
@@ -2304,11 +2304,11 @@
   border-top-right-radius: 3px;
   border-top-left-radius: 3px;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-title {
+.p-dialog .p-dialog-header .p-dialog-title {
   font-weight: 600;
   font-size: 1.25rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header .p-dialog-header-icon {
   width: 2rem;
   height: 2rem;
   color: #aeb6bf;
@@ -2317,16 +2317,16 @@
   transition: background-color 0.2s, box-shadow 0.2s, box-shadow 0.2s;
   margin-right: 0.5rem;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:hover {
+.p-dialog .p-dialog-header .p-dialog-header-icon:hover {
   color: #ebedef;
   background: rgba(255, 255, 255, 0.1);
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:focus {
+.p-dialog .p-dialog-header .p-dialog-header-icon:focus {
   outline: 0 none;
   outline-offset: 0;
   box-shadow: 0 0 0 0.1rem #B2DFDB;
 }
-.p-dialog .p-dialog-titlebar .p-dialog-titlebar-icon:last-child {
+.p-dialog .p-dialog-header .p-dialog-header-icon:last-child {
   margin-right: 0;
 }
 .p-dialog .p-dialog-content {
diff --git a/src/components/dialog/Dialog.vue b/src/components/dialog/Dialog.vue
index 8030a2ec6..88177ce86 100755
--- a/src/components/dialog/Dialog.vue
+++ b/src/components/dialog/Dialog.vue
@@ -2,16 +2,16 @@
     <div ref="mask" :class="maskClass" v-if="maskVisible">
         <transition name="p-dialog" @before-enter="onBeforeEnter" @enter="onEnter" @before-leave="onBeforeLeave" @leave="onLeave" @after-leave="onAfterLeave" @appear="onAppear">
             <div ref="dialog" :class="dialogClass" :style="dialogStyle" v-if="visible" v-bind="$attrs" v-on="listeners" role="dialog" :aria-labelledby="ariaLabelledById" :aria-modal="modal">
-                <div class="p-dialog-titlebar" v-if="showHeader">
+                <div class="p-dialog-header" v-if="showHeader">
                     <slot name="header">
                         <span :id="ariaLabelledById" class="p-dialog-title" v-if="header" >{{header}}</span>
                     </slot>
-                    <div class="p-dialog-titlebar-icons">
-                        <button class="p-dialog-titlebar-icon p-dialog-titlebar-maximize p-link" @click="maximize" v-if="maximizable" type="button">
+                    <div class="p-dialog-header-icons">
+                        <button class="p-dialog-header-icon p-dialog-header-maximize p-link" @click="maximize" v-if="maximizable" type="button" tabindex="-1">
                             <span :class="maximizeIconClass"></span>
                         </button>
-                        <button class="p-dialog-titlebar-icon p-dialog-titlebar-close p-link" @click="close" v-if="closable" :aria-label="ariaCloseLabel" type="button">
-                            <span class="p-dialog-titlebar-close-icon pi pi-times"></span>
+                        <button class="p-dialog-header-icon p-dialog-header-close p-link" @click="close" v-if="closable" :aria-label="ariaCloseLabel" type="button" tabindex="-1">
+                            <span class="p-dialog-header-close-icon pi pi-times"></span>
                         </button>
                     </div>
                 </div>
@@ -122,9 +122,9 @@ export default {
             }
         },
         focus() {
-            let focusable = DomHandler.findSingle(this.$refs.dialog, 'input,button');
-            if (focusable) {
-                focusable.focus();
+            let focusable = DomHandler.getFocusableElements(this.$refs.dialog);
+            if (focusable && focusable.length) {
+                focusable[0].focus();
             }
         },
         maximize() {
@@ -231,7 +231,7 @@ export default {
             }, this.dialogClasses];
         },
         maximizeIconClass() {
-            return ['p-dialog-titlebar-maximize-icon pi', {
+            return ['p-dialog-header-maximize-icon pi', {
                 'pi-window-maximize': !this.maximized,
                 'pi-window-minimize': this.maximized
             }];
@@ -279,7 +279,7 @@ export default {
     overflow-y: auto;
 }
 
-.p-dialog-titlebar {
+.p-dialog-header {
     display: flex;
     align-items: center;
     justify-content: space-between;
@@ -289,12 +289,12 @@ export default {
     list-style: 1;
 }
 
-.p-dialog .p-dialog-titlebar-icons {
+.p-dialog .p-dialog-header-icons {
     display: flex;
     align-items: center;
 }
 
-.p-dialog .p-dialog-titlebar-icon {
+.p-dialog .p-dialog-header-icon {
     display: flex;
     align-items: center;
     justify-content: center;