diff --git a/htconfig.php b/htconfig.php
index c849b3416..36c685f7c 100644
--- a/htconfig.php
+++ b/htconfig.php
@@ -47,7 +47,7 @@ $a->config['php_path'] = 'php';
 // You shouldn't need to change anything else.
 // Location of global directory submission page. 
 
-$a->config['system']['directory_submit_url'] = 'http://dir.dfrn.org/submit';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/images/3ring150.jpg b/images/3ring150.jpg
new file mode 100644
index 000000000..a5bbc1bf2
Binary files /dev/null and b/images/3ring150.jpg differ
diff --git a/images/friendika.gif b/images/friendika.gif
new file mode 100644
index 000000000..d38646617
Binary files /dev/null and b/images/friendika.gif differ
diff --git a/images/friendika.ico b/images/friendika.ico
new file mode 100644
index 000000000..8428d28dc
Binary files /dev/null and b/images/friendika.ico differ
diff --git a/images/friendika16.gif b/images/friendika16.gif
new file mode 100644
index 000000000..f5321b1e5
Binary files /dev/null and b/images/friendika16.gif differ
diff --git a/images/friendika16.ico b/images/friendika16.ico
new file mode 100644
index 000000000..3deaf8f1a
Binary files /dev/null and b/images/friendika16.ico differ
diff --git a/images/friendika32.gif b/images/friendika32.gif
new file mode 100644
index 000000000..78e65ed71
Binary files /dev/null and b/images/friendika32.gif differ
diff --git a/images/friendika32.ico b/images/friendika32.ico
new file mode 100644
index 000000000..6698c583b
Binary files /dev/null and b/images/friendika32.ico differ
diff --git a/include/nav.php b/include/nav.php
index e4bad3382..78db9e399 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -56,6 +56,6 @@ else {
 	$banner = get_config('system','banner');
 
 	if($banner === false)
-		$banner = 'friendika';
+		$banner = 'Friendika';
 
 	$a->page['nav'] .= '<span id="banner">' . $banner . '</span>';
diff --git a/view/head.tpl b/view/head.tpl
index fc2177b8d..7a962cc26 100644
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -1,6 +1,7 @@
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <base href="$baseurl" />
 <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
+<link rel="shortcut icon" href="$baseurl/images/friendika32.ico">
 
 <!--[if IE]>
 <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/htconfig.tpl b/view/htconfig.tpl
index 6b65844a8..dcc21f566 100644
--- a/view/htconfig.tpl
+++ b/view/htconfig.tpl
@@ -45,7 +45,7 @@ $a->config['php_path'] = '$phpath';
 
 // Location of global directory submission page.
 
-$a->config['system']['directory_submit_url'] = 'http://dir.dfrn.org/submit';
+$a->config['system']['directory_submit_url'] = 'http://dir.friendika.com/submit';
 
 // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts
 
diff --git a/view/theme/default/friendika16.gif b/view/theme/default/friendika16.gif
new file mode 100644
index 000000000..f5321b1e5
Binary files /dev/null and b/view/theme/default/friendika16.gif differ
diff --git a/view/theme/default/style.css b/view/theme/default/style.css
index da10e9da9..d9d34d409 100644
--- a/view/theme/default/style.css
+++ b/view/theme/default/style.css
@@ -387,7 +387,7 @@ footer {
 
 input#dfrn-url {
 	float: left;
-	background: url(dfrn.gif) no-repeat;
+	background: url(friendika16.gif) no-repeat;
 	background-position: 2px center;
 	font-size: 17px;
 	padding-left: 21px;