diff --git a/modules/config/default/+evil-bindings.el b/modules/config/default/+evil-bindings.el
index e278284d3..793f995f5 100644
--- a/modules/config/default/+evil-bindings.el
+++ b/modules/config/default/+evil-bindings.el
@@ -141,7 +141,8 @@
             "C-SPC"   #'company-complete-common
             "TAB"     #'company-complete-common-or-cycle
             [tab]     #'company-complete-common-or-cycle
-            [backtab] #'company-select-previous)
+            [backtab] #'company-select-previous
+            [f1]      nil)
           (:map company-search-map  ; applies to `company-filter-map' too
             "C-n"     #'company-select-next-or-abort
             "C-p"     #'company-select-previous-or-abort
diff --git a/modules/lang/java/+lsp.el b/modules/lang/java/+lsp.el
index dc917a6c7..03937e5c1 100644
--- a/modules/lang/java/+lsp.el
+++ b/modules/lang/java/+lsp.el
@@ -3,9 +3,10 @@
 
 (use-package! lsp-java
   :after-call java-mode
-  :init (add-hook 'java-mode-local-vars-hook #'lsp!)
-  :config
+  :init
+  (add-hook 'java-mode-local-vars-hook #'lsp!)
   (setq lsp-java-server-install-dir (concat doom-etc-dir "eclipse.jdt.ls/server/"))
+  :config
   ;; TODO keybinds
   ;; TODO treemacs integration (?)
   )
diff --git a/modules/ui/neotree/config.el b/modules/ui/neotree/config.el
index 705b61979..4a474c998 100644
--- a/modules/ui/neotree/config.el
+++ b/modules/ui/neotree/config.el
@@ -15,7 +15,7 @@
         neo-mode-line-type 'none
         neo-window-width 24
         neo-show-updir-line nil
-        neo-theme 'nerd ; fallback
+        neo-theme 'icons
         neo-banner-message nil
         neo-confirm-create-file #'off-p
         neo-confirm-create-directory #'off-p