diff --git a/public/style.css b/public/style.css
index 3c5b7c8..499b6d1 100644
--- a/public/style.css
+++ b/public/style.css
@@ -143,10 +143,14 @@ li.load-more {
   padding-top: 6px;
 }
 
+.btn-group-justified .btn,
+.btn-group-justified .btn:focus {
+  outline: 0;
+}
+
 .btn-group-justified.column-menu .btn {
   border-radius: 0;
   border-bottom: 0;
-  outline: 0;
 }
 
 .notification.reblog,
@@ -403,13 +407,14 @@ li.load-more {
   clear: both;
 }
 
-.charcount {
-  cursor: default;
+.btn-nsfw {
+  font-size: 10px;
+  font-weight: bold;
+  line-height: 20px;
 }
 
-.draft-actions .btn-group:nth-child(2) {
-  width: .5%;
-  min-width: 30px;
+.charcount {
+  cursor: default;
 }
 
 .in-reply-to .well {
diff --git a/src/View/Draft.elm b/src/View/Draft.elm
index 6e70123..821442a 100644
--- a/src/View/Draft.elm
+++ b/src/View/Draft.elm
@@ -256,24 +256,27 @@ draftView ({ draft, currentUser } as model) =
                         ]
                     , visibilitySelector draft
                     , fileUploadField draft
-                    , div [ class "form-group checkbox" ]
-                        [ label []
-                            [ input
-                                [ type_ "checkbox"
-                                , onCheck <| DraftEvent << UpdateSensitive
-                                , checked draft.sensitive
-                                ]
-                                []
-                            , text " This post is NSFW"
-                            ]
-                        ]
                     , Common.justifiedButtonGroup "draft-actions"
                         [ button
                             [ type_ "button"
                             , class "btn btn-default"
+                            , title "Clear this draft"
                             , onClick (DraftEvent ClearDraft)
                             ]
-                            [ text "Clear" ]
+                            [ Common.icon "trash" ]
+                        , button
+                            [ type_ "button"
+                            , class <|
+                                "btn btn-default btn-nsfw "
+                                    ++ (if draft.sensitive then
+                                            "btn-primary active"
+                                        else
+                                            ""
+                                       )
+                            , title "Mark this post as Not Safe For Work (sensitive content)"
+                            , onClick <| DraftEvent (UpdateSensitive (not draft.sensitive))
+                            ]
+                            [ text "NSFW" ]
                         , div
                             [ class <|
                                 if limitExceeded then