diff --git a/Mastodon/Generated/Assets.swift b/Mastodon/Generated/Assets.swift
index f0222a9e0..cc94eaf6a 100644
--- a/Mastodon/Generated/Assets.swift
+++ b/Mastodon/Generated/Assets.swift
@@ -67,6 +67,10 @@ internal enum Asset {
       internal static let invalid = ColorAsset(name: "Colors/TextField/invalid")
       internal static let valid = ColorAsset(name: "Colors/TextField/valid")
     }
+    internal static let backgroundLight = ColorAsset(name: "Colors/backgroundLight")
+    internal static let buttonDefault = ColorAsset(name: "Colors/buttonDefault")
+    internal static let buttonDisabled = ColorAsset(name: "Colors/buttonDisabled")
+    internal static let buttonInactive = ColorAsset(name: "Colors/buttonInactive")
     internal static let lightAlertYellow = ColorAsset(name: "Colors/lightAlertYellow")
     internal static let lightBackground = ColorAsset(name: "Colors/lightBackground")
     internal static let lightBrandBlue = ColorAsset(name: "Colors/lightBrandBlue")
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/backgroundLight.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/backgroundLight.colorset/Contents.json
new file mode 100644
index 000000000..0e4687fb4
--- /dev/null
+++ b/Mastodon/Resources/Assets.xcassets/Colors/backgroundLight.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.910",
+          "green" : "0.882",
+          "red" : "0.851"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/buttonDefault.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/buttonDefault.colorset/Contents.json
new file mode 100644
index 000000000..2e1ce5f3a
--- /dev/null
+++ b/Mastodon/Resources/Assets.xcassets/Colors/buttonDefault.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.851",
+          "green" : "0.565",
+          "red" : "0.169"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/buttonDisabled.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/buttonDisabled.colorset/Contents.json
new file mode 100644
index 000000000..78cde95fb
--- /dev/null
+++ b/Mastodon/Resources/Assets.xcassets/Colors/buttonDisabled.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.784",
+          "green" : "0.682",
+          "red" : "0.608"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/buttonInactive.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/buttonInactive.colorset/Contents.json
new file mode 100644
index 000000000..69dc63851
--- /dev/null
+++ b/Mastodon/Resources/Assets.xcassets/Colors/buttonInactive.colorset/Contents.json
@@ -0,0 +1,20 @@
+{
+  "colors" : [
+    {
+      "color" : {
+        "color-space" : "srgb",
+        "components" : {
+          "alpha" : "1.000",
+          "blue" : "0.549",
+          "green" : "0.510",
+          "red" : "0.431"
+        }
+      },
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/lightAlertYellow.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/lightAlertYellow.colorset/Contents.json
index 29b7bba3d..0e29336a8 100644
--- a/Mastodon/Resources/Assets.xcassets/Colors/lightAlertYellow.colorset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/Colors/lightAlertYellow.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
   "colors" : [
     {
+      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
-          "alpha" : "1.000",
+          "red" : "0.792",
           "blue" : "0.016",
           "green" : "0.561",
-          "red" : "0.792"
+          "alpha" : "1.000"
         }
-      },
-      "idiom" : "universal"
+      }
     }
   ],
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}
\ No newline at end of file
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/lightDangerRed.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/lightDangerRed.colorset/Contents.json
index dabccc33e..8ea3105e6 100644
--- a/Mastodon/Resources/Assets.xcassets/Colors/lightDangerRed.colorset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/Colors/lightDangerRed.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
   "colors" : [
     {
       "color" : {
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
+          "red" : "0.875",
           "blue" : "0.353",
-          "green" : "0.251",
-          "red" : "0.875"
+          "green" : "0.251"
         }
       },
       "idiom" : "universal"
     }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+  ]
+}
\ No newline at end of file
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/lightDarkGray.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/lightDarkGray.colorset/Contents.json
index 8d54c84c2..e6461f1d3 100644
--- a/Mastodon/Resources/Assets.xcassets/Colors/lightDarkGray.colorset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/Colors/lightDarkGray.colorset/Contents.json
@@ -1,6 +1,11 @@
 {
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
   "colors" : [
     {
+      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
@@ -9,12 +14,7 @@
           "green" : "0.137",
           "red" : "0.122"
         }
-      },
-      "idiom" : "universal"
+      }
     }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+  ]
+}
\ No newline at end of file
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/lightSecondaryText.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/lightSecondaryText.colorset/Contents.json
index ba375b791..ac36bf1f4 100644
--- a/Mastodon/Resources/Assets.xcassets/Colors/lightSecondaryText.colorset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/Colors/lightSecondaryText.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
   "colors" : [
     {
+      "idiom" : "universal",
       "color" : {
-        "color-space" : "srgb",
         "components" : {
+          "blue" : "0.263",
+          "green" : "0.235",
           "alpha" : "0.600",
-          "blue" : "67",
-          "green" : "60",
-          "red" : "60"
-        }
-      },
-      "idiom" : "universal"
+          "red" : "0.235"
+        },
+        "color-space" : "srgb"
+      }
     }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+  ]
+}
\ No newline at end of file
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/lightSuccessGreen.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/lightSuccessGreen.colorset/Contents.json
index 8716dcb74..8ef654ce0 100644
--- a/Mastodon/Resources/Assets.xcassets/Colors/lightSuccessGreen.colorset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/Colors/lightSuccessGreen.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
   "colors" : [
     {
+      "idiom" : "universal",
       "color" : {
         "color-space" : "srgb",
         "components" : {
           "alpha" : "1.000",
-          "blue" : "0.604",
           "green" : "0.741",
-          "red" : "0.475"
+          "red" : "0.475",
+          "blue" : "0.604"
         }
-      },
-      "idiom" : "universal"
+      }
     }
-  ],
-  "info" : {
-    "author" : "xcode",
-    "version" : 1
-  }
-}
+  ]
+}
\ No newline at end of file
diff --git a/Mastodon/Resources/Assets.xcassets/Colors/lightWhite.colorset/Contents.json b/Mastodon/Resources/Assets.xcassets/Colors/lightWhite.colorset/Contents.json
index a5291a593..5147016be 100644
--- a/Mastodon/Resources/Assets.xcassets/Colors/lightWhite.colorset/Contents.json
+++ b/Mastodon/Resources/Assets.xcassets/Colors/lightWhite.colorset/Contents.json
@@ -1,20 +1,20 @@
 {
   "colors" : [
     {
+      "idiom" : "universal",
       "color" : {
-        "color-space" : "srgb",
         "components" : {
+          "red" : "0.996",
           "alpha" : "1.000",
           "blue" : "0.996",
-          "green" : "1.000",
-          "red" : "0.996"
-        }
-      },
-      "idiom" : "universal"
+          "green" : "1.000"
+        },
+        "color-space" : "srgb"
+      }
     }
   ],
   "info" : {
-    "author" : "xcode",
-    "version" : 1
+    "version" : 1,
+    "author" : "xcode"
   }
-}
+}
\ No newline at end of file
diff --git a/Mastodon/Resources/en.lproj/Localizable.strings b/Mastodon/Resources/en.lproj/Localizable.strings
index 2a72b92c0..5ed3c68a6 100644
--- a/Mastodon/Resources/en.lproj/Localizable.strings
+++ b/Mastodon/Resources/en.lproj/Localizable.strings
@@ -96,4 +96,4 @@ any server.";
 "Scene.ServerRules.Subtitle" = "These rules are set by the admins of %@.";
 "Scene.ServerRules.Title" = "Some ground rules.";
 "Scene.Welcome.Slogan" = "Social networking
-back in your hands.";
+back in your hands.";
\ No newline at end of file