diff --git a/assets/javascripts/app.js b/assets/javascripts/app.js
index c4ba891..39a52ce 100644
--- a/assets/javascripts/app.js
+++ b/assets/javascripts/app.js
@@ -842,7 +842,7 @@ $(function(){
                     var isLinkImage = $parentA.length > 0 && $parentA.text().replace(/\u00a0/g, '').trim() === "";
 
                     // --- 1. 處理「裝飾性圖片」標註 ---
-                    if (currentAlt === "announcement image" || currentAlt === "裝飾圖片" || currentTitle === "裝飾圖片") {
+                    if (currentAlt === "announcement image" || currentAlt === "裝飾圖片" || currentTitle === "裝飾圖片" || currentAlt === "這是一張圖片" || currentTitle === "這是一張圖片") {
                         $img.attr('alt', '');
                         $img.removeAttr('title');
                         return; 
@@ -2924,12 +2924,12 @@ $(function() {
   }, 1000);
 });
 function removeHiddenContentLinks() {
+  // 若網址含有 editmode=on 則不執行
+  if (window.location.href.indexOf('editmode=on') !== -1) return;
+
   $('a').each(function () {
     var $link = $(this);
 
-    // 取得連結內所有子元素
-    var $children = $link.children();
-
     // 若連結本身是 display:none，直接移除
     if ($link.css('display') === 'none') {
       $link.remove();
@@ -2937,6 +2937,7 @@ function removeHiddenContentLinks() {
     }
 
     // 若連結內有子元素，且全部都是 display:none
+    var $children = $link.children();
     if ($children.length > 0) {
       var allHidden = $children.toArray().every(function (child) {
         return $(child).css('display') === 'none';
@@ -2950,6 +2951,89 @@ function removeHiddenContentLinks() {
 
 $(document).ready(function () {
   setTimeout(removeHiddenContentLinks, 500);
+});
+//萬用表格無障礙
+function fixSortLinkA11y() {
+  $('a').filter(function () {
+    return $(this).find('.universal-th-icon').length > 0;
+  }).each(function () {
+    var $link = $(this);
+
+    // === Step 1: 移除 display:none 的 span ===
+    $link.find('span').each(function () {
+      if ($(this).css('display') === 'none' || $(this).attr('style') && $(this).attr('style').indexOf('display: none') !== -1) {
+        $(this).remove();
+      }
+    });
+
+    // === Step 2: 取得 aria-label ===
+    var ariaLabel = $link.attr('aria-label') || '';
+
+    // 若 aria-label 空白或含未替換模板變數，從旁邊 .universal-th-text 補
+    if (!ariaLabel || ariaLabel.indexOf('{{') !== -1) {
+      var $th = $link.closest('th, div[class*="col-"]');
+      var colName = $th.find('.universal-th-text').text().trim();
+      ariaLabel = colName ? '重新排序' + colName : '排序';
+      $link.attr('aria-label', ariaLabel);
+    }
+
+    // === Step 3: 補上 title 屬性 ===
+    if (!$link.attr('title')) {
+      $link.attr('title', ariaLabel + '(在本視窗開啟)');
+    }
+
+    // === Step 4: 確保圖示有 aria-hidden ===
+    $link.find('.universal-th-icon').attr('aria-hidden', 'true');
+
+    // === Step 5: 補上 visually-hidden 連結文字 ===
+    if ($link.find('.visually-hidden').length === 0) {
+      $link.append('<span class="visually-hidden">' + ariaLabel + '</span>');
+    }
+  });
+}
+function fixSearchInputA11y() {
+  $('input[type="search"], input[type="text"]').each(function () {
+    var $input = $(this);
+
+    // 已有對應 label 就跳過
+    var inputId = $input.attr('id');
+    if (inputId && $('label[for="' + inputId + '"]').length) return;
+
+    // 已有 aria-label / aria-labelledby / title 就跳過
+    if ($input.attr('aria-label') || $input.attr('aria-labelledby') || $input.attr('title')) return;
+
+    // 從 placeholder 取得說明文字
+    var placeholder = $input.attr('placeholder') || '';
+
+    // 從最近的 th 或欄位標題取得欄位名稱
+    var colName = '';
+    var $th = $input.closest('th, div[class*="col-"]');
+    if ($th.length) {
+      colName = $th.find('.universal-th-text').text().trim();
+    }
+
+    // 組合標籤文字
+    var label = '';
+    if (colName && placeholder) {
+      label = colName + '搜尋';
+    } else if (colName) {
+      label = colName + '搜尋';
+    } else if (placeholder) {
+      label = placeholder;
+    } else {
+      label = '搜尋關鍵字';
+    }
+
+    $input.attr('aria-label', label);
+    $input.attr('title', label);
+  });
+}
+
+$(document).ready(function () {
+  setTimeout(function () {
+    fixSortLinkA11y();
+    fixSearchInputA11y();
+  }, 500);
 });
   // 執行 member等高計算，目前改用flexbox故mark掉 by ika 20160105
   // $(window).load(function() {
diff --git a/assets/stylesheets/template/base/_global.scss b/assets/stylesheets/template/base/_global.scss
index 8f47b49..8bee0dc 100644
--- a/assets/stylesheets/template/base/_global.scss
+++ b/assets/stylesheets/template/base/_global.scss
@@ -11,6 +11,9 @@
     display: block
   }
 }
+#orbit-bar .orbit-bar-menu .orbit-bar-logo{
+  cursor: unset!important;
+}
 
 .login-btn:focus {
         outline: 0.3125em auto -webkit-focus-ring-color !important;
diff --git a/assets/stylesheets/template/modules/archives.scss b/assets/stylesheets/template/modules/archives.scss
index c78eb49..ba34087 100644
--- a/assets/stylesheets/template/modules/archives.scss
+++ b/assets/stylesheets/template/modules/archives.scss
@@ -144,18 +144,18 @@
 .i-archive-title {
   @extend .unity-title;
 }
-.link { background-color: #1368d4 !important; } /* 對比 4.6:1 */
-.txt  { background-color: #3a8a40 !important; } /* 對比 4.6:1 */
-.xlsx { background-color: #9e3050 !important; } /* 對比 4.6:1 */
-.pdf  { background-color: #2a7d36 !important; } /* 對比 4.6:1 */
-.docx { background-color: #5e46a0 !important; } /* 對比 4.6:1 */
-.doc  { background-color: #1368d4 !important; } /* 對比 4.6:1 */
-.pptx { background-color: #3d4aa0 !important; } /* 對比 4.6:1 */
-.jpg  { background-color: #8f3333 !important; } /* 對比 4.6:1 */
-.zip  { background-color: #8a6400 !important; } /* 對比 4.6:1 */
-.rar  { background-color: #9e5000 !important; } /* 對比 4.6:1 */
-.xls  { background-color: #3a8a40 !important; } /* 對比 4.6:1 */
-.odt  { background-color: #767676 !important; } /* 對比 4.6:1 */
+.link { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.txt  { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.xlsx { background-color: #9e3050 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.pdf  { background-color: #2a7d36 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.docx { background-color: #5e46a0 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.doc  { background-color: #1368d4 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.pptx { background-color: #3d4aa0 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.jpg  { background-color: #8f3333 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.zip  { background-color: #8a6400 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.rar  { background-color: #9e5000 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.xls  { background-color: #3a8a40 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
+.odt  { background-color: #767676 !important; margin-left: 0.5em; } /* 對比 4.6:1 */
 .table>caption+thead>tr:first-child>td, .table>caption+thead>tr:first-child>th, .table>colgroup+thead>tr:first-child>td, .table>colgroup+thead>tr:first-child>th, .table>thead:first-child>tr:first-child>td, .table>thead:first-child>tr:first-child>th{
     // border-top: 0.0625em solid #ddd;
 }
diff --git a/modules/custom_gallery/custom_gallery_index1.html.erb b/modules/custom_gallery/custom_gallery_index1.html.erb
index 4531ca1..36a731f 100644
--- a/modules/custom_gallery/custom_gallery_index1.html.erb
+++ b/modules/custom_gallery/custom_gallery_index1.html.erb
@@ -6,7 +6,7 @@
     <div class="index-content col-xs-4 col-sm-3">
       <div class="index-content-inner">
         <div class="index-pic">
-          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
         <section class="index-part">
           <h4 class="index-content-title">
diff --git a/modules/custom_gallery/custom_gallery_index3.html.erb b/modules/custom_gallery/custom_gallery_index3.html.erb
index fb8f821..6388e93 100644
--- a/modules/custom_gallery/custom_gallery_index3.html.erb
+++ b/modules/custom_gallery/custom_gallery_index3.html.erb
@@ -6,7 +6,7 @@
     <div class="index-content col-xs-4 col-sm-3">
       <div class="index-content-inner">
         <div class="index-pic">
-          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
         <section class="index-part">
           <h4 class="index-content-title">
diff --git a/modules/gallery/gallery_index1.html.erb b/modules/gallery/gallery_index1.html.erb
index e7c011e..db489b2 100644
--- a/modules/gallery/gallery_index1.html.erb
+++ b/modules/gallery/gallery_index1.html.erb
@@ -4,15 +4,16 @@
   </h3>
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content col-sm-3">
-      <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+      
       <div class="index-content-inner">
+      <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
         <div class="index-pic">
-          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+          <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
         </div>
-        </a>
+      </a>
         <div class="index-part">
           <h4 class="index-content-title">
-            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+            <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">{{album-name}}</a>
           </h4>
           <div class="index-img-description">{{album-description}}</div>
         </div>
diff --git a/modules/gallery/gallery_index2.html.erb b/modules/gallery/gallery_index2.html.erb
index 75f9c36..83bb367 100644
--- a/modules/gallery/gallery_index2.html.erb
+++ b/modules/gallery/gallery_index2.html.erb
@@ -5,14 +5,14 @@
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content">
       <div class="index-content-inner clearfix row">
-       <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+       <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
         <div class="index-pic col-xs-5 col-sm-2">
           <img class="index-img" src="{{thumb-src}}" alt="{{alt_title}}">
         </div>
         </a>
         <div class="index-part col-xs-7 col-sm-10">
           <h4 class="index-content-title">
-           <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+           <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{album-name}}">{{album-name}}</a>
           </h4>
           <div class="index-img-description">{{album-description}}</div>
         </div>
diff --git a/modules/gallery/gallery_index3.html.erb b/modules/gallery/gallery_index3.html.erb
index 9571f1a..6900ed8 100644
--- a/modules/gallery/gallery_index3.html.erb
+++ b/modules/gallery/gallery_index3.html.erb
@@ -4,15 +4,15 @@
   </h3>
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content col-sm-3">
-      <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+      <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
         <div class="index-content-inner">
           <div class="index-pic">
-            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
           </div>
       </a>
         <div class="index-part">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{album-name}}">{{album-name}}</a>
             </h4>
         </div>
     </div>
diff --git a/modules/gallery/gallery_index4.html.erb b/modules/gallery/gallery_index4.html.erb
index 0067a40..3d90d62 100644
--- a/modules/gallery/gallery_index4.html.erb
+++ b/modules/gallery/gallery_index4.html.erb
@@ -5,14 +5,14 @@
   <div class="row" data-level="0" data-list="albums" style="display: flex;flex-wrap: wrap;">
     <div class="index-content">
       <div class="index-content-inner clearfix row">
-        <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+        <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
           <div class="index-pic col-xs-5 col-sm-2">
             <img class="index-img" src="{{thumb-src}}" alt="{{alt_title}}">
           </div>
         </a>
         <div class="index-part col-xs-7 col-sm-10">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{album-name}}">{{album-name}}</a>
             </h4>
         </div>
 
diff --git a/modules/gallery/gallery_index5.html.erb b/modules/gallery/gallery_index5.html.erb
index 7ac894a..fa2c16d 100644
--- a/modules/gallery/gallery_index5.html.erb
+++ b/modules/gallery/gallery_index5.html.erb
@@ -8,11 +8,11 @@
 
         <div class="card-front">
           <div class="card-body" style="padding:0;">
-          <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+          <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
             <img src="{{thumb-src}}"alt="{{alt_title}}">
             </a>
             <div class="card-footer">
-            <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+            <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
               <h3 class="card-title">{{album-name}}</h3>
             </a>
             </div>
diff --git a/modules/gallery/gallery_index6.html.erb b/modules/gallery/gallery_index6.html.erb
index 9d21410..10146a3 100644
--- a/modules/gallery/gallery_index6.html.erb
+++ b/modules/gallery/gallery_index6.html.erb
@@ -6,14 +6,14 @@
     <div class="index-content  col-sm-3">
 
         <div class="index-content-inner">
-          <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">
+          <a href="{{link_to_show}}" aria-label="前往{{album-name}}" title="{{album-name}}">
           <div class="index-pic">
-            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{alt_title}}">
+            <img class="img-thumbnail" src="{{thumb-src}}" alt="{{album-name}}">
           </div>
           </a>
           <section class="index-part">
             <h4 class="index-content-title">
-              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{page-title}}">{{album-name}}</a>
+              <a href="{{link_to_show}}" aria-label="前往{{page-title}}" title="{{album-name}}">{{album-name}}</a>
             </h4>
           </section>
         </div>