diff --git a/Theme/Backend/media-list.tpl.php b/Theme/Backend/media-list.tpl.php
index fbb1e78..929cda1 100755
--- a/Theme/Backend/media-list.tpl.php
+++ b/Theme/Backend/media-list.tpl.php
@@ -26,6 +26,9 @@ $mediaPath = \urldecode($this->getData('path') ?? '/');
  * @var \Modules\Media\Models\Media[] $media
  */
 $media = $this->getData('media');
+
+$previous = empty($media) ? '{/prefix}media/list' : '{/prefix}media/list?{?}&id=' . \reset($media)->getId() . '&ptype=-';
+$next     = empty($media) ? '{/prefix}media/list' : '{/prefix}media/list?{?}&id=' . \end($media)->getId() . '&ptype=+';
 ?>
 
 <div class="row">
@@ -107,6 +110,8 @@ $media = $this->getData('media');
                     <?php endif; ?>
             </table>
             <div class="portlet-foot">
+                <a tabindex="0" class="button" href="<?= UriFactory::build($previous); ?>"><?= $this->getHtml('Previous', '0', '0'); ?></a>
+                <a tabindex="0" class="button" href="<?= UriFactory::build($next); ?>"><?= $this->getHtml('Next', '0', '0'); ?></a>
             </div>
         </div>
     </div>
diff --git a/Theme/Backend/media-upload.tpl.php b/Theme/Backend/media-upload.tpl.php
index 4cbf1ce..2350138 100755
--- a/Theme/Backend/media-upload.tpl.php
+++ b/Theme/Backend/media-upload.tpl.php
@@ -43,7 +43,11 @@ use phpOMS\Uri\UriFactory;
                         <tr><td><label for="iPath"><?= $this->getHtml('Path') ?></label>
                         <tr><td><input type="text" id="iPath" name="virtualPath" value="<?= empty($this->request->getUri()->getQuery('path')) ? '/' : $this->request->getUri()->getQuery('path'); ?>" disabled>
                         <tr><td><label><?= $this->getHtml('Settings') ?></label>
-                        <tr><td><input type="checkbox" id="iAddCollection" name="addcollection" checked><label for="iAddCollection"><?= $this->getHtml('AddToCollection') ?></label>
+                        <tr><td>
+                            <span class="checkbox">
+                                <input type="checkbox" id="iAddCollection" name="addcollection" checked>
+                                <label for="iAddCollection"><?= $this->getHtml('AddToCollection') ?></label>
+                            </span>
                         <tr><td><label for="iPathSettings"><?= $this->getHtml('PathSettings') ?></label>
                         <tr><td>
                             <select id="iPathSettings" name="pathsettings">