diff --git a/Sources/MediaViewControllers/MediaViewController.swift b/Sources/MediaViewControllers/MediaViewController.swift
index ed85671bc0e949a88e0145851af1195e1c1171b4..50b5752ff84c8e3c20bbe274fdd6ccc573d06bd7 100644
--- a/Sources/MediaViewControllers/MediaViewController.swift
+++ b/Sources/MediaViewControllers/MediaViewController.swift
@@ -44,13 +44,19 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell>, MediaCatego
         return editButton
     }()
 
+    private lazy var doneButton: UIBarButtonItem = {
+        return UIBarButtonItem(barButtonSystemItem: .done, target: self, action: #selector(customSetEditing(button:)))
+    }()
+
     private var rigthBarButtons: [UIBarButtonItem]?
+    private var leftBarButton: UIBarButtonItem?
 
     init(services: Services) {
         self.services = services
         rendererButton = services.rendererDiscovererManager.setupRendererButton()
         super.init(nibName: nil, bundle: nil)
         rigthBarButtons = [editButton, UIBarButtonItem(customView: rendererButton)]
+        leftBarButton = sortButton
     }
 
     override func viewDidLoad() {
@@ -95,7 +101,7 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell>, MediaCatego
             showButtons = true
         }
         navigationItem.rightBarButtonItems = showButtons ? rigthBarButtons : nil
-        navigationItem.leftBarButtonItem = showButtons ? sortButton : nil
+        navigationItem.leftBarButtonItem = showButtons ? leftBarButton : nil
     }
 
     override func configure(cell: VLCLabelCell, for indicatorInfo: IndicatorInfo) {
@@ -119,13 +125,14 @@ class VLCMediaViewController: VLCPagingViewController<VLCLabelCell>, MediaCatego
 extension VLCMediaViewController {
     @objc private func customSetEditing(button: UIButton) {
         isEditing = !isEditing
+        rigthBarButtons = isEditing ? [doneButton] : [editButton, UIBarButtonItem(customView: rendererButton)]
+        leftBarButton = isEditing ? nil : sortButton
     }
 
     override func setEditing(_ editing: Bool, animated: Bool) {
         super.setEditing(editing, animated: animated)
 
         scrollingEnabled(!editing)
-        navigationItem.leftBarButtonItem = editing ? nil : sortButton
         viewControllers[currentIndex].setEditing(editing, animated: animated)
     }
 }
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/Contents.json b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/Contents.json
index b70857f01fa4ce1196d7d556a20f1ba911fa03d0..01b0afa3cbfc233ea4b871fae34e39f8c81b3e5e 100644
--- a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/Contents.json
+++ b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "edit.png",
+      "filename" : "rename.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "edit@2x.png",
+      "filename" : "rename@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "edit@3x.png",
+      "filename" : "rename@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit.png b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit.png
deleted file mode 100644
index cff187e5861f7beac39caf66e3b8b17b2fbbeb5b..0000000000000000000000000000000000000000
Binary files a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit.png and /dev/null differ
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit@2x.png b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit@2x.png
deleted file mode 100644
index 4b06827884a97ad9b30195a030eb95befc23cda9..0000000000000000000000000000000000000000
Binary files a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit@2x.png and /dev/null differ
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit@3x.png b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit@3x.png
deleted file mode 100644
index 21378116153397f639ec3e378ff91586295d10d9..0000000000000000000000000000000000000000
Binary files a/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/edit@3x.png and /dev/null differ
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/rename.png b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/rename.png
similarity index 100%
rename from vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/rename.png
rename to vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/rename.png
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/rename@2x.png b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/rename@2x.png
similarity index 100%
rename from vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/rename@2x.png
rename to vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/rename@2x.png
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/rename@3x.png b/vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/rename@3x.png
similarity index 100%
rename from vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/rename@3x.png
rename to vlc-ios/Images.xcassets/MediaController/Edit/edit.imageset/rename@3x.png
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/Contents.json b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/Contents.json
index 0d3133af2264a7d5740b9a42dba08cb3a194f759..1e6199cc95a46a7ee15d122e87ecb21b15f27b4c 100644
--- a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/Contents.json
+++ b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/Contents.json
@@ -2,17 +2,17 @@
   "images" : [
     {
       "idiom" : "universal",
-      "filename" : "rename.png",
+      "filename" : "icnEdit.png",
       "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "filename" : "rename@2x.png",
+      "filename" : "icnEdit@2x.png",
       "scale" : "2x"
     },
     {
       "idiom" : "universal",
-      "filename" : "rename@3x.png",
+      "filename" : "icnEdit@3x.png",
       "scale" : "3x"
     }
   ],
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit.png b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit.png
new file mode 100644
index 0000000000000000000000000000000000000000..e501336c85b36065b3c8f0e5340aa1a0d5f6482c
Binary files /dev/null and b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit.png differ
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit@2x.png b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..057812b04d43d79a4dc81b1210f84d4765c5c86d
Binary files /dev/null and b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit@2x.png differ
diff --git a/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit@3x.png b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit@3x.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e84325cb217fa10c54b0b8290937172bb82bb41
Binary files /dev/null and b/vlc-ios/Images.xcassets/MediaController/Edit/rename.imageset/icnEdit@3x.png differ