diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 0987750f..30715383 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -61,6 +61,10 @@
     <inspection_tool class="PreviewNotSupportedInUnitTestFiles" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
     </inspection_tool>
+    <inspection_tool class="PreviewParameterProviderOnFirstParameter" enabled="true" level="ERROR" enabled_by_default="true">
+      <option name="composableFile" value="true" />
+      <option name="previewFile" value="true" />
+    </inspection_tool>
     <inspection_tool class="PreviewPickerAnnotation" enabled="true" level="ERROR" enabled_by_default="true">
       <option name="composableFile" value="true" />
       <option name="previewFile" value="true" />
diff --git a/app/src/main/java/org/permanent/permanent/network/NetworkClient.kt b/app/src/main/java/org/permanent/permanent/network/NetworkClient.kt
index ee4d22f4..0ea43985 100644
--- a/app/src/main/java/org/permanent/permanent/network/NetworkClient.kt
+++ b/app/src/main/java/org/permanent/permanent/network/NetworkClient.kt
@@ -19,6 +19,7 @@ import okhttp3.RequestBody.Companion.asRequestBody
 import okhttp3.RequestBody.Companion.toRequestBody
 import okhttp3.ResponseBody
 import okhttp3.logging.HttpLoggingInterceptor
+import org.json.JSONObject
 import org.permanent.permanent.BuildConfig
 import org.permanent.permanent.Constants
 import org.permanent.permanent.PermanentApplication
@@ -41,6 +42,8 @@ import org.permanent.permanent.network.models.LegacyContact
 import org.permanent.permanent.network.models.LocnVO
 import org.permanent.permanent.network.models.ProfileItemsRequestContainer
 import org.permanent.permanent.network.models.ResponseVO
+import org.permanent.permanent.network.models.ShareLinkVO
+import org.permanent.permanent.network.models.ShareLinkVOResponse
 import org.permanent.permanent.network.models.Shareby_urlVO
 import org.permanent.permanent.network.models.SimpleRequestContainer
 import org.permanent.permanent.network.models.StorageGift
@@ -784,6 +787,30 @@ class NetworkClient(private var okHttpClient: OkHttpClient?, context: Context) {
 
     fun disableTwoFactor(twoFAVO: TwoFAVO): Call<ResponseBody> = stelaAccountService.disableTwoFactor(twoFAVO)
 
+    fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?): Call<ShareLinkVOResponse> = stelaAccountService.getShareLink(shareTokens,shareLinkIds)
+
+    fun generateShareLink(shareLink: ShareLinkVO): Call<ResponseVO> = stelaAccountService.generateShareLink(shareLink)
+
+    fun updateShareLink(shareLink: ShareLinkVO): Call<ResponseVO> {
+        val json = JSONObject()
+
+        shareLink.permissionsLevel?.let { json.put("permissionsLevel", it) }
+        shareLink.accessRestrictions?.let { json.put("accessRestrictions", it) }
+        if (shareLink.expirationTimestamp == null) {
+            json.put("expirationTimestamp", JSONObject.NULL)
+        } else {
+            json.put("expirationTimestamp", shareLink.expirationTimestamp)
+        }
+        val body = json.toString()
+            .toRequestBody("application/json; charset=utf-8".toMediaType())
+
+        return stelaAccountService.updateShareLink(shareLink.id, body)
+    }
+
+    fun deleteShareLink(shareLinkId: String): Call<ResponseVO> {
+        return stelaAccountService.deleteShareLink(shareLinkId)
+    }
+
     fun getPaymentIntent(
         accountId: Int,
         accountEmail: String?,
diff --git a/app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt b/app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt
index f097718f..cbad21c7 100644
--- a/app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt
+++ b/app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt
@@ -1,17 +1,38 @@
 package org.permanent.permanent.network
 
+import okhttp3.RequestBody
 import okhttp3.ResponseBody
 import org.permanent.permanent.models.Tags
 import org.permanent.permanent.network.models.ResponseVO
+import org.permanent.permanent.network.models.ShareLinkVO
+import org.permanent.permanent.network.models.ShareLinkVOResponse
 import org.permanent.permanent.network.models.TwoFAVO
 import retrofit2.Call
 import retrofit2.http.Body
+import retrofit2.http.DELETE
 import retrofit2.http.GET
+import retrofit2.http.PATCH
 import retrofit2.http.POST
 import retrofit2.http.PUT
+import retrofit2.http.Path
+import retrofit2.http.Query
 
 interface StelaAccountService {
 
+    @GET("api/v2/share-links")
+    fun getShareLink(@Query("shareTokens[]") shareTokens: List<String>?,
+                     @Query("shareLinkIds[]") shareLinkIds: List<String>?
+    ): Call<ShareLinkVOResponse>
+
+    @POST("api/v2/share-links")
+    fun generateShareLink(@Body shareLink: ShareLinkVO): Call<ResponseVO>
+
+    @PATCH("api/v2/share-links/{shareLinkId}")
+    fun updateShareLink(@Path("shareLinkId") shareLinkId: String?,  @Body body: RequestBody): Call<ResponseVO>
+
+    @DELETE("api/v2/share-links/{shareLinkId}")
+    fun deleteShareLink(@Path("shareLinkId") shareLinkId: String?): Call<ResponseVO>
+
     @PUT("api/v2/account/tags")
     fun addRemoveTags(@Body tags: Tags): Call<ResponseVO>
 
diff --git a/app/src/main/java/org/permanent/permanent/network/models/Datum.kt b/app/src/main/java/org/permanent/permanent/network/models/Datum.kt
index 9a9aeaa6..24ca2ce7 100644
--- a/app/src/main/java/org/permanent/permanent/network/models/Datum.kt
+++ b/app/src/main/java/org/permanent/permanent/network/models/Datum.kt
@@ -20,4 +20,6 @@ class Datum {
     var TagVO: TagVO? = null
     var TagLinkVO: TagLinkVO? = null
     var PromoVO: PromoVO? = null
+    var ShareLinkVO: ShareLinkVO? = null
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/network/models/ResponseVO.kt b/app/src/main/java/org/permanent/permanent/network/models/ResponseVO.kt
index 514bb54c..b891a953 100644
--- a/app/src/main/java/org/permanent/permanent/network/models/ResponseVO.kt
+++ b/app/src/main/java/org/permanent/permanent/network/models/ResponseVO.kt
@@ -85,4 +85,8 @@ class ResponseVO {
     fun getPromoVO(): PromoVO? {
         return getData()?.get(0)?.PromoVO
     }
+
+    fun getShareLinkVO(): ShareLinkVO? {
+        return getData()?.get(0)?.ShareLinkVO
+    }
 }
diff --git a/app/src/main/java/org/permanent/permanent/network/models/ShareLinkVO.kt b/app/src/main/java/org/permanent/permanent/network/models/ShareLinkVO.kt
new file mode 100644
index 00000000..85cc4cf9
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/network/models/ShareLinkVO.kt
@@ -0,0 +1,24 @@
+package org.permanent.permanent.network.models
+
+
+data class ShareLinkVOResponse(
+    val items: List<ShareLinkVO>
+)
+
+data class ShareLinkVO (
+    var id:  String? = null,
+    var itemId:  String? = null,
+    var itemType:  String? = null,
+    var permissionsLevel:  String? = null,
+    var accessRestrictions: String? = null,
+
+    var token: String? = null,
+
+    var maxUses: Int? = null, // can be 0 for unlimited uses
+
+    var usesExpended: Int? = null,
+    var expirationTimestamp: String? = null, // can be null for no expiration, or this format: "2026-11-17 13:56:31"
+
+    var createdAt: String? = null,
+    var updatedAt: String? = null,
+)
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt b/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt
index f215025c..5bde8339 100644
--- a/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt
+++ b/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt
@@ -3,6 +3,7 @@ package org.permanent.permanent.repositories
 import org.permanent.permanent.models.Tags
 import org.permanent.permanent.network.IResponseListener
 import org.permanent.permanent.network.ITwoFAListener
+import org.permanent.permanent.network.models.ShareLinkVO
 import org.permanent.permanent.network.models.TwoFAVO
 
 interface StelaAccountRepository {
@@ -18,4 +19,12 @@ interface StelaAccountRepository {
     fun sendDisableCode(twoFAVO: TwoFAVO, listener: IResponseListener)
 
     fun disableTwoFactor(twoFAVO: TwoFAVO, listener: IResponseListener)
+
+    fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?, listener: IResponseListener)
+
+    fun generateShareLink(shareLinkVO: ShareLinkVO, listener: IResponseListener)
+
+    fun updateShareLink(shareLinkVO: ShareLinkVO, listener: IResponseListener)
+
+    fun deleteShareLink(shareLinkId: String, listener: IResponseListener)
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt b/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt
index 17306987..72a9bb18 100644
--- a/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt
+++ b/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt
@@ -10,6 +10,8 @@ import org.permanent.permanent.network.ITwoFAListener
 import org.permanent.permanent.network.NetworkClient
 import org.permanent.permanent.network.models.ErrorResponse
 import org.permanent.permanent.network.models.ResponseVO
+import org.permanent.permanent.network.models.ShareLinkVO
+import org.permanent.permanent.network.models.ShareLinkVOResponse
 import org.permanent.permanent.network.models.TwoFAVO
 import retrofit2.Call
 import retrofit2.Callback
@@ -192,4 +194,97 @@ class StelaAccountRepositoryImpl(context: Context) : StelaAccountRepository {
             }
         })
     }
+
+    override fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?, listener: IResponseListener) {
+        NetworkClient.instance().getShareLink(shareTokens, shareLinkIds).enqueue( object : Callback<ShareLinkVOResponse> {
+
+            override fun onResponse(call: Call<ShareLinkVOResponse>, response: Response<ShareLinkVOResponse>) {
+                if (response.isSuccessful) {
+                    val responseVO = response.body()
+                    if (responseVO != null) {
+                        listener.onSuccess("")
+                    } else {
+                        listener.onFailed(appContext.getString(R.string.generic_error))
+                    }
+                } else {
+                    listener.onFailed("No Link detected")
+                }
+            }
+
+            override fun onFailure(call: Call<ShareLinkVOResponse>, t: Throwable) {
+                listener.onFailed(t.message)
+            }
+        })
+    }
+
+    override fun generateShareLink(shareLinkVO: ShareLinkVO, listener: IResponseListener) {
+        NetworkClient.instance().generateShareLink(shareLinkVO).enqueue( object : Callback<ResponseVO> {
+
+            override fun onResponse(call: Call<ResponseVO>, response: Response<ResponseVO>) {
+                if (response.isSuccessful) {
+                    val responseVO = response.body()
+                    if (responseVO != null) {
+                        listener.onSuccess("")
+                    } else {
+                        listener.onFailed(appContext.getString(R.string.generic_error))
+                    }
+                } else {
+                    listener.onFailed("No Link detected")
+                }
+            }
+
+            override fun onFailure(call: Call<ResponseVO>, t: Throwable) {
+                listener.onFailed(t.message)
+            }
+        })
+    }
+
+    override fun updateShareLink(shareLinkVO: ShareLinkVO, listener: IResponseListener) {
+        NetworkClient.instance().updateShareLink(shareLinkVO)
+            .enqueue(object : Callback<ResponseVO> {
+
+                override fun onResponse(call: Call<ResponseVO>, response: Response<ResponseVO>) {
+                    if (response.isSuccessful) {
+                        val responseVO = response.body()
+                        if (responseVO != null) {
+                            listener.onSuccess("")
+                        } else {
+                            listener.onFailed(appContext.getString(R.string.generic_error))
+                        }
+                    } else {
+                        try {
+                            listener.onFailed(response.errorBody().toString())
+                        } catch (e: Exception) {
+                            listener.onFailed(e.message)
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<ResponseVO>, t: Throwable) {
+                    listener.onFailed(t.message)
+                }
+            })
+    }
+
+    override fun deleteShareLink(shareLinkId: String, listener: IResponseListener) {
+        NetworkClient.instance().deleteShareLink(shareLinkId)
+            .enqueue(object : Callback<ResponseVO> {
+
+                override fun onResponse(call: Call<ResponseVO>, response: Response<ResponseVO>) {
+                    if (response.isSuccessful) {
+                        listener.onSuccess("")
+                    } else {
+                        try {
+                            listener.onFailed(response.errorBody().toString())
+                        } catch (e: Exception) {
+                            listener.onFailed(e.message)
+                        }
+                    }
+                }
+
+                override fun onFailure(call: Call<ResponseVO>, t: Throwable) {
+                    listener.onFailed(t.message)
+                }
+            })
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/AccessRolesFragment.kt b/app/src/main/java/org/permanent/permanent/ui/AccessRolesFragment.kt
index 1aa61b8d..0b76657e 100644
--- a/app/src/main/java/org/permanent/permanent/ui/AccessRolesFragment.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/AccessRolesFragment.kt
@@ -24,10 +24,10 @@ import org.permanent.permanent.databinding.FragmentAccessRolesBinding
 import org.permanent.permanent.models.AccessRole
 import org.permanent.permanent.models.Share
 import org.permanent.permanent.network.models.Shareby_urlVO
-import org.permanent.permanent.ui.shareManagement.ShareManagementFragment
 import org.permanent.permanent.viewmodels.AccessRolesViewModel
 import org.permanent.permanent.viewmodels.SingleLiveEvent
 import androidx.core.net.toUri
+import org.permanent.permanent.ui.shareManagement.ShareLinkFragment
 
 class AccessRolesFragment : PermanentBottomSheetFragment() {
     private lateinit var binding: FragmentAccessRolesBinding
@@ -38,7 +38,7 @@ class AccessRolesFragment : PermanentBottomSheetFragment() {
         shareByUrlVo: Shareby_urlVO,
     ) {
         val bundle = Bundle()
-        bundle.putParcelable(ShareManagementFragment.SHARE_BY_URL_VO_KEY, shareByUrlVo)
+        bundle.putParcelable(ShareLinkFragment.SHARE_BY_URL_VO_KEY, shareByUrlVo)
         this.arguments = bundle
     }
 
@@ -46,7 +46,7 @@ class AccessRolesFragment : PermanentBottomSheetFragment() {
         share: Share,
     ) {
         val bundle = Bundle()
-        bundle.putParcelable(ShareManagementFragment.PARCELABLE_SHARE_KEY, share)
+        bundle.putParcelable(ShareLinkFragment.PARCELABLE_SHARE_KEY, share)
         this.arguments = bundle
     }
 
@@ -60,8 +60,8 @@ class AccessRolesFragment : PermanentBottomSheetFragment() {
         binding.executePendingBindings()
         binding.lifecycleOwner = this
         binding.viewModel = viewModel
-        viewModel.setShareLink(arguments?.getParcelable(ShareManagementFragment.SHARE_BY_URL_VO_KEY))
-        viewModel.setShare(arguments?.getParcelable(ShareManagementFragment.PARCELABLE_SHARE_KEY))
+        viewModel.setShareLink(arguments?.getParcelable(ShareLinkFragment.SHARE_BY_URL_VO_KEY))
+        viewModel.setShare(arguments?.getParcelable(ShareLinkFragment.PARCELABLE_SHARE_KEY))
         initCurrentAccessRole()
 
         return binding.root
diff --git a/app/src/main/java/org/permanent/permanent/ui/Extensions.kt b/app/src/main/java/org/permanent/permanent/ui/Extensions.kt
index 6714dc86..9d38a783 100644
--- a/app/src/main/java/org/permanent/permanent/ui/Extensions.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/Extensions.kt
@@ -20,7 +20,9 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.text.SimpleDateFormat
+import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.LocalTime
 import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
@@ -117,6 +119,21 @@ fun bytesToCustomHumanReadableString(bytes: Long, showDecimal: Boolean): String
     }.toString()
 }
 
+private val BACKEND_DATE_TIME_FORMATTER: DateTimeFormatter =
+    DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
+
+/**
+ * Convert a LocalDate to a backend datetime string.
+ *
+ * @param useEndOfDay if true, result will be at 23:59:59 of the date (default = true).
+ *                    if false, result will be at 00:00:00 of the date.
+ */
+fun LocalDate.toBackendDateTimeString(useEndOfDay: Boolean = true): String? {
+    val time = if (useEndOfDay) LocalTime.of(23, 59, 59) else LocalTime.MIDNIGHT
+    val dt = LocalDateTime.of(this, time)
+    return dt.format(BACKEND_DATE_TIME_FORMATTER)
+}
+
 fun String?.toDisplayDate(): String {
     if (this.isNullOrBlank()) return ""
     return try {
diff --git a/app/src/main/java/org/permanent/permanent/ui/composeComponents/AnimatedSnackbar.kt b/app/src/main/java/org/permanent/permanent/ui/composeComponents/AnimatedSnackbar.kt
index 9fe6c665..9011d3a3 100644
--- a/app/src/main/java/org/permanent/permanent/ui/composeComponents/AnimatedSnackbar.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/composeComponents/AnimatedSnackbar.kt
@@ -70,7 +70,7 @@ fun AnimatedSnackbar(
                 .fillMaxWidth()
                 .border(1.dp, colorResource(id = if (isForError) R.color.errorLight else  R.color.success200), RoundedCornerShape(12.dp))
                 .background(
-                    color = colorResource(id = if (isForError) R.color.errorSuperLight else R.color.successLight),
+                    color = colorResource(id = if (isForError) R.color.errorSuperLight else R.color.success50),
                     shape = RoundedCornerShape(size = 12.dp)
                 ), contentAlignment = Alignment.Center
         ) {
diff --git a/app/src/main/java/org/permanent/permanent/ui/composeComponents/CircularProgressIndicator.kt b/app/src/main/java/org/permanent/permanent/ui/composeComponents/CircularProgressIndicator.kt
index 8299b3c8..dfaa77b3 100644
--- a/app/src/main/java/org/permanent/permanent/ui/composeComponents/CircularProgressIndicator.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/composeComponents/CircularProgressIndicator.kt
@@ -21,10 +21,9 @@ import androidx.compose.ui.res.painterResource
 import org.permanent.permanent.R
 
 @Composable
-fun CircularProgressIndicator(overlayColor: OverlayColor = OverlayColor.DARK) {
+fun CircularProgressIndicator(overlayColor: OverlayColor = OverlayColor.DARK, modifier: Modifier = Modifier.fillMaxSize()) {
     Box(
-        modifier = Modifier
-            .fillMaxSize()
+        modifier = modifier
             .background(if (overlayColor == OverlayColor.DARK) Color.Black.copy(alpha = 0.5f) else Color.White.copy(alpha = 0.5f))
             .clickable(enabled = false) {}, contentAlignment = Alignment.Center
     ) {
diff --git a/app/src/main/java/org/permanent/permanent/ui/composeComponents/LinkSettingsMenuItem.kt b/app/src/main/java/org/permanent/permanent/ui/composeComponents/LinkSettingsMenuItem.kt
new file mode 100644
index 00000000..d1543e5b
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/composeComponents/LinkSettingsMenuItem.kt
@@ -0,0 +1,121 @@
+package org.permanent.permanent.ui.composeComponents
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.IntrinsicSize
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.permanent.permanent.R
+
+@Composable
+fun LinkSettingsMenuItem(
+    isTablet: Boolean = false,
+    iconResource: Painter,
+    title: String,
+    subtitle: String,
+    isSelected: Boolean = false,
+    onClick: () -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clickable { onClick() }
+            .background(if (isSelected) colorResource(id = R.color.blue25).copy(alpha = 0.5f) else Color.Transparent)
+            .padding(24.dp)
+            .height(IntrinsicSize.Min),
+        verticalAlignment = Alignment.Top,
+        horizontalArrangement = Arrangement.spacedBy(16.dp)
+
+    ) {
+        Box(
+            modifier = Modifier
+                .size(32.dp)
+                .background(if (isSelected) Color.White else colorResource(R.color.success50), RoundedCornerShape(4.dp)),
+            contentAlignment = Alignment.Center
+        ) {
+            Icon(
+                painter = iconResource,
+                contentDescription = "",
+                tint = Color.Unspecified
+            )
+        }
+
+        Column(
+            modifier = Modifier
+                .padding(horizontal = 16.dp)
+                .weight(1.0f, fill = false),
+            verticalArrangement = Arrangement.spacedBy(8.dp),
+            horizontalAlignment = Alignment.Start,
+        ) {
+            Text(
+                text = title,
+                fontSize = if (isTablet) 18.sp else 14.sp,
+                lineHeight = 24.sp,
+                color = colorResource(R.color.blue900),
+                fontFamily = FontFamily(Font(R.font.usual_medium))
+            )
+
+            Text(
+                text = subtitle,
+                fontSize = if (isTablet) 18.sp else 12.sp,
+                lineHeight = if (isTablet) 32.sp else 16.sp,
+                color = colorResource(R.color.blue900),
+                fontFamily = FontFamily(Font(R.font.usual_regular))
+            )
+        }
+
+        if (isSelected) {
+            Box(
+                modifier = Modifier
+                    .size(32.dp)
+                    .background(Color.White, CircleShape),
+                contentAlignment = Alignment.Center
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_check_circle_green),
+                    contentDescription = "Checklist Icon",
+                    tint = Color.Unspecified
+                )
+            }
+        } else {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_circle_blue),
+                contentDescription = "",
+                tint = Color.Unspecified
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+fun LinkSettingsComposablePreview() {
+    LinkSettingsMenuItem(
+        iconResource = painterResource(id = R.drawable.ic_plus_primary),
+        title = "Add storage!",
+        subtitle = "Increase your space easily by adding more storage.",
+        isSelected = true,
+        onClick = { })
+}
diff --git a/app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt b/app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt
index 370d667c..2ffd0e24 100644
--- a/app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/fileView/FileActivity.kt
@@ -70,11 +70,12 @@ class FileActivity : PermanentBaseActivity() {
                 this@FileActivity.finish()
                 true
             }
-            R.id.shareLinkFragment -> {
-                navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
-                setToolbarAndStatusBarColor(R.color.black)
-                true
-            }
+            //TODO Replace with new Share Link Settings
+//            R.id.shareLinkFragment -> {
+//                navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
+//                setToolbarAndStatusBarColor(R.color.black)
+//                true
+//            }
             else -> navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
         }
     }
diff --git a/app/src/main/java/org/permanent/permanent/ui/fileView/FileViewOptionsFragment.kt b/app/src/main/java/org/permanent/permanent/ui/fileView/FileViewOptionsFragment.kt
index 3b720a31..68256c7d 100644
--- a/app/src/main/java/org/permanent/permanent/ui/fileView/FileViewOptionsFragment.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/fileView/FileViewOptionsFragment.kt
@@ -52,8 +52,9 @@ class FileViewOptionsFragment : PermanentBottomSheetFragment() {
 
     private val onShareViaPermanentObserver = Observer<Void?> {
         val bundle = bundleOf(PARCELABLE_RECORD_KEY to record)
-        requireParentFragment().requireParentFragment().findNavController()
-            .navigate(R.id.action_filesContainerFragment_to_shareLinkFragment, bundle)
+        //TODO Replace with new Share Link Settings
+        // requireParentFragment().requireParentFragment().findNavController()
+        // .navigate(R.id.action_filesContainerFragment_to_shareLinkFragment, bundle)
         dismiss()
     }
 
diff --git a/app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt b/app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt
index 7d6c1ae0..d6a66d0a 100644
--- a/app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/myFiles/MyFilesFragment.kt
@@ -53,7 +53,7 @@ import org.permanent.permanent.ui.public.PublicFragment
 import org.permanent.permanent.ui.recordMenu.RecordMenuFragment
 import org.permanent.permanent.ui.recordMenu.RecordUiModel
 import org.permanent.permanent.ui.recordMenu.SelectionMenuFragment
-import org.permanent.permanent.ui.shareManagement.ShareManagementFragment
+import org.permanent.permanent.ui.shareManagement.ShareLinkFragment
 import org.permanent.permanent.ui.shares.PreviewState
 import org.permanent.permanent.ui.shares.SHOW_SCREEN_SIMPLIFIED_KEY
 import org.permanent.permanent.ui.shares.URL_TOKEN_KEY
@@ -82,7 +82,6 @@ class MyFilesFragment : PermanentBaseFragment() {
     private var addOptionsFragment: AddOptionsFragment? = null
     private var recordMenuFragment: RecordMenuFragment? = null
     private var saveToPermanentFragment: SaveToPermanentFragment? = null
-    private var shareManagementFragment: ShareManagementFragment? = null
     private var sortOptionsFragment: SortOptionsFragment? = null
     private var selectionMenuFragment: SelectionMenuFragment? = null
     private var bottomSheetFragment: ChecklistBottomSheetFragment? = null
@@ -329,9 +328,9 @@ class MyFilesFragment : PermanentBaseFragment() {
     }
 
     private fun showShareManagementFragment(record: Record?) {
-        shareManagementFragment = ShareManagementFragment()
-        shareManagementFragment?.setBundleArguments(record, null)
-        shareManagementFragment?.show(parentFragmentManager, shareManagementFragment?.tag)
+        val shareManagementScreen = ShareLinkFragment()
+        shareManagementScreen.setBundleArguments(record, null)
+        shareManagementScreen.show(parentFragmentManager, shareManagementScreen.tag)
     }
 
     private val shrinkIslandRequestObserver = Observer<Void?> {
diff --git a/app/src/main/java/org/permanent/permanent/ui/recordMenu/RecordMenuFragment.kt b/app/src/main/java/org/permanent/permanent/ui/recordMenu/RecordMenuFragment.kt
index b542ed21..8cf066fe 100644
--- a/app/src/main/java/org/permanent/permanent/ui/recordMenu/RecordMenuFragment.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/recordMenu/RecordMenuFragment.kt
@@ -37,7 +37,8 @@ import org.permanent.permanent.ui.Workspace
 import org.permanent.permanent.ui.myFiles.ModificationType
 import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
 import org.permanent.permanent.ui.recordMenu.compose.RecordMenuScreen
-import org.permanent.permanent.ui.shareManagement.ShareManagementFragment
+import org.permanent.permanent.ui.shareManagement.ShareLinkFragment
+import org.permanent.permanent.ui.shareManagement.shareLink.ShareLinkScreen
 import org.permanent.permanent.viewmodels.RecordMenuItem
 import org.permanent.permanent.viewmodels.RecordMenuViewModel
 
@@ -49,7 +50,6 @@ class RecordMenuFragment : PermanentBottomSheetFragment() {
     private lateinit var record: Record
     private val onFileDownloadRequest = MutableLiveData<Record>()
     private val onRecordLeaveShareRequest = MutableLiveData<Record>()
-    private var shareManagementFragment: ShareManagementFragment? = null
     private val onRecordPublishRequest = MutableLiveData<Record>()
     private val onRecordRenameRequest = MutableLiveData<Record>()
     private val onRecordRelocateRequest = MutableLiveData<Pair<Record, ModificationType>>()
@@ -217,9 +217,9 @@ class RecordMenuFragment : PermanentBottomSheetFragment() {
     }
 
     private fun showShareManagementFragment() {
-        shareManagementFragment = ShareManagementFragment()
-        shareManagementFragment?.setBundleArguments(record, viewModel.getShareByUrlVO())
-        shareManagementFragment?.show(parentFragmentManager, shareManagementFragment?.tag)
+        val shareManagementScreen = ShareLinkFragment()
+        shareManagementScreen.setBundleArguments(record, viewModel.getShareByUrlVO())
+        shareManagementScreen.show(parentFragmentManager, shareManagementScreen.tag)
     }
 
     private fun showConfirmationDialogForPublish() {
diff --git a/app/src/main/java/org/permanent/permanent/ui/recordMenu/compose/RecordMenuScreen.kt b/app/src/main/java/org/permanent/permanent/ui/recordMenu/compose/RecordMenuScreen.kt
index 9c028766..95a1655a 100644
--- a/app/src/main/java/org/permanent/permanent/ui/recordMenu/compose/RecordMenuScreen.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/recordMenu/compose/RecordMenuScreen.kt
@@ -153,7 +153,7 @@ fun RecordMenuHeader(
     recordName: String,
     recordSize: String,
     recordDate: String,
-    onCloseClick: () -> Unit
+    onCloseClick: (() -> Unit)? = null
 ) {
     Row(
         modifier = Modifier
@@ -224,12 +224,14 @@ fun RecordMenuHeader(
         Spacer(modifier = Modifier.width(16.dp))
 
         // Close Icon
-        IconButton(onClick = onCloseClick) {
-            Icon(
+        if (onCloseClick != null) {
+            IconButton(onClick = onCloseClick) {
+                Icon(
                 painter = painterResource(id = R.drawable.ic_close_light_blue),
                 contentDescription = "Close",
                 tint = colorResource(R.color.blue400),
-            )
+                    )
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/settings/compose/twoStepVerification/TwoStepEnabledScreen.kt b/app/src/main/java/org/permanent/permanent/ui/settings/compose/twoStepVerification/TwoStepEnabledScreen.kt
index 3a3fc27d..941afbbb 100644
--- a/app/src/main/java/org/permanent/permanent/ui/settings/compose/twoStepVerification/TwoStepEnabledScreen.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/settings/compose/twoStepVerification/TwoStepEnabledScreen.kt
@@ -235,7 +235,7 @@ private fun TabletBody(
             HorizontalDivider(
                 modifier = Modifier.fillMaxWidth(),
                 thickness = 1.dp,
-                color = colorResource(id = R.color.dividerBlue)
+                color = colorResource(id = R.color.blue100)
             )
 
             Spacer(modifier = Modifier.height(24.dp))
@@ -410,7 +410,7 @@ private fun PhoneBody(
             HorizontalDivider(
                 modifier = Modifier.fillMaxWidth(),
                 thickness = 1.dp,
-                color = colorResource(id = R.color.dividerBlue)
+                color = colorResource(id = R.color.blue100)
             )
 
             Spacer(modifier = Modifier.height(24.dp))
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareLinkFragment.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareLinkFragment.kt
new file mode 100644
index 00000000..9f2c9fcf
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareLinkFragment.kt
@@ -0,0 +1,86 @@
+package org.permanent.permanent.ui.shareManagement
+
+import android.graphics.Color
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
+import androidx.compose.ui.platform.ComposeView
+import androidx.compose.ui.unit.dp
+import androidx.core.os.bundleOf
+import androidx.lifecycle.ViewModelProvider
+import com.google.android.material.bottomsheet.BottomSheetBehavior
+import com.google.android.material.bottomsheet.BottomSheetDialog
+import org.permanent.permanent.models.Record
+import org.permanent.permanent.network.models.Shareby_urlVO
+import org.permanent.permanent.ui.PermanentBottomSheetFragment
+import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
+import org.permanent.permanent.ui.shareManagement.compose.ShareManagementContainer
+import org.permanent.permanent.viewmodels.ShareManagementViewModel
+
+class ShareLinkFragment : PermanentBottomSheetFragment()  {
+
+    private var record: Record? = null
+
+    private lateinit var viewModel: ShareManagementViewModel
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View {
+        viewModel = ViewModelProvider(this)[ShareManagementViewModel::class.java]
+        record = arguments?.getParcelable(PARCELABLE_RECORD_KEY)
+        record?.let {
+            viewModel.setRecord(it)
+        }
+        viewModel.setShareLink(arguments?.getParcelable(SHARE_BY_URL_VO_KEY))
+
+        return ComposeView(requireContext()).apply {
+            setContent {
+                MaterialTheme {
+                    Surface(
+                        shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp),
+                        ) {
+                        ShareManagementContainer(
+                            viewModel = viewModel,
+                            onClose = { dismiss() }
+                        )
+                    }
+                }
+            }
+        }
+    }
+
+    fun setBundleArguments(record: Record?, shareByUrlVO: Shareby_urlVO?) {
+        val bundle = bundleOf(PARCELABLE_RECORD_KEY to record, SHARE_BY_URL_VO_KEY to shareByUrlVO)
+        this.arguments = bundle
+    }
+
+    override fun onStart() {
+        super.onStart()
+        (dialog as? BottomSheetDialog)?.behavior?.apply {
+            state = BottomSheetBehavior.STATE_EXPANDED
+            skipCollapsed = true
+            isHideable = false
+            try {
+                this.isDraggable = false
+            } catch (ignored: Throwable) {
+            }
+        }
+        // transparent background so Compose Surface can draw rounded corners
+        (requireView().parent as? View)?.setBackgroundColor(Color.TRANSPARENT)
+    }
+
+    override fun connectViewModelEvents() {}
+
+    override fun disconnectViewModelEvents() {}
+
+    companion object {
+        const val PARCELABLE_SHARE_KEY = "parcelable_share_key"
+        const val SHARE_BY_URL_VO_KEY = "share_by_url_vo_key"
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareManagementFragment.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareManagementFragment.kt
deleted file mode 100644
index 2855521f..00000000
--- a/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareManagementFragment.kt
+++ /dev/null
@@ -1,266 +0,0 @@
-package org.permanent.permanent.ui.shareManagement
-
-import android.app.DatePickerDialog
-import android.app.Dialog
-import android.content.DialogInterface
-import android.content.Intent
-import android.graphics.Typeface
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import android.widget.FrameLayout
-import android.widget.TextView
-import androidx.activity.OnBackPressedCallback
-import androidx.core.content.ContextCompat
-import androidx.core.os.bundleOf
-import androidx.databinding.DataBindingUtil
-import androidx.lifecycle.Observer
-import androidx.lifecycle.ViewModelProvider
-import androidx.navigation.fragment.findNavController
-import androidx.recyclerview.widget.LinearLayoutManager
-import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetDialog
-import com.google.android.material.snackbar.Snackbar
-import org.permanent.permanent.R
-import org.permanent.permanent.databinding.DialogDeleteBinding
-import org.permanent.permanent.databinding.FragmentShareManagementBinding
-import org.permanent.permanent.models.AccessRole
-import org.permanent.permanent.models.AccountEventAction
-import org.permanent.permanent.models.Record
-import org.permanent.permanent.models.Share
-import org.permanent.permanent.network.models.Shareby_urlVO
-import org.permanent.permanent.ui.AccessRolesFragment
-import org.permanent.permanent.ui.PermanentBottomSheetFragment
-import org.permanent.permanent.ui.fileView.FileActivity
-import org.permanent.permanent.ui.myFiles.PARCELABLE_RECORD_KEY
-import org.permanent.permanent.viewmodels.ShareManagementViewModel
-import java.util.Calendar
-
-class ShareManagementFragment : PermanentBottomSheetFragment() {
-
-    private lateinit var viewModel: ShareManagementViewModel
-    private lateinit var binding: FragmentShareManagementBinding
-    private lateinit var pendingSharesRecyclerView: RecyclerView
-    private lateinit var pendingSharesAdapter: SharesAdapter
-    private lateinit var sharesRecyclerView: RecyclerView
-    private lateinit var sharesAdapter: SharesAdapter
-    private var record: Record? = null
-    private var shareToEdit: Share? = null
-    private var accessRolesFragment: AccessRolesFragment? = null
-
-    fun setBundleArguments(record: Record?, shareByUrlVO: Shareby_urlVO?) {
-        val bundle = bundleOf(PARCELABLE_RECORD_KEY to record, SHARE_BY_URL_VO_KEY to shareByUrlVO)
-        this.arguments = bundle
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View {
-        viewModel = ViewModelProvider(this)[ShareManagementViewModel::class.java]
-        binding = FragmentShareManagementBinding.inflate(inflater, container, false)
-        binding.executePendingBindings()
-        binding.lifecycleOwner = this
-        binding.viewModel = viewModel
-        record = arguments?.getParcelable(PARCELABLE_RECORD_KEY)
-        record?.let {
-            viewModel.setRecord(it)
-            initPendingSharesRecyclerView(binding.rvPendingShares)
-            initSharesRecyclerView(binding.rvShares)
-        }
-        viewModel.setShareLink(arguments?.getParcelable(SHARE_BY_URL_VO_KEY))
-        if (activity is FileActivity) {
-            (activity as FileActivity).setToolbarAndStatusBarColor(R.color.colorPrimary)
-        }
-        return binding.root
-    }
-
-    override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val bottomSheetDialog = super.onCreateDialog(savedInstanceState) as BottomSheetDialog
-        bottomSheetDialog.setOnShowListener { dialog: DialogInterface ->
-            val dialogc = dialog as BottomSheetDialog
-            val bottomSheet =
-                dialogc.findViewById<FrameLayout>(com.google.android.material.R.id.design_bottom_sheet)
-            BottomSheetBehavior.from(bottomSheet as FrameLayout)
-                .setState(BottomSheetBehavior.STATE_EXPANDED)
-        }
-        return bottomSheetDialog
-    }
-
-    private fun initPendingSharesRecyclerView(rvPendingShares: RecyclerView) {
-        pendingSharesRecyclerView = rvPendingShares
-        pendingSharesAdapter = SharesAdapter(viewModel.getPendingShares(), viewModel)
-        pendingSharesRecyclerView.apply {
-            setHasFixedSize(true)
-            layoutManager = LinearLayoutManager(context)
-            adapter = pendingSharesAdapter
-        }
-    }
-
-    private fun initSharesRecyclerView(rvShares: RecyclerView) {
-        sharesRecyclerView = rvShares
-        sharesAdapter = SharesAdapter(viewModel.getShares(), viewModel)
-        sharesRecyclerView.apply {
-            setHasFixedSize(true)
-            layoutManager = LinearLayoutManager(context)
-            adapter = sharesAdapter
-        }
-    }
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        // Device's back press
-        requireActivity().onBackPressedDispatcher
-            .addCallback(this, object : OnBackPressedCallback(true) {
-                override fun handleOnBackPressed() {
-                    if (activity is FileActivity) {
-                        (activity as FileActivity).setToolbarAndStatusBarColor(R.color.black)
-                    }
-                    findNavController().popBackStack(R.id.shareLinkFragment, true)
-                }
-            })
-    }
-
-    private val showSnackbarSuccess = Observer<String> { message ->
-        val snackBar = Snackbar.make(binding.root, message, Snackbar.LENGTH_LONG)
-        val view: View = snackBar.view
-        context?.let {
-            view.setBackgroundColor(ContextCompat.getColor(it, R.color.deepGreen))
-            snackBar.setTextColor(ContextCompat.getColor(it, R.color.paleGreen))
-        }
-        val snackbarTextTextView = view.findViewById(R.id.snackbar_text) as TextView
-        snackbarTextTextView.setTypeface(snackbarTextTextView.typeface, Typeface.BOLD)
-        snackBar.show()
-    }
-
-    private val showSnackbar = Observer<String> { message ->
-        Snackbar.make(binding.root, message, Snackbar.LENGTH_LONG).show()
-    }
-
-    private val onShareLinkObserver = Observer<String> {
-        val sendIntent: Intent = Intent().apply {
-            action = Intent.ACTION_SEND
-            putExtra(Intent.EXTRA_TEXT, it)
-            type = "text/plain"
-        }
-
-        val shareIntent = Intent.createChooser(sendIntent, null)
-        startActivity(shareIntent)
-        viewModel.sendEvent(AccountEventAction.COPY_SHARE_LINK)
-    }
-
-    private val onRevokeLinkRequest = Observer<Void?> {
-        val dialogBinding: DialogDeleteBinding = DataBindingUtil.inflate(
-            LayoutInflater.from(context), R.layout.dialog_delete, null, false
-        )
-        val alert = android.app.AlertDialog.Builder(context).setView(dialogBinding.root).create()
-
-        dialogBinding.tvTitle.text = getString(R.string.share_management_revoke_title)
-        dialogBinding.btnDelete.text = getString(R.string.share_management_revoke_button)
-        dialogBinding.btnDelete.setOnClickListener {
-            viewModel.deleteShareLink()
-            alert.dismiss()
-        }
-        dialogBinding.btnCancel.setOnClickListener {
-            alert.dismiss()
-        }
-        alert.show()
-    }
-
-    private val onShareApproved = Observer<Share> {
-        pendingSharesAdapter.remove(it)
-        sharesAdapter.add(it)
-    }
-
-    private val onShareRemoved = Observer<Share> {
-        viewModel.onShareRemoved(it)
-        sharesAdapter.remove(it)
-        record?.shares?.remove(it)
-    }
-
-    private val showAccessRolesForShareObserver = Observer<Share> { share ->
-        shareToEdit = share
-        accessRolesFragment = AccessRolesFragment()
-        accessRolesFragment?.setBundleArguments(share)
-        accessRolesFragment?.getOnAccessRoleUpdated()
-            ?.observe(this, onAccessRoleForShareUpdatedObserver)
-        accessRolesFragment?.show(parentFragmentManager, accessRolesFragment?.tag)
-    }
-
-    private val showAccessRolesForLinkObserver = Observer<Shareby_urlVO> {
-        accessRolesFragment = AccessRolesFragment()
-        accessRolesFragment?.setBundleArguments(it)
-        accessRolesFragment?.getOnAccessRoleUpdated()
-            ?.observe(this, onAccessRoleForLinkUpdatedObserver)
-        accessRolesFragment?.show(parentFragmentManager, accessRolesFragment?.tag)
-    }
-
-    private val onAccessRoleForLinkUpdatedObserver = Observer<AccessRole> {
-        viewModel.onAccessRoleUpdated(it)
-    }
-
-    private val onAccessRoleForShareUpdatedObserver = Observer<AccessRole?> {
-        if (it == null) {
-            shareToEdit?.let { share -> onShareRemoved.onChanged(share) }
-        } else {
-            shareToEdit?.accessRole = it
-            shareToEdit?.let { share -> sharesAdapter.update(share) }
-        }
-    }
-
-    private val onShowDatePicker = Observer<Void?> {
-        context?.let { context ->
-            val c = Calendar.getInstance()
-            val year = c.get(Calendar.YEAR)
-            val month = c.get(Calendar.MONTH)
-            val day = c.get(Calendar.DAY_OF_MONTH)
-            DatePickerDialog(context, viewModel, year, month, day).show()
-        }
-    }
-
-    override fun connectViewModelEvents() {
-        viewModel.getShowSnackbar().observe(this, showSnackbar)
-        viewModel.getShowSnackbarSuccess().observe(this, showSnackbarSuccess)
-        viewModel.getOnShareLinkRequest().observe(this, onShareLinkObserver)
-        viewModel.getShowAccessRolesForShare().observe(this, showAccessRolesForShareObserver)
-        viewModel.getOnRevokeLinkRequest().observe(this, onRevokeLinkRequest)
-        viewModel.getOnShareApproved().observe(this, onShareApproved)
-        viewModel.getOnShareDenied().observe(this, onShareRemoved)
-        viewModel.getShowAccessRolesForLink().observe(this, showAccessRolesForLinkObserver)
-        viewModel.getShowDatePicker().observe(this, onShowDatePicker)
-    }
-
-    override fun disconnectViewModelEvents() {
-        viewModel.getShowSnackbar().removeObserver(showSnackbar)
-        viewModel.getShowSnackbarSuccess().removeObserver(showSnackbarSuccess)
-        viewModel.getOnShareLinkRequest().removeObserver(onShareLinkObserver)
-        viewModel.getShowAccessRolesForShare().removeObserver(showAccessRolesForShareObserver)
-        viewModel.getOnRevokeLinkRequest().removeObserver(onRevokeLinkRequest)
-        viewModel.getOnShareApproved().removeObserver(onShareApproved)
-        viewModel.getOnShareDenied().removeObserver(onShareRemoved)
-        viewModel.getShowAccessRolesForLink().removeObserver(showAccessRolesForLinkObserver)
-        viewModel.getShowDatePicker().removeObserver(onShowDatePicker)
-        accessRolesFragment?.getOnAccessRoleUpdated()
-            ?.removeObserver(onAccessRoleForLinkUpdatedObserver)
-        accessRolesFragment?.getOnAccessRoleUpdated()
-            ?.removeObserver(onAccessRoleForShareUpdatedObserver)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        connectViewModelEvents()
-    }
-
-    override fun onPause() {
-        super.onPause()
-        disconnectViewModelEvents()
-    }
-
-    companion object {
-        const val PARCELABLE_SHARE_KEY = "parcelable_share_key"
-        const val SHARE_BY_URL_VO_KEY = "share_by_url_vo_key"
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/AccessRolesPage.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/AccessRolesPage.kt
new file mode 100644
index 00000000..ef599a3c
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/AccessRolesPage.kt
@@ -0,0 +1,102 @@
+package org.permanent.permanent.ui.shareManagement.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.permanent.permanent.R
+import org.permanent.permanent.models.AccessRole
+import org.permanent.permanent.ui.composeComponents.LinkSettingsMenuItem
+import org.permanent.permanent.viewmodels.ShareManagementViewModel
+
+@Composable
+fun AccessRolesPage(
+    viewModel: ShareManagementViewModel,
+    onClose: () -> Unit,
+) {
+    val selectedAccessRole by viewModel.selectedAccessRole.collectAsState()
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.White)
+    ) {
+        Column(
+            modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Top
+        ) {
+
+            NavigationHeader(
+                title = stringResource(R.string.select_access_role),
+                onBackBtnClick = { viewModel.onBackBtnClick(SharePage.ACCESS_ROLES) },
+                onCloseClick = onClose
+            )
+
+            val isOwnerSelected = selectedAccessRole == AccessRole.OWNER
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_owner_green),
+                title = AccessRole.OWNER.toTitleCase(),
+                subtitle = stringResource(R.string.owner_description),
+                isSelected = isOwnerSelected
+            ) { viewModel.onAccessRoleClick(AccessRole.OWNER) }
+
+            HorizontalDivider(
+                thickness = 1.dp, color = colorResource(R.color.blue25)
+            )
+
+            val isCuratorSelected = selectedAccessRole == AccessRole.CURATOR
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_curator_green),
+                title = AccessRole.CURATOR.toTitleCase(),
+                subtitle = stringResource(R.string.curator_description),
+                isSelected = isCuratorSelected
+            ) { viewModel.onAccessRoleClick(AccessRole.CURATOR) }
+
+            HorizontalDivider(
+                thickness = 1.dp, color = colorResource(R.color.blue25)
+            )
+
+            val isEditorSelected = selectedAccessRole == AccessRole.EDITOR
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_editor_green),
+                title = AccessRole.EDITOR.toTitleCase(),
+                subtitle = stringResource(R.string.editor_description),
+                isSelected = isEditorSelected
+            ) { viewModel.onAccessRoleClick(AccessRole.EDITOR) }
+
+            HorizontalDivider(
+                thickness = 1.dp, color = colorResource(R.color.blue25)
+            )
+
+            val isContributorSelected = selectedAccessRole == AccessRole.CONTRIBUTOR
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_contributor_green),
+                title = AccessRole.CONTRIBUTOR.toTitleCase(),
+                subtitle = stringResource(R.string.contributor_description),
+                isSelected = isContributorSelected
+            ) { viewModel.onAccessRoleClick(AccessRole.CONTRIBUTOR) }
+
+            HorizontalDivider(
+                thickness = 1.dp, color = colorResource(R.color.blue25)
+            )
+
+            val isViewerSelected = selectedAccessRole == AccessRole.VIEWER
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_viewer_green),
+                title = AccessRole.VIEWER.toTitleCase(),
+                subtitle = stringResource(R.string.viewer_description),
+                isSelected = isViewerSelected
+            ) { viewModel.onAccessRoleClick(AccessRole.VIEWER) }
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/GeneralAccessPage.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/GeneralAccessPage.kt
new file mode 100644
index 00000000..dbae7bbf
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/GeneralAccessPage.kt
@@ -0,0 +1,79 @@
+package org.permanent.permanent.ui.shareManagement.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.permanent.permanent.R
+import org.permanent.permanent.ui.composeComponents.LinkSettingsMenuItem
+import org.permanent.permanent.viewmodels.ShareManagementViewModel
+
+@Composable
+fun GeneralAccessPage(
+    viewModel: ShareManagementViewModel,
+    onClose: () -> Unit,
+) {
+    val selectedAccessType by viewModel.selectedGeneralAccessType.collectAsState()
+
+    Box(
+        modifier = Modifier
+            .fillMaxSize()
+            .background(Color.White)
+    ) {
+        Column(
+            modifier = Modifier.fillMaxSize(), verticalArrangement = Arrangement.Top
+        ) {
+
+            NavigationHeader(
+                title = stringResource(R.string.general_access),
+                onBackBtnClick = { viewModel.onBackBtnClick(SharePage.GENERAL_ACCESS) },
+                onCloseClick = onClose
+            )
+
+            val isAnyoneSelected = selectedAccessType == AccessType.ANYONE_CAN_VIEW
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_globe_green),
+                title = stringResource(R.string.anyone_can_view),
+                subtitle = stringResource(R.string.anyone_can_view_description),
+                isSelected = isAnyoneSelected
+            ) { viewModel.onGeneralAccessItemClick(AccessType.ANYONE_CAN_VIEW) }
+
+            HorizontalDivider(
+                thickness = 1.dp, color = colorResource(R.color.blue25)
+            )
+
+            val isRestrictedSelected = selectedAccessType == AccessType.RESTRICTED
+            LinkSettingsMenuItem(
+                iconResource = painterResource(id = R.drawable.ic_lock_green),
+                title = stringResource(R.string.restricted),
+                subtitle = stringResource(R.string.restricted_description),
+                isSelected = isRestrictedSelected
+            ) { viewModel.onGeneralAccessItemClick(AccessType.RESTRICTED) }
+
+            HorizontalDivider(
+                thickness = 1.dp, color = colorResource(R.color.blue25)
+            )
+        }
+    }
+}
+
+enum class AccessType(val value: Int) {
+    ANYONE_CAN_VIEW(0), RESTRICTED(1);
+
+    val backendValue: String
+        get() = when (this) {
+            ANYONE_CAN_VIEW -> "none"
+            RESTRICTED -> "approval"
+        }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/LinkSettingsPage.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/LinkSettingsPage.kt
new file mode 100644
index 00000000..e85a01f6
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/LinkSettingsPage.kt
@@ -0,0 +1,673 @@
+package org.permanent.permanent.ui.shareManagement.compose
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.PaddingValues
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.lazy.LazyColumn
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Scaffold
+import androidx.compose.material3.Surface
+import androidx.compose.material3.Text
+import androidx.compose.material3.TextButton
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.graphics.painter.Painter
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.intl.Locale
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.text.toUpperCase
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.permanent.permanent.R
+import org.permanent.permanent.models.AccessRole
+import org.permanent.permanent.ui.composeComponents.ButtonColor
+import org.permanent.permanent.ui.composeComponents.CenteredTextAndIconButton
+import org.permanent.permanent.ui.composeComponents.ConfirmationBottomSheet
+import org.permanent.permanent.viewmodels.ShareManagementViewModel
+import java.time.LocalDate
+import java.time.format.DateTimeFormatter
+
+@Composable
+fun LinkSettingsPage(
+    viewModel: ShareManagementViewModel,
+    onClose: () -> Unit,
+) {
+    val shareLink by viewModel.shareLink.collectAsState()
+    val selectedGeneralAccessType by viewModel.selectedGeneralAccessType.collectAsState()
+    val selectedAccessRole by viewModel.selectedAccessRole.collectAsState()
+    val selectedLinkDuration by viewModel.selectedLinkDuration.collectAsState()
+    var showRevokeConfirmation by remember { mutableStateOf(false) }
+    val durationOptions = remember { LinkDuration.entries }
+
+    Scaffold(
+        modifier = Modifier.fillMaxSize(),
+        topBar = {
+            NavigationHeader(
+                title = stringResource(R.string.link_settings),
+                onBackBtnClick = { viewModel.onBackBtnClick(SharePage.LINK_SETTINGS) },
+                onCloseClick = onClose
+            )
+        },
+        bottomBar = {
+            Column {
+                // Top gradient fade
+                Box(
+                    modifier = Modifier
+                        .fillMaxWidth()
+                        .height(16.dp)
+                        .background(
+                            Brush.verticalGradient(
+                                colors = listOf(
+                                    Color.Transparent,
+                                    Color.White
+                                )
+                            )
+                        )
+                )
+
+                // Buttons container
+                Surface(color = Color.White, tonalElevation = 4.dp) {
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(start = 24.dp, end = 24.dp, bottom = 24.dp, top = 16.dp),
+                        horizontalArrangement = Arrangement.spacedBy(24.dp)
+                    ) {
+                        Box(modifier = Modifier.weight(1f)) {
+                            CenteredTextAndIconButton(
+                                buttonColor = ButtonColor.LIGHT_BLUE,
+                                text = stringResource(id = R.string.button_cancel),
+                                icon = null,
+                                onButtonClick = { viewModel.onBackBtnClick(SharePage.LINK_SETTINGS) })
+                        }
+
+                        Box(modifier = Modifier.weight(1f)) {
+                            CenteredTextAndIconButton(
+                                buttonColor = ButtonColor.DARK,
+                                text = stringResource(id = R.string.done),
+                                icon = null,
+                                onButtonClick = { viewModel.onDoneBtnClick() })
+                        }
+                    }
+                }
+            }
+        },
+        containerColor = Color.White
+    ) { innerPadding ->
+        // only this area scrolls; topBar and bottomBar remain fixed
+        LazyColumn(
+            contentPadding = innerPadding,
+            modifier = Modifier
+                .fillMaxSize()
+                .background(colorResource(R.color.blue25))
+        ) {
+            item {
+                LinkRow(
+                    shareLink = viewModel.cleanUrlRegex(shareLink),
+                    onCopyClick = { viewModel.copyLinkToClipboard() }
+                )
+            }
+
+            item {
+                Column(
+                    modifier = Modifier
+                        .fillParentMaxHeight()
+                        .fillMaxWidth()
+                        .background(Color.White)
+                        .padding(24.dp)
+                ) {
+                    // General access header + row
+                    Text(
+                        text = stringResource(R.string.general_access).toUpperCase(Locale.current),
+                        style = TextStyle(
+                            fontSize = 10.sp,
+                            lineHeight = 8.sp,
+                            fontFamily = FontFamily(Font(R.font.usual_regular)),
+                            color = colorResource(R.color.colorPrimary),
+                            letterSpacing = 1.6.sp,
+                        )
+                    )
+
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    Row(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .clickable { viewModel.onGeneralAccessClick() },
+                        verticalAlignment = Alignment.CenterVertically
+                    ) {
+                        Box(
+                            modifier = Modifier
+                                .size(32.dp)
+                                .background(
+                                    colorResource(R.color.success50),
+                                    RoundedCornerShape(4.dp)
+                                ),
+                            contentAlignment = Alignment.Center
+                        ) {
+                            Icon(
+                                painter = painterResource(
+                                    id = when (selectedGeneralAccessType) {
+                                        AccessType.ANYONE_CAN_VIEW -> R.drawable.ic_globe_green
+                                        AccessType.RESTRICTED -> R.drawable.ic_lock_green
+                                    }
+                                ), contentDescription = "", tint = Color.Unspecified
+                            )
+                        }
+
+                        Spacer(modifier = Modifier.width(16.dp))
+
+                        Text(
+                            text = when (selectedGeneralAccessType) {
+                                AccessType.ANYONE_CAN_VIEW -> stringResource(R.string.anyone_can_view)
+                                AccessType.RESTRICTED -> stringResource(R.string.restricted)
+                            }, modifier = Modifier.weight(1f), style = TextStyle(
+                                fontSize = 14.sp,
+                                lineHeight = 24.sp,
+                                fontFamily = FontFamily(Font(R.font.usual_medium)),
+                                color = colorResource(R.color.colorPrimary),
+                            )
+                        )
+
+                        Spacer(modifier = Modifier.width(16.dp))
+
+                        Icon(
+                            painter = painterResource(id = R.drawable.ic_arrow_select_light_blue),
+                            contentDescription = null,
+                            tint = Color.Unspecified,
+                            modifier = Modifier.size(12.dp)
+                        )
+
+                        Spacer(modifier = Modifier.width(12.dp))
+                    }
+
+                    // default access role only when restricted
+                    if (selectedGeneralAccessType == AccessType.RESTRICTED) {
+                        Spacer(modifier = Modifier.height(24.dp))
+
+                        Text(
+                            text = stringResource(R.string.default_access_role).toUpperCase(Locale.current),
+                            style = TextStyle(
+                                fontSize = 10.sp,
+                                lineHeight = 8.sp,
+                                fontFamily = FontFamily(Font(R.font.usual_regular)),
+                                color = colorResource(R.color.colorPrimary),
+                                letterSpacing = 1.6.sp,
+                            )
+                        )
+
+                        Spacer(modifier = Modifier.height(16.dp))
+
+                        Row(
+                            modifier = Modifier
+                                .fillMaxWidth()
+                                .clickable { viewModel.onDefaultAccessRoleClick() },
+                            verticalAlignment = Alignment.CenterVertically
+                        ) {
+                            Box(
+                                modifier = Modifier
+                                    .size(32.dp)
+                                    .background(
+                                        colorResource(R.color.success50),
+                                        RoundedCornerShape(4.dp)
+                                    ),
+                                contentAlignment = Alignment.Center
+                            ) {
+                                Icon(
+                                    painter = painterResource(
+                                        id = when (selectedAccessRole) {
+                                            AccessRole.VIEWER -> R.drawable.ic_viewer_green
+                                            AccessRole.CONTRIBUTOR -> R.drawable.ic_contributor_green
+                                            AccessRole.EDITOR -> R.drawable.ic_editor_green
+                                            AccessRole.CURATOR -> R.drawable.ic_curator_green
+                                            AccessRole.OWNER -> R.drawable.ic_owner_green
+                                            AccessRole.MANAGER -> TODO()
+                                        }
+                                    ), contentDescription = "", tint = Color.Unspecified
+                                )
+                            }
+
+                            Spacer(modifier = Modifier.width(16.dp))
+
+                            Text(
+                                text = when (selectedAccessRole) {
+                                    AccessRole.VIEWER -> AccessRole.VIEWER.toTitleCase()
+                                    AccessRole.CONTRIBUTOR -> AccessRole.CONTRIBUTOR.toTitleCase()
+                                    AccessRole.EDITOR -> AccessRole.EDITOR.toTitleCase()
+                                    AccessRole.CURATOR -> AccessRole.CURATOR.toTitleCase()
+                                    AccessRole.OWNER -> AccessRole.OWNER.toTitleCase()
+                                    AccessRole.MANAGER -> AccessRole.MANAGER.toTitleCase()
+                                }, modifier = Modifier.weight(1f), style = TextStyle(
+                                    fontSize = 14.sp,
+                                    lineHeight = 24.sp,
+                                    fontFamily = FontFamily(Font(R.font.usual_medium)),
+                                    color = colorResource(R.color.colorPrimary),
+                                )
+                            )
+
+                            Spacer(modifier = Modifier.width(16.dp))
+
+                            Icon(
+                                painter = painterResource(id = R.drawable.ic_arrow_select_light_blue),
+                                contentDescription = null,
+                                tint = Color.Unspecified,
+                                modifier = Modifier.size(12.dp)
+                            )
+
+                            Spacer(modifier = Modifier.width(12.dp))
+                        }
+                    }
+
+                    Spacer(modifier = Modifier.height(24.dp))
+
+                    // Link expiration
+                    Text(
+                        text = stringResource(R.string.link_expiration).toUpperCase(Locale.current),
+                        style = TextStyle(
+                            fontSize = 10.sp,
+                            lineHeight = 8.sp,
+                            fontFamily = FontFamily(Font(R.font.usual_regular)),
+                            color = colorResource(R.color.colorPrimary),
+                            letterSpacing = 1.6.sp,
+                        )
+                    )
+
+                    Spacer(modifier = Modifier.height(16.dp))
+
+                    Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            val option1 = durationOptions[0] // ONE_DAY
+                            val option2 = durationOptions[1] // ONE_MONTH
+
+                            DurationOption(
+                                icon = painterResource(id = option1.iconRes),
+                                label = stringResource(option1.labelRes),
+                                selected = selectedLinkDuration == option1,
+                                onClick = { viewModel.onLinkDurationSelected(option1) },
+                                modifier = Modifier.weight(1f)
+                            )
+
+                            DurationOption(
+                                icon = painterResource(id = option2.iconRes),
+                                label = stringResource(option2.labelRes),
+                                selected = selectedLinkDuration == option2,
+                                onClick = { viewModel.onLinkDurationSelected(option2) },
+                                modifier = Modifier.weight(1f),
+                            )
+                        }
+
+                        Row(horizontalArrangement = Arrangement.spacedBy(8.dp)) {
+                            val option3 = durationOptions[2] // ONE_YEAR
+                            val option4 = durationOptions[3] // NEVER
+
+                            DurationOption(
+                                icon = painterResource(id = option3.iconRes),
+                                label = stringResource(option3.labelRes),
+                                selected = selectedLinkDuration == option3,
+                                onClick = { viewModel.onLinkDurationSelected(option3) },
+                                modifier = Modifier.weight(1f),
+                            )
+
+                            DurationOption(
+                                icon = painterResource(id = option4.iconRes),
+                                label = stringResource(option4.labelRes),
+                                selected = selectedLinkDuration == option4,
+                                onClick = { viewModel.onLinkDurationSelected(option4) },
+                                modifier = Modifier.weight(1f),
+                            )
+                        }
+                    }
+
+                    Spacer(Modifier.height(16.dp))
+
+                    InfoBanner(duration = selectedLinkDuration)
+
+                    Spacer(Modifier.height(24.dp))
+
+                    HorizontalDivider(thickness = 1.dp, color = colorResource(R.color.blue50))
+
+                    Spacer(Modifier.height(16.dp))
+
+                    RevokeLink(onClick = { showRevokeConfirmation = true })
+                }
+            }
+        }
+    }
+
+    if (showRevokeConfirmation) {
+        ConfirmationBottomSheet(
+            message = stringResource(R.string.confirm_revoke_link_message),
+            boldText = stringResource(R.string.revoke_this_share_link),
+            confirmationButtonText = stringResource(id = R.string.revoke_link),
+            onConfirm = {
+                showRevokeConfirmation = false
+                viewModel.revokeLink()
+            },
+            onDismiss = {
+                showRevokeConfirmation = false
+            })
+    }
+}
+
+@Composable
+fun NavigationHeader(
+    title: String, onBackBtnClick: () -> Unit, onCloseClick: (() -> Unit)? = null
+) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(colorResource(R.color.white))
+                .padding(12.dp), contentAlignment = Alignment.Center
+        ) {
+            IconButton(
+                onClick = onBackBtnClick, modifier = Modifier.align(Alignment.CenterStart)
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_arrow_back_blue),
+                    contentDescription = "Back",
+                    tint = Color.Unspecified,
+                )
+            }
+
+            Text(
+                text = title, style = TextStyle(
+                    fontSize = 16.sp,
+                    lineHeight = 24.sp,
+                    fontFamily = FontFamily(Font(R.font.usual_medium)),
+                    color = colorResource(R.color.blue900),
+                    textAlign = TextAlign.Center
+                ), maxLines = 1, overflow = TextOverflow.Ellipsis
+            )
+
+            if (onCloseClick != null) {
+                IconButton(
+                    onClick = onCloseClick, modifier = Modifier.align(Alignment.CenterEnd)
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_close_light_blue),
+                        contentDescription = "Close",
+                        tint = colorResource(R.color.blue200),
+                    )
+                }
+            }
+        }
+
+        HorizontalDivider(
+            thickness = 1.dp, color = colorResource(R.color.blue100)
+        )
+    }
+}
+
+@Composable
+fun LinkRow(
+    shareLink: String, onCopyClick: () -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(colorResource(R.color.blue25))
+            .padding(24.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.CenterVertically)
+                .border(
+                    width = 1.dp,
+                    color = colorResource(R.color.blue50),
+                    shape = RoundedCornerShape(10.dp)
+                )
+                .clip(RoundedCornerShape(10.dp))
+                .background(colorResource(R.color.white))
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_link_gradient),
+                    contentDescription = null,
+                    tint = Color.Unspecified,
+                    modifier = Modifier
+                        .size(44.dp)
+                        .clip(RoundedCornerShape(6.dp))
+                        .padding(8.dp)
+                )
+
+                Spacer(modifier = Modifier.width(8.dp))
+
+                Text(
+                    text = shareLink, modifier = Modifier.weight(1f), style = TextStyle(
+                        fontSize = 14.sp,
+                        lineHeight = 24.sp,
+                        fontFamily = FontFamily(Font(R.font.usual_regular)),
+                        textAlign = TextAlign.Left,
+                        brush = Brush.linearGradient(
+                            colors = listOf(
+                                colorResource(R.color.barneyPurple),
+                                colorResource(R.color.colorAccent)
+                            ), start = Offset(0f, 0f), end = Offset(300f, 300f)
+                        ),
+                    ), maxLines = 1, overflow = TextOverflow.Ellipsis
+                )
+
+                Row(
+                    modifier = Modifier
+                        .clickable { onCopyClick() }
+                        .padding(start = 8.dp, end = 12.dp, top = 8.dp, bottom = 8.dp),
+                    verticalAlignment = Alignment.CenterVertically) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_copy_blue),
+                        contentDescription = null,
+                        tint = Color.Unspecified
+                    )
+
+                    Spacer(modifier = Modifier.width(8.dp))
+
+                    Text(
+                        text = stringResource(R.string.copy), style = TextStyle(
+                            fontSize = 14.sp,
+                            lineHeight = 24.sp,
+                            fontFamily = FontFamily(Font(R.font.usual_medium)),
+                            color = colorResource(R.color.blue900)
+                        )
+                    )
+                }
+            }
+        }
+    }
+}
+
+@Composable
+private fun DurationOption(
+    icon: Painter,
+    label: String,
+    selected: Boolean,
+    onClick: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    val backgroundColor = if (selected) colorResource(R.color.blue25) else Color.Transparent
+    val gradientBrush = Brush.horizontalGradient(
+        colors = listOf(
+            colorResource(R.color.barneyPurple), colorResource(R.color.colorAccent)
+        )
+    )
+    val borderModifier = if (selected) {
+        Modifier.border(
+            width = 1.dp, brush = gradientBrush, shape = RoundedCornerShape(12.dp)
+        )
+    } else {
+        Modifier.border(
+            width = 1.dp, color = colorResource(R.color.blue100), shape = RoundedCornerShape(12.dp)
+        )
+    }
+
+    Surface(
+        modifier = modifier
+            .height(88.dp)
+            .clip(RoundedCornerShape(12.dp))
+            .clickable(onClick = onClick)
+            .then(borderModifier),
+        color = backgroundColor,
+        tonalElevation = if (selected) 2.dp else 0.dp
+    ) {
+        Box(
+            modifier = Modifier.fillMaxSize(), contentAlignment = Alignment.Center
+        ) {
+            Column(
+                verticalArrangement = Arrangement.spacedBy(8.dp),
+                horizontalAlignment = Alignment.CenterHorizontally
+            ) {
+                Icon(
+                    painter = icon,
+                    contentDescription = null,
+                    tint = Color.Unspecified,
+                    modifier = Modifier.size(24.dp)
+                )
+
+                Text(
+                    text = label, style = TextStyle(
+                        fontSize = 14.sp,
+                        lineHeight = 24.sp,
+                        fontFamily = FontFamily(Font(R.font.usual_regular)),
+                        fontWeight = if (selected) FontWeight.SemiBold else FontWeight.Normal,
+                        color = colorResource(if (selected) R.color.blue900 else R.color.blue600)
+                    )
+                )
+            }
+        }
+    }
+}
+
+@Composable
+private fun InfoBanner(
+    duration: LinkDuration, today: LocalDate = LocalDate.now()
+) {
+    val dateFormatter = remember { DateTimeFormatter.ofPattern("MMMM d, yyyy") }
+    val infoText = when (duration) {
+        LinkDuration.NEVER -> stringResource(R.string.link_never_expires)
+        else -> {
+            val date = duration.expirationDate(today)!!
+            stringResource(R.string.link_expires_on, date.format(dateFormatter))
+        }
+    }
+
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(12.dp))
+            .background(colorResource(R.color.warning50))
+            .border(1.dp, colorResource(R.color.warning100), RoundedCornerShape(12.dp))
+            .padding(8.dp), verticalAlignment = Alignment.CenterVertically
+    ) {
+        Icon(
+            painter = painterResource(id = R.drawable.ic_info_orange),
+            contentDescription = null,
+            tint = Color.Unspecified,
+        )
+
+        Spacer(Modifier.width(8.dp))
+
+        Text(
+            text = infoText, style = TextStyle(
+                fontSize = 12.sp,
+                lineHeight = 16.sp,
+                fontFamily = FontFamily(Font(R.font.usual_regular)),
+                color = colorResource(R.color.warning800)
+            )
+        )
+    }
+}
+
+@Composable
+private fun RevokeLink(onClick: () -> Unit) {
+    TextButton(
+        modifier = Modifier.fillMaxWidth(),
+        shape = RoundedCornerShape(12.dp),
+        contentPadding = PaddingValues(0.dp),
+        onClick = onClick
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.Start,
+            verticalAlignment = Alignment.CenterVertically
+        ) {
+            Icon(
+                painter = painterResource(id = R.drawable.ic_revoke_link),
+                contentDescription = null,
+                tint = Color.Unspecified,
+            )
+
+            Spacer(Modifier.width(16.dp))
+
+            Text(
+                text = stringResource(R.string.revoke_link), style = TextStyle(
+                    fontSize = 14.sp,
+                    lineHeight = 24.sp,
+                    fontFamily = FontFamily(Font(R.font.usual_regular)),
+                    color = colorResource(R.color.error500)
+                )
+            )
+        }
+    }
+}
+
+enum class LinkDuration(
+    @StringRes val labelRes: Int,
+    @DrawableRes val iconRes: Int,
+) {
+    ONE_DAY(
+        labelRes = R.string.one_day, iconRes = R.drawable.ic_one_day_blue
+    ),
+    ONE_MONTH(
+        labelRes = R.string.one_month, iconRes = R.drawable.ic_one_month_blue
+    ),
+    ONE_YEAR(
+        labelRes = R.string.one_year, iconRes = R.drawable.ic_one_year_blue
+    ),
+    NEVER(
+        labelRes = R.string.never, iconRes = R.drawable.ic_never_blue
+    );
+
+    fun expirationDate(from: LocalDate): LocalDate? = when (this) {
+        ONE_DAY -> from.plusDays(1)
+        ONE_MONTH -> from.plusMonths(1)
+        ONE_YEAR -> from.plusYears(1)
+        NEVER -> null
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/ShareManagementContainer.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/ShareManagementContainer.kt
new file mode 100644
index 00000000..450b47cf
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/ShareManagementContainer.kt
@@ -0,0 +1,100 @@
+package org.permanent.permanent.ui.shareManagement.compose
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.pager.HorizontalPager
+import androidx.compose.foundation.pager.rememberPagerState
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.LaunchedEffect
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.unit.dp
+import org.permanent.permanent.R
+import org.permanent.permanent.ui.composeComponents.AnimatedSnackbar
+import org.permanent.permanent.ui.composeComponents.CircularProgressIndicator
+import org.permanent.permanent.ui.composeComponents.SnackbarType
+import org.permanent.permanent.ui.shareManagement.shareLink.ShareLinkScreen
+import org.permanent.permanent.viewmodels.ShareManagementViewModel
+
+@Composable
+fun ShareManagementContainer(
+    viewModel: ShareManagementViewModel,
+    onClose: () -> Unit,
+) {
+    val isBusyState by viewModel.isBusyState.collectAsState()
+    val snackbarMessage by viewModel.snackbarMessage.collectAsState()
+    val snackbarType by viewModel.snackbarType.collectAsState()
+    val pagerState = rememberPagerState(
+        initialPage = SharePage.SHARE_ITEM.value, pageCount = { SharePage.entries.size })
+    val navigateToPage by viewModel.navigateToPage.collectAsState()
+
+    LaunchedEffect(navigateToPage) {
+        navigateToPage?.let { page ->
+            pagerState.animateScrollToPage(page.value)
+            viewModel.clearPageNavigation()
+        }
+    }
+
+    Box(
+        modifier = Modifier
+            .fillMaxHeight(0.95f)
+            .background(colorResource(id = R.color.blue900))
+    ) {
+        Row(
+            modifier = Modifier.fillMaxSize()
+        ) {
+            HorizontalPager(
+                state = pagerState, beyondViewportPageCount = 3, userScrollEnabled = false
+            ) { page ->
+                when (page) {
+                    SharePage.SHARE_ITEM.value -> {
+                        ShareLinkScreen(
+                            viewModel = viewModel, onClose = { onClose() })
+                    }
+
+                    SharePage.LINK_SETTINGS.value -> {
+                        LinkSettingsPage(
+                            viewModel = viewModel, onClose = { onClose() })
+                    }
+
+                    SharePage.GENERAL_ACCESS.value -> {
+                        GeneralAccessPage(
+                            viewModel = viewModel, onClose = { onClose() })
+                    }
+
+                    SharePage.ACCESS_ROLES.value -> {
+                        AccessRolesPage(
+                            viewModel = viewModel, onClose = { onClose() })
+                    }
+                }
+            }
+        }
+
+        AnimatedSnackbar(
+            modifier = Modifier
+                .align(Alignment.BottomCenter)
+                .padding(32.dp),
+            isForError = snackbarType == SnackbarType.ERROR,
+            message = snackbarMessage,
+            buttonText = stringResource(id = R.string.ok),
+            onButtonClick = {
+                viewModel.clearSnackbar()
+            })
+    }
+
+    if (isBusyState) {
+        CircularProgressIndicator(modifier = Modifier.fillMaxHeight(0.95f))
+    }
+}
+
+enum class SharePage(val value: Int) {
+    SHARE_ITEM(0), LINK_SETTINGS(1), GENERAL_ACCESS(2), ACCESS_ROLES(3)
+}
diff --git a/app/src/main/java/org/permanent/permanent/ui/shareManagement/shareLink/ShareLinkScreen.kt b/app/src/main/java/org/permanent/permanent/ui/shareManagement/shareLink/ShareLinkScreen.kt
new file mode 100644
index 00000000..061ed4a5
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/shareLink/ShareLinkScreen.kt
@@ -0,0 +1,307 @@
+package org.permanent.permanent.ui.shareManagement.shareLink
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxHeight
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.layout.wrapContentHeight
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.collectAsState
+import androidx.compose.runtime.getValue
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.geometry.Offset
+import androidx.compose.ui.graphics.Brush
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.colorResource
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
+import androidx.compose.ui.text.font.FontFamily
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import org.permanent.permanent.R
+import org.permanent.permanent.ui.composeComponents.CircularProgressIndicator
+import org.permanent.permanent.ui.composeComponents.OverlayColor
+import org.permanent.permanent.ui.recordMenu.compose.RecordMenuHeader
+import org.permanent.permanent.viewmodels.ShareManagementViewModel
+
+@Composable
+fun ShareLinkScreen(
+    viewModel: ShareManagementViewModel,
+    onClose: () -> Unit,
+) {
+
+    val recordThumbURL by viewModel.recordThumb.collectAsState()
+    val recordName by viewModel.recordName.collectAsState()
+    val recordSize by viewModel.recordSize.collectAsState()
+    val recordDate by viewModel.recordDate.collectAsState()
+    val shareLink by viewModel.shareLink.collectAsState()
+    val creatingLink by viewModel.isCreatingLinkState.collectAsState()
+    val isLinkSharedState by viewModel.isLinkSharedState.collectAsState()
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .fillMaxHeight()
+            .background(colorResource(R.color.blue25))
+            .wrapContentHeight(Alignment.Top)
+    ) {
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .wrapContentHeight()
+        ) {
+            SheetHeader(
+                title = "Share Item", onCloseClick = onClose
+            )
+
+            RecordMenuHeader(
+                recordThumbURL = recordThumbURL,
+                recordName = recordName,
+                recordSize = recordSize,
+                recordDate = recordDate
+            )
+
+            if (creatingLink) {
+                CreatingLinkRow()
+            } else {
+                if (isLinkSharedState) {
+                    SharedLinkRow(shareLink = viewModel.cleanUrlRegex(shareLink), onSettingClick = {
+                        viewModel.onLinkSettingsBtnClick()
+                    }, onCopyClick = {
+                        viewModel.copyLinkToClipboard()
+                    })
+                } else {
+                    CreateLinkRow(onClick = {
+                        viewModel.onCreateLinkBtnClick()
+                    })
+                }
+            }
+        }
+    }
+}
+
+@Composable
+fun CreatingLinkRow() {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(colorResource(R.color.blue25))
+            .padding(start = 36.dp, top = 24.dp, bottom = 24.dp, end = 24.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        CircularProgressIndicator(
+            overlayColor = OverlayColor.LIGHT, modifier = Modifier
+                .height(16.dp)
+                .width(16.dp)
+        )
+
+        Spacer(modifier = Modifier.width(28.dp))
+
+        Text(
+            text = stringResource(R.string.creating_link), style = TextStyle(
+                fontSize = 14.sp,
+                lineHeight = 24.sp,
+                fontFamily = FontFamily(Font(R.font.usual_regular)),
+                brush = Brush.linearGradient(
+                    colors = listOf(
+                        colorResource(R.color.barneyPurple), colorResource(R.color.colorAccent)
+                    ), start = Offset(0f, 0f), end = Offset(300f, 300f)
+                ),
+            ), maxLines = 1, overflow = TextOverflow.Ellipsis
+        )
+    }
+}
+
+@Composable
+fun SharedLinkRow(
+    shareLink: String, onSettingClick: () -> Unit, onCopyClick: () -> Unit
+) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(colorResource(R.color.blue25))
+            .padding(start = 24.dp, top = 6.dp, bottom = 6.dp, end = 24.dp),
+        verticalAlignment = Alignment.CenterVertically
+    ) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .align(Alignment.CenterVertically)
+                .border(
+                    width = 1.dp,
+                    color = colorResource(R.color.blue50),
+                    shape = RoundedCornerShape(10.dp)
+                )
+                .clip(RoundedCornerShape(10.dp))
+                .background(colorResource(R.color.white))
+        ) {
+            Row(
+                modifier = Modifier.fillMaxWidth(), verticalAlignment = Alignment.CenterVertically
+            ) {
+                Icon(
+                    painter = painterResource(id = R.drawable.ic_lock_closed),
+                    contentDescription = null,
+                    tint = Color.Unspecified,
+                    modifier = Modifier
+                        .size(44.dp)
+                        .clip(RoundedCornerShape(6.dp))
+                        .padding(8.dp)
+                )
+
+                Spacer(modifier = Modifier.width(8.dp))
+
+                Text(
+                    text = shareLink, modifier = Modifier.weight(1f), style = TextStyle(
+                        fontSize = 14.sp,
+                        lineHeight = 24.sp,
+                        fontFamily = FontFamily(Font(R.font.usual_regular)),
+                        textAlign = TextAlign.Left,
+                        brush = Brush.linearGradient(
+                            colors = listOf(
+                                colorResource(R.color.barneyPurple),
+                                colorResource(R.color.colorAccent)
+                            ), start = Offset(0f, 0f), end = Offset(300f, 300f)
+                        ),
+                    ), maxLines = 1, overflow = TextOverflow.Ellipsis
+                )
+                Spacer(modifier = Modifier.width(8.dp))
+
+                IconButton(onClick = onSettingClick, modifier = Modifier.size(24.dp)) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_settings_blue),
+                        contentDescription = null,
+                        tint = Color.Unspecified,
+                        modifier = Modifier.size(24.dp)
+                    )
+                }
+                Spacer(modifier = Modifier.width(16.dp))
+
+                IconButton(onClick = onCopyClick, modifier = Modifier.size(24.dp)) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_copy_blue),
+                        contentDescription = null,
+                        tint = Color.Unspecified,
+                        modifier = Modifier.size(24.dp)
+                    )
+                }
+                Spacer(modifier = Modifier.width(12.dp))
+            }
+        }
+    }
+}
+
+@Composable
+fun CreateLinkRow(onClick: () -> Unit) {
+    Row(
+        modifier = Modifier
+            .fillMaxWidth()
+            .background(colorResource(R.color.blue25))
+            .clickable { onClick() }
+            .padding(start = 24.dp, top = 12.dp, bottom = 12.dp, end = 12.dp),
+        verticalAlignment = Alignment.CenterVertically) {
+
+        Icon(
+            painter = painterResource(id = R.drawable.ic_share_link),
+            contentDescription = null,
+            tint = Color.Unspecified,
+            modifier = Modifier
+                .size(40.dp)
+                .clip(RoundedCornerShape(6.dp))
+        )
+
+        Spacer(modifier = Modifier.width(16.dp))
+
+        Column(
+            modifier = Modifier
+                .weight(1f)
+                .height(56.dp)
+                .padding(top = 4.dp, end = 24.dp)
+                .align(Alignment.CenterVertically)
+        ) {
+            Text(
+                text = stringResource(R.string.create_link_to_sare), style = TextStyle(
+                    fontSize = 14.sp,
+                    lineHeight = 24.sp,
+                    fontFamily = FontFamily(Font(R.font.usual_medium)),
+                    color = colorResource(R.color.blue900),
+                ), maxLines = 1, overflow = TextOverflow.Ellipsis
+            )
+
+            Spacer(modifier = Modifier.height(4.dp))
+
+            Text(
+                text = stringResource(R.string.create_link_description), style = TextStyle(
+                    fontSize = 12.sp,
+                    lineHeight = 16.sp,
+                    fontFamily = FontFamily(Font(R.font.usual_regular)),
+                    color = colorResource(R.color.blue400),
+                ), maxLines = 2, overflow = TextOverflow.Ellipsis
+            )
+        }
+    }
+}
+
+@Composable
+fun SheetHeader(
+    title: String, onCloseClick: (() -> Unit)? = null
+) {
+    Column(modifier = Modifier.fillMaxWidth()) {
+        Box(
+            modifier = Modifier
+                .fillMaxWidth()
+                .background(colorResource(R.color.white))
+                .padding(start = 24.dp, top = 12.dp, bottom = 12.dp, end = 12.dp),
+            contentAlignment = Alignment.Center
+        ) {
+            Text(
+                text = title, style = TextStyle(
+                    fontSize = 16.sp,
+                    lineHeight = 24.sp,
+                    fontFamily = FontFamily(Font(R.font.usual_medium)),
+                    color = colorResource(R.color.blue900),
+                    textAlign = TextAlign.Center
+                ), maxLines = 1, overflow = TextOverflow.Ellipsis
+            )
+
+            if (onCloseClick != null) {
+                IconButton(
+                    onClick = onCloseClick, modifier = Modifier.align(Alignment.CenterEnd)
+                ) {
+                    Icon(
+                        painter = painterResource(id = R.drawable.ic_close_light_blue),
+                        contentDescription = "Close",
+                        tint = colorResource(R.color.blue200),
+                    )
+                }
+            }
+        }
+
+        HorizontalDivider(
+            thickness = 1.dp, color = colorResource(R.color.blue50)
+        )
+    }
+}
+
+enum class LinkState {
+    SHARED, LOADING, NOTSHARED
+}
diff --git a/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModel.kt b/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModel.kt
index 184191e2..efdb726c 100644
--- a/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModel.kt
+++ b/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModel.kt
@@ -2,31 +2,48 @@ package org.permanent.permanent.viewmodels
 
 import android.app.Application
 import android.app.DatePickerDialog
+import android.content.ClipData
+import android.content.ClipboardManager
 import android.content.Context
 import android.text.Editable
+import android.util.Log
 import android.view.KeyEvent
 import android.view.View
 import android.view.inputmethod.EditorInfo
 import android.widget.DatePicker
 import androidx.lifecycle.LiveData
 import androidx.lifecycle.MutableLiveData
+import kotlinx.coroutines.flow.MutableStateFlow
+import kotlinx.coroutines.flow.StateFlow
 import okhttp3.internal.trimSubstring
 import org.permanent.permanent.R
 import org.permanent.permanent.models.AccessRole
 import org.permanent.permanent.models.EventAction
 import org.permanent.permanent.models.Record
+import org.permanent.permanent.models.RecordType
 import org.permanent.permanent.models.Share
 import org.permanent.permanent.models.Status
 import org.permanent.permanent.network.IResponseListener
 import org.permanent.permanent.network.ShareRequestType
+import org.permanent.permanent.network.models.ShareLinkVO
 import org.permanent.permanent.network.models.Shareby_urlVO
 import org.permanent.permanent.repositories.EventsRepositoryImpl
 import org.permanent.permanent.repositories.IEventsRepository
 import org.permanent.permanent.repositories.IShareRepository
 import org.permanent.permanent.repositories.ShareRepositoryImpl
+import org.permanent.permanent.repositories.StelaAccountRepository
+import org.permanent.permanent.repositories.StelaAccountRepositoryImpl
 import org.permanent.permanent.ui.PREFS_NAME
 import org.permanent.permanent.ui.PreferencesHelper
+import org.permanent.permanent.ui.bytesToHumanReadableString
+import org.permanent.permanent.ui.composeComponents.SnackbarType
 import org.permanent.permanent.ui.shareManagement.ShareListener
+import org.permanent.permanent.ui.shareManagement.compose.AccessType
+import org.permanent.permanent.ui.shareManagement.compose.LinkDuration
+import org.permanent.permanent.ui.shareManagement.compose.SharePage
+import org.permanent.permanent.ui.toBackendDateTimeString
+import org.permanent.permanent.ui.toDisplayDate
+import java.time.LocalDate
 
 
 class ShareManagementViewModel(application: Application) : ObservableAndroidViewModel(application),
@@ -37,9 +54,35 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         application.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
     )
     private lateinit var record: Record
-    private val recordName = MutableLiveData<String>()
+    private val _recordThumb = MutableStateFlow("")
+    val recordThumb: StateFlow<String> = _recordThumb
+    private val _recordSize = MutableStateFlow("")
+    val recordSize: StateFlow<String> = _recordSize
+    private val _recordDate = MutableStateFlow("")
+    val recordDate: StateFlow<String> = _recordDate
+    private val _recordName = MutableStateFlow("")
+    val recordName: StateFlow<String> = _recordName
+    private val _shareLink = MutableStateFlow("")
+    val shareLink: StateFlow<String> = _shareLink
+    private val _isCreatingLinkState = MutableStateFlow(false)
+    val isCreatingLinkState: StateFlow<Boolean> = _isCreatingLinkState
+    private val _isLinkSharedState = MutableStateFlow(false)
+    val isLinkSharedState: StateFlow<Boolean> = _isLinkSharedState
+    private val _selectedGeneralAccessType = MutableStateFlow(AccessType.ANYONE_CAN_VIEW)
+    val selectedGeneralAccessType: StateFlow<AccessType> = _selectedGeneralAccessType
+    private val _selectedAccessRole = MutableStateFlow(AccessRole.VIEWER)
+    val selectedAccessRole: StateFlow<AccessRole> = _selectedAccessRole
+    private val _selectedLinkDuration = MutableStateFlow(LinkDuration.NEVER)
+    val selectedLinkDuration: StateFlow<LinkDuration> = _selectedLinkDuration
+    private val _isBusyState = MutableStateFlow(false)
+    val isBusyState: StateFlow<Boolean> = _isBusyState
+    private val _snackbarMessage = MutableStateFlow("")
+    val snackbarMessage: StateFlow<String> = _snackbarMessage
+    private val _snackbarType = MutableStateFlow(SnackbarType.NONE)
+    val snackbarType: StateFlow<SnackbarType> = _snackbarType
     private var shareByUrlVO: Shareby_urlVO? = null
-    private val shareLink = MutableLiveData("")
+    private val _navigateToPage = MutableStateFlow<SharePage?>(null)
+    val navigateToPage: StateFlow<SharePage?> = _navigateToPage
     private var shares = mutableListOf<Share>()
     private var pendingShares = mutableListOf<Share>()
     private val sharesSize = MutableLiveData(0)
@@ -51,22 +94,26 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     private val expirationDate = MutableLiveData<String>()
     private val showDatePicker = SingleLiveEvent<Void?>()
     private val sharedWithLabelTxt = MutableLiveData<String>()
-    private val areLinkSettingsVisible = MutableLiveData(false)
-    private val isBusy = MutableLiveData(false)
     private val showSnackbar = MutableLiveData<String>()
     private val showSnackbarSuccess = MutableLiveData<String>()
     private val onShareLinkRequest = SingleLiveEvent<String>()
-    private val onRevokeLinkRequest = SingleLiveEvent<Void?>()
     private val showAccessRolesForLink = SingleLiveEvent<Shareby_urlVO>()
     private val showAccessRolesForShare = SingleLiveEvent<Share>()
     private val onShareApproved = SingleLiveEvent<Share>()
     private val onShareDenied = SingleLiveEvent<Share>()
     private var shareRepository: IShareRepository = ShareRepositoryImpl(appContext)
     private var eventsRepository: IEventsRepository = EventsRepositoryImpl(application)
+    private var stelaAccountRepository: StelaAccountRepository =
+        StelaAccountRepositoryImpl(application)
 
     fun setRecord(record: Record) {
         this.record = record
-        recordName.value = record.displayName
+
+        _recordName.value = record.displayName ?: ""
+        _recordSize.value = if (record.size != -1L) bytesToHumanReadableString(record.size) else ""
+        _recordDate.value = record.displayDate.toDisplayDate()
+        _recordThumb.value = if (record.type == RecordType.FILE) record.thumbURL200 ?: "" else ""
+
         initShares(record.shares)
         sharedWithLabelTxt.value =
             appContext.getString(R.string.record_options_shared_with, shares.size)
@@ -91,7 +138,8 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
 
     private fun init(shareByUrlVO: Shareby_urlVO) {
         this.shareByUrlVO = shareByUrlVO
-        this.shareLink.value = shareByUrlVO.shareUrl ?: ""
+        _shareLink.value = shareByUrlVO.shareUrl ?: ""
+        _isLinkSharedState.value = _shareLink.value != ""
         sharePreview.value = shareByUrlVO.previewToggle == 1
         autoApprove.value = shareByUrlVO.autoApproveToggle == 1
         maxUses.value = (shareByUrlVO.maxUses ?: 0).toString()
@@ -100,59 +148,177 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     }
 
     private fun checkForExistingLink(record: Record) {
-        if (isBusy.value != null && isBusy.value!!) {
+        if (isCreatingLinkState.value!!) {
             return
         }
 
-        isBusy.value = true
+        _isCreatingLinkState.value = true
         shareRepository.requestShareLink(record, ShareRequestType.GET,
             object : IShareRepository.IShareByUrlListener {
                 override fun onSuccess(shareByUrlVO: Shareby_urlVO?) {
-                    isBusy.value = false
+                    _isCreatingLinkState.value = false
+                    _isLinkSharedState.value = true
                     shareByUrlVO?.let { init(it) }
                 }
 
                 override fun onFailed(error: String?) {
-                    isBusy.value = false
+                    _isCreatingLinkState.value = false
                     showSnackbar.value = error
                 }
             })
     }
 
     fun onCreateLinkBtnClick() {
-        if (isBusy.value != null && isBusy.value!!) {
+        if (_isCreatingLinkState.value!!) {
             return
         }
 
-        isBusy.value = true
+        _isCreatingLinkState.value = true
         shareRepository.requestShareLink(record, ShareRequestType.GENERATE,
             object : IShareRepository.IShareByUrlListener {
                 override fun onSuccess(shareByUrlVO: Shareby_urlVO?) {
-                    isBusy.value = false
+                    _isCreatingLinkState.value = false
+                    _isLinkSharedState.value = true
                     this@ShareManagementViewModel.shareByUrlVO = shareByUrlVO
                     shareByUrlVO?.shareUrl?.let {
-                        shareLink.value = it
-                        onShowLinkSettingsBtnClick()
+                        _shareLink.value = it
+                        _isLinkSharedState.value = _shareLink.value != ""
+                        onLinkSettingsBtnClick()
                     }
                 }
 
                 override fun onFailed(error: String?) {
-                    isBusy.value = false
+                    _isCreatingLinkState.value = false
+                    _isLinkSharedState.value = false
                     showSnackbar.value = error
                 }
             })
     }
 
+    fun copyLinkToClipboard() {
+
+        val clipboard = appContext.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
+        val clip: ClipData = ClipData.newPlainText(
+            appContext.getString(R.string.share_management_share_link), _shareLink.value
+        )
+        clipboard.setPrimaryClip(clip)
+        //showMessage.value = appContext.getString(R.string.share_management_link_copied)
+    }
+
+    fun cleanUrlRegex(url: String): String {
+        return url.replace(Regex("^https?://(www\\.)?"), "")
+    }
+
+
     fun onShareLinkBtnClick() {
         onShareLinkRequest.value = shareLink.value.toString()
     }
 
-    fun onShowLinkSettingsBtnClick() {
-        areLinkSettingsVisible.value = true
+    fun onLinkSettingsBtnClick() {
+        _navigateToPage.value = SharePage.LINK_SETTINGS
     }
 
-    fun onHideLinkSettingsBtnClick() {
-        areLinkSettingsVisible.value = false
+    fun onBackBtnClick(fromPage: SharePage) {
+        when (fromPage) {
+            SharePage.LINK_SETTINGS -> {
+                _navigateToPage.value = SharePage.SHARE_ITEM
+            }
+
+            SharePage.GENERAL_ACCESS, SharePage.ACCESS_ROLES -> {
+                _navigateToPage.value = SharePage.LINK_SETTINGS
+            }
+
+            else -> {
+                Log.d("ShareManagementViewModel", "onBackBtnClick: ${_navigateToPage.value}")
+            }
+        }
+    }
+
+    fun onGeneralAccessClick() {
+        _navigateToPage.value = SharePage.GENERAL_ACCESS
+    }
+
+    fun onGeneralAccessItemClick(type: AccessType) {
+        _selectedGeneralAccessType.value = type
+        _navigateToPage.value = SharePage.LINK_SETTINGS
+    }
+
+    fun onDefaultAccessRoleClick() {
+        _navigateToPage.value = SharePage.ACCESS_ROLES
+    }
+
+    fun onAccessRoleClick(role: AccessRole) {
+        _selectedAccessRole.value = role
+        _navigateToPage.value = SharePage.LINK_SETTINGS
+    }
+
+    fun onLinkDurationSelected(duration: LinkDuration) {
+        _selectedLinkDuration.value = duration
+    }
+
+    fun revokeLink() {
+        if (_isBusyState.value) {
+            return
+        }
+        _isBusyState.value = true
+        val shareId: String = shareByUrlVO?.shareby_urlId.toString()
+        stelaAccountRepository.deleteShareLink(shareId, object : IResponseListener {
+
+            override fun onSuccess(message: String?) {
+                _isBusyState.value = false
+                _isLinkSharedState.value = false
+                _navigateToPage.value = SharePage.SHARE_ITEM
+                _snackbarMessage.value = appContext.getString(R.string.link_revoked)
+                _snackbarType.value = SnackbarType.SUCCESS
+            }
+
+            override fun onFailed(error: String?) {
+                _isBusyState.value = false
+                error?.let {
+                    _snackbarMessage.value = it
+                    _snackbarType.value = SnackbarType.ERROR
+                }
+            }
+        })
+    }
+
+    fun onDoneBtnClick() {
+        if (_isBusyState.value) {
+            return
+        }
+        val shareId: String = shareByUrlVO?.shareby_urlId.toString()
+        val accessRestrictions = _selectedGeneralAccessType.value.backendValue
+        val permissionLevel =
+            if (_selectedGeneralAccessType.value == AccessType.ANYONE_CAN_VIEW) AccessRole.VIEWER.name.lowercase() else
+                if (_selectedAccessRole.value == AccessRole.CURATOR) AccessRole.MANAGER.name.lowercase() else
+                    _selectedAccessRole.value.name.lowercase()
+        val expirationTimestamp =
+            _selectedLinkDuration.value.expirationDate(LocalDate.now())?.toBackendDateTimeString()
+
+        _isBusyState.value = true
+        val shareLinkVO = ShareLinkVO(
+            id = shareId,
+            permissionsLevel = permissionLevel,
+            accessRestrictions = accessRestrictions,
+            expirationTimestamp = expirationTimestamp
+        )
+        stelaAccountRepository.updateShareLink(shareLinkVO, object : IResponseListener {
+
+            override fun onSuccess(message: String?) {
+                _isBusyState.value = false
+                _navigateToPage.value = SharePage.SHARE_ITEM
+                _snackbarMessage.value = appContext.getString(R.string.link_settings_updated)
+                _snackbarType.value = SnackbarType.SUCCESS
+            }
+
+            override fun onFailed(error: String?) {
+                _isBusyState.value = false
+                error?.let {
+                    _snackbarMessage.value = it
+                    _snackbarType.value = SnackbarType.ERROR
+                }
+            }
+        })
     }
 
     fun onDefaultAccessRoleBtnClick() {
@@ -191,29 +357,26 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         saveChanges()
     }
 
-    fun onRevokeLinkBtnClick() {
-        onRevokeLinkRequest.call()
-    }
-
     fun deleteShareLink() {
-        if (isBusy.value != null && isBusy.value!!) {
+        if (_isCreatingLinkState.value != null && _isCreatingLinkState.value!!) {
             return
         }
 
         shareByUrlVO?.let {
-            isBusy.value = true
+            _isCreatingLinkState.value = true
             shareRepository.modifyShareLink(
                 it,
                 ShareRequestType.DELETE,
                 object : IResponseListener {
                     override fun onSuccess(message: String?) {
-                        isBusy.value = false
+                        _isCreatingLinkState.value = false
                         this@ShareManagementViewModel.shareByUrlVO = null
-                        shareLink.value = ""
+                        _shareLink.value = ""
+                        _isLinkSharedState.value = false
                     }
 
                     override fun onFailed(error: String?) {
-                        isBusy.value = false
+                        _isCreatingLinkState.value = false
                         showSnackbar.value = error
                     }
                 })
@@ -221,7 +384,7 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     }
 
     private fun saveChanges() {
-        if (isBusy.value != null && isBusy.value!!) {
+        if (_isCreatingLinkState.value != null && _isCreatingLinkState.value!!) {
             return
         }
         shareByUrlVO?.let {
@@ -230,16 +393,16 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
             it.maxUses = if (maxUses.value.isNullOrBlank()) 0 else maxUses.value!!.toInt()
             it.expiresDT = expirationDate.value
 
-            isBusy.value = true
+            _isCreatingLinkState.value = true
             shareRepository.modifyShareLink(it, ShareRequestType.UPDATE,
                 object : IResponseListener {
                     override fun onSuccess(message: String?) {
-                        isBusy.value = false
+                        _isCreatingLinkState.value = false
                         showSnackbar.value = message
                     }
 
                     override fun onFailed(error: String?) {
-                        isBusy.value = false
+                        _isCreatingLinkState.value = false
                         showSnackbar.value = error
                     }
                 })
@@ -251,14 +414,14 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     }
 
     override fun onApproveClick(share: Share) {
-        if (isBusy.value != null && isBusy.value!!) {
+        if (_isCreatingLinkState.value != null && _isCreatingLinkState.value!!) {
             return
         }
 
-        isBusy.value = true
+        _isCreatingLinkState.value = true
         shareRepository.updateShare(share, object : IResponseListener {
             override fun onSuccess(message: String?) {
-                isBusy.value = false
+                _isCreatingLinkState.value = false
                 share.status.value = Status.OK // This hides the Approve and Deny buttons
                 pendingShares.remove(share)
                 shares.add(share)
@@ -271,21 +434,21 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
             }
 
             override fun onFailed(error: String?) {
-                isBusy.value = false
+                _isCreatingLinkState.value = false
                 showSnackbar.value = error
             }
         })
     }
 
     override fun onDenyClick(share: Share) {
-        if (isBusy.value != null && isBusy.value!!) {
+        if (_isCreatingLinkState.value != null && _isCreatingLinkState.value!!) {
             return
         }
 
-        isBusy.value = true
+        _isCreatingLinkState.value = true
         shareRepository.deleteShare(share, object : IResponseListener {
             override fun onSuccess(message: String?) {
-                isBusy.value = false
+                _isCreatingLinkState.value = false
                 pendingShares.remove(share)
                 pendingSharesSize.value = pendingShares.size
                 showSnackbarSuccess.value = message
@@ -293,7 +456,7 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
             }
 
             override fun onFailed(error: String?) {
-                isBusy.value = false
+                _isCreatingLinkState.value = false
                 showSnackbar.value = error
             }
         })
@@ -318,24 +481,24 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         defaultAccessRole.value = accessRole
     }
 
+    fun clearPageNavigation() {
+        _navigateToPage.value = null
+    }
+
+    fun clearSnackbar() {
+        _snackbarMessage.value = ""
+    }
+
     fun getShares(): List<Share> = shares
 
     fun getPendingShares(): List<Share> = pendingShares
 
     fun getRecord(): Record = record
 
-    fun getRecordName(): MutableLiveData<String> = recordName
-
-    fun getShareLink(): MutableLiveData<String> = shareLink
-
     fun getSharesSize(): MutableLiveData<Int> = sharesSize
 
     fun getPendingSharesSize(): MutableLiveData<Int> = pendingSharesSize
 
-    fun getIsBusy(): MutableLiveData<Boolean> = isBusy
-
-    fun getAreLinkSettingsVisible(): MutableLiveData<Boolean> = areLinkSettingsVisible
-
     fun getSharePreview(): MutableLiveData<Boolean> = sharePreview
 
     fun getAutoApprove(): MutableLiveData<Boolean> = autoApprove
@@ -358,8 +521,6 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
 
     fun getSharedWithLabelTxt(): MutableLiveData<String> = sharedWithLabelTxt
 
-    fun getOnRevokeLinkRequest(): LiveData<Void?> = onRevokeLinkRequest
-
     fun getShowAccessRolesForShare(): LiveData<Share> = showAccessRolesForShare
 
     fun getOnShareApproved(): MutableLiveData<Share> = onShareApproved
diff --git a/app/src/main/res/drawable/ic_arrow_back_blue.xml b/app/src/main/res/drawable/ic_arrow_back_blue.xml
new file mode 100644
index 00000000..4546796a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_back_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M5.219,12.563C5.063,12.406 5,12.219 5,12C5,11.813 5.063,11.625 5.219,11.469L10.719,6.219C11.031,5.938 11.5,5.938 11.781,6.25C12.063,6.531 12.063,7.031 11.75,7.313L7.594,11.25L18.25,11.25C18.656,11.25 19,11.594 19,12C19,12.438 18.656,12.75 18.25,12.75L7.594,12.75L11.75,16.719C12.063,17 12.063,17.469 11.781,17.781C11.5,18.094 11.031,18.094 10.719,17.813L5.219,12.563Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_circle_blue.xml b/app/src/main/res/drawable/ic_circle_blue.xml
new file mode 100644
index 00000000..d4c7287f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_circle_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M18.5,12C18.5,9.688 17.25,7.563 15.25,6.375C13.219,5.219 10.75,5.219 8.75,6.375C6.719,7.563 5.5,9.688 5.5,12C5.5,14.344 6.719,16.469 8.75,17.656C10.75,18.813 13.219,18.813 15.25,17.656C17.25,16.469 18.5,14.344 18.5,12ZM4,12C4,9.156 5.5,6.531 8,5.094C10.469,3.656 13.5,3.656 16,5.094C18.469,6.531 20,9.156 20,12C20,14.875 18.469,17.5 16,18.938C13.5,20.375 10.469,20.375 8,18.938C5.5,17.5 4,14.875 4,12Z"
+      android:fillColor="#D0D1DB"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_contributor_green.xml b/app/src/main/res/drawable/ic_contributor_green.xml
new file mode 100644
index 00000000..88e4bb7f
--- /dev/null
+++ b/app/src/main/res/drawable/ic_contributor_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="16dp"
+    android:viewportWidth="14"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6.75,0L7.25,0C7.656,0 8,0.344 8,0.75V2.5L8.875,0.75C10.063,1.375 10.875,2.594 10.969,4C11.406,4 11.719,4.344 11.719,4.75C11.719,5.188 11.406,5.5 10.969,5.5L3,5.5C2.563,5.5 2.25,5.188 2.25,4.75C2.25,4.344 2.563,4 3,4C3.094,2.594 3.906,1.375 5.094,0.75L6,2.5V0.75C6,0.344 6.313,0 6.75,0ZM5.063,9.5C3.969,8.906 3.188,7.813 3.031,6.5H4.531C4.781,7.656 5.781,8.5 7,8.5C8.188,8.5 9.219,7.656 9.438,6.5H10.969C10.781,7.813 10,8.906 8.938,9.5C8.344,9.844 7.688,10 7,10C6.281,10 5.625,9.844 5.063,9.5ZM4.688,11H7H9.281H9.781C12.094,11 14,12.906 14,15.219C14,15.656 13.625,16 13.188,16L0.781,16C0.344,16 0,15.656 0,15.219C0,12.906 1.875,11 4.188,11L4.688,11ZM12.406,14.5C12.094,13.375 11.031,12.5 9.781,12.5L4.188,12.5C2.938,12.5 1.875,13.375 1.563,14.5L12.406,14.5Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_copy_blue.xml b/app/src/main/res/drawable/ic_copy_blue.xml
new file mode 100644
index 00000000..7e9da8ab
--- /dev/null
+++ b/app/src/main/res/drawable/ic_copy_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M17,14.5C17.25,14.5 17.5,14.281 17.5,14V7.625L15.375,5.5L11,5.5C10.719,5.5 10.5,5.75 10.5,6L10.5,14C10.5,14.281 10.719,14.5 11,14.5H17ZM11,16C9.875,16 9,15.125 9,14L9,6C9,4.906 9.875,4 11,4L15.375,4C15.75,4 16.156,4.188 16.438,4.469L18.531,6.563C18.813,6.844 19,7.25 19,7.625V14C19,15.125 18.094,16 17,16H11ZM7,8H8V9.5H7C6.719,9.5 6.5,9.75 6.5,10L6.5,18C6.5,18.281 6.719,18.5 7,18.5H13C13.25,18.5 13.5,18.281 13.5,18V17H15V18C15,19.125 14.094,20 13,20H7C5.875,20 5,19.125 5,18L5,10C5,8.906 5.875,8 7,8Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_curator_green.xml b/app/src/main/res/drawable/ic_curator_green.xml
new file mode 100644
index 00000000..fb0f4c9a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_curator_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="15dp"
+    android:height="16dp"
+    android:viewportWidth="15"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M6.563,0.313C6.719,0.438 6.844,0.5 7.063,0.5C7.25,0.5 7.375,0.438 7.531,0.313C7.75,0.188 8,0 8.563,0C9.656,0 10.375,1.875 10.813,3.5C11.031,3.438 11.25,3.375 11.438,3.313C12.438,2.906 12.969,2.438 13.156,2.219C13.281,2.031 13.563,1.969 13.781,2.063C14,2.188 14.094,2.438 14.031,2.656C13.719,3.531 12.938,4.625 11.75,5.469C11.531,5.656 11.281,5.813 11,5.969C11.031,6.156 11.063,6.313 11.063,6.5C11.063,8.719 9.25,10.5 7.063,10.5C4.844,10.5 3.063,8.719 3.063,6.5C3.063,6.313 3.063,6.156 3.094,5.969C2.813,5.813 2.563,5.656 2.344,5.469C1.156,4.625 0.375,3.531 0.063,2.688C0,2.438 0.094,2.188 0.313,2.063C0.531,1.969 0.813,2.031 0.938,2.219C1.125,2.438 1.656,2.906 2.656,3.313C2.844,3.375 3.063,3.438 3.281,3.531C3.719,1.875 4.438,0 5.563,0C6.125,0 6.344,0.188 6.563,0.313ZM7.063,7C6.156,7 5.313,6.875 4.563,6.625C4.594,7.938 5.688,9 7.063,9C8.406,9 9.5,7.938 9.531,6.625C8.781,6.875 7.969,7 7.063,7ZM1.75,14.344L1.719,14.5L12.375,14.5L12.344,14.344C12.281,13.594 11.625,13 10.875,13L3.219,13C2.469,13 1.813,13.594 1.75,14.344ZM0.25,14.188C0.406,12.656 1.719,11.5 3.219,11.5L10.875,11.5C12.406,11.5 13.688,12.656 13.844,14.188L13.938,14.906C14,15.5 13.531,16 12.938,16L1.156,16C0.563,16 0.094,15.5 0.188,14.906L0.25,14.188Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_editor_green.xml b/app/src/main/res/drawable/ic_editor_green.xml
new file mode 100644
index 00000000..35651d99
--- /dev/null
+++ b/app/src/main/res/drawable/ic_editor_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="16dp"
+    android:viewportWidth="14"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M7,1.5C5.594,1.5 4.5,2.625 4.5,4V5C4.5,6.281 5.406,7.313 6.625,7.5V7C6.625,6.813 6.781,6.625 7,6.625C7.188,6.625 7.375,6.813 7.375,7V7.5C8.563,7.313 9.5,6.281 9.5,5V4C9.5,2.625 8.375,1.5 7,1.5ZM3,4C3,1.813 4.781,0 7,0C9.188,0 11,1.813 11,4V4.75C11,5.094 11.094,5.406 11.313,5.688L11.656,6.094C11.875,6.375 12,6.688 12,7.031C12,7.844 11.313,8.5 10.5,8.5H8.938C8.344,8.844 7.688,9 7,9C6.281,9 5.625,8.844 5.063,8.5L3.469,8.5C2.656,8.5 2,7.844 2,7.031C2,6.688 2.094,6.375 2.313,6.094L2.656,5.688C2.875,5.406 3,5.063 3,4.75V4ZM6,3.5C6.25,3.5 6.5,3.75 6.5,4C6.5,4.281 6.25,4.5 6,4.5C5.719,4.5 5.5,4.281 5.5,4C5.5,3.75 5.719,3.5 6,3.5ZM7.5,4C7.5,3.75 7.719,3.5 8,3.5C8.25,3.5 8.5,3.75 8.5,4C8.5,4.281 8.25,4.5 8,4.5C7.719,4.5 7.5,4.281 7.5,4ZM7.25,5.25C7.313,5.313 7.438,5.406 7.594,5.5C7.75,5.594 7.875,5.625 8,5.625C8.188,5.625 8.375,5.813 8.375,6C8.375,6.219 8.188,6.375 8,6.375C7.688,6.375 7.406,6.281 7.219,6.156C7.125,6.094 7.063,6.063 7,6C6.594,6.281 6.219,6.375 6,6.375C5.781,6.375 5.625,6.219 5.625,6C5.625,5.813 5.781,5.625 6,5.625C6.063,5.625 6.375,5.594 6.719,5.25C6.875,5.094 7.094,5.094 7.25,5.25ZM7.5,13.031C7.469,13.313 7.25,13.5 7,13.5C6.719,13.5 6.5,13.313 6.5,13.031C5.75,13.094 5.156,13.281 4.719,13.469C4.438,13.563 4.25,13.688 4.094,13.75C4.031,13.813 4,13.844 3.969,13.844C3.938,13.844 3.938,13.875 3.938,13.875C3.688,14.031 3.406,14.063 3.156,13.938C2.906,13.813 2.75,13.531 2.75,13.25L2.75,12.344C2.094,12.906 1.656,13.656 1.531,14.5L6.5,14.5C6.5,14.25 6.719,14 7,14C7.25,14 7.5,14.25 7.5,14.5H12.438C12.313,13.656 11.875,12.906 11.25,12.344V13.25C11.25,13.531 11.063,13.813 10.813,13.938C10.563,14.063 10.281,14.031 10.063,13.875H10.031C10.031,13.875 10.031,13.875 10,13.844C9.969,13.844 9.938,13.781 9.875,13.75C9.719,13.688 9.531,13.563 9.25,13.469C8.813,13.281 8.219,13.094 7.5,13.031ZM3.656,10.188C4.156,9.781 4.781,9.5 5.5,9.5H8.5C9.188,9.5 9.813,9.781 10.313,10.188C12.438,10.781 14,12.75 14,15.063C14,15.594 13.563,16 13.031,16L0.938,16C0.406,16 0,15.594 0,15.063C0,12.75 1.531,10.781 3.656,10.188ZM7,11.5C8.094,11.5 9.031,11.75 9.719,12.031C9.594,11.438 9.094,11 8.5,11H5.5C4.875,11 4.375,11.438 4.25,12.031C4.938,11.75 5.875,11.5 7,11.5Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_globe_green.xml b/app/src/main/res/drawable/ic_globe_green.xml
new file mode 100644
index 00000000..a67777ea
--- /dev/null
+++ b/app/src/main/res/drawable/ic_globe_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="16dp"
+    android:viewportWidth="17"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M8.375,14.5C8.594,14.5 9.219,14.281 9.844,13C10.125,12.438 10.375,11.781 10.531,11H6.188C6.375,11.781 6.594,12.438 6.875,13C7.531,14.281 8.125,14.5 8.375,14.5ZM5.938,9.5H10.781C10.844,9.031 10.875,8.531 10.875,8C10.875,7.5 10.844,7 10.781,6.5L5.938,6.5C5.875,7 5.875,7.5 5.875,8C5.875,8.531 5.875,9.031 5.938,9.5ZM6.188,5L10.531,5C10.375,4.25 10.125,3.594 9.844,3.031C9.219,1.75 8.594,1.5 8.375,1.5C8.125,1.5 7.531,1.75 6.875,3.031C6.594,3.594 6.375,4.25 6.188,5ZM12.281,6.5C12.344,7 12.344,7.5 12.344,8C12.344,8.531 12.344,9.031 12.281,9.5H14.688C14.813,9.031 14.875,8.531 14.875,8C14.875,7.5 14.813,7 14.688,6.5L12.281,6.5ZM14.125,5C13.469,3.719 12.375,2.688 11.063,2.094C11.5,2.906 11.844,3.906 12.063,5H14.125ZM4.656,5C4.875,3.906 5.219,2.906 5.656,2.094C4.344,2.688 3.25,3.719 2.594,5L4.656,5ZM2.031,6.5C1.938,7 1.875,7.5 1.875,8C1.875,8.531 1.906,9.031 2.031,9.5H4.438C4.375,9.031 4.375,8.531 4.375,8C4.375,7.5 4.375,7 4.438,6.5L2.031,6.5ZM11.063,13.938C12.375,13.344 13.469,12.313 14.125,11H12.063C11.844,12.125 11.5,13.125 11.063,13.938ZM5.656,13.938C5.219,13.125 4.875,12.125 4.656,11H2.594C3.25,12.313 4.344,13.344 5.656,13.938ZM8.375,16C5.5,16 2.875,14.5 1.438,12C0,9.531 0,6.5 1.438,4C2.875,1.531 5.5,0 8.375,0C11.219,0 13.844,1.531 15.281,4C16.719,6.5 16.719,9.531 15.281,12C13.844,14.5 11.219,16 8.375,16Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_info_orange.xml b/app/src/main/res/drawable/ic_info_orange.xml
new file mode 100644
index 00000000..35058355
--- /dev/null
+++ b/app/src/main/res/drawable/ic_info_orange.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,20C9.125,20 6.5,18.5 5.063,16C3.625,13.531 3.625,10.5 5.063,8C6.5,5.531 9.125,4 12,4C14.844,4 17.469,5.531 18.906,8C20.344,10.5 20.344,13.531 18.906,16C17.469,18.5 14.844,20 12,20ZM10.75,14.5C10.313,14.5 10,14.844 10,15.25C10,15.688 10.313,16 10.75,16H13.25C13.656,16 14,15.688 14,15.25C14,14.844 13.656,14.5 13.25,14.5H13V11.75C13,11.344 12.656,11 12.25,11H10.75C10.313,11 10,11.344 10,11.75C10,12.188 10.313,12.5 10.75,12.5H11.5V14.5H10.75ZM12,8C11.438,8 11,8.469 11,9C11,9.563 11.438,10 12,10C12.531,10 13,9.563 13,9C13,8.469 12.531,8 12,8Z"
+      android:fillColor="#F79009"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_link_gradient.xml b/app/src/main/res/drawable/ic_link_gradient.xml
new file mode 100644
index 00000000..a9c07b6a
--- /dev/null
+++ b/app/src/main/res/drawable/ic_link_gradient.xml
@@ -0,0 +1,24 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:aapt="http://schemas.android.com/aapt"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M4,0L28,0A4,4 0,0 1,32 4L32,28A4,4 0,0 1,28 32L4,32A4,4 0,0 1,0 28L0,4A4,4 0,0 1,4 0z"
+      android:fillColor="#F4F6FD"/>
+  <path
+      android:pathData="M7,16C7,13.25 9.219,11 12,11H14.25C14.656,11 15,11.344 15,11.75C15,12.188 14.656,12.5 14.25,12.5H12C10.063,12.5 8.5,14.094 8.5,16C8.5,17.938 10.063,19.5 12,19.5H14.25C14.656,19.5 15,19.844 15,20.25C15,20.688 14.656,21 14.25,21H12C9.219,21 7,18.781 7,16ZM25,16C25,18.781 22.75,21 20,21H17.75C17.313,21 17,20.688 17,20.25C17,19.844 17.313,19.5 17.75,19.5H20C21.906,19.5 23.5,17.938 23.5,16C23.5,14.094 21.906,12.5 20,12.5H17.75C17.313,12.5 17,12.188 17,11.75C17,11.344 17.313,11 17.75,11H20C22.75,11 25,13.25 25,16ZM12.75,15.25L19.25,15.25C19.656,15.25 20,15.594 20,16C20,16.438 19.656,16.75 19.25,16.75H12.75C12.313,16.75 12,16.438 12,16C12,15.594 12.313,15.25 12.75,15.25Z">
+    <aapt:attr name="android:fillColor">
+      <gradient
+          android:startX="8"
+          android:startY="8"
+          android:endX="26.704"
+          android:endY="12.337"
+          android:type="linear">
+        <item android:offset="0" android:color="#FF800080"/>
+        <item android:offset="1" android:color="#FFFF9933"/>
+      </gradient>
+    </aapt:attr>
+  </path>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_closed.xml b/app/src/main/res/drawable/ic_lock_closed.xml
new file mode 100644
index 00000000..35a645fa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_closed.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M4,0L28,0A4,4 0,0 1,32 4L32,28A4,4 0,0 1,28 32L4,32A4,4 0,0 1,0 28L0,4A4,4 0,0 1,4 0z"
+      android:fillColor="#ECFDF3"/>
+  <path
+      android:pathData="M13.5,12V14L18.5,14V12C18.5,10.625 17.375,9.5 16,9.5C14.594,9.5 13.5,10.625 13.5,12ZM12,14V12C12,9.813 13.781,8 16,8C18.188,8 20,9.813 20,12V14H21C22.094,14 23,14.906 23,16V22C23,23.125 22.094,24 21,24H11C9.875,24 9,23.125 9,22V16C9,14.906 9.875,14 11,14H12ZM10.5,16V22C10.5,22.281 10.719,22.5 11,22.5H21C21.25,22.5 21.5,22.281 21.5,22V16C21.5,15.75 21.25,15.5 21,15.5L11,15.5C10.719,15.5 10.5,15.75 10.5,16Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_green.xml b/app/src/main/res/drawable/ic_lock_green.xml
new file mode 100644
index 00000000..4ceef841
--- /dev/null
+++ b/app/src/main/res/drawable/ic_lock_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="16dp"
+    android:viewportWidth="14"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4.5,4V6L9.5,6L9.5,4C9.5,2.625 8.375,1.5 7,1.5C5.594,1.5 4.5,2.625 4.5,4ZM3,6V4C3,1.813 4.781,0 7,0C9.188,0 11,1.813 11,4L11,6H12C13.094,6 14,6.906 14,8V14C14,15.125 13.094,16 12,16L2,16C0.875,16 0,15.125 0,14L0,8C0,6.906 0.875,6 2,6H3ZM1.5,8L1.5,14C1.5,14.281 1.719,14.5 2,14.5L12,14.5C12.25,14.5 12.5,14.281 12.5,14V8C12.5,7.75 12.25,7.5 12,7.5L2,7.5C1.719,7.5 1.5,7.75 1.5,8Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_never_blue.xml b/app/src/main/res/drawable/ic_never_blue.xml
new file mode 100644
index 00000000..4a45ef23
--- /dev/null
+++ b/app/src/main/res/drawable/ic_never_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M2,11.438C2,9 3.969,7 6.406,7C7.625,7 8.781,7.531 9.625,8.406L12,10.906L14.344,8.406C15.188,7.531 16.344,7 17.563,7C20,7 22,9 22,11.438V12.594C22,15.031 20,17 17.563,17C16.344,17 15.188,16.5 14.344,15.625L12,13.094L9.625,15.625C8.781,16.5 7.625,17 6.406,17C3.969,17 2,15.031 2,12.594L2,11.438ZM10.969,12L8.531,9.438C7.969,8.844 7.219,8.5 6.406,8.5C4.781,8.5 3.5,9.813 3.5,11.438V12.594C3.5,14.219 4.781,15.5 6.406,15.5C7.219,15.5 7.969,15.188 8.531,14.594L10.969,12ZM13,12L15.438,14.594C16,15.188 16.75,15.5 17.563,15.5C19.188,15.5 20.5,14.219 20.5,12.594V11.438C20.5,9.813 19.188,8.5 17.563,8.5C16.781,8.5 16,8.844 15.438,9.438L13.031,12H13Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_one_day_blue.xml b/app/src/main/res/drawable/ic_one_day_blue.xml
new file mode 100644
index 00000000..b6647beb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_one_day_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,4C9.406,4 9.75,4.344 9.75,4.75V6L14.25,6V4.75C14.25,4.344 14.563,4 15,4C15.406,4 15.75,4.344 15.75,4.75V6H17C18.094,6 19,6.906 19,8V8.5V10V18C19,19.125 18.094,20 17,20H7C5.875,20 5,19.125 5,18L5,10V8.5V8C5,6.906 5.875,6 7,6L8.25,6V4.75C8.25,4.344 8.563,4 9,4ZM17.5,10L6.5,10L6.5,18C6.5,18.281 6.719,18.5 7,18.5H17C17.25,18.5 17.5,18.281 17.5,18V10ZM12.281,11.594L13,13.094L14.656,13.344C14.938,13.375 15.031,13.719 14.844,13.906L13.656,15.063L13.938,16.688C13.969,16.969 13.688,17.156 13.469,17.031L12,16.25L10.5,17.031C10.281,17.156 10,16.969 10.031,16.688L10.313,15.063L9.125,13.906C8.938,13.719 9.031,13.375 9.313,13.344L10.969,13.094L11.688,11.594C11.813,11.375 12.156,11.375 12.281,11.594Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_one_month_blue.xml b/app/src/main/res/drawable/ic_one_month_blue.xml
new file mode 100644
index 00000000..bc486623
--- /dev/null
+++ b/app/src/main/res/drawable/ic_one_month_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M9,4C9.406,4 9.75,4.344 9.75,4.75V6L14.25,6V4.75C14.25,4.344 14.563,4 15,4C15.406,4 15.75,4.344 15.75,4.75V6H17C18.094,6 19,6.906 19,8V8.5V10V18C19,19.125 18.094,20 17,20H7C5.875,20 5,19.125 5,18L5,10V8.5V8C5,6.906 5.875,6 7,6H8.25V4.75C8.25,4.344 8.563,4 9,4ZM17.5,10L6.5,10L6.5,18C6.5,18.281 6.719,18.5 7,18.5H17C17.25,18.5 17.5,18.281 17.5,18V10ZM8.5,12L15.5,12C15.75,12 16,12.25 16,12.5V14.5C16,14.781 15.75,15 15.5,15L8.5,15C8.219,15 8,14.781 8,14.5V12.5C8,12.25 8.219,12 8.5,12Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_one_year_blue.xml b/app/src/main/res/drawable/ic_one_year_blue.xml
new file mode 100644
index 00000000..9bb31353
--- /dev/null
+++ b/app/src/main/res/drawable/ic_one_year_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,4C11.406,4 11.75,4.344 11.75,4.75V6H15.25V4.75C15.25,4.344 15.563,4 16,4C16.406,4 16.75,4.344 16.75,4.75V6H18C19.094,6 20,6.906 20,8V9.5V10V15C20,16.125 19.094,17 18,17H9C7.875,17 7,16.125 7,15L7,10V9.5L7,8C7,6.906 7.875,6 9,6H10.25V4.75C10.25,4.344 10.563,4 11,4ZM8.5,10L8.5,15C8.5,15.281 8.719,15.5 9,15.5L18,15.5C18.25,15.5 18.5,15.281 18.5,15V10L8.5,10ZM5.5,9.75L5.5,16.25C5.5,17.5 6.5,18.5 7.75,18.5H16.25C16.656,18.5 17,18.844 17,19.25C17,19.688 16.656,20 16.25,20H7.75C5.656,20 4,18.344 4,16.25L4,9.75C4,9.344 4.313,9 4.75,9C5.156,9 5.5,9.344 5.5,9.75Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_owner_green.xml b/app/src/main/res/drawable/ic_owner_green.xml
new file mode 100644
index 00000000..00ce91f4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_owner_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="16dp"
+    android:viewportWidth="14"
+    android:viewportHeight="16">
+  <path
+      android:pathData="M4.5,4V4.5C4.5,5.906 5.594,7 7,7C8.375,7 9.5,5.906 9.5,4.5V4L4.5,4ZM4.5,0.625C4.813,0.844 5.219,0.875 5.563,0.688L6.531,0.125C6.656,0.063 6.813,0 7,0C7.156,0 7.313,0.063 7.438,0.125L8.406,0.688C8.75,0.875 9.156,0.844 9.5,0.625V0.594C9.5,0.594 9.5,0.594 9.531,0.594L9.625,0.5L10.094,0.125C10.188,0.063 10.313,0 10.406,0L10.5,0C10.75,0 11,0.25 11,0.5V1.219V1.344V4.5C11,6.719 9.188,8.5 7,8.5C4.781,8.5 3,6.719 3,4.5L3,1.344V1.219V0.5C3,0.25 3.219,0 3.5,0L3.563,0C3.688,0 3.781,0.063 3.875,0.125L4.375,0.5L4.469,0.594C4.469,0.594 4.469,0.594 4.469,0.625H4.5ZM5.25,11C3.25,11 1.625,12.563 1.5,14.5L12.469,14.5C12.344,12.563 10.719,11 8.75,11H5.25ZM5.25,9.5H8.75C11.625,9.5 14,11.875 14,14.75V15C14,15.563 13.531,16 13,16L1,16C0.438,16 0,15.563 0,15V14.75C0,11.875 2.344,9.5 5.25,9.5Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_revoke_link.xml b/app/src/main/res/drawable/ic_revoke_link.xml
new file mode 100644
index 00000000..7e11a8b0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_revoke_link.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="32dp"
+    android:height="32dp"
+    android:viewportWidth="32"
+    android:viewportHeight="32">
+  <path
+      android:pathData="M7.188,8.188L10.969,11.125C11.281,11.063 11.625,11 12,11H14.25C14.656,11 15,11.344 15,11.75C15,12.188 14.656,12.5 14.25,12.5H12.75L16.25,15.25L19.25,15.25C19.656,15.25 20,15.594 20,16C20,16.438 19.656,16.75 19.25,16.75H18.156L21.313,19.25C22.594,18.719 23.5,17.469 23.5,16C23.5,14.094 21.906,12.5 20,12.5H17.75C17.313,12.5 17,12.188 17,11.75C17,11.344 17.313,11 17.75,11H20C22.75,11 25,13.25 25,16C25,17.813 24.031,19.375 22.625,20.25L25.688,22.688C26.031,22.938 26.094,23.406 25.813,23.719C25.563,24.063 25.094,24.125 24.781,23.844L6.281,9.344C5.938,9.094 5.875,8.625 6.156,8.313C6.406,7.969 6.875,7.906 7.188,8.188ZM9.375,13.688C8.813,14.313 8.5,15.125 8.5,16C8.5,17.938 10.063,19.5 12,19.5H14.25C14.656,19.5 15,19.844 15,20.25C15,20.688 14.656,21 14.25,21H12C9.219,21 7,18.781 7,16C7,14.781 7.438,13.625 8.188,12.75L9.375,13.688Z"
+      android:fillColor="#F04438"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_settings_blue.xml b/app/src/main/res/drawable/ic_settings_blue.xml
new file mode 100644
index 00000000..d5fd67f1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_settings_blue.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M12,4C12.531,4 13.031,4.063 13.531,4.156C13.781,4.219 14.219,4.344 14.469,4.781C14.531,4.906 14.563,5.031 14.594,5.156L14.906,6.375C14.938,6.531 15.25,6.719 15.438,6.656L16.625,6.313C16.75,6.281 16.875,6.25 17,6.25C17.5,6.25 17.844,6.563 18,6.75C18.688,7.531 19.219,8.438 19.563,9.438C19.656,9.688 19.75,10.125 19.469,10.531C19.406,10.656 19.313,10.75 19.219,10.844L18.344,11.719C18.188,11.844 18.188,12.188 18.344,12.313L19.219,13.188C19.313,13.281 19.406,13.375 19.469,13.5C19.719,13.906 19.625,14.344 19.563,14.594C19.219,15.594 18.688,16.5 18,17.281C17.844,17.469 17.5,17.781 17,17.781C16.875,17.781 16.75,17.75 16.625,17.719L15.438,17.344C15.25,17.313 14.938,17.469 14.906,17.656L14.594,18.875C14.563,19 14.531,19.125 14.469,19.25C14.219,19.688 13.781,19.813 13.531,19.875C13.031,19.969 12.531,20 12,20C11.469,20 10.938,19.969 10.438,19.875C10.188,19.813 9.75,19.688 9.5,19.25C9.438,19.125 9.406,19 9.375,18.875L9.063,17.656C9.031,17.469 8.719,17.313 8.563,17.344L7.375,17.719C7.25,17.75 7.094,17.75 6.969,17.781C6.469,17.781 6.125,17.469 5.969,17.281C5.281,16.5 4.75,15.594 4.406,14.594C4.344,14.344 4.25,13.906 4.5,13.469C4.563,13.375 4.656,13.25 4.75,13.156L5.656,12.313C5.781,12.188 5.781,11.844 5.656,11.719L4.75,10.844C4.656,10.75 4.563,10.656 4.5,10.531C4.25,10.125 4.344,9.688 4.406,9.438C4.75,8.438 5.281,7.531 5.969,6.75C6.125,6.563 6.469,6.25 6.969,6.25C7.094,6.25 7.25,6.281 7.375,6.313L8.563,6.656C8.719,6.719 9.031,6.531 9.063,6.375L9.375,5.156C9.406,5.031 9.438,4.906 9.5,4.781C9.75,4.344 10.188,4.219 10.438,4.156C10.938,4.063 11.469,4 12,4ZM10.813,5.625L10.531,6.719C10.281,7.719 9.125,8.406 8.125,8.125L7.031,7.781C6.531,8.406 6.125,9.094 5.844,9.844L6.688,10.625C7.438,11.344 7.438,12.688 6.688,13.406L5.844,14.188C6.125,14.938 6.531,15.625 7.031,16.25L8.125,15.906C9.125,15.625 10.281,16.313 10.531,17.313L10.813,18.406C11.563,18.563 12.406,18.563 13.188,18.406L13.438,17.313C13.688,16.313 14.844,15.625 15.844,15.906L16.938,16.25C17.438,15.625 17.844,14.938 18.125,14.188L17.313,13.406C16.563,12.688 16.563,11.344 17.313,10.625L18.125,9.844C17.844,9.094 17.438,8.406 16.938,7.781L15.844,8.125C14.875,8.406 13.688,7.719 13.438,6.719L13.188,5.625C12.406,5.469 11.563,5.469 10.813,5.625ZM10.5,12C10.5,12.563 10.781,13.031 11.25,13.313C11.688,13.594 12.281,13.594 12.75,13.313C13.188,13.031 13.5,12.563 13.5,12C13.5,11.469 13.188,11 12.75,10.719C12.281,10.438 11.688,10.438 11.25,10.719C10.781,11 10.5,11.469 10.5,12ZM12,15C10.906,15 9.938,14.438 9.375,13.5C8.844,12.594 8.844,11.438 9.375,10.5C9.938,9.594 10.906,9 12,9C13.063,9 14.031,9.594 14.594,10.5C15.125,11.438 15.125,12.594 14.594,13.5C14.031,14.438 13.063,15 12,15Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_share_link.xml b/app/src/main/res/drawable/ic_share_link.xml
new file mode 100644
index 00000000..4d1af9ee
--- /dev/null
+++ b/app/src/main/res/drawable/ic_share_link.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="40dp"
+    android:height="24dp"
+    android:viewportWidth="40"
+    android:viewportHeight="24">
+  <path
+      android:pathData="M11,12C11,9.25 13.219,7 16,7L18.25,7C18.656,7 19,7.344 19,7.75C19,8.188 18.656,8.5 18.25,8.5H16C14.063,8.5 12.5,10.094 12.5,12C12.5,13.938 14.063,15.5 16,15.5L18.25,15.5C18.656,15.5 19,15.844 19,16.25C19,16.688 18.656,17 18.25,17H16C13.219,17 11,14.781 11,12ZM29,12C29,14.781 26.75,17 24,17H21.75C21.313,17 21,16.688 21,16.25C21,15.844 21.313,15.5 21.75,15.5H24C25.906,15.5 27.5,13.938 27.5,12C27.5,10.094 25.906,8.5 24,8.5H21.75C21.313,8.5 21,8.188 21,7.75C21,7.344 21.313,7 21.75,7H24C26.75,7 29,9.25 29,12ZM16.75,11.25L23.25,11.25C23.656,11.25 24,11.594 24,12C24,12.438 23.656,12.75 23.25,12.75L16.75,12.75C16.313,12.75 16,12.438 16,12C16,11.594 16.313,11.25 16.75,11.25Z"
+      android:fillColor="#131B4A"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_viewer_green.xml b/app/src/main/res/drawable/ic_viewer_green.xml
new file mode 100644
index 00000000..5e27b7f6
--- /dev/null
+++ b/app/src/main/res/drawable/ic_viewer_green.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="14dp"
+    android:height="17dp"
+    android:viewportWidth="14"
+    android:viewportHeight="17">
+  <path
+      android:pathData="M7,6.656C7.875,6.656 8.688,6.188 9.156,5.406C9.594,4.656 9.594,3.688 9.156,2.906C8.688,2.156 7.875,1.656 7,1.656C6.094,1.656 5.281,2.156 4.813,2.906C4.375,3.688 4.375,4.656 4.813,5.406C5.281,6.188 6.094,6.656 7,6.656ZM11,4.156C11,5.594 10.219,6.906 9,7.625C7.75,8.344 6.219,8.344 5,7.625C3.75,6.906 3,5.594 3,4.156C3,2.75 3.75,1.438 5,0.719C6.219,0 7.75,0 9,0.719C10.219,1.438 11,2.75 11,4.156ZM1.5,14.656L12.469,14.656C12.375,13.188 11.438,11.938 10.094,11.438L8.563,13.375C7.75,14.375 6.219,14.375 5.438,13.375L3.875,11.438C2.563,11.938 1.594,13.188 1.5,14.656ZM4.156,9.781C4.313,9.75 4.5,9.813 4.625,9.969L6.594,12.438C6.813,12.688 7.188,12.688 7.375,12.438L9.375,9.969C9.469,9.813 9.656,9.75 9.813,9.781C12.188,10.281 14,12.406 14,14.906V15.156C14,15.719 13.531,16.156 13,16.156H1C0.438,16.156 0,15.719 0,15.156V14.906C0,12.406 1.781,10.281 4.156,9.781Z"
+      android:fillColor="#12B76A"/>
+</vector>
diff --git a/app/src/main/res/layout/fragment_access_roles.xml b/app/src/main/res/layout/fragment_access_roles.xml
index 39945600..1b33aa52 100644
--- a/app/src/main/res/layout/fragment_access_roles.xml
+++ b/app/src/main/res/layout/fragment_access_roles.xml
@@ -67,7 +67,7 @@
                     android:ellipsize="end"
                     android:fontFamily="@font/open_sans_bold"
                     android:maxLines="1"
-                    android:text="@string/access_roles_link_settings_title"
+                    android:text="@string/link_settings"
                     android:textColor="@color/white"
                     android:textSize="16sp"
                     android:visibility="@{viewModel.shareByUrlVO != null ? View.VISIBLE : View.GONE}"
diff --git a/app/src/main/res/layout/fragment_share_management.xml b/app/src/main/res/layout/fragment_share_management.xml
deleted file mode 100644
index 04372557..00000000
--- a/app/src/main/res/layout/fragment_share_management.xml
+++ /dev/null
@@ -1,700 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<layout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <data>
-
-        <import type="android.view.View" />
-
-        <variable
-            name="viewModel"
-            type="org.permanent.permanent.viewmodels.ShareManagementViewModel" />
-    </data>
-
-    <androidx.core.widget.NestedScrollView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <androidx.constraintlayout.widget.ConstraintLayout
-            android:id="@+id/clBottomMenu"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:background="@color/colorPrimary">
-
-            <View
-                android:id="@+id/viewDragSheet"
-                android:layout_width="24dp"
-                android:layout_height="2dp"
-                android:layout_marginTop="4dp"
-                android:background="@color/whiteSuperTransparent"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent" />
-
-            <ImageView
-                android:id="@+id/ivRecordThumb"
-                android:layout_width="28dp"
-                android:layout_height="28dp"
-                android:layout_marginStart="16dp"
-                android:layout_marginTop="20dp"
-                android:layout_marginBottom="20dp"
-                android:scaleType="centerCrop"
-                app:layout_constraintBottom_toTopOf="@+id/clContent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:record="@{viewModel.record}" />
-
-            <TextView
-                android:id="@+id/tvFileName"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                android:layout_marginStart="12dp"
-                android:layout_marginTop="16dp"
-                android:layout_marginEnd="12dp"
-                android:layout_marginBottom="16dp"
-                android:ellipsize="end"
-                android:fontFamily="@font/open_sans_bold"
-                android:maxLines="1"
-                android:text="@{viewModel.recordName}"
-                android:textColor="@color/white"
-                android:textSize="16sp"
-                app:layout_constraintBottom_toBottomOf="@id/ivRecordThumb"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toEndOf="@id/ivRecordThumb"
-                app:layout_constraintTop_toTopOf="@id/ivRecordThumb" />
-
-            <androidx.constraintlayout.widget.ConstraintLayout
-                android:id="@+id/clContent"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:background="@color/white"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintHorizontal_bias="0.0"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toBottomOf="@id/tvFileName">
-
-                <ImageView
-                    android:id="@+id/ivShareManagement"
-                    android:layout_width="24dp"
-                    android:layout_height="0dp"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="24dp"
-                    android:padding="2dp"
-                    android:scaleType="centerInside"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent"
-                    app:srcCompat="@drawable/ic_link_settings"
-                    app:tint="@color/lightGrey" />
-
-                <TextView
-                    android:id="@+id/tvTitle"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="24dp"
-                    android:layout_marginEnd="16dp"
-                    android:fontFamily="@font/open_sans_bold"
-                    android:singleLine="true"
-                    android:text="@string/share_management_share_management_title"
-                    android:textColor="@color/colorPrimary"
-                    android:textSize="16sp"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toEndOf="@+id/ivShareManagement"
-                    app:layout_constraintTop_toTopOf="parent" />
-
-                <View
-                    android:id="@+id/viewDividerTitle"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="24dp"
-                    android:background="@color/lighterGrey"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvTitle" />
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/clLink"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:background="@color/white"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/viewDividerTitle">
-
-                    <TextView
-                        android:id="@+id/tvLink"
-                        android:layout_width="0dp"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="8dp"
-                        android:layout_marginTop="16dp"
-                        android:ellipsize="end"
-                        android:maxLines="1"
-                        android:onClick="@{() -> viewModel.onShareLinkBtnClick()}"
-                        android:padding="12dp"
-                        android:paddingStart="46dp"
-                        android:text="@{viewModel.shareLink}"
-                        android:textColor="@color/barneyPurple"
-                        android:textSize="15sp"
-                        android:visibility="@{viewModel.shareLink.isEmpty ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintEnd_toStartOf="@+id/ivShare"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <ImageView
-                        android:id="@+id/ivLink"
-                        android:layout_width="24dp"
-                        android:layout_height="0dp"
-                        android:layout_marginStart="12dp"
-                        android:padding="2dp"
-                        android:scaleType="centerInside"
-                        android:visibility="@{viewModel.shareLink.isEmpty ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintBottom_toBottomOf="@+id/tvLink"
-                        app:layout_constraintStart_toStartOf="@+id/tvLink"
-                        app:layout_constraintTop_toTopOf="@+id/tvLink"
-                        app:srcCompat="@drawable/ic_link_black"
-                        app:tint="@color/lightGrey" />
-
-                    <ImageView
-                        android:id="@+id/ivShare"
-                        android:layout_width="40dp"
-                        android:layout_height="0dp"
-                        android:layout_marginEnd="8dp"
-                        android:onClick="@{() -> viewModel.onShareLinkBtnClick()}"
-                        android:padding="2dp"
-                        android:scaleType="centerInside"
-                        android:visibility="@{viewModel.shareLink.isEmpty ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintBottom_toBottomOf="@+id/tvLink"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintTop_toTopOf="@+id/tvLink"
-                        app:layout_constraintVertical_bias="0.0"
-                        app:srcCompat="@drawable/ic_share"
-                        app:tint="@color/black" />
-
-                    <androidx.constraintlayout.widget.ConstraintLayout
-                        android:id="@+id/clLinkSettings"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:background="@color/white"
-                        android:visibility="@{viewModel.shareLink.isEmpty ? View.GONE : View.VISIBLE}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/tvLink">
-
-                        <Button
-                            android:id="@+id/btnShowLinkSettings"
-                            style="@style/customIconTextButtonStyle"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="16dp"
-                            android:fontFamily="@font/open_sans_semibold"
-                            android:onClick="@{() -> viewModel.areLinkSettingsVisible ? viewModel.onHideLinkSettingsBtnClick() : viewModel.onShowLinkSettingsBtnClick()}"
-                            android:paddingLeft="12dp"
-                            android:text="@{viewModel.areLinkSettingsVisible ? @string/share_management_hide_link_settings : @string/share_management_show_link_settings}"
-                            android:textAlignment="textStart"
-                            android:textColor="@color/colorPrimary"
-                            android:textSize="16sp"
-                            app:icon="@drawable/ic_arrow_drop_down_primary"
-                            app:iconPadding="16dp"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toTopOf="parent" />
-
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/switchSharePreview"
-                            android:layout_width="0dp"
-                            android:layout_height="64dp"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="8dp"
-                            android:checked="@{viewModel.sharePreview}"
-                            android:fontFamily="@font/open_sans"
-                            android:letterSpacing="-0.01"
-                            android:onCheckedChanged="@{(switch, checked) -> viewModel.onSharePreviewChanged(checked)}"
-                            android:paddingStart="12dp"
-                            android:paddingLeft="12dp"
-                            android:paddingEnd="12dp"
-                            android:paddingRight="12dp"
-                            android:text="@string/share_management_share_preview"
-                            android:textColor="@color/colorPrimary"
-                            android:textSize="16sp"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/btnShowLinkSettings"
-                            app:theme="@style/colorSwitchStyle" />
-
-                        <TextView
-                            android:id="@+id/tvSharePreview"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="28dp"
-                            android:layout_marginEnd="16dp"
-                            android:fontFamily="@font/open_sans_italic"
-                            android:letterSpacing="-0.01"
-                            android:text="@string/share_management_share_preview_description"
-                            android:textColor="@color/middleGrey"
-                            android:textSize="12sp"
-                            android:textStyle="normal"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toBottomOf="@+id/switchSharePreview"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <androidx.appcompat.widget.SwitchCompat
-                            android:id="@+id/switchAutoApprove"
-                            android:layout_width="0dp"
-                            android:layout_height="64dp"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="8dp"
-                            android:checked="@{viewModel.autoApprove}"
-                            android:fontFamily="@font/open_sans"
-                            android:letterSpacing="-0.01"
-                            android:onCheckedChanged="@{(switch, checked) -> viewModel.onAutoApproveChanged(checked)}"
-                            android:paddingStart="12dp"
-                            android:paddingLeft="12dp"
-                            android:paddingEnd="12dp"
-                            android:paddingRight="12dp"
-                            android:text="@string/share_management_auto_approve"
-                            android:textColor="@color/colorPrimary"
-                            android:textSize="16sp"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/switchSharePreview"
-                            app:theme="@style/colorSwitchStyle" />
-
-                        <TextView
-                            android:id="@+id/tvAutoApprove"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="28dp"
-                            android:layout_marginEnd="16dp"
-                            android:fontFamily="@font/open_sans_italic"
-                            android:letterSpacing="-0.01"
-                            android:text="@string/share_management_auto_approve_description"
-                            android:textColor="@color/middleGrey"
-                            android:textSize="12sp"
-                            android:textStyle="normal"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toBottomOf="@+id/switchAutoApprove"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <TextView
-                            android:id="@+id/tvAccessRoleTitle"
-                            android:layout_width="0dp"
-                            android:layout_height="64dp"
-                            android:layout_marginStart="16dp"
-                            android:layout_marginEnd="16dp"
-                            android:layout_marginBottom="24dp"
-                            android:ellipsize="end"
-                            android:maxLines="1"
-                            android:onClick="@{() -> viewModel.onDefaultAccessRoleBtnClick()}"
-                            android:paddingStart="12dp"
-                            android:paddingTop="20dp"
-                            android:text="@string/share_management_default_access_role"
-                            android:textColor="@color/colorPrimary"
-                            android:textSize="16sp"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toTopOf="@+id/layoutMaxUses"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tvAutoApprove" />
-
-                        <TextView
-                            android:id="@+id/tvAccessRoleDescription"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="28dp"
-                            android:layout_marginEnd="16dp"
-                            android:fontFamily="@font/open_sans_italic"
-                            android:letterSpacing="-0.01"
-                            android:text="@string/share_management_access_role_description"
-                            android:textColor="@color/middleGrey"
-                            android:textSize="12sp"
-                            android:textStyle="normal"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toBottomOf="@+id/tvAccessRoleTitle"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent" />
-
-                        <TextView
-                            android:id="@+id/tvAccessRole"
-                            android:layout_width="wrap_content"
-                            android:layout_height="wrap_content"
-                            android:background="@drawable/access_role_background_color"
-                            android:ellipsize="end"
-                            android:fontFamily="@font/open_sans"
-                            android:letterSpacing="-0.01"
-                            android:maxLines="1"
-                            android:paddingHorizontal="8dp"
-                            android:paddingVertical="4dp"
-                            android:text="@{viewModel.accessRole.name()}"
-                            android:textColor="@color/black"
-                            android:textSize="10sp"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toBottomOf="@+id/tvAccessRoleDescription"
-                            app:layout_constraintEnd_toStartOf="@+id/ivEditAccessRole"
-                            app:layout_constraintTop_toTopOf="@+id/tvAccessRoleTitle" />
-
-                        <ImageView
-                            android:id="@+id/ivEditAccessRole"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:scaleType="centerInside"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toBottomOf="@+id/tvAccessRole"
-                            app:layout_constraintEnd_toEndOf="@+id/tvAccessRoleTitle"
-                            app:layout_constraintTop_toTopOf="@+id/tvAccessRole"
-                            app:srcCompat="@drawable/ic_edit_primary"
-                            app:tint="@color/black" />
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/layoutMaxUses"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="24dp"
-                            android:layout_marginEnd="24dp"
-                            android:textColorHint="@color/colorPrimary"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:boxBackgroundColor="@color/blue25"
-                            app:boxBackgroundMode="outline"
-                            app:boxCornerRadiusBottomEnd="4dp"
-                            app:boxCornerRadiusBottomStart="4dp"
-                            app:boxCornerRadiusTopEnd="4dp"
-                            app:boxCornerRadiusTopStart="4dp"
-                            app:boxStrokeColor="@color/lightGrey"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tvAccessRoleDescription">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/etMaxUses"
-                                android:layout_width="match_parent"
-                                android:layout_height="64dp"
-                                android:afterTextChanged="@{(editable) -> viewModel.onMaxUsesChanged(editable)}"
-                                android:fontFamily="@font/open_sans"
-                                android:hint="@string/share_management_max_uses"
-                                android:inputType="number"
-                                android:letterSpacing="-0.01"
-                                android:onEditorAction="@{(view, actionId, event) -> viewModel.onKeyboardDoneBtnClick(view, actionId, event)}"
-                                android:text="@{viewModel.maxUses}"
-                                android:textColor="@color/colorPrimary"
-                                android:textColorHint="@color/colorPrimary"
-                                android:textSize="16sp" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <TextView
-                            android:id="@+id/tvMaxUses"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="8dp"
-                            android:layout_marginEnd="24dp"
-                            android:fontFamily="@font/open_sans_italic"
-                            android:letterSpacing="-0.01"
-                            android:text="@string/share_management_max_uses_description"
-                            android:textColor="@color/middleGrey"
-                            android:textSize="12sp"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/layoutMaxUses" />
-
-                        <com.google.android.material.textfield.TextInputLayout
-                            android:id="@+id/layoutExpDate"
-                            android:layout_width="match_parent"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="24dp"
-                            android:layout_marginEnd="24dp"
-                            android:textColorHint="@color/colorPrimary"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:boxBackgroundColor="@color/blue25"
-                            app:boxBackgroundMode="outline"
-                            app:boxCornerRadiusBottomEnd="4dp"
-                            app:boxCornerRadiusBottomStart="4dp"
-                            app:boxCornerRadiusTopEnd="4dp"
-                            app:boxCornerRadiusTopStart="4dp"
-                            app:boxStrokeColor="@color/lightGrey"
-                            app:layout_constraintBottom_toBottomOf="parent"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/tvMaxUses"
-                            app:layout_constraintVertical_bias="0.0">
-
-                            <com.google.android.material.textfield.TextInputEditText
-                                android:id="@+id/etExpDate"
-                                android:layout_width="match_parent"
-                                android:layout_height="wrap_content"
-                                android:focusable="false"
-                                android:fontFamily="@font/open_sans"
-                                android:hint="@string/share_management_expiration_date"
-                                android:letterSpacing="-0.01"
-                                android:onClick="@{() -> viewModel.onExpirationDateClick()}"
-                                android:text="@{viewModel.expirationDate}"
-                                android:textColor="@color/colorPrimary"
-                                android:textColorHint="@color/colorPrimary"
-                                android:textSize="16sp" />
-
-                        </com.google.android.material.textfield.TextInputLayout>
-
-                        <ImageView
-                            android:id="@+id/ivExpDate"
-                            android:layout_width="40dp"
-                            android:layout_height="40dp"
-                            android:layout_marginTop="4dp"
-                            android:onClick="@{() -> viewModel.onShareLinkBtnClick()}"
-                            android:scaleType="centerInside"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintBottom_toBottomOf="@+id/layoutExpDate"
-                            app:layout_constraintEnd_toEndOf="@+id/layoutExpDate"
-                            app:layout_constraintTop_toTopOf="@+id/layoutExpDate"
-                            app:srcCompat="@drawable/ic_arrow_drop_down_primary"
-                            app:tint="@color/black" />
-
-                        <TextView
-                            android:id="@+id/tvExpDate"
-                            android:layout_width="0dp"
-                            android:layout_height="wrap_content"
-                            android:layout_marginStart="24dp"
-                            android:layout_marginTop="8dp"
-                            android:layout_marginEnd="24dp"
-                            android:fontFamily="@font/open_sans_italic"
-                            android:letterSpacing="-0.01"
-                            android:text="@string/share_management_expiration_date_description"
-                            android:textColor="@color/middleGrey"
-                            android:textSize="12sp"
-                            android:visibility="@{viewModel.areLinkSettingsVisible ? View.VISIBLE : View.GONE}"
-                            app:layout_constraintEnd_toEndOf="parent"
-                            app:layout_constraintHorizontal_bias="0.0"
-                            app:layout_constraintStart_toStartOf="parent"
-                            app:layout_constraintTop_toBottomOf="@+id/layoutExpDate" />
-                    </androidx.constraintlayout.widget.ConstraintLayout>
-
-                    <ImageView
-                        android:id="@+id/ivNoLink"
-                        android:layout_width="wrap_content"
-                        android:layout_height="160dp"
-                        android:layout_marginTop="48dp"
-                        android:src="@drawable/img_share_management"
-                        android:visibility="@{viewModel.shareLink.isEmpty &amp;&amp; viewModel.sharesSize == 0 &amp;&amp; viewModel.pendingSharesSize == 0 ? View.VISIBLE : View.GONE}"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <Button
-                        android:id="@+id/btnCreateShareLink"
-                        style="@style/customIconTextButtonStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginTop="32dp"
-                        android:layout_marginEnd="16dp"
-                        android:layout_marginBottom="16dp"
-                        android:backgroundTint="@color/colorPrimary"
-                        android:onClick="@{() -> viewModel.onCreateLinkBtnClick()}"
-                        android:text="@string/share_management_create_share_link_button"
-                        android:textColor="@color/white"
-                        android:visibility="@{viewModel.shareLink.isEmpty ? View.VISIBLE : View.GONE}"
-                        app:layout_constraintBottom_toBottomOf="parent"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@+id/ivNoLink" />
-
-                    <!--                <TextView-->
-                    <!--                    android:id="@+id/tvOr"-->
-                    <!--                    android:layout_width="wrap_content"-->
-                    <!--                    android:layout_height="wrap_content"-->
-                    <!--                    android:layout_marginStart="16dp"-->
-                    <!--                    android:layout_marginTop="32dp"-->
-                    <!--                    android:layout_marginEnd="16dp"-->
-                    <!--                    android:singleLine="true"-->
-                    <!--                    android:text="@string/share_management_or"-->
-                    <!--                    android:textColor="@color/lightGrey"-->
-                    <!--                    android:fontFamily="@font/open_sans_italic"-->
-                    <!--                    android:textSize="14sp"-->
-                    <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toBottomOf="@+id/btnCreateShareLink" />-->
-
-                    <!--                <Button-->
-                    <!--                    android:id="@+id/btnSendEmailInvitation"-->
-                    <!--                    style="@style/customIconButtonStyle"-->
-                    <!--                    android:layout_width="wrap_content"-->
-                    <!--                    android:layout_height="wrap_content"-->
-                    <!--                    android:layout_marginStart="16dp"-->
-                    <!--                    android:layout_marginTop="24dp"-->
-                    <!--                    android:layout_marginEnd="16dp"-->
-                    <!--                    android:fontFamily="@font/open_sans_semibold"-->
-                    <!--                    android:onClick="@{() -> viewModel.onSendEmailInvitationBtnClick()}"-->
-                    <!--                    android:text="@string/share_management_send_email_invitation"-->
-                    <!--                    android:visibility="@{viewModel.existsLink ? View.GONE : View.VISIBLE}"-->
-                    <!--                    app:icon="@drawable/ic_email_black"-->
-                    <!--                    app:iconPadding="8dp"-->
-                    <!--                    app:layout_constraintEnd_toEndOf="parent"-->
-                    <!--                    app:layout_constraintStart_toStartOf="parent"-->
-                    <!--                    app:layout_constraintTop_toBottomOf="@+id/tvOr" />-->
-
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <View
-                    android:id="@+id/viewDividerLink"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="24dp"
-                    android:background="@color/lighterGrey"
-                    android:visibility="@{viewModel.shareLink.isEmpty &amp;&amp; viewModel.sharesSize == 0 &amp;&amp; viewModel.pendingSharesSize == 0 ? View.GONE : View.VISIBLE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/clLink" />
-
-                <TextView
-                    android:id="@+id/tvPendingRequests"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="24dp"
-                    android:ellipsize="end"
-                    android:fontFamily="@font/open_sans"
-                    android:letterSpacing="-0.01"
-                    android:maxLines="1"
-                    android:text="@string/share_management_pending_requests"
-                    android:textAllCaps="true"
-                    android:textColor="@color/middleGrey"
-                    android:textSize="12sp"
-                    android:visibility="@{viewModel.pendingSharesSize > 0 ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/viewDividerLink" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvPendingShares"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:visibility="@{viewModel.pendingSharesSize > 0 ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvPendingRequests" />
-
-                <TextView
-                    android:id="@+id/tvSharedWith"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="16dp"
-                    android:layout_marginTop="24dp"
-                    android:ellipsize="end"
-                    android:fontFamily="@font/open_sans"
-                    android:letterSpacing="-0.01"
-                    android:maxLines="1"
-                    android:text="@{viewModel.sharedWithLabelTxt}"
-                    android:textAllCaps="true"
-                    android:textColor="@color/middleGrey"
-                    android:textSize="12sp"
-                    android:textStyle="normal"
-                    android:visibility="@{viewModel.sharesSize > 0 ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/rvPendingShares" />
-
-                <androidx.recyclerview.widget.RecyclerView
-                    android:id="@+id/rvShares"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:visibility="@{viewModel.sharesSize > 0 ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/tvSharedWith" />
-
-                <View
-                    android:id="@+id/viewDividerShares"
-                    android:layout_width="match_parent"
-                    android:layout_height="1dp"
-                    android:layout_marginTop="24dp"
-                    android:background="@color/lighterGrey"
-                    android:visibility="@{viewModel.pendingSharesSize > 0 || viewModel.sharesSize > 0 ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/rvShares" />
-
-
-                <androidx.constraintlayout.widget.ConstraintLayout
-                    android:id="@+id/layoutButtons"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:layout_marginTop="24dp"
-                    android:layout_marginBottom="24dp"
-                    android:visibility="@{viewModel.shareLink.isEmpty ? View.GONE : View.VISIBLE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintHorizontal_bias="0.0"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toBottomOf="@+id/viewDividerShares">
-
-                    <Button
-                        android:id="@+id/btnShareLink"
-                        style="@style/customIconTextButtonStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:onClick="@{() -> viewModel.onShareLinkBtnClick()}"
-                        android:text="@string/share_management_share_link"
-                        android:textAlignment="textStart"
-                        app:icon="@drawable/ic_share"
-                        app:iconPadding="10dp"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toTopOf="parent" />
-
-                    <Button
-                        android:id="@+id/btnRevokeLink"
-                        style="@style/customIconTextButtonStyle"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:layout_marginStart="16dp"
-                        android:layout_marginEnd="16dp"
-                        android:onClick="@{() -> viewModel.onRevokeLinkBtnClick()}"
-                        android:text="@string/share_management_revoke_link_button"
-                        android:textAlignment="textStart"
-                        android:textColor="@color/red"
-                        app:icon="@drawable/ic_link_leave_share"
-                        app:iconPadding="10dp"
-                        app:iconTint="@color/red"
-                        app:layout_constraintEnd_toEndOf="parent"
-                        app:layout_constraintHorizontal_bias="0.0"
-                        app:layout_constraintStart_toStartOf="parent"
-                        app:layout_constraintTop_toBottomOf="@id/btnShareLink" />
-                </androidx.constraintlayout.widget.ConstraintLayout>
-
-                <androidx.core.widget.ContentLoadingProgressBar
-                    android:id="@+id/progressBar"
-                    style="@style/Widget.AppCompat.ProgressBar"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:indeterminate="true"
-                    android:visibility="@{viewModel.isBusy ? View.VISIBLE : View.GONE}"
-                    app:layout_constraintBottom_toBottomOf="parent"
-                    app:layout_constraintEnd_toEndOf="parent"
-                    app:layout_constraintStart_toStartOf="parent"
-                    app:layout_constraintTop_toTopOf="parent" />
-            </androidx.constraintlayout.widget.ConstraintLayout>
-        </androidx.constraintlayout.widget.ConstraintLayout>
-    </androidx.core.widget.NestedScrollView>
-</layout>
\ No newline at end of file
diff --git a/app/src/main/res/navigation/file_navigation_graph.xml b/app/src/main/res/navigation/file_navigation_graph.xml
index 116be0b2..6b362d26 100644
--- a/app/src/main/res/navigation/file_navigation_graph.xml
+++ b/app/src/main/res/navigation/file_navigation_graph.xml
@@ -14,11 +14,6 @@
             app:destination="@id/fileMetadataFragment"
             app:popEnterAnim="@android:anim/slide_in_left"
             app:popExitAnim="@android:anim/slide_out_right" />
-        <action
-            android:id="@+id/action_filesContainerFragment_to_shareLinkFragment"
-            app:destination="@id/shareLinkFragment"
-            app:popEnterAnim="@android:anim/slide_in_left"
-            app:popExitAnim="@android:anim/slide_out_right" />
     </fragment>
 
     <fragment
@@ -37,13 +32,6 @@
             app:popExitAnim="@android:anim/slide_out_right" />
     </fragment>
 
-    <fragment
-        android:id="@+id/shareLinkFragment"
-        android:name="org.permanent.permanent.ui.shareManagement.ShareManagementFragment"
-        android:label="@string/main_navigation_title_share_link"
-        tools:layout="@layout/fragment_share_management">
-    </fragment>
-
     <fragment
         android:id="@+id/locationSearchFragment"
         android:name="org.permanent.permanent.ui.fileView.LocationSearchFragment"
diff --git a/app/src/main/res/navigation/main_navigation_graph.xml b/app/src/main/res/navigation/main_navigation_graph.xml
index 7ef54120..54f85c29 100644
--- a/app/src/main/res/navigation/main_navigation_graph.xml
+++ b/app/src/main/res/navigation/main_navigation_graph.xml
@@ -68,12 +68,6 @@
         android:label="@string/main_navigation_title_search"
         tools:layout="@layout/fragment_record_search" />
 
-    <fragment
-        android:id="@+id/shareLinkFragment"
-        android:name="org.permanent.permanent.ui.shareManagement.ShareManagementFragment"
-        android:label="@string/main_navigation_title_share_link"
-        tools:layout="@layout/fragment_share_management" />
-
     <fragment
         android:id="@+id/sharePreviewFragment"
         android:name="org.permanent.permanent.ui.shares.SharePreviewFragment"
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 821cd130..1dc2a61f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -18,7 +18,6 @@
     <color name="colorPrimary200">#B8BBC9</color>
     <color name="colorPrimaryDarker">#0f163b</color>
     <color name="colorPrimaryLighter">#1c2451</color>
-    <color name="dividerBlue">#D0D1DB</color>
     <color name="errorSuperLight">#FEF3F2</color>
     <color name="errorLight">#FEE4E2</color>
     <color name="error25">#FFFBFA</color>
@@ -34,9 +33,11 @@
     <color name="colorAccent">#FF9933</color>
     <color name="colorAccentDark">#ff8000</color>
     <color name="orange">#F17400</color>
-    <color name="warning500">#F79009</color>
+    <color name="warning50">#FFFAEB</color>
     <color name="warning100">#FEF0C7</color>
     <color name="warning200">#FEDF89</color>
+    <color name="warning500">#F79009</color>
+    <color name="warning800">#93370D</color>
     <color name="lightGreen">#D1FADF</color>
     <color name="textGreen">#027A48</color>
     <color name="green">#34C759</color>
@@ -45,9 +46,9 @@
     <color name="dullGreen">#82B15F</color>
     <color name="paleGreen">#CAE5C9</color>
     <color name="success25">#F6FEF9</color>
+    <color name="success50">#ECFDF3</color>
     <color name="success200">#A6F4C5</color>
     <color name="success500">#12B76A</color>
-    <color name="successLight">#ECFDF3</color>
     <color name="success">#32D583</color>
     <color name="successDark">#039855</color>
     <color name="white">#FFFFFF</color>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index ad28fe2c..b053acc3 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -360,7 +360,7 @@
     <string name="share_management_pending_requests">Pending requests</string>
 
     <string name="access_roles_title">Access Roles</string>
-    <string name="access_roles_link_settings_title">Link Settings</string>
+    <string name="link_settings">Link Settings</string>
     <string name="access_roles_whats_this">What\'s this</string>
     <string name="access_roles_viewer">Viewer</string>
     <string name="access_roles_contributor">Contributor</string>
@@ -825,7 +825,36 @@
     <string name="delete">Delete</string>
     <string name="leave_share">Leave share</string>
     <string name="confirm">Confirm</string>
+    <string name="copy">Copy</string>
     <string name="confirm_delete_message">Are you sure you want to delete "%1$s"?</string>
     <string name="the_selected_items">the selected items</string>
     <string name="confirm_leave_share_message">Are you sure you want to give up your access to the "%1$s" item?</string>
+
+    <string name="create_link_to_sare">Create link to share</string>
+    <string name="creating_link">Creating link…</string>
+    <string name="create_link_description">Generate a link to send via text or email to invite people to share this content.</string>
+    <string name="revoke_link">Revoke link</string>
+    <string name="confirm_revoke_link_message">Are you sure you want to revoke this share link?</string>
+    <string name="revoke_this_share_link">revoke this share link</string>
+    <string name="anyone_can_view">Anyone can view</string>
+    <string name="anyone_can_view_description">Anyone with the link can view and download.</string>
+    <string name="restricted">Restricted</string>
+    <string name="restricted_description">The user must have an account and be logged in to view.</string>
+    <string name="general_access">General access</string>
+    <string name="default_access_role">Default access role</string>
+    <string name="link_expiration">Link expiration</string>
+    <string name="one_day">One day</string>
+    <string name="one_month">One month</string>
+    <string name="one_year">One year</string>
+    <string name="never">Never</string>
+    <string name="link_never_expires">The link will never expire.</string>
+    <string name="link_expires_on">The link will expire on %1$s.</string>
+    <string name="select_access_role">Select access role</string>
+    <string name="owner_description">Has ultimate control: manages roles, settings, and full archive access, including deletion.</string>
+    <string name="curator_description">Trusted member with full control: edit, organize, delete, publish, share, and manage archive membership.</string>
+    <string name="editor_description">Can upload and edit metadata but cannot delete materials, publish them, or share anything.</string>
+    <string name="contributor_description">Can upload new materials but cannot edit metadata, delete items, publish content, or share.</string>
+    <string name="viewer_description">Can view all materials but cannot edit, delete, upload, publish, or share anything.</string>
+    <string name="link_settings_updated">Link settings has been updated.</string>
+    <string name="link_revoked">Link has been revoked.</string>
 </resources>