diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
index 1f32f9b..30c210c 100644
--- a/app/assets/stylesheets/application.css
+++ b/app/assets/stylesheets/application.css
@@ -25,7 +25,6 @@
   outline: none;
 }
 
-// TODO: convert em to rem
 body {
   margin: 0 0.5rem;
 }
@@ -59,8 +58,8 @@ input[type=checkbox]:checked {
 }
 
 .application-menu {
-  height: 2.1em;
-  margin: 0.5em 0;
+  height: 2.1rem;
+  margin: 0.5rem 0;
 }
 .application-menu a,
 input[type=submit] {
@@ -68,15 +67,15 @@ input[type=submit] {
   border: 1px solid;
   background-color: white;
   border-color: #a0a0a0;
-  border-radius: 0.2em;
+  border-radius: 0.2rem;
   color: #a0a0a0;
   display: flex;
   fill: #a0a0a0;
   float: right;
   font-size: 0.8rem;
   font-weight: bold;
-  margin-left: 1em;
-  padding: 0.6em;
+  margin-left: 0.8rem;
+  padding: 0.4rem;
   text-decoration: none;
 }
 .application-menu a svg {
@@ -105,20 +104,20 @@ input[type=submit]:focus-visible {
 }
 
 .flashes {
-  height: 2.1em;
+  height: 2.1rem;
 }
 .flash {
   align-items: center;
-  border-radius: 0.2em;
+  border-radius: 0.2rem;
   color: white;
   display: flex;
-  font-size: 1.0em;
+  font-size: 1.0rem;
 }
 .flash.alert:before {
   content: url('pictograms/alert-outline.svg');
-  height: 1.4em;
-  margin: 0 0.5em;
-  width: 1.4em;
+  height: 1.4rem;
+  margin: 0 0.5rem;
+  width: 1.4rem;
 }
 .flash.alert {
   border-color: #ff1f5b;
@@ -126,9 +125,9 @@ input[type=submit]:focus-visible {
 }
 .flash.notice:before {
   content: url('pictograms/check-circle-outline.svg');
-  height: 1.4em;
-  margin: 0 0.5em;
-  width: 1.4em;
+  height: 1.4rem;
+  margin: 0 0.5rem;
+  width: 1.4rem;
 }
 .flash.notice {
   border-color: #00cd6c;
@@ -140,11 +139,11 @@ input[type=submit]:focus-visible {
   border-radius: inherit;
   color: inherit;
   cursor: pointer;
-  font-size: 1.4em;
+  font-size: 1.4rem;
   font-weight: bold;
   margin-left:auto;
   opacity: 0.6;
-  padding: 0.1em 0.2em;
+  padding: 0.2rem 0.2rem;
 }
 .flash button:hover {
   opacity: 1;
@@ -155,8 +154,8 @@ form table {
   margin: 0 auto;
 }
 form tr td:first-child {
-  font-size: 0.9em;
-  padding-right: 0.25em;
+  font-size: 0.9rem;
+  padding-right: 0.25rem;
   text-align: right;
 }
 form td.required {
@@ -167,6 +166,7 @@ form td.error {
 }
 form input[type=submit] {
   float: none;
-  font-size: 0.9em;
+  font-size: 0.9rem;
   margin: 0 auto;
+  padding: 0.6rem;
 }