diff --git a/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.kt b/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.kt
index 3ebe6b08d380..83b9d152a4dd 100644
--- a/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.kt
+++ b/app/src/main/java/com/owncloud/android/ui/adapter/LinkShareViewHolder.kt
@@ -134,11 +134,11 @@ internal class LinkShareViewHolder(itemView: View) : RecyclerView.ViewHolder(ite
 
         if (TextUtils.isEmpty(permissionName) || (isSecureFileDrop(publicShare) && encrypted)) {
             binding.permissionName.visibility = View.GONE
-            return
+        } else {
+            binding.permissionName.visibility = View.VISIBLE
+            binding.permissionName.text = permissionName
         }
 
-        binding.permissionName.text = permissionName
-        binding.permissionName.visibility = View.VISIBLE
         viewThemeUtils?.androidx?.colorPrimaryTextViewElement(binding.permissionName)
     }
 
diff --git a/app/src/main/res/layout/file_details_share_internal_share_link.xml b/app/src/main/res/layout/file_details_share_internal_share_link.xml
index 8bc5eb8be1de..ddafa2b559d4 100644
--- a/app/src/main/res/layout/file_details_share_internal_share_link.xml
+++ b/app/src/main/res/layout/file_details_share_internal_share_link.xml
@@ -22,7 +22,7 @@
         android:background="@drawable/round_bgnd"
         android:contentDescription="@string/share"
         android:id="@+id/copy_internal_link_icon"
-        android:layout_gravity="top"
+        android:layout_gravity="center"
         android:layout_height="@dimen/share_icon_size"
         android:layout_marginEnd="@dimen/standard_margin"
         android:layout_marginStart="@dimen/standard_margin"
diff --git a/app/src/main/res/layout/file_details_share_link_share_item.xml b/app/src/main/res/layout/file_details_share_link_share_item.xml
index e7cf42512914..7663b67f341f 100644
--- a/app/src/main/res/layout/file_details_share_link_share_item.xml
+++ b/app/src/main/res/layout/file_details_share_link_share_item.xml
@@ -63,22 +63,25 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/permission_name"
+            android:visibility="gone"
+            tools:visibility="visible"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:singleLine="true"
             tools:text="@string/placeholder_view_only"
+            android:drawablePadding="@dimen/standard_quarter_margin"
             app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
             app:drawableTint="@color/primary"
-            app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
             android:textColor="@color/primary"
             android:textSize="@dimen/two_line_secondary_text_size" />
     </LinearLayout>
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/copy_link"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        style="?attr/materialIconButtonStyle"
+        android:layout_width="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/minimum_size_for_touchable_area"
         android:layout_gravity="center_vertical"
         android:contentDescription="@string/copy_link"
         android:paddingStart="@dimen/standard_padding"
@@ -86,15 +89,21 @@
         android:paddingEnd="@dimen/standard_padding"
         android:paddingBottom="@dimen/standard_quarter_margin"
         android:scaleType="fitCenter"
-        android:src="@drawable/ic_content_copy" />
+        app:iconTint="@color/text_color"
+        app:icon="@drawable/ic_content_copy"
+        app:iconGravity="textStart" />
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/overflow_menu"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        style="?attr/materialIconButtonStyle"
+        android:layout_gravity="center"
+        android:layout_width="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/minimum_size_for_touchable_area"
         android:contentDescription="@string/overflow_menu"
         android:paddingStart="@dimen/standard_padding"
         android:paddingEnd="@dimen/standard_padding"
-        android:src="@drawable/ic_dots_vertical" />
+        app:icon="@drawable/ic_dots_vertical"
+        app:iconTint="@color/text_color"
+        app:iconGravity="textStart" />
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/file_details_share_share_item.xml b/app/src/main/res/layout/file_details_share_share_item.xml
index facdb0cdaa42..3ee12388b13b 100644
--- a/app/src/main/res/layout/file_details_share_share_item.xml
+++ b/app/src/main/res/layout/file_details_share_share_item.xml
@@ -51,24 +51,30 @@
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/permission_name"
+            android:visibility="gone"
+            tools:visibility="visible"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:gravity="center_vertical"
             android:singleLine="true"
             android:textColor="@color/primary"
             android:textSize="@dimen/two_line_secondary_text_size"
+            android:drawablePadding="4dp"
             app:drawableEndCompat="@drawable/ic_baseline_arrow_drop_down_24"
-            app:drawableRightCompat="@drawable/ic_baseline_arrow_drop_down_24"
             app:drawableTint="@color/primary"
             tools:text="@string/placeholder_view_only" />
     </LinearLayout>
 
-    <ImageView
+    <com.google.android.material.button.MaterialButton
         android:id="@+id/overflow_menu"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
+        style="?attr/materialIconButtonStyle"
+        android:layout_gravity="center"
+        android:layout_width="@dimen/minimum_size_for_touchable_area"
+        android:layout_height="@dimen/minimum_size_for_touchable_area"
         android:contentDescription="@string/overflow_menu"
         android:paddingStart="@dimen/standard_padding"
         android:paddingEnd="@dimen/standard_padding"
-        android:src="@drawable/ic_dots_vertical" />
+        app:icon="@drawable/ic_dots_vertical"
+        app:iconTint="@color/text_color"
+        app:iconGravity="textStart" />
 </LinearLayout>