diff --git a/TODO b/TODO
index 7d367686..e111cf1c 100644
--- a/TODO
+++ b/TODO
@@ -1,3 +1,13 @@
+0.2
+
++ feed editor
++ feed icons
++ background feed updates
++ update detection based on content checksum
+- cleanup posts older then specified number of days
+
+0.3
+
 - better error handling
 - keyboard navigation
 
diff --git a/backend.php b/backend.php
index 2f88e815..0105253d 100644
--- a/backend.php
+++ b/backend.php
@@ -254,7 +254,7 @@
 			$class = ($lnum % 2) ? "even" : "odd";
 
 			if ($line["last_read_ts"] < $line["updated_ts"] && $line["unread"] == "f") {
-				$update_pic = "<img src=\"updated.png\" alt=\"Updated\">";
+				$update_pic = "<img src=\"images/updated.png\" alt=\"Updated\">";
 			} else {
 				$update_pic = "&nbsp;";
 			}
diff --git a/functions.php b/functions.php
index 4dafe457..0d668eda 100644
--- a/functions.php
+++ b/functions.php
@@ -35,7 +35,7 @@
 		$icon_file = ICONS_DIR . "/$feed.ico";
 
 		if (!file_exists($icon_file)) {
-		
+				
 			error_reporting(0);
 			$r = fopen($icon_url, "r");
 			error_reporting (E_ERROR | E_WARNING | E_PARSE);
@@ -53,7 +53,11 @@
 				fclose($r);
 				fclose($t);
 
-				rename($tmpfname, $icon_file);
+				error_reporting(0);
+				if (!rename($tmpfname, $icon_file)) {
+					unlink($tmpfname);
+				}
+				error_reporting (E_ERROR | E_WARNING | E_PARSE);
 
 			}	
 		}
diff --git a/button.png b/images/button.png
similarity index 100%
rename from button.png
rename to images/button.png
diff --git a/header.png b/images/header.png
similarity index 100%
rename from header.png
rename to images/header.png
diff --git a/header_rev.png b/images/header_rev.png
similarity index 100%
rename from header_rev.png
rename to images/header_rev.png
diff --git a/updated.png b/images/updated.png
similarity index 100%
rename from updated.png
rename to images/updated.png
diff --git a/tt-rss.css b/tt-rss.css
index d5f88276..9e7d9eb9 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -116,7 +116,7 @@ table.main td.toolbar {
 table.main td.header {
 	font-size : 21pt;
 	background-color : #f0f0f0;
-	background-image : url("header.png");
+	background-image : url("images/header.png");
 	background-position : top left;
 	background-repeat : repeat-x;
 	height : 50px;
@@ -177,7 +177,7 @@ table.main td.notify {
 	text-align : center;
 	color : gray;
 	background-color : #f0f0f0;
-	background-image : url("header_rev.png");
+	background-image : url("images/header_rev.png");
 	background-position : top left;
 	background-repeat : repeat-x;
 
@@ -220,10 +220,14 @@ table.prefAddFeed input {
 }
 
 table.prefAddFeed {
-	background : #f0f0f0;
 	border : 1px solid #c0c0c0;
 	padding : 10px;
 	-moz-border-radius : 5px;
+	background-color : #f0f0f0;
+	background-image : url("images/form.png");
+	background-position : bottom left;
+	background-repeat : repeat-x;
+
 }
 
 table.prefFeedList tr.title td {
@@ -257,7 +261,7 @@ a.disabledButton:hover {
 
 a.button {
 	border : 1px solid #d0d0d0;
-	background-image : url("button.png");
+	background-image : url("images/button.png");
 	background-position : top;
 	background-repeat : repeat-x;
 	background-color : white;
@@ -274,7 +278,7 @@ a.button:hover {
 
 a.buttonWarn {
 	border : 1px solid #d0d0d0;
-	background-image : url("button.png");
+	background-image : url("images/button.png");
 	background-position : top;
 	background-repeat : repeat-x;
 	background-color : white;