diff --git a/app/src/androidTest/java/com/nmc/android/ui/FileSharingIT.kt b/app/src/androidTest/java/com/nmc/android/ui/FileSharingIT.kt
index 91c8cf7fdfb1..f99082077f00 100644
--- a/app/src/androidTest/java/com/nmc/android/ui/FileSharingIT.kt
+++ b/app/src/androidTest/java/com/nmc/android/ui/FileSharingIT.kt
@@ -99,11 +99,12 @@ class FileSharingIT : AbstractIT() {
         onView(withId(R.id.tv_sharing_details_message)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.tv_sharing_details_message)).check(matches(withText("You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.")))
         onView(withId(R.id.searchView)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.pick_contact_email_btn)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.label_personal_share)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.label_personal_share)).check(matches(withText("Personal share by mail")))
 
         onView(withId(R.id.share_create_new_link)).check(matches(isCompletelyDisplayed()))
-        onView(withId(R.id.share_create_new_link)).check(matches(withText("Add link")))
+        onView(withId(R.id.share_create_new_link)).check(matches(withText("Create Link")))
 
         onView(withId(R.id.tv_your_shares)).check(matches(not(isDisplayed())))
         onView(withId(R.id.sharesList)).check(matches(not(isDisplayed())))
@@ -155,11 +156,12 @@ class FileSharingIT : AbstractIT() {
         onView(withId(R.id.tv_sharing_details_message)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.tv_sharing_details_message)).check(matches(withText("You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.")))
         onView(withId(R.id.searchView)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.pick_contact_email_btn)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.label_personal_share)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.label_personal_share)).check(matches(withText("Personal share by mail")))
 
         onView(withId(R.id.share_create_new_link)).check(matches(isCompletelyDisplayed()))
-        onView(withId(R.id.share_create_new_link)).check(matches(withText("Add link")))
+        onView(withId(R.id.share_create_new_link)).check(matches(withText("Create Link")))
 
         onView(withId(R.id.tv_your_shares)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.tv_your_shares)).check(matches(withText("Your Shares")))
@@ -185,6 +187,7 @@ class FileSharingIT : AbstractIT() {
         onView(withId(R.id.shared_with_you_avatar)).check(matches(isCompletelyDisplayed()))
 
         onView(withId(R.id.searchView)).check(matches(not(isDisplayed())))
+        onView(withId(R.id.pick_contact_email_btn)).check(matches(not(isDisplayed())))
         onView(withId(R.id.label_personal_share)).check(matches(not(isDisplayed())))
         onView(withId(R.id.share_create_new_link)).check(matches(not(isDisplayed())))
         onView(withId(R.id.tv_your_shares)).check(matches(not(isDisplayed())))
@@ -208,6 +211,7 @@ class FileSharingIT : AbstractIT() {
         onView(withId(R.id.shared_with_you_note_container)).check(matches(not(isDisplayed())))
 
         onView(withId(R.id.searchView)).check(matches(isCompletelyDisplayed()))
+        onView(withId(R.id.pick_contact_email_btn)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.label_personal_share)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.share_create_new_link)).check(matches(isCompletelyDisplayed()))
         onView(withId(R.id.tv_your_shares)).check(matches(not(isDisplayed())))
diff --git a/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt b/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt
index 7c86042db7cb..a3b8a1149948 100644
--- a/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt
+++ b/app/src/main/java/com/nmc/android/utils/CheckableThemeUtils.kt
@@ -3,19 +3,33 @@ package com.nmc.android.utils
 import android.content.res.ColorStateList
 import androidx.appcompat.widget.AppCompatCheckBox
 import androidx.appcompat.widget.SwitchCompat
-import androidx.core.graphics.drawable.DrawableCompat
-import androidx.core.widget.CompoundButtonCompat
-import com.owncloud.android.MainApp
+import androidx.core.content.res.ResourcesCompat
 import com.owncloud.android.R
 
 object CheckableThemeUtils {
     @JvmStatic
     fun tintCheckbox(vararg checkBoxes: AppCompatCheckBox) {
         for (checkBox in checkBoxes) {
-            val checkEnabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_checked_enabled)
-            val checkDisabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_checked_disabled)
-            val uncheckEnabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_unchecked_enabled)
-            val uncheckDisabled = MainApp.getAppContext().resources.getColor(R.color.checkbox_unchecked_disabled)
+            val checkEnabled = ResourcesCompat.getColor(
+                checkBox.context.resources,
+                R.color.checkbox_checked_enabled,
+                checkBox.context.theme
+            )
+            val checkDisabled = ResourcesCompat.getColor(
+                checkBox.context.resources,
+                R.color.checkbox_checked_disabled,
+                checkBox.context.theme
+            )
+            val uncheckEnabled = ResourcesCompat.getColor(
+                checkBox.context.resources,
+                R.color.checkbox_unchecked_enabled,
+                checkBox.context.theme
+            )
+            val uncheckDisabled = ResourcesCompat.getColor(
+                checkBox.context.resources,
+                R.color.checkbox_unchecked_disabled,
+                checkBox.context.theme
+            )
 
             val states = arrayOf(
                 intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked),
@@ -29,8 +43,7 @@ object CheckableThemeUtils {
                 uncheckEnabled,
                 uncheckDisabled
             )
-            val checkColorStateList = ColorStateList(states, colors)
-            CompoundButtonCompat.setButtonTintList(checkBox, checkColorStateList)
+            checkBox.buttonTintList = ColorStateList(states, colors)
         }
     }
 
@@ -40,47 +53,65 @@ object CheckableThemeUtils {
         if (colorText) {
             switchView.setTextColor(color)
         }
-        val thumbColorCheckedEnabled = MainApp.getAppContext().resources.getColor(R.color.switch_thumb_checked_enabled)
-        val thumbColorUncheckedEnabled =
-            MainApp.getAppContext().resources.getColor(R.color.switch_thumb_unchecked_enabled)
-        val thumbColorCheckedDisabled =
-            MainApp.getAppContext().resources.getColor(R.color.switch_thumb_checked_disabled)
-        val thumbColorUncheckedDisabled =
-            MainApp.getAppContext().resources.getColor(R.color.switch_thumb_unchecked_disabled)
 
         val states = arrayOf(
             intArrayOf(android.R.attr.state_enabled, android.R.attr.state_checked),
-            intArrayOf(-android.R.attr.state_enabled, android.R.attr.state_checked),
             intArrayOf(android.R.attr.state_enabled, -android.R.attr.state_checked),
-            intArrayOf(-android.R.attr.state_enabled, -android.R.attr.state_checked)
+            intArrayOf(-android.R.attr.state_enabled)
         )
+
+        val thumbColorCheckedEnabled = ResourcesCompat.getColor(
+            switchView.context.resources,
+            R.color.switch_thumb_checked_enabled,
+            switchView.context.theme
+        )
+        val thumbColorUncheckedEnabled =
+            ResourcesCompat.getColor(
+                switchView.context.resources,
+                R.color.switch_thumb_unchecked_enabled,
+                switchView.context.theme
+            )
+        val thumbColorDisabled =
+            ResourcesCompat.getColor(
+                switchView.context.resources,
+                R.color.switch_thumb_disabled,
+                switchView.context.theme
+            )
+
         val thumbColors = intArrayOf(
             thumbColorCheckedEnabled,
-            thumbColorCheckedDisabled,
             thumbColorUncheckedEnabled,
-            thumbColorUncheckedDisabled
+            thumbColorDisabled
         )
         val thumbColorStateList = ColorStateList(states, thumbColors)
-        val trackColorCheckedEnabled = MainApp.getAppContext().resources.getColor(R.color.switch_track_checked_enabled)
+
+        val trackColorCheckedEnabled = ResourcesCompat.getColor(
+            switchView.context.resources,
+            R.color.switch_track_checked_enabled,
+            switchView.context.theme
+        )
         val trackColorUncheckedEnabled =
-            MainApp.getAppContext().resources.getColor(R.color.switch_track_unchecked_enabled)
-        val trackColorCheckedDisabled =
-            MainApp.getAppContext().resources.getColor(R.color.switch_track_checked_disabled)
-        val trackColorUncheckedDisabled =
-            MainApp.getAppContext().resources.getColor(R.color.switch_track_unchecked_disabled)
+            ResourcesCompat.getColor(
+                switchView.context.resources,
+                R.color.switch_track_unchecked_enabled,
+                switchView.context.theme
+            )
+        val trackColorDisabled =
+            ResourcesCompat.getColor(
+                switchView.context.resources,
+                R.color.switch_track_disabled,
+                switchView.context.theme
+            )
 
         val trackColors = intArrayOf(
             trackColorCheckedEnabled,
-            trackColorCheckedDisabled,
             trackColorUncheckedEnabled,
-            trackColorUncheckedDisabled
+            trackColorDisabled
         )
-        val trackColorStateList = ColorStateList(states, trackColors)
 
-        // setting the thumb color
-        DrawableCompat.setTintList(switchView.thumbDrawable, thumbColorStateList)
+        val trackColorStateList = ColorStateList(states, trackColors)
 
-        // setting the track color
-        DrawableCompat.setTintList(switchView.trackDrawable, trackColorStateList)
+        switchView.thumbTintList = thumbColorStateList
+        switchView.trackTintList = trackColorStateList
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
index 2042d38e38d3..e384a579b693 100644
--- a/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
+++ b/app/src/main/java/com/owncloud/android/ui/activity/FileActivity.java
@@ -945,7 +945,7 @@ protected void doShareWith(String shareeName, ShareType shareType) {
             //if user sharing from Preview Image Fragment
             fragment = getSupportFragmentManager().findFragmentByTag(ShareActivity.TAG_SHARE_FRAGMENT);
             if (fragment != null) {
-                ((FileDetailSharingFragment) fragment).initiateSharingProcess(shareeName, shareType);
+                ((FileDetailSharingFragment) fragment).initiateSharingProcess(shareeName, shareType, usersAndGroupsSearchConfig.getSearchOnlyUsers());
             }
         }
     }
diff --git a/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt b/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt
index c6f57dd75aeb..749cea654633 100644
--- a/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt
+++ b/app/src/main/java/com/owncloud/android/ui/dialog/SendShareDialog.kt
@@ -12,7 +12,6 @@ import com.google.android.material.bottomsheet.BottomSheetBehavior
 import com.google.android.material.bottomsheet.BottomSheetDialog
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment
 import com.google.android.material.snackbar.Snackbar
-import com.nextcloud.android.common.ui.theme.utils.ColorRole
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.client.utils.IntentUtil.createSendIntent
 import com.nextcloud.utils.extensions.getParcelableArgument
@@ -85,7 +84,6 @@ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment),
         binding.btnShare.setOnClickListener { shareFile(file) }
         binding.btnLink.setOnClickListener { shareByLink() }
 
-        applyTintColor()
         setupBottomSheetBehaviour()
         checkButtonVisibilities()
         setupSendButtonRecyclerView()
@@ -109,12 +107,6 @@ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment),
         bottomSheetDialog.behavior.skipCollapsed = true
     }
 
-    private fun applyTintColor() {
-        viewThemeUtils?.material?.colorMaterialButtonPrimaryFilled(binding.btnLink)
-        viewThemeUtils?.material?.colorMaterialButtonPrimaryFilled(binding.btnShare)
-        viewThemeUtils?.platform?.colorViewBackground(binding.bottomSheet, ColorRole.SURFACE)
-    }
-
     @Suppress("MagicNumber")
     private fun checkButtonVisibilities() {
         if (hideNcSharingOptions) {
@@ -138,6 +130,9 @@ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment),
     }
 
     private fun shareByLink() {
+        // NMC Customization
+        isPeopleShareClicked = false
+
         val fileOperationsHelper = (requireActivity() as FileActivity).fileOperationsHelper
 
         if (file?.isSharedViaLink == true) {
@@ -221,6 +216,9 @@ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment),
     }
 
     private fun shareFile(file: OCFile?) {
+        // NMC Customization
+        isPeopleShareClicked = true
+
         dismiss()
 
         if (activity is FileDisplayActivity) {
@@ -247,6 +245,11 @@ class SendShareDialog : BottomSheetDialogFragment(R.layout.send_share_fragment),
         const val PACKAGE_NAME = "PACKAGE_NAME"
         const val ACTIVITY_NAME = "ACTIVITY_NAME"
 
+        // TODO: 06/21/23 remove this condition after Comments section included
+        // flag to avoid crash during creating new link share for a file for which link share already exist
+        @JvmField
+        var isPeopleShareClicked = false
+
         @JvmStatic
         fun newInstance(file: OCFile?, hideNcSharingOptions: Boolean, capability: OCCapability): SendShareDialog {
             val dialogFragment = SendShareDialog()
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
index 82c775300cae..fec435eab0a0 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java
@@ -30,6 +30,7 @@
 import android.content.Context;
 import android.content.res.ColorStateList;
 import android.graphics.Bitmap;
+import android.graphics.PorterDuff;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -95,6 +96,7 @@
 import androidx.annotation.IdRes;
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
+import androidx.core.content.ContextCompat;
 import androidx.core.content.res.ResourcesCompat;
 import androidx.fragment.app.FragmentManager;
 
@@ -547,11 +549,17 @@ private void setFileModificationTimestamp(OCFile file, boolean showDetailedTimes
 
     private void setFavoriteIconStatus(boolean isFavorite) {
         if (isFavorite) {
-            binding.favorite.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.ic_star, null));
+            binding.favorite.setImageDrawable(ResourcesCompat.getDrawable(getResources(), R.drawable.favorite, null));
         } else {
             binding.favorite.setImageDrawable(ResourcesCompat.getDrawable(getResources(),
-                                                                          R.drawable.ic_star_outline,
-                                                                          null));
+                                                                      R.drawable.ic_star_outline,
+                                                                      null));
+
+            //NMC Customization
+            binding.favorite.getDrawable().mutate().setColorFilter(requireContext()
+                                                                       .getResources()
+                                                                       .getColor(R.color.list_item_lastmod_and_filesize_text, null),
+                                                                   PorterDuff.Mode.SRC_IN);
         }
     }
 
@@ -574,13 +582,12 @@ private void setFilePreview(OCFile file) {
 
         if (toolbarActivity != null) {
             if (file.isFolder()) {
-                toolbarActivity.setPreviewImageDrawable(MimeTypeUtil
-                                                            .getFolderTypeIcon(file.isSharedWithMe() || file.isSharedWithSharee(),
-                                                                               file.isSharedViaLink(), file.isEncrypted(),
-                                                                               file.isGroupFolder(),
-                                                                               syncedFolderProvider.findByRemotePathAndAccount(file.getRemotePath(), user),
-                                                                               file.getMountType(), requireContext(),
-                                                                               viewThemeUtils));
+                boolean isAutoUploadFolder = SyncedFolderProvider.isAutoUploadFolder(syncedFolderProvider, file, user);
+
+                Integer overlayIconId = file.getFileOverlayIconId(isAutoUploadFolder);
+                // NMC Customization: No overlay icon will be used. Directly using folder icons
+                toolbarActivity.setPreviewImageDrawable(ContextCompat.getDrawable(requireContext(), overlayIconId));
+
                 int leftRightPadding = requireContext().getResources().getDimensionPixelSize(R.dimen.standard_padding);
                 updatePreviewImageUI(leftRightPadding);
 
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
index 0d1cc0a5fe15..cbd35f626133 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailSharingFragment.java
@@ -28,12 +28,16 @@
 import android.Manifest;
 import android.accounts.AccountManager;
 import android.annotation.SuppressLint;
+import android.app.Activity;
 import android.app.SearchManager;
 import android.content.Context;
+import android.content.Intent;
 import android.content.res.Configuration;
+import android.database.Cursor;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
+import android.provider.ContactsContract;
 import android.text.TextUtils;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -188,6 +192,8 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container,
 
         binding.sharesList.setLayoutManager(new LinearLayoutManager(requireContext()));
 
+        binding.pickContactEmailBtn.setOnClickListener(v -> checkContactPermission());
+
         binding.shareCreateNewLink.setOnClickListener(v -> createPublicShareLink());
 
         //remove focus from search view on click of root view
@@ -250,6 +256,7 @@ private void setUpSearchView() {
         binding.searchView.setQueryHint(getResources().getString(R.string.share_search));
         binding.searchView.setVisibility(View.VISIBLE);
         binding.labelPersonalShare.setVisibility(View.VISIBLE);
+        binding.pickContactEmailBtn.setVisibility(View.VISIBLE);
 
         binding.searchView.setOnQueryTextFocusChangeListener((view, hasFocus) -> {
             isSearchViewFocused = hasFocus;
@@ -315,11 +322,12 @@ private void hideAppBar() {
      * @param shareeName
      * @param shareType
      */
-    public void initiateSharingProcess(String shareeName, ShareType shareType) {
+    public void initiateSharingProcess(String shareeName, ShareType shareType, boolean secureShare) {
         requireActivity().getSupportFragmentManager().beginTransaction().replace(R.id.share_fragment_container,
                                                                                  FileDetailsSharingProcessFragment.newInstance(file,
                                                                                                                                shareeName,
                                                                                                                                shareType,
+                                                                                                                               secureShare,
                                                                                                                                SharingMenuHelper.canEditFile(requireActivity(), user, capabilities, file, editorUtils)),
                                                                                  FileDetailsSharingProcessFragment.TAG)
             .addToBackStack(null)
@@ -365,9 +373,10 @@ private void setShareWithYou() {
 
             String note = file.getNote();
 
+            //NMC Customization --> Share with me note container is not required
             if (!TextUtils.isEmpty(note)) {
                 binding.sharedWithYouNote.setText(file.getNote());
-                binding.sharedWithYouNoteContainer.setVisibility(View.VISIBLE);
+                binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
             } else {
                 binding.sharedWithYouNoteContainer.setVisibility(View.GONE);
             }
@@ -378,6 +387,7 @@ private void setShareWithYou() {
             } else {
                 binding.searchView.setVisibility(View.GONE);
                 binding.labelPersonalShare.setVisibility(View.GONE);
+                binding.pickContactEmailBtn.setVisibility(View.GONE);
                 binding.shareCreateNewLink.setVisibility(View.GONE);
                 binding.tvSharingDetailsMessage.setText(getResources().getString(R.string.reshare_not_allowed));
             }
@@ -572,6 +582,7 @@ public void refreshSharesFromDB() {
                                                                                    ShareType.PUBLIC_LINK,
                                                                                    "");
 
+        // NMC Customization: Not required for NMC
         /*if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares()) &&
             (!file.isEncrypted() || capabilities.getEndToEndEncryption().isTrue())) {
             final OCShare ocShare = new OCShare();
@@ -581,14 +592,6 @@ public void refreshSharesFromDB() {
             adapter.removeNewPublicShare();
         }*/
 
-        if (publicShares.isEmpty() && containsNoNewPublicShare(adapter.getShares())) {
-            final OCShare ocShare = new OCShare();
-            ocShare.setShareType(ShareType.NEW_PUBLIC_LINK);
-            publicShares.add(ocShare);
-        } else {
-            adapter.removeNewPublicShare();
-        }
-
         adapter.addShares(publicShares);
 
         showHideView((shares == null || shares.isEmpty()) && (publicShares == null || publicShares.isEmpty()));
diff --git a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
index d274b03fd06d..273ac18408e1 100644
--- a/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
+++ b/app/src/main/java/com/owncloud/android/ui/fragment/FileDetailsSharingProcessFragment.kt
@@ -24,14 +24,19 @@ package com.owncloud.android.ui.fragment
 import android.content.Context
 import android.content.res.Configuration
 import android.os.Bundle
+import android.os.Handler
+import android.os.Looper
 import android.text.TextUtils
 import android.view.LayoutInflater
+import android.view.MotionEvent
 import android.view.View
 import android.view.ViewGroup
+import android.widget.RadioGroup
 import androidx.fragment.app.Fragment
 import com.nextcloud.client.di.Injectable
 import com.nextcloud.utils.extensions.getParcelableArgument
 import com.nextcloud.utils.extensions.getSerializableArgument
+import com.nmc.android.utils.CheckableThemeUtils
 import com.owncloud.android.R
 import com.owncloud.android.databinding.FileDetailsSharingProcessFragmentBinding
 import com.owncloud.android.datamodel.OCFile
@@ -39,11 +44,13 @@ import com.owncloud.android.lib.resources.shares.OCShare
 import com.owncloud.android.lib.resources.shares.SharePermissionsBuilder
 import com.owncloud.android.lib.resources.shares.ShareType
 import com.owncloud.android.ui.activity.FileActivity
+import com.owncloud.android.ui.activity.ToolbarActivity
 import com.owncloud.android.ui.dialog.ExpirationDatePickerDialogFragment
 import com.owncloud.android.ui.fragment.util.SharingMenuHelper
 import com.owncloud.android.ui.helpers.FileOperationsHelper
 import com.owncloud.android.utils.ClipboardUtil
 import com.owncloud.android.utils.DisplayUtils
+import com.owncloud.android.utils.KeyboardUtils
 import com.owncloud.android.utils.theme.ViewThemeUtils
 import java.text.SimpleDateFormat
 import java.util.Date
@@ -61,7 +68,8 @@ import javax.inject.Inject
 class FileDetailsSharingProcessFragment :
     Fragment(),
     Injectable,
-    ExpirationDatePickerDialogFragment.OnExpiryDateListener {
+    ExpirationDatePickerDialogFragment.OnExpiryDateListener,
+    RadioGroup.OnCheckedChangeListener {
 
     companion object {
         const val TAG = "FileDetailsSharingProcessFragment"
@@ -73,6 +81,7 @@ class FileDetailsSharingProcessFragment :
         private const val ARG_RESHARE_SHOWN = "arg_reshare_shown"
         private const val ARG_EXP_DATE_SHOWN = "arg_exp_date_shown"
         private const val ARG_SECURE_SHARE = "secure_share"
+        private const val ARG_IS_TEXT_FILE = "is_text_file"
 
         // types of screens to be displayed
         const val SCREEN_TYPE_PERMISSION = 1 // permissions screen
@@ -86,13 +95,15 @@ class FileDetailsSharingProcessFragment :
             file: OCFile,
             shareeName: String,
             shareType: ShareType,
-            secureShare: Boolean
+            secureShare: Boolean,
+            isTextFile: Boolean
         ): FileDetailsSharingProcessFragment {
             val args = Bundle()
             args.putParcelable(ARG_OCFILE, file)
             args.putSerializable(ARG_SHARE_TYPE, shareType)
             args.putString(ARG_SHAREE_NAME, shareeName)
             args.putBoolean(ARG_SECURE_SHARE, secureShare)
+            args.putBoolean(ARG_IS_TEXT_FILE, isTextFile)
             val fragment = FileDetailsSharingProcessFragment()
             fragment.arguments = args
             return fragment
@@ -102,13 +113,20 @@ class FileDetailsSharingProcessFragment :
          * fragment instance to be called while modifying existing share information
          */
         @JvmStatic
-        fun newInstance(share: OCShare, screenType: Int, isReshareShown: Boolean, isExpirationDateShown: Boolean):
+        fun newInstance(
+            share: OCShare,
+            screenType: Int,
+            isReshareShown: Boolean,
+            isExpirationDateShown: Boolean,
+            isTextFile: Boolean
+        ):
             FileDetailsSharingProcessFragment {
             val args = Bundle()
             args.putParcelable(ARG_OCSHARE, share)
             args.putInt(ARG_SCREEN_TYPE, screenType)
             args.putBoolean(ARG_RESHARE_SHOWN, isReshareShown)
             args.putBoolean(ARG_EXP_DATE_SHOWN, isExpirationDateShown)
+            args.putBoolean(ARG_IS_TEXT_FILE, isTextFile)
             val fragment = FileDetailsSharingProcessFragment()
             fragment.arguments = args
             return fragment
@@ -117,6 +135,8 @@ class FileDetailsSharingProcessFragment :
 
     @Inject
     lateinit var viewThemeUtils: ViewThemeUtils
+    @Inject
+    lateinit var keyboardUtils: KeyboardUtils
 
     private lateinit var onEditShareListener: FileDetailSharingFragment.OnEditShareListener
 
@@ -130,14 +150,23 @@ class FileDetailsSharingProcessFragment :
     private var shareProcessStep = SCREEN_TYPE_PERMISSION // default screen type
     private var permission = OCShare.NO_PERMISSION // no permission
     private var chosenExpDateInMills: Long = -1 // for no expiry date
+    private var isTextFile: Boolean = false
 
     private var share: OCShare? = null
     private var isReShareShown: Boolean = true // show or hide reShare option
     private var isExpDateShown: Boolean = true // show or hide expiry date option
     private var isSecureShare: Boolean = false
+    private var isDownloadCountFetched: Boolean = false
 
     private var expirationDatePickerFragment: ExpirationDatePickerDialogFragment? = null
 
+    private var isHideDownloadCheckedReadOnly: Boolean = false
+    private var isHideDownloadCheckedUploadEdit: Boolean = false
+
+    private var isFileDropSelected: Boolean = false
+    private var isReadOnlySelected: Boolean = false
+    private var isUploadEditingSelected: Boolean = false
+
     override fun onAttach(context: Context) {
         super.onAttach(context)
         try {
@@ -165,6 +194,7 @@ class FileDetailsSharingProcessFragment :
             isReShareShown = it.getBoolean(ARG_RESHARE_SHOWN, true)
             isExpDateShown = it.getBoolean(ARG_EXP_DATE_SHOWN, true)
             isSecureShare = it.getBoolean(ARG_SECURE_SHARE, false)
+            isTextFile = it.getBoolean(ARG_IS_TEXT_FILE, false)
         }
 
         fileActivity = activity as FileActivity?
@@ -172,6 +202,27 @@ class FileDetailsSharingProcessFragment :
         requireNotNull(fileActivity) { "FileActivity may not be null" }
     }
 
+    // Updating Hide Download enable/disable on selection of FileDrop
+    override fun onCheckedChanged(group: RadioGroup?, checkId: Int) {
+        if (binding.shareProcessPermissionFileDrop.id == checkId) {
+            isFileDropSelected = true
+            binding.shareProcessHideDownloadCheckbox.isChecked = true
+            binding.shareProcessHideDownloadCheckbox.isEnabled = false
+        } else {
+            isFileDropSelected = false
+            binding.shareProcessHideDownloadCheckbox.isEnabled = true
+            if (binding.shareProcessPermissionReadOnly.id == checkId) {
+                isReadOnlySelected = true
+                isUploadEditingSelected = false
+                binding.shareProcessHideDownloadCheckbox.isChecked = isHideDownloadCheckedReadOnly
+            } else if (binding.shareProcessPermissionUploadEditing.id == checkId) {
+                isReadOnlySelected = false
+                isUploadEditingSelected = true
+                binding.shareProcessHideDownloadCheckbox.isChecked = isHideDownloadCheckedUploadEdit
+            }
+        }
+    }
+
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View {
         binding = FileDetailsSharingProcessFragmentBinding.inflate(inflater, container, false)
         fileOperationsHelper = fileActivity?.fileOperationsHelper
@@ -181,36 +232,43 @@ class FileDetailsSharingProcessFragment :
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         if (shareProcessStep == SCREEN_TYPE_PERMISSION) {
+            binding.shareProcessPermissionReadOnly.isChecked = true
             showShareProcessFirst()
         } else {
             showShareProcessSecond()
         }
+        //Set default value to 0 for download count
+        if (!isDownloadCountFetched) {
+            binding.shareProcessRemainingDownloadCountTv.text =
+                String.format(resources.getString(R.string.download_text), "0")
+        }
+        binding.shareProcessPermissionRadioGroup.setOnCheckedChangeListener(this)
         implementClickEvents()
-
+        binding.shareProcessHideDownloadCheckbox.setOnCheckedChangeListener { _, isChecked ->
+            if (!isFileDropSelected) {
+                if (isReadOnlySelected) {
+                    isHideDownloadCheckedReadOnly = isChecked
+                } else if (isUploadEditingSelected) {
+                    isHideDownloadCheckedUploadEdit = isChecked
+                }
+            }
+        }
         themeView()
     }
+    private fun scrollTopShowToolbar() {
+        //show the toolbar if it is hidden due to scrolling
+        if (requireActivity() is ToolbarActivity) {
+            (requireActivity() as ToolbarActivity).expandToolbar()
+        }
+    }
 
     private fun themeView() {
-        viewThemeUtils.platform.colorTextView(binding.shareProcessEditShareLink)
-        viewThemeUtils.platform.colorTextView(binding.shareProcessAdvancePermissionTitle)
-
-        viewThemeUtils.platform.themeRadioButton(binding.shareProcessPermissionReadOnly)
-        viewThemeUtils.platform.themeRadioButton(binding.shareProcessPermissionUploadEditing)
-        viewThemeUtils.platform.themeRadioButton(binding.shareProcessPermissionFileDrop)
-
-        viewThemeUtils.platform.themeCheckbox(binding.shareProcessAllowResharingCheckbox)
-
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessSetPasswordSwitch)
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessSetExpDateSwitch)
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessHideDownloadCheckbox)
-        viewThemeUtils.androidx.colorSwitchCompat(binding.shareProcessChangeNameSwitch)
-
-        viewThemeUtils.material.colorTextInputLayout(binding.shareProcessEnterPasswordContainer)
-        viewThemeUtils.material.colorTextInputLayout(binding.shareProcessChangeNameContainer)
-        viewThemeUtils.material.colorTextInputLayout(binding.noteContainer)
-
-        viewThemeUtils.material.colorMaterialButtonPrimaryFilled(binding.shareProcessBtnNext)
-        viewThemeUtils.material.colorMaterialButtonPrimaryOutlined(binding.shareProcessBtnCancel)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessSetPasswordSwitch)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessAllowResharingCheckbox)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessSetExpDateSwitch)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessHideDownloadCheckbox)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessChangeNameSwitch)
+        CheckableThemeUtils.tintSwitch(binding.shareProcessDownloadLimitSwitch)
     }
 
     override fun onConfigurationChanged(newConfig: Configuration) {
@@ -227,9 +285,10 @@ class FileDetailsSharingProcessFragment :
     }
 
     private fun showShareProcessFirst() {
+        scrollTopShowToolbar()
         binding.shareProcessGroupOne.visibility = View.VISIBLE
-        binding.shareProcessEditShareLink.visibility = View.VISIBLE
         binding.shareProcessGroupTwo.visibility = View.GONE
+        binding.tvSetPasswordEmailWarning.visibility = View.GONE
 
         if (share != null) {
             setupModificationUI()
@@ -244,13 +303,17 @@ class FileDetailsSharingProcessFragment :
         // show or hide expiry date
         if (isExpDateShown && !isSecureShare) {
             binding.shareProcessSetExpDateSwitch.visibility = View.VISIBLE
+            binding.dividerSharingExpDate.visibility = View.VISIBLE
         } else {
             binding.shareProcessSetExpDateSwitch.visibility = View.GONE
+            binding.dividerSharingExpDate.visibility = View.GONE
         }
         shareProcessStep = SCREEN_TYPE_PERMISSION
     }
 
     private fun setupModificationUI() {
+        binding.shareProcessBtnNext.text = requireContext().resources.getString(R.string.common_confirm)
+
         if (share?.isFolder == true) updateViewForFolder() else updateViewForFile()
 
         // read only / allow upload and editing / file drop
@@ -263,19 +326,6 @@ class FileDetailsSharingProcessFragment :
         }
 
         shareType = share?.shareType ?: ShareType.NO_SHARED
-
-        // show different text for link share and other shares
-        // because we have link to share in Public Link
-        val resources = requireContext().resources
-
-        binding.shareProcessBtnNext.text = resources.getString(
-            if (shareType == ShareType.PUBLIC_LINK) {
-                R.string.share_copy_link
-            } else {
-                R.string.common_confirm
-            }
-        )
-
         updateViewForShareType()
         binding.shareProcessSetPasswordSwitch.isChecked = share?.isPasswordProtected == true
         showPasswordInput(binding.shareProcessSetPasswordSwitch.isChecked)
@@ -314,24 +364,44 @@ class FileDetailsSharingProcessFragment :
     }
 
     private fun updateViewForExternalShare() {
-        binding.shareProcessChangeNameSwitch.visibility = View.GONE
-        binding.shareProcessChangeNameContainer.visibility = View.GONE
+        hideLinkLabelViews()
         updateViewForExternalAndLinkShare()
+        updateFileEditingRadioButton()
     }
 
     private fun updateViewForLinkShare() {
         updateViewForExternalAndLinkShare()
         binding.shareProcessChangeNameSwitch.visibility = View.VISIBLE
+        binding.dividerSharingChangeName.visibility = View.VISIBLE
         if (share != null) {
-            binding.shareProcessChangeName.setText(share?.label)
+            binding.shareProcessChangeNameEt.setText(share?.label)
             binding.shareProcessChangeNameSwitch.isChecked = !TextUtils.isEmpty(share?.label)
         }
         showChangeNameInput(binding.shareProcessChangeNameSwitch.isChecked)
+
+        //download limit will only be available for files
+        if (share?.isFolder == false || file?.isFolder == false) {
+            binding.shareProcessDownloadLimitSwitch.visibility = View.VISIBLE
+            binding.dividerSharingDownloadLimit.visibility = View.VISIBLE
+
+            //fetch the download limit for link share
+            fetchDownloadLimitForShareLink()
+        } else {
+            binding.shareProcessDownloadLimitSwitch.visibility = View.GONE
+            binding.dividerSharingDownloadLimit.visibility = View.GONE
+        }
+
+        //the input for download limit will be hidden initially
+        //and can be visible back or no depending on the api result
+        //from the download limit api
+        binding.shareProcessDownloadLimitEt.visibility = View.GONE
+        binding.shareProcessRemainingDownloadCountTv.visibility = View.GONE
+
+        updateFileEditingRadioButton()
     }
 
     private fun updateViewForInternalShare() {
-        binding.shareProcessChangeNameSwitch.visibility = View.GONE
-        binding.shareProcessChangeNameContainer.visibility = View.GONE
+        hideLinkLabelViews()
         binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
         if (isSecureShare) {
             binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
@@ -345,6 +415,35 @@ class FileDetailsSharingProcessFragment :
                 binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
             }
             binding.shareProcessAllowResharingCheckbox.isChecked = SharingMenuHelper.canReshare(share)
+            if (share?.isFolder == true) {
+                hideFileDropView()
+            }
+        } else if (file?.isFolder == true) {
+            hideFileDropView()
+        }
+    }
+
+    private fun hideFileDropView() {
+        //no file drop for internal share due to 403 bad request api issue
+        binding.shareProcessPermissionFileDrop.visibility = View.GONE
+        binding.shareFileDropInfo.visibility = View.GONE
+    }
+
+    private fun hideLinkLabelViews() {
+        binding.shareProcessChangeNameSwitch.visibility = View.GONE
+        binding.shareProcessChangeNameEt.visibility = View.GONE
+        binding.dividerSharingChangeName.visibility = View.GONE
+
+        binding.shareProcessDownloadLimitSwitch.visibility = View.GONE
+        binding.shareProcessDownloadLimitEt.visibility = View.GONE
+        binding.shareProcessRemainingDownloadCountTv.visibility = View.GONE
+        binding.dividerSharingDownloadLimit.visibility = View.GONE
+    }
+
+    private fun updateFileEditingRadioButton() {
+        if (!isTextFile) {
+            binding.shareProcessPermissionUploadEditing.isEnabled = false
+            binding.shareProcessPermissionUploadEditing.setTextColor(resources.getColor(R.color.share_disabled_txt_color))
         }
     }
 
@@ -352,15 +451,22 @@ class FileDetailsSharingProcessFragment :
      * update views where share type external or link share
      */
     private fun updateViewForExternalAndLinkShare() {
-        binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
+        binding.shareProcessHideDownloadCheckbox.isEnabled = true
+        binding.dividerSharingHideDownload.visibility = View.VISIBLE
         binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
+        binding.shareProcessAllowResharingInfo.visibility = View.GONE
+        binding.dividerSharingAllowResharing.visibility = View.GONE
         binding.shareProcessSetPasswordSwitch.visibility = View.VISIBLE
+        binding.dividerSharingEnterPassword.visibility = View.VISIBLE
 
         if (share != null) {
             if (SharingMenuHelper.isFileDrop(share)) {
-                binding.shareProcessHideDownloadCheckbox.visibility = View.GONE
+                binding.shareProcessHideDownloadCheckbox.isChecked = true
+                binding.shareProcessHideDownloadCheckbox.isEnabled = false
+                binding.dividerSharingHideDownload.visibility = View.GONE
             } else {
-                binding.shareProcessHideDownloadCheckbox.visibility = View.VISIBLE
+                binding.shareProcessHideDownloadCheckbox.isEnabled = true
+                binding.dividerSharingHideDownload.visibility = View.VISIBLE
                 binding.shareProcessHideDownloadCheckbox.isChecked = share?.isHideFileDownload == true
             }
         }
@@ -388,14 +494,17 @@ class FileDetailsSharingProcessFragment :
         binding.shareProcessPermissionUploadEditing.text =
             requireContext().resources.getString(R.string.link_share_editing)
         binding.shareProcessPermissionFileDrop.visibility = View.GONE
+        binding.shareFileDropInfo.visibility = View.GONE
     }
 
     private fun updateViewForFolder() {
         binding.shareProcessPermissionUploadEditing.text =
             requireContext().resources.getString(R.string.link_share_allow_upload_and_editing)
         binding.shareProcessPermissionFileDrop.visibility = View.VISIBLE
+        binding.shareFileDropInfo.visibility = View.VISIBLE
         if (isSecureShare) {
             binding.shareProcessPermissionFileDrop.visibility = View.GONE
+            binding.shareFileDropInfo.visibility = View.GONE
             binding.shareProcessAllowResharingCheckbox.visibility = View.GONE
             binding.shareProcessSetExpDateSwitch.visibility = View.GONE
         }
@@ -405,15 +514,25 @@ class FileDetailsSharingProcessFragment :
      * update views for screen type Note
      */
     private fun showShareProcessSecond() {
+        scrollTopShowToolbar()
         binding.shareProcessGroupOne.visibility = View.GONE
-        binding.shareProcessEditShareLink.visibility = View.GONE
         binding.shareProcessGroupTwo.visibility = View.VISIBLE
         if (share != null) {
-            binding.shareProcessBtnNext.text = requireContext().resources.getString(R.string.set_note)
+            binding.shareProcessBtnNext.text = requireContext().resources.getString(R.string.send_email)
             binding.noteText.setText(share?.note)
+
+            //show the warning label if password protection is enabled
+            /* binding.tvSetPasswordEmailWarning.visibility =
+                 if (share?.isPasswordProtected == true) View.VISIBLEF
+                 else View.GONE*/
         } else {
             binding.shareProcessBtnNext.text = requireContext().resources.getString(R.string.send_share)
             binding.noteText.setText("")
+
+            //show the warning label if password protection is enabled
+            /* binding.tvSetPasswordEmailWarning.visibility =
+                 if (binding.shareProcessSetPasswordSwitch.isChecked) View.VISIBLE
+                 else View.GONE*/
         }
         shareProcessStep = SCREEN_TYPE_NOTE
     }
@@ -441,6 +560,17 @@ class FileDetailsSharingProcessFragment :
         binding.shareProcessSelectExpDate.setOnClickListener {
             showExpirationDateDialog()
         }
+        binding.shareProcessDownloadLimitSwitch.setOnCheckedChangeListener { _, isChecked ->
+            showDownloadLimitInput(isChecked)
+        }
+        binding.noteText.setOnTouchListener { view, event ->
+            view.parent.requestDisallowInterceptTouchEvent(true)
+            if ((event.action and MotionEvent.ACTION_MASK) == MotionEvent.ACTION_UP) {
+                view.parent.requestDisallowInterceptTouchEvent(false)
+            }
+            return@setOnTouchListener false
+        }
+
     }
 
     private fun showExpirationDateDialog(chosenDateInMillis: Long = chosenExpDateInMills) {
@@ -456,13 +586,30 @@ class FileDetailsSharingProcessFragment :
     }
 
     private fun showChangeNameInput(isChecked: Boolean) {
-        binding.shareProcessChangeNameContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
+        binding.shareProcessChangeNameEt.visibility = if (isChecked) View.VISIBLE else View.GONE
+        if (!isChecked) {
+            binding.shareProcessChangeNameEt.setText("")
+            //hide keyboard when user unchecks
+            hideKeyboard()
+        }
+    }
+
+    private fun showDownloadLimitInput(isChecked: Boolean) {
+        binding.shareProcessDownloadLimitEt.visibility = if (isChecked) View.VISIBLE else View.GONE
+        binding.shareProcessRemainingDownloadCountTv.visibility = if (isChecked) View.VISIBLE else View.GONE
         if (!isChecked) {
-            binding.shareProcessChangeName.setText("")
+            binding.shareProcessDownloadLimitEt.setText("")
+            if (!isDownloadCountFetched) {
+                binding.shareProcessRemainingDownloadCountTv.text = String.format(resources.getString(R.string.download_text), "0")
+            }
+            //hide keyboard when user unchecks
+            hideKeyboard()
         }
     }
 
     private fun onCancelClick() {
+        // hide keyboard when user clicks cancel button
+        hideKeyboard()
         // if modifying the existing share then on back press remove the current fragment
         if (share != null) {
             removeCurrentFragment()
@@ -482,6 +629,13 @@ class FileDetailsSharingProcessFragment :
         binding.shareProcessSelectExpDate.visibility = if (isChecked) View.VISIBLE else View.GONE
         binding.shareProcessExpDateDivider.visibility = if (isChecked) View.VISIBLE else View.GONE
 
+        //update margin of divider when switch is enabled/disabled
+        val margin = if (isChecked) requireContext().resources.getDimensionPixelOffset(R.dimen.standard_half_margin)
+        else 0
+        val param = binding.dividerSharingExpDate.layoutParams as ViewGroup.MarginLayoutParams
+        param.setMargins(0, margin, 0, 0)
+        binding.dividerSharingExpDate.layoutParams = param
+
         // reset the expiration date if switch is unchecked
         if (!isChecked) {
             chosenExpDateInMills = -1
@@ -490,17 +644,28 @@ class FileDetailsSharingProcessFragment :
     }
 
     private fun showPasswordInput(isChecked: Boolean) {
-        binding.shareProcessEnterPasswordContainer.visibility = if (isChecked) View.VISIBLE else View.GONE
+        binding.shareProcessEnterPassword.visibility = if (isChecked) View.VISIBLE else View.GONE
 
         // reset the password if switch is unchecked
         if (!isChecked) {
             binding.shareProcessEnterPassword.setText("")
+            // hide keyboard when user unchecks
+            hideKeyboard()
         }
     }
 
+    private fun hideKeyboard() {
+        if (this::binding.isInitialized) {
+            keyboardUtils.hideKeyboardFrom(requireContext(), binding.root)
+        }
+    }
+
+    /**
+     * remove the fragment and pop it from backstack because we are adding it to backstack
+     */
     private fun removeCurrentFragment() {
-        onEditShareListener.onShareProcessClosed()
-        fileActivity?.supportFragmentManager?.beginTransaction()?.remove(this)?.commit()
+        requireActivity().supportFragmentManager.beginTransaction().remove(this).commit()
+        requireActivity().supportFragmentManager.popBackStack()
     }
 
     private fun getReSharePermission(): Int {
@@ -514,6 +679,7 @@ class FileDetailsSharingProcessFragment :
      */
     @Suppress("ReturnCount")
     private fun validateShareProcessFirst() {
+        hideKeyboard()
         permission = getSelectedPermission()
         if (permission == OCShare.NO_PERMISSION) {
             DisplayUtils.showSnackMessage(binding.root, R.string.no_share_permission_selected)
@@ -535,12 +701,23 @@ class FileDetailsSharingProcessFragment :
         }
 
         if (binding.shareProcessChangeNameSwitch.isChecked &&
-            binding.shareProcessChangeName.text?.trim().isNullOrEmpty()
+            binding.shareProcessChangeNameEt.text?.trim().isNullOrEmpty()
         ) {
             DisplayUtils.showSnackMessage(binding.root, R.string.label_empty)
             return
         }
 
+        if (binding.shareProcessDownloadLimitSwitch.isChecked) {
+            val downloadLimit = binding.shareProcessDownloadLimitEt.text?.trim()
+            if (downloadLimit.isNullOrEmpty()) {
+                DisplayUtils.showSnackMessage(binding.root, R.string.download_limit_empty)
+                return
+            } else if (downloadLimit.toString().toLong() <= 0) {
+                DisplayUtils.showSnackMessage(binding.root, R.string.download_limit_zero)
+                return
+            }
+        }
+
         // if modifying existing share information then execute the process
         if (share != null) {
             updateShare()
@@ -558,8 +735,8 @@ class FileDetailsSharingProcessFragment :
         binding.shareProcessAllowResharingCheckbox.isChecked -> getReSharePermission()
         binding.shareProcessPermissionReadOnly.isChecked -> OCShare.READ_PERMISSION_FLAG
         binding.shareProcessPermissionUploadEditing.isChecked -> when {
-            file?.isFolder == true || share?.isFolder == true -> OCShare.MAXIMUM_PERMISSIONS_FOR_FOLDER
-            else -> OCShare.MAXIMUM_PERMISSIONS_FOR_FILE
+            file?.isFolder == true || share?.isFolder == true -> SharingMenuHelper.CAN_EDIT_PERMISSIONS_FOR_FOLDER
+            else -> SharingMenuHelper.CAN_EDIT_PERMISSIONS_FOR_FILE
         }
 
         binding.shareProcessPermissionFileDrop.isChecked -> OCShare.CREATE_PERMISSION_FLAG
@@ -573,7 +750,8 @@ class FileDetailsSharingProcessFragment :
             binding.shareProcessHideDownloadCheckbox.isChecked,
             binding.shareProcessEnterPassword.text.toString().trim(),
             chosenExpDateInMills,
-            binding.shareProcessChangeName.text.toString().trim()
+            binding.shareProcessChangeNameEt.text.toString().trim(),
+            binding.shareProcessDownloadLimitEt.text.toString().trim()
         )
         // copy the share link if available
         if (!TextUtils.isEmpty(share?.shareLink)) {
@@ -585,10 +763,14 @@ class FileDetailsSharingProcessFragment :
      * method to validate step 2 (note screen) information
      */
     private fun validateShareProcessSecond() {
-        val noteText = binding.noteText.text.toString().trim()
+        hideKeyboard()
         // if modifying existing share then directly update the note and send email
-        if (share != null && share?.note != noteText) {
-            fileOperationsHelper?.updateNoteToShare(share, noteText)
+        if (share != null) {
+            if (TextUtils.isEmpty(binding.noteText.text.toString().trim())) {
+                DisplayUtils.showSnackMessage(binding.root, R.string.share_link_empty_note_message)
+                return
+            }
+            fileOperationsHelper?.updateNoteToShare(share, binding.noteText.text.toString().trim())
         } else {
             // else create new share
             fileOperationsHelper?.shareFileWithSharee(
@@ -600,14 +782,27 @@ class FileDetailsSharingProcessFragment :
                     .shareProcessHideDownloadCheckbox.isChecked,
                 binding.shareProcessEnterPassword.text.toString().trim(),
                 chosenExpDateInMills,
-                noteText,
-                binding.shareProcessChangeName.text.toString().trim(),
+                binding.noteText.text.toString().trim(),
+                binding.shareProcessChangeNameEt.text.toString().trim(),
                 true
             )
         }
         removeCurrentFragment()
     }
 
+    /**
+     * fetch the download limit for the link share
+     * the response will be received in FileActivity --> onRemoteOperationFinish() method
+     */
+    private fun fetchDownloadLimitForShareLink() {
+        //need to call this method in handler else to show progress dialog it will throw exception
+        Handler(Looper.getMainLooper()).post {
+            share?.let {
+                fileOperationsHelper?.getShareDownloadLimit(it.token)
+            }
+        }
+    }
+
     /**
      * method will be called from DrawerActivity on back press to handle screen backstack
      */
@@ -628,4 +823,15 @@ class FileDetailsSharingProcessFragment :
     override fun onDateUnSet() {
         binding.shareProcessSetExpDateSwitch.isChecked = false
     }
+
+    /**
+     * will be called when download limit is fetched
+     */
+    fun onLinkShareDownloadLimitFetched(downloadLimit: Long, downloadCount: Long) {
+        binding.shareProcessDownloadLimitSwitch.isChecked = downloadLimit > 0
+        showDownloadLimitInput(binding.shareProcessDownloadLimitSwitch.isChecked)
+        binding.shareProcessDownloadLimitEt.setText(if (downloadLimit > 0) downloadLimit.toString() else "")
+        binding.shareProcessRemainingDownloadCountTv.text = String.format(resources.getString(R.string.download_text), downloadCount.toString())
+        isDownloadCountFetched = true
+    }
 }
diff --git a/app/src/main/res/drawable/ic_contact_book.xml b/app/src/main/res/drawable/ic_contact_book.xml
index 6dff9b171724..f4e34a5fa52f 100644
--- a/app/src/main/res/drawable/ic_contact_book.xml
+++ b/app/src/main/res/drawable/ic_contact_book.xml
@@ -1,26 +1,12 @@
-<!--
-    @author Google LLC
-    Copyright (C) 2023 Google LLC
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-    http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
--->
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#666666"
     android:viewportWidth="24"
     android:viewportHeight="24">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M20,0L4,0v2h16L20,0zM4,24h16v-2L4,22v2zM20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM12,6.75c1.24,0 2.25,1.01 2.25,2.25s-1.01,2.25 -2.25,2.25S9.75,10.24 9.75,9 10.76,6.75 12,6.75zM17,17L7,17v-1.5c0,-1.67 3.33,-2.5 5,-2.5s5,0.83 5,2.5L17,17z" />
+  <path
+      android:pathData="M18,1.5C19.65,1.5 21,2.85 21,4.5L21,4.5L21,19.5C21,21.15 19.65,22.5 18,22.5L18,22.5L3,22.5L3,1.5ZM18,3L4.5,3L4.5,21L18,21C18.85,21 19.5,20.35 19.5,19.5L19.5,19.5L19.5,4.5C19.5,3.65 18.85,3 18,3L18,3ZM14,13.4C14.8,13.4 15.45,14 15.6,14.8L15.6,14.8L15.75,15.5L8.25,15.5L8.35,14.8C8.5,14 9.2,13.45 10,13.45L10,13.45L10.85,13.45L12,14.6L13.2,13.4ZM12,8C13.15,8 14.1,8.85 14.1,10.1C14.1,11.35 13.2,12.6 12,12.6C10.8,12.6 9.9,11.35 9.9,10.1C9.9,8.85 10.85,8 12,8Z"
+      android:strokeWidth="1"
+      android:fillColor="#262626"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
 </vector>
diff --git a/app/src/main/res/layout/file_details_sharing_fragment.xml b/app/src/main/res/layout/file_details_sharing_fragment.xml
index 68a0fbb61956..f07ed7cdf78c 100644
--- a/app/src/main/res/layout/file_details_sharing_fragment.xml
+++ b/app/src/main/res/layout/file_details_sharing_fragment.xml
@@ -22,8 +22,8 @@
 <androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     android:id="@+id/file_details_nested_scroll_view"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <LinearLayout
@@ -58,8 +58,8 @@
                 android:layout_width="@dimen/shared_with_me_icon_size"
                 android:layout_height="@dimen/shared_with_me_icon_size"
                 android:contentDescription="@string/avatar"
-                app:tint="@color/shared_with_me_color"
-                app:srcCompat="@drawable/ic_shared_with_me" />
+                app:srcCompat="@drawable/ic_shared_with_me"
+                app:tint="@color/shared_with_me_color" />
 
             <LinearLayout
                 android:layout_width="match_parent"
@@ -114,27 +114,44 @@
             android:textColor="@color/share_info_txt_color"
             android:textSize="@dimen/txt_size_14sp" />
 
-        <androidx.appcompat.widget.SearchView
-            android:id="@+id/searchView"
-            style="@style/ownCloud.SearchView"
+        <LinearLayout
             android:layout_width="match_parent"
-            app:searchIcon="@null"
-            android:layout_height="45dp"
-            android:layout_marginStart="@dimen/standard_half_margin"
+            android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/standard_double_margin"
-            android:layout_marginEnd="@dimen/standard_half_margin"
-            app:queryBackground="@drawable/share_search_background"
-            android:hint="@string/share_search" />
+            android:gravity="center_vertical"
+            android:orientation="horizontal">
+
+            <androidx.appcompat.widget.SearchView
+                android:id="@+id/searchView"
+                style="@style/ownCloud.SearchView"
+                android:layout_width="0dp"
+                android:layout_height="@dimen/share_search_height"
+                android:layout_marginStart="@dimen/standard_half_margin"
+                android:layout_weight="1"
+                android:hint="@string/share_search"
+                app:queryBackground="@drawable/share_search_background"
+                app:searchIcon="@null" />
+
+            <androidx.appcompat.widget.AppCompatImageView
+                android:id="@+id/pick_contact_email_btn"
+                android:layout_width="@dimen/share_search_height"
+                android:layout_height="@dimen/share_search_height"
+                android:layout_marginEnd="@dimen/standard_margin"
+                android:background="@drawable/share_search_background"
+                app:srcCompat="@drawable/ic_contact_book"
+                app:tint="@color/share_btn_txt_color" />
+
+        </LinearLayout>
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/label_personal_share"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:paddingEnd="@dimen/standard_half_padding"
-            android:id="@+id/label_personal_share"
-            android:paddingStart="@dimen/standard_half_padding"
-            android:layout_marginTop="@dimen/standard_eighth_margin"
             android:layout_marginStart="@dimen/standard_margin"
+            android:layout_marginTop="@dimen/standard_eighth_margin"
             android:layout_marginEnd="@dimen/standard_margin"
+            android:paddingStart="@dimen/standard_half_padding"
+            android:paddingEnd="@dimen/standard_half_padding"
             android:text="@string/personal_share_email"
             android:textColor="@color/share_color"
             android:textSize="@dimen/txt_size_11sp" />
@@ -157,18 +174,18 @@
             app:iconTint="@color/share_btn_txt_color" />
 
         <androidx.appcompat.widget.AppCompatTextView
+            android:id="@+id/tv_your_shares"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/standard_margin"
-            android:id="@+id/tv_your_shares"
-            android:visibility="gone"
-            tools:visibility="visible"
             android:layout_marginTop="@dimen/standard_double_margin"
             android:layout_marginEnd="@dimen/standard_margin"
             android:text="@string/your_shares"
             android:textColor="@color/text_color"
             android:textSize="@dimen/txt_size_16sp"
-            android:textStyle="bold" />
+            android:textStyle="bold"
+            android:visibility="gone"
+            tools:visibility="visible" />
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/sharesList"
@@ -178,21 +195,21 @@
             android:dividerHeight="1dp" />
 
         <androidx.appcompat.widget.AppCompatTextView
-            android:layout_width="wrap_content"
             android:id="@+id/tv_empty_shares"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
+            android:layout_gravity="center"
             android:layout_marginStart="@dimen/standard_margin"
             android:layout_marginTop="@dimen/standard_double_margin"
             android:layout_marginEnd="@dimen/standard_margin"
             android:text="@string/empty_shares"
-            android:layout_gravity="center"
-            android:visibility="gone"
             android:textColor="@color/secondary_text_color"
-            android:textSize="@dimen/txt_size_16sp" />
+            android:textSize="@dimen/txt_size_16sp"
+            android:visibility="gone" />
 
         <View
             android:layout_width="match_parent"
-            android:layout_height="80dp"/>
+            android:layout_height="80dp" />
 
     </LinearLayout>
 </androidx.core.widget.NestedScrollView>
diff --git a/app/src/main/res/layout/file_details_sharing_process_fragment.xml b/app/src/main/res/layout/file_details_sharing_process_fragment.xml
index 156b268a077a..ed2792a2475f 100644
--- a/app/src/main/res/layout/file_details_sharing_process_fragment.xml
+++ b/app/src/main/res/layout/file_details_sharing_process_fragment.xml
@@ -24,6 +24,7 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
+    android:background="@color/bg_default"
     android:focusable="true"
     android:focusableInTouchMode="true"
     android:minHeight="400dp">
@@ -31,8 +32,9 @@
     <androidx.core.widget.NestedScrollView
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:padding="@dimen/standard_padding"
-        app:layout_constraintBottom_toTopOf="@+id/share_process_btn_cancel"
+        android:paddingTop="@dimen/standard_padding"
+        android:paddingBottom="@dimen/standard_padding"
+        app:layout_constraintBottom_toTopOf="@+id/divider_bottom"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent">
@@ -43,116 +45,252 @@
             android:minHeight="400dp">
 
             <androidx.appcompat.widget.AppCompatTextView
-                android:id="@+id/share_process_edit_share_link"
-                android:layout_width="0dp"
+                android:id="@+id/tv_sharing_title"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:text="@string/share_permissions"
-                android:textColor="@color/primary"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingRight="@dimen/standard_padding"
+                android:text="@string/share_dialog_title"
+                android:textColor="@color/share_title_txt_color"
+                android:textSize="@dimen/txt_size_16sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_permission_title"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="@dimen/standard_margin"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingRight="@dimen/standard_padding"
+                android:text="@string/permissions"
+                android:textColor="@color/share_title_txt_color"
+                android:textSize="@dimen/txt_size_16sp"
+                android:textStyle="bold"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/tv_sharing_title" />
+
+            <View
+                android:id="@+id/divider_sharing_permissions"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/standard_quarter_margin"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_permission_title" />
+
             <RadioGroup
                 android:id="@+id/share_process_permission_radio_group"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:layout_gravity="end"
                 android:orientation="vertical"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingRight="@dimen/standard_padding"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_edit_share_link">
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_permissions">
 
                 <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/share_process_permission_read_only"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/minimum_size_for_touchable_area"
-                    android:text="@string/link_share_view_only" />
+                    android:background="?android:selectableItemBackground"
+                    android:button="@null"
+                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                    android:text="@string/link_share_read_only"
+                    android:textColor="@color/share_txt_color"
+                    android:textSize="@dimen/txt_size_15sp" />
 
                 <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/share_process_permission_upload_editing"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/minimum_size_for_touchable_area"
-                    android:text="@string/link_share_allow_upload_and_editing" />
+                    android:background="?android:selectableItemBackground"
+                    android:button="@null"
+                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                    android:text="@string/link_share_allow_upload_and_editing"
+                    android:textColor="@color/share_txt_color"
+                    android:textSize="@dimen/txt_size_15sp" />
 
                 <com.google.android.material.radiobutton.MaterialRadioButton
                     android:id="@+id/share_process_permission_file_drop"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:minHeight="@dimen/minimum_size_for_touchable_area"
-                    android:text="@string/link_share_file_drop" />
+                    android:background="?android:selectableItemBackground"
+                    android:button="@null"
+                    android:drawableEnd="?android:attr/listChoiceIndicatorSingle"
+                    android:text="@string/link_share_file_drop"
+                    android:textColor="@color/share_txt_color"
+                    android:textSize="@dimen/txt_size_15sp" />
 
             </RadioGroup>
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_file_drop_info"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:text="@string/file_drop_info"
+                android:textColor="@color/share_info_txt_color"
+                android:textSize="@dimen/txt_size_15sp"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_permission_radio_group" />
+
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/share_process_advance_permission_title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_margin"
-                android:text="@string/advanced_settings"
-                android:textColor="@color/primary"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingRight="@dimen/standard_padding"
+                android:text="@string/advance_permissions"
+                android:textColor="@color/share_title_txt_color"
+                android:textSize="@dimen/txt_size_16sp"
                 android:textStyle="bold"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_permission_radio_group" />
+                app:layout_constraintTop_toBottomOf="@+id/share_file_drop_info" />
 
-            <com.google.android.material.checkbox.MaterialCheckBox
+            <View
+                android:id="@+id/divider_sharing_adv_permissions"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/standard_quarter_margin"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_advance_permission_title" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
+                android:id="@+id/share_process_hide_download_checkbox"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:text="@string/share_via_link_hide_download"
+                android:textSize="@dimen/txt_size_15sp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_adv_permissions"
+                tools:visibility="visible" />
+
+            <View
+                android:id="@+id/divider_sharing_hide_download"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_hide_download_checkbox" />
+
+            <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/share_process_allow_resharing_checkbox"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
-                android:text="@string/allow_resharing"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:text="@string/advance_permissions"
+                android:textColor="@color/share_txt_color"
                 android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_advance_permission_title"
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_hide_download"
                 tools:visibility="visible" />
 
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_allow_resharing_info"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:text="@string/allow_resharing_info"
+                android:textColor="@color/share_info_txt_color"
+                android:textSize="@dimen/txt_size_15sp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_allow_resharing_checkbox"
+                tools:visibility="visible" />
+
+            <View
+                android:id="@+id/divider_sharing_allow_resharing"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:layout_marginTop="@dimen/standard_quarter_margin"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_allow_resharing_info" />
+
             <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/share_process_set_password_switch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
                 android:text="@string/share_no_password_title"
+                android:textColor="@color/share_txt_color"
+                android:textSize="@dimen/txt_size_15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_allow_resharing_checkbox" />
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_allow_resharing" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/share_process_enter_password_container"
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/share_process_enter_password"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:hint="@string/hint_password"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:autofillHints="password"
+                android:inputType="textPassword"
+                android:textColor="@color/share_txt_color"
+                android:textColorHighlight="@color/et_highlight_color"
+                android:textColorHint="@color/grey_60"
+                android:textSize="@dimen/txt_size_15sp"
                 android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/share_process_set_password_switch"
-                tools:visibility="visible">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/share_process_enter_password"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:autofillHints="password"
-                    android:ems="10"
-                    android:gravity="top"
-                    android:inputType="textPassword">
-
-                </com.google.android.material.textfield.TextInputEditText>
+                tools:visibility="visible" />
 
-            </com.google.android.material.textfield.TextInputLayout>
+            <View
+                android:id="@+id/divider_sharing_enter_password"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_enter_password" />
 
             <com.google.android.material.materialswitch.MaterialSwitch
                 android:id="@+id/share_process_set_exp_date_switch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_half_margin"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
                 android:text="@string/share_no_expiration_date_label"
+                android:textColor="@color/share_txt_color"
+                android:textSize="@dimen/txt_size_15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_enter_password_container" />
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_enter_password" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/share_process_select_exp_date"
@@ -160,9 +298,15 @@
                 android:layout_height="wrap_content"
                 android:gravity="center_vertical"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
                 android:padding="@dimen/standard_half_padding"
+                android:textColor="@color/share_txt_color"
+                android:textColorHint="@color/grey_60"
+                android:textSize="@dimen/txt_size_15sp"
                 android:visibility="gone"
-                app:drawableEndCompat="@drawable/file_calendar"
+                app:drawableEndCompat="@drawable/ic_calendar"
+                app:drawableTint="@color/primary"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/share_process_set_exp_date_switch"
@@ -172,59 +316,130 @@
                 android:id="@+id/share_process_exp_date_divider"
                 android:layout_width="match_parent"
                 android:layout_height="0.5dp"
-                android:background="@color/text_color"
+                android:layout_marginLeft="@dimen/share_exp_date_divider_margin"
+                android:layout_marginRight="@dimen/share_exp_date_divider_margin"
+                android:background="@color/share_et_divider"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toBottomOf="@+id/share_process_select_exp_date" />
 
+            <View
+                android:id="@+id/divider_sharing_exp_date"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_exp_date_divider" />
+
             <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/share_process_hide_download_checkbox"
-                android:layout_width="0dp"
+                android:id="@+id/share_process_change_name_switch"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/standard_half_margin"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
-                android:text="@string/share_via_link_hide_download"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:text="@string/link_label"
+                android:textColor="@color/share_txt_color"
+                android:textSize="@dimen/txt_size_15sp"
                 android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_exp_date_divider"
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_exp_date"
                 tools:visibility="visible" />
 
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/share_process_change_name_et"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:hint="@string/hint_link_label"
+                android:inputType="textNoSuggestions|textCapSentences"
+                android:textColor="@color/share_txt_color"
+                android:textColorHighlight="@color/et_highlight_color"
+                android:textColorHint="@color/grey_60"
+                android:textSize="@dimen/txt_size_15sp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_change_name_switch"
+                tools:visibility="visible" />
+
+            <View
+                android:id="@+id/divider_sharing_change_name"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_change_name_et" />
+
             <com.google.android.material.materialswitch.MaterialSwitch
-                android:id="@+id/share_process_change_name_switch"
+                android:id="@+id/share_process_download_limit_switch"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_half_margin"
                 android:minHeight="@dimen/minimum_size_for_touchable_area"
-                android:text="@string/link_name"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:text="@string/link_download_limit"
+                android:textColor="@color/share_txt_color"
+                android:textSize="@dimen/txt_size_15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_hide_download_checkbox" />
+                app:layout_constraintTop_toBottomOf="@+id/divider_sharing_change_name" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/share_process_change_name_container"
+            <!--  Limiting to max 18 input size to avoid taking more input -->
+            <androidx.appcompat.widget.AppCompatEditText
+                android:id="@+id/share_process_download_limit_et"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:hint="@string/hint_name"
-                android:minHeight="@dimen/minimum_size_for_touchable_area"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:digits="0123456789"
+                android:hint="@string/hint_download_limit"
+                android:imeOptions="actionDone"
+                android:importantForAutofill="no"
+                android:inputType="number"
+                android:maxLength="18"
+                android:maxLines="1"
+                android:textColor="@color/share_txt_color"
+                android:textColorHighlight="@color/et_highlight_color"
+                android:textColorHint="@color/grey_60"
+                android:textSize="@dimen/txt_size_15sp"
                 android:visibility="gone"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_change_name_switch"
-                tools:visibility="visible">
-
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/share_process_change_name"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:ems="10"
-                    android:gravity="top"
-                    android:importantForAutofill="no"
-                    android:inputType="textNoSuggestions|textCapSentences">
+                app:layout_constraintTop_toBottomOf="@+id/share_process_download_limit_switch"
+                tools:visibility="visible" />
 
-                </com.google.android.material.textfield.TextInputEditText>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/share_process_remaining_download_count_tv"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginTop="@dimen/standard_half_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:paddingBottom="@dimen/standard_padding"
+                android:text="@string/download_text"
+                android:textColor="@color/grey_60"
+                android:textSize="@dimen/txt_size_15sp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_download_limit_et"
+                tools:visibility="visible" />
 
-            </com.google.android.material.textfield.TextInputLayout>
+            <View
+                android:id="@+id/divider_sharing_download_limit"
+                android:layout_width="match_parent"
+                android:layout_height="1dp"
+                android:background="@color/list_divider_background"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/share_process_remaining_download_count_tv" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/share_process_group_one"
@@ -232,60 +447,98 @@
                 android:layout_height="wrap_content"
                 android:visibility="visible"
                 app:constraint_referenced_ids="share_process_exp_date_divider,
-                share_process_permission_radio_group,
+                share_process_permission_radio_group, share_process_permission_title,
                 share_process_advance_permission_title, share_process_hide_download_checkbox,
                 share_process_allow_resharing_checkbox, share_process_set_password_switch,
-                share_process_set_exp_date_switch, share_process_enter_password_container,
+                share_process_set_exp_date_switch, share_process_enter_password,
                 share_process_select_exp_date, share_process_change_name_switch,
-                share_process_change_name_container" />
+                share_process_change_name_et, divider_sharing_adv_permissions,
+                divider_sharing_permissions, divider_sharing_allow_resharing,
+                divider_sharing_change_name, divider_sharing_enter_password,
+                divider_sharing_exp_date,divider_sharing_hide_download,
+                share_file_drop_info, share_process_allow_resharing_info,
+                share_process_download_limit_switch, divider_sharing_download_limit,
+                share_process_download_limit_et,share_process_remaining_download_count_tv" />
 
             <androidx.appcompat.widget.AppCompatTextView
                 android:id="@+id/share_process_message_title"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="@dimen/standard_margin"
-                android:text="@string/share_send_note"
-                android:textColor="@color/secondary_text_color"
+                android:paddingLeft="@dimen/standard_padding"
+                android:paddingRight="@dimen/standard_padding"
+                android:text="@string/your_message"
+                android:textColor="@color/share_txt_color"
+                android:textSize="@dimen/text_size_13sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_edit_share_link" />
+                app:layout_constraintTop_toBottomOf="@+id/tv_sharing_title" />
 
-            <com.google.android.material.textfield.TextInputLayout
-                android:id="@+id/note_container"
+            <com.google.android.material.textfield.TextInputEditText
+                android:id="@+id/note_text"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="@dimen/note_et_height"
+                android:layout_marginLeft="@dimen/standard_margin"
                 android:layout_marginTop="@dimen/standard_half_margin"
-                android:hint="@string/hint_note"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:background="@drawable/share_et_bg"
+                android:gravity="top"
+                android:importantForAutofill="no"
+                android:inputType="textCapSentences|textMultiLine|textNoSuggestions"
+                android:overScrollMode="always"
+                android:padding="@dimen/standard_padding"
+                android:scrollbarStyle="insideInset"
+                android:scrollbars="vertical"
+                android:textColor="@color/share_txt_color"
+                android:textColorHighlight="@color/et_highlight_color"
+                android:textColorHint="@color/grey_60"
+                android:textSize="@dimen/txt_size_15sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@+id/share_process_message_title">
+                app:layout_constraintTop_toBottomOf="@+id/share_process_message_title" />
 
-                <com.google.android.material.textfield.TextInputEditText
-                    android:id="@+id/note_text"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:gravity="top"
-                    android:importantForAutofill="no"
-                    android:inputType="textCapSentences|textMultiLine|textNoSuggestions"
-                    android:minLines="10"
-                    android:scrollbars="vertical" />
-            </com.google.android.material.textfield.TextInputLayout>
+            <androidx.appcompat.widget.AppCompatTextView
+                android:id="@+id/tv_set_password_email_warning"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="@dimen/standard_margin"
+                android:layout_marginTop="@dimen/standard_margin"
+                android:layout_marginRight="@dimen/standard_margin"
+                android:background="@drawable/sharing_email_warning_bg"
+                android:padding="@dimen/standard_padding"
+                android:text="@string/sharing_email_warning"
+                android:textColor="@color/share_warning_txt_color"
+                android:textSize="@dimen/txt_size_14sp"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/note_text" />
 
             <androidx.constraintlayout.widget.Group
                 android:id="@+id/share_process_group_two"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:visibility="gone"
-                app:constraint_referenced_ids="share_process_message_title, note_container" />
+                app:constraint_referenced_ids="share_process_message_title, note_text" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
     </androidx.core.widget.NestedScrollView>
 
+    <View
+        android:id="@+id/divider_bottom"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginBottom="@dimen/standard_margin"
+        android:background="@color/list_divider_background"
+        app:layout_constraintBottom_toTopOf="@+id/share_process_btn_cancel"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent" />
+
     <com.google.android.material.button.MaterialButton
         android:id="@+id/share_process_btn_cancel"
-        style="@style/Widget.Material3.Button.OutlinedButton"
-        android:layout_width="@dimen/button_width"
+        style="@style/OutlinedButton"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_margin"
         android:layout_marginEnd="@dimen/standard_half_margin"
@@ -294,19 +547,21 @@
         app:cornerRadius="@dimen/button_corner_radius"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toStartOf="@+id/share_process_btn_next"
+        app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="@+id/share_process_btn_next" />
 
     <com.google.android.material.button.MaterialButton
         android:id="@+id/share_process_btn_next"
-        android:layout_width="@dimen/button_extra_width"
+        android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/standard_half_margin"
         android:layout_marginEnd="@dimen/standard_margin"
         android:layout_marginBottom="@dimen/standard_margin"
         android:text="@string/common_next"
-        android:theme="@style/Widget.Material3.Button.IconButton.Filled"
+        style="@style/Button.Primary"
         app:cornerRadius="@dimen/button_corner_radius"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toEndOf="@+id/share_process_btn_cancel"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 6270cd0861d6..135982c8ea25 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -95,7 +95,6 @@
     <string name="check_back_later_or_reload">Schauen Sie später noch einmal vorbei oder laden Sie neu.</string>
     <string name="checkbox">Checkbox</string>
     <string name="choose_local_folder">Wähle einen lokalen Ordner…</string>
-    <string name="choose_location">Ort wählen</string>
     <string name="choose_remote_folder">Wähle einen entfernten Ordner …</string>
     <string name="choose_template_helper_text">Bitte eine Vorlage auswählen und einen Dateinamen eingeben.</string>
     <string name="choose_which_file">Wählen Sie, welche Datei behalten werden soll!</string>
@@ -111,21 +110,20 @@
     <string name="common_cancel">Abbrechen</string>
     <string name="common_cancel_sync">Synchronisierung abbrechen</string>
     <string name="common_choose_account">Konto auswählen</string>
-    <string name="common_confirm">Übernehmen</string>
+    <string name="common_confirm">Bestätigen</string>
     <string name="common_copy">Kopieren</string>
     <string name="common_delete">Löschen</string>
     <string name="common_error">Fehler</string>
     <string name="common_error_out_memory">Nicht genügend Speicher</string>
     <string name="common_error_unknown">Unbekannter Fehler</string>
     <string name="common_loading">Lade…</string>
-    <string name="common_next">Weiter</string>
+    <string name="common_next">Nächste</string>
     <string name="common_no">Nein</string>
     <string name="common_ok">OK</string>
     <string name="common_pending">Ausstehend</string>
     <string name="common_remove">Löschen</string>
     <string name="common_rename">Umbenennen</string>
     <string name="common_save">Speichern</string>
-    <string name="common_select">Auswählen</string>
     <string name="common_send">Senden</string>
     <string name="common_share">Teilen</string>
     <string name="common_skip">Überspringen</string>
@@ -195,7 +193,6 @@
     <string name="data_to_back_up">Zu sichernde Daten</string>
     <string name="default_credentials_wrong">Zugangsdaten falsch</string>
     <string name="delete_account">Benutzerkonto löschen</string>
-    <string name="delete_account_warning">Konto %s und alle lokalen Dateien löschen?\n\nLöschung kann nicht rückgängig gemacht werden.</string>
     <string name="delete_entries">Einträgen entfernen</string>
     <string name="delete_link">Link löschen</string>
     <string name="deselect_all">Auswahl aufheben</string>
@@ -527,7 +524,6 @@
     <string name="no_mutliple_accounts_allowed">Nur ein Konto zulässig</string>
     <string name="no_pdf_app_available">Keine App verfügbar um PDFs anzuzeigen</string>
     <string name="no_send_app">Keine App zum Senden der ausgewählten Dateien verfügbar</string>
-    <string name="note_confirm">Senden</string>
     <string name="note_could_not_sent">Notiz konnte nicht versandt werden</string>
     <string name="note_icon_hint">Notiz-Symbol</string>
     <string name="notification_action_failed">Ausführen der Aktion fehlgeschlagen.</string>
@@ -700,7 +696,6 @@
     <string name="select_one_template">Bitte eine Vorlage auswählen</string>
     <string name="select_template">Vorlage auswählen</string>
     <string name="send">Senden</string>
-    <string name="send_note">Notiz an Empfänger senden</string>
     <string name="sendbutton_description">Icon für den Senden-Button</string>
     <string name="set_as">Setze als</string>
     <string name="set_note">Notiz setzen</string>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 88a29668c4cd..e926fdcc432f 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -89,10 +89,8 @@
     <color name="overflow_bg_color">@color/grey_80</color>
 
     <!-- Switch Compat Colors -->
-    <color name="switch_thumb_checked_disabled">@color/grey_70</color>
-    <color name="switch_track_checked_disabled">@color/grey_60</color>
-    <color name="switch_thumb_unchecked_disabled">@color/grey_70</color>
-    <color name="switch_track_unchecked_disabled">@color/grey_60</color>
+    <color name="switch_thumb_disabled">@color/grey_70</color>
+    <color name="switch_track_disabled">@color/grey_60</color>
 
     <!-- Checkbox Colors -->
     <color name="checkbox_checked_disabled">@color/grey_70</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 951b6765b8a4..b05b582157a7 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -137,12 +137,10 @@
     <!-- Switch Compat Colors -->
     <color name="switch_thumb_checked_enabled">@color/primary</color>
     <color name="switch_track_checked_enabled">#F399C7</color>
-    <color name="switch_thumb_checked_disabled">@color/grey_0</color>
-    <color name="switch_track_checked_disabled">@color/grey_0</color>
     <color name="switch_thumb_unchecked_enabled">#FFFFFF</color>
     <color name="switch_track_unchecked_enabled">@color/grey_30</color>
-    <color name="switch_thumb_unchecked_disabled">@color/grey_0</color>
-    <color name="switch_track_unchecked_disabled">@color/grey_0</color>
+    <color name="switch_thumb_disabled">@color/grey_10</color>
+    <color name="switch_track_disabled">@color/grey_0</color>
 
     <!-- Checkbox Colors -->
     <color name="checkbox_checked_enabled">@color/primary</color>
diff --git a/app/src/main/res/values/dimens.xml b/app/src/main/res/values/dimens.xml
index cc9e25255a10..3a987ca9bef3 100644
--- a/app/src/main/res/values/dimens.xml
+++ b/app/src/main/res/values/dimens.xml
@@ -28,4 +28,5 @@
     <dimen name="notification_row_item_height">145dp</dimen>
     <dimen name="button_stroke_width">1dp</dimen>
     <dimen name="txt_size_13sp">13sp</dimen>
+    <dimen name="share_search_height">44dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 45c683c15d88..256f5e3f13c4 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1007,7 +1007,7 @@
     <string name="sharing_description">You can create links or send shares by mail. If you invite MagentaCLOUD users, you have more opportunities for collaboration.</string>
     <string name="your_message">Your Message</string>
     <string name="personal_share_email">Personal share by mail</string>
-    <string name="create_link">Add link</string>
+    <string name="create_link">Create Link</string>
     <string name="your_shares">Your Shares</string>
     <string name="link_label">Link Label</string>
     <string name="hint_link_label">Your custom link label</string>