diff --git a/Doxyfile b/Doxyfile
index a1676eba7a8..37855ceece7 100644
--- a/Doxyfile
+++ b/Doxyfile
@@ -1,7 +1,7 @@
INPUT = README.md index.php boot.php update.php bin/ mod/ include/ view/ src/ VERSION
RECURSIVE = YES
PROJECT_NAME = "Friendica"
-PROJECT_LOGO = images/friendica-64.jpg
+PROJECT_LOGO = images/friendica-64.png
EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
EXCLUDE_PATTERNS = *smarty3* strings.php *.log *.out *test*
OUTPUT_DIRECTORY = doc
diff --git a/doc/BBCode.md b/doc/BBCode.md
index dae630448f7..3fe59913089 100644
--- a/doc/BBCode.md
+++ b/doc/BBCode.md
@@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
| Friendica |
- | [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img] |
-  |
+ [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img] |
+  |
- | [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]The Friendica Logo[/img] |
- |
+ [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]The Friendica Logo[/img] |
+ |
- [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]
+ | [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]
Note: provided height is simply discarded. |
- |
+  |
| [size=xx-small]small text[/size] |
diff --git a/doc/de/BBCode.md b/doc/de/BBCode.md
index 5949e67e18e..a978c4f45dd 100644
--- a/doc/de/BBCode.md
+++ b/doc/de/BBCode.md
@@ -65,17 +65,17 @@ table.bbcodes > * > tr > th {
Friendica |
- | [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img] |
- |
+ [img]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png[/img] |
+ |
- | [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg]Das Friendica Logo[/img] |
- |
+ [img=https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.png]Das Friendica Logo[/img] |
+ |
- [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica-32.jpg[/img]
+ | [img=64x32]https://raw.githubusercontent.com/friendica/friendica/stable/images/friendica.svg[/img]
Note: provided height is simply discarded. |
- |
+ |
| [size=xx-small]kleiner Text[/size] |
diff --git a/images/friendica-16.png b/images/friendica-16.png
index 745b7ac6c5a..b31c058d118 100644
Binary files a/images/friendica-16.png and b/images/friendica-16.png differ
diff --git a/images/friendica-192.png b/images/friendica-192.png
index 97537c6c348..cf924c430d8 100644
Binary files a/images/friendica-192.png and b/images/friendica-192.png differ
diff --git a/images/friendica-32.png b/images/friendica-32.png
index 61764bf20a3..e025e4c2785 100644
Binary files a/images/friendica-32.png and b/images/friendica-32.png differ
diff --git a/images/friendica-512.png b/images/friendica-512.png
index e579478df62..54269b8b110 100644
Binary files a/images/friendica-512.png and b/images/friendica-512.png differ
diff --git a/images/friendica-64.png b/images/friendica-64.png
index 88cb8b016d4..2cdddedc88e 100644
Binary files a/images/friendica-64.png and b/images/friendica-64.png differ
diff --git a/images/friendica.svg b/images/friendica.svg
index 45820959d51..180fe2a90e7 100644
--- a/images/friendica.svg
+++ b/images/friendica.svg
@@ -1 +1,4 @@
-
\ No newline at end of file
+
diff --git a/mods/fpostit/fpostit.php b/mods/fpostit/fpostit.php
index ce66d3180a7..20c7b0889df 100644
--- a/mods/fpostit/fpostit.php
+++ b/mods/fpostit/fpostit.php
@@ -125,7 +125,7 @@ function showForm($error, $content) {
echo <<
- 
+ 
Friendica Bookmarklet
diff --git a/mods/fpostit/friendica.svg b/mods/fpostit/friendica.svg
new file mode 100644
index 00000000000..180fe2a90e7
--- /dev/null
+++ b/mods/fpostit/friendica.svg
@@ -0,0 +1,4 @@
+
diff --git a/mods/fpostit/friendika-32.png b/mods/fpostit/friendika-32.png
deleted file mode 100644
index 61764bf20a3..00000000000
Binary files a/mods/fpostit/friendika-32.png and /dev/null differ
diff --git a/src/App/Page.php b/src/App/Page.php
index 41d50da055c..14f0101ef07 100644
--- a/src/App/Page.php
+++ b/src/App/Page.php
@@ -231,7 +231,7 @@ class Page implements ArrayAccess
$shortcut_icon = $config->get('system', 'shortcut_icon');
if ($shortcut_icon == '') {
- $shortcut_icon = 'images/friendica-32.png';
+ $shortcut_icon = 'images/friendica.svg';
}
$touch_icon = $config->get('system', 'touch_icon');
diff --git a/src/Content/Nav.php b/src/Content/Nav.php
index 213b4599f06..c30a157067f 100644
--- a/src/Content/Nav.php
+++ b/src/Content/Nav.php
@@ -304,7 +304,7 @@ class Nav
// Provide a banner/logo/whatever
$banner = DI::config()->get('system', 'banner');
if (is_null($banner)) {
- $banner = '
Friendica';
+ $banner = '
Friendica';
}
$nav_info = [
diff --git a/src/Content/Smilies.php b/src/Content/Smilies.php
index 4a20497a831..411f03b463f 100644
--- a/src/Content/Smilies.php
+++ b/src/Content/Smilies.php
@@ -142,7 +142,7 @@ class Smilies
'
',
'
',
'
',
- '~friendica 
',
+ '~friendica 
',
'red
matrix',
'redmatrix'
];
diff --git a/src/Module/Admin/Site.php b/src/Module/Admin/Site.php
index 4c5c38ea542..515fb53c875 100644
--- a/src/Module/Admin/Site.php
+++ b/src/Module/Admin/Site.php
@@ -450,7 +450,7 @@ class Site extends BaseAdmin
$banner = DI::config()->get('system', 'banner');
if ($banner == false) {
- $banner = 'Friendica';
+ $banner = 'Friendica';
}
$email_banner = DI::config()->get('system', 'email_banner');
diff --git a/view/templates/head.tpl b/view/templates/head.tpl
index 5ba9e47a316..2ef1bfe08fd 100644
--- a/view/templates/head.tpl
+++ b/view/templates/head.tpl
@@ -12,7 +12,7 @@
{{/foreach}}
-
+
diff --git a/view/templates/install_base.tpl b/view/templates/install_base.tpl
index 4907c258572..a8a6c0ab967 100644
--- a/view/templates/install_base.tpl
+++ b/view/templates/install_base.tpl
@@ -1,4 +1,4 @@
-
{{$title}}
+
{{$title}}
{{$pass}}
diff --git a/view/templates/install_checks.tpl b/view/templates/install_checks.tpl
index 4574faf060b..26f47daad53 100644
--- a/view/templates/install_checks.tpl
+++ b/view/templates/install_checks.tpl
@@ -1,5 +1,5 @@
-
{{$title}}
+ {{$title}}
{{$pass}}