diff --git a/app/Http/Controllers/DictionaryController.php b/app/Http/Controllers/DictionaryController.php
index 43802d77..7455bc53 100644
--- a/app/Http/Controllers/DictionaryController.php
+++ b/app/Http/Controllers/DictionaryController.php
@@ -18,6 +18,9 @@
 use App\Services\DictionaryImportService;
 
 
+// request classes
+use App\Http\Requests\Dictionaries\GetDictionaryFileInformationRequest;
+
 class DictionaryController extends Controller
 {
     /*
@@ -614,18 +617,18 @@ public function importDictionaryCsvFile(Request $request) {
         return 'success';
     }
 
-    /*
-        Scans the /storage/app/dictionaries folder, 
-        and returns a list of importable dictionaries.
-    */
-    public function getImportableDictionaryList() {
-        
+    public function getDictionaryFileInformation(GetDictionaryFileInformationRequest $request) {
+        $dictionaryFile = $request->file('dictionaryFile');
         $dictCcLanguageCodes = config('linguacafe.languages.dict_cc_language_codes');
         $databaseLanguageCodes = config('linguacafe.languages.database_name_language_codes');
         $supportedSourceLanguages = config('linguacafe.languages.supported_languages');
         
-        $dictionaryImportService = new DictionaryImportService();
-        $dictionariesFound = $dictionaryImportService->getImportableDictionaryList($supportedSourceLanguages, $dictCcLanguageCodes, $databaseLanguageCodes);
+        try {
+            $dictionaryImportService = new DictionaryImportService();
+            $dictionariesFound = $dictionaryImportService->getDictionaryFileInformation($dictionaryFile, $supportedSourceLanguages, $dictCcLanguageCodes, $databaseLanguageCodes);
+        } catch (\Exception $e) {
+            abort(500, $e->getMessage());
+        }
         
         return json_encode($dictionariesFound);
     }
@@ -637,7 +640,7 @@ public function importSupportedDictionary(Request $request) {
         $dictionarySourceLanguage = $request->post('dictionarySourceLanguage');
         $dictionaryTargetLanguage = $request->post('dictionaryTargetLanguage');
         $dictionaryDatabaseName = $request->post('dictionaryDatabaseName');
-
+        
         // import jmdict files
         if ($dictionaryName == 'JMDict') {
             try {
@@ -646,9 +649,9 @@ public function importSupportedDictionary(Request $request) {
                 $dictionaryImportService->kanjiImport();
                 $dictionaryImportService->kanjiRadicalImport();
             } catch (\Throwable $t) {
-                return 'error';
+                return $t->getMessage();
             } catch (\Exception $e) {
-                return 'error';
+                return $e->getMessage();
             }
 
             return 'success';
diff --git a/app/Http/Requests/Dictionaries/GetDictionaryFileInformationRequest.php b/app/Http/Requests/Dictionaries/GetDictionaryFileInformationRequest.php
new file mode 100644
index 00000000..d7b5ec3c
--- /dev/null
+++ b/app/Http/Requests/Dictionaries/GetDictionaryFileInformationRequest.php
@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Requests\Dictionaries;
+
+use Illuminate\Foundation\Http\FormRequest;
+
+class GetDictionaryFileInformationRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     *
+     * @return bool
+     */
+    public function authorize()
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array
+     */
+    public function rules()
+    {
+        return [
+            'dictionaryFile' => 'required|file',
+        ];
+    }
+}
diff --git a/app/Services/DictionaryImportService.php b/app/Services/DictionaryImportService.php
index 124c9dd2..0c023d3e 100644
--- a/app/Services/DictionaryImportService.php
+++ b/app/Services/DictionaryImportService.php
@@ -27,16 +27,19 @@ private function deleteTempDictionaryFiles() {
         Storage::delete($tempDictionaryFiles);
     }
 
-    /*
-        Scans the /storage/app/dictionaries folder, 
-        and returns a list of importable dictionaries.
-    */
-    public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLanguageCodes, $databaseLanguageCodes) {
-        $dictionariesFound = [];
-        $files = Storage::files('dictionaries');
+    public function getDictionaryFileInformation($dictionaryFile, $supportedSourceLanguages, $dictCcLanguageCodes, $databaseLanguageCodes) {
+        // delete old files from dictionaries temp folder
+        $this->deleteTempDictionaryFiles();
+
+        // move uploaded file to the dictionaries temp folder
+        $fileName = $dictionaryFile->getClientOriginalName();
+        $dictionaryFile->move(storage_path('app/temp/dictionaries'), $fileName);
+
+        // scan the new file
+        $dictionary = null;
         
         // jmdict dictionary
-        if (Storage::exists('dictionaries/jmdict.zip')) {
+        if ($fileName === 'jmdict.zip') {
             $dictionary = new \stdClass();
             $dictionary->name = 'JMDict';
             $dictionary->databaseName = 'dict_jp_jmdict';
@@ -58,14 +61,10 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
             if ($recordCount > 180000) {
                 $dictionary->imported = true;
             }
-
-
-            // add jmdict to the list
-            $dictionariesFound[] = $dictionary;
         }
 
         // cc cedict dictionary
-        if (Storage::exists('dictionaries/cedict_ts.u8')) {
+        if ($fileName === 'cedict_ts.u8') {
             $dictionary = new \stdClass();
             $dictionary->name = 'cc-cedict';
             $dictionary->databaseName = 'dict_zh_cedict';
@@ -84,7 +83,7 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
             }
 
             // check record count
-            $handle = fopen(Storage::path('dictionaries/cedict_ts.u8'), "r");
+            $handle = fopen(Storage::path('temp/dictionaries/cedict_ts.u8'), "r");
             if ($handle) {
                 while (($line = fgets($handle)) !== false) {
                     if (str_contains($line, '#! entries=')) {
@@ -96,13 +95,10 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
             
             // close file
             fclose($handle);
-
-            // add cc cedict to the list
-            $dictionariesFound[] = $dictionary;
         }
 
         // HanDeDict dictionary
-        if (Storage::exists('dictionaries/handedict.u8')) {
+        if ($fileName === 'handedict.u8') {
             $dictionary = new \stdClass();
             $dictionary->name = 'HanDeDict';
             $dictionary->databaseName = 'dict_zh_handedict';
@@ -121,14 +117,11 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
             }
 
             // check record count
-            $dictionary->expectedRecordCount = $this->getFileLineCount(Storage::path('dictionaries/handedict.u8'));
-            
-            // add cc cedict to the list
-            $dictionariesFound[] = $dictionary;
+            $dictionary->expectedRecordCount = $this->getFileLineCount(Storage::path('temp/dictionaries/handedict.u8'));
         }
 
         // kengdic dictionary
-        if (Storage::exists('dictionaries/kengdic.tsv')) {
+        if ($fileName === 'kengdic.tsv') {
             $dictionary = new \stdClass();
             $dictionary->name = 'kengdic';
             $dictionary->databaseName = 'dict_ko_kengdic';
@@ -146,12 +139,11 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
                 $dictionary->imported = true;
             }
 
-            // add kengdic to the list
-            $dictionariesFound[] = $dictionary;
+            return $dictionary;
         }
 
         // eurfa welsh dictionary
-        if (Storage::exists('dictionaries/Eurfa_Welsh_Dictionary.csv')) {
+        if ($fileName === 'Eurfa_Welsh_Dictionary.csv') {
             $dictionary = new \stdClass();
             $dictionary->name = 'eurfa';
             $dictionary->databaseName = 'dict_cy_eurfa';
@@ -169,19 +161,16 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
                 $dictionary->imported = true;
             }
 
-            // add kengdic to the list
-            $dictionariesFound[] = $dictionary;
+            return $dictionary;
         }
         
+        
         // dict cc dictionaries
-        foreach ($files as $file) {
-            // skip non txt files
-            if (pathinfo($file, PATHINFO_EXTENSION) !== 'txt') {
-                continue;
-            }
-            
+        if (pathinfo($fileName, PATHINFO_EXTENSION) === 'txt') {
+            $supported = true;
+
             // get language
-            $handle = fopen(Storage::path($file), "r");
+            $handle = fopen(Storage::path('temp/dictionaries/' . $fileName), "r");
             if ($handle) {
                 if (($line = fgets($handle)) !== false) {
                     # example line:
@@ -189,7 +178,7 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
 
                     // skip file if it's not a dict cc dictionary
                     if (!str_contains($line, ' vocabulary database	compiled by dict.cc')) {
-                        continue;
+                        $supported = false;
                     }
 
                     // split first line by spaces
@@ -206,7 +195,7 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
                             !in_array(ucfirst($dictCcLanguageCodes[$fileLanguage[0]]), $supportedSourceLanguages, true)
                             
                         ) {
-                            continue;
+                            $supported = false;
                         }
                     }
                 }
@@ -216,76 +205,75 @@ public function getImportableDictionaryList($supportedSourceLanguages, $dictCcLa
             fclose($handle);
 
             // add the found dictionary to the list
-            $dictionary = new \stdClass();
-            $dictionary->name = 'dictcc ' . $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[0]]] . '-'. $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[1]]];
-            $dictionary->databaseName = 'dict_' . $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[0]]] . '_' . $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[1]]] . '_dict_cc';
-            $dictionary->source_language = $dictCcLanguageCodes[$fileLanguage[0]];
-            $dictionary->target_language = $dictCcLanguageCodes[$fileLanguage[1]];
-            $dictionary->color = '#FF981B'; 
-            $dictionary->expectedRecordCount = $this->getFileLineCount(Storage::path($file));
-            $dictionary->firstUpdateInterval = 3000;
-            $dictionary->updateInterval = 10000;
-            $dictionary->fileName = pathinfo($file, PATHINFO_BASENAME);
-            $dictionary->imported = false;
-
+            if ($supported) {
+                $dictionary = new \stdClass();
+                $dictionary->name = 'dictcc ' . $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[0]]] . '-'. $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[1]]];
+                $dictionary->databaseName = 'dict_' . $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[0]]] . '_' . $databaseLanguageCodes[$dictCcLanguageCodes[$fileLanguage[1]]] . '_dict_cc';
+                $dictionary->source_language = $dictCcLanguageCodes[$fileLanguage[0]];
+                $dictionary->target_language = $dictCcLanguageCodes[$fileLanguage[1]];
+                $dictionary->color = '#FF981B'; 
+                $dictionary->expectedRecordCount = $this->getFileLineCount(Storage::path('temp/dictionaries/' . $fileName));
+                $dictionary->firstUpdateInterval = 3000;
+                $dictionary->updateInterval = 10000;
+                $dictionary->fileName = $fileName;
+                $dictionary->imported = false;
+
+
+                // check if the dictionary has been imported
+                if (Schema::hasTable($dictionary->databaseName)) {
+                    $dictionary->imported = true;
+                }
 
-            // check if the dictionary has been imported
-            if (Schema::hasTable($dictionary->databaseName)) {
-                $dictionary->imported = true;
+                return $dictionary;
             }
-            
-            // add dictionary to the list
-            $dictionariesFound[] = $dictionary;
         }
 
         // wiktionary dictionaries
-        foreach ($files as $file) {
-            if (pathinfo($file, PATHINFO_EXTENSION) !== 'tsv') {
-                continue;
-            }
+        if (pathinfo($fileName, PATHINFO_EXTENSION) === 'tsv') {
+            $supported = true;
 
             // get filename and split into words
-            $fileName = pathinfo($file, PATHINFO_FILENAME);
-            $words = explode('.', $fileName);
+            $words = explode('.', pathinfo($fileName, PATHINFO_FILENAME));
 
             // make sure the file is in a format that's expected
             if (count($words) < 2) {
-                continue;
+                $supported = false;
             }
 
             // skip file if it's not a wiktionary
             if ($words[1] !== 'wiktionary') {
-                continue;
+                $supported = false;
             }
 
             // get language
             $language = strtolower($words[0]);
 
-            $dictionary = new \stdClass();
-            $dictionary->name = 'wiktionary ' . $databaseLanguageCodes[$language];
-            $dictionary->databaseName = 'dict_' . $databaseLanguageCodes[$language] . '_wiktionary';
-            $dictionary->source_language = $language;
-            $dictionary->target_language = 'english';
-            $dictionary->color = '#E9CDA0'; 
-            $dictionary->expectedRecordCount = count(file(Storage::path($file)));
-            $dictionary->firstUpdateInterval = 5000;
-            $dictionary->updateInterval = 10000;
-            $dictionary->fileName =  pathinfo($file, PATHINFO_BASENAME);
+            if ($supported) {
+                $dictionary = new \stdClass();
+                $dictionary->name = 'wiktionary ' . $databaseLanguageCodes[$language];
+                $dictionary->databaseName = 'dict_' . $databaseLanguageCodes[$language] . '_wiktionary';
+                $dictionary->source_language = $language;
+                $dictionary->target_language = 'english';
+                $dictionary->color = '#E9CDA0'; 
+                $dictionary->expectedRecordCount = $this->getFileLineCount(Storage::path('temp/dictionaries/' . $fileName));
+                $dictionary->firstUpdateInterval = 5000;
+                $dictionary->updateInterval = 10000;
+                $dictionary->fileName =  $fileName;
+
+                // check if the wiktionary has been imported
+                if (Schema::hasTable($dictionary->databaseName)) {
+                    $dictionary->imported = true;
+                }
 
-            // check if the wiktionary has been imported
-            if (Schema::hasTable($dictionary->databaseName)) {
-                $dictionary->imported = true;
+                return $dictionary;
             }
-            
-            // add wiktionary to the list
-            $dictionariesFound[] = $dictionary;
         }
 
-        return $dictionariesFound;
+        return $dictionary;
     }
 
     private function getFileLineCount($fileName) {
-        $lineCount =0;
+        $lineCount = 0;
         $file = fopen($fileName, 'r');
         
         if ($file) {
@@ -335,7 +323,7 @@ public function importCeDictOrHanDeDict($name, $targetLanguage, $databaseName, $
         $index = 0;
         DB::beginTransaction();
 
-        $handle = fopen(Storage::path('dictionaries/' . $fileName), "r");
+        $handle = fopen(Storage::path('temp/dictionaries/' . $fileName), "r");
         
         if (!$handle) {
             return 'error';
@@ -409,7 +397,7 @@ public function importKengdic($name, $databaseName, $fileName) {
 
         $index = 0;
         DB::beginTransaction();
-        $handle = fopen(Storage::path('dictionaries/' . $fileName), "r");
+        $handle = fopen(Storage::path('temp/dictionaries/' . $fileName), "r");
         
         if (!$handle) {
             return 'error';
@@ -482,7 +470,7 @@ public function importEurfa($name, $databaseName, $fileName) {
 
         DB::beginTransaction();
         $index = 0;
-        $csv = Reader::createFromPath(storage_path('app/dictionaries') . '/' . $fileName, 'r');
+        $csv = Reader::createFromPath(storage_path('app/temp/dictionaries') . '/' . $fileName, 'r');
         $records = $csv->getRecords();
         $uniqueWords = [];
         foreach ($records as$record) {
@@ -547,7 +535,7 @@ public function importDictCc($name, $sourceLanguage, $targetLanguage, $fileName,
         $index = 0;
         DB::beginTransaction();
 
-        $handle = fopen(Storage::path('dictionaries/' . $fileName), "r");
+        $handle = fopen(Storage::path('temp/dictionaries/' . $fileName), "r");
         if (!$handle) {
             return 'error';
         }
@@ -613,7 +601,7 @@ public function importWiktionary($name, $language, $fileName, $databaseName) {
 
         $index = 0;
         DB::beginTransaction();
-        $handle = fopen(Storage::path('dictionaries/' . $fileName), "r");
+        $handle = fopen(Storage::path('temp/dictionaries/' . $fileName), "r");
         if (!$handle) {
             return 'error';
         }
@@ -761,9 +749,6 @@ public function kanjiRadicalImport() {
 
         // finish
         DB::commit();
-
-        // delete temp files
-        $this->deleteTempDictionaryFiles();
     }
 
     /*
@@ -877,11 +862,8 @@ public function jmdictImport() {
         DB::statement('DELETE FROM dict_jp_jmdict_readings');
 
         // extract zip file
-        $filePath = Storage::path('dictionaries/jmdict.zip');
+        $filePath = Storage::path('temp/dictionaries/jmdict.zip');
         $extractPath = Storage::path('temp/dictionaries');
-        
-        // delete all temp dictionary files
-        $this->deleteTempDictionaryFiles();
 
         // extract jmdict.zip file
         $zip = new \ZipArchive();
diff --git a/resources/js/components/Admin/AdminDictionaryImportDialog.vue b/resources/js/components/Admin/AdminDictionaryImportDialog.vue
index 32b9fa76..424c3aec 100644
--- a/resources/js/components/Admin/AdminDictionaryImportDialog.vue
+++ b/resources/js/components/Admin/AdminDictionaryImportDialog.vue
@@ -1,7 +1,7 @@
 <template>
     <v-dialog v-model="value" scrollable persistent width="1000px">
         <!-- External dictionary import -->
-        <template v-if="importType === 'external'">
+        <template v-if="selectedDictionaryType === 'custom'">
             <admin-external-dictionary-import 
                 :language="language"
                 @import-finished="importFinished" 
@@ -11,9 +11,8 @@
         </template>
 
         <!-- Supported dictionary import -->
-        <template v-if="importType === 'supported'">
+        <template v-if="selectedDictionaryType === 'supported'">
             <admin-supported-dictionary-import 
-                :dictionary="selectedDictionary"
                 @import-finished="importFinished" 
                 @back-to-dictionaries="backToDictionaries" 
                 @close="close" 
@@ -22,10 +21,9 @@
 
         <!-- Dictionary selection list -->
         <v-card 
-            v-if="importType === 'none'"
+            v-if="selectedDictionaryType === null"
             id="supported-dictionary-import-dialog" 
             class="rounded-lg"
-            :loading="dictionariesLoading"
             min-height="600px"
         >
             <!-- Title bar -->
@@ -39,125 +37,69 @@
 
             <!-- Dictionary list -->
             <v-card-text>
-                <!-- Import info text -->
-                <template v-if="dictionariesFound.length">
-                    These dictionaries have been found in the LinguaCafe storage directory. 
-                    You can select one to start the import process, or you can upload and 
-                    import a dictionary from an external .csv file.
-                </template>
-
-                <!-- Scanned dictionary list -->
-                <div id="supported-dictionaries" class="mt-4" v-if="!dictionariesLoading">
-                    <!-- Upload external .csv import -->
-                    <div class="dictionary d-flex flex-wrap justify-space-between rounded-xl pa-4">
-                        <div class="language"></div>
-                        <div class="name">
-                            Upload a dictionary from a .csv dictionary file
-                        </div>
-                        <div class="import-button">
-                            <v-btn 
-                                rounded 
-                                depressed 
-                                color="primary"
-                                width="120px"
-                                @click="selectDictionary(-1)"
-                            ><v-icon class="mr-1">mdi-file-upload</v-icon>Upload</v-btn>
-                        </div>
-                    </div>
-
-                    <!-- Scanned dictionary files -->
-                    <template v-if="dictionariesFound.length">
-                        <div 
-                            class="dictionary d-flex flex-wrap rounded-xl mt-4 pa-4"
-                            v-for="(dictionary, dictionaryIndex) in dictionariesFound"
-                            :key="dictionaryIndex"
-                            >
-                            
-                            <div class="language d-flex align-center">
-                                <v-img 
-                                    class="border" 
-                                    :src="'/images/flags/' + dictionary.source_language + '.png'" 
-                                    max-width="43" 
-                                    height="28"
-                                ></v-img> 
-                            </div>
-
-                            <div class="name">
-                                {{ dictionary.name }}
-                                <v-icon 
-                                    v-if="dictionary.imported"
-                                    color="success"
-                                    class="ml-2"
-                                    title="This dictionary is already imported."
-                                >
-                                    mdi-database-check
-                                </v-icon>
-                            </div>
-
-                            
-                            <div class="import-button">
-                                <v-btn 
-                                    rounded 
-                                    depressed 
-                                    color="primary"
-                                    width="120px"
-                                    @click="selectDictionary(dictionaryIndex)"
-                                ><v-icon class="mr-1">mdi-database-import</v-icon>Import</v-btn>
-                            </div>
-                        </div>
-                    </template>
-                </div>
+                <!-- Dictionary type selection -->
+                <label class="font-weight-bold mt-4"></label>
+                <v-radio-group
+                    v-model="dictionaryTypeInput"
+                    class="mt-0"
+                >
+                    <v-radio
+                        label="Supported dictionary file from the user manual"
+                        value="supported"
+                    ></v-radio>
+                    <v-radio
+                        label="Custom .csv dictionary file"
+                        value="custom"
+                    ></v-radio>
+                    <v-radio
+                        label="DeepL dictionary"
+                        value="deepl"
+                        disabled
+                    ></v-radio>
+                </v-radio-group>
             </v-card-text>
+            <v-card-actions>
+                <v-spacer />
+                <v-btn 
+                    rounded 
+                    depressed
+                    color="primary"
+                    @click="selectDictionary"
+                >Continue</v-btn>
+            </v-card-actions>
         </v-card>
     </v-dialog>
 </template>
 
 <script>
-import axios from 'axios';
-    export default {
-        props: {
-            value : Boolean,
-            language: String,
+export default {
+    props: {
+        value : Boolean,
+        language: String,
+    },
+    emits: ['input'],
+    data: function() {
+        return {
+            dictionaryTypeInput: 'supported',
+            selectedDictionaryType: null,
+        };
+    },
+    mounted: function() {
+    },
+    methods: {
+        selectDictionary() {
+            this.selectedDictionaryType = this.dictionaryTypeInput;
         },
-        emits: ['input'],
-        data: function() {
-            return {
-                dictionariesLoading: false,
-                dictionariesFound: [],
-                selectedDictionary: null,
-                importType: 'none'
-            };
+        backToDictionaries() {
+            this.dictionaryTypeInput = 'supported';
+            this.selectedDictionaryType = null;
         },
-        mounted: function() {
-            this.loadDictionaries();
+        close() {
+            this.$emit('input', false);
         },
-        methods: {
-            loadDictionaries() {
-                this.dictionariesLoading = true;
-                axios.get('/dictionaries/scan').then((response) => {
-                    this.dictionariesFound = response.data;
-                    this.dictionariesLoading = false;
-                });
-            },
-            selectDictionary(dictionaryIndex) {
-                if (dictionaryIndex == -1) {
-                    this.selectedDictionary = null;
-                    this.importType = 'external';
-                } else {
-                    this.selectedDictionary = this.dictionariesFound[dictionaryIndex];
-                    this.importType = 'supported';
-                }
-            },
-            backToDictionaries() {
-                this.importType = 'none';
-                this.selectedDictionary = null;
-            },
-            close() {
-                this.$emit('input', false);
-            },
-            importFinished() {
-                this.$emit('import-finished');
-            }
+        importFinished() {
+            this.$emit('import-finished');
         }
     }
+}
 </script>
diff --git a/resources/js/components/Admin/AdminDictionarySettings.vue b/resources/js/components/Admin/AdminDictionarySettings.vue
index 5719f55c..d3f3e407 100644
--- a/resources/js/components/Admin/AdminDictionarySettings.vue
+++ b/resources/js/components/Admin/AdminDictionarySettings.vue
@@ -34,8 +34,8 @@
             Dictionaries
             <v-spacer/>
             <v-btn rounded dark color="primary" @click="importDialog = true;">
-                <v-icon class="mr-1">mdi-database-import</v-icon>
-                <span id="import-button-text">Import dictionary</span>
+                <v-icon class="mr-1">mdi-database-plus</v-icon>
+                <span id="import-button-text">Add dictionary</span>
                 <span id="import-button-text-short">Import</span>
             </v-btn>
         </div>
@@ -62,6 +62,11 @@
                 :items-per-page="9"
             >
 
+                <!-- Records -->
+                <template v-slot:item.records="{ item }">
+                    {{ item.records == '-' ? '-' : formatNumber(item.records) }}
+                </template>
+
                 <!-- Source language -->
                 <template v-slot:item.source_language="{ item }">
                     <v-img class="mx-auto border" :src="'/images/flags/' + item.source_language + '.png'" max-width="43" height="28" /> 
@@ -130,30 +135,38 @@
                     {
                         text: 'Name',
                         value: 'name',
+                        align: 'center',
                     },
                     {
                         text: 'Records',
                         value: 'records',
+                        align: 'center',
                     },
                     {
                         text: 'Database',
                         value: 'database_table_name',
+                        align: 'center',
                     },
                     {
-                        text: 'Source language',
+                        text: 'Source',
                         value: 'source_language',
+                        align: 'center',
                     },
                     {
-                        text: 'Target language',
+                        text: 'Target',
                         value: 'target_language',
+                        align: 'center',
                     },
                     {
                         text: 'Enabled',
                         value: 'enabled',
+                        align: 'center',
                     },
                     {
                         text: 'Actions',
                         value: 'actions',
+                        align: 'center',
+                        width: '110px',
                     },
                 ]
             }
diff --git a/resources/js/components/Admin/AdminSupportedDictionaryImport.vue b/resources/js/components/Admin/AdminSupportedDictionaryImport.vue
index 5fae27c7..0b8fa248 100644
--- a/resources/js/components/Admin/AdminSupportedDictionaryImport.vue
+++ b/resources/js/components/Admin/AdminSupportedDictionaryImport.vue
@@ -9,114 +9,163 @@
         <v-card-title>
             <span class="text-h5">Dictionary import</span>
             <v-spacer></v-spacer>
-            <v-btn icon @click="close"> 
+            <v-btn icon @click="close" :disabled="importing"> 
                 <v-icon>mdi-close</v-icon>
             </v-btn>
         </v-card-title>
 
         <!-- Card text -->
         <v-card-text>
-            <!-- Import overview information -->
-            <template v-if="!importing && importResult === null">
-                Importing a large dictionary can take several minutes. 
-                <v-simple-table class="border no-hover mx-auto mt-2">
-                    <tbody>
-                        <tr>
-                            <td>Dictionary name:</td>
-                            <td>{{ dictionary.name }}</td>
-                        </tr>
-                        <tr>
-                            <td>Database table name:</td>
-                            <td>{{ dictionary.databaseName }}</td>
-                        </tr>
-                        <tr>
-                            <td>Records:</td>
-                            <td>{{ formatNumber(dictionary.expectedRecordCount) }}</td>
-                        </tr>
-                        <tr>
-                            <td>Source language:</td>
-                            <td>
-                                <v-img 
-                                    class="border" 
-                                    :src="'/images/flags/' + dictionary.source_language + '.png'" 
-                                    max-width="43" 
-                                    height="28"
-                                ></v-img> 
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Target language:</td>
-                            <td>
-                                <v-img 
-                                    class="border" 
-                                    :src="'/images/flags/' + dictionary.target_language + '.png'" 
-                                    max-width="43" 
-                                    height="28"
-                                ></v-img> 
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Color:</td>
-                            <td>
-                                <v-card
-                                    class="border"
-                                    outlined
-                                    :color="dictionary.color"
-                                    width="48px"
-                                    height="26px"
-                                ></v-card>
-                            </td>
-                        </tr>
-                        <tr>
-                            <td>Filename:</td>
-                            <td>
-                                {{ dictionary.fileName }}
-                            </td>
-                        </tr>
-                    </tbody>
-                </v-simple-table>
-            </template>
 
-            <!-- Import progress -->
-            <template v-if="importing">
-                The dictionary is being imported. This might take a while.
-                <v-progress-linear
-                    color="primary"
-                    height="36"
-                    :value="this.importedRecords / this.dictionary.expectedRecordCount * 100"
-                    class="rounded-pill mt-2"
-                >
-                    <strong>{{ importingProgressPercentage }}%</strong>
-                </v-progress-linear>
-            </template>
+            <v-stepper id="import-stepper" v-model="stepperPage" elevation="0" class="pb-0" min-height="620px">
+                <!-- Stepper header -->
+                <v-stepper-header>
+                    <v-stepper-step :complete="stepperPage > 1" step="1" :color="stepperPage > 1 ? 'success' : 'primary'">
+                        Upload dictionary file
+                    </v-stepper-step>
+                    <v-divider/>
+                    
+                    <v-stepper-step :complete="stepperPage > 2" step="2" :color="stepperPage > 2 ? 'success' : 'primary'">
+                        Overview
+                    </v-stepper-step>
+                    <v-divider/>
 
-            <!-- Import result -->
-            <template v-if="!importing && importResult !== null">
-                <!-- Success message -->
-                <v-alert
-                    v-if="importResult == 'success'"
-                    class="rounded-lg mt-2"
-                    color="success"
-                    type="success"
-                    border="left"
-                    dark
-                >
-                    The import process has finished successfully. {{ dictionary.name }} has been imported.
-                </v-alert>
-
-                <!-- error message -->
-                <v-alert
-                    v-if="importResult !== 'success'"
-                    class="rounded-lg mt-2"
-                    color="error"
-                    type="error"
-                    border="left"
-                    dark
-                >
-                        The import process has failed. Please make sure your dictionary files are the correct ones. If the problem 
-                        still persist, please create a <a href="https://github.com/simjanos-dev/LinguaCafe">GitHub</a> Issue.
-                </v-alert>
-            </template>
+                    <v-stepper-step :complete="stepperPage > 3" step="3" :color="stepperPage > 3 ? 'success' : 'primary'">
+                        Importing
+                    </v-stepper-step>
+                </v-stepper-header>
+
+                <v-stepper-items>
+                    <!-- Upload file -->
+                    <v-stepper-content step="1">
+                        <v-file-input
+                            v-model="dictionaryFile"
+                            filled
+                            dense
+                            rounded
+                            clearable
+                            placeholder="Dictionary file"
+                            prepend-icon="mdi-file"
+                            @change="testDictionaryFile"
+                        ></v-file-input>
+
+                        <v-alert
+                            v-if="dictionaryFileTest === 'error'"
+                            class="mt-2"
+                            type="error"
+                            color="error"
+                            border="left"
+                        >
+                            The selected file is not a supported dictionary file. Please upload a file from the sources listed in the user manual.
+                        </v-alert>
+                    </v-stepper-content>
+
+                    <!-- Import overview information -->
+                    <v-stepper-content step="2">
+                        Importing a large dictionary can take several minutes. 
+                        <v-simple-table class="border no-hover mx-auto mt-2" v-if="dictionary !== null">
+                            <tbody>
+                                <tr>
+                                    <td>Dictionary name:</td>
+                                    <td>{{ dictionary.name }}</td>
+                                </tr>
+                                <tr>
+                                    <td>Database table name:</td>
+                                    <td>{{ dictionary.databaseName }}</td>
+                                </tr>
+                                <tr>
+                                    <td>Records:</td>
+                                    <td>{{ formatNumber(dictionary.expectedRecordCount) }}</td>
+                                </tr>
+                                <tr>
+                                    <td>Source language:</td>
+                                    <td>
+                                        <v-img 
+                                            class="border" 
+                                            :src="'/images/flags/' + dictionary.source_language + '.png'" 
+                                            max-width="43" 
+                                            height="28"
+                                        ></v-img> 
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Target language:</td>
+                                    <td>
+                                        <v-img 
+                                            class="border" 
+                                            :src="'/images/flags/' + dictionary.target_language + '.png'" 
+                                            max-width="43" 
+                                            height="28"
+                                        ></v-img> 
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Color:</td>
+                                    <td>
+                                        <v-card
+                                            class="border"
+                                            outlined
+                                            :color="dictionary.color"
+                                            width="48px"
+                                            height="26px"
+                                        ></v-card>
+                                    </td>
+                                </tr>
+                                <tr>
+                                    <td>Filename:</td>
+                                    <td>
+                                        {{ dictionary.fileName }}
+                                    </td>
+                                </tr>
+                            </tbody>
+                        </v-simple-table>
+                    </v-stepper-content>
+
+                    <!-- Import step -->
+                    <v-stepper-content step="3">
+                        <!-- Import progress -->
+                        <template v-if="importing">
+                            The dictionary is being imported. This might take a while.
+                            <v-progress-linear
+                                color="primary"
+                                height="36"
+                                :value="this.importedRecords / this.dictionary.expectedRecordCount * 100"
+                                class="rounded-pill mt-2"
+                            >
+                                <strong>{{ importingProgressPercentage }}%</strong>
+                            </v-progress-linear>
+                        </template>
+
+                        <!-- Import result -->
+                        <template v-if="!importing && importResult !== null">
+                            <!-- Success message -->
+                            <v-alert
+                                v-if="importResult == 'success'"
+                                class="rounded-lg mt-2"
+                                color="success"
+                                type="success"
+                                border="left"
+                                dark
+                            >
+                                The import process has finished successfully. {{ dictionary.name }} has been imported.
+                            </v-alert>
+
+                            <!-- error message -->
+                            <v-alert
+                                v-if="importResult !== 'success'"
+                                class="rounded-lg mt-2"
+                                color="error"
+                                type="error"
+                                border="left"
+                                dark
+                            >
+                                    The import process has failed. Please make sure your dictionary files are the correct ones. If the problem 
+                                    still persist, please create a <a href="https://github.com/simjanos-dev/LinguaCafe">GitHub</a> Issue.
+                            </v-alert>
+                        </template>
+                    </v-stepper-content>
+                </v-stepper-items>
+            </v-stepper>
         </v-card-text>
         <v-card-actions>
             <v-spacer />
@@ -126,9 +175,10 @@
                 <v-btn 
                     rounded 
                     text 
-                    @click="backToDictionaries"
+                    @click="back"
                 >Back</v-btn>
                 <v-btn
+                    v-if="stepperPage == 2 && importResult === null && dictionaryFile !== null  && dictionaryFile !== undefined"
                     rounded
                     depressed
                     color="primary"
@@ -151,11 +201,12 @@
 <script>
     import {formatNumber} from './../../helper.js';
     export default {
-        props: {
-            dictionary: Object
-        },
         data: function() {
             return {
+                dictionary: null,
+                dictionaryFile: null,
+                dictionaryFileTest: '',
+                stepperPage: 1,
                 importing: false,
                 importResult: null,
                 importedRecords: 0,
@@ -165,9 +216,37 @@
         mounted: function() {
         },
         methods: {
+            testDictionaryFile() {
+                if (this.dictionaryFile === null) {
+                    this.dictionary = null;
+                    this.dictionaryFileTest = '';
+                    return;
+                }
+                
+                let formData = new FormData();
+                formData.append("dictionaryFile", this.dictionaryFile);
+
+                this.dictionaryFileTest = 'loading';
+                axios.post('/dictionaries/get-supported-dictionary-file-information', formData).then((response) => {
+                    if (response.data === null) {
+                        this.dictionary = null;
+                        this.dictionaryFileTest = 'error';
+                    } else {
+                        this.dictionary = response.data;
+                        this.stepperPage = 2;
+                        this.dictionaryFileTest = '';
+                    }
+                }).catch((error) => {
+                    this.dictionaryFileTest = 'error';
+                });
+            },
             // requests how many records have been imported
             updateImportProgress() {
-                axios.get('/dictionaries/get-record-count/' + this.$props.dictionary.databaseName).then((response) => {
+                if (this.dictionaryFile === null) {
+                    return;
+                }
+
+                axios.get('/dictionaries/get-record-count/' + this.dictionary.databaseName).then((response) => {
                     // update imported recod count
                     this.importedRecords = parseInt(response.data);
 
@@ -186,8 +265,13 @@
                 });
             },
             startImport() {
+                if (this.dictionary === null) {
+                    return;
+                }
+
                 this.importing = true;
                 this.importedRecords = 0;
+                this.stepperPage = 3;
                 
                 // first improt progress request
                 setTimeout(() => {
@@ -195,19 +279,23 @@
                 }, this.dictionary.firstUpdateInterval);
 
                 axios.post('/dictionaries/import', {
-                    'dictionarySourceLanguage': this.$props.dictionary.source_language,
-                    'dictionaryTargetLanguage': this.$props.dictionary.target_language,
-                    'dictionaryName': this.$props.dictionary.name,
-                    'dictionaryDatabaseName': this.$props.dictionary.databaseName,
-                    'dictionaryExpectedRecordCount': this.$props.dictionary.expectedRecordCount,
-                    'dictionaryFileName': this.$props.dictionary.fileName
+                    'dictionarySourceLanguage': this.dictionary.source_language,
+                    'dictionaryTargetLanguage': this.dictionary.target_language,
+                    'dictionaryName': this.dictionary.name,
+                    'dictionaryDatabaseName': this.dictionary.databaseName,
+                    'dictionaryExpectedRecordCount': this.dictionary.expectedRecordCount,
+                    'dictionaryFileName': this.dictionary.fileName
                 }).then((response) => {
                     this.importing = false;
                     this.importResult = response.data;
                 });
             },
-            backToDictionaries() {
-                this.$emit('back-to-dictionaries');
+            back() {
+                if (this.stepperPage === 1) {
+                    this.$emit('back-to-dictionaries');
+                } else {
+                    this.stepperPage --;
+                }
             },
             close() {
                 this.$emit('import-finished');
diff --git a/resources/js/components/Home/PatchNotes.vue b/resources/js/components/Home/PatchNotes.vue
index a8a223bb..b7f5ad32 100644
--- a/resources/js/components/Home/PatchNotes.vue
+++ b/resources/js/components/Home/PatchNotes.vue
@@ -13,6 +13,7 @@
                     <li>Added an import option for e-books that lets users order the chapters based on the e-book's spine metadata. In some rare cases, this will fix incorrect chapter order for imported e-books.</li>
                     <li>Added an option to set preferred hover vocabulary position. Now it can appear both above or below the hovered words based on the selected setting.</li>
                     <li>Added filtering, sorting and pagination to the admin dictionary settings page.</li>
+                    <li>Replaced the dictionary import process. Now users can import dictionaries by file upload, instead of having to copy files into the storage directory.</li>
                 </ul>
 
                 <b>Bug fixes:</b>
diff --git a/routes/web.php b/routes/web.php
index 0ad04336..8d2d4c78 100755
--- a/routes/web.php
+++ b/routes/web.php
@@ -106,7 +106,7 @@
     Route::get('/images/kanji/{fileName}', [App\Http\Controllers\ImageController::class, 'getKanjiImage']);
 
     // dictionaries
-    Route::get('/dictionaries/scan', [App\Http\Controllers\DictionaryController::class, 'getImportableDictionaryList']);
+    Route::post('/dictionaries/get-supported-dictionary-file-information', [App\Http\Controllers\DictionaryController::class, 'getDictionaryFileInformation']);
     Route::post('/dictionaries/import', [App\Http\Controllers\DictionaryController::class, 'importSupportedDictionary']);
     Route::get('/dictionaries/get-record-count/{dictionaryName}', [App\Http\Controllers\DictionaryController::class, 'getDictionaryRecordCount']);
     Route::get('/dictionaries/deepl/get-usage', [App\Http\Controllers\DictionaryController::class, 'getDeeplCharacterLimit']);