diff --git a/system/form.php b/system/form.php
index 49d60b36..56439455 100644
--- a/system/form.php
+++ b/system/form.php
@@ -317,7 +317,7 @@ class Form {
 		$attributes['value'] = $value;
 		$attributes['id'] = static::id($name, $attributes);
 
-		return '<input'.HTML::attributes($attributes).' />'.PHP_EOL;
+		return '<input'.HTML::attributes($attributes).'>'.PHP_EOL;
 	}
 
 	/**
diff --git a/system/html.php b/system/html.php
index 89968130..c562de09 100644
--- a/system/html.php
+++ b/system/html.php
@@ -32,7 +32,7 @@ class HTML {
 	 */
 	public static function style($url, $media = 'all')
 	{
-		return '<link href="'.static::entities(URL::to_asset($url)).'" rel="stylesheet" type="text/css" media="'.$media.'" />'.PHP_EOL;
+		return '<link href="'.static::entities(URL::to_asset($url)).'" rel="stylesheet" type="text/css" media="'.$media.'">'.PHP_EOL;
 	}
 
 	/**
@@ -146,7 +146,7 @@ class HTML {
 	public static function image($url, $alt = '', $attributes = array())
 	{
 		$attributes['alt'] = static::entities($alt);
-		return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).' />';
+		return '<img src="'.static::entities(URL::to_asset($url)).'"'.static::attributes($attributes).'>';
 	}
 
 	/**
@@ -157,7 +157,7 @@ class HTML {
 	 */
 	public static function breaks($count = 1)
 	{
-		return str_repeat('<br />', $count);
+		return str_repeat('<br>', $count);
 	}
 
 	/**