diff --git a/backend/src/controllers/archiveController.js b/backend/src/controllers/archiveController.js
index 8878367..e9e407c 100644
--- a/backend/src/controllers/archiveController.js
+++ b/backend/src/controllers/archiveController.js
@@ -1,5 +1,29 @@
 const db = require('../config/db');
 const path = require('path');
+const fs = require('fs');
+
+// ── Helper: format file size in human-readable string ─────────────────────────
+const formatBytes = (bytes) => {
+    if (bytes === null || bytes === undefined || isNaN(bytes) || bytes < 0) return 'Unknown';
+    if (bytes === 0) return '0 B';
+    const k = 1024;
+    const sizes = ['B', 'KB', 'MB', 'GB'];
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i];
+};
+
+const getDocSize = (d) => {
+    if (d.file_size !== null && d.file_size !== undefined && d.file_size > 0) {
+        return d.file_size;
+    }
+    if (d.file_path && fs.existsSync(d.file_path)) {
+        try {
+            const stat = fs.statSync(d.file_path);
+            return stat.size;
+        } catch (_) {}
+    }
+    return null;
+};
 
 
 exports.getArchivedStudents = (req, res) => {
@@ -263,31 +287,44 @@ exports.getArchivedDocuments = (req, res) => {
 
         const rows = db.prepare(`
             SELECT DISTINCT
-                d.id, d.student_id, d.file_name, d.document_type, d.status,
-                d.created_at, d.file_path,
+                d.id, d.student_id, d.requirement_id, d.file_name, d.document_type, d.status,
+                d.created_at, d.file_path, d.uploaded_by, d.file_size,
                 s.lrn as student_lrn,
                 s.status as student_status,
-                s.first_name || ' ' || s.last_name as student_name
+                s.first_name || ' ' || s.last_name as student_name,
+                TRIM(COALESCE(u.first_name, '') || ' ' || COALESCE(u.last_name, '')) as uploaded_by_name,
+                u.username as uploaded_by_username
             FROM documents d
+            LEFT JOIN users u ON d.uploaded_by = u.id
             ${joins}
             ${whereClause}
             ORDER BY d.created_at DESC
             LIMIT ? OFFSET ?
         `).all([...params, limitNum, offset]);
 
-        const documents = rows.map(d => ({
-            id: d.id,
-            studentId: d.student_id,
-            fileName: d.file_name,
-            documentType: d.document_type,
-            status: d.status,
-            createdAt: d.created_at,
-            studentLrn: d.student_lrn,
-            studentName: d.student_name,
-            studentStatus: d.student_status,
-            size: 'Unknown',
-            filePath: d.file_path,
-        }));
+        const documents = rows.map(d => {
+            const rawSize = getDocSize(d);
+            const uploaderName = d.uploaded_by_name && d.uploaded_by_name.trim().length > 0
+                ? d.uploaded_by_name.trim()
+                : (d.uploaded_by_username || (d.uploaded_by ? `User #${d.uploaded_by}` : null));
+            return {
+                id: d.id,
+                studentId: d.student_id,
+                requirementId: d.requirement_id,
+                fileName: d.file_name,
+                documentType: d.document_type,
+                status: d.status,
+                createdAt: d.created_at,
+                studentLrn: d.student_lrn,
+                studentName: d.student_name,
+                studentStatus: d.student_status,
+                uploadedBy: d.uploaded_by,
+                uploadedByName: uploaderName,
+                fileSize: rawSize,
+                size: rawSize !== null ? formatBytes(rawSize) : 'Unknown',
+                filePath: d.file_path,
+            };
+        });
 
         res.json({
             documents,
diff --git a/backend/src/controllers/documentController.js b/backend/src/controllers/documentController.js
index 5a16b1d..31fb957 100644
--- a/backend/src/controllers/documentController.js
+++ b/backend/src/controllers/documentController.js
@@ -16,6 +16,28 @@ const logActivity = (userId, action, entityType, entityId, description) => {
     }
 };
 
+// ── Helper: format file size in human-readable string ─────────────────────────
+const formatBytes = (bytes) => {
+    if (bytes === null || bytes === undefined || isNaN(bytes) || bytes < 0) return 'Unknown';
+    if (bytes === 0) return '0 B';
+    const k = 1024;
+    const sizes = ['B', 'KB', 'MB', 'GB'];
+    const i = Math.floor(Math.log(bytes) / Math.log(k));
+    return parseFloat((bytes / Math.pow(k, i)).toFixed(1)) + ' ' + sizes[i];
+};
+
+const getDocSize = (d) => {
+    if (d.file_size !== null && d.file_size !== undefined && d.file_size > 0) {
+        return d.file_size;
+    }
+    if (d.file_path && fs.existsSync(d.file_path)) {
+        try {
+            const stat = fs.statSync(d.file_path);
+            return stat.size;
+        } catch (_) {}
+    }
+    return null;
+};
 
 const STUDENT_DIR_ROOT = process.env.STUDENT_DIR_ROOT
     ? path.resolve(process.env.STUDENT_DIR_ROOT)
@@ -147,11 +169,12 @@ exports.uploadDocument = (req, res) => {
 
     try {
         const reqId = requirementId && requirementId !== 'null' ? requirementId : null;
+        const fileSize = file.size || (file.path && fs.existsSync(file.path) ? fs.statSync(file.path).size : null);
 
         const result = db.prepare(`
-            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by)
-            VALUES (?, ?, ?, ?, ?, 'Completed', ?)
-        `).run(studentId, reqId, file.originalname, file.path, documentType, req.user.id);
+            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by, file_size)
+            VALUES (?, ?, ?, ?, ?, 'Completed', ?, ?)
+        `).run(studentId, reqId, file.originalname, file.path, documentType, req.user.id, fileSize);
 
         // Log activity
         const student = db.prepare('SELECT first_name, last_name FROM students WHERE id = ?').get(studentId);
@@ -326,10 +349,13 @@ exports.getAllDocuments = (req, res) => {
 
         const fetchSql = `
             SELECT DISTINCT
-                d.id, d.student_id, d.file_name, d.document_type, d.status, d.created_at, d.file_path,
+                d.id, d.student_id, d.requirement_id, d.file_name, d.document_type, d.status, d.created_at, d.file_path, d.uploaded_by, d.file_size,
                 s.lrn as student_lrn,
-                s.first_name || ' ' || s.last_name as student_name
+                s.first_name || ' ' || s.last_name as student_name,
+                TRIM(COALESCE(u.first_name, '') || ' ' || COALESCE(u.last_name, '')) as uploaded_by_name,
+                u.username as uploaded_by_username
             FROM documents d
+            LEFT JOIN users u ON d.uploaded_by = u.id
             ${joins}
             ${whereClause}
             ORDER BY d.created_at DESC
@@ -338,18 +364,28 @@ exports.getAllDocuments = (req, res) => {
 
         const documents = db.prepare(fetchSql).all([...params, limitNum, offset]);
 
-        const mappedDocs = documents.map(d => ({
-            id: d.id,
-            studentId: d.student_id,
-            fileName: d.file_name,
-            documentType: d.document_type,
-            status: d.status,
-            createdAt: d.created_at,
-            studentLrn: d.student_lrn,
-            studentName: d.student_name,
-            size: 'Unknown', // Not storing size in DB right now
-            filePath: d.file_path
-        }));
+        const mappedDocs = documents.map(d => {
+            const rawSize = getDocSize(d);
+            const uploaderName = d.uploaded_by_name && d.uploaded_by_name.trim().length > 0
+                ? d.uploaded_by_name.trim()
+                : (d.uploaded_by_username || (d.uploaded_by ? `User #${d.uploaded_by}` : null));
+            return {
+                id: d.id,
+                studentId: d.student_id,
+                requirementId: d.requirement_id,
+                fileName: d.file_name,
+                documentType: d.document_type,
+                status: d.status,
+                createdAt: d.created_at,
+                studentLrn: d.student_lrn,
+                studentName: d.student_name,
+                uploadedBy: d.uploaded_by,
+                uploadedByName: uploaderName,
+                fileSize: rawSize,
+                size: rawSize !== null ? formatBytes(rawSize) : 'Unknown',
+                filePath: d.file_path
+            };
+        });
 
         res.json({
             documents: mappedDocs,
@@ -388,9 +424,12 @@ exports.getStatuses = (req, res) => {
     }
 };
 
-exports.getDocumentsByStudent = (req, res) => {
+// ============================================================
+// GET /api/documents/student/:studentId — get single student's documents
+// ============================================================
+exports.getDocumentsByStudent = exports.getDocumentById = (req, res) => {
+    const studentId = req.params.studentId || req.params.id;
     try {
-        const studentId = req.params.studentId;
         const isTeacher = req.user?.role?.toLowerCase() === 'teacher';
         if (isTeacher) {
             const hasAccess = db.prepare(`
@@ -412,26 +451,39 @@ exports.getDocumentsByStudent = (req, res) => {
         const documents = db.prepare(`
             SELECT d.*, dr.name as requirement_name,
                    s.lrn as student_lrn,
-                   s.first_name || ' ' || s.last_name as student_name
+                   s.first_name || ' ' || s.last_name as student_name,
+                   TRIM(COALESCE(u.first_name, '') || ' ' || COALESCE(u.last_name, '')) as uploaded_by_name,
+                   u.username as uploaded_by_username
             FROM documents d
+            LEFT JOIN users u ON d.uploaded_by = u.id
             LEFT JOIN document_requirements dr ON d.requirement_id = dr.id
             LEFT JOIN students s ON d.student_id = s.id
             WHERE d.student_id = ? AND d.deleted_at IS NULL
         `).all(studentId);
 
-        const mappedDocs = documents.map(d => ({
-            id: d.id,
-            studentId: d.student_id,
-            fileName: d.file_name,
-            documentType: d.document_type,
-            status: d.status,
-            createdAt: d.created_at,
-            studentLrn: d.student_lrn,
-            studentName: d.student_name,
-            size: 'Unknown',
-            filePath: d.file_path,
-            requirementName: d.requirement_name
-        }));
+        const mappedDocs = documents.map(d => {
+            const rawSize = getDocSize(d);
+            const uploaderName = d.uploaded_by_name && d.uploaded_by_name.trim().length > 0
+                ? d.uploaded_by_name.trim()
+                : (d.uploaded_by_username || (d.uploaded_by ? `User #${d.uploaded_by}` : null));
+            return {
+                id: d.id,
+                studentId: d.student_id,
+                requirementId: d.requirement_id,
+                fileName: d.file_name,
+                documentType: d.document_type,
+                status: d.status,
+                createdAt: d.created_at,
+                studentLrn: d.student_lrn,
+                studentName: d.student_name,
+                uploadedBy: d.uploaded_by,
+                uploadedByName: uploaderName,
+                fileSize: rawSize,
+                size: rawSize !== null ? formatBytes(rawSize) : 'Unknown',
+                filePath: d.file_path,
+                requirementName: d.requirement_name
+            };
+        });
 
         res.json(mappedDocs);
     } catch (error) {
@@ -662,10 +714,11 @@ exports.copyDocument = (req, res) => {
         fs.copyFileSync(originalPath, newFilePath);
 
         // Insert into DB
+        const fileSize = doc.file_size || (fs.existsSync(newFilePath) ? fs.statSync(newFilePath).size : null);
         const result = db.prepare(`
-            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by)
-            VALUES (?, ?, ?, ?, ?, ?, ?)
-        `).run(doc.student_id, doc.requirement_id, newFileName, newFilePath, doc.document_type, doc.status, req.user.id);
+            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by, file_size)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        `).run(doc.student_id, doc.requirement_id, newFileName, newFilePath, doc.document_type, doc.status, req.user.id, fileSize);
 
         // Log activity
         const student = db.prepare('SELECT first_name, last_name FROM students WHERE id = ?').get(doc.student_id);
@@ -740,10 +793,11 @@ exports.convertToPdf = async (req, res) => {
         fs.renameSync(tempPdfPath, finalPdfPath);
 
         // Insert new PDF document row into database
+        const convertedFileSize = fs.existsSync(finalPdfPath) ? fs.statSync(finalPdfPath).size : null;
         const result = db.prepare(`
-            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by)
-            VALUES (?, ?, ?, ?, ?, ?, ?)
-        `).run(doc.student_id, doc.requirement_id, newFileName, finalPdfPath, doc.document_type, doc.status, req.user.id);
+            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by, file_size)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
+        `).run(doc.student_id, doc.requirement_id, newFileName, finalPdfPath, doc.document_type, doc.status, req.user.id, convertedFileSize);
 
         const newDoc = db.prepare('SELECT * FROM documents WHERE id = ?').get(result.lastInsertRowid);
 
@@ -774,31 +828,45 @@ exports.bulkDelete = (req, res) => {
         return res.status(400).json({ message: 'No document IDs provided' });
     }
     try {
-        const deletedNames = [];
+        const isTeacher = req.user?.role?.toLowerCase() === 'teacher';
+        const teacherId = req.user?.id;
+        let deletedCount = 0;
+
         const getStmt = db.prepare('SELECT file_name, student_id, file_path, document_type FROM documents WHERE id = ?');
-        const softDeleteStmt = db.prepare("UPDATE documents SET deleted_at = strftime('%Y-%m-%dT%H:%M:%SZ', 'now') WHERE id = ?");
-        const insertTrashStmt = db.prepare(`
+        const insertRecentStmt = db.prepare(`
             INSERT INTO recent_deleted (document_id, student_id, file_name, file_path, document_type, deleted_by)
             VALUES (?, ?, ?, ?, ?, ?)
         `);
+        const softDeleteStmt = db.prepare('UPDATE documents SET deleted_at = CURRENT_TIMESTAMP WHERE id = ?');
 
         const transaction = db.transaction(() => {
             for (const id of ids) {
                 const doc = getStmt.get(id);
                 if (doc) {
-                    insertTrashStmt.run(id, doc.student_id, doc.file_name, doc.file_path, doc.document_type, req.user?.id);
+                    if (isTeacher) {
+                        const hasAccess = db.prepare(`
+                            SELECT 1 FROM enrollments e
+                            JOIN teacher_sections ts ON e.section_id = ts.section_id
+                            WHERE e.student_id = ? AND ts.teacher_id = ?
+                              AND e.id = (
+                                  SELECT e2.id FROM enrollments e2
+                                  JOIN academic_years ay ON e2.academic_year_id = ay.id
+                                  WHERE e2.student_id = ?
+                                  ORDER BY ay.year_range DESC, e2.grade_level DESC, e2.id DESC LIMIT 1
+                              )
+                        `).get(doc.student_id, teacherId, doc.student_id);
+                        if (!hasAccess) continue;
+                    }
+                    insertRecentStmt.run(id, doc.student_id, doc.file_name, doc.file_path, doc.document_type, req.user?.id);
                     softDeleteStmt.run(id);
-                    deletedNames.push(doc.file_name);
+                    deletedCount++;
                 }
             }
         });
 
         transaction();
 
-        logActivity(req.user?.id, 'DELETE', 'document', null,
-            `Moved ${deletedNames.length} documents to Recycle Bin: ${deletedNames.join(', ')}`);
-
-        res.json({ message: `Successfully moved ${deletedNames.length} documents to Recycle Bin` });
+        res.json({ message: `Successfully moved ${deletedCount} documents to recycle bin` });
     } catch (error) {
         console.error('bulkDelete error:', error);
         res.status(500).json({ message: 'Failed to bulk delete documents', error: error.message });
@@ -849,21 +917,24 @@ exports.bulkStatus = (req, res) => {
 exports.bulkAddToPrintQueue = (req, res) => {
     const { ids } = req.body;
     const userId = req.user.id;
-    const isTeacher = req.user?.role?.toLowerCase() === 'teacher';
     if (!ids || !Array.isArray(ids) || !ids.length) {
         return res.status(400).json({ message: 'No document IDs provided' });
     }
     try {
+        const isTeacher = req.user?.role?.toLowerCase() === 'teacher';
         let addedCount = 0;
+
         const checkStmt = db.prepare('SELECT id FROM print_queue WHERE document_id = ? AND user_id = ?');
-        const insertStmt = db.prepare('INSERT INTO print_queue (document_id, user_id) VALUES (?, ?)');
         const getDocStudentStmt = db.prepare('SELECT student_id FROM documents WHERE id = ?');
+        const insertStmt = db.prepare('INSERT INTO print_queue (document_id, user_id) VALUES (?, ?)');
 
         const transaction = db.transaction(() => {
             for (const id of ids) {
-                const doc = getDocStudentStmt.get(id);
-                if (doc) {
+                const existing = checkStmt.get(id, userId);
+                if (!existing) {
                     if (isTeacher) {
+                        const docStudent = getDocStudentStmt.get(id);
+                        if (!docStudent) continue;
                         const hasAccess = db.prepare(`
                             SELECT 1 FROM enrollments e
                             JOIN teacher_sections ts ON e.section_id = ts.section_id
@@ -874,16 +945,11 @@ exports.bulkAddToPrintQueue = (req, res) => {
                                   WHERE e2.student_id = ?
                                   ORDER BY ay.year_range DESC, e2.grade_level DESC, e2.id DESC LIMIT 1
                               )
-                        `).get(doc.student_id, userId, doc.student_id);
-                        if (!hasAccess) {
-                            continue;
-                        }
-                    }
-                    const existing = checkStmt.get(id, userId);
-                    if (!existing) {
-                        insertStmt.run(id, userId);
-                        addedCount++;
+                        `).get(docStudent.student_id, userId, docStudent.student_id);
+                        if (!hasAccess) continue;
                     }
+                    insertStmt.run(id, userId);
+                    addedCount++;
                 }
             }
         });
@@ -910,8 +976,8 @@ exports.bulkCopy = (req, res) => {
         let copiedCount = 0;
         const getStmt = db.prepare('SELECT * FROM documents WHERE id = ?');
         const insertStmt = db.prepare(`
-            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by)
-            VALUES (?, ?, ?, ?, ?, ?, ?)
+            INSERT INTO documents (student_id, requirement_id, file_name, file_path, document_type, status, uploaded_by, file_size)
+            VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         `);
         const usedNames = new Set();
 
@@ -952,7 +1018,8 @@ exports.bulkCopy = (req, res) => {
                     const newFilePath = path.join(dir, `${Date.now()}-${newFileName.replace(/[^a-zA-Z0-9.-]/g, '_')}`);
 
                     fs.copyFileSync(originalPath, newFilePath);
-                    insertStmt.run(doc.student_id, doc.requirement_id, newFileName, newFilePath, doc.document_type, doc.status, req.user.id);
+                    const copiedFileSize = doc.file_size || (fs.existsSync(newFilePath) ? fs.statSync(newFilePath).size : null);
+                    insertStmt.run(doc.student_id, doc.requirement_id, newFileName, newFilePath, doc.document_type, doc.status, req.user.id, copiedFileSize);
                     copiedCount++;
                 }
             }
@@ -989,9 +1056,11 @@ exports.getTrashDocuments = (req, res) => {
         const rows = db.prepare(`
             SELECT rd.document_id as id, rd.student_id, rd.file_name, rd.document_type, rd.file_path, rd.deleted_at,
                    s.lrn as student_lrn,
-                   s.first_name || ' ' || s.last_name as student_name
+                   s.first_name || ' ' || s.last_name as student_name,
+                   d.file_size
             FROM recent_deleted rd
             LEFT JOIN students s ON rd.student_id = s.id
+            LEFT JOIN documents d ON rd.document_id = d.id
             ${teacherJoin}
             WHERE rd.document_id IS NOT NULL
             ORDER BY rd.deleted_at DESC
@@ -1003,6 +1072,7 @@ exports.getTrashDocuments = (req, res) => {
             const diffMs = now - deletedTime;
             const diffDays = Math.floor(diffMs / (1000 * 60 * 60 * 24));
             const daysRemaining = Math.max(0, 30 - diffDays);
+            const rawSize = d.file_size;
 
             return {
                 id: d.id,
@@ -1015,7 +1085,8 @@ exports.getTrashDocuments = (req, res) => {
                 studentName: d.student_name,
                 deletedAt: d.deleted_at,
                 daysRemaining,
-                size: 'Unknown',
+                fileSize: rawSize,
+                size: rawSize !== null ? formatBytes(rawSize) : 'Unknown',
                 filePath: d.file_path
             };
         });
diff --git a/backend/src/models/schema.js b/backend/src/models/schema.js
index e8d6b8f..85f77a1 100644
--- a/backend/src/models/schema.js
+++ b/backend/src/models/schema.js
@@ -1,5 +1,6 @@
 const db = require('../config/db');
 const bcrypt = require('bcrypt');
+const fs = require('fs');
 
 const initSchema = () => {
     // ── Migration: Document status rename ──────────────────────────────────
@@ -492,6 +493,7 @@ const initSchema = () => {
                 status TEXT CHECK(status IN ('Completed','Archived')) DEFAULT 'Completed',
                 retention_date DATE,
                 uploaded_by INTEGER,
+                file_size INTEGER DEFAULT NULL,
                 created_at DATETIME DEFAULT (strftime('%Y-%m-%dT%H:%M:%SZ', 'now')),
                 deleted_at DATETIME DEFAULT NULL,
                 FOREIGN KEY (student_id) REFERENCES students(id) ON DELETE CASCADE,
@@ -632,6 +634,32 @@ const initSchema = () => {
             console.log('Migration: added deleted_at column to documents table');
         }
 
+        // Migration: add file_size column to documents if missing & backfill from disk
+        if (!docCols.some(c => c.name === 'file_size')) {
+            db.prepare("ALTER TABLE documents ADD COLUMN file_size INTEGER DEFAULT NULL").run();
+            console.log('Migration: added file_size column to documents table');
+        }
+
+        try {
+            const docsWithoutSize = db.prepare("SELECT id, file_path FROM documents WHERE file_size IS NULL OR file_size = 0").all();
+            if (docsWithoutSize.length > 0) {
+                const updateSizeStmt = db.prepare("UPDATE documents SET file_size = ? WHERE id = ?");
+                db.transaction(() => {
+                    for (const doc of docsWithoutSize) {
+                        if (doc.file_path && fs.existsSync(doc.file_path)) {
+                            try {
+                                const stats = fs.statSync(doc.file_path);
+                                updateSizeStmt.run(stats.size, doc.id);
+                            } catch (_) {}
+                        }
+                    }
+                })();
+                console.log(`[Migration] Backfilled file_size for ${docsWithoutSize.length} documents from disk.`);
+            }
+        } catch (sizeErr) {
+            console.error('[Migration Error] Failed to backfill file_size:', sizeErr.message);
+        }
+
         // Migration: Backfill any documents that are soft-deleted but missing from recent_deleted
         try {
             const orphanDeleted = db.prepare(`
diff --git a/frontend/AGENTS.md b/frontend/AGENTS.md
index 5782983..89186a8 100644
--- a/frontend/AGENTS.md
+++ b/frontend/AGENTS.md
@@ -321,9 +321,9 @@ Files backup/restore - mirror mode or zip -->
 <!-- # DOCUMENT SCREEN
 - move filter icon between multi select and bulk add  -->
 
-# DOCUMENT SCREEN AND ARCHIVES SCREEN
+<!-- # DOCUMENT SCREEN AND ARCHIVES SCREEN
 - Properties modal: add who uploads
-- add in backend data for file size to get the accurate file size
+- add in backend data for file size to get the accurate file size -->
 
 <!-- - list view -> documents only keep the folder design -> Only file name, under the file name is size of file ex. [2MB], then right side the date ex. [Dec 20, 2024] then 3 dots for menu
 - list view -> Folder only -> add count files inside ex. [3 items] -> keep the chips for JHS SHS just add, do not modify the chips code, only add under the file name
diff --git a/frontend/lib/core/utils/file_icon_helper.dart b/frontend/lib/core/utils/file_icon_helper.dart
index af7db4c..34fed87 100644
--- a/frontend/lib/core/utils/file_icon_helper.dart
+++ b/frontend/lib/core/utils/file_icon_helper.dart
@@ -77,7 +77,10 @@ class FileIconHelper {
         name.endsWith('.rar') ||
         name.endsWith('.7z') ||
         name.endsWith('.tar') ||
-        name.endsWith('.gz');
+        name.endsWith('.gz') ||
+        type.contains('zip') ||
+        type.contains('archive') ||
+        type.contains('compressed');
   }
 
   /// Returns the appropriate [IconData] for a given file name and optional document type.
@@ -187,4 +190,25 @@ class FileIconHelper {
     final color = overrideColor ?? getColor(fileName, docType: docType);
     return Icon(icon, size: size, color: color);
   }
+
+  /// Formats file size bytes or string into a human readable format (e.g. 2.4 MB, 500 KB)
+  static String formatFileSize(dynamic size) {
+    if (size == null) return '—';
+    if (size is num) {
+      if (size <= 0) return '0 B';
+      if (size < 1024) return '$size B';
+      if (size < 1024 * 1024) {
+        return '${(size / 1024).toStringAsFixed(1)} KB';
+      }
+      if (size < 1024 * 1024 * 1024) {
+        return '${(size / (1024 * 1024)).toStringAsFixed(1)} MB';
+      }
+      return '${(size / (1024 * 1024 * 1024)).toStringAsFixed(1)} GB';
+    }
+    final s = size.toString().trim();
+    if (s.isEmpty || s == 'Unknown' || s == '—') return '—';
+    final parsed = num.tryParse(s);
+    if (parsed != null) return formatFileSize(parsed);
+    return s;
+  }
 }
diff --git a/frontend/lib/domain/entities/document_model.dart b/frontend/lib/domain/entities/document_model.dart
index e07a394..3e18823 100644
--- a/frontend/lib/domain/entities/document_model.dart
+++ b/frontend/lib/domain/entities/document_model.dart
@@ -11,6 +11,9 @@ class DocumentModel {
   // Extra fields for UI display
   final String? studentLrn;
   final String? studentName;
+  final int? uploadedBy;
+  final String? uploadedByName;
+  final int? fileSize;
   final String? size;
 
   DocumentModel({
@@ -24,6 +27,9 @@ class DocumentModel {
     required this.createdAt,
     this.studentLrn,
     this.studentName,
+    this.uploadedBy,
+    this.uploadedByName,
+    this.fileSize,
     this.size,
   });
 
@@ -43,7 +49,10 @@ class DocumentModel {
                 : DateTime.now()),
       studentLrn: json['studentLrn'] ?? json['student_lrn'],
       studentName: json['studentName'] ?? json['student_name'],
-      size: json['size'],
+      uploadedBy: json['uploadedBy'] ?? json['uploaded_by'] as int?,
+      uploadedByName: json['uploadedByName'] ?? json['uploaded_by_name'] as String?,
+      fileSize: json['fileSize'] ?? json['file_size'] as int?,
+      size: json['size'] as String?,
     );
   }
 
@@ -56,6 +65,9 @@ class DocumentModel {
       'file_path': filePath,
       'document_type': documentType,
       'status': status,
+      'uploaded_by': uploadedBy,
+      'uploaded_by_name': uploadedByName,
+      'file_size': fileSize,
       'created_at': createdAt.toIso8601String(),
     };
   }
diff --git a/frontend/lib/ui/screens/documents/widgets/file_folder_card.dart b/frontend/lib/ui/screens/documents/widgets/file_folder_card.dart
index 80e9c2f..c26a430 100644
--- a/frontend/lib/ui/screens/documents/widgets/file_folder_card.dart
+++ b/frontend/lib/ui/screens/documents/widgets/file_folder_card.dart
@@ -325,7 +325,9 @@ class _FileFolderCardState extends State<FileFolderCard> {
                       ),
                       const SizedBox(height: 2),
                       Text(
-                        widget.document.size ?? '—',
+                        FileIconHelper.formatFileSize(
+                          widget.document.fileSize ?? widget.document.size,
+                        ),
                         style: TextStyle(
                           fontSize: 11,
                           color: isDark
diff --git a/frontend/lib/ui/shared/dialogs/document_properties_dialog.dart b/frontend/lib/ui/shared/dialogs/document_properties_dialog.dart
index 69ac85f..7384d4c 100644
--- a/frontend/lib/ui/shared/dialogs/document_properties_dialog.dart
+++ b/frontend/lib/ui/shared/dialogs/document_properties_dialog.dart
@@ -171,10 +171,21 @@ class DocumentPropertiesDialog extends StatelessWidget {
                           : '—'),
                   icon: Icons.person_outline_rounded,
                 ),
+                _buildPropertyRow(
+                  context,
+                  label: 'Uploaded By',
+                  value: document.uploadedByName ??
+                      (document.uploadedBy != null
+                          ? 'User #${document.uploadedBy}'
+                          : '—'),
+                  icon: Icons.person_add_alt_1_outlined,
+                ),
                 _buildPropertyRow(
                   context,
                   label: 'File Size',
-                  value: document.size ?? '—',
+                  value: FileIconHelper.formatFileSize(
+                    document.fileSize ?? document.size,
+                  ),
                   icon: Icons.data_usage_rounded,
                 ),
                 _buildPropertyRow(