diff --git a/inc/instance-config.php b/inc/instance-config.php
index 169aa028..337a714d 100644
--- a/inc/instance-config.php
+++ b/inc/instance-config.php
@@ -352,7 +352,7 @@ $config['enable_embedding'] = true;
 
 $config['youtube_js_html'] = '<div class="video-container" data-video="$2">'.
 '<a href="https://youtu.be/$2" target="_blank" class="file">'.
-'<img style="width:255px;height:190px;" src="//img.youtube.com/vi/$2/0.jpg" class="post-image"/>'.
+'https://youtu.be/$2'.
 '</a></div>';
 
 $config['embedding'] = array();
diff --git a/js/youtube.js b/js/youtube.js
index 9fe81b60..62541bf7 100644
--- a/js/youtube.js
+++ b/js/youtube.js
@@ -24,22 +24,35 @@
 
 
 onready(function(){
-	var do_embed_yt = function(tag) {
-		$('div.video-container a', tag).click(function() {
-			var videoID = $(this.parentNode).data('video');
-		
-			$(this.parentNode).html('<iframe style="float:left;margin: 10px 20px" type="text/html" '+
-				'width="360" height="270" src="//www.youtube.com/embed/' + videoID +
-				'?autoplay=1&html5=1" allowfullscreen frameborder="0"/>');
+	const ON = "[Remove]";
+	const OFF = "[Embed]";
 
-			return false;
+	function addEmbedButton(index, videoNode) {
+		videoNode = $(videoNode);
+		var videoId = videoNode.data('video');
+		var span = $("<span>[Embed]</span>");
+		var embedNode = $('<iframe style="float:left;margin: 10px 20px" type="text/html" '+
+				'width="360" height="270" src="//www.youtube.com/embed/' + videoId +
+				'?autoplay=1&html5=1" allowfullscreen frameborder="0"/>');
+		span.click(function() {
+			if (span.text() == ON){
+				embedNode.remove();
+				span.text(OFF);
+			} else{
+				videoNode.append(embedNode);
+				span.text(ON);
+			}
 		});
-	};
-	do_embed_yt(document);
 
-        // allow to work with auto-reload.js, etc.
-        $(document).on('new_post', function(e, post) {
-                do_embed_yt(post);
-        });
+		videoNode.append(span);
+	}
+
+	$('div.video-container', document).each(addEmbedButton);
+	
+
+	// allow to work with auto-reload.js, etc.
+	$(document).on('new_post', function(e, post) {
+			$('div.video-container', post).each(addEmbedButton);
+	});
 });