diff --git a/src/Element/Copy.css b/src/Element/Copy.css
index 2ed09ebc8..35af72ab7 100644
--- a/src/Element/Copy.css
+++ b/src/Element/Copy.css
@@ -7,7 +7,7 @@
 .copy .body {
     font-family: monospace;
     font-size: 14px;
-    background: var(--gray-secondary);
+    background: var(--note-bg);
     color: var(--font-color);
     padding: 2px 4px;
     border-radius: 10px;
diff --git a/src/Element/Note.css b/src/Element/Note.css
index a57b2b469..111849518 100644
--- a/src/Element/Note.css
+++ b/src/Element/Note.css
@@ -1,19 +1,3 @@
-.note {
-    margin-bottom: 12px;
-    border-radius: 16px;
-    background-color: var(--note-bg);
-    padding: 12px;
-    min-height: 110px;
-}
-@media (min-width: 720px) {
-  .note { margin-bottom: 24px; padding: 24px; }
-}
-@media (prefers-color-scheme: light) {
-  .note {
-    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.05);
-  }
-}
-
 .note.thread {
     border-bottom: none;
 }
@@ -31,6 +15,7 @@
 
 .note > .body {
     margin-top: 12px;
+    padding-left: 56px;
     text-overflow: ellipsis;
     white-space: pre-wrap;
     word-break: normal;
@@ -38,6 +23,10 @@
     overflow-y: visible;
 }
 
+.note > .footer {
+    padding-left: 46px;
+}
+
 .note > .header img:hover, .note > .header .name > .reply:hover, .note .body:hover {
     cursor: pointer;
 }
@@ -130,6 +119,10 @@
   color: var(--font-tertiary-color);
 }
 
+.note.active > .footer > .reaction-pill.reacted {
+  color: var(--highlight);
+}
+
 @media (prefers-color-scheme: light) {
   .indented .active {
       background-color: var(--gray-secondary);
@@ -143,7 +136,4 @@
   .note.active > .footer > .reaction-pill {
     color: var(--font-secondary-color);
   }
-  .note.active > .footer > .reaction-pill.reacted {
-    color: var(--highlight);
-  }
 }
diff --git a/src/Element/NoteCreator.css b/src/Element/NoteCreator.css
index b7d24db37..c415376d6 100644
--- a/src/Element/NoteCreator.css
+++ b/src/Element/NoteCreator.css
@@ -1,7 +1,9 @@
 .note-creator {
     margin-bottom: 10px;
-    background-color: var(--gray);
+    background-color: var(--note-bg);
+    border: 1px solid var(--gray);
     border-radius: 10px;
+    padding: 6px;
 }
 
 .note-reply {
@@ -12,6 +14,7 @@
     outline: none;
     resize: none;
     min-height: 40px;
+    background-color: var(--note-bg);
     border-radius: 10px 10px 0 0;
     max-width: -webkit-fill-available;
     max-width: -moz-available;
@@ -43,7 +46,7 @@
 .note-creator .btn {
     border-radius: 20px;
     font-weight: bold;
-    background-color: var(--gray-secondary);
-    color: var(--gray-superlight);
-    border-color: var(--gray-superlight);
+    background-color: var(--bg-color);
+    color: var(--font-color);
+    font-size: var(--font-size);
 }
diff --git a/src/Element/ProfileImage.css b/src/Element/ProfileImage.css
index 4624cc37c..62e7a5eae 100644
--- a/src/Element/ProfileImage.css
+++ b/src/Element/ProfileImage.css
@@ -9,8 +9,8 @@
 
 .pfp .avatar {
     border-width: 1px;
-    width: 40px;
-    height: 40px;
+    width: 48px;
+    height: 48px;
     cursor: pointer;
 }
 
diff --git a/src/Element/Text.css b/src/Element/Text.css
index 4f50fcc19..dc5c2afbd 100644
--- a/src/Element/Text.css
+++ b/src/Element/Text.css
@@ -1,5 +1,9 @@
 .text a {
     color: var(--highlight);
+    text-decoration: none;
+}
+.text a:hover {
+    text-decoration: underline;
 }
 
 .text h1 {
@@ -26,6 +30,10 @@
     margin-bottom: 4px;
 }
 
+.text p:last-child {
+    margin-bottom: 0;
+}
+
 .text pre {
     margin: 0;
 }
diff --git a/src/index.css b/src/index.css
index 38cfe07a0..ea93f862f 100644
--- a/src/index.css
+++ b/src/index.css
@@ -4,7 +4,7 @@
     --bg-color: #000;
     --font-color: #FFF;
     --font-secondary-color: #555;
-    --font-tertiary-color: #999;
+    --font-tertiary-color: #666;
     --font-size: 16px;
     --font-size-small: 14px;
     --font-size-tiny: 12px;
@@ -88,10 +88,15 @@ code {
   margin-bottom: 12px;
   border-radius: 16px;
   background-color: var(--note-bg);
-  padding: 12px;
+  padding: 6px 12px;
 }
 @media (min-width: 720px) {
-  .card { margin-bottom: 24px; padding: 24px; }
+  .card { margin-bottom: 24px; padding: 12px 24px; }
+}
+@media (prefers-color-scheme: light) {
+  .card {
+    box-shadow: 0px 2px 4px rgba(0, 0, 0, 0.05);
+  }
 }
 
 .card .header {
@@ -112,6 +117,7 @@ code {
   cursor: pointer;
   user-select: none;
   background-color: var(--bg-color);
+  color: var(--font-color);
   border: 1px solid;
   display: inline-block;
 }