diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.html b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.html
index 5b2f950da6..6589e4f81c 100644
--- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.html
+++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-form.component.html
@@ -69,7 +69,7 @@
   </mat-form-field>
   <div fxLayout="column" [fxShow]="!isEdit && (dashboardScope === 'tenant' && isPublic(entity)
                                 || dashboardScope === 'customer' && isCurrentPublicCustomer(entity))">
-    <tb-social-share-panel style="padding-bottom: 10px;"
+    <tb-social-share-panel style="padding-bottom: 1.25em;"
                            shareTitle="{{ 'dashboard.socialshare-title' | translate:{dashboardTitle: entity?.title} }}"
                            shareText="{{ 'dashboard.socialshare-text' | translate:{dashboardTitle: entity?.title} }}"
                            shareLink="{{ publicLink }}"
diff --git a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-toolbar.component.scss b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-toolbar.component.scss
index 1693046f3d..98d67d2a03 100644
--- a/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-toolbar.component.scss
+++ b/ui-ngx/src/app/modules/home/pages/dashboard/dashboard-toolbar.component.scss
@@ -24,29 +24,12 @@ $mobile-toolbar-height-total: 84px !default;
 tb-dashboard-toolbar {
   mat-fab-toolbar {
     mat-fab-trigger {
-      .mat-button {
-        &.mat-fab {
-          width: 36px;
-          height: 36px;
-          margin: 4px 0 0 4px;
-          line-height: 36px;
-          .mat-button-wrapper {
-            width: 36px;
-            height: 36px;
-            padding: 0 6px;
-            box-sizing: border-box;
-          }
-          mat-icon {
-            display: block;
-            position: absolute;
-            top: 25%;
-            width: 18px;
-            min-width: 18px;
-            height: 18px;
-            min-height: 18px;
-            margin: 0;
-            line-height: 18px;
-          }
+      .mat-fab {
+        width: 36px;
+        height: 36px;
+        margin: 4px 0 0 4px;
+        .mat-button-wrapper {
+          padding: 0;
         }
       }
     }
diff --git a/ui-ngx/src/app/shared/components/socialshare-panel.component.html b/ui-ngx/src/app/shared/components/socialshare-panel.component.html
index 28341baa7f..d283e5a3ae 100644
--- a/ui-ngx/src/app/shared/components/socialshare-panel.component.html
+++ b/ui-ngx/src/app/shared/components/socialshare-panel.component.html
@@ -16,7 +16,7 @@
 
 -->
 <div fxLayout="row" fxLayoutGap="12px" [fxHide]="isShareLinkLocal()">
-  <button mat-button mat-icon-button mat-raised-button class="mat-primary"
+  <button mat-icon-button mat-raised-button class="mat-primary"
           shareButton="facebook"
           title="{{ shareTitle }}"
           description="{{ shareText }}"
@@ -25,7 +25,7 @@
           matTooltip="{{ 'action.share-via' | translate:{provider:'Facebook'} }}">
     <mat-icon svgIcon="mdi:facebook"></mat-icon>
   </button>
-  <button mat-button mat-icon-button mat-raised-button class="mat-primary"
+  <button mat-icon-button mat-raised-button class="mat-primary"
           shareButton="twitter"
           title="{{ shareTitle }}"
           tags="{{ shareHashTags }}"
@@ -34,7 +34,7 @@
           matTooltip="{{ 'action.share-via' | translate:{provider:'Twitter'} }}">
     <mat-icon svgIcon="mdi:twitter"></mat-icon>
   </button>
-  <button mat-button mat-icon-button mat-raised-button class="mat-primary"
+  <button mat-icon-button mat-raised-button class="mat-primary"
           shareButton="linkedin"
           title="{{ shareTitle }}"
           url="{{ shareLink }}"
@@ -42,7 +42,7 @@
           matTooltip="{{ 'action.share-via' | translate:{provider:'Linkedin'} }}">
     <mat-icon svgIcon="mdi:linkedin"></mat-icon>
   </button>
-  <button mat-button mat-icon-button mat-raised-button class="mat-primary"
+  <button mat-icon-button mat-raised-button class="mat-primary"
           shareButton="reddit"
           title="{{ shareTitle }}"
           url="{{ shareLink }}"
diff --git a/ui-ngx/src/app/shared/components/socialshare-panel.component.ts b/ui-ngx/src/app/shared/components/socialshare-panel.component.ts
index 94090ee0f3..bfde800a0e 100644
--- a/ui-ngx/src/app/shared/components/socialshare-panel.component.ts
+++ b/ui-ngx/src/app/shared/components/socialshare-panel.component.ts
@@ -14,16 +14,8 @@
 /// limitations under the License.
 ///
 
-import { Component, Input, OnDestroy, OnInit } from '@angular/core';
-import { User } from '@shared/models/user.model';
-import { Authority } from '@shared/models/authority.enum';
-import { select, Store } from '@ngrx/store';
-import { AppState } from '@core/core.state';
-import { selectAuthUser, selectUserDetails } from '@core/auth/auth.selectors';
-import { map } from 'rxjs/operators';
-import { AuthService } from '@core/auth/auth.service';
-import { Router } from '@angular/router';
-import {isLocalUrl} from '@core/utils';
+import { Component, Input, OnInit } from '@angular/core';
+import { isLocalUrl } from '@core/utils';
 
 @Component({
   selector: 'tb-social-share-panel',