diff --git a/dfhack-icon.png b/dfhack-icon.ico
similarity index 100%
rename from dfhack-icon.png
rename to dfhack-icon.ico
diff --git a/docs/Plugins.rst b/docs/Plugins.rst
index 500235994..5cb16dfd3 100644
--- a/docs/Plugins.rst
+++ b/docs/Plugins.rst
@@ -1670,7 +1670,7 @@ open the dashboard from the chop designation menu.
 treefarm
 --------
 Automatically manages special burrows and regularly schedules tree chopping
-and digging when appropriate.  
+and digging when appropriate.
 
 Every time the plugin runs, it checks for burrows with a name containing the
 string ``"treefarm"``. For each such burrow, it checks every tile in it for
@@ -2234,7 +2234,7 @@ This command lets you see and change the game mode directly.
     Not all combinations are good for every situation and most of them will
     produce undesirable results. There are a few good ones though.
 
-Examples: 
+Examples:
 
   * You are in fort game mode, managing your fortress and paused.
   * You switch to the arena game mode, *assume control of a creature* and then
diff --git a/docs/conf.py.in b/docs/conf.py.in
index 58de900bb..cfd348456 100644
--- a/docs/conf.py.in
+++ b/docs/conf.py.in
@@ -145,7 +145,7 @@ html_theme = '@SPHINX_THEME@'
 # 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 = 'dfhack-icon.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,