diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..88007e7
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+
+images/.DS_Store
diff --git a/code/BlogEntry.php b/code/BlogEntry.php
index 292b6e9..79a3cf2 100644
--- a/code/BlogEntry.php
+++ b/code/BlogEntry.php
@@ -15,7 +15,7 @@ class BlogEntry extends Page {
 	
 	static $can_be_root = false;
 	
-	static $icon = "blog/images/blogpage";
+	static $icon = "blog/images/blogpage-file.png";
 		
 	static $has_one = array();
 	
diff --git a/code/BlogHolder.php b/code/BlogHolder.php
index 7ad3e27..1b4f7f5 100644
--- a/code/BlogHolder.php
+++ b/code/BlogHolder.php
@@ -12,7 +12,7 @@
  * BlogHolders have a form on them for easy posting, and an owner that can post to them, BlogTrees don't
  */
 class BlogHolder extends BlogTree implements PermissionProvider {
-	static $icon = "blog/images/blogholder";
+	static $icon = "blog/images/blogholder-file.png";
 
 	static $db = array(
 		'TrackBacksEnabled' => 'Boolean',
@@ -34,9 +34,9 @@ class BlogHolder extends BlogTree implements PermissionProvider {
 		$fields = parent::getCMSFields();
 		SiteTree::enableCMSFieldsExtensions();
 
-		$fields->addFieldToTab('Root.Main', new CheckboxField('TrackBacksEnabled', 'Enable TrackBacks'));
-		$fields->addFieldToTab('Root.Main', new DropdownField('OwnerID', 'Blog owner', array_merge(array('' => "(None)"), $blogOwners->map('ID', 'Name')->toArray())));
-		$fields->addFieldToTab('Root.Main', new CheckboxField('AllowCustomAuthors', 'Allow non-admins to have a custom author field'));
+		$fields->addFieldToTab('Root.Main', new CheckboxField('TrackBacksEnabled', 'Enable TrackBacks'), "Content");
+		$fields->addFieldToTab('Root.Main', new DropdownField('OwnerID', 'Blog owner', array_merge(array('' => "(None)"), $blogOwners->map('ID', 'Name')->toArray())), "Content");
+		$fields->addFieldToTab('Root.Main', new CheckboxField('AllowCustomAuthors', 'Allow non-admins to have a custom author field'), "Content");
 
 		$this->extend('updateCMSFields', $fields);
 
diff --git a/code/BlogTree.php b/code/BlogTree.php
index 32758f4..2d37663 100644
--- a/code/BlogTree.php
+++ b/code/BlogTree.php
@@ -5,10 +5,13 @@
  */
 
 /**
- * Blog tree allows a tree of Blog Holders. Viewing branch nodes shows all blog entries from all blog holder children
+ * Blog tree is a way to group Blogs. It allows a tree of "Blog Holders". 
+ * Viewing branch nodes shows all blog entries from all blog holder children
  */
 
 class BlogTree extends Page {
+
+	static $icon = "blog/images/blogtree-file.png";
 	
 	// Default number of blog entries to show
 	static $default_entries_limit = 10;
@@ -31,6 +34,8 @@ class BlogTree extends Page {
 		'BlogTree', 'BlogHolder'
 	);
 
+	
+
 	/*
 	 * Finds the BlogTree object most related to the current page.
 	 * - If this page is a BlogTree, use that
@@ -96,7 +101,7 @@ class BlogTree extends Page {
 	function getCMSFields() {
 		$fields = parent::getCMSFields();
 
-		$fields->addFieldToTab("Root.Main", new TextField("Name", "Name of blog"));
+		$fields->addFieldToTab("Root.Main", new TextField("Name", "Name of blog"), "Content");
 		$fields->addFieldToTab('Root.Main', new DropdownField('LandingPageFreshness', 'When you first open the blog, how many entries should I show', array( 
  			"" => "All entries", 
 			"1" => "Last month's entries", 
@@ -112,7 +117,7 @@ class BlogTree extends Page {
 			"11" => "Last 11 months' entries", 
 			"12" => "Last year's entries", 
 			"INHERIT" => "Take value from parent Blog Tree"
-		))); 
+		)), "Content"); 
  		if(class_exists('WidgetArea')) {
  			$fields->addFieldToTab("Root.Widgets", new CheckboxField("InheritSideBar", 'Inherit Sidebar From Parent'));
 			$fields->addFieldToTab("Root.Widgets", new WidgetAreaEditor("SideBar"));
diff --git a/images/blogholder-file.gif b/images/blogholder-file.gif
deleted file mode 100644
index 4b5b00f..0000000
Binary files a/images/blogholder-file.gif and /dev/null differ
diff --git a/images/blogholder-file.png b/images/blogholder-file.png
new file mode 100644
index 0000000..47da477
Binary files /dev/null and b/images/blogholder-file.png differ
diff --git a/images/blogpage-file.gif b/images/blogpage-file.gif
deleted file mode 100644
index 73cc55b..0000000
Binary files a/images/blogpage-file.gif and /dev/null differ
diff --git a/images/blogpage-file.png b/images/blogpage-file.png
new file mode 100644
index 0000000..f9b2610
Binary files /dev/null and b/images/blogpage-file.png differ
diff --git a/images/blogtree-file.png b/images/blogtree-file.png
new file mode 100644
index 0000000..f73e008
Binary files /dev/null and b/images/blogtree-file.png differ