diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
index 0757fd6..0b98e53 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.java
@@ -116,8 +116,8 @@ public class DialogShareableLink extends Composite {
 	private boolean itemIsPublicStatus;
 	
 	private final String privateShareToFileDescription = "By sharing the following Private Link "
-			+ "to file with your coworkers, you will enact the users of the group the folder is shared with, "
-			+ "after login, to access the file and the shared folder content";
+			+ "with your coworkers, you will enact the users of the group the folder is shared with, "
+			+ "to access the file and the shared folder content. Login required";
 	
 	
 	/**
@@ -223,8 +223,9 @@ public class DialogShareableLink extends Composite {
 				fieldSetPrivate.setVisible(true);
 				fieldPrivateSharing.setVisible(true);
 				
-				if(item.isShareable())
+				if(item.isShareable()) {
 					buttonShareSettings.setVisible(true);
+				}
 				
 				loadAndShowPrivateLink(item, textPrivateLink);
 				
@@ -235,7 +236,7 @@ public class DialogShareableLink extends Composite {
 					//labelLinkSharing.setText("Only your cowokers (sharing members) can access to the content");
 				}
 			}
-			
+
 			//THE FOLDER IS PRIVATE - NO SHARED AND NO PUBLIC
 			if(!item.isPublic() && !item.isShared()) {
 				
@@ -243,6 +244,7 @@ public class DialogShareableLink extends Composite {
 				if(item.isShareable()) {
 					fieldPrivateSharing.setVisible(true);
 					buttonShareSettings.setVisible(true);
+					buttonShareSettings.setText("Enable Share");
 				}
 				
 				//SHARING WITH EVERYONE
diff --git a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
index 42a1711..a7884fe 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
+++ b/src/main/java/org/gcube/portlets/user/workspace/client/view/windows/DialogShareableLink.ui.xml
@@ -79,15 +79,12 @@
 						addStyleNames="my-control-group">
 
 						<b:Well ui:field="wellPrivateLinkDescription">
-							By sharing the following Private Link
-							to
-							folder with
+							By sharing the following Private Link with
 							your
 							coworkers,
 							you will enact the users of the group
-							the folder is shared with,
-							after login, to access the shared
-							folder content</b:Well>
+							the folder is shared with to access the shared
+							folder content. Login required</b:Well>
 						<b:ControlLabel>Private Link</b:ControlLabel>
 						<b:Controls>
 							<b:InputAddOn prependIcon="LINK"
@@ -119,23 +116,19 @@
 				<b:ControlGroup ui:field="cgPublicLink" addStyleNames="my-control-group">
 					<b:Well ui:field="alertFolderPublicLink" visible="false">By sharing
 						the following Public
-						Link
-						to folder, you will
+						Link, you will
 						enact anyone
 						with the
 						link to
 						view the
-						content, no login will be
-						requested</b:Well>
+						content. No login required</b:Well>
 					<b:Well ui:field="alertFilePublicLink" visible="false">By sharing
 						the following
-						Public Link to file, your coworkers can download it.
-						No login will be
-						requested.
+						Public Link, anyone with link can download it.
 						The link will always point to the
 						version
 						of the file at the
-						time of link creation</b:Well>
+						time of link creation. No login required</b:Well>
 					<b:ControlLabel>Public Link</b:ControlLabel>
 					<b:Controls>
 						<b:InputAddOn prependIcon="GLOBE"
diff --git a/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css b/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
index 43ab237..3d7a8b2 100644
--- a/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
+++ b/src/main/java/org/gcube/portlets/user/workspace/public/workspacetree.css
@@ -288,5 +288,5 @@ table.userssuggest th {
 }
 
 .my-control-group .gwt-TextBox {
-	width: 370px !important;
+	width: 360px !important;
 }
\ No newline at end of file