diff --git a/src/views/admin/page-admin-circles.pug b/src/views/admin/page-admin-circles.pug
index 01ee2e2..248a3be 100644
--- a/src/views/admin/page-admin-circles.pug
+++ b/src/views/admin/page-admin-circles.pug
@@ -39,7 +39,8 @@
           solid-ac-checker(data-src=`${endpoints.circles || (endpoints.post && endpoints.post.circles)}`, permission='acl:Append')
             solid-link(
               class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-plus'
-              next='admin-circle-create' data-trans='circle.list.buttonCreate'
+              next='admin-circle-create'
+              data-trans='circle.list.buttonCreate'
             )
 
       .table-wrapper
diff --git a/src/views/admin/page-admin-projects.pug b/src/views/admin/page-admin-projects.pug
index 5ef2014..9bb0af9 100644
--- a/src/views/admin/page-admin-projects.pug
+++ b/src/views/admin/page-admin-projects.pug
@@ -10,27 +10,28 @@
   #admin-project-list.content-box__height(hidden, data-view="admin-project-list")
     include ../../templates/hubl-user-avatar.pug
 
-    div.segment.padding-xlarge.border-bottom
+    div.segment.padding-top-xsmall.padding-right-large.padding-bottom-xsmall.padding-left-large.border-bottom.border-color-grey.text-color-heading
       div
         h2.text-uppercase.text-xlarge.text-letter-spacing-large(data-trans='project.list.title')
       div.segment.lg-hidden
         button.mobile-sidebar-button.jsMobileSidebarOpenButton.icon-arrow-left-circle(data-trans='project.list.buttonMobile')
 
-    div.segment.padding-xlarge
-      div.segment.padding-y-small.margin-bottom.clearfix
+    div.segment.padding-large
+      div.segment.margin-bottom-medium.clearfix
         div.segment.lg-half.float-left
-          h3.text-large.text-bold.text-letter-spacing-large(data-trans='project.list.subTitle')
-        div.segment.lg-half.float-left.text-right
+          h3.text-color-heading.text-semibold.text-letter-spacing-large(data-trans='project.list.subTitle')
+        div.segment.lg-half.float-left.text-right.padding-top-xxsmall
           solid-ac-checker(data-src=`${endpoints.projects || (endpoints.post && endpoints.post.projects)}`, permission='acl:Append')
             solid-link(
-              class='button text-bolder text-uppercase reversed button-secondary bordered icon icon-plus'
+              class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-plus'
               next='admin-project-create'
               data-trans='project.list.buttonCreate'
             )
 
       .table-wrapper
-        .table.segment.margin-bottom
-          div.table-header
+        .table
+
+          div.table-header.bg-color-third.text-color-heading
             div.table-cell.w280(data-trans='project.list.tableHeader1')
             div.table-cell.w280(data-trans='project.list.tableHeader2')
             div.table-cell.w280(data-trans='project.list.tableHeader3')
@@ -39,7 +40,7 @@
           solid-widget(name="hubl-admin-project-leave-button")
             template
               solid-delete(
-                class='button text-bolder text-uppercase button-secondary bordered icon icon-close'
+                class='button text-xsmall text-bold text-uppercase color-secondary bordered'
                 data-src="${src}"
                 data-label=''
                 data-trans='data-label=project.list.buttonQuit'
@@ -53,13 +54,16 @@
 
           solid-widget(name='hubl-project-captain')
             template
-              solid-display.user-thumb.block.is-spaced(
+              solid-display.segment.margin-left-xlarge.user-thumb(
                 data-src='${await value}'
-                fields='account.picture, sup(name), sub(username)'
+                fields='account.picture, content(name-and-icon(name), sub(username))'
 
-                class-account.picture='avatar user-thumb__picture'
-                class-name='user-thumb__name'
-                class-username='user-thumb__username'
+                class-account.picture='user-thumb-avatar'
+                class-content='user-thumb-content'
+                class-name-and-icon='user-thumb-content__name-and-icon'
+                class-name='name'
+                class-sub='user-thumb-content__sub-text'
+                class-username=''
 
                 widget-account.picture='hubl-user-avatar'
               )
@@ -78,7 +82,7 @@
           solid-widget(name='hubl-admin-project-leave-button')
             template
               solid-delete(
-                class='button text-bolder text-uppercase button-secondary bordered icon icon-close'
+                class='button text-xsmall text-bold text-uppercase color-secondary bordered'
                 data-src="${src}"
                 data-label=''
                 data-trans='data-label=project.list.buttonQuit'
@@ -92,9 +96,9 @@
             fields='project.name, project.members, project.captain, leaveButton'
             loader-id='loader-admin-projects'
 
-            class-project.name='table-cell w280 text-color-heading text-bold text-letter-spacing-large text-underline'
-            class-project.members='table-cell w280 cell border cell-with-id-card'
-            class-project.captain='table-cell w280 cell border cell-with-id-card'
+            class-project.name='table-cell w280 text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline'
+            class-project.members='table-cell w280'
+            class-project.captain='table-cell w280'
             class-leaveButton='table-cell w230'
 
             action-leaveButton="joinButton"
@@ -109,7 +113,7 @@
           solid-widget(name='hubl-admin-project-join-button')
             template
               solid-form(
-                class='button text-bolder text-uppercase reversed button-secondary bordered icon icon-arrow-right-circle'
+                class='button text-xsmall text-bold text-uppercase reversed color-secondary bordered icon icon-arrow-right-circle'
                 data-src='${src}'
                 nested-field="members"
 
@@ -134,9 +138,9 @@
             fields='name, members, captain, joinButton'
             loader-id='loader-admin-projects'
 
-            class-name='table-cell w280 text-color-heading text-bold text-letter-spacing-large text-underline'
-            class-members='table-cell w280 cell border cell-with-id-card'
-            class-captain='table-cell w280 cell border cell-with-id-card'
+            class-name='table-cell w280 text-xlarge text-color-heading text-semibold text-letter-spacing-large text-underline'
+            class-members='table-cell w280'
+            class-captain='table-cell w280'
             class-joinButton='table-cell w230'
 
             action-joinButton="joinButton" # Workaround: I need members two times