diff --git a/cypress/integration/control_attach.js b/cypress/integration/control_attach.js
index 6714f6c24e..ddaa22884d 100644
--- a/cypress/integration/control_attach.js
+++ b/cypress/integration/control_attach.js
@@ -29,7 +29,8 @@ context("Attach Control", () => {
 		//Clicking on "Link" button to attach a file using the "Link" button
 		cy.findByRole("button", { name: "Link" }).click();
 		cy.findByPlaceholderText("Attach a web link").type(
-			"https://wallpaperplay.com/walls/full/8/2/b/72402.jpg"
+			"https://wallpaperplay.com/walls/full/8/2/b/72402.jpg",
+			{ force: true }
 		);
 
 		//Clicking on the Upload button to upload the file
diff --git a/cypress/integration/sidebar.js b/cypress/integration/sidebar.js
index c8aa2a441b..7510425db3 100644
--- a/cypress/integration/sidebar.js
+++ b/cypress/integration/sidebar.js
@@ -81,7 +81,7 @@ context("Sidebar", () => {
 
 			// test "Show All" button
 			cy.get(".attachment-row").should("have.length", 10);
-			cy.get(".show-all-btn").click();
+			cy.get(".show-all-btn").click({ force: true });
 			cy.get(".attachment-row").should("have.length", 12);
 		});
 	});
@@ -120,7 +120,7 @@ context("Sidebar", () => {
 			).click();
 
 			//To check if filter is applied
-			cy.click_filter_button().should("contain", "1 filter");
+			cy.click_filter_button().get(".filter-label").should("contain", "1");
 			cy.get(".fieldname-select-area > .awesomplete > .form-control").should(
 				"have.value",
 				"Assigned To"
diff --git a/frappe/public/js/frappe/form/templates/form_sidebar.html b/frappe/public/js/frappe/form/templates/form_sidebar.html
index 447e71514e..60d2a4ae60 100644
--- a/frappe/public/js/frappe/form/templates/form_sidebar.html
+++ b/frappe/public/js/frappe/form/templates/form_sidebar.html
@@ -56,21 +56,22 @@
 
 		<li class="explore-full-btn hidden">
 			<button class="data-pill btn">
+				<svg class="es-icon mr-2 icon-sm">
+					<use href="#es-line-folder-alt"></use>
+				</svg>
 				<span class="pill-label ellipsis">
 					{%= __("Explore Files") %}
 				</span>
-				<svg class="es-icon icon-sm">
-					<use href="#es-line-folder-alt"></use>
-				</svg>
 			</button>
 		</li>
-
-
-		<li class="show-all-btn hidden">
+		<button class="show-all-btn hidden">
+			<svg class="es-icon icon-sm">
+				<use href="#es-line-preview"></use>
+			</svg>
 			<a href="" class="pill-label ellipsis">
 				{%= __("Show All") %}
 			</a>
-		</li>
+		</button>
 	</li>
 	<li class="attachments-actions">
 		<button class="data-pill btn add-attachment-btn">
diff --git a/frappe/public/scss/desk/sidebar.scss b/frappe/public/scss/desk/sidebar.scss
index 1f96a9c53c..72702c4576 100644
--- a/frappe/public/scss/desk/sidebar.scss
+++ b/frappe/public/scss/desk/sidebar.scss
@@ -397,9 +397,8 @@ body[data-route^="Module"] .main-menu {
 	display: inline-flex;
 }
 
-.attachments-actions {
+.attachments-actions, .explore-full-btn > .data-pill.btn {
 	display: flex;
-	gap: 5px;
 	max-width: 100%;
 }
 
@@ -409,8 +408,19 @@ body[data-route^="Module"] .main-menu {
 }
 
 .show-all-btn {
-	margin-top: var(--margin-md);
-	text-align: center;
+	width: 100%;
+	border: 1px solid var(--border-color);
+	border-radius: var(--border-radius);
+	background-color: var(--bg-color);
+	text-align: start;
+	padding-left: 8px;
+	margin-bottom: var(--margin-sm);
+
+	a.pill-label.ellipsis {
+		&:hover {
+			text-decoration: none;
+		}
+	}
 }
 .form-assignments, .form-shared {
 	.assignments, .shares {