diff --git a/editor/editor_log.cpp b/editor/editor_log.cpp
index e301d12214c..158eedfb0f7 100644
--- a/editor/editor_log.cpp
+++ b/editor/editor_log.cpp
@@ -88,6 +88,7 @@ void EditorLog::_notification(int p_what) {
 void EditorLog::_clear_request() {
 
 	log->clear();
+	tool_button->set_icon(Ref<Texture>());
 }
 
 void EditorLog::clear() {
@@ -103,9 +104,7 @@ void EditorLog::add_message(const String &p_msg, bool p_error) {
 		Ref<Texture> icon = get_icon("Error", "EditorIcons");
 		log->add_image(icon);
 		log->add_text(" ");
-		//button->set_icon(icon);
-	} else {
-		//button->set_icon(Ref<Texture>());
+		tool_button->set_icon(icon);
 	}
 
 	log->add_text(p_msg);
@@ -115,6 +114,10 @@ void EditorLog::add_message(const String &p_msg, bool p_error) {
 		log->pop();
 }
 
+void EditorLog::set_tool_button(ToolButton *p_tool_button) {
+	tool_button = p_tool_button;
+}
+
 /*
 void EditorLog::_dragged(const Point2& p_ofs) {
 
diff --git a/editor/editor_log.h b/editor/editor_log.h
index 42137f71cc9..f9bc82de7d7 100644
--- a/editor/editor_log.h
+++ b/editor/editor_log.h
@@ -51,6 +51,7 @@ class EditorLog : public VBoxContainer {
 	RichTextLabel *log;
 	HBoxContainer *title_hb;
 	//PaneDrag *pd;
+	ToolButton *tool_button;
 
 	static void _error_handler(void *p_self, const char *p_func, const char *p_file, int p_line, const char *p_error, const char *p_errorexp, ErrorHandlerType p_type);
 
@@ -68,6 +69,7 @@ protected:
 
 public:
 	void add_message(const String &p_msg, bool p_error = false);
+	void set_tool_button(ToolButton *p_tool_button);
 	void deinit();
 
 	void clear();
diff --git a/editor/editor_node.cpp b/editor/editor_node.cpp
index 81325754796..d9155caf40d 100644
--- a/editor/editor_node.cpp
+++ b/editor/editor_node.cpp
@@ -5557,7 +5557,8 @@ EditorNode::EditorNode() {
 	bottom_panel_vb->add_child(bottom_panel_hb);
 
 	log = memnew(EditorLog);
-	add_bottom_panel_item(TTR("Output"), log);
+	ToolButton *output_button = add_bottom_panel_item(TTR("Output"), log);
+	log->set_tool_button(output_button);
 
 	old_split_ofs = 0;