diff --git a/system/templates/guilds.change_logo.html.twig b/system/templates/guilds.change_logo.html.twig
index 6336480f..9205b7a0 100644
--- a/system/templates/guilds.change_logo.html.twig
+++ b/system/templates/guilds.change_logo.html.twig
@@ -8,15 +8,11 @@ Here you can change logo of your guild.<br/>Actuall logo: <img src="images/guild
 </form>
 Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_size_kb }} KB</b><br>
 <br/>
-{% spaceless %}
 <div style="text-align:center">
 	<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
-		<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
-			{{ include('buttons.back.html.twig') }}
-		</div>
+		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
-{% endspaceless %}
 <script type="text/javascript">
 	$(function() {
 		$('#upload_form').submit(function (event) {
@@ -34,4 +30,4 @@ Only <b>jpg, gif, png, bmp</b> pictures. Max. size: <b>{{ config.guild_image_siz
 			return true;
 		});
 	});
-</script>
\ No newline at end of file
+</script>
diff --git a/system/templates/guilds.change_motd.html.twig b/system/templates/guilds.change_motd.html.twig
index cbc267a9..89d7829f 100644
--- a/system/templates/guilds.change_motd.html.twig
+++ b/system/templates/guilds.change_motd.html.twig
@@ -5,12 +5,8 @@ Here you can change MOTD (Message of the Day, showed in game!) of your guild.<br
 	<textarea name="motd" cols="60" rows="3">{{ guild.getCustomField('motd')|raw }}</textarea><br/>
 	(max. {{ config.guild_motd_chars_limit }} chars) <input type="submit" value="Save MOTD" /></form><br/>
 <br/>
-{% spaceless %}
 <div style="text-align:center">
 	<form action="?subtopic=guilds&guild={{ guild.getName() }}&action=manager" method="post">
-		<div class="BigButton" style="background-image:url({{ template_path }}/images/global/buttons/sbutton.gif)">
-			{{ include('buttons.back.html.twig') }}
-		</div>
+		{{ include('buttons.back.html.twig') }}
 	</form>
 </div>
-{% endspaceless %}
\ No newline at end of file