diff --git a/diylc/diylc-library/lib/diylc-core.jar b/diylc/diylc-library/lib/diylc-core.jar
index 9af4143a..248200c6 100644
Binary files a/diylc/diylc-library/lib/diylc-core.jar and b/diylc/diylc-library/lib/diylc-core.jar differ
diff --git a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
index 803b742e..cd2cdbd7 100644
--- a/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
+++ b/diylc/diylc-library/src/org/diylc/components/electromechanical/MiniToggleSwitch.java
@@ -51,6 +51,9 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
   private OrientationHV orientation = OrientationHV.VERTICAL;
   private Size spacing = SPACING;
 
+  private Color bodyColor = BODY_COLOR;
+  private Color borderColor = BORDER_COLOR;
+
   public MiniToggleSwitch() {
     super();
     updateControlPoints();
@@ -189,15 +192,15 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
     // Reset body shape.
     body = null;
   }
-  
+
   @EditableProperty
   public Size getSpacing() {
     if (spacing == null) {
-      spacing = SPACING;      
+      spacing = SPACING;
     }
     return spacing;
   }
-  
+
   public void setSpacing(Size spacing) {
     this.spacing = spacing;
     updateControlPoints();
@@ -217,7 +220,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
       if (alpha < MAX_ALPHA) {
         g2d.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, 1f * alpha / MAX_ALPHA));
       }
-      g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : BODY_COLOR);
+      g2d.setColor(outlineMode ? Constants.TRANSPARENT_COLOR : getBodyColor());
       g2d.fill(body);
       g2d.setComposite(oldComposite);
       g2d.setStroke(ObjectCache.getInstance().fetchBasicStroke(1));
@@ -229,7 +232,7 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
       } else {
         finalBorderColor =
             componentState == ComponentState.SELECTED || componentState == ComponentState.DRAGGING ? SELECTION_COLOR
-                : BORDER_COLOR;
+                : getBorderColor();
       }
       g2d.setColor(finalBorderColor);
       g2d.draw(body);
@@ -315,4 +318,26 @@ public class MiniToggleSwitch extends AbstractTransparentComponent<ToggleSwitchT
           - 1);
     }
   }
+
+  @EditableProperty(name = "Body")
+  public Color getBodyColor() {
+    if (bodyColor == null)
+      bodyColor = BODY_COLOR;
+    return bodyColor;
+  }
+
+  public void setBodyColor(Color bodyColor) {
+    this.bodyColor = bodyColor;
+  }
+
+  @EditableProperty(name = "Border")
+  public Color getBorderColor() {
+    if (borderColor == null)
+      borderColor = BORDER_COLOR;
+    return borderColor;
+  }
+
+  public void setBorderColor(Color borderColor) {
+    this.borderColor = borderColor;
+  }
 }
diff --git a/diylc/diylc-swing/lib/diylc-core.jar b/diylc/diylc-swing/lib/diylc-core.jar
index 9af4143a..248200c6 100644
Binary files a/diylc/diylc-swing/lib/diylc-core.jar and b/diylc/diylc-swing/lib/diylc-core.jar differ
diff --git a/diylc/diylc-swing/library/main.jar b/diylc/diylc-swing/library/main.jar
index d7a7b110..22c3bf5b 100644
Binary files a/diylc/diylc-swing/library/main.jar and b/diylc/diylc-swing/library/main.jar differ
diff --git a/diylc/diylc-swing/update.xml b/diylc/diylc-swing/update.xml
index 8a7472bb..3648b046 100644
--- a/diylc/diylc-swing/update.xml
+++ b/diylc/diylc-swing/update.xml
@@ -1781,6 +1781,10 @@
 				<org.diylc.appframework.update.Change>
 					<changeType>IMPROVEMENT</changeType>
 					<description>DIL IC label rotates to fit the longer side of the component. Name and value are displayed in separate lines</description>
+				</org.diylc.appframework.update.Change>	
+				<org.diylc.appframework.update.Change>
+					<changeType>IMPROVEMENT</changeType>
+					<description>Editable toggle switch color</description>
 				</org.diylc.appframework.update.Change>				
 			</changes>
 			<url>https://github.com/bancika/diy-layout-creator/releases</url>