diff --git a/Makefile.am b/Makefile.am
index df9c2294..efa65c4b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -165,6 +165,7 @@ rofi_LDADD=\
 ##
 dist_man1_MANS=\
 	doc/rofi.1\
+	doc/rofi-theme-selector.1\
 	doc/rofi-sensible-terminal.1
 
 dist_man5_MANS=\
@@ -237,8 +238,9 @@ EXTRA_DIST+=\
 ##
 
 
-update-manpage: $(top_srcdir)/doc/rofi.1.markdown $(top_srcdir)/doc/rofi-theme.5.markdown
+update-manpage: $(top_srcdir)/doc/rofi-theme-selector.1.markdown $(top_srcdir)/doc/rofi.1.markdown $(top_srcdir)/doc/rofi-theme.5.markdown
 	ronn --roff $(top_srcdir)/doc/rofi.1.markdown
+	ronn --roff $(top_srcdir)/doc/rofi-theme-selector.1.markdown
 	ronn --roff $(top_srcdir)/doc/rofi-theme.5.markdown
 
 ##
diff --git a/doc/rofi-theme-selector.1 b/doc/rofi-theme-selector.1
new file mode 100644
index 00000000..95499dd5
--- /dev/null
+++ b/doc/rofi-theme-selector.1
@@ -0,0 +1,49 @@
+.\" generated with Ronn/v0.7.3
+.\" http://github.com/rtomayko/ronn/tree/0.7.3
+.
+.TH "ROFI\-THEME\-SELECTOR" "1" "November 2017" "" ""
+.
+.SH "NAME"
+\fBrofi\-theme\-selector\fR \- Preview and apply themes for \fBrofi\fR
+.
+.SH "DESCRIPTION"
+\fBrofi\-theme\-selector\fR is a bash/rofi script to preview and apply themes for \fBrofi\fR\. It\'s part of any installation of \fBrofi\fR\.
+.
+.SH "USAGE"
+.
+.SS "Running rofi\-theme\-selector"
+\fBrofi\-theme\-selector\fR shows a list of all available themes in a \fBrofi\fR window\. It lets you preview each theme with the Enter key and apply the theme to your \fBrofi\fR configuration file with Alt+a\.
+.
+.SH "Theme directories"
+\fBrofi\-theme\-selector\fR searches the following directories for themes:
+.
+.IP "\(bu" 4
+${PREFIX}/share/rofi/themes
+.
+.IP "\(bu" 4
+$XDG_CONFIG_HOME/rofi
+.
+.IP "\(bu" 4
+$XDG_DATA_HOME/share/rofi/themes
+.
+.IP "" 0
+.
+.P
+${PREFIX} reflects the install location of rofi\. In most cases this will be "/usr"\. $XDG_CONFIG_HOME is normally unset\. Default path is "$HOME/\.config"\. $XDG_DATA_HOME is normally unset\. Default path is "$HOME/\.local/share"\.
+.
+.P
+SEE ALSO rofi(1)
+.
+.P
+AUTHOR Qball Cow qball@gmpclient\.org
+.
+.IP "" 4
+.
+.nf
+
+   Rasmus Steinke rasi@xssn\.at
+.
+.fi
+.
+.IP "" 0
+
diff --git a/doc/rofi.1 b/doc/rofi.1
index 45411af0..a5026252 100644
--- a/doc/rofi.1
+++ b/doc/rofi.1
@@ -1,7 +1,7 @@
 .\" generated with Ronn/v0.7.3
 .\" http://github.com/rtomayko/ronn/tree/0.7.3
 .
-.TH "ROFI" "1" "October 2017" "" ""
+.TH "ROFI" "1" "November 2017" "" ""
 .
 .SH "NAME"
 \fBrofi\fR \- A window switcher, application launcher, ssh dialog and dmenu replacement
@@ -340,6 +340,18 @@ Disable plugin loading\.
 .P
 Specify the directory where \fBrofi\fR should look for plugins\.
 .
+.P
+\fB\-show\-icons\fR
+.
+.P
+Show application icons in drun and window modes\.
+.
+.P
+\fB\-drun\-icon\-theme\fR
+.
+.P
+Specify icon theme to be used in drun mode if show\-icons setting is enabled\. If not specified default theme from DE is used, \fIAdwaita\fR and \fIgnome\fR themes act as fallback themes\.
+.
 .SS "Matching"
 \fB\-matching\fR \fImethod\fR
 .
@@ -1572,7 +1584,7 @@ Please see this \fIhttps://github\.com/DaveDavenport/rofi/wiki/Debugging%20Rofi\
 When creating an issue, please read this \fIhttps://github\.com/DaveDavenport/rofi/blob/master/\.github/CONTRIBUTING\.md\fR first\.
 .
 .SH "SEE ALSO"
-rofi\-sensible\-terminal(1), dmenu(1), rofi\-theme(5)
+rofi\-sensible\-terminal(1), dmenu(1), rofi\-theme(5), rofi\-theme\-selector(1)
 .
 .SH "AUTHOR"
 Qball Cow \fIqball@gmpclient\.org\fR