diff --git a/frontend/src/views/admin/SoraAdminView.vue b/frontend/src/views/admin/SoraAdminView.vue
index 17a42838..3d107a1e 100644
--- a/frontend/src/views/admin/SoraAdminView.vue
+++ b/frontend/src/views/admin/SoraAdminView.vue
@@ -3,10 +3,9 @@ import { ref, onMounted, computed } from 'vue'
 import { useI18n } from 'vue-i18n'
 import soraAdminAPI, { type SoraSystemStats, type SoraUserStats, type SoraGenerationAdmin } from '@/api/admin/sora'
 import AppLayout from '@/components/layout/AppLayout.vue'
-import LoadingSpinner from '@/components/ui/LoadingSpinner.vue'
-import Icon from '@/components/ui/Icon.vue'
-import BaseButton from '@/components/ui/BaseButton.vue'
-import BasePagination from '@/components/ui/BasePagination.vue'
+import LoadingSpinner from '@/components/common/LoadingSpinner.vue'
+import Icon from '@/components/icons/Icon.vue'
+import ConfirmDialog from '@/components/common/ConfirmDialog.vue'
 
 const { t } = useI18n()
 
@@ -17,6 +16,11 @@ const userStats = ref<SoraUserStats[]>([])
 const generations = ref<SoraGenerationAdmin[]>([])
 const activeTab = ref<'overview' | 'users' | 'generations'>('overview')
 
+// Confirm dialog state
+const showConfirmDialog = ref(false)
+const confirmDialogMessage = ref('')
+const pendingClearUserId = ref<number | null>(null)
+
 // Pagination
 const userPage = ref(1)
 const userPageSize = ref(20)
@@ -98,8 +102,19 @@ async function fetchGenerations() {
   }
 }
 
-async function clearUserStorage(userId: number) {
-  if (!confirm(t('admin.sora.confirmClearStorage'))) return
+// Confirm dialog handlers
+function confirmClearStorage(userId: number) {
+  pendingClearUserId.value = userId
+  confirmDialogMessage.value = t('admin.sora.confirmClearStorage')
+  showConfirmDialog.value = true
+}
+
+async function handleConfirmClear() {
+  if (pendingClearUserId.value === null) return
+  const userId = pendingClearUserId.value
+  showConfirmDialog.value = false
+  pendingClearUserId.value = null
+
   try {
     await soraAdminAPI.clearUserStorage(userId)
     await fetchUserStats()
@@ -109,6 +124,11 @@ async function clearUserStorage(userId: number) {
   }
 }
 
+function handleCancelClear() {
+  showConfirmDialog.value = false
+  pendingClearUserId.value = null
+}
+
 async function loadAll() {
   loading.value = true
   await Promise.all([
@@ -304,7 +324,7 @@ onMounted(loadAll)
               class="input flex-1"
               @keyup.enter="fetchUserStats"
             />
-            <BaseButton @click="fetchUserStats">{{ t('common.search') }}</BaseButton>
+            <button class="btn btn-primary" @click="fetchUserStats">{{ t('common.search') }}</button>
           </div>
 
           <!-- Table -->
@@ -340,13 +360,12 @@ onMounted(loadAll)
                   <td class="px-4 py-3 text-sm text-gray-900 dark:text-white">{{ formatBytes(user.used_bytes) }}</td>
                   <td class="px-4 py-3 text-sm text-gray-900 dark:text-white">{{ user.generations_count }}</td>
                   <td class="px-4 py-3 text-sm">
-                    <BaseButton
-                      variant="danger"
-                      size="sm"
-                      @click="clearUserStorage(user.user_id)"
+                    <button
+                      class="btn btn-danger btn-sm"
+                      @click="confirmClearStorage(user.user_id)"
                     >
                       {{ t('admin.sora.clearStorage') }}
-                    </BaseButton>
+                    </button>
                   </td>
                 </tr>
               </tbody>
@@ -354,12 +373,16 @@ onMounted(loadAll)
           </div>
 
           <!-- Pagination -->
-          <BasePagination
-            v-if="userTotalPages > 1"
-            :current="userPage"
-            :total="userTotalPages"
-            @change="onUserPageChange"
-          />
+          <div v-if="userTotalPages > 1" class="flex items-center justify-center gap-2">
+            <button
+              v-for="p in userTotalPages"
+              :key="p"
+              :class="['btn btn-sm', p === userPage ? 'btn-primary' : 'btn-secondary']"
+              @click="onUserPageChange(p)"
+            >
+              {{ p }}
+            </button>
+          </div>
         </div>
 
         <!-- Generations Tab -->
@@ -417,14 +440,28 @@ onMounted(loadAll)
           </div>
 
           <!-- Pagination -->
-          <BasePagination
-            v-if="genTotalPages > 1"
-            :current="genPage"
-            :total="genTotalPages"
-            @change="onGenPageChange"
-          />
+          <div v-if="genTotalPages > 1" class="flex items-center justify-center gap-2">
+            <button
+              v-for="p in genTotalPages"
+              :key="p"
+              :class="['btn btn-sm', p === genPage ? 'btn-primary' : 'btn-secondary']"
+              @click="onGenPageChange(p)"
+            >
+              {{ p }}
+            </button>
+          </div>
         </div>
       </template>
     </div>
+
+    <!-- Confirm Dialog -->
+    <ConfirmDialog
+      :show="showConfirmDialog"
+      :title="t('admin.sora.clearStorage')"
+      :message="confirmDialogMessage"
+      :danger="true"
+      @confirm="handleConfirmClear"
+      @cancel="handleCancelClear"
+    />
   </AppLayout>
 </template>