diff --git a/conf/client/rules.fnl b/conf/client/rules.fnl
index e600f34..3942f13 100644
--- a/conf/client/rules.fnl
+++ b/conf/client/rules.fnl
@@ -27,7 +27,8 @@
 
   ;; Floating clients.
   {:rule_any {:class ["Gpick"
-                      "Orage"]
+                      "Orage"
+                      "Pavucontrol"]
               :name ["Event Tester"] ;; xev
               :role ["pop-up"
                      "xfce4-terminal-dropdown"]}
diff --git a/conf/tags.fnl b/conf/tags.fnl
index 6686315..bd652a2 100644
--- a/conf/tags.fnl
+++ b/conf/tags.fnl
@@ -8,13 +8,12 @@
 ;;;
 ;; Configuration
 
-(local layouts [awful.layout.suit.tile
-                awful.layout.suit.floating])
+(local layouts [awful.layout.suit.tile])
 
 (set awful.layout.layouts layouts)
 
 ;; TODO Rasterize?
-(local tags [:firefox.png :code.png :code.svg])
+(local tags [:firefox.png :code.png :code.png :code.png :code.png :code.png])
 
 (let [icon-path (.. (os.getenv "HOME") "/.config/awesome/theme/icons/tag/")]
  (awful.screen.connect_for_each_screen
@@ -22,7 +21,6 @@
     (each [n tag (ipairs tags)]
       (awful.tag.add
        n {:icon (.. icon-path tag)
-          :icon_only true
           :layout (. layouts 1)
           :gap_single_client false
           :gap beautiful.useless_gap