diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties
index c968d04610..0884404529 100644
--- a/core/assets/bundles/bundle.properties
+++ b/core/assets/bundles/bundle.properties
@@ -267,6 +267,8 @@ toolmode.eraseores = Erase Ores
 toolmode.eraseores.description = Erase only ores.
 toolmode.fillteams = Fill Teams
 toolmode.fillteams.description = Fill teams instead of blocks.
+toolmode.drawteams = Draw Teams
+toolmode.drawteams.description = Draw teams instead of blocks.
 
 filters.empty = [LIGHT_GRAY]No filters! Add one with the button below.
 filter.distort = Distort
diff --git a/core/src/io/anuke/mindustry/editor/EditorTool.java b/core/src/io/anuke/mindustry/editor/EditorTool.java
index 02d4f518a0..f0f6b810a6 100644
--- a/core/src/io/anuke/mindustry/editor/EditorTool.java
+++ b/core/src/io/anuke/mindustry/editor/EditorTool.java
@@ -44,7 +44,7 @@ public enum EditorTool{
             });
         }
     },
-    pencil("replace", "square"){
+    pencil("replace", "square", "drawteams"){
         {
             edit = true;
             draggable = true;
@@ -61,6 +61,9 @@ public enum EditorTool{
             }else if(mode == 1){
                 //square mode
                 editor.drawBlocks(x, y, true, tile -> true);
+            }else if(mode == 2){
+                //draw teams
+                editor.drawCircle(x, y, tile -> tile.link().setTeam(editor.drawTeam));
             }
 
         }