diff --git a/src/app/pages/community/content-providers/add-content-providers.component.html b/src/app/pages/community/content-providers/add-content-providers.component.html
index 96ed2f3..fbf8d63 100644
--- a/src/app/pages/community/content-providers/add-content-providers.component.html
+++ b/src/app/pages/community/content-providers/add-content-providers.component.html
@@ -42,13 +42,14 @@
    <li *ngFor="let result of openaireContentProviders" class="uk-animation-fade">
        <h6 class="uk-grid" uk-grid>
            <span class="uk-width-5-6">
-             <a class="custom-external" target="_blank" [href]="properties.baseOpenaireLink+'/search/dataprovider?datasourceId='+result.id">
+             <a target="_blank" [href]="properties.baseOpenaireLink+'/search/dataprovider?datasourceId='+result.id">
                <span *ngIf="result['title'].name">
                  <span [innerHTML]="result['title'].name"></span>
                </span>
                <span *ngIf="!result['title'].name">
                  [no title available]
               </span>
+               <span class="custom-external custom-icon space"></span>
              </a>
            </span>
 
@@ -70,10 +71,12 @@
        <div *ngIf="result['organizations'] != undefined && result['organizations'].length > 0">
            <span> Organization: </span>
            <span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">
-               <a *ngIf="organization.id" class="custom-external custom-icon" target="_blank"
+               <a *ngIf="organization.id" target="_blank"
                   [href]="properties.baseOpenaireLink+'/search/organization?organizationId='+organization.id">
-                       {{organization.name}}</a><span
-
+                 <span>{{organization.name}}</span>
+                 <span class="custom-external custom-icon space"></span>
+               </a>
+             <span
                    *ngIf="!organization.id">
                        {{organization.name}}</span><span
 
@@ -88,8 +91,9 @@
        <div *ngIf="result['websiteURL'] != undefined && result['websiteURL'] != ''">
            <span>Website URL: </span>
            <span>
-               <a href="{{result['websiteURL']}}" target="_blank" class="custom-external custom-icon">
-                   {{result['websiteURL']}}
+               <a href="{{result['websiteURL']}}" target="_blank">
+                 <span>{{result['websiteURL']}}</span>
+                 <span class="custom-external custom-icon space"></span>
                </a>
            </span>
        </div>
@@ -97,8 +101,9 @@
        <div *ngIf="result['OAIPMHURL'] != undefined && result['OAIPMHURL'] != ''">
            <span>OAI-PMH URL: </span>
            <span>
-               <a href="{{result['OAIPMHURL']}}" target="_blank" class="custom-external custom-icon">
-                   {{result['OAIPMHURL']}}
+               <a href="{{result['OAIPMHURL']}}" target="_blank">
+                 <span>{{result['OAIPMHURL']}}</span>
+                 <span class="custom-external custom-icon space"></span>
                </a>
            </span>
        </div>
diff --git a/src/app/pages/community/content-providers/remove-content-providers.component.html b/src/app/pages/community/content-providers/remove-content-providers.component.html
index 5b76815..87f88e9 100644
--- a/src/app/pages/community/content-providers/remove-content-providers.component.html
+++ b/src/app/pages/community/content-providers/remove-content-providers.component.html
@@ -54,10 +54,11 @@
       <tbody>
       <tr class="uk-table-middle" *ngFor="let result of communityContentProviders">
         <td class="uk-text-center uk-width-1-4">
-          <a class="custom-external" target="_blank"
+          <a target="_blank"
              [href]="communityUrl+'/search/dataprovider?datasourceId=' +result.openaireId">
             <span *ngIf="result.name">{{result.name}}</span>
             <span *ngIf="!result.name">[no name available]</span>
+            <span class="custom-external custom-icon space"></span>
           </a>
         </td>
         <td class="uk-text-center uk-width-1-4">
diff --git a/src/app/pages/community/projects/add-projects.component.html b/src/app/pages/community/projects/add-projects.component.html
index 3bfeb6a..5ccd78a 100644
--- a/src/app/pages/community/projects/add-projects.component.html
+++ b/src/app/pages/community/projects/add-projects.component.html
@@ -61,7 +61,7 @@ If you cannot find a funder that is relevant for your community, please contact
    <li *ngFor="let result of openaireProjects" class="uk-animation-fade">
        <h6 class="uk-grid" uk-grid>
            <span class="uk-width-5-6">
-             <a class="custom-external" target="_blank" [href]="properties.baseOpenaireLink+'/search/project?projectId='+result.id">
+             <a target="_blank" [href]="properties.baseOpenaireLink+'/search/project?projectId='+result.id">
                <span *ngIf="result['title'].name || result.acronym">
                  <span *ngIf="result.acronym">{{result.acronym}}</span>
                  <span *ngIf="result.acronym && result['title'].name">-</span>
@@ -72,6 +72,7 @@ If you cannot find a funder that is relevant for your community, please contact
                  [no title available]
                  <span *ngIf="result.code">({{result.code}})</span>
               </span>
+               <span class="custom-external custom-icon space"></span>
              </a>
            </span>
 
@@ -99,10 +100,12 @@ If you cannot find a funder that is relevant for your community, please contact
        <div *ngIf="result['organizations'] != undefined && result['organizations'].length > 0">
            <span> Organization: </span>
            <span *ngFor="let organization of result['organizations'].slice(0,10) let i=index">
-               <a *ngIf="organization.id" class="custom-external custom-icon" target="_blank"
+               <a *ngIf="organization.id" target="_blank"
                   [href]="properties.baseOpenaireLink+'/search/organization?organizationId='+organization.id">
-                       {{organization.name}}</a><span
-
+                    <span>{{organization.name}}</span>
+                    <span class="custom-external custom-icon space"></span>
+               </a>
+             <span
                    *ngIf="!organization.id">
                        {{organization.name}}</span><span
 
diff --git a/src/app/pages/community/projects/remove-projects.component.html b/src/app/pages/community/projects/remove-projects.component.html
index 8f7a204..1106b22 100644
--- a/src/app/pages/community/projects/remove-projects.component.html
+++ b/src/app/pages/community/projects/remove-projects.component.html
@@ -54,11 +54,12 @@
         <tbody>
           <tr class="uk-table-middle" *ngFor="let result of communityProjects">
             <td class="uk-text-center uk-width-1-4">
-              <a class="custom-external" target="_blank"
+              <a target="_blank"
                  [href]="communityUrl+'/search/project?' + ((result.openaireId) ? 'projectId='+result.openaireId : 'grantId='+result.grantId+'&funder='+result.funder)">
                 <span *ngIf="result.name">{{result.name}}</span>
                 <span *ngIf="result.name && result.acronym">(</span><span *ngIf="result.acronym">{{result.acronym}}</span><span *ngIf="result.name && result.acronym">)</span>
                 <span *ngIf="!result.name && !result.acronym">[no title available]</span>
+                <span class="custom-external custom-icon space"></span>
               </a>
             </td>
             <td class="uk-text-center uk-width-1-4">
diff --git a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html
index 559e0ce..1543579 100644
--- a/src/app/pages/zenodo-communities/add-zenodo-communities.component.html
+++ b/src/app/pages/zenodo-communities/add-zenodo-communities.component.html
@@ -43,9 +43,10 @@
             </div>
             <div class="uk-width-expand">
                 <h4 class="uk-comment-title uk-margin-remove uk-grid">
-                  <a class="custom-external uk-width-expand" target="_blank" href="{{item.link}}">
+                  <a class="uk-width-expand" target="_blank" href="{{item.link}}">
                     <span *ngIf="item.title">{{item.title}}</span>
                     <span *ngIf="!item.title">[no name available]</span>
+                    <span class="custom-external custom-icon space"></span>
                   </a>
                 <span *ngIf=" masterCommunity && item.id==masterCommunity.id" class="uk-label uk-label-warning">Master zenodo community</span>
                 <span class="uk-width-1-6 uk-text-center">
diff --git a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html
index 61b2a15..0f615f8 100644
--- a/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html
+++ b/src/app/pages/zenodo-communities/manage-zenodo-communities.component.html
@@ -10,9 +10,10 @@
        </div>
        <div class="uk-width-expand">
            <h4 class="uk-comment-title uk-margin-remove">
-             <a *ngIf="masterCommunity.link" class="custom-external" target="_blank" href="{{masterCommunity.link}}">
+             <a *ngIf="masterCommunity.link" target="_blank" href="{{masterCommunity.link}}">
                <span *ngIf="masterCommunity.title">{{masterCommunity.title}}</span>
                <span *ngIf="!masterCommunity.title">[no name available]</span>
+               <span class="custom-external custom-icon space"></span>
              </a>
              <div  *ngIf="!masterCommunity.link">
                <span *ngIf="masterCommunity.title">{{masterCommunity.title}}</span>
@@ -69,9 +70,10 @@
           <tbody>
             <tr class="uk-table-middle" *ngFor="let item of selectedCommunities">
               <td class="uk-text-center uk-width-1-4">
-                <a class="custom-external" target="_blank" href="{{item.link}}">
+                <a target="_blank" href="{{item.link}}">
                   <span *ngIf="item.title">{{item.title}}</span>
                   <span *ngIf="!item.title">[no name available]</span>
+                  <span class="custom-external custom-icon space"></span>
                 </a>
               </td>
               <td class="uk-text-center uk-width-1-4">