diff --git a/.gitignore b/.gitignore
index 85dfbb19..54f31121 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,3 +40,6 @@ hs_err_pid*
 .externalNativeBuild
 fastlane/.env.staging
 fastlane/.env.production
+
+# Kotlin compiler cache
+.kotlin/
\ No newline at end of file
diff --git a/.idea/appInsightsSettings.xml b/.idea/appInsightsSettings.xml
index 86c22136..2587f35a 100644
--- a/.idea/appInsightsSettings.xml
+++ b/.idea/appInsightsSettings.xml
@@ -3,6 +3,20 @@
   <component name="AppInsightsSettings">
     <option name="tabSettings">
       <map>
+        <entry key="Android Vitals">
+          <value>
+            <InsightsFilterSettings>
+              <option name="connection">
+                <ConnectionSetting>
+                  <option name="appId" value="org.permanent.PermanentArchive" />
+                </ConnectionSetting>
+              </option>
+              <option name="signal" value="SIGNAL_UNSPECIFIED" />
+              <option name="timeIntervalDays" value="SEVEN_DAYS" />
+              <option name="visibilityType" value="ALL" />
+            </InsightsFilterSettings>
+          </value>
+        </entry>
         <entry key="Firebase Crashlytics">
           <value>
             <InsightsFilterSettings>
diff --git a/.idea/deploymentTargetSelector.xml b/.idea/deploymentTargetSelector.xml
index 23bc8d89..e6a7a5e0 100644
--- a/.idea/deploymentTargetSelector.xml
+++ b/.idea/deploymentTargetSelector.xml
@@ -4,7 +4,7 @@
     <selectionStates>
       <SelectionState runConfigName="app">
         <option name="selectionMode" value="DROPDOWN" />
-        <DropdownSelection timestamp="2025-08-28T13:25:49.186016Z">
+        <DropdownSelection timestamp="2026-01-14T09:59:49.558100Z">
           <Target type="DEFAULT_BOOT">
             <handle>
               <DeviceId pluginId="LocalEmulator" identifier="path=/Users/flaviahandrea/.android/avd/Pixel_9_-_Andr_16_API_36.avd" />
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/models/AccessRole.kt b/app/src/main/java/org/permanent/permanent/models/AccessRole.kt
index b44d55c3..ef0139a0 100644
--- a/app/src/main/java/org/permanent/permanent/models/AccessRole.kt
+++ b/app/src/main/java/org/permanent/permanent/models/AccessRole.kt
@@ -3,7 +3,7 @@ package org.permanent.permanent.models
 import android.os.Parcel
 import android.os.Parcelable
 import org.permanent.permanent.ArchivePermission
-import java.util.*
+import java.util.Locale
 
 enum class AccessRole(val backendString: String) : Parcelable {
     OWNER("access.role.owner") {
@@ -113,7 +113,7 @@ enum class AccessRole(val backendString: String) : Parcelable {
     fun toTitleCase(): String = this.name.lowercase(Locale.getDefault())
         .replaceFirstChar { it.titlecase(Locale.getDefault()) }
 
-    fun toLowerCase(): String = this.name.lowercase(Locale.getDefault())
+    fun lowerCase(): String = this.name.lowercase(Locale.getDefault())
 
     fun getInferior(otherAccessRole: AccessRole): AccessRole {
         return if (otherAccessRole in inferiors()) otherAccessRole else this
@@ -153,7 +153,7 @@ enum class AccessRole(val backendString: String) : Parcelable {
             return values()[parcel.readInt()]
         }
 
-        fun createFromBackendString(accessRoleString: String?): AccessRole {
+        fun fromBackendValue(accessRoleString: String?): AccessRole {
             return when (accessRoleString) {
                 OWNER.backendString -> OWNER
                 MANAGER.backendString -> MANAGER
@@ -164,6 +164,17 @@ enum class AccessRole(val backendString: String) : Parcelable {
             }
         }
 
+        fun fromStelaBackendValue(accessRoleString: String?): AccessRole {
+            return when (accessRoleString) {
+                OWNER.lowerCase() -> OWNER
+                MANAGER.lowerCase() -> MANAGER
+                CURATOR.lowerCase() -> CURATOR
+                EDITOR.lowerCase() -> EDITOR
+                CONTRIBUTOR.lowerCase() -> CONTRIBUTOR
+                else -> VIEWER
+            }
+        }
+
         override fun newArray(size: Int): Array<AccessRole?> {
             return arrayOfNulls(size)
         }
diff --git a/app/src/main/java/org/permanent/permanent/models/Record.kt b/app/src/main/java/org/permanent/permanent/models/Record.kt
index a67dfb2d..b61df17b 100644
--- a/app/src/main/java/org/permanent/permanent/models/Record.kt
+++ b/app/src/main/java/org/permanent/permanent/models/Record.kt
@@ -83,7 +83,7 @@ open class Record : Parcelable {
         isThumbBlurred = false
         type = if (recordInfo.folderId != null) RecordType.FOLDER else RecordType.FILE
         size = recordInfo.size ?: -1L
-        accessRole = AccessRole.createFromBackendString(recordInfo.accessRole)
+        accessRole = AccessRole.fromBackendValue(recordInfo.accessRole)
         initShares(recordInfo.ShareVOs)
         displayFirstInCarousel = false
         val thumbStatus = ThumbStatus.createFromBackendString(recordInfo.thumbStatus)
@@ -109,7 +109,7 @@ open class Record : Parcelable {
         thumbURL2000 = recordInfo.thumbURL2000
         isThumbBlurred = false
         type = RecordType.FOLDER
-        accessRole = AccessRole.createFromBackendString(recordInfo.accessRole)
+        accessRole = AccessRole.fromBackendValue(recordInfo.accessRole)
         initShares(recordInfo.ShareVOs)
         displayFirstInCarousel = false
         val thumbStatus = ThumbStatus.createFromBackendString(recordInfo.thumbStatus)
@@ -138,7 +138,7 @@ open class Record : Parcelable {
         thumbURL2000 = itemVO.thumbURL2000
         isThumbBlurred = false
         type = if (itemVO.folderId != null) RecordType.FOLDER else RecordType.FILE
-        accessRole = AccessRole.createFromBackendString(itemVO.accessRole)
+        accessRole = AccessRole.fromBackendValue(itemVO.accessRole)
         initShares(itemVO.ShareVOs)
         displayFirstInCarousel = false
         isProcessing = itemVO.thumbURL200.isNullOrEmpty()
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 d1103bab..7f6a5aa8 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
@@ -58,7 +59,6 @@ import org.permanent.permanent.ui.myFiles.upload.CountingRequestListener
 import retrofit2.Call
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory
-import retrofit2.http.Query
 import java.io.File
 import java.util.Date
 
@@ -788,10 +788,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 getShareLink(shareLinkIds: List<Int>): Call<ShareLinkVOResponse> = stelaAccountService.getShareLink(shareLinkIds)
 
     fun generateShareLink(shareLink: ShareLinkVO): Call<ShareLinkResponse> = 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 36f0fcb7..d8fd16ea 100644
--- a/app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt
+++ b/app/src/main/java/org/permanent/permanent/network/StelaAccountService.kt
@@ -10,21 +10,28 @@ 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>
+    fun getShareLink(@Query("shareLinkIds[]") shareLinkIds: List<Int>): Call<ShareLinkVOResponse>
 
     @POST("api/v2/share-links")
     fun generateShareLink(@Body shareLink: ShareLinkVO): Call<ShareLinkResponse>
 
+    @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/FileData.kt b/app/src/main/java/org/permanent/permanent/network/models/FileData.kt
index 5e76a9ac..dab96049 100644
--- a/app/src/main/java/org/permanent/permanent/network/models/FileData.kt
+++ b/app/src/main/java/org/permanent/permanent/network/models/FileData.kt
@@ -38,7 +38,7 @@ class FileData private constructor() : Parcelable {
         folderLinkId = recordVO.folder_linkId ?: -1
         archiveId = recordVO.archiveId ?: -1
         archiveNr = recordVO.archiveNbr
-        accessRole = AccessRole.createFromBackendString(recordVO.accessRole)
+        accessRole = AccessRole.fromBackendValue(recordVO.accessRole)
         val fileVOs = recordVO.FileVOs ?: emptyList()
 
         val fileVO: FileVO? = when {
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
index a9224b0f..fa166aac 100644
--- a/app/src/main/java/org/permanent/permanent/network/models/ShareLinkVO.kt
+++ b/app/src/main/java/org/permanent/permanent/network/models/ShareLinkVO.kt
@@ -8,20 +8,20 @@ data class ShareLinkVOResponse(
 data class ShareLinkResponse(
     val data: ShareLinkVO
 )
-class ShareLinkVO {
-    var id:  String? = null
-    var itemId:  String? = null
-    var itemType:  String? = null
-    var permissionsLevel:  String? = null
-    var accessRestrictions: String? = null
+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 token: String? = null,
 
-    var maxUses: Int? = null // can be 0 for unlimited uses
+    var maxUses: Int? = null, // can be 0 for unlimited uses
 
-    var usesExpended: Int? = null
-    var expirationTimestamp: String? = null // can be null for no expiration
+    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
+    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 3795181c..bc8630ab 100644
--- a/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt
+++ b/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepository.kt
@@ -21,8 +21,11 @@ interface StelaAccountRepository {
 
     fun disableTwoFactor(twoFAVO: TwoFAVO, listener: IResponseListener)
 
-    fun getShareLink(shareTokens: List<String>?,shareLinkIds: List<String>?, listener: IResponseListener)
+    fun getShareLink(shareLinkIds: List<Int>, listener: ILinkListener)
 
     fun generateShareLink(shareLinkVO: ShareLinkVO, listener: ILinkListener)
 
+    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 e3b8e0c0..1753bab1 100644
--- a/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt
+++ b/app/src/main/java/org/permanent/permanent/repositories/StelaAccountRepositoryImpl.kt
@@ -11,9 +11,9 @@ 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.ShareLinkResponse
 import org.permanent.permanent.network.models.ShareLinkVO
 import org.permanent.permanent.network.models.ShareLinkVOResponse
-import org.permanent.permanent.network.models.ShareLinkResponse
 import org.permanent.permanent.network.models.TwoFAVO
 import retrofit2.Call
 import retrofit2.Callback
@@ -197,14 +197,14 @@ 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 getShareLink(shareLinkIds: List<Int>, listener: ILinkListener) {
+        NetworkClient.instance().getShareLink(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("")
+                        listener.onSuccess(responseVO.items[0])
                     } else {
                         listener.onFailed(appContext.getString(R.string.generic_error))
                     }
@@ -240,4 +240,53 @@ class StelaAccountRepositoryImpl(context: Context) : StelaAccountRepository {
             }
         })
     }
+
+    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/Extensions.kt b/app/src/main/java/org/permanent/permanent/ui/Extensions.kt
index 6714dc86..a709329c 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,11 @@ import java.io.FileOutputStream
 import java.io.IOException
 import java.io.OutputStream
 import java.text.SimpleDateFormat
+import java.time.Instant
+import java.time.LocalDate
 import java.time.LocalDateTime
+import java.time.LocalTime
+import java.time.ZoneOffset
 import java.time.format.DateTimeFormatter
 import java.util.Date
 import java.util.Locale
@@ -117,6 +121,26 @@ 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.toLocalDateUtc(): LocalDate =
+    Instant.parse(this)
+        .atZone(ZoneOffset.UTC)
+        .toLocalDate()
+
 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/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 320ed6d6..370d667c 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,7 +70,6 @@ class FileActivity : PermanentBaseActivity() {
                 this@FileActivity.finish()
                 true
             }
-
             R.id.shareLinkFragment -> {
                 navController.navigateUp(appBarConfig) || super.onSupportNavigateUp()
                 setToolbarAndStatusBarColor(R.color.black)
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 8cf066fe..25034cfe 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
@@ -38,7 +38,6 @@ 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.ShareLinkFragment
-import org.permanent.permanent.ui.shareManagement.shareLink.ShareLinkScreen
 import org.permanent.permanent.viewmodels.RecordMenuItem
 import org.permanent.permanent.viewmodels.RecordMenuViewModel
 
@@ -218,7 +217,7 @@ class RecordMenuFragment : PermanentBottomSheetFragment() {
 
     private fun showShareManagementFragment() {
         val shareManagementScreen = ShareLinkFragment()
-        shareManagementScreen.setBundleArguments(record, viewModel.getShareByUrlVO())
+        shareManagementScreen.setBundleArguments(record)
         shareManagementScreen.show(parentFragmentManager, shareManagementScreen.tag)
     }
 
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
index 6cf278fc..97ce5441 100644
--- a/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareLinkFragment.kt
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/ShareLinkFragment.kt
@@ -15,10 +15,9 @@ 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.shareLink.ShareLinkScreen
+import org.permanent.permanent.ui.shareManagement.compose.ShareManagementContainer
 import org.permanent.permanent.viewmodels.ShareManagementViewModel
 
 class ShareLinkFragment : PermanentBottomSheetFragment()  {
@@ -37,7 +36,6 @@ class ShareLinkFragment : PermanentBottomSheetFragment()  {
         record?.let {
             viewModel.setRecord(it)
         }
-        viewModel.setShareLink(arguments?.getParcelable(SHARE_BY_URL_VO_KEY))
 
         return ComposeView(requireContext()).apply {
             setContent {
@@ -45,7 +43,7 @@ class ShareLinkFragment : PermanentBottomSheetFragment()  {
                     Surface(
                         shape = RoundedCornerShape(topStart = 12.dp, topEnd = 12.dp),
                         ) {
-                        ShareLinkScreen(
+                        ShareManagementContainer(
                             viewModel = viewModel,
                             onClose = { dismiss() }
                         )
@@ -55,9 +53,8 @@ class ShareLinkFragment : PermanentBottomSheetFragment()  {
         }
     }
 
-    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
+    fun setBundleArguments(record: Record?) {
+        this.arguments = bundleOf(PARCELABLE_RECORD_KEY to record)
     }
 
     override fun onStart() {
@@ -65,8 +62,13 @@ class ShareLinkFragment : PermanentBottomSheetFragment()  {
         (dialog as? BottomSheetDialog)?.behavior?.apply {
             state = BottomSheetBehavior.STATE_EXPANDED
             skipCollapsed = true
+            isHideable = false
+            try {
+                this.isDraggable = false
+            } catch (ignored: Throwable) {
+            }
         }
-        // Optional: transparent background so your Compose Surface can draw rounded corners
+        // transparent background so Compose Surface can draw rounded corners
         (requireView().parent as? View)?.setBackgroundColor(Color.TRANSPARENT)
     }
 
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..8fbc5743
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/GeneralAccessPage.kt
@@ -0,0 +1,84 @@
+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"
+        }
+
+    companion object {
+        fun fromBackendValue(value: String): AccessType? =
+            entries.firstOrNull { it.backendValue == value }
+    }
+}
\ 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..495b76b7
--- /dev/null
+++ b/app/src/main/java/org/permanent/permanent/ui/shareManagement/compose/LinkSettingsPage.kt
@@ -0,0 +1,697 @@
+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.Duration
+import java.time.Instant
+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()
+    val createdAtDate by viewModel.createdAtDate.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, createdAt = createdAtDate)
+
+                    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, createdAt: LocalDate
+) {
+    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(createdAt)!!
+            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
+    }
+
+    companion object {
+        fun fromBackend(
+            createdAt: String?,
+            expirationTimestamp: String?
+        ): LinkDuration {
+            if (createdAt == null || expirationTimestamp == null) return NEVER
+
+            val created = Instant.parse(createdAt)
+            val expires = Instant.parse(expirationTimestamp)
+
+            val duration = Duration.between(created, expires)
+
+            return when {
+                duration.toDays() <= 1 -> ONE_DAY
+                duration.toDays() in 28..31 -> ONE_MONTH
+                duration.toDays() in 360..370 -> ONE_YEAR
+                else -> NEVER
+            }
+        }
+    }
+}
\ 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
index 507f7e13..115c3d98 100644
--- 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
@@ -38,14 +38,12 @@ 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.models.AccessRole
 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
-import kotlin.String
 
 @Composable
 fun ShareLinkScreen(
@@ -64,7 +62,7 @@ fun ShareLinkScreen(
     Box(
         modifier = Modifier
             .fillMaxWidth()
-            .fillMaxHeight(0.95f)
+            .fillMaxHeight()
             .background(colorResource(R.color.blue25))
             .wrapContentHeight(Alignment.Top)
     ) {
@@ -74,9 +72,8 @@ fun ShareLinkScreen(
                 .wrapContentHeight()
         ) {
             SheetHeader(
-                title = stringResource(R.string.share_link_item), onCloseClick = onClose
+                title = "Share Item", onCloseClick = onClose
             )
-            HorizontalDivider()
 
             RecordMenuHeader(
                 recordThumbURL = recordThumbURL,
@@ -92,7 +89,9 @@ fun ShareLinkScreen(
                 CreatingLinkRow()
             } else {
                 if (isLinkSharedState) {
-                    SharedLinkRow(shareLink = viewModel.cleanUrlRegex(shareLink), onSettingClick = {}, onCopyClick = {
+                    SharedLinkRow(shareLink = viewModel.cleanUrlRegex(shareLink), onSettingClick = {
+                        viewModel.onLinkSettingsBtnClick()
+                    }, onCopyClick = {
                         viewModel.copyLinkToClipboard()
                     })
                 } else {
@@ -114,7 +113,6 @@ fun CreatingLinkRow() {
             .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)
@@ -271,34 +269,40 @@ fun CreateLinkRow(onClick: () -> Unit) {
 fun SheetHeader(
     title: String, onCloseClick: (() -> Unit)? = null
 ) {
-    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
-        )
+    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.blue400),
-                )
+            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)
+        )
     }
 }
 
diff --git a/app/src/main/java/org/permanent/permanent/viewmodels/AccessRolesViewModel.kt b/app/src/main/java/org/permanent/permanent/viewmodels/AccessRolesViewModel.kt
index c100159f..9ac52391 100644
--- a/app/src/main/java/org/permanent/permanent/viewmodels/AccessRolesViewModel.kt
+++ b/app/src/main/java/org/permanent/permanent/viewmodels/AccessRolesViewModel.kt
@@ -31,7 +31,7 @@ class AccessRolesViewModel(application: Application) : ObservableAndroidViewMode
     fun setShareLink(shareByUrlVO: Shareby_urlVO?) {
         this.shareByUrlVO = shareByUrlVO
         shareByUrlVO?.let {
-            checkedAccessRole.value = AccessRole.createFromBackendString(it.defaultAccessRole)
+            checkedAccessRole.value = AccessRole.fromBackendValue(it.defaultAccessRole)
         }
     }
 
diff --git a/app/src/main/java/org/permanent/permanent/viewmodels/RecordMenuViewModel.kt b/app/src/main/java/org/permanent/permanent/viewmodels/RecordMenuViewModel.kt
index 315176a5..fc48a8c6 100644
--- a/app/src/main/java/org/permanent/permanent/viewmodels/RecordMenuViewModel.kt
+++ b/app/src/main/java/org/permanent/permanent/viewmodels/RecordMenuViewModel.kt
@@ -27,7 +27,6 @@ import org.permanent.permanent.models.FileType
 import org.permanent.permanent.models.Record
 import org.permanent.permanent.models.RecordType
 import org.permanent.permanent.models.Upload
-import org.permanent.permanent.network.ShareRequestType
 import org.permanent.permanent.network.models.FileData
 import org.permanent.permanent.network.models.ResponseVO
 import org.permanent.permanent.network.models.Shareby_urlVO
@@ -35,8 +34,6 @@ import org.permanent.permanent.repositories.EventsRepositoryImpl
 import org.permanent.permanent.repositories.FileRepositoryImpl
 import org.permanent.permanent.repositories.IEventsRepository
 import org.permanent.permanent.repositories.IFileRepository
-import org.permanent.permanent.repositories.IShareRepository
-import org.permanent.permanent.repositories.ShareRepositoryImpl
 import org.permanent.permanent.ui.PREFS_NAME
 import org.permanent.permanent.ui.PreferencesHelper
 import org.permanent.permanent.ui.Workspace
@@ -88,7 +85,6 @@ class RecordMenuViewModel(application: Application) : ObservableAndroidViewModel
     private val onShareToAnotherAppRequest = SingleLiveEvent<String>()
     private val onFileDownloadedForSharing = SingleLiveEvent<String>()
     private var fileRepository: IFileRepository = FileRepositoryImpl(application)
-    private var shareRepository: IShareRepository = ShareRepositoryImpl(ctx)
     private var eventsRepository: IEventsRepository = EventsRepositoryImpl(application)
 
     fun initWith(
@@ -104,34 +100,20 @@ class RecordMenuViewModel(application: Application) : ObservableAndroidViewModel
         actualAccessRole =
             record.accessRole?.getInferior(CurrentArchivePermissionsManager.instance.getAccessRole())
                 ?: AccessRole.VIEWER
-        if (workspace == Workspace.PRIVATE_FILES) checkForExistingLink(record)
 
         _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 ""
-        _archiveThumb.value = record.archiveThumbURL200?.takeIf { isShownInSharedWithMe && isShownInRootFolder } ?: ""
-        _archiveName.value = record.archiveFullName?.takeIf { isShownInSharedWithMe && isShownInRootFolder } ?: ""
+        _archiveThumb.value =
+            record.archiveThumbURL200?.takeIf { isShownInSharedWithMe && isShownInRootFolder } ?: ""
+        _archiveName.value =
+            record.archiveFullName?.takeIf { isShownInSharedWithMe && isShownInRootFolder } ?: ""
         _accessRole.value = actualAccessRole
 
         _menuItems.value = buildMenuItems()
     }
 
-    private fun checkForExistingLink(record: Record) {
-        _isBusyState.value = true
-        shareRepository.requestShareLink(record, ShareRequestType.GET,
-            object : IShareRepository.IShareByUrlListener {
-                override fun onSuccess(shareByUrlVO: Shareby_urlVO?) {
-                    _isBusyState.value = false
-                    this@RecordMenuViewModel.shareByUrlVO = shareByUrlVO
-                }
-
-                override fun onFailed(error: String?) {
-                    _isBusyState.value = false
-                }
-            })
-    }
-
     private fun buildMenuItems(): List<RecordMenuItem> {
         val baseItems = listOf(
             RecordMenuItem.Share,
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 fa0c424c..f5a3b5ae 100644
--- a/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModel.kt
+++ b/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModel.kt
@@ -5,44 +5,58 @@ 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.Constants
 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.ILinkListener
 import org.permanent.permanent.network.IResponseListener
 import org.permanent.permanent.network.ShareRequestType
+import org.permanent.permanent.network.models.BackendRecordType
 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 org.permanent.permanent.network.models.BackendRecordType
-import org.permanent.permanent.repositories.StelaAccountRepository
-import org.permanent.permanent.repositories.StelaAccountRepositoryImpl
+import org.permanent.permanent.ui.toLocalDateUtc
+import java.time.LocalDate
+
 
 class ShareManagementViewModel(application: Application) : ObservableAndroidViewModel(application),
-    ShareListener, DatePickerDialog.OnDateSetListener {
+    ShareListener {
 
     private val appContext = application.applicationContext
     private val prefsHelper = PreferencesHelper(
         application.getSharedPreferences(PREFS_NAME, Context.MODE_PRIVATE)
     )
-    private lateinit var record: org.permanent.permanent.models.Record
+    private lateinit var record: Record
     private val _recordThumb = MutableStateFlow("")
     val recordThumb: StateFlow<String> = _recordThumb
     private val _recordSize = MutableStateFlow("")
@@ -57,9 +71,23 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     val isCreatingLinkState: StateFlow<Boolean> = _isCreatingLinkState
     private val _isLinkSharedState = MutableStateFlow(false)
     val isLinkSharedState: StateFlow<Boolean> = _isLinkSharedState
-    private var shareByUrlVO: Shareby_urlVO? = null
-
-
+    private val _createdAtDate = MutableStateFlow<LocalDate>(LocalDate.now())
+    val createdAtDate: StateFlow<LocalDate> = _createdAtDate
+    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 shareLinkVO: ShareLinkVO? = null
+    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)
@@ -70,22 +98,19 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     private val defaultAccessRole = MutableLiveData(AccessRole.VIEWER)
     private val expirationDate = MutableLiveData<String>()
     private val showDatePicker = SingleLiveEvent<Void?>()
-    private val sharedWithLabelTxt = MutableLiveData<String>()
     private val areLinkSettingsVisible = 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)
 
-    private var stelaAccountRepository: StelaAccountRepository = StelaAccountRepositoryImpl(appContext)
-
-    fun setRecord(record: org.permanent.permanent.models.Record) {
+    fun setRecord(record: Record) {
         this.record = record
 
         _recordName.value = record.displayName ?: ""
@@ -93,17 +118,8 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         _recordDate.value = record.displayDate.toDisplayDate()
         _recordThumb.value = if (record.type == RecordType.FILE) record.thumbURL200 ?: "" else ""
 
+        checkForExistingLink(record)
         initShares(record.shares)
-        sharedWithLabelTxt.value =
-            appContext.getString(R.string.record_options_shared_with, shares.size)
-    }
-
-    fun setShareLink(shareByUrlVO: Shareby_urlVO?) {
-        if (shareByUrlVO == null) {
-            checkForExistingLink(record)
-        } else {
-            init(shareByUrlVO)
-        }
     }
 
     private fun initShares(shares: MutableList<Share>?) {
@@ -115,67 +131,103 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         pendingSharesSize.value = this.pendingShares.size
     }
 
-    private fun init(shareByUrlVO: Shareby_urlVO) {
-        this.shareByUrlVO = shareByUrlVO
-        _shareLink.value = shareByUrlVO.shareUrl ?: ""
-        _isLinkSharedState.value = _shareLink.value != ""
-        sharePreview.value = shareByUrlVO.previewToggle == 1
-        autoApprove.value = shareByUrlVO.autoApproveToggle == 1
-        maxUses.value = (shareByUrlVO.maxUses ?: 0).toString()
-        defaultAccessRole.value = AccessRole.createFromBackendString(shareByUrlVO.defaultAccessRole)
-        shareByUrlVO.expiresDT.let { expirationDate.value = it?.trimSubstring() }
-    }
-
-    private fun checkForExistingLink(record: org.permanent.permanent.models.Record) {
-        if (isCreatingLinkState.value!!) {
+    private fun checkForExistingLink(record: Record) {
+        if (_isBusyState.value) {
             return
         }
 
-        _isCreatingLinkState.value = true
-        shareRepository.requestShareLink(record, ShareRequestType.GET,
+        _isBusyState.value = true
+        shareRepository.requestShareLink(
+            record,
+            ShareRequestType.GET,
             object : IShareRepository.IShareByUrlListener {
                 override fun onSuccess(shareByUrlVO: Shareby_urlVO?) {
-                    _isCreatingLinkState.value = false
-                    _isLinkSharedState.value = true
-                    shareByUrlVO?.let { init(it) }
+                    _isBusyState.value = false
+                    shareByUrlVO?.let { getLinkFromStela(it) }
                 }
 
                 override fun onFailed(error: String?) {
-                    _isCreatingLinkState.value = false
-                    showSnackbar.value = error
+                    _isBusyState.value = false
+                    error?.let { showSnackbar.value = error }
                 }
             })
     }
 
+    private fun getLinkFromStela(shareByUrlVO: Shareby_urlVO) {
+        if (_isBusyState.value) {
+            return
+        }
+
+        shareByUrlVO.shareby_urlId?.let { shareByUrlId ->
+            _isBusyState.value = true
+            stelaAccountRepository.getShareLink(
+                mutableListOf(shareByUrlId),
+                object : ILinkListener {
+
+                    override fun onSuccess(shareLink: ShareLinkVO?) {
+                        _isBusyState.value = false
+                        shareLink?.let {
+                            initLink(it)
+                            initLinkSettings(it)
+                        }
+                    }
+
+                    override fun onFailed(error: String?) {
+                        _isBusyState.value = false
+                        error?.let { showSnackbar.value = error }
+                    }
+                })
+        }
+    }
+
+    private fun initLink(shareLink: ShareLinkVO) {
+        this.shareLinkVO = shareLink
+        _shareLink.value = Constants.SHARED_LINK_URL + shareLink.token
+        _isLinkSharedState.value = _shareLink.value != ""
+        shareLinkVO?.createdAt?.toLocalDateUtc()?.let { _createdAtDate.value = it }
+    }
+
+    private fun initLinkSettings(shareLink: ShareLinkVO) {
+        shareLink.accessRestrictions?.let { accessRestriction ->
+            _selectedGeneralAccessType.value =
+                AccessType.fromBackendValue(accessRestriction) ?: AccessType.ANYONE_CAN_VIEW
+        }
+        _selectedAccessRole.value =
+            if (shareLink.permissionsLevel == AccessRole.MANAGER.lowerCase()) AccessRole.CURATOR else AccessRole.fromStelaBackendValue(
+                shareLink.permissionsLevel
+            )
+        _selectedLinkDuration.value =
+            LinkDuration.fromBackend(shareLink.createdAt, shareLink.expirationTimestamp)
+    }
+
     fun onCreateLinkBtnClick() {
-        if (_isCreatingLinkState.value!!) {
+        if (_isCreatingLinkState.value) {
             return
         }
 
         _isCreatingLinkState.value = true
-        var shareLinkVO = ShareLinkVO()
+        val shareLinkVO = ShareLinkVO()
         shareLinkVO.itemId = record.id.toString()
-        shareLinkVO.itemType = if (record.type == RecordType.FILE) BackendRecordType.RECORD.toString().lowercase() else BackendRecordType.FOLDER.toString().lowercase()
+        shareLinkVO.itemType =
+            if (record.type == RecordType.FILE) BackendRecordType.RECORD.toString()
+                .lowercase() else BackendRecordType.FOLDER.toString().lowercase()
 
         stelaAccountRepository.generateShareLink(shareLinkVO, object : ILinkListener {
 
-            override fun onSuccess(sharedLink: ShareLinkVO?) {
+            override fun onSuccess(shareLink: ShareLinkVO?) {
                 _isCreatingLinkState.value = false
                 _isLinkSharedState.value = true
-                this@ShareManagementViewModel.shareByUrlVO = shareByUrlVO
-                shareByUrlVO?.shareUrl = Constants.SHARED_LINK_URL + sharedLink?.token
-
-                shareByUrlVO?.shareUrl?.let {
-                    _shareLink.value = it
-                    _isLinkSharedState.value = _shareLink.value != ""
-                    onShowLinkSettingsBtnClick()
-                }
+                this@ShareManagementViewModel.shareLinkVO = shareLink
+                _shareLink.value = Constants.SHARED_LINK_URL + shareLink?.token
+                _isLinkSharedState.value = _shareLink.value != ""
+                shareLink?.createdAt?.toLocalDateUtc()?.let { _createdAtDate.value = it }
+                onShowLinkSettingsBtnClick()
             }
 
             override fun onFailed(error: String?) {
+                _isCreatingLinkState.value = false
+                _isLinkSharedState.value = false
                 error?.let {
-                    _isCreatingLinkState.value = false
-                    _isLinkSharedState.value = false
                     showSnackbar.value = error
                 }
             }
@@ -183,7 +235,6 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
     }
 
     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
@@ -195,51 +246,122 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         return url.replace(Regex("^https?://(www\\.)?"), "")
     }
 
+    fun onShareLinkBtnClick() {
+        onShareLinkRequest.value = shareLink.value.toString()
+    }
+
+    fun onLinkSettingsBtnClick() {
+        _navigateToPage.value = SharePage.LINK_SETTINGS
+    }
+
     fun onShowLinkSettingsBtnClick() {
         areLinkSettingsVisible.value = true
     }
 
-    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 onDefaultAccessRoleBtnClick() {
-        showAccessRolesForLink.value = shareByUrlVO
+    fun onGeneralAccessItemClick(type: AccessType) {
+        _selectedGeneralAccessType.value = type
+        _navigateToPage.value = SharePage.LINK_SETTINGS
     }
 
+    fun onDefaultAccessRoleClick() {
+        _navigateToPage.value = SharePage.ACCESS_ROLES
+    }
 
-    override fun onDateSet(view: DatePicker, year: Int, month: Int, day: Int) {
-        expirationDate.value = "$year-${month + 1}-$day"
-        saveChanges()
+    fun onAccessRoleClick(role: AccessRole) {
+        _selectedAccessRole.value = role
+        _navigateToPage.value = SharePage.LINK_SETTINGS
     }
 
-    fun onRevokeLinkBtnClick() {
-        onRevokeLinkRequest.call()
+    fun onLinkDurationSelected(duration: LinkDuration) {
+        _selectedLinkDuration.value = duration
     }
 
-    private fun saveChanges() {
-        if (_isCreatingLinkState.value != null && _isCreatingLinkState.value!!) {
+    fun revokeLink() {
+        if (_isBusyState.value) {
             return
         }
-        shareByUrlVO?.let {
-            it.previewToggle = if (sharePreview.value == false) 0 else 1
-            it.autoApproveToggle = if (autoApprove.value == false) 0 else 1
-            it.maxUses = if (maxUses.value.isNullOrBlank()) 0 else maxUses.value!!.toInt()
-            it.expiresDT = expirationDate.value
-
-            _isCreatingLinkState.value = true
-            shareRepository.modifyShareLink(it, ShareRequestType.UPDATE,
-                object : IResponseListener {
-                    override fun onSuccess(message: String?) {
-                        _isCreatingLinkState.value = false
-                        showSnackbar.value = message
+        _isBusyState.value = true
+        shareLinkVO?.id?.let { shareId ->
+            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
                     }
+                }
+            })
+        }
+    }
 
-                    override fun onFailed(error: String?) {
-                        _isCreatingLinkState.value = false
-                        showSnackbar.value = error
+    fun onDoneBtnClick() {
+        if (_isBusyState.value) {
+            return
+        }
+        shareLinkVO?.id?.let { shareId ->
+            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 =
+                shareLinkVO?.createdAt?.toLocalDateUtc()
+                    ?.let { _selectedLinkDuration.value.expirationDate(it) }
+                    ?.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
                     }
-                })
+                }
+            })
         }
     }
 
@@ -261,8 +383,6 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
                 shares.add(share)
                 pendingSharesSize.value = pendingShares.size
                 sharesSize.value = shares.size
-                sharedWithLabelTxt.value =
-                    appContext.getString(R.string.record_options_shared_with, shares.size)
                 onShareApproved.value = share
                 showSnackbarSuccess.value = message
             }
@@ -304,4 +424,54 @@ class ShareManagementViewModel(application: Application) : ObservableAndroidView
         )
     }
 
+    fun onShareRemoved(share: Share) {
+        shares.remove(share)
+        sharesSize.value = shares.size
+    }
+
+    fun onAccessRoleUpdated(accessRole: AccessRole) {
+        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 getSharesSize(): MutableLiveData<Int> = sharesSize
+
+    fun getPendingSharesSize(): MutableLiveData<Int> = pendingSharesSize
+
+    fun getSharePreview(): MutableLiveData<Boolean> = sharePreview
+
+    fun getAutoApprove(): MutableLiveData<Boolean> = autoApprove
+
+    fun getMaxUses(): MutableLiveData<String> = maxUses
+
+    fun getAccessRole(): MutableLiveData<AccessRole> = defaultAccessRole
+
+    fun getExpirationDate(): MutableLiveData<String> = expirationDate
+
+    fun getShowDatePicker(): LiveData<Void?> = showDatePicker
+
+    fun getShowSnackbar(): LiveData<String> = showSnackbar
+
+    fun getShowSnackbarSuccess(): LiveData<String> = showSnackbarSuccess
+
+    fun getOnShareLinkRequest(): LiveData<String> = onShareLinkRequest
+
+    fun getShowAccessRolesForShare(): LiveData<Share> = showAccessRolesForShare
+
+    fun getOnShareApproved(): MutableLiveData<Share> = onShareApproved
+
+    fun getOnShareDenied(): MutableLiveData<Share> = onShareDenied
 }
diff --git a/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModelOld.kt b/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModelOld.kt
index 9a0bc784..81e85187 100644
--- a/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModelOld.kt
+++ b/app/src/main/java/org/permanent/permanent/viewmodels/ShareManagementViewModelOld.kt
@@ -95,7 +95,7 @@ class ShareManagementViewModelOld(application: Application) : ObservableAndroidV
         sharePreview.value = shareByUrlVO.previewToggle == 1
         autoApprove.value = shareByUrlVO.autoApproveToggle == 1
         maxUses.value = (shareByUrlVO.maxUses ?: 0).toString()
-        defaultAccessRole.value = AccessRole.createFromBackendString(shareByUrlVO.defaultAccessRole)
+        defaultAccessRole.value = AccessRole.fromBackendValue(shareByUrlVO.defaultAccessRole)
         shareByUrlVO.expiresDT.let { expirationDate.value = it?.trimSubstring() }
     }
 
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_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_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_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_link.xml b/app/src/main/res/layout/fragment_share_link.xml
deleted file mode 100644
index 414e3c8e..00000000
--- a/app/src/main/res/layout/fragment_share_link.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context=".ui.shareManagement.ShareLinkFragment">
-
-    <!-- TODO: Update blank fragment layout -->
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:text="@string/hello_blank_fragment" />
-
-</FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_share_management.xml b/app/src/main/res/layout/fragment_share_management.xml
index 877798d0..2f894789 100644
--- a/app/src/main/res/layout/fragment_share_management.xml
+++ b/app/src/main/res/layout/fragment_share_management.xml
@@ -698,4 +698,3 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.core.widget.NestedScrollView>
 </layout>
-
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 9aad36d1..9bcee9d4 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,6 +825,7 @@
     <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>
@@ -833,6 +834,28 @@
     <string name="creating_link">Creating link...</string>
     <string name="share_link_item">Share Item</string>
     <string name="create_link_description">Generate a link to send via text or email to invite people to share this content.</string>
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</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>