diff --git a/homeassistant/components/command_line/switch.py b/homeassistant/components/command_line/switch.py
index ae6c1c0c925..fae4cdbcc6b 100644
--- a/homeassistant/components/command_line/switch.py
+++ b/homeassistant/components/command_line/switch.py
@@ -13,6 +13,7 @@ from homeassistant.const import (
     CONF_COMMAND_ON,
     CONF_COMMAND_STATE,
     CONF_FRIENDLY_NAME,
+    CONF_ICON_TEMPLATE,
     CONF_SWITCHES,
     CONF_VALUE_TEMPLATE,
 )
@@ -31,6 +32,7 @@ SWITCH_SCHEMA = vol.Schema(
         vol.Optional(CONF_COMMAND_STATE): cv.string,
         vol.Optional(CONF_FRIENDLY_NAME): cv.string,
         vol.Optional(CONF_VALUE_TEMPLATE): cv.template,
+        vol.Optional(CONF_ICON_TEMPLATE): cv.template,
         vol.Optional(CONF_COMMAND_TIMEOUT, default=DEFAULT_TIMEOUT): cv.positive_int,
     }
 )
@@ -54,6 +56,10 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
         if value_template is not None:
             value_template.hass = hass
 
+        icon_template = device_config.get(CONF_ICON_TEMPLATE)
+        if icon_template is not None:
+            icon_template.hass = hass
+
         switches.append(
             CommandSwitch(
                 hass,
@@ -62,6 +68,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
                 device_config[CONF_COMMAND_ON],
                 device_config[CONF_COMMAND_OFF],
                 device_config.get(CONF_COMMAND_STATE),
+                icon_template,
                 value_template,
                 device_config[CONF_COMMAND_TIMEOUT],
             )
@@ -85,6 +92,7 @@ class CommandSwitch(SwitchEntity):
         command_on,
         command_off,
         command_state,
+        icon_template,
         value_template,
         timeout,
     ):
@@ -96,6 +104,7 @@ class CommandSwitch(SwitchEntity):
         self._command_on = command_on
         self._command_off = command_off
         self._command_state = command_state
+        self._icon_template = icon_template
         self._value_template = value_template
         self._timeout = timeout
 
@@ -152,6 +161,10 @@ class CommandSwitch(SwitchEntity):
         """Update device state."""
         if self._command_state:
             payload = str(self._query_state())
+            if self._icon_template:
+                self._attr_icon = self._icon_template.render_with_possible_json_value(
+                    payload
+                )
             if self._value_template:
                 payload = self._value_template.render_with_possible_json_value(payload)
             self._state = payload.lower() == "true"
diff --git a/tests/components/command_line/test_switch.py b/tests/components/command_line/test_switch.py
index 3eeded7278b..910d990d07d 100644
--- a/tests/components/command_line/test_switch.py
+++ b/tests/components/command_line/test_switch.py
@@ -90,6 +90,7 @@ async def test_state_value(hass: HomeAssistant) -> None:
                     "command_on": f"echo 1 > {path}",
                     "command_off": f"echo 0 > {path}",
                     "value_template": '{{ value=="1" }}',
+                    "icon_template": '{% if value=="1" %} mdi:on {% else %} mdi:off {% endif %}',
                 }
             },
         )
@@ -108,6 +109,7 @@ async def test_state_value(hass: HomeAssistant) -> None:
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_ON
+        assert entity_state.attributes.get("icon") == "mdi:on"
 
         await hass.services.async_call(
             DOMAIN,
@@ -119,6 +121,7 @@ async def test_state_value(hass: HomeAssistant) -> None:
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_OFF
+        assert entity_state.attributes.get("icon") == "mdi:off"
 
 
 async def test_state_json_value(hass: HomeAssistant) -> None:
@@ -136,6 +139,7 @@ async def test_state_json_value(hass: HomeAssistant) -> None:
                     "command_on": f"echo '{oncmd}' > {path}",
                     "command_off": f"echo '{offcmd}' > {path}",
                     "value_template": '{{ value_json.status=="ok" }}',
+                    "icon_template": '{% if value_json.status=="ok" %} mdi:on {% else %} mdi:off {% endif %}',
                 }
             },
         )
@@ -154,6 +158,7 @@ async def test_state_json_value(hass: HomeAssistant) -> None:
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_ON
+        assert entity_state.attributes.get("icon") == "mdi:on"
 
         await hass.services.async_call(
             DOMAIN,
@@ -165,6 +170,7 @@ async def test_state_json_value(hass: HomeAssistant) -> None:
         entity_state = hass.states.get("switch.test")
         assert entity_state
         assert entity_state.state == STATE_OFF
+        assert entity_state.attributes.get("icon") == "mdi:off"
 
 
 async def test_state_code(hass: HomeAssistant) -> None: