diff --git a/app/controllers/template_replace_documents_controller.rb b/app/controllers/templates_clone_and_replace_controller.rb
similarity index 65%
rename from app/controllers/template_replace_documents_controller.rb
rename to app/controllers/templates_clone_and_replace_controller.rb
index b9f28881..0d75416b 100644
--- a/app/controllers/template_replace_documents_controller.rb
+++ b/app/controllers/templates_clone_and_replace_controller.rb
@@ -1,15 +1,10 @@
 # frozen_string_literal: true
 
-class TemplateReplaceDocumentsController < ApplicationController
+class TemplatesCloneAndReplaceController < ApplicationController
   load_and_authorize_resource :template
 
   def create
-    if params[:blobs].blank? && params[:files].blank?
-      return respond_to do |f|
-        f.html { redirect_back fallback_location: template_path(@template), alert: I18n.t('file_is_missing') }
-        f.json { render json: { error: I18n.t('file_is_missing') }, status: :unprocessable_entity }
-      end
-    end
+    return head :unprocessable_entity if params[:files].blank?
 
     ActiveRecord::Associations::Preloader.new(
       records: [@template],
@@ -17,6 +12,7 @@ class TemplateReplaceDocumentsController < ApplicationController
     ).call
 
     cloned_template = Templates::Clone.call(@template, author: current_user)
+    cloned_template.name = File.basename(params[:files].first.original_filename, '.*')
     cloned_template.save!
 
     documents = Templates::ReplaceAttachments.call(cloned_template, params, extract_fields: true)
@@ -31,6 +27,9 @@ class TemplateReplaceDocumentsController < ApplicationController
       f.json { render json: { id: cloned_template.id } }
     end
   rescue Templates::CreateAttachments::PdfEncrypted
-    render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity
+    respond_to do |f|
+      f.html { render turbo_stream: turbo_stream.append(params[:form_id], html: helpers.tag.prompt_password) }
+      f.json { render json: { error: 'PDF encrypted', status: 'pdf_encrypted' }, status: :unprocessable_entity }
+    end
   end
 end
diff --git a/app/javascript/application.js b/app/javascript/application.js
index 7cf2371e..c2e12079 100644
--- a/app/javascript/application.js
+++ b/app/javascript/application.js
@@ -127,7 +127,7 @@ safeRegisterElement('template-builder', class extends HTMLElement {
       withSendButton: this.dataset.withSendButton !== 'false',
       withSignYourselfButton: this.dataset.withSignYourselfButton !== 'false',
       withConditions: this.dataset.withConditions === 'true',
-      withReplaceAndCloneUpload: this.dataset.withReplaceAndCloneUpload !== 'false',
+      withReplaceAndCloneUpload: true,
       currencies: (this.dataset.currencies || '').split(',').filter(Boolean),
       acceptFileTypes: this.dataset.acceptFileTypes,
       showTourStartForm: this.dataset.showTourStartForm === 'true'
diff --git a/app/javascript/elements/dashboard_dropzone.js b/app/javascript/elements/dashboard_dropzone.js
index 1dc3622f..6704f840 100644
--- a/app/javascript/elements/dashboard_dropzone.js
+++ b/app/javascript/elements/dashboard_dropzone.js
@@ -1,74 +1,106 @@
-import { actionable } from '@github/catalyst/lib/actionable'
 import { target, targets, targetable } from '@github/catalyst/lib/targetable'
 
-export default actionable(targetable(class extends HTMLElement {
-  static [targets.static] = ['hiddenOnHover']
+export default targetable(class extends HTMLElement {
+  static [targets.static] = [
+    'hiddenOnDrag',
+    'folderCards',
+    'templateCards'
+  ]
+
   static [target.static] = [
-    'loading',
-    'icon',
-    'input',
-    'fileDropzone'
+    'form',
+    'fileDropzone',
+    'fileDropzoneLoading'
   ]
 
   connectedCallback () {
-    this.showOnlyOnWindowHover = this.dataset.showOnlyOnWindowHover === 'true'
-
     document.addEventListener('drop', this.onWindowDragdrop)
     document.addEventListener('dragover', this.onWindowDropover)
+
     window.addEventListener('dragleave', this.onWindowDragleave)
 
-    this.addEventListener('dragover', this.onDragover)
-    this.addEventListener('dragleave', this.onDragleave)
+    this.fileDropzone?.addEventListener('drop', this.onDropFile)
+
+    this.folderCards.forEach((el) => el.addEventListener('drop', this.onDropFolder))
+    this.templateCards.forEach((el) => el.addEventListener('drop', this.onDropTemplate))
 
-    this.fileDropzone.addEventListener('drop', this.onDrop)
-    this.fileDropzone.addEventListener('turbo:submit-start', this.showDraghover)
-    this.fileDropzone.addEventListener('turbo:submit-end', this.hideDraghover)
+    return [this.fileDropzone, ...this.folderCards, ...this.templateCards].forEach((el) => {
+      el?.addEventListener('dragover', this.onDragover)
+      el?.addEventListener('dragleave', this.onDragleave)
+    })
   }
 
   disconnectedCallback () {
     document.removeEventListener('drop', this.onWindowDragdrop)
     document.removeEventListener('dragover', this.onWindowDropover)
+
     window.removeEventListener('dragleave', this.onWindowDragleave)
 
-    this.removeEventListener('dragover', this.onDragover)
-    this.removeEventListener('dragleave', this.onDragleave)
+    this.fileDropzone?.removeEventListener('drop', this.onDropFile)
 
-    this.fileDropzone.removeEventListener('drop', this.onDrop)
-    this.fileDropzone.removeEventListener('turbo:submit-start', this.showDraghover)
-    this.fileDropzone.removeEventListener('turbo:submit-end', this.hideDraghover)
+    this.folderCards.forEach((el) => el.removeEventListener('drop', this.onDropFolder))
+    this.templateCards.forEach((el) => el.removeEventListener('drop', this.onDropTemplate))
+
+    return [this.fileDropzone, ...this.folderCards, ...this.templateCards].forEach((el) => {
+      el?.removeEventListener('dragover', this.onDragover)
+      el?.removeEventListener('dragleave', this.onDragleave)
+    })
   }
 
-  onDrop = (e) => {
+  onDropFile = (e) => {
     e.preventDefault()
 
-    this.input.files = e.dataTransfer.files
+    this.fileDropzoneLoading.classList.remove('hidden')
+    this.fileDropzoneLoading.previousElementSibling.classList.add('hidden')
+    this.fileDropzoneLoading.classList.add('opacity-50')
 
-    this.uploadFiles(e.dataTransfer.files)
+    this.uploadFiles(e.dataTransfer.files, '/templates_upload')
   }
 
-  onWindowDragdrop = () => {
-    if (!this.hovered) this.hideDraghover()
+  onDropFolder = (e) => {
+    e.preventDefault()
+
+    const loading = document.createElement('div')
+    const svg = e.target.querySelector('svg')
+
+    loading.innerHTML = this.loadingIconHtml
+    loading.children[0].classList.add(...svg.classList)
+
+    e.target.replaceChild(loading.children[0], svg)
+    e.target.classList.add('opacity-50')
+
+    const params = new URLSearchParams({ folder_name: e.target.innerText }).toString()
+
+    this.uploadFiles(e.dataTransfer.files, `/templates_upload?${params}`)
   }
 
-  onSelectFiles (e) {
+  onDropTemplate = (e) => {
     e.preventDefault()
 
-    this.uploadFiles(this.input.files)
-  }
+    const loading = document.createElement('div')
+    loading.classList.add('bottom-5', 'left-0', 'flex', 'justify-center', 'w-full', 'absolute')
+    loading.innerHTML = this.loadingIconHtml
 
-  toggleLoading = (e) => {
-    if (e && e.target && (!e.target.contains(this) || !e.detail?.formSubmission?.formElement?.contains(this))) {
-      return
-    }
+    e.target.appendChild(loading)
+    e.target.classList.add('opacity-50')
+
+    const id = e.target.href.split('/').pop()
 
-    this.loading?.classList?.toggle('hidden')
-    this.icon?.classList?.toggle('hidden')
+    this.uploadFiles(e.dataTransfer.files, `/templates/${id}/clone_and_replace`)
   }
 
-  uploadFiles () {
-    this.toggleLoading()
+  onWindowDragdrop = () => {
+    if (!this.isLoading) this.hideDraghover()
+  }
+
+  uploadFiles (files, url) {
+    this.isLoading = true
+
+    this.form.action = url
+
+    this.form.querySelector('[type="file"]').files = files
 
-    this.fileDropzone.querySelector('button[type="submit"]').click()
+    this.form.querySelector('[type="submit"]').click()
   }
 
   onWindowDropover = (e) => {
@@ -79,45 +111,50 @@ export default actionable(targetable(class extends HTMLElement {
     }
   }
 
+  onDragover () {
+    this.style.backgroundColor = '#F7F3F0'
+  }
+
+  onDragleave () {
+    this.style.backgroundColor = null
+  }
+
   onWindowDragleave = (e) => {
     if (e.clientX <= 0 || e.clientY <= 0 || e.clientX >= window.innerWidth || e.clientY >= window.innerHeight) {
       this.hideDraghover()
     }
   }
 
-  onDragover (e) {
-    e.preventDefault()
+  showDraghover = () => {
+    if (this.isDrag) return
 
-    this.hovered = true
-    this.style.backgroundColor = '#F7F3F0'
-  }
+    this.isDrag = true
 
-  onDragleave (e) {
-    e.preventDefault()
+    this.fileDropzone?.classList?.remove('hidden')
 
-    this.hovered = false
-    this.style.backgroundColor = null
-  }
-
-  showDraghover = () => {
-    if (this.showOnlyOnWindowHover) {
-      this.classList.remove('hidden')
-    }
+    this.hiddenOnDrag.forEach((el) => { el.style.display = 'none' })
 
-    this.classList.remove('bg-base-200', 'border-transparent')
-    this.classList.add('bg-base-100', 'border-base-300', 'border-dashed')
-    this.fileDropzone.classList.remove('hidden')
-    this.hiddenOnHover.forEach((el) => { el.style.display = 'none' })
+    return [...this.folderCards, ...this.templateCards].forEach((el) => {
+      el.classList.remove('bg-base-200', 'before:hidden')
+    })
   }
 
   hideDraghover = () => {
-    if (this.showOnlyOnWindowHover) {
-      this.classList.add('hidden')
-    }
+    this.isDrag = false
+
+    this.fileDropzone?.classList?.add('hidden')
+
+    this.hiddenOnDrag.forEach((el) => { el.style.display = null })
+
+    return [...this.folderCards, ...this.templateCards].forEach((el) => {
+      el.classList.add('bg-base-200', 'before:hidden')
+    })
+  }
 
-    this.classList.add('bg-base-200', 'border-transparent')
-    this.classList.remove('bg-base-100', 'border-base-300', 'border-dashed')
-    this.fileDropzone.classList.add('hidden')
-    this.hiddenOnHover.forEach((el) => { el.style.display = null })
+  get loadingIconHtml () {
+    return `<svg xmlns="http://www.w3.org/2000/svg" class="animate-spin" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" />
+  <path d="M12 3a9 9 0 1 0 9 9" />
+</svg>`
   }
-}))
+})
diff --git a/app/javascript/template_builder/builder.vue b/app/javascript/template_builder/builder.vue
index 2077f9c8..77e1bb96 100644
--- a/app/javascript/template_builder/builder.vue
+++ b/app/javascript/template_builder/builder.vue
@@ -1,24 +1,24 @@
 <template>
-  <HoverDropzone
-    v-if="sortedDocuments.length && (withUploadButton || withAddPageButton)"
-    :is-dragging="isDragging"
-    :template-id="template.id"
-    :accept-file-types="acceptFileTypes"
-    :with-replace-and-clone="withReplaceAndCloneUpload"
-    hover-class="bg-base-200/50"
-    @add="[updateFromUpload($event), isDragging = false]"
-    @replace="[onDocumentsReplace($event), isDragging = false]"
-    @replace-and-clone="[onDocumentsReplaceAndTemplateClone($event), isDragging = false]"
-    @error="onUploadFailed"
-  />
   <div
     ref="dragContainer"
     style="max-width: 1600px"
     class="mx-auto pl-3 h-full"
     :class="isMobile ? 'pl-4' : 'md:pl-4'"
     @dragover="onDragover"
-    @drop="isDragging = false"
+    @drop="isDragFile = false"
   >
+    <HoverDropzone
+      v-if="sortedDocuments.length && withUploadButton && editable"
+      :is-dragging="isDragFile"
+      :template-id="template.id"
+      :accept-file-types="acceptFileTypes"
+      :with-replace-and-clone="withReplaceAndCloneUpload"
+      hover-class="bg-base-200/50"
+      @add="[updateFromUpload($event), isDragFile = false]"
+      @replace="[onDocumentsReplace($event), isDragFile = false]"
+      @replace-and-clone="onDocumentsReplaceAndTemplateClone($event)"
+      @error="[onUploadFailed($event), isDragFile = false]"
+    />
     <DragPlaceholder
       ref="dragPlaceholder"
       :field="fieldsDragFieldRef.value || toRaw(dragField)"
@@ -683,7 +683,7 @@ export default {
     withReplaceAndCloneUpload: {
       type: Boolean,
       required: false,
-      default: true
+      default: false
     },
     withPhone: {
       type: Boolean,
@@ -745,7 +745,7 @@ export default {
       drawFieldType: null,
       drawOption: null,
       dragField: null,
-      isDragging: false
+      isDragFile: false
     }
   },
   computed: {
@@ -892,12 +892,12 @@ export default {
         ref.x = e.clientX - ref.offsetX
         ref.y = e.clientY - ref.offsetY
       } else if (e.dataTransfer?.types?.includes('Files')) {
-        this.isDragging = true
+        this.isDragFile = true
       }
     },
     onWindowDragLeave (event) {
       if (event.clientX <= 0 || event.clientY <= 0 || event.clientX >= window.innerWidth || event.clientY >= window.innerHeight) {
-        this.isDragging = false
+        this.isDragFile = false
       }
     },
     reorderFields (item) {
@@ -1560,8 +1560,6 @@ export default {
       }, 'image/png')
     },
     onUploadFailed (error) {
-      this.isDragging = false
-
       if (error) alert(error)
     },
     updateFromUpload (data) {
@@ -1685,7 +1683,7 @@ export default {
       this.save()
     },
     onDocumentsReplace (data) {
-      data.schema.forEach((schemaItem , index) => {
+      data.schema.forEach((schemaItem, index) => {
         const existingSchemaItem = this.template.schema[index]
 
         if (this.template.schema[index]) {
diff --git a/app/javascript/template_builder/dropzone.vue b/app/javascript/template_builder/dropzone.vue
index 2e5b0073..72705b99 100644
--- a/app/javascript/template_builder/dropzone.vue
+++ b/app/javascript/template_builder/dropzone.vue
@@ -10,12 +10,12 @@
       id="document_dropzone"
       class="w-full relative rounded-md border-2 border-base-content/10 border-dashed"
       :for="inputId"
-      :class="[{ 'opacity-50': isLoading || isProcessing, 'hover:bg-base-200': !hoverClass }, isDragEntering && hoverClass ? hoverClass : '']"
+      :class="[{ 'opacity-50': isLoading, 'hover:bg-base-200/30': !hoverClass }, isDragEntering && hoverClass ? hoverClass : '']"
     >
       <div class="absolute top-0 right-0 left-0 bottom-0 flex items-center justify-center pointer-events-none">
         <div class="flex flex-col items-center">
           <IconInnerShadowTop
-            v-if="isLoading || isProcessing"
+            v-if="isLoading"
             class="animate-spin"
             :width="40"
             :height="40"
@@ -29,6 +29,7 @@
           <div
             v-if="message"
             class="font-medium text-lg mb-1"
+            :class="{ 'mt-1': !withDescription }"
           >
             {{ message }}
           </div>
@@ -97,10 +98,10 @@ export default {
       required: false,
       default: true
     },
-    header: {
-      type: Object,
+    title: {
+      type: String,
       required: false,
-      default: () => ({})
+      default: ''
     },
     acceptFileTypes: {
       type: String,
@@ -108,11 +109,10 @@ export default {
       default: 'image/*, application/pdf'
     }
   },
-  emits: ['success', 'error', 'loading', 'processing'],
+  emits: ['success', 'error', 'loading'],
   data () {
     return {
       isLoading: false,
-      isProcessing: false,
       isDragEntering: false
     }
   },
@@ -122,7 +122,7 @@ export default {
     },
     uploadUrl () {
       if (this.cloneTemplateOnUpload) {
-        return `/templates/${this.templateId}/replace_documents`
+        return `/templates/${this.templateId}/clone_and_replace`
       } else {
         return `/templates/${this.templateId}/documents`
       }
@@ -130,21 +130,16 @@ export default {
     message () {
       if (this.isLoading) {
         return this.t('uploading')
-      } else if (this.isProcessing) {
-        return this.t('processing_')
       } else if (this.acceptFileTypes === 'image/*, application/pdf') {
-        return this.header.pdf_documents_or_images || this.header.documents_or_images || this.t('add_pdf_documents_or_images')
+        return this.title || this.t('add_pdf_documents_or_images')
       } else {
-        return this.header.documents_or_images || this.t('add_documents_or_images')
+        return this.title || this.t('add_documents_or_images')
       }
     }
   },
   watch: {
     isLoading (value) {
       this.$emit('loading', value)
-    },
-    isProcessing (value) {
-      this.$emit('processing', value)
     }
   },
   methods: {
diff --git a/app/javascript/template_builder/hover_dropzone.vue b/app/javascript/template_builder/hover_dropzone.vue
index da5e63bd..5c9ccf28 100644
--- a/app/javascript/template_builder/hover_dropzone.vue
+++ b/app/javascript/template_builder/hover_dropzone.vue
@@ -1,6 +1,6 @@
 <template>
   <div
-    v-if="isDragging || isLoading || isProcessing"
+    v-if="isDragging || isLoading"
     class="modal modal-open"
   >
     <div class="flex flex-col gap-2 p-4 items-center bg-base-100 h-full max-h-[85vh] max-w-6xl rounded-2xl w-full">
@@ -11,10 +11,9 @@
         :template-id="templateId"
         :accept-file-types="acceptFileTypes"
         :with-description="false"
-        :header="{ documents_or_images: t('upload_new_document') }"
+        :title="t('upload_a_new_document')"
         type="add_files"
         @loading="isLoading = $event"
-        @processing="isProcessing = $event"
         @success="$emit('add', $event)"
         @error="$emit('error', $event)"
       />
@@ -26,9 +25,8 @@
           :template-id="templateId"
           :accept-file-types="acceptFileTypes"
           :with-description="false"
-          :header="{ documents_or_images: t('replace_existing_document') }"
+          :title="t('replace_existing_document')"
           @loading="isLoading = $event"
-          @processing="isProcessing = $event"
           @success="$emit('replace', $event)"
           @error="$emit('error', $event)"
         />
@@ -41,9 +39,8 @@
           :accept-file-types="acceptFileTypes"
           :with-description="false"
           :clone-template-on-upload="true"
-          :header="{ documents_or_images: t('clone_template_and_replace_documents') }"
+          :title="t('clone_and_replace_documents')"
           @loading="isLoading = $event"
-          @processing="isProcessing = $event"
           @success="$emit('replace-and-clone', $event)"
           @error="$emit('error', $event)"
         />
@@ -85,8 +82,7 @@ export default {
   emits: ['add', 'replace', 'replace-and-clone', 'error'],
   data () {
     return {
-      isLoading: false,
-      isProcessing: false
+      isLoading: false
     }
   }
 }
diff --git a/app/javascript/template_builder/i18n.js b/app/javascript/template_builder/i18n.js
index f2ba6676..f2149304 100644
--- a/app/javascript/template_builder/i18n.js
+++ b/app/javascript/template_builder/i18n.js
@@ -63,9 +63,9 @@ const en = {
   processing_: 'Processing...',
   add_pdf_documents_or_images: 'Add PDF documents or images',
   add_documents_or_images: 'Add documents or images',
-  upload_new_document: 'Upload new document',
+  upload_a_new_document: 'Upload a new document',
   replace_existing_document: 'Replace existing document',
-  clone_template_and_replace_documents: 'Clone template and replace documents',
+  clone_and_replace_documents: 'Clone and replace documents',
   required: 'Required',
   default_value: 'Default value',
   format: 'Format',
diff --git a/app/javascript/template_builder/replace.vue b/app/javascript/template_builder/replace.vue
index 6a62f4c9..0a1dcba2 100644
--- a/app/javascript/template_builder/replace.vue
+++ b/app/javascript/template_builder/replace.vue
@@ -2,7 +2,7 @@
   <label
     :for="inputId"
     class="btn btn-neutral btn-xs text-white transition-none replace-document-button"
-    :class="{ 'opacity-100': isLoading || isProcessing }"
+    :class="{ 'opacity-100': isLoading }"
   >
     {{ message }}
     <form
@@ -41,8 +41,7 @@ export default {
   emits: ['success'],
   data () {
     return {
-      isLoading: false,
-      isProcessing: false
+      isLoading: false
     }
   },
   computed: {
@@ -52,8 +51,6 @@ export default {
     message () {
       if (this.isLoading) {
         return this.t('uploading_')
-      } else if (this.isProcessing) {
-        return this.t('processing_')
       } else {
         return this.t('replace')
       }
diff --git a/app/javascript/template_builder/upload.vue b/app/javascript/template_builder/upload.vue
index e6c017bc..a502ff3e 100644
--- a/app/javascript/template_builder/upload.vue
+++ b/app/javascript/template_builder/upload.vue
@@ -4,10 +4,10 @@
       id="add_document_button"
       :for="inputId"
       class="btn btn-outline w-full add-document-button"
-      :class="{ 'btn-disabled': isLoading || isProcessing }"
+      :class="{ 'btn-disabled': isLoading }"
     >
       <IconInnerShadowTop
-        v-if="isLoading || isProcessing"
+        v-if="isLoading"
         width="20"
         class="animate-spin"
       />
@@ -18,9 +18,6 @@
       <span v-if="isLoading">
         {{ t('uploading_') }}
       </span>
-      <span v-else-if="isProcessing">
-        {{ t('processing_') }}
-      </span>
       <span v-else>
         {{ t('add_document') }}
       </span>
@@ -66,8 +63,7 @@ export default {
   emits: ['success', 'error'],
   data () {
     return {
-      isLoading: false,
-      isProcessing: false
+      isLoading: false
     }
   },
   computed: {
@@ -91,6 +87,7 @@ export default {
           resp.json().then((data) => {
             this.$emit('success', data)
             this.$refs.input.value = ''
+            this.isLoading = false
           })
         } else if (resp.status === 422) {
           resp.json().then((data) => {
@@ -106,22 +103,26 @@ export default {
                 if (resp.ok) {
                   this.$emit('success', await resp.json())
                   this.$refs.input.value = ''
+                  this.isLoading = false
                 } else {
                   alert(this.t('wrong_password'))
 
                   this.$emit('error', await resp.json().error)
+                  this.isLoading = false
                 }
               })
             } else {
               this.$emit('error', data.error)
+              this.isLoading = false
             }
           })
         } else {
           resp.json().then((data) => {
             this.$emit('error', data.error)
+            this.isLoading = false
           })
         }
-      }).finally(() => {
+      }).catch(() => {
         this.isLoading = false
       })
     }
diff --git a/app/views/icons/_file_upload.html.erb b/app/views/icons/_file_upload.html.erb
new file mode 100644
index 00000000..fb87c703
--- /dev/null
+++ b/app/views/icons/_file_upload.html.erb
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" class="<%= local_assigns[:class] %>" width="44" height="44" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor" fill="none" stroke-linecap="round" stroke-linejoin="round">
+  <path stroke="none" d="M0 0h24v24H0z" fill="none" /><path d="M14 3v4a1 1 0 0 0 1 1h4" /><path d="M17 21h-10a2 2 0 0 1 -2 -2v-14a2 2 0 0 1 2 -2h7l5 5v11a2 2 0 0 1 -2 2z" /><path d="M12 11v6" /><path d="M9.5 13.5l2.5 -2.5l2.5 2.5" />
+</svg>
diff --git a/app/views/template_folders/_folder.html.erb b/app/views/template_folders/_folder.html.erb
index b87ffe70..7c35e950 100644
--- a/app/views/template_folders/_folder.html.erb
+++ b/app/views/template_folders/_folder.html.erb
@@ -1,15 +1,12 @@
 <% is_long = folder.name.size > 32 %>
-<dashboard-dropzone class="relative rounded-2xl bg-base-200 border-2 border-transparent">
-  <a href="<%= folder_path(folder) %>" class="flex h-full flex-col justify-between py-5 px-6 w-full">
-    <% if !is_long %>
-      <%= svg_icon('folder', class: 'w-6 h-6') %>
+<a href="<%= folder_path(folder) %>" class="flex h-full flex-col justify-between rounded-2xl py-5 px-6 w-full bg-base-200 before:border-2 before:border-base-300 before:border-dashed before:absolute before:left-0 before:right-0 before:top-0 before:bottom-0 before:hidden before:rounded-2xl relative" data-targets="dashboard-dropzone.folderCards">
+  <% if !is_long %>
+    <%= svg_icon('folder', class: 'w-6 h-6') %>
+  <% end %>
+  <div class="text-lg font-semibold mt-1" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: <%= is_long ? 2 : 1 %>;">
+    <% if is_long %>
+      <%= svg_icon('folder', class: 'w-6 h-6 inline') %>
     <% end %>
-    <div class="text-lg font-semibold mt-1" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: <%= is_long ? 2 : 1 %>;">
-      <% if is_long %>
-        <%= svg_icon('folder', class: 'w-6 h-6 inline') %>
-      <% end %>
-      <%= folder.name %>
-    </div>
-  </a>
-  <%= render 'templates/dashboard_dropzone_form', url: templates_upload_path(folder_name: folder.name) %>
-</dashboard-dropzone>
+    <%= folder.name %>
+  </div>
+</a>
diff --git a/app/views/template_folders/show.html.erb b/app/views/template_folders/show.html.erb
index 02068344..e99a5888 100644
--- a/app/views/template_folders/show.html.erb
+++ b/app/views/template_folders/show.html.erb
@@ -4,50 +4,56 @@
     <span><%= t('home') %></span>
   <% end %>
 </div>
-<div class="relative flex justify-between items-center w-full mb-4">
-  <dashboard-dropzone data-show-only-on-window-hover="true" class="absolute bottom-0 h-36 w-full rounded-xl bg-base-200 border-2 border-dashed z-10 hidden">
-    <%= render 'templates/dashboard_dropzone_form', url: templates_upload_path(folder_name: @template_folder.name), title: t('upload_new_document'), icon: 'cloud_upload' %>
-  </dashboard-dropzone>
-  <h1 class="text-4xl font-bold flex flex-grow min-w-0 space-x-2 md:flex <%= 'hidden' if params[:q].present? %>">
-    <%= svg_icon('folder', class: 'w-9 h-9 flex-shrink-0') %>
-    <span class="peer truncate">
-      <%= @template_folder.name %>
-    </span>
-    <% if can?(:update, @template_folder) && @template_folder.name != TemplateFolder::DEFAULT_NAME %>
-      <span class="pl-1 opacity-0 hover:opacity-100 peer-hover:opacity-100">
-        <a href="<%= edit_folder_path(@template_folder) %>" data-turbo-frame="modal">
-          <%= svg_icon('pencil', class: 'w-7 h-7') %>
-        </a>
-      </span>
-    <% end %>
-  </h1>
-  <div class="flex space-x-2">
-    <% if params[:q].present? || @pagy.pages > 1 %>
-      <%= render 'shared/search_input' %>
+<dashboard-dropzone>
+  <div class="relative flex justify-between items-center w-full mb-4">
+    <%= form_for '', url: '', id: form_id = SecureRandom.uuid, method: :post, class: 'hidden', data: { target: 'dashboard-dropzone.form' }, html: { enctype: 'multipart/form-data' } do %>
+      <input name="form_id" value="<%= form_id %>">
+      <input name="folder_name" value="<%= @template_folder.name %>">
+      <button type="submit"></button>
+      <input id="dashboard_dropzone_input" name="files[]" type="file" multiple>
     <% end %>
-    <% if can?(:create, ::Template) %>
-      <%= render 'templates/upload_button', folder_name: @template_folder.name %>
-      <%= link_to new_template_path(folder_name: @template_folder.name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
-        <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-        <span class="hidden md:block"><%= t('create') %></span>
+    <%= render 'templates/dashboard_dropzone', style: 'height: 137px' %>
+    <h1 class="text-2xl truncate md:text-3xl font-bold flex items-center flex-grow min-w-0 space-x-2 md:flex <%= 'hidden' if params[:q].present? %>">
+      <%= svg_icon('folder', class: 'w-9 h-9 flex-shrink-0') %>
+      <span class="peer truncate">
+        <%= @template_folder.name %>
+      </span>
+      <% if can?(:update, @template_folder) && @template_folder.name != TemplateFolder::DEFAULT_NAME %>
+        <span class="opacity-0 hover:opacity-100 peer-hover:opacity-100">
+          <a href="<%= edit_folder_path(@template_folder) %>" data-turbo-frame="modal">
+            <%= svg_icon('pencil', class: 'w-7 h-7') %>
+          </a>
+        </span>
       <% end %>
-    <% end %>
-  </div>
-</div>
-<% if @pagy.count > 0 %>
-  <div class="grid gap-4 md:grid-cols-3">
-    <%= render partial: 'templates/template', collection: @templates %>
+    </h1>
+    <div class="flex space-x-2">
+      <% if params[:q].present? || @pagy.pages > 1 %>
+        <%= render 'shared/search_input' %>
+      <% end %>
+      <% if can?(:create, ::Template) %>
+        <%= render 'templates/upload_button', folder_name: @template_folder.name %>
+        <%= link_to new_template_path(folder_name: @template_folder.name), class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
+          <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+          <span class="hidden md:block"><%= t('create') %></span>
+        <% end %>
+      <% end %>
+    </div>
   </div>
-  <% templates_order_select_html = capture do %>
-    <% if params[:q].blank? && @pagy.pages > 1 %>
-      <%= render('shared/templates_order_select', with_recently_used: @pagy.count < 10_000) %>
+  <% if @pagy.count > 0 %>
+    <div class="grid gap-4 md:grid-cols-3">
+      <%= render partial: 'templates/template', collection: @templates %>
+    </div>
+    <% templates_order_select_html = capture do %>
+      <% if params[:q].blank? && @pagy.pages > 1 %>
+        <%= render('shared/templates_order_select', with_recently_used: @pagy.count < 10_000) %>
+      <% end %>
     <% end %>
-  <% end %>
-  <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates', right_additional_html: templates_order_select_html %>
-<% elsif params[:q].present? %>
-  <div class="text-center">
-    <div class="mt-16 text-3xl font-semibold">
-      <%= t('templates_not_found') %>
+    <%= render 'shared/pagination', pagy: @pagy, items_name: 'templates', right_additional_html: templates_order_select_html %>
+  <% elsif params[:q].present? %>
+    <div class="text-center">
+      <div class="mt-16 text-3xl font-semibold">
+        <%= t('templates_not_found') %>
+      </div>
     </div>
-  </div>
-<% end %>
+  <% end %>
+</dashboard-dropzone>
diff --git a/app/views/templates/_dashboard_dropzone.html.erb b/app/views/templates/_dashboard_dropzone.html.erb
new file mode 100644
index 00000000..7c5c9c8f
--- /dev/null
+++ b/app/views/templates/_dashboard_dropzone.html.erb
@@ -0,0 +1,20 @@
+<div class="absolute bottom-0 w-full cursor-pointer rounded-xl bg-base-100 border-2 border-base-300 border-dashed hidden z-50" data-target="dashboard-dropzone.fileDropzone" style="<%= local_assigns[:style] %>">
+  <div class="absolute top-0 right-0 left-0 bottom-0 flex justify-center p-2 items-center pointer-events-none">
+    <div class="flex flex-col items-center text-center" data-target="dashboard-dropzone.toggleLoading">
+      <span class="flex flex-col items-center">
+        <span>
+          <%= svg_icon('cloud_upload', class: 'w-9 h-9') %>
+        </span>
+        <div class="font-medium mb-1">
+          <%= t('upload_new_document') %>
+        </div>
+      </span>
+      <span class="flex flex-col items-center hidden" data-target="dashboard-dropzone.fileDropzoneLoading">
+        <%= svg_icon('loader', class: 'w-9 h-9 animate-spin') %>
+        <div class="font-medium mb-1">
+          <%= t('uploading') %>...
+        </div>
+      </span>
+    </div>
+  </div>
+</div>
diff --git a/app/views/templates/_dashboard_dropzone_form.html.erb b/app/views/templates/_dashboard_dropzone_form.html.erb
deleted file mode 100644
index e2a737dd..00000000
--- a/app/views/templates/_dashboard_dropzone_form.html.erb
+++ /dev/null
@@ -1,29 +0,0 @@
-<%= form_for '', url: local_assigns.fetch(:url, templates_upload_path), id: form_id = SecureRandom.uuid, method: :post, class: 'block hidden', html: { enctype: 'multipart/form-data' }, data: { target: 'dashboard-dropzone.fileDropzone' } do %>
-  <input type="hidden" name="form_id" value="<%= form_id %>">
-  <button type="submit" class="hidden"></button>
-  <label for="dashboard_dropzone_input_<%= form_id %>">
-    <div class="absolute top-0 right-0 left-0 bottom-0 flex justify-center p-2 items-<%= local_assigns.fetch(:position, 'center') %>">
-      <div class="flex flex-col items-center text-center">
-        <% if local_assigns[:icon] %>
-          <span data-target="dashboard-dropzone.icon" class="flex flex-col items-center">
-            <span>
-              <%= svg_icon(local_assigns[:icon], class: 'w-10 h-10') %>
-            </span>
-            <% if local_assigns[:title] %>
-              <div class="font-medium mb-1">
-                <%= local_assigns[:title] %>
-              </div>
-            <% end %>
-          </span>
-        <% end %>
-        <span data-target="dashboard-dropzone.loading" class="flex flex-col items-center hidden">
-          <%= svg_icon('loader', class: 'w-10 h-10 animate-spin') %>
-          <div class="font-medium mb-1">
-            <%= t('uploading') %>...
-          </div>
-        </span>
-      </div>
-      <input id="dashboard_dropzone_input_<%= form_id %>" name="files[]" class="hidden" data-action="change:dashboard-dropzone#onSelectFiles" data-target="dashboard-dropzone.input" type="file" accept="image/*, application/pdf<%= ', .docx, .doc, .xlsx, .xls, .odt, .rtf' if Docuseal.multitenant? %>" multiple>
-    </div>
-  </label>
-<% end %>
diff --git a/app/views/templates/_template.html.erb b/app/views/templates/_template.html.erb
index cc643062..0ef7c9db 100644
--- a/app/views/templates/_template.html.erb
+++ b/app/views/templates/_template.html.erb
@@ -1,12 +1,12 @@
-<dashboard-dropzone class="block h-36 relative group bg-base-200 border-2 rounded-2xl border-transparent">
-  <a href="<%= template_path(template) %>" class="flex h-full flex-col justify-between pt-6 px-7 w-full peer">
-    <div class="pb-4 text-xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
+<div class="h-36 relative group">
+  <a href="<%= template_path(template) %>" class="flex h-full flex-col justify-between rounded-2xl pt-6 px-7 w-full bg-base-200 before:border-2 before:border-base-300 before:border-dashed before:absolute before:left-0 before:right-0 before:top-0 before:bottom-0 before:hidden before:rounded-2xl" data-targets="dashboard-dropzone.templateCards">
+    <div class="text-xl font-semibold" style="overflow: hidden; display: -webkit-box; -webkit-box-orient: vertical; -webkit-line-clamp: 2;">
       <% if template.template_accesses.present? %>
         <%= svg_icon('lock', class: 'w-6 h-6 inline -translate-y-[4px]') %>
       <% end %>
       <% template.name.split(/(_)/).each do |item| %><%= item %><wbr><% end %>
     </div>
-    <div class="pb-6 pt-1 space-y-1" data-targets="dashboard-dropzone.hiddenOnHover">
+    <div class="pb-6 pt-1 space-y-1" data-targets="dashboard-dropzone.hiddenOnDrag">
       <p class="flex items-center space-x-1 text-xs text-base-content/60">
         <%= svg_icon('user', class: 'w-4 h-4') %>
         <span><%= template.author.full_name.presence || template.author.email.to_s.sub(/\+\w+@/, '@') %></span>
@@ -28,8 +28,7 @@
       </p>
     </div>
   </a>
-  <%= render 'templates/dashboard_dropzone_form', url: template_replace_documents_path(template), title: t('upload_new_based_on_template'), icon: 'files', position: 'end' %>
-  <div class="absolute top-0 bottom-0 w-0 flex items-center hidden md:group-hover:flex" style="right: 37px" data-targets="dashboard-dropzone.hiddenOnHover">
+  <div class="absolute top-0 bottom-0 w-0 items-center hidden md:group-hover:flex" style="right: 37px" data-targets="dashboard-dropzone.hiddenOnDrag">
     <div class="space-y-1">
       <% if can?(:update, template) && !template.archived_at? && template.account_id == current_account.id %>
         <span class="tooltip tooltip-left" data-tip="<%= t('move') %>">
@@ -69,4 +68,4 @@
       <% end %>
     </div>
   </div>
-</dashboard-dropzone>
+</div>
diff --git a/app/views/templates_dashboard/index.html.erb b/app/views/templates_dashboard/index.html.erb
index 49858d14..1fd59e73 100644
--- a/app/views/templates_dashboard/index.html.erb
+++ b/app/views/templates_dashboard/index.html.erb
@@ -1,81 +1,86 @@
 <% has_archived = current_account.templates.where.not(archived_at: nil).exists? %>
 <% show_dropzone = params[:q].blank? && @pagy.pages == 1 && ((@template_folders.size < 10 && @templates.size.zero?) || (@template_folders.size < 7 && @templates.size < 4) || (@template_folders.size < 4 && @templates.size < 7)) %>
 <% if Docuseal.demo? %><%= render 'shared/demo_alert' %><% end %>
-<div class="flex justify-between items-center w-full mb-4 relative">
-  <% unless show_dropzone %>
-    <dashboard-dropzone data-show-only-on-window-hover="true" class="absolute bottom-0 w-full rounded-xl bg-base-200 border-2 border-dashed z-10 hidden" style="height: 7.5rem;">
-      <%= render 'templates/dashboard_dropzone_form', title: t('upload_new_document'), icon: 'cloud_upload' %>
-    </dashboard-dropzone>
+<dashboard-dropzone>
+  <%= form_for '', url: '', id: form_id = SecureRandom.uuid, method: :post, class: 'hidden', data: { target: 'dashboard-dropzone.form' }, html: { enctype: 'multipart/form-data' } do %>
+    <input name="form_id" value="<%= form_id %>">
+    <button type="submit"></button>
+    <input id="dashboard_dropzone_input" name="files[]" type="file" multiple>
   <% end %>
-  <div class="flex items-center flex-grow min-w-0">
-    <% if has_archived || @pagy.count > 0 || @template_folders.present? %>
-      <div class="mr-2">
-        <%= render 'dashboard/toggle_view', selected: 'templates' %>
-      </div>
+  <div class="flex justify-between items-center w-full mb-4 relative">
+    <% unless show_dropzone %>
+      <%= render 'templates/dashboard_dropzone', style: 'height: 114px' %>
     <% end %>
-    <h1 class="text-2xl truncate md:text-3xl sm:text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>">
-      <%= t('document_templates_html') %>
-    </h1>
+    <div class="flex items-center flex-grow min-w-0">
+      <% if has_archived || @pagy.count > 0 || @template_folders.present? %>
+        <div class="mr-2">
+          <%= render 'dashboard/toggle_view', selected: 'templates' %>
+        </div>
+      <% end %>
+      <h1 class="text-2xl truncate md:text-3xl sm:text-4xl font-bold md:block <%= 'hidden' if params[:q].present? %>">
+        <%= t('document_templates_html') %>
+      </h1>
+    </div>
+    <div class="flex space-x-2">
+      <% if params[:q].present? || @pagy.pages > 1 || @template_folders.present? %>
+        <%= render 'shared/search_input' %>
+      <% end %>
+      <% if can?(:create, ::Template) %>
+        <span class="hidden sm:block">
+          <%= render 'templates/upload_button' %>
+        </span>
+        <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
+          <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
+          <span class="hidden md:block"><%= t('create') %></span>
+        <% end %>
+      <% end %>
+    </div>
   </div>
-  <div class="flex space-x-2">
-    <% if params[:q].present? || @pagy.pages > 1 || @template_folders.present? %>
-      <%= render 'shared/search_input' %>
+  <% view_archived_html = capture do %>
+    <% if has_archived %>
+      <div>
+        <a href="<%= templates_archived_index_path %>" class="link text-sm"><%= t('view_archived') %></a>
+      </div>
     <% end %>
-    <% if can?(:create, ::Template) %>
-      <span class="hidden sm:block">
-        <%= render 'templates/upload_button' %>
-      </span>
-      <%= link_to new_template_path, class: 'white-button !border gap-2', data: { turbo_frame: :modal } do %>
-        <%= svg_icon('plus', class: 'w-6 h-6 stroke-2') %>
-        <span class="hidden md:block"><%= t('create') %></span>
-      <% end %>
+  <% end %>
+  <% templates_order_select_html = capture do %>
+    <% if params[:q].blank? && @pagy.pages > 1 %>
+      <%= render('shared/templates_order_select', with_recently_used: @pagy.count < 10_000) %>
     <% end %>
-  </div>
-</div>
-<% view_archived_html = capture do %>
-  <% if has_archived %>
-    <div>
-      <a href="<%= templates_archived_index_path %>" class="link text-sm"><%= t('view_archived') %></a>
-    </div>
   <% end %>
-<% end %>
-<% templates_order_select_html = capture do %>
-  <% if params[:q].blank? && @pagy.pages > 1 %>
-    <%= render('shared/templates_order_select', with_recently_used: @pagy.count < 10_000) %>
+  <% if @template_folders.present? %>
+    <div class="grid gap-4 md:grid-cols-3 <%= 'mb-6' if @templates.present? %>">
+      <%= render partial: 'template_folders/folder', collection: @template_folders, as: :folder %>
+    </div>
   <% end %>
-<% end %>
-<% if @template_folders.present? %>
-  <div class="grid gap-4 md:grid-cols-3 <%= 'mb-6' if @templates.present? %>">
-    <%= render partial: 'template_folders/folder', collection: @template_folders, as: :folder %>
-  </div>
-<% end %>
-<% if @templates.present? %>
-  <div class="grid gap-4 md:grid-cols-3">
-    <%= render partial: 'templates/template', collection: @templates %>
-    <% if show_dropzone && current_user.created_at > 2.weeks.ago || params[:tour] == 'true' %>
-      <% user_config = current_user.user_configs.find_or_initialize_by(key: UserConfig::SHOW_APP_TOUR) %>
-      <% if user_config.new_record? || user_config.value || params[:tour] == 'true' %>
-        <div class="hidden md:block">
-          <app-tour id="app_tour" data-show-tour="<%= params[:tour] == 'true' || user_config.value %>" data-type="dashboard" data-next-page-path="<%= @templates.first && can?(:edit, @templates.first) ? edit_template_path(@templates.first, params.permit(:tour)) : settings_account_path %>" data-i18n="<%= t('app_tour').to_json %>"></app-tour>
-          <% if user_config.new_record? && !params.key?(:tour) %>
-            <div class="h-36 rounded-2xl pt-3 px-7 w-full border border-dashed border-base-300">
-              <div class="text-xl text-center font-semibold text-base-content">
-                <%= t('welcome_to_docuseal') %>
-              </div>
-              <div class="my-2 text-center text-xs text-base-content/70">
-                <%= t('start_a_quick_tour_to_learn_how_to_create_an_send_your_first_document') %>
-              </div>
-              <div class="flex gap-2 mt-3 w-full">
-                <%= button_to button_title(title: t('skip'), icon_disabled: svg_icon('loader', class: 'w-4 h-4 animate-spin')), user_configs_path, params: { user_config: { key: UserConfig::SHOW_APP_TOUR, value: false } }, class: 'btn btn-sm btn-outline w-full', form_class: 'flex-1', method: :post, form: { onsubmit: 'window.app_tour.parentNode.remove()' } %>
-                <%= button_to t('start_tour'), user_configs_path, params: { user_config: { key: UserConfig::SHOW_APP_TOUR, value: true } }, class: 'btn btn-sm btn-warning  w-full', form_class: 'flex-1', method: :post, form: { onsubmit: 'window.app_tour.start()' } %>
+  <% if @templates.present? %>
+    <div class="grid gap-4 md:grid-cols-3">
+      <%= render partial: 'templates/template', collection: @templates %>
+      <% if show_dropzone && current_user.created_at > 2.weeks.ago || params[:tour] == 'true' %>
+        <% user_config = current_user.user_configs.find_or_initialize_by(key: UserConfig::SHOW_APP_TOUR) %>
+        <% if user_config.new_record? || user_config.value || params[:tour] == 'true' %>
+          <div class="hidden md:block">
+            <app-tour id="app_tour" data-show-tour="<%= params[:tour] == 'true' || user_config.value %>" data-type="dashboard" data-next-page-path="<%= @templates.first && can?(:edit, @templates.first) ? edit_template_path(@templates.first, params.permit(:tour)) : settings_account_path %>" data-i18n="<%= t('app_tour').to_json %>"></app-tour>
+            <% if user_config.new_record? && !params.key?(:tour) %>
+              <div class="h-36 rounded-2xl pt-3 px-7 w-full border border-dashed border-base-300">
+                <div class="text-xl text-center font-semibold text-base-content">
+                  <%= t('welcome_to_docuseal') %>
+                </div>
+                <div class="my-2 text-center text-xs text-base-content/70">
+                  <%= t('start_a_quick_tour_to_learn_how_to_create_an_send_your_first_document') %>
+                </div>
+                <div class="flex gap-2 mt-3 w-full">
+                  <%= button_to button_title(title: t('skip'), icon_disabled: svg_icon('loader', class: 'w-4 h-4 animate-spin')), user_configs_path, params: { user_config: { key: UserConfig::SHOW_APP_TOUR, value: false } }, class: 'btn btn-sm btn-outline w-full', form_class: 'flex-1', method: :post, form: { onsubmit: 'window.app_tour.parentNode.remove()' } %>
+                  <%= button_to t('start_tour'), user_configs_path, params: { user_config: { key: UserConfig::SHOW_APP_TOUR, value: true } }, class: 'btn btn-sm btn-warning  w-full', form_class: 'flex-1', method: :post, form: { onsubmit: 'window.app_tour.start()' } %>
+                </div>
               </div>
-            </div>
-          <% end %>
-        </div>
+            <% end %>
+          </div>
+        <% end %>
       <% end %>
-    <% end %>
-  </div>
-<% end %>
+    </div>
+  <% end %>
+</dashboard-dropzone>
 <% if show_dropzone %>
   <%= render 'templates/dropzone' %>
 <% end %>
diff --git a/config/locales/i18n.yml b/config/locales/i18n.yml
index 537edeb1..dbb83882 100644
--- a/config/locales/i18n.yml
+++ b/config/locales/i18n.yml
@@ -717,7 +717,7 @@ en: &en
   name_a_z: Name A-Z
   recently_used: Recently used
   newest_first: Newest first
-  upload_new_based_on_template: Upload new based on template
+  create_base_on_template: Create based on template
   submission_sources:
     api: API
     bulk: Bulk Send
diff --git a/config/routes.rb b/config/routes.rb
index 8adb31f4..ba05e364 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -97,7 +97,7 @@ Rails.application.routes.draw do
   resources :templates, only: %i[new create edit update show destroy] do
     resource :debug, only: %i[show], controller: 'templates_debug' if Rails.env.development?
     resources :documents, only: %i[create], controller: 'template_documents'
-    resources :replace_documents, only: %i[create], controller: 'template_replace_documents'
+    resources :clone_and_replace, only: %i[create], controller: 'templates_clone_and_replace'
     resources :restore, only: %i[create], controller: 'templates_restore'
     resources :archived, only: %i[index], controller: 'templates_archived_submissions'
     resources :submissions, only: %i[new create]
diff --git a/lib/templates/clone.rb b/lib/templates/clone.rb
index 2c15858f..0fe3b91b 100644
--- a/lib/templates/clone.rb
+++ b/lib/templates/clone.rb
@@ -4,6 +4,7 @@ module Templates
   module Clone
     module_function
 
+    # rubocop:disable Metrics, Style/CombinableLoops
     def call(original_template, author:, external_id: nil, name: nil, folder_name: nil)
       template = original_template.account.templates.new
 
@@ -29,10 +30,13 @@ module Templates
         template.schema.first['name'] = template.name
       end
 
+      original_template.template_accesses.each do |template_access|
+        template.template_accesses.new(user_id: template_access.user_id)
+      end
+
       template
     end
 
-    # rubocop:disable Metrics, Style/CombinableLoops
     def update_submitters_and_fields_and_schema(cloned_submitters, cloned_fields, cloned_schema, cloned_preferences)
       submitter_uuids_replacements = {}
       field_uuids_replacements = {}
diff --git a/lib/templates/replace_attachments.rb b/lib/templates/replace_attachments.rb
index e10f6a1d..0333d897 100644
--- a/lib/templates/replace_attachments.rb
+++ b/lib/templates/replace_attachments.rb
@@ -27,7 +27,7 @@ module Templates
         end
 
         next if template.fields.any? { |f| f['areas']&.any? { |a| a['attachment_uuid'] == document.uuid } }
-        next unless submitter && document.metadata.dig('pdf', 'fields').present?
+        next if submitter.blank? || document.metadata.dig('pdf', 'fields').blank?
 
         pdf_fields = document.metadata['pdf'].delete('fields').to_a
         pdf_fields.each { |f| f['submitter_uuid'] = submitter['uuid'] }