diff --git a/src/contentScripts/views/Home/components/Following.vue b/src/contentScripts/views/Home/components/Following.vue
index e29d71d5..d8296c35 100644
--- a/src/contentScripts/views/Home/components/Following.vue
+++ b/src/contentScripts/views/Home/components/Following.vue
@@ -176,7 +176,7 @@ defineExpose({ initData })
     </div>
 
     <!-- no more content -->
-    <Empty v-if="noMoreContent" class="pb-4" :description="$t('common.no_more_content')" />
+    <Empty v-if="noMoreContent && !needToLoginFirst" class="pb-4" :description="$t('common.no_more_content')" />
 
     <Transition name="fade">
       <Loading v-if="isLoading" />
diff --git a/src/contentScripts/views/Home/components/Trending.vue b/src/contentScripts/views/Home/components/Trending.vue
index 760f8a1c..95a193e6 100644
--- a/src/contentScripts/views/Home/components/Trending.vue
+++ b/src/contentScripts/views/Home/components/Trending.vue
@@ -24,6 +24,7 @@ const videoList = reactive<VideoItem[]>([])
 const isLoading = ref<boolean>(false)
 const containerRef = ref<HTMLElement>() as Ref<HTMLElement>
 const pn = ref<number>(1)
+const noMoreContent = ref<boolean>(false)
 const { handleReachBottom, handlePageRefresh } = useBewlyApp()
 
 onMounted(async () => {
@@ -36,6 +37,7 @@ onActivated(() => {
 })
 
 async function initData() {
+  noMoreContent.value = false
   videoList.length = 0
   pn.value = 1
   await getData()
@@ -57,6 +59,9 @@ function initPageAction() {
 }
 
 async function getTrendingVideos() {
+  if (noMoreContent.value)
+    return
+
   emit('beforeLoading')
   isLoading.value = true
   try {
@@ -66,7 +71,9 @@ async function getTrendingVideos() {
       ps: 30,
     })
 
-    if (response.code === 0 && !response.data.no_more) {
+    if (response.code === 0) {
+      noMoreContent.value = response.data.no_more
+
       const resData = [] as VideoItem[]
 
       response.data.list.forEach((item: VideoItem) => {
diff --git a/src/styles/main.scss b/src/styles/main.scss
index 2e4b6d78..f14079e9 100644
--- a/src/styles/main.scss
+++ b/src/styles/main.scss
@@ -102,3 +102,20 @@ html.dark.bewly-design {
 .dark::view-transition-new(root) {
   z-index: 1;
 }
+
+// Adapt the colors of the two Bilibili Evolved's buttons on the left side to BewlyBewly theme
+.bewly-design {
+  .be-settings > .sidebar > * {
+    background-color: var(--bew-elevated-solid-1) !important;
+    opacity: 0.4;
+
+    &:hover {
+      opacity: 1;
+    }
+  }
+
+  .be-settings > .sidebar > * .be-icon {
+    color: var(--bew-text-1) !important;
+    fill: var(--bew-text-1) !important;
+  }
+}