diff --git a/docs/_static/favicon.ico b/docs/_static/favicon.ico
new file mode 100644
index 00000000..2dd9609c
Binary files /dev/null and b/docs/_static/favicon.ico differ
diff --git a/docs/_static/platformio-logo.png b/docs/_static/platformio-logo.png
index 8cbe937a..a8b025d5 100644
Binary files a/docs/_static/platformio-logo.png and b/docs/_static/platformio-logo.png differ
diff --git a/docs/conf.py b/docs/conf.py
index b499869d..cb04d018 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -119,12 +119,12 @@ html_theme = 'default'
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+html_logo = '_static/platformio-logo.png'
 
 # The name of an image file (within the static path) to use as favicon of the
 # docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+html_favicon = '_static/favicon.ico'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
@@ -184,22 +184,22 @@ htmlhelp_basename = 'PlatformIOdoc'
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
 
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
 
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-  ('index', 'PlatformIO.tex', u'PlatformIO Documentation',
-   u'Ivan Kravets', 'manual'),
+    ('index', 'PlatformIO.tex', u'PlatformIO Documentation',
+     u'Ivan Kravets', 'manual'),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
@@ -242,9 +242,9 @@ man_pages = [
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-  ('index', 'PlatformIO', u'PlatformIO Documentation',
-   u'Ivan Kravets', 'PlatformIO', 'One line description of project.',
-   'Miscellaneous'),
+    ('index', 'PlatformIO', u'PlatformIO Documentation',
+     u'Ivan Kravets', 'PlatformIO', 'One line description of project.',
+     'Miscellaneous'),
 ]
 
 # Documents to append as an appendix to all manuals.
diff --git a/docs/index.rst b/docs/index.rst
index 4cf5c3f5..9f6611fa 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -19,9 +19,6 @@ MBED compatible**
 Silicon Labs EFM32, ST STM32, TI MSP430 & Tiva, Teensy, Arduino, mbed,
 libOpenCM3, etc.*
 
-.. image:: _static/platformio-logo.png
-    :target: http://platformio.org
-
 * `Website <http://platformio.org>`_
 * `Web 2.0 Library Search <http://platformio.org/#!/lib>`_ |
   `Embedded Boards Explorer <http://platformio.org/#!/boards>`_