diff --git a/public/index.html b/public/index.html
index 655c60cfa..630fcd801 100644
--- a/public/index.html
+++ b/public/index.html
@@ -2398,9 +2398,11 @@
                             </div>
 
                             <div id="avatar_div" class="avatar_div alignitemsflexstart justifySpaceBetween flexnowrap flexGap5">
-                                <div id="avatar_div_div" class="avatar">
+                                <label id="avatar_div_div" for="add_avatar_button" class="avatar" title="Click to select a new avatar for this character">
                                     <img id="avatar_load_preview" src="img/ai4.png" alt="avatar">
-                                </div>
+                                    <input hidden type="file" id="add_avatar_button" name="avatar" accept="image/png, image/jpeg, image/jpg, image/gif, image/bmp">
+                                </label>
+
                                 <div class="flex-container flexFlowColumn">
                                     <label for="char-management-dropdown">
                                         <select id="char-management-dropdown">
@@ -2430,9 +2432,6 @@
                                     </label>
 
                                     <div class="form_create_bottom_buttons_block">
-                                        <label for="add_avatar_button" class="menu_button fa-solid fa-file-image " title="Click to select a new avatar for this character">
-                                            <input type="file" id="add_avatar_button" name="avatar" accept="image/png, image/jpeg, image/jpg, image/gif, image/bmp">
-                                        </label>
                                         <div id="rm_button_back" class="menu_button fa-solid fa-left-long "></div>
 
                                         <!-- <div id="renameCharButton" class="menu_button fa-solid fa-user-pen" title="Rename Character"></div> -->
diff --git a/public/script.js b/public/script.js
index 8b88827c0..ab63c3491 100644
--- a/public/script.js
+++ b/public/script.js
@@ -4834,7 +4834,7 @@ export function select_selected_character(chid) {
     $('.open_alternate_greetings').data('chid', chid);
     $('#set_character_world').data('chid', chid);
     const world = characters[chid]?.data?.extensions?.world;
-    const worldSet = world && world_names.includes(world);
+    const worldSet = Boolean(world && world_names.includes(world));
     $('#set_character_world').toggleClass('world_set', worldSet);
     checkEmbeddedWorld(chid);
 
diff --git a/public/style.css b/public/style.css
index 7680a6aa9..91b1755d8 100644
--- a/public/style.css
+++ b/public/style.css
@@ -687,7 +687,16 @@ hr {
     gap: 5px;
 }
 
+#avatar_div_div {
+    border: 2px solid var(--SmartThemeBodyColor);
+    margin: 2px;
+    cursor: pointer;
+    transition: all 0.2s ease-in-out;
+}
 
+#avatar_div_div:hover {
+    filter: drop-shadow(0px 0px 5px var(--SmartThemeQuoteColor));
+}
 
 .avatar {
     width: 50px;