diff --git a/Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift b/Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift
index 01e348d3..478c9d56 100644
--- a/Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift
+++ b/Packages/GalleryVC/Sources/GalleryVC/GalleryItemViewController.swift
@@ -91,10 +91,11 @@ class GalleryItemViewController: UIViewController {
         view.addSubview(topControlsView)
         
         var shareConfig = UIButton.Configuration.gray()
-        shareConfig.cornerStyle = .capsule
+        shareConfig.cornerStyle = .dynamic
         shareConfig.background.backgroundColor = .black.withAlphaComponent(0.25)
         shareConfig.baseForegroundColor = .white
         shareConfig.image = UIImage(systemName: "square.and.arrow.up")
+        shareConfig.contentInsets = NSDirectionalEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)
         shareButton = UIButton(configuration: shareConfig)
         shareButton.addTarget(self, action: #selector(shareButtonPressed), for: .touchUpInside)
         shareButton.isPointerInteractionEnabled = true
@@ -106,10 +107,11 @@ class GalleryItemViewController: UIViewController {
         topControlsView.addSubview(shareButton)
         
         var closeConfig = UIButton.Configuration.gray()
-        closeConfig.cornerStyle = .capsule
+        closeConfig.cornerStyle = .dynamic
         closeConfig.background.backgroundColor = .black.withAlphaComponent(0.25)
         closeConfig.baseForegroundColor = .white
         closeConfig.image = UIImage(systemName: "xmark")
+        closeConfig.contentInsets = NSDirectionalEdgeInsets(top: 4, leading: 4, bottom: 4, trailing: 4)
         let closeButton = UIButton(configuration: closeConfig)
         closeButton.addTarget(self, action: #selector(closeButtonPressed), for: .touchUpInside)
         closeButton.isPointerInteractionEnabled = true
@@ -168,10 +170,12 @@ class GalleryItemViewController: UIViewController {
             shareButtonLeadingConstraint,
             shareButtonTopConstraint,
             shareButton.bottomAnchor.constraint(equalTo: topControlsView.bottomAnchor),
+            shareButton.widthAnchor.constraint(equalTo: shareButton.heightAnchor),
             
             closeButtonTrailingConstraint,
             closeButtonTopConstraint,
             closeButton.bottomAnchor.constraint(equalTo: topControlsView.bottomAnchor),
+            closeButton.widthAnchor.constraint(equalTo: closeButton.heightAnchor),
 
             bottomControlsView.leadingAnchor.constraint(equalTo: view.leadingAnchor),
             bottomControlsView.trailingAnchor.constraint(equalTo: view.trailingAnchor),