diff --git a/web/src/views/WifiDevices.vue b/web/src/views/WifiDevices.vue
index e25c80f..d5e918c 100644
--- a/web/src/views/WifiDevices.vue
+++ b/web/src/views/WifiDevices.vue
@@ -17,15 +17,22 @@
             hint="MAC, IP, Usuário"
             dense
           />
-          <v-btn
-            class="ml-2 mb-6"
-            :loading="$apollo.queries.wifiDevices.loading"
-            color="primary"
-            text
-            @click="$apollo.queries.wifiDevices.refresh()"
-          >
-            <v-icon left>mdi-refresh</v-icon> Atualizar
-          </v-btn>
+          <v-tooltip bottom>
+            <span>Atualizar</span>
+            <template #activator="{ on }">
+              <v-btn
+                class="ml-2 mb-6"
+                :loading="$apollo.queries.wifiDevices.loading"
+                color="primary"
+                icon
+                large
+                v-on="on"
+                @click="$apollo.queries.wifiDevices.refresh()"
+              >
+                <v-icon>mdi-refresh</v-icon>
+              </v-btn>
+            </template>
+          </v-tooltip>
         </v-toolbar>
       </template>
       <template #default="{ items }">
diff --git a/web/src/views/WifiUsers.vue b/web/src/views/WifiUsers.vue
index d5f61bb..f825fe9 100644
--- a/web/src/views/WifiUsers.vue
+++ b/web/src/views/WifiUsers.vue
@@ -15,15 +15,22 @@
             hint="Nome, conta"
             dense
           />
-          <v-btn
-            class="ml-2 mb-6"
-            :loading="$apollo.queries.wifiUsers.loading"
-            color="primary"
-            text
-            @click="$apollo.queries.wifiUsers.refresh()"
-          >
-            <v-icon left>mdi-refresh</v-icon> Atualizar
-          </v-btn>
+          <v-tooltip bottom>
+            <span>Atualizar</span>
+            <template #activator="{ on }">
+              <v-btn
+                class="ml-2 mb-6"
+                :loading="$apollo.queries.wifiUsers.loading"
+                color="primary"
+                icon
+                large
+                v-on="on"
+                @click="$apollo.queries.wifiUsers.refresh()"
+              >
+                <v-icon>mdi-refresh</v-icon>
+              </v-btn>
+            </template>
+          </v-tooltip>
         </v-toolbar>
       </template>
 
@@ -33,35 +40,37 @@
             <v-expansion-panel-header>
               <div style="width: 50px">
                 <avatar size="24" left :src="user.thumbnailPhoto" />
-                {{ user.displayName }}
+                {{ user.displayName }} ({{ user.sAMAccountName }})
               </div>
               <template #actions>
-                <v-badge
-                  color="green"
-                  bottom
-                  :content="
-                    user.wifiDevices
-                      .filter(wifiDevice => wifiDevice.isOnline)
-                      .length.toString()
-                  "
-                >
-                  <v-icon color="green">mdi-cellphone-wireless</v-icon>
-                </v-badge>
                 <v-badge
                   class="mx-4"
-                  color="grey"
+                  color="grey darken-1"
                   bottom
+                  offset-y="10"
                   :content="
                     user.wifiDevices
                       .filter(wifiDevice => !wifiDevice.isOnline)
                       .length.toString()
                   "
                 >
-                  <v-icon color="grey">mdi-cellphone-wireless</v-icon>
+                  <v-badge
+                    color="green"
+                    top
+                    offset-y="10"
+                    :content="
+                      user.wifiDevices
+                        .filter(wifiDevice => wifiDevice.isOnline)
+                        .length.toString()
+                    "
+                  >
+                    <v-icon>mdi-cellphone-wireless</v-icon>
+                  </v-badge>
                 </v-badge>
               </template>
             </v-expansion-panel-header>
             <v-expansion-panel-content>
+              Dispositivos associados à este usuário:
               <v-expansion-panels flat>
                 <v-expansion-panel
                   v-for="device in user.wifiDevices"