diff --git a/html/src/app.js b/html/src/app.js
index 65522e23..de68523c 100644
--- a/html/src/app.js
+++ b/html/src/app.js
@@ -1644,6 +1644,7 @@ speechSynthesis.getVoices();
             }
         } else {
             ref = {
+                acceptedPrivacyVersion: 0,
                 acceptedTOSVersion: 0,
                 accountDeletionDate: null,
                 accountDeletionLog: null,
@@ -17013,6 +17014,7 @@ speechSynthesis.getVoices();
             return;
         }
         D.ref = ref;
+        D.avatarScaling = ref.tags?.includes('feature_avatar_scaling');
         $app.applyWorldDialogInstances();
         for (var room of D.rooms) {
             if ($app.isRealInstance(room.tag)) {
@@ -18822,10 +18824,7 @@ speechSynthesis.getVoices();
             return;
         }
         var shortName = args.json.shortName;
-        var secureOrShortName = shortName;
-        if (!shortName) {
-            secureOrShortName = args.json.secureName;
-        }
+        var secureOrShortName = args.json.shortName || args.json.secureName;
         var location = `${args.instance.worldId}:${args.instance.instanceId}`;
         if (location === $app.launchDialog.tag) {
             var L = this.parseLocation(location);
@@ -18910,13 +18909,17 @@ speechSynthesis.getVoices();
         desktopMode
     ) {
         var D = this.launchDialog;
+        var L = API.parseLocation(location);
         var args = [];
-        if (shortName) {
+        if (
+            shortName &&
+            L.instanceType !== 'public' &&
+            L.groupAccessType !== 'public'
+        ) {
             args.push(`vrchat://launch?id=${location}&shortName=${shortName}`);
         } else {
             // fetch shortName
             var newShortName = '';
-            var L = API.parseLocation(location);
             var response = await API.getInstanceShortName({
                 worldId: L.worldId,
                 instanceId: L.instanceId
@@ -22370,6 +22373,7 @@ speechSynthesis.getVoices();
         this.galleryDialogVisible = true;
         this.refreshGalleryTable();
         this.refreshVRCPlusIconsTable();
+        this.refreshEmojiTable();
     };
 
     $app.methods.refreshGalleryTable = function () {
diff --git a/html/src/index.pug b/html/src/index.pug
index 8a2aa2df..a8925709 100644
--- a/html/src/index.pug
+++ b/html/src/index.pug
@@ -324,7 +324,7 @@ html
                                                 el-button(@click="refreshInstancePlayerCount(userDialog.$location.tag)" size="mini" icon="el-icon-refresh" style="margin-left:5px" circle)
                                             instance-info(:location="userDialog.$location.tag" :instance="userDialog.instance.ref" :friendcount="userDialog.instance.friendCount" :updateelement="updateInstanceInfo")
                                             br
-                                        location(:location="userDialog.ref.location" :traveling="userDialog.ref.travelingToLocation")
+                                        location(:location="userDialog.ref.location" :traveling="userDialog.ref.travelingToLocation" style="margin-top:5px")
                                     .x-friend-list(style="flex:1;margin-top:10px;max-height:150px")
                                         .x-friend-item(v-if="userDialog.$location.userId" @click="showUserDialog(userDialog.$location.userId)" class="x-friend-item-border")
                                             template(v-if="userDialog.$location.user")
@@ -1452,7 +1452,7 @@ html
                     el-checkbox(v-model="launchDialog.desktop" style="float:left;margin-top:5px") {{ $t('dialog.launch.start_as_desktop') }}
                     el-button(size="small" @click="showPreviousInstanceInfoDialog(launchDialog.location)") {{ $t('dialog.launch.info') }}
                     el-button(size="small" @click="showInviteDialog(launchDialog.location)" :disabled="!checkCanInvite(launchDialog.location)") {{ $t('dialog.launch.invite') }}
-                    el-button(type="primary" size="small" @click="launchGame(launchDialog.location, launchDialog.secureOrShortName, launchDialog.desktop)" :disabled="!launchDialog.secureOrShortName") {{ $t('dialog.launch.launch') }}
+                    el-button(type="primary" size="small" @click="launchGame(launchDialog.location, launchDialog.shortName, launchDialog.desktop)" :disabled="!launchDialog.secureOrShortName") {{ $t('dialog.launch.launch') }}
 
             //- dialog: export friends list
             el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" :visible.sync="exportFriendsListDialog" :title="$t('dialog.export_friends_list.header')" width="650px")
@@ -2074,6 +2074,8 @@ html
             //- dialog: Gallery/VRCPlusIcons
             el-dialog.x-dialog(:before-close="beforeDialogClose" @mousedown.native="dialogMouseDown" @mouseup.native="dialogMouseUp" ref="galleryDialog" :visible.sync="galleryDialogVisible" :title="$t('dialog.gallery_icons.header')" width="100%")
                 span(style="padding-bottom:10px") {{ $t('dialog.gallery_icons.description') }} (4:3)
+                br
+                br
                 el-tabs(type="card")
                     el-tab-pane(v-if="galleryDialogVisible" v-loading="galleryDialogGalleryLoading")
                         span(slot="label") {{ $t('dialog.gallery_icons.gallery') }}
@@ -2106,9 +2108,9 @@ html
                                 el-button(type="default" @click="downloadAndSaveImage(image.versions[image.versions.length - 1].file.url)" size="mini" icon="el-icon-download" circle)
                                 el-button(type="default" @click="deleteVRCPlusIcon(image.id)" size="mini" icon="el-icon-delete" circle style="margin-left:5px")
                     el-tab-pane(v-if="galleryDialogVisible" v-loading="galleryDialogIconsLoading")
-                        span(slot="label") {{ $t('dialog.gallery_icons.emoji') }}
-                            span(style="color:#909399;font-size:12px;margin-left:5px") {{ emojiTable.length }}/64
-                        input(type="file" accept="image/*" @change="onFileChangeEmoji" id="EmojiUploadButton" style="display:none")
+                        span(slot="label") {{ $t('dialog.gallery_icons.emojis') }}
+                            span(style="color:#909399;font-size:12px;margin-left:5px") {{ emojiTable.length }}/5
+                        //- input(type="file" accept="image/*" @change="onFileChangeEmoji" id="EmojiUploadButton" style="display:none")
                         el-button-group
                             el-button(type="default" size="small" @click="refreshEmojiTable" icon="el-icon-refresh") {{ $t('dialog.gallery_icons.refresh') }}
                             el-button(type="default" size="small" @click="displayEmojiUpload" icon="el-icon-upload2" :disabled="!API.currentUser.$isVRCPlus") {{ $t('dialog.gallery_icons.upload') }}
diff --git a/html/src/localization/strings/en.json b/html/src/localization/strings/en.json
index 7d10dd6c..c0d7b530 100644
--- a/html/src/localization/strings/en.json
+++ b/html/src/localization/strings/en.json
@@ -516,7 +516,7 @@
                 "request_invite": "Request Invite",
                 "request_invite_with_message": "Request Invite With Message",
                 "invite_to_group": "Invite To Group",
-                "manage_gallery_icon": "Manage Gallery/Icons/Emoji",
+                "manage_gallery_icon": "Manage Photos/Icons/Emojis",
                 "accept_friend_request": "Accept Friend Request",
                 "decline_friend_request": "Decline Friend Request",
                 "cancel_friend_request": "Cancel Friend Request",
@@ -789,7 +789,7 @@
                 }
             },
             "gallery": {
-                "header": "Gallery"
+                "header": "Photos"
             },
             "json": {
                 "header": "JSON"
@@ -1089,11 +1089,11 @@
             "send": "Send"
         },
         "gallery_icons": {
-            "header": "Gallery, Icons and Emoji",
+            "header": "Photos, Icons and Emojis",
             "description": "Recommended image size 1200x900px",
-            "gallery": "Gallery",
+            "gallery": "Photos",
             "icons": "Icons",
-            "emoji": "Emoji",
+            "emojis": "Emojis",
             "refresh": "Refresh",
             "upload": "Upload",
             "clear": "Clear"
@@ -1122,7 +1122,7 @@
         },
         "gallery_select": {
             "header": "Select Image",
-            "gallery": "Gallery",
+            "gallery": "Photos",
             "none": "None",
             "refresh": "Refresh",
             "upload": "Upload"
diff --git a/html/src/mixins/tabs/playerList.pug b/html/src/mixins/tabs/playerList.pug
index 96e03156..8a689795 100644
--- a/html/src/mixins/tabs/playerList.pug
+++ b/html/src/mixins/tabs/playerList.pug
@@ -26,7 +26,7 @@ mixin playerListTab()
                         br
                         location-world(:locationobject="currentInstanceLocation" :currentuserid="API.currentUser.id")
                         instance-info(:location="currentInstanceLocation.tag" :instance="currentInstanceWorld.instance" :friendcount="lastLocation.friendList.size" :updateelement="updateInstanceInfo")
-                        | ― #[timer(v-if="lastLocation.date" :epoch="lastLocation.date")]
+                        |  ― #[timer(v-if="lastLocation.date" :epoch="lastLocation.date")]
                     div(style="margin-top:5px")
                         span(v-show="currentInstanceWorld.ref.name !== currentInstanceWorld.ref.description" v-text="currentInstanceWorld.ref.description" style="font-size:12px;overflow:hidden;text-overflow:ellipsis;display:-webkit-box;-webkit-box-orient:vertical;-webkit-line-clamp:2")
                 div(style="display:flex;flex-direction:column;margin-left:20px")