diff --git a/tailbone/templates/people/view_profile.mako b/tailbone/templates/people/view_profile.mako
index bf94b7fa..c5c86806 100644
--- a/tailbone/templates/people/view_profile.mako
+++ b/tailbone/templates/people/view_profile.mako
@@ -404,33 +404,53 @@
           % if request.has_perm('people_profile.edit_person'):
           <${b}-table-column label="Actions"
                           v-slot="props">
-            <a class="grid-action"
-               href="#" @click.prevent="editPhoneInit(props.row)">
+            <a href="#" @click.prevent="editPhoneInit(props.row)"
+               % if not request.use_oruga:
+                   class="grid-action"
+               % endif
+               >
               % if request.use_oruga:
-                  <o-icon icon="edit" />
+                  <span class="icon-text">
+                    <o-icon icon="edit" />
+                    <span>Edit</span>
+                  </span>
               % else:
                   <i class="fas fa-edit"></i>
+                  Edit
               % endif
-              Edit
             </a>
-            <a class="grid-action has-text-danger"
-               href="#" @click.prevent="deletePhoneInit(props.row)">
+            <a href="#" @click.prevent="deletePhoneInit(props.row)"
+               % if request.use_oruga:
+                   class="has-text-danger"
+               % else:
+                   class="grid-action has-text-danger"
+               % endif
+               >
               % if request.use_oruga:
-                  <o-icon icon="trash" />
+                  <span class="icon-text">
+                    <o-icon icon="trash" />
+                    <span>Delete</span>
+                  </span>
               % else:
                   <i class="fas fa-trash"></i>
+                  Delete
               % endif
-              Delete
             </a>
-            <a class="grid-action"
+            <a v-if="!props.row.preferred"
                href="#" @click.prevent="preferPhoneInit(props.row)"
-               v-if="!props.row.preferred">
+               % if not request.use_oruga:
+                   class="grid-action"
+               % endif
+               >
               % if request.use_oruga:
-                  <o-icon icon="star" />
+                  <span class="icon-text">
+                    <o-icon icon="star" />
+                    <span>Set Preferred</span>
+                  </span>
               % else:
                   <i class="fas fa-star"></i>
+                  Set Preferred
               % endif
-              Set Preferred
             </a>
           </${b}-table-column>
           % endif
@@ -618,33 +638,52 @@
           % if request.has_perm('people_profile.edit_person'):
               <${b}-table-column label="Actions"
                               v-slot="props">
-                <a class="grid-action"
-                   href="#" @click.prevent="editEmailInit(props.row)">
+                <a href="#" @click.prevent="editEmailInit(props.row)"
+                   % if not request.use_oruga:
+                       class="grid-action"
+                   % endif
+                   >
                   % if request.use_oruga:
-                      <o-icon icon="edit" />
+                      <span class="icon-text">
+                        <o-icon icon="edit" />
+                        <span>Edit</span>
+                      </span>
                   % else:
                       <i class="fas fa-edit"></i>
+                      Edit
                   % endif
-                  Edit
                 </a>
-                <a class="grid-action has-text-danger"
-                   href="#" @click.prevent="deleteEmailInit(props.row)">
+                <a href="#" @click.prevent="deleteEmailInit(props.row)"
+                   % if request.use_oruga:
+                       class="has-text-danger"
+                   % else:
+                       class="grid-action has-text-danger"
+                   % endif
+                   >
                   % if request.use_oruga:
-                      <o-icon icon="trash" />
+                      <span class="icon-text">
+                        <o-icon icon="trash" />
+                        <span>Delete</span>
+                      </span>
                   % else:
                       <i class="fas fa-trash"></i>
+                      Delete
                   % endif
-                  Delete
                 </a>
-                <a class="grid-action"
-                   href="#" @click.prevent="preferEmailInit(props.row)"
-                   v-if="!props.row.preferred">
+                <a v-if="!props.row.preferred"
+                   % if not request.use_oruga:
+                       class="grid-action"
+                   % endif
+                   href="#" @click.prevent="preferEmailInit(props.row)">
                   % if request.use_oruga:
-                      <o-icon icon="star" />
+                      <span class="icon-text">
+                        <o-icon icon="star" />
+                        <span>Set Preferred</span>
+                      </span>
                   % else:
                       <i class="fas fa-star"></i>
+                      Set Preferred
                   % endif
-                  Set Preferred
                 </a>
               </${b}-table-column>
           % endif
@@ -1200,8 +1239,15 @@
                                   label="Actions"
                                   v-slot="props">
                     <a href="#" @click.prevent="editEmployeeHistoryInit(props.row)">
-                      <i class="fas fa-edit"></i>
-                      Edit
+                      % if request.use_oruga:
+                          <span class="icon-text">
+                            <o-icon icon="edit" />
+                            <span>Edit</span>
+                          </span>
+                      % else:
+                          <i class="fas fa-edit"></i>
+                          Edit
+                      % endif
                     </a>
                   </${b}-table-column>
               % endif
@@ -1428,15 +1474,30 @@
                             v-slot="props">
               % if request.has_perm('people_profile.edit_note'):
                   <a href="#" @click.prevent="editNoteInit(props.row)">
-                    <i class="fas fa-edit"></i>
-                    Edit
+                    % if request.use_oruga:
+                        <span class="icon-text">
+                          <o-icon icon="edit" />
+                          <span>Edit</span>
+                        </span>
+                    % else:
+                        <i class="fas fa-edit"></i>
+                        Edit
+                    % endif
                   </a>
               % endif
               % if request.has_perm('people_profile.delete_note'):
                   <a href="#" @click.prevent="deleteNoteInit(props.row)"
                      class="has-text-danger">
-                    <i class="fas fa-trash"></i>
-                    Delete
+                    % if request.use_oruga:
+                        <span class="icon-text">
+                          <o-icon icon="trash" />
+                          <span>Delete</span>
+                        </span>
+                    % else:
+                        <i class="fas fa-trash"></i>
+                        Delete
+                    % endif
+
                   </a>
               % endif
             </${b}-table-column>
@@ -1477,14 +1538,16 @@
 
                 <b-field label="Subject">
                   <b-input v-model.trim="editNoteSubject"
-                           :disabled="editNoteDelete">
+                           :disabled="editNoteDelete"
+                           expanded>
                   </b-input>
                 </b-field>
 
                 <b-field label="Text">
                   <b-input v-model.trim="editNoteText"
                            type="textarea"
-                           :disabled="editNoteDelete">
+                           :disabled="editNoteDelete"
+                           expanded>
                   </b-input>
                 </b-field>