diff --git a/src/images/photos.svg b/src/images/photos.svg
deleted file mode 100644
index c01bb22f2817d26849551f9b45887cebdb5558d9..0000000000000000000000000000000000000000
--- a/src/images/photos.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg id="Layer_1" fill="#D0D4DA" enable-background="new 0 0 512.002 512.002" height="512" viewBox="0 0 512.002 512.002" width="512" xmlns="http://www.w3.org/2000/svg"><g><path d="m508.617 174.213c-2.762-3.771-6.828-6.241-11.447-6.954l-148.74-22.97v-126.78c0-9.649-7.851-17.5-17.5-17.5h-313.43c-9.649 0-17.5 7.851-17.5 17.5v313.628c0 9.649 7.851 17.5 17.5 17.5h116.806l-14.726 95.363c-1.458 9.436 5.187 18.511 14.624 19.967l309.757 47.837c9.224 1.424 18.53-5.332 19.965-14.625l8.01-51.867c1.48-9.583-13.345-11.875-14.824-2.289-1.009 6.531-5.669 54.737-10.862 53.957l-309.757-47.837c-1.484-.374-2.181-1.325-2.089-2.853l15.08-97.652h16.783l-12.199 78.99c-.632 4.094 2.174 7.925 6.268 8.557l267.09 41.248c3.77.58 7.964-2.431 8.557-6.268l41.321-267.566c.632-4.094-2.174-7.925-6.268-8.557l-122.607-18.935v-16.64l146.451 22.617c1.484.374 2.18 1.325 2.089 2.853l-34.017 220.267c-1.439 9.317 13.32 12.03 14.824 2.289l34.017-220.267c.714-4.62-.415-9.241-3.176-13.013zm-493.617 156.924v-313.628c0-1.379 1.122-2.5 2.5-2.5h313.429c1.378 0 2.5 1.121 2.5 2.5v313.628c0 1.379-1.122 2.5-2.5 2.5h-313.429c-1.378 0-2.5-1.121-2.5-2.5zm446.335-122.416-39.032 252.742-252.266-38.959 11.408-73.867h149.484c9.649 0 17.5-7.851 17.5-17.5v-139.853z"/><path d="m309.343 31.455h-270.257c-4.142 0-7.5 3.357-7.5 7.5v37.49c0 9.697 15 9.697 15 0v-29.99h255.256v255.738h-255.256v-185.86c0-9.697-15-9.697-15 0v193.36c0 4.143 3.358 7.5 7.5 7.5h270.256c4.142 0 7.5-3.357 7.5-7.5v-270.738c.001-4.143-3.357-7.5-7.499-7.5z"/><path d="m174.212 248.933c.979 0 1.958-.191 2.879-.575.842-.35 20.844-8.752 41.182-24.627 27.726-21.642 42.567-46.865 42.919-72.943.368-27.278-20.413-53.849-49.002-53.849-14.959 0-28.816 7.447-37.979 19.76-9.162-12.313-23.019-19.76-37.979-19.76-27.02 0-49.002 24.11-49.002 53.747 0 62.789 80.723 96.3 84.159 97.695.906.369 1.865.552 2.823.552zm-71.981-98.247c0-21.365 15.253-38.747 34.002-38.747 13.334 0 25.505 8.966 31.007 22.842 2.454 6.188 11.49 6.188 13.944 0 5.501-13.876 17.672-22.842 31.006-22.842 20.292 0 34.261 19.579 34.003 38.646-.626 46.424-58.409 76.256-72.02 82.64-13.707-6.278-71.942-35.715-71.942-82.539z"/></g></svg>
\ No newline at end of file
diff --git a/src/styles/admin-circles/_index.scss b/src/styles/admin-circles/_index.scss
index f152015facd6fbd4f3d5c49cbd47105cce9adfcd..8cb492090f2546b498badc7b86cc51c947e526cd 100644
--- a/src/styles/admin-circles/_index.scss
+++ b/src/styles/admin-circles/_index.scss
@@ -145,43 +145,17 @@
   }
 
   .communities-profile-picture {
-    height: 200px;
-
-    div {
-      display: block;
-      width: 100%;
-      height: 100%;
-      background-position: center;
-      background-repeat: no-repeat;
-      background-size: contain;
-    }
-
-    .picture-empty {
-      display: flex;
-      justify-content: center;
-      align-items: center;
-
-      object {
-        height: 100px;
-        width: 100px;
-        object-fit: cover;
-        object-position: center;
-      }
-    }
-
-    &:nth-child(2)>.picture-empty {
-      background: #E4E9F1;
-
-      svg {
-        fill: #D0D4DA;
-      }
-    }
-
-    &:nth-child(3)>.picture-empty {
-      background: #E9F2FF;
-
-      svg {
-        fill: #D7E2F3;
+    
+    >div:not(:empty) {
+      height: 200px;
+
+      div:first-child {
+        display: block;
+        width: 100%;
+        height: 100%;
+        background-position: center;
+        background-repeat: no-repeat;
+        background-size: contain;
       }
     }
   }
@@ -247,11 +221,9 @@
     }
 
     .communities-profile-picture {
-      height: 180px;
-
-      object {
-        height: 80px;
-        width: 80px;
+      
+      >div:not(:empty) {
+        height: 180px;
       }
     }
 
@@ -278,6 +250,13 @@
       .leaflet-top.leaflet-left {
         display: none;
       }
+
+      .leaflet-popup-close-button {
+        display: block;
+        font-size: 20px;
+        margin-top: 5px;
+        margin-right: 5px;
+      }
     }
   }
   .flex {
diff --git a/src/views/partials/communities/page-community-profile.pug b/src/views/partials/communities/page-community-profile.pug
index 7f55ac83ad16ed8d8132f7d8792a3a8e5d916220..e4d5d46588017662f8b3be68c1a9131ca8078e5f 100644
--- a/src/views/partials/communities/page-community-profile.pug
+++ b/src/views/partials/communities/page-community-profile.pug
@@ -30,11 +30,16 @@ div.community-profile.padding-medium.sm-padding-none
       class-segment7="segment lg-hidden sm-full"
 
       class-segment8="segment two-third sm-full padding-bottom-large padding-bottom-xxsmall sm-text-left"
+      class-addresses="segment block margin-bottom-xsmall icon mdi-map-marker icon-third icon-large icon-margin-right-xsmall"
+      class-members="segment block margin-bottom-xsmall"
+      class-profile.website="segment block"
+      class-profile.email="segment block"
+      class-profile.phone="segment block"
 
       class-segment9="segment full"
       class-profile.description="segment full whitespace-normal"
 
-      class-segment10="segment full text-right margin-top-xxlarge"
+      class-segment10="segment full text-right"
 
       class-segment11="segment full whitespace-normal flex"
       class-profile.picture1="communities-profile-picture segment third"
diff --git a/src/views/partials/widgets.pug b/src/views/partials/widgets.pug
index 12059875e16f6b7fde4362f1174d498a449eeeaa..7a4792841b069d498c3d5857d237edf9193873fa 100644
--- a/src/views/partials/widgets.pug
+++ b/src/views/partials/widgets.pug
@@ -26,7 +26,6 @@ include widgets/hubl-communities-edit-email.pug
 include widgets/hubl-communities-edit-website.pug
 include widgets/hubl-communities-logo.pug
 include widgets/hubl-communities-map-fix-url-name.pug
-include widgets/hubl-communities-profile-address.pug
 include widgets/hubl-communities-profile-email.pug
 include widgets/hubl-communities-profile-facebook.pug
 include widgets/hubl-communities-profile-instagram.pug
diff --git a/src/views/partials/widgets/hubl-communities-edit-button.pug b/src/views/partials/widgets/hubl-communities-edit-button.pug
index f82b3a9bb8bebc4f7b0d6387fb4fdb1e5461438e..5f8b9fa670c18e5a16889b58e5c42993eb4cdb52 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 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 icon icon-pencil"
           data-trans="communities.profile.edit"
           data-src="${src}"
           next=`${getRoute('communities', true)}-edit`
diff --git a/src/views/partials/widgets/hubl-communities-profile-address.pug b/src/views/partials/widgets/hubl-communities-profile-address.pug
deleted file mode 100644
index fc237e3f00c7fb2b63389c25fb9635a6a00c9986..0000000000000000000000000000000000000000
--- a/src/views/partials/widgets/hubl-communities-profile-address.pug
+++ /dev/null
@@ -1,4 +0,0 @@
-if componentSet.has('communities') && getRoute('communities')
-  solid-widget(name='hubl-communities-profile-address')
-    template
-      | ${await value.adress_line1 != "" ? `<span class="icon mdi-map-marker icon-third icon-large icon-margin-right-xsmall">\${await value.adress_line1}<br>\${await value.adress_line2 || ""}</span>` : ""}
diff --git a/src/views/partials/widgets/hubl-communities-profile-email.pug b/src/views/partials/widgets/hubl-communities-profile-email.pug
index c8cb2c68c606f62498debfa449789f344fe332bb..f5b762a74ce3f28b34f416cfc79d74c8e655b150 100644
--- a/src/views/partials/widgets/hubl-communities-profile-email.pug
+++ b/src/views/partials/widgets/hubl-communities-profile-email.pug
@@ -1,3 +1,3 @@
 if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-profile-email')
-    template ${value != "" ? `<a class="link margin-bottom-xsmall icon mdi-email-outline icon-third icon-large icon-margin-right-xsmall" href="mailto:\${value}">${value}</a>` : ""}
+    template ${value != "" ? `<a class="link margin-bottom-xsmall icon mdi-email-outline icon-third icon-large icon-margin-right-xsmall" style="text-decoration:none;" href="mailto:\${value}">${value}</a>` : ""}
diff --git a/src/views/partials/widgets/hubl-communities-profile-members-counter.pug b/src/views/partials/widgets/hubl-communities-profile-members-counter.pug
index 4e78753e53a429b88067a4bccd5f819af5846059..f910aab8879da0cf47f6b7cb6c4299f9708aed40 100644
--- a/src/views/partials/widgets/hubl-communities-profile-members-counter.pug
+++ b/src/views/partials/widgets/hubl-communities-profile-members-counter.pug
@@ -1,7 +1,7 @@
 if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-profile-members-counter')
     template
-      p
+      span
         span.icon.icon-people.icon-third.icon-large.margin-right-xsmall
         solid-display(
           data-src="${src || value}"
diff --git a/src/views/partials/widgets/hubl-communities-profile-phone.pug b/src/views/partials/widgets/hubl-communities-profile-phone.pug
index 3b6f0ea61caba22d7c21f0fee029bed5036b892e..67b5dedb920dc5506429723aedea493d27724826 100644
--- a/src/views/partials/widgets/hubl-communities-profile-phone.pug
+++ b/src/views/partials/widgets/hubl-communities-profile-phone.pug
@@ -1,3 +1,3 @@
 if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-profile-phone')
-    template ${value != "" ? `<a class="link margin-bottom-xsmall icon mdi-cellphone-iphone icon-third icon-large icon-margin-right-xsmall" href="tel:\${value}">${value}</a>` : ""}
+    template ${value != "" ? `<a class="link margin-bottom-xsmall icon mdi-cellphone-iphone icon-third icon-large icon-margin-right-xsmall" style="text-decoration:none;" href="tel:\${value}">${value}</a>` : ""}
diff --git a/src/views/partials/widgets/hubl-communities-profile-picture.pug b/src/views/partials/widgets/hubl-communities-profile-picture.pug
index a12066333e9ea8e8fba5eeaa340250df88f5ec1d..c470f505bef2b3c15574e459a3ca88c4238991e5 100644
--- a/src/views/partials/widgets/hubl-communities-profile-picture.pug
+++ b/src/views/partials/widgets/hubl-communities-profile-picture.pug
@@ -1,3 +1,3 @@
 if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-profile-picture')
-    template ${value != "" ? `<div \style="background-image:url(${value});" />` : `<div class="picture-empty"><object type="image/svg+xml" data="/images/photos.svg"></object></div>`}
+    template ${value != "" ? `<div><div \style="background-image:url(${value});"></div></div>` : `<div class="picture-empty"></div>`}
diff --git a/src/views/partials/widgets/hubl-communities-profile-website.pug b/src/views/partials/widgets/hubl-communities-profile-website.pug
index ea5c8b206969a7aea2dda8d7c530ceb36a4a96d8..4b481d15f0b84136976a50848232bd6d5e795497 100644
--- a/src/views/partials/widgets/hubl-communities-profile-website.pug
+++ b/src/views/partials/widgets/hubl-communities-profile-website.pug
@@ -1,3 +1,3 @@
 if componentSet.has('communities') && getRoute('communities')
   solid-widget(name='hubl-communities-profile-website')
-    template ${value != "" ? `<a class="link margin-bottom-xsmall icon mdi-link-variant icon-third icon-large icon-margin-right-xsmall" href="tel:\${value}" target="_blank">${value}</a>` : ""}
+    template ${value != "" ? `<a class="link margin-bottom-xsmall icon mdi-link-variant icon-third icon-large icon-margin-right-xsmall" style="text-decoration:none;" href="tel:\${value}" target="_blank">${value}</a>` : ""}