diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.html b/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.html
index e349a481e1..b181ea57fc 100644
--- a/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.html
+++ b/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.html
@@ -41,7 +41,7 @@
     </form>
 </mat-dialog-content>
 
-<mat-dialog-actions>
+<mat-dialog-actions class="adf-dialog-buttons">
     <span class="adf-fill-remaining-space"></span>
 
     <button
@@ -50,7 +50,7 @@
         {{ 'CORE.FOLDER_DIALOG.CANCEL_BUTTON.LABEL' | translate }}
     </button>
 
-    <button
+    <button class="adf-dialog-action-button"
         mat-button
         (click)="submit()"
         [disabled]="!form.valid">
diff --git a/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.scss b/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.scss
index 3bda268b54..c904e440b3 100644
--- a/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.scss
+++ b/ng2-components/ng2-alfresco-core/src/dialogs/folder.dialog.scss
@@ -5,3 +5,16 @@
 .adf-full-width {
     width: 100%;
 }
+
+@mixin adf-dialog-theme($theme) {
+
+    $primary: map-get($theme, primary);
+
+    .adf-dialog-buttons button {
+        text-transform: uppercase;
+    }
+    .adf-dialog-action-button:enabled {
+        color: mat-color($primary);
+    }
+
+}
diff --git a/ng2-components/ng2-alfresco-core/styles/_index.scss b/ng2-components/ng2-alfresco-core/styles/_index.scss
index 1527291e2b..c2e5726dd3 100644
--- a/ng2-components/ng2-alfresco-core/styles/_index.scss
+++ b/ng2-components/ng2-alfresco-core/styles/_index.scss
@@ -8,6 +8,7 @@
 @import '../src/components/pagination/pagination.component';
 @import '../src/components/info-drawer/info-drawer-layout.component';
 @import '../src/components/settings/host-settings.component';
+@import '../src/dialogs/folder.dialog';
 
 @mixin alfresco-core-theme($theme) {
     @include adf-host-settings-theme($theme);
@@ -20,4 +21,5 @@
     @include adf-pagination-theme($theme);
     @include adf-colors-theme($theme);
     @include adf-default-class($theme);
+    @include adf-dialog-theme($theme);
 }