diff --git a/package-lock.json b/package-lock.json
index 44f8451..8b6776a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1615,9 +1615,9 @@
       }
     },
     "@startinblox/hubl-styling-framework": {
-      "version": "1.9.5",
-      "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.5.tgz",
-      "integrity": "sha512-gS2i88LTYEOp5bBP69I0TdlHh0BSKZsme0HV7otS67tIYkhgXHdot6defWy2Ia9y3QNMZ640USbCjWxwg3unig=="
+      "version": "1.9.6",
+      "resolved": "https://registry.npmjs.org/@startinblox/hubl-styling-framework/-/hubl-styling-framework-1.9.6.tgz",
+      "integrity": "sha512-jcKewmNJIy3SStKeb++9UFiBHH/kDvoRpFOzx/fmrUd54uFLSmvBtiVnR4VAHbhzqtaHqIwu4u8xkuQarSdIzw=="
     },
     "@types/q": {
       "version": "1.5.4",
diff --git a/package.json b/package.json
index 79bbeeb..f7995a3 100644
--- a/package.json
+++ b/package.json
@@ -57,7 +57,7 @@
     "clearDist": false
   },
   "dependencies": {
-    "@startinblox/hubl-styling-framework": "^1.9.5",
+    "@startinblox/hubl-styling-framework": "^1.9.6",
     "cross-env": "^7.0.3",
     "fs-extra": "^9.0.1",
     "normalize.css": "^8.0.1",
diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss
index 25c195a..6831190 100644
--- a/src/styles/admin-circles/_index.scss
+++ b/src/styles/admin-circles/_index.scss
@@ -6,7 +6,7 @@
   /* Styles on buttons and .children-link don't work because this input is inside too many elements. */
   /* And no I can't add that stupid icon because it'a an input. */
   /* But now, with 0.16, it's a button and you can :D */
-  .join-button {
+  /*.join-button {
 
     input,
     button {
@@ -55,7 +55,7 @@
         }
       }
     }
-  }
+  }*/
 
   .masonry>div:nth-child(1) {
     /* change from directory (nth-child(2))*/
diff --git a/src/styles/index.scss b/src/styles/index.scss
index 26a93d8..4bbecc1 100644
--- a/src/styles/index.scss
+++ b/src/styles/index.scss
@@ -121,17 +121,11 @@ hubl-menu-empty+hubl-menu-empty {
 .search-button {
 
   button {
-    display: inline-flex;
-    line-height: 15px;
 
     @media (max-width: 768px) {
       margin-bottom: 20px;
       width: 100%;
     }
-
-    &::before {
-      vertical-align: middle;
-    }
   }
 }
 
@@ -144,3 +138,27 @@ hubl-menu-empty+hubl-menu-empty {
     }
   }
 }
+
+.children-button-icon {
+
+  button {
+    display: inline-flex;
+    justify-content: center;
+    line-height: 15px;
+
+    &::before {
+      vertical-align: middle;
+    }
+  }
+}
+
+.button-icon {
+
+  display: inline-flex;
+  justify-content: center;
+  line-height: 15px;
+
+  &::before {
+    vertical-align: middle;
+  }
+}
diff --git a/src/views/partials/admin/page-admin-chat-create.pug b/src/views/partials/admin/page-admin-chat-create.pug
index e424f36..6f8a04b 100644
--- a/src/views/partials/admin/page-admin-chat-create.pug
+++ b/src/views/partials/admin/page-admin-chat-create.pug
@@ -59,7 +59,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
 
     submit-button=''
     submit-widget="button"
-    class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+    class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
     
     data-trans='label-user.first_name=user.create.labelFirstname;label-user.last_name=user.create.labelLastname;label-user.username=user.create.labelUsername;label-user.email=user.create.labelEmail;submit-button=user.create.buttonSubmit'
   )
diff --git a/src/views/partials/admin/page-admin-chat.pug b/src/views/partials/admin/page-admin-chat.pug
index 42eb676..70d90ff 100644
--- a/src/views/partials/admin/page-admin-chat.pug
+++ b/src/views/partials/admin/page-admin-chat.pug
@@ -17,7 +17,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
     submit-button=""
     submit-widget="button"
-    class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
+    class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
     data-trans='label-cell1=communities.searchBy;submit-button=goButton'
   )
 
diff --git a/src/views/partials/admin/page-admin-circles-create.pug b/src/views/partials/admin/page-admin-circles-create.pug
index e992588..2a15007 100644
--- a/src/views/partials/admin/page-admin-circles-create.pug
+++ b/src/views/partials/admin/page-admin-circles-create.pug
@@ -53,7 +53,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
 
     submit-button=''
     submit-widget="button"
-    class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+    class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
 
     data-trans='enum-status=hublStatus;label-status=circle.create.labelStatus;label-community.community=circle.create.labelCommunity;label-name=circle.create.labelName;label-description=circle.create.labelDescription;submit-button=circle.create.buttonSubmit;label-subtitle=circle.create.labelSubtitle;label-help=circle.create.descriptionHelp'
   )
diff --git a/src/views/partials/admin/page-admin-circles-join.pug b/src/views/partials/admin/page-admin-circles-join.pug
index dc2d540..ced26ac 100644
--- a/src/views/partials/admin/page-admin-circles-join.pug
+++ b/src/views/partials/admin/page-admin-circles-join.pug
@@ -10,6 +10,7 @@ solid-widget(name=`hubl-admin-circle-join-button`)
 
       submit-button=''
       submit-widget="button"
+      class-submit-button="add-member-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
       data-trans='submit-button=circle.list.buttonJoin'
     )
     hubl-reactivity(data-src=`${getComponent('circles').endpoints.get}` target-src='${value}')
diff --git a/src/views/partials/admin/page-admin-circles.pug b/src/views/partials/admin/page-admin-circles.pug
index 8eccc49..5e5159e 100644
--- a/src/views/partials/admin/page-admin-circles.pug
+++ b/src/views/partials/admin/page-admin-circles.pug
@@ -18,7 +18,7 @@ div.segment.full.padding-large.padding-top-medium.padding-bottom-xsmall.sm-paddi
     div.segment.half.sm-full.text-right
       solid-ac-checker(data-src=`${getComponent('circles').endpoints.post}`, permission='acl:Append')
         solid-link(
-          class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
+          class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-margin-right-xsmall icon-plus'
           next=`admin-${getRoute('circles', true)}-create`
           data-trans='circle.list.buttonCreate'
         )
@@ -32,7 +32,7 @@ div.segment.full.padding-large.padding-top-medium.padding-bottom-xsmall.sm-paddi
     class-searchname="segment margin-bottom-medium margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
     submit-button=""
     submit-widget="button"
-    class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
+    class-submit-button="search-button segment sm-full text-xsmall children-button-icon children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
     data-trans='label-searchname=circle.list.searchBy;submit-button=circle.list.searchButton'
   )
 
diff --git a/src/views/partials/admin/page-admin-projects-create.pug b/src/views/partials/admin/page-admin-projects-create.pug
index a3220bb..3d01f2f 100644
--- a/src/views/partials/admin/page-admin-projects-create.pug
+++ b/src/views/partials/admin/page-admin-projects-create.pug
@@ -54,7 +54,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
 
     submit-button=''
     submit-widget="button"
-    class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+    class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
     
     next=getRoute('projects', true)
 
diff --git a/src/views/partials/admin/page-admin-projects.pug b/src/views/partials/admin/page-admin-projects.pug
index 33cf5af..def6e0c 100644
--- a/src/views/partials/admin/page-admin-projects.pug
+++ b/src/views/partials/admin/page-admin-projects.pug
@@ -12,7 +12,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     div.segment.half.sm-full.text-right
       solid-ac-checker(data-src=`${getComponent('projects').endpoints.post}`, permission='acl:Append')
         solid-link(
-          class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-plus'
+          class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-margin-right-xsmall icon-plus'
           next=`admin-${getRoute('projects', true)}-create`
           data-trans='project.list.buttonCreate'
         )
@@ -25,7 +25,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
     class-cell1="segment margin-bottom-medium third sm-full padding-right-small sm-padding-none text-small text-semibold text-uppercase text-color-heading"
     submit-button=""
     submit-widget="button"
-    class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
+    class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
     data-trans='label-cell1=project.list.searchBy;submit-button=goButton'
   )
 
@@ -106,7 +106,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
       solid-widget(name=`hubl-admin-project-join-button`)
         template
           solid-form(
-            class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
+            class=''
             data-src='${src}'
             nested-field="members"
 
@@ -116,6 +116,7 @@ div.segment.full.padding-large.sm-padding-xsmall.sm-padding-top-medium.whitespac
 
             submit-button=''
             submit-widget="button"
+            class-submit-button="add-member-button segment margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
             data-trans='submit-button=project.list.buttonJoin'
           )
           hubl-reactivity(data-src=`${getComponent('projects').endpoints.get}` target-src='${value}')
diff --git a/src/views/partials/circle/page-circle-edit.pug b/src/views/partials/circle/page-circle-edit.pug
index 554a263..932dd3a 100644
--- a/src/views/partials/circle/page-circle-edit.pug
+++ b/src/views/partials/circle/page-circle-edit.pug
@@ -66,7 +66,7 @@ div.segment.full.padding-large.whitespace-normal
 
       submit-button=''
       submit-widget="button"
-      class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+      class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
       next=`${component.route}-information`
 
       data-trans='enum-status=hublStatus;label-status=circle.edit.labelStatus;label-community.community=circle.edit.labelCommunity;label-name=circle.edit.labelName;label-owner=circle.edit.labelOwner;label-description=circle.edit.labelDescription;submit-button=circle.edit.buttonSubmit;label-subtitle=circle.edit.labelSubtitle;label-help=circle.edit.descriptionHelp'
diff --git a/src/views/partials/circle/page-circle-profile.pug b/src/views/partials/circle/page-circle-profile.pug
index 4749294..639410d 100644
--- a/src/views/partials/circle/page-circle-profile.pug
+++ b/src/views/partials/circle/page-circle-profile.pug
@@ -44,9 +44,9 @@ div(
       .segment.half.sm-full.text-right.margin-bottom-medium.sm-margin-bottom-small
         solid-ac-checker(permission='acl:Append', bind-resources, nested-field='members')
           solid-ac-checker(permission='acl:Delete', bind-resources)
-            solid-link(class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-pencil' next=`${component.route}-edit` bind-resources data-trans='circle.profile.buttonModify')
+            solid-link(class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-pencil icon-margin-right-xsmall' next=`${component.route}-edit` bind-resources data-trans='circle.profile.buttonModify')
           solid-ac-checker(no-permission='acl:Delete', bind-resources)
-            solid-link(class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-pencil' next=`${component.route}-edit` bind-resources data-trans='circle.profile.buttonAdd')
+            solid-link(class='segment sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-pencil icon-margin-right-xsmall' next=`${component.route}-edit` bind-resources data-trans='circle.profile.buttonAdd')
 
       solid-widget(name=`hubl-circle-leave-button-${component.uniq}`)
         template
diff --git a/src/views/partials/communities/page-community-directory.pug b/src/views/partials/communities/page-community-directory.pug
index 1cea2a2..d926fb4 100644
--- a/src/views/partials/communities/page-community-directory.pug
+++ b/src/views/partials/communities/page-community-directory.pug
@@ -11,7 +11,7 @@
         class-name="segment margin-bottom-medium full sm-full padding-right-small sm-padding-none text-small input-bg-white children-shadow"
         submit-button=""
         submit-widget="button"
-        class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
+        class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
         data-trans='placeholder-name=communities.list.searchBy;submit-button=communities.list.searchButton'
       )
     div.segment.sm-full.text-right(style='float:right')
diff --git a/src/views/partials/communities/page-community-edit.pug b/src/views/partials/communities/page-community-edit.pug
index 5f81ad5..440e699 100644
--- a/src/views/partials/communities/page-community-edit.pug
+++ b/src/views/partials/communities/page-community-edit.pug
@@ -58,7 +58,7 @@ div.bg-color-white
 
         submit-button=""
         submit-widget="button"
-        class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+        class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
 
         data-trans="label-logo=communities.edit.labelLogo;label-profile.shortDescription=communities.edit.labelShortDescription;label-profile.description=communities.edit.labelDescription;label-profile.phone=communities.edit.labelPhone;label-profile.tweeter=communities.edit.labelTwitter;label-profile.facebook=communities.edit.labelFacebook;label-profile.linkedin=communities.edit.labelLinkedin;label-profile.instagram=communities.edit.labelInstagram;submit-button=communities.edit.buttonSubmit"
       )
@@ -88,7 +88,7 @@ div.bg-color-white
 
         submit-button=""
         submit-widget="button"
-        class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+        class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
 
         data-trans="label-profile.picture1=communities.edit.labelPicture1;label-profile.picture2=communities.edit.labelPicture2;label-profile.picture3=communities.edit.labelPicture3;submit-button=communities.edit.buttonSubmit"
       )
diff --git a/src/views/partials/communities/page-community-map.pug b/src/views/partials/communities/page-community-map.pug
index 3a03be6..86d6ca5 100644
--- a/src/views/partials/communities/page-community-map.pug
+++ b/src/views/partials/communities/page-community-map.pug
@@ -13,7 +13,7 @@
 
         submit-button=""
         submit-widget="button"
-        class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
+        class-submit-button="search-button segment sm-full text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-arrow-right-circle children-icon-small children-icon-margin-right-xsmall"
         data-trans='placeholder-filter=communities.list.searchBy;submit-button=communities.list.searchButton'
       )
     div.segment.sm-full.text-right(style='float:right')
diff --git a/src/views/partials/project/page-project-edit.pug b/src/views/partials/project/page-project-edit.pug
index e80a0e3..9ea4e13 100644
--- a/src/views/partials/project/page-project-edit.pug
+++ b/src/views/partials/project/page-project-edit.pug
@@ -59,7 +59,7 @@ div.segment.full.padding-large.whitespace-normal
 
       submit-button=''
       submit-widget="button"
-      class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
+      class-submit-button="submit-button segment sm-full margin-top-xsmall text-xsmall children-link-button children-link-text-bold children-link-text-uppercase children-link-reversed color-secondary bordered children-button-icon children-icon-rocket children-icon-small children-icon-margin-right-xsmall"
       next=`${component.route}-information`
 
       data-trans='label-name=project.edit.labelName;label-captain=project.edit.labelCaptain;label-customer.name=project.edit.labelCustomer;label-customer.address=project.edit.labelCustomerAddress;label-description=project.edit.labelDescription;label-help=project.edit.descriptionHelp;submit-button=project.edit.buttonSubmit'
diff --git a/src/views/partials/project/page-project-profile.pug b/src/views/partials/project/page-project-profile.pug
index 53e0604..051cdab 100644
--- a/src/views/partials/project/page-project-profile.pug
+++ b/src/views/partials/project/page-project-profile.pug
@@ -49,9 +49,9 @@ div(
 
       solid-ac-checker.segment.half.sm-full.text-right(permission='acl:Append', bind-resources, nested-field='members')
         solid-ac-checker(permission='acl:Delete', bind-resources)
-          solid-link(class='segment sm-full margin-bottom-large sm-margin-bottom-medium button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-pencil' next=`${component.route}-edit` bind-resources data-trans='project.profile.buttonModify')
+          solid-link(class='segment sm-full margin-bottom-large sm-margin-bottom-medium button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-pencil icon-margin-right-xsmall' next=`${component.route}-edit` bind-resources data-trans='project.profile.buttonModify')
         solid-ac-checker(no-permission='acl:Delete', bind-resources)
-          solid-link(class='segment sm-full margin-bottom-large sm-margin-bottom-medium button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-pencil' next=`${component.route}-edit` bind-resources data-trans='project.profile.buttonAdd')
+          solid-link(class='segment sm-full margin-bottom-large sm-margin-bottom-medium button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-pencil icon-margin-right-xsmall' next=`${component.route}-edit` bind-resources data-trans='project.profile.buttonAdd')
 
       solid-ac-checker.segment.full.text-right.margin-bottom-large.sm-margin-bottom-medium(permission='acl:Delete', bind-resources)
         solid-delete(
diff --git a/src/views/partials/widgets/hubl-action-community.pug b/src/views/partials/widgets/hubl-action-community.pug
index 3d731b3..0e8aea1 100644
--- a/src/views/partials/widgets/hubl-action-community.pug
+++ b/src/views/partials/widgets/hubl-action-community.pug
@@ -3,7 +3,7 @@ if componentSet.has('admin') && componentSet.has('chat')
     template
       solid-ac-checker(data-src="${value}", nested-field="members", permission='acl:Append')
         solid-link(
-          class='button text-small text-bold text-uppercase reversed color-secondary bordered icon icon-plus'
+          class='button text-small text-bold text-uppercase reversed color-secondary bordered button-icon icon icon-margin-right-xsmall icon-plus'
           data-src="${value}"
           next=`admin-${getRoute("chat", true)}-create`
           data-trans='communities.linkInvite'
diff --git a/src/views/partials/widgets/hubl-communities-edit-button.pug b/src/views/partials/widgets/hubl-communities-edit-button.pug
index 5f8b9fa..47b9db4 100644
--- a/src/views/partials/widgets/hubl-communities-edit-button.pug
+++ b/src/views/partials/widgets/hubl-communities-edit-button.pug
@@ -7,7 +7,7 @@ if componentSet.has('communities') && getRoute('communities')
         nested-field="profile"
       )
         solid-link(
-          class="segment margin-top-xxlarge sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered icon icon-pencil"
+          class="segment margin-top-xxlarge sm-full button text-xsmall text-bold text-uppercase text-center reversed color-secondary bordered button-icon icon icon-pencil icon-margin-right-xsmall"
           data-trans="communities.profile.edit"
           data-src="${src}"
           next=`${getRoute('communities', true)}-edit`