diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/armor.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/armor.htm
index c7d30259f2..46c32dfb74 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/armor.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/armor.htm
@@ -95,7 +95,6 @@ Masterwork Sets<br1>
 <button action="bypass -h admin_buy 10002" value="S Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/armor.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center></td>
 </tr>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 119b2dceb1..16b2b0371a 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -20,42 +20,41 @@ Jewels by Grade<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9960" value="No Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9960" value="No Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9964" value="A Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9965" value="S Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9961" value="D Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9961" value="D Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9965" value="S Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9966" value="S80 Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9962" value="C Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9962" value="C Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9966" value="S80 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9908" value="S84 Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9963" value="B Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9963" value="B Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9908" value="S84 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9964" value="A Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
@@ -64,10 +63,10 @@ Boss Jewels<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9917" value="Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9917" value="Normal" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 11083" value="Blessed Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 11083" value="Blessed"width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
@@ -76,12 +75,10 @@ Other Jewels<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9999" value="Masterwork Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9999" value="Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-</tr>
-<tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/armor.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/armor.htm
index c7d30259f2..46c32dfb74 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/armor.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/armor.htm
@@ -95,7 +95,6 @@ Masterwork Sets<br1>
 <button action="bypass -h admin_buy 10002" value="S Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/armor.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center></td>
 </tr>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 119b2dceb1..16b2b0371a 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -20,42 +20,41 @@ Jewels by Grade<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9960" value="No Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9960" value="No Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9964" value="A Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9965" value="S Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9961" value="D Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9961" value="D Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9965" value="S Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9966" value="S80 Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9962" value="C Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9962" value="C Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9966" value="S80 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9908" value="S84 Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9963" value="B Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9963" value="B Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9908" value="S84 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9964" value="A Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
@@ -64,10 +63,10 @@ Boss Jewels<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9917" value="Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9917" value="Normal" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 11083" value="Blessed Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 11083" value="Blessed"width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
@@ -76,12 +75,10 @@ Other Jewels<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9999" value="Masterwork Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9999" value="Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-</tr>
-<tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/armor.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/armor.htm
index c7d30259f2..46c32dfb74 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/armor.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/armor.htm
@@ -95,7 +95,6 @@ Masterwork Sets<br1>
 <button action="bypass -h admin_buy 10002" value="S Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/armor.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center></td>
 </tr>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm
index 119b2dceb1..16b2b0371a 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/html/admin/gmstore/gear/jewels.htm
@@ -20,42 +20,41 @@ Jewels by Grade<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9960" value="No Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9960" value="No Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9964" value="A Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9965" value="S Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9961" value="D Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9961" value="D Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9965" value="S Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9966" value="S80 Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9962" value="C Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9962" value="C Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9966" value="S80 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9908" value="S84 Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9963" value="B Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9963" value="B Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 9908" value="S84 Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 <tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/r.htm" value="R Grade Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9964" value="A Grade" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
@@ -64,10 +63,10 @@ Boss Jewels<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9917" value="Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9917" value="Normal" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 <td align=center>
-<button action="bypass -h admin_buy 11083" value="Blessed Boss Jewels" width=140 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 11083" value="Blessed"width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>
@@ -76,12 +75,10 @@ Other Jewels<br1>
 <table width=260>
 <tr>
 <td align=center>
-<button action="bypass -h admin_buy 9999" value="Masterwork Jewels" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_buy 9999" value="Masterwork" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
-</tr>
-<tr>
 <td align=center>
-<button action="bypass -h admin_html gmstore/gear/jewels.htm" value="Coming Soon" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
+<button action="bypass -h admin_html gmstore/gear/jewels/brooch.htm" value="Brooch" width=120 height=20 back="L2UI_ct1.button_df" fore="L2UI_ct1.button_df">
 </td>
 </tr>
 </table>