diff --git a/public/assets/icon/add-picture.svg b/public/assets/icon/add-picture.svg
new file mode 100644
index 0000000..b7e3810
--- /dev/null
+++ b/public/assets/icon/add-picture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g fill="none"><path fill="currentColor" d="M44 24a2 2 0 1 0-4 0zM24 8a2 2 0 1 0 0-4zm15 32H9v4h30zM8 39V9H4v30zm32-15v15h4V24zM9 8h15V4H9zm0 32a1 1 0 0 1-1-1H4a5 5 0 0 0 5 5zm30 4a5 5 0 0 0 5-5h-4a1 1 0 0 1-1 1zM8 9a1 1 0 0 1 1-1V4a5 5 0 0 0-5 5z"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="m6 35l10.693-9.802a2 2 0 0 1 2.653-.044L32 36m-4-5l4.773-4.773a2 2 0 0 1 2.615-.186L42 31M30 12h12m-6-6v12"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/icon/check-fill.svg b/public/assets/icon/check-fill.svg
new file mode 100644
index 0000000..d3862d7
--- /dev/null
+++ b/public/assets/icon/check-fill.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><g fill="none" fill-rule="evenodd"><path d="m12.593 23.258l-.011.002l-.071.035l-.02.004l-.014-.004l-.071-.035q-.016-.005-.024.005l-.004.01l-.017.428l.005.02l.01.013l.104.074l.015.004l.012-.004l.104-.074l.012-.016l.004-.017l-.017-.427q-.004-.016-.017-.018m.265-.113l-.013.002l-.185.093l-.01.01l-.003.011l.018.43l.005.012l.008.007l.201.093q.019.005.029-.008l.004-.014l-.034-.614q-.005-.018-.02-.022m-.715.002a.02.02 0 0 0-.027.006l-.006.014l-.034.614q.001.018.017.024l.015-.002l.201-.093l.01-.008l.004-.011l.017-.43l-.003-.012l-.01-.01z"/><path fill="currentColor" d="M21.546 5.111a1.5 1.5 0 0 1 0 2.121L10.303 18.475a1.6 1.6 0 0 1-2.263 0L2.454 12.89a1.5 1.5 0 1 1 2.121-2.121l4.596 4.596L19.424 5.111a1.5 1.5 0 0 1 2.122 0"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/icon/file-document-alert.svg b/public/assets/icon/file-document-alert.svg
new file mode 100644
index 0000000..313ff89
--- /dev/null
+++ b/public/assets/icon/file-document-alert.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="currentColor" d="M20 17h2v-2h-2zm0-10v6h2V7M6 16h5v2H6m0-6h8v2H6M4 2c-1.11 0-2 .89-2 2v16c0 1.11.89 2 2 2h12c1.11 0 2-.89 2-2V8l-6-6M4 4h7v5h5v11H4Z"/></svg>
\ No newline at end of file
diff --git a/public/assets/icon/upload-picture.svg b/public/assets/icon/upload-picture.svg
new file mode 100644
index 0000000..4549d0a
--- /dev/null
+++ b/public/assets/icon/upload-picture.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><g fill="none"><path fill="currentColor" d="M44 24a2 2 0 1 0-4 0zM24 8a2 2 0 1 0 0-4zm15 32H9v4h30zM8 39V9H4v30zm32-15v15h4V24zM9 8h15V4H9zm0 32a1 1 0 0 1-1-1H4a5 5 0 0 0 5 5zm30 4a5 5 0 0 0 5-5h-4a1 1 0 0 1-1 1zM8 9a1 1 0 0 1 1-1V4a5 5 0 0 0-5 5z"/><path stroke="currentColor" stroke-linecap="round" stroke-linejoin="round" stroke-width="4" d="m6 35l10.693-9.802a2 2 0 0 1 2.653-.044L32 36m-4-5l4.773-4.773a2 2 0 0 1 2.615-.186L42 31m-5-13V6m-5 5l5-5l5 5"/></g></svg>
\ No newline at end of file
diff --git a/public/assets/icon/video-settings-rounded.svg b/public/assets/icon/video-settings-rounded.svg
new file mode 100644
index 0000000..32f4507
--- /dev/null
+++ b/public/assets/icon/video-settings-rounded.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path fill="currentColor" d="M11 20H4q-.825 0-1.412-.587T2 18V6q0-.825.588-1.412T4 4h16q.825 0 1.413.588T22 6v4q0 .425-.288.713T21 11t-.712-.288T20 10V6H4v12h7q.425 0 .713.288T12 19t-.288.713T11 20m-1.5-4.875v-6.25q0-.45.388-.663t.762.038l4.875 3.125q.35.225.35.625t-.35.625L10.65 15.75q-.375.25-.763.038t-.387-.663m8.275 7.475l-.225-1.1q-.3-.125-.563-.262t-.537-.338l-1.075.325q-.175.05-.325-.012T14.8 21l-.6-1q-.1-.15-.05-.325t.175-.3l.825-.725q-.05-.35-.05-.65t.05-.65l-.825-.725q-.125-.125-.175-.3T14.2 16l.6-1q.1-.15.25-.212t.325-.013l1.075.325q.275-.2.538-.337t.562-.263l.225-1.1q.05-.175.163-.288T18.25 13h1.2q.2 0 .313.113t.162.287l.225 1.1q.3.125.563.275t.537.375l1.05-.375q.175-.05.338.013T22.9 15l.6 1.05q.1.15.063.325t-.163.3l-.85.725q.05.3.05.625t-.05.625l.825.725q.125.125.175.3T23.5 20l-.6 1q-.1.15-.25.213t-.325.012L21.25 20.9q-.275.2-.537.338t-.563.262l-.225 1.1q-.05.175-.162.288T19.45 23h-1.2q-.2 0-.312-.112t-.163-.288M18.85 20q.825 0 1.413-.587T20.85 18t-.587-1.412T18.85 16t-1.412.588T16.85 18t.588 1.413T18.85 20"/></svg>
\ No newline at end of file
diff --git a/public/global-style.css b/public/global-style.css
index ea0aaf7..536b9ff 100644
--- a/public/global-style.css
+++ b/public/global-style.css
@@ -76,11 +76,6 @@
 }
 
 .gs-info-bg {
-    position: absolute;
-    top: 40%;
-    left: 50%;
-    margin-left: -101px;
-    transfrom: translate(-50%, -50%);
     color: #1E88E5;
 }
 
@@ -115,7 +110,7 @@
 .gs-info-sub-bg {
     background-color: #BDBDBD;
     color: white;
-    border-radius: 20px;
+    border-radius: 10px;
     width: 255px;
     margin-top: 20px;
     padding: 5px;
diff --git a/src/components/designer/modeling/GitActionDialog.vue b/src/components/designer/modeling/GitActionDialog.vue
index 3bc8be0..68c35a0 100644
--- a/src/components/designer/modeling/GitActionDialog.vue
+++ b/src/components/designer/modeling/GitActionDialog.vue
@@ -62,8 +62,8 @@
                                             @click="onSelected(testIdx, codeIdx)"
                                         >
                                             <v-row>
-                                                <Icon
-                                                    icon="mdi:file-document-alert-outline" width="20" height="20"
+                                                <Icons
+                                                    :icon="'file-document-alert'" :width="20" :height="20"
                                                     style="color: white; position: relative; left: -30px; top: 20px;"
                                                 />
                                                 <v-col style="margin-left:-35px; margin-right: 25px;">
diff --git a/src/components/designer/modeling/generators/GeneratorUI.vue b/src/components/designer/modeling/generators/GeneratorUI.vue
index 0b6a588..b621f02 100644
--- a/src/components/designer/modeling/generators/GeneratorUI.vue
+++ b/src/components/designer/modeling/generators/GeneratorUI.vue
@@ -9,7 +9,6 @@
             @click="openGeneratorUI=!openGeneratorUI"
         >
             <v-icon>mdi-auto-fix</v-icon>
-            <!-- <Icon icon="arcticons:openai-chatgpt" width="35" height="35" /> -->
         </v-btn>
         <v-row v-if="openGeneratorUI" style="position:absolute; right:30px; top:75px;">
             <v-card style="text-align: center; z-index: 2;" width="auto">
@@ -75,7 +74,7 @@
                                     color="primary"
                                 >
                                     <div v-if="generatorName === 'CJMGenerator' || generatorName === 'BMGenerator' || generatorName === 'UserStoryMapGenerator'">
-                                        <span><Icon style="float:left; margin-right:3px;" icon="ri:check-fill" width="16" height="16"/>complete</span>
+                                        <span><Icons :icon="'check-fill'" style="float:left; margin-right:3px;" :width="16" :height="16"/>complete</span>
                                     </div>
                                     <div v-else>
                                         <span>CONTINUE<v-icon>mdi-arrow-right</v-icon></span>
@@ -300,6 +299,7 @@
     import DDLDraftGenerator from './DDLDraftGenerator.js'
     import DDLBoundedContextDistributeGenerator from './es-ddl-generators/DDLBoundedContextDistributeGenerator.js'
     import PreProcessingFunctionsGenerator from './es-ddl-generators/PreProcessingFunctionsGenerator.js'
+import Icons from '../../../ui/Icons.vue'
     
     //import UserStoryGenerator from './UserStoryGenerator.js'
 
@@ -348,7 +348,8 @@
             }
         },
         components: {
-            DebeziumLogsTab
+            DebeziumLogsTab,
+                Icons
         },
 
         created(){
diff --git a/src/components/labs/LabLocator.vue b/src/components/labs/LabLocator.vue
index e3cc0fd..8648072 100644
--- a/src/components/labs/LabLocator.vue
+++ b/src/components/labs/LabLocator.vue
@@ -12,7 +12,6 @@
                     large
                 >
                     <Icons :icon="'right'" :color="'#FFFFFF'"/>
-                    <!-- <Icon color="white" icon="mingcute:right-fill" width="24" height="24" /> -->
                 </v-card>
             </template>
             <span>인스트럭션 크기 조절</span>
@@ -264,9 +263,7 @@
                             <template v-slot:activator="{ on, attrs }">
                                 <v-btn style="margin-left:5px;" v-bind="attrs" v-on="on" @click="editLabVideo()"
                                         color="primary" icon large>
-                                    <Icon icon="material-symbols:video-settings-rounded"
-                                            style="margin-top:-4px; width:30px; height:30px;"
-                                    />
+                                    <Icons :icon="'video-settings-rounded'" :width="30" :height="30" style="margin-top:-4px;" />
                                 </v-btn>
                             </template>
                             <span>유튜브 Url 수정</span>
@@ -307,12 +304,11 @@
                         <v-tooltip bottom>
                             <template v-slot:activator="{ on, attrs }">
                                 <v-btn
-                                        style="margin-left:5px;" v-bind="attrs" v-on="on"
-                                        @click="uploadImage()"
-                                        color="primary" icon large>
-                                    <v-icon>
-                                        mdi-folder-upload
-                                    </v-icon>
+                                    style="margin-left:5px;" v-bind="attrs" v-on="on"
+                                    @click="uploadImage()"
+                                    color="primary" icon large
+                                >
+                                    <Icons :icon="'add-picture'" :size="26" />
                                 </v-btn>
                             </template>
                             <span>이미지 업로드</span>
@@ -321,8 +317,10 @@
                         <v-tooltip bottom>
                             <template v-slot:activator="{ on, attrs }">
                                 <v-btn style="margin-left:5px;" v-bind="attrs" v-on="on" @click="screenCapture()"
-                                        color="primary" v-if="isAdmin || myId==userId" icon large>
-                                    <v-icon>{{setIcon}}</v-icon>
+                                    color="primary" v-if="isAdmin || myId==userId" icon large
+                                >
+                                    <Icons v-if="!isCapturing" :icon="'upload-picture'" :size="26" />
+                                    <v-icon v-else>{{setIcon}}</v-icon>
                                 </v-btn>
                             </template>
                             <span>제출</span>
@@ -899,38 +897,36 @@
                 v-model="imageWindow"
                 width="800"
         >
-            <v-card width="800">
-                <v-card-title>결과 제출</v-card-title>
-                <div style="text-align: -webkit-center;">
+            <v-card class="pa-4 ma-0">
+                <v-row class="pa-0 ma-0">
+                    <v-card-title class="pa-0 ma-0">결과 제출</v-card-title>
+                    <v-spacer></v-spacer>
+                    <v-icon @click="deleteImage()">mdi-close</v-icon>
+                </v-row>
+                <div>
                     <div v-if="!imgFile"
                          class="gs-info-bg"
-                         style="position:relative;
-                        left:8%;"
+                         style="text-align: center;"
                     >
                         <div>이미지 업로드 방법 선택</div>
-                        <div class="gs-info-sub-bg">
-                            <div style="text-align: left; margin-left:10px;" class="gs-info-sub-title">
-                                1.클립보드 이미지 붙여넣기 ctrl + V<br>
+                        <div class="gs-info-sub-bg" style="margin: 0 auto;">
+                            <div class="gs-info-sub-title" style="text-align: left;">
+                                1. 클립보드 이미지 붙여넣기 ctrl + V<br>
                                 2. 내 PC 이미지 클릭 후 업로드
                             </div>
                         </div>
                     </div>
-                    <v-img class="img-file-style" :src="imgFile ? imgFile:null"
-                           style="width: 90%; max-height: 600px;"></v-img>
+                    <v-img class="img-file-style" :src="imgFile ? imgFile:null"></v-img>
                 </div>
-                <v-card-actions style="justify-content: right;">
-                    <v-btn style="margin-right: 10px;"
-                           text
-                           @click="deleteImage()"
-                    >취소
-                    </v-btn>
+                <v-row class="ma-0 pa-0 pt-4">
+                    <v-spacer></v-spacer>
                     <v-btn style="margin-right: 10px;" text @click="selectFile()">내 PC 이미지</v-btn>
                     <v-btn
-                            color="primary" text
-                            @click="submitResultByUser(imgFile)"
+                        color="primary" text
+                        @click="submitResultByUser(imgFile)"
                     >제출
                     </v-btn>
-                </v-card-actions>
+                </v-row>
             </v-card>
         </v-dialog>
         <div class="modal">
@@ -1327,8 +1323,6 @@
             setIcon() {
                 if (this.isCapturing) {
                     return 'mdi-spin mdi-loading'
-                } else {
-                    return 'mdi-camera'
                 }
             },
             setClass() {