diff --git a/templates/tibiacom/basic.css b/templates/tibiacom/basic.css
index 87175cca..b1bbe8f9 100644
--- a/templates/tibiacom/basic.css
+++ b/templates/tibiacom/basic.css
@@ -1486,6 +1486,25 @@ img {
   width: 135px;
   z-index: 20;
 }
+.BigButtonText {
+	position: absolute;
+	top: 0;
+	left: 0;
+	width: 135px;
+	height: 25px;
+	margin: 0;
+	padding: 0;
+	cursor: pointer;
+	background: 0 0;
+	border: none;
+	text-align: center;
+	color: #ffd18c;
+	font-family: Verdana,Arial,Times New Roman,sans-serif;
+	font-size: 12px;
+	font-weight: 400;
+	z-index: 20;
+	text-shadow: -1px -1px 0 #000,0 -1px 0 #000,1px -1px 0 #000,1px 0 0 #000,1px 1px 0 #000,0 1px 0 #000,-1px 1px 0 #000,-1px 0 0 #000
+}
 .TopButtonContainer {
   position: relative;
   right: 4px;
diff --git a/templates/tibiacom/buttons.base.html.twig b/templates/tibiacom/buttons.base.html.twig
index b94ec170..6833a61d 100644
--- a/templates/tibiacom/buttons.base.html.twig
+++ b/templates/tibiacom/buttons.base.html.twig
@@ -1,8 +1,8 @@
 {% spaceless %}
-<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
+<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/button_blue.gif)">
 	<div onMouseOver="MouseOverBigButton(this);" onMouseOut="MouseOutBigButton(this);">
-		<div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/sbutton_over.gif);" ></div>
-		<input class="ButtonText" type="image" name="{{ button_name }}" alt="{{ button_name }}" src="{{ template_path }}/images/global/buttons/{{ button_image }}.gif" />
+		<div class="BigButtonOver" style="background-image:url({{ template_path }}/images/global/buttons/{% if button_color is defined and button_color == 'green' %}button_green{% else %}button_blue_over{% endif %}.gif);" ></div>
+		<input class="BigButtonText" type="submit" value="{{ button_name }}">
 	</div>
 </div>
-{% endspaceless %}
\ No newline at end of file
+{% endspaceless %}
diff --git a/templates/tibiacom/images/global/buttons/button_blue.gif b/templates/tibiacom/images/global/buttons/button_blue.gif
new file mode 100644
index 00000000..3c393ab1
Binary files /dev/null and b/templates/tibiacom/images/global/buttons/button_blue.gif differ
diff --git a/templates/tibiacom/images/global/buttons/button_blue_over.gif b/templates/tibiacom/images/global/buttons/button_blue_over.gif
new file mode 100644
index 00000000..9637a4cb
Binary files /dev/null and b/templates/tibiacom/images/global/buttons/button_blue_over.gif differ