diff --git a/e2e/core/login/login-sso/login-sso.e2e.ts b/e2e/core/login/login-sso/login-sso.e2e.ts
index 62efdcbc30..d2f62fb226 100644
--- a/e2e/core/login/login-sso/login-sso.e2e.ts
+++ b/e2e/core/login/login-sso/login-sso.e2e.ts
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-import { LoginSSOPage } from '../../../pages/adf/loginSSOPage';
+import { LoginSSOPage } from '@alfresco/adf-testing';
 import { SettingsPage } from '../../../pages/adf/settingsPage';
 import TestConfig = require('../../../test.config');
 import { browser } from 'protractor';
diff --git a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html
index a4e5b7282c..862f7b5d1e 100644
--- a/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html
+++ b/lib/core/card-view/components/card-view-textitem/card-view-textitem.component.html
@@ -43,16 +43,13 @@
                         (input)="onTextAreaInputChange()"
                         [attr.data-automation-id]="'card-textitem-edittextarea-' + property.key"></textarea>
                 </mat-form-field>
-                <button mat-button
-                    [disabled]="hasErrors()"
+                <mat-icon
+                    [ngClass]="{'disable': hasErrors()}"
                     (click)="update()"
                     [attr.data-automation-id]="'card-textitem-update-' + property.key"
-                    class="adf-textitem-icon adf-update-icon">
-                        <mat-icon
-                            class="adf-update-icon"
-                            [class.adf-button-disabled]="hasErrors()"
-                            [attr.title]="'CORE.METADATA.ACTIONS.SAVE' | translate">done</mat-icon>
-                </button>
+                    class="adf-textitem-icon adf-update-icon"
+                    [class.adf-button-disabled]="hasErrors()"
+                    [attr.title]="'CORE.METADATA.ACTIONS.SAVE' | translate">done</mat-icon>
                 <mat-icon
                     class="adf-textitem-icon adf-reset-icon"
                     (click)="reset()"