diff --git a/library/device.dcm b/library/device.dcm
index df086a6b..132cf3bc 100644
--- a/library/device.dcm
+++ b/library/device.dcm
@@ -203,6 +203,7 @@ $ENDCMP
 $CMP LED
 D LED generic
 K led
+F ~
 $ENDCMP
 #
 $CMP LED_RABG
@@ -519,7 +520,8 @@ $ENDCMP
 #
 $CMP R
 D Resistor
-K R DEV
+K r dev
+F ~
 $ENDCMP
 #
 $CMP RR8
@@ -544,6 +546,8 @@ $ENDCMP
 #
 $CMP R_Small
 D Resistor
+K res 
+F ~
 $ENDCMP
 #
 $CMP SCHDPAK
@@ -579,8 +583,15 @@ F ~
 $ENDCMP
 #
 $CMP SW_PUSH
-D Button
-K Switch
+D Button, generic, normally open
+K switch push no
+F ~
+$ENDCMP
+#
+$CMP SW_PUSH_SMALL
+D button, generic, small symbol
+K switch no push
+F ~
 $ENDCMP
 #
 $CMP Switch_DPST
diff --git a/library/device.lib b/library/device.lib
index 69d0dd2d..0195d794 100644
--- a/library/device.lib
+++ b/library/device.lib
@@ -202,8 +202,8 @@ $ENDFPLIST
 DRAW
 P 2 0 1 13 -60 -20 60 -20 N
 P 2 0 1 12 -60 20 60 20 N
-X ~ 1 0 100 75 D 40 40 1 1 P
-X ~ 2 0 -100 80 U 40 40 1 1 P
+X ~ 1 0 100 80 D 50 50 1 1 P
+X ~ 2 0 -100 80 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -1053,8 +1053,8 @@ ENDDEF
 DEF LED D 0 40 Y N 1 F N
 F0 "D" 0 100 50 H V C CNN
 F1 "LED" 0 -100 50 H V C CNN
-F2 "" 0 0 50 H V C CNN
-F3 "" 0 0 50 H V C CNN
+F2 "" -100 0 50 H V C CNN
+F3 "" 0 100 50 H V C CNN
 $FPLIST
  LED-*
  LED_*
@@ -1064,8 +1064,8 @@ P 2 0 1 0 -50 50 -50 -50 N
 P 3 0 1 0 -80 -25 -125 -65 -120 -40 N
 P 3 0 1 0 -65 -40 -110 -80 -105 -55 N
 P 3 0 1 0 50 50 -50 0 50 -50 F
-X K 1 -200 0 150 R 40 40 1 1 P
-X A 2 200 0 150 L 40 40 1 1 P
+X K 1 -200 0 150 R 50 50 1 1 P
+X A 2 200 0 150 L 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -2982,8 +2982,8 @@ $FPLIST
 $ENDFPLIST
 DRAW
 S -30 70 30 -70 0 1 8 N
-X ~ 1 0 100 30 D 40 40 1 1 P
-X ~ 2 0 -100 30 U 40 40 1 1 P
+X ~ 1 0 100 30 D 50 50 1 1 P
+X ~ 2 0 -100 30 U 50 50 1 1 P
 ENDDRAW
 ENDDEF
 #
@@ -3098,7 +3098,7 @@ ENDDEF
 # SW_PUSH
 #
 DEF SW_PUSH SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
+F0 "SW" 0 150 50 H V C CNN
 F1 "SW_PUSH" 0 -80 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
@@ -3113,19 +3113,19 @@ ENDDEF
 # SW_PUSH_SMALL
 #
 DEF SW_PUSH_SMALL SW 0 40 N N 1 F N
-F0 "SW" 150 110 50 H V C CNN
-F1 "SW_PUSH_SMALL" 0 -79 50 H V C CNN
+F0 "SW" 0 150 50 H V C CNN
+F1 "SW_PUSH_SMALL" 0 -90 50 H V C CNN
 F2 "" 0 0 50 H V C CNN
 F3 "" 0 0 50 H V C CNN
 DRAW
-C -60 60 10 0 1 0 N
-C 60 -60 10 0 1 0 N
-P 3 0 1 0 -100 100 -60 60 -60 60 N
-P 4 0 1 0 60 -60 100 -100 100 -100 100 -100 N
-P 6 0 1 0 -10 60 10 70 70 10 60 -10 60 -10 60 -10 N
-P 7 0 1 0 -50 80 80 -50 90 -40 -40 90 -50 80 -50 80 -50 80 N
-X 1 1 -100 100 0 R 50 50 0 1 P
-X 2 2 100 -100 0 L 50 50 0 1 P
+C -40 0 10 0 1 10 f
+C 40 0 10 0 1 10 f
+P 3 0 1 10 -10 10 10 20 -10 30 N
+P 4 0 1 10 40 50 30 70 -30 70 -40 50 F
+P 5 0 1 10 60 30 -60 30 -60 50 60 50 60 30 f
+P 6 0 1 10 -10 10 10 0 -10 -10 10 -20 -10 -30 10 -40 N
+X 1 1 -100 0 50 R 50 50 0 1 P
+X 2 2 100 0 50 L 50 50 0 1 P
 ENDDRAW
 ENDDEF
 #