diff --git a/D6StarWars/D6StarWars.css b/D6StarWars/D6StarWars.css
index 12fe6f8b1c..29ca0d07a8 100644
--- a/D6StarWars/D6StarWars.css
+++ b/D6StarWars/D6StarWars.css
@@ -484,6 +484,7 @@
 }
 
 .charsheet .attribute {
+    display: flex;
     margin-bottom: 5px;
 }
 
@@ -494,8 +495,7 @@
     line-height: 34px;
 }
 .charsheet .unified-dice-text {
-    display: inline-flex;
-    width: calc(100% - 231px);
+    flex-grow: 1;
     height: 40px;
     margin: 0;
     padding: 0 5px;
@@ -525,8 +525,9 @@
 
 .charsheet .unified-dice-middle {
     display: inline-flex;
-    width: 29px;
+    width: 32px;
     height: 40px;
+    padding: 0 2px;
     line-height: 40px;
     font-size: 1.6em;
     vertical-align: top;
@@ -541,18 +542,24 @@
     padding: 2px 4px;
 }
 
+.charsheet .attributes button[type=roll].unified-dice-roll {
+    margin: 0 5px 0 0;
+}
+
 /* Skill */
 .charsheet .skill {
+    display: flex;
     height: 28px;
     margin: 4px 0;
 }
 .charsheet .skill * {
     height: 28px;
     line-height: 26px;
-    width: 100%;
 }
 .charsheet .skill input[type="text"]{
-    width: calc(100% - 5px);
+    flex-grow: 1;
+    width: inherit;
+    margin-right: 5px;
 }
 
 .charsheet .skill label {
@@ -590,7 +597,9 @@
     display: inline-flex;
     width: 25px;
     height: 28px;
+    margin: 0 2px;
     padding-left: 4px;
+    padding-right: 3px;
     font-size: medium;
     vertical-align: top;
     line-height: 28px;
@@ -649,8 +658,9 @@
 
 /* Weapons & Armors */
 .charsheet .armor.sheet-row,
-.charsheet .weapon.sheet-row{
-    width: 850px;
+.charsheet .weapon.sheet-row {
+    display: flex;
+    width: 856px;
 }
 .charsheet .armor.sheet-row:first-of-type .cell,
 .charsheet .weapon.sheet-row:first-of-type .cell {
@@ -683,25 +693,25 @@
 }
 .charsheet .cell-name {
     min-width: 50px;
-    width: calc(100% - 743px);
+    flex-grow: 1;
 }
 .charsheet .cell-name .unified-dice-text {
     width: 100%;
 }
 .charsheet .cell-dice {
-    width: 197px;
+    width: 205px;
 }
 .charsheet .cell-1 {
     width: 46px;
 }
 .charsheet .cell-2 {
-    width: 84px;
+    width: 98px;
 }
 .charsheet .cell-4 {
-    width: 198px;
+    width: 200px;
 }
 .charsheet .armor .cell-4 {
-    width: 218px;
+    width: 204px;
 }
 .charsheet .cell-4 .part {
     display: inline-block;